From b3b647054e8610a29536ccee7be3aa2483e16431 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Fri, 15 Aug 2014 14:21:56 -0700
Subject: [PATCH] Import translations. DO NOT MERGE

Change-Id: I33188a7df715a4accf49444b4e182a64a94aa880
Auto-generated-cl: translation import
---
 res/values-am/strings.xml     |   6 +-
 res/values-ca/strings.xml     |  18 +-
 res/values-cs/strings.xml     |  10 +-
 res/values-da/arrays.xml      |   4 +-
 res/values-da/strings.xml     |   6 +-
 res/values-de/strings.xml     |   2 +-
 res/values-en-rGB/strings.xml |   2 +-
 res/values-en-rIN/strings.xml |   2 +-
 res/values-es/strings.xml     |   2 +-
 res/values-et-rEE/strings.xml |  16 +-
 res/values-fr/strings.xml     |   2 +-
 res/values-hi/arrays.xml      |   2 +-
 res/values-hi/strings.xml     | 246 +++++++++----------
 res/values-hu/strings.xml     |  30 +--
 res/values-hy-rAM/strings.xml |  18 +-
 res/values-in/arrays.xml      |   2 +-
 res/values-in/strings.xml     |   6 +-
 res/values-it/arrays.xml      |   4 +-
 res/values-it/strings.xml     |   6 +-
 res/values-iw/strings.xml     |   2 +-
 res/values-ka-rGE/strings.xml |   4 +-
 res/values-km-rKH/arrays.xml  |  30 +--
 res/values-km-rKH/strings.xml | 112 ++++-----
 res/values-lo-rLA/strings.xml |  12 +-
 res/values-lt/strings.xml     |   2 +-
 res/values-lv/strings.xml     |   8 +-
 res/values-nb/strings.xml     |   2 +-
 res/values-nl/strings.xml     |  10 +-
 res/values-pl/strings.xml     |   2 +-
 res/values-pt-rPT/strings.xml |   2 +-
 res/values-pt/strings.xml     |   4 +-
 res/values-ru/strings.xml     |   8 +-
 res/values-sk/arrays.xml      |   6 +-
 res/values-sk/strings.xml     |  36 +--
 res/values-sr/strings.xml     |  16 +-
 res/values-sw/strings.xml     |  26 +-
 res/values-uk/strings.xml     |  14 +-
 res/values-vi/strings.xml     |   6 +-
 res/values-zh-rCN/arrays.xml  |  56 ++---
 res/values-zh-rCN/strings.xml | 538 +++++++++++++++++++++---------------------
 res/values-zh-rHK/arrays.xml  |  22 +-
 res/values-zh-rHK/strings.xml | 154 ++++++------
 res/values-zh-rTW/strings.xml |   8 +-
 res/values-zu/strings.xml     |   4 +-
 44 files changed, 734 insertions(+), 734 deletions(-)

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 740cc429e1..55354406ad 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1553,9 +1553,9 @@
     <string name="process_stats_run_time" msgid="6520628955709369115">"የሚያሄድበት ጊዜ ርዝመት"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"አገልግሎቶች"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"የቆይታ ጊዜ"</string>
-    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ሰዓታት"</string>
-    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ሰዓታት"</string>
-    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ሰዓታት"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ሰዓቶች"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ሰዓቶች"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ሰዓቶች"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 ቀን"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"ስርዓት አሳይ"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"ዩ ኤስ ኤስ ይጠቀሙ"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b0ed44fff2..8d2365c720 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -226,7 +226,7 @@
     <string name="radio_info_phone_number_label" msgid="7192944627907412169">"Número de telèfon:"</string>
     <string name="radio_info_band_mode_label" msgid="441469694142042022">"Selecciona la banda de senyal mòbil"</string>
     <string name="radio_info_network_type_label" msgid="3706382548257257987">"Tipus de xarxa:"</string>
-    <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Defineix el tipus de xarxa preferida:"</string>
+    <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Defineix el tipus de xarxa preferit:"</string>
     <string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Ping d\'adreça IP:"</string>
     <string name="radio_info_ping_hostname" msgid="3054888474808217853">"Fes ping al nom d\'amfitrió (www.google.com):"</string>
     <string name="radio_info_http_client_test" msgid="5733604021077701555">"Prova de client HTTP:"</string>
@@ -281,14 +281,14 @@
     <string name="roaming" msgid="3596055926335478572">"Itinerància de dades"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Estableix connexió amb serveis de dades en itinerància"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Estableix connexió amb serveis de dades en itinerància"</string>
-    <string name="roaming_reenable_message" msgid="9141007271031717369">"Heu perdut la connectivitat de dades perquè heu abandonat la xarxa local amb la itinerància de dades desactivada."</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"Has perdut la connectivitat de dades, perquè has abandonat la xarxa domèstica i la itinerància de dades està desactivada."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Activa-la"</string>
-    <string name="roaming_warning" msgid="7625933694709170887">"Si permets la itinerància de dades, els costos poden ser elevats."</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Si permets la itinerància de dades, és possible que se t\'apliquin càrrecs per itinerància significatius.\n\nAquesta configuració afecta tots els usuaris de la tauleta."</string>
-    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Si permets la itinerància de dades, és possible que se t\'apliquin càrrecs per itinerància significatius.\n\nAquesta configuració afecta tots els usuaris del telèfon."</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Si permets la itinerància de dades, és possible que se\'t facturin càrrecs d\'itinerància elevats."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Si permets la itinerància de dades, és possible que se\'t facturin càrrecs d\'itinerància elevats.\n\nAquesta configuració afecta tots els usuaris de la tauleta."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Si permets la itinerància de dades, és possible que se\'t facturin càrrecs d\'itinerància elevats.\n\nAquesta configuració afecta tots els usuaris del telèfon."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Vols permetre la itinerància de dades?"</string>
     <string name="networks" msgid="6333316876545927039">"Selecció d\'operador"</string>
-    <string name="sum_carrier_select" msgid="3616956422251879163">"Selecciona un operador de xarxa"</string>
+    <string name="sum_carrier_select" msgid="3616956422251879163">"Tria un operador de xarxa"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data i hora"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Estableix la data i l\'hora"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Defineix la data, l\'hora, la zona horària i els formats"</string>
@@ -766,9 +766,9 @@
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueig de targeta SIM"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloqueja la targeta SIM"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Necessites el PIN per utilitzar la tauleta"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Requereix el PIN per utilitzar el telèfon"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Sol·licita el PIN per utilitzar el telèfon"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Exigeix el PIN per utilitzar la tauleta"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Requereix el PIN per utilitzar el telèfon"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Sol·licita el PIN per utilitzar el telèfon"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Canvia el PIN de la SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN de la SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Bloqueja la targeta SIM"</string>
@@ -926,7 +926,7 @@
     <string name="error_mnc_not23" msgid="8418177072458379439">"El camp MNC ha de tenir 2 o 3 dígits."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"S\'està restaurant la configuració predeterminada d\'APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Restableix al valor predeterminat"</string>
-    <string name="restore_default_apn_completed" msgid="2824775307377604897">"S\'ha completat el restabliment de configuració predeterminada d\'APN."</string>
+    <string name="restore_default_apn_completed" msgid="2824775307377604897">"S\'ha restablert la configuració predeterminada d\'APN."</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restableix dades de fàbrica"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Esborra totes les dades de la tauleta"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Esborra totes les dades del telèfon"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 1cfd079010..5f4740a548 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -189,11 +189,11 @@
     <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Vymazat"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port proxy"</string>
-    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Nepoužívat server proxy pro"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Nepoužívat proxy server pro"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Obnovit výchozí nastavení"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Hotovo"</string>
-    <string name="proxy_hostname_label" msgid="8490171412999373362">"Název hostitele serveru proxy"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Název hostitele proxy serveru"</string>
     <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Upozornění"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
@@ -202,7 +202,7 @@
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"Je třeba vyplnit pole portu."</string>
     <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_warning_limited_support" msgid="7229337138062837422">"Proxy server protokolu HTTP může používat prohlížeč, ale nesmí jej používat další aplikace."</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>
@@ -770,13 +770,13 @@
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"K použití tabletu je vyžadován kód PIN"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"K použití telefonu je vyžadován PIN"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Změnit PIN SIM karty"</string>
-    <string name="sim_enter_pin" msgid="6608715137008508432">"PIN SIM karty"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"Kód PIN SIM karty"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Zamykat SIM kartu"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Odemknout SIM kartu"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"Starý PIN SIM karty"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"Nový PIN SIM karty"</string>
     <string name="sim_reenter_new" msgid="3178510434642201544">"Potvrďte nový kód PIN."</string>
-    <string name="sim_change_pin" msgid="7328607264898359112">"PIN SIM karty"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"Kód PIN SIM karty"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Nesprávný kód PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Kódy PIN nejsou shodné"</string>
     <string name="sim_change_failed" msgid="304964924772218382">"Kód PIN nelze změnit.\nMožná jste zadali nesprávný kód PIN."</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index a3c284bd9e..d590fb98f7 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -90,7 +90,7 @@
     <item msgid="515055375277271756">"Godkender..."</item>
     <item msgid="1943354004029184381">"Henter IP-adresse…"</item>
     <item msgid="4221763391123233270">"Tilsluttet"</item>
-    <item msgid="624838831631122137">"Midlertidigt standset"</item>
+    <item msgid="624838831631122137">"Sat på pause"</item>
     <item msgid="7979680559596111948">"Afbryder ..."</item>
     <item msgid="1634960474403853625">"Afbrudt"</item>
     <item msgid="746097431216080650">"Mislykkedes"</item>
@@ -104,7 +104,7 @@
     <item msgid="554971459996405634">"Godkender med <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</item>
     <item msgid="7928343808033020343">"Henter IP-adresse fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</item>
     <item msgid="8937994881315223448">"Forbundet til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
-    <item msgid="1330262655415760617">"Midlertidigt standset"</item>
+    <item msgid="1330262655415760617">"Sat på pause"</item>
     <item msgid="7698638434317271902">"Afbryder fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</item>
     <item msgid="197508606402264311">"Afbrudt"</item>
     <item msgid="8578370891960825148">"Mislykkedes"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9a2897b978..0f67ce6036 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -56,7 +56,7 @@
     <string name="radioInfo_data_disconnected" msgid="1959735267890719418">"Afbrudt"</string>
     <string name="radioInfo_data_connecting" msgid="8404571440697917823">"Forbinder"</string>
     <string name="radioInfo_data_connected" msgid="7074301157399238697">"Tilsluttet"</string>
-    <string name="radioInfo_data_suspended" msgid="5315325487890334196">"Midlertidigt standset"</string>
+    <string name="radioInfo_data_suspended" msgid="5315325487890334196">"Sat på pause"</string>
     <string name="radioInfo_unknown" msgid="737385314432468266">"ukendt"</string>
     <string name="radioInfo_display_packets" msgid="8654359809877290639">"pk."</string>
     <string name="radioInfo_display_bytes" msgid="4018206969492931883">"bytes"</string>
@@ -795,7 +795,7 @@
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Systemopdateringer"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-version"</string>
-    <string name="model_number" msgid="3765737700545384794">"Modelnummer"</string>
+    <string name="model_number" msgid="3765737700545384794">"Modelnavn"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Udstyrs-id"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Basebandversion"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernesystem"</string>
@@ -1392,7 +1392,7 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Opdater skærmforstørrelse automatisk"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Opdater skærmforstørrelsen på appovergange"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Afbryderknappen afslutter opkald"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Indtal adgangskoder"</string>
+    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Oplæs adgangskoder"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Forsinkelse på tryk og hold nede"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Indstillinger"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Til"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c25e126364..a6815829e4 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1298,7 +1298,7 @@
     <string name="quick_launch_title" msgid="7904609846945905306">"Schnellstart"</string>
     <string name="quick_launch_summary" msgid="8101133819188001190">"Tastenkombinationen zum Starten von Apps festlegen"</string>
     <string name="quick_launch_assign_application" msgid="6240064079456617501">"App zuweisen"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Keine Tastenkombination"</string>
+    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Kein Tasteaturkürzel"</string>
     <string name="quick_launch_shortcut" msgid="5090405067413522300">"Suche + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
     <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Löschen"</string>
     <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Die Verknüpfung für <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) wird gelöscht."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 4e20648b68..c8f05e23fc 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1955,7 +1955,7 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Network may be monitored"</string>
-    <string name="done_button" msgid="1991471253042622230">"Finished"</string>
+    <string name="done_button" msgid="1991471253042622230">"Done"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Network monitoring"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"This device is managed by:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nYour administrator is capable of monitoring your network activity, including emails, apps and secure websites.\n\nFor more information, contact your administrator."</string>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"A third party is capable of monitoring your network activity, including emails, apps and secure websites.\n\nA trusted credential installed on your device is making this possible."</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 4e20648b68..c8f05e23fc 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1955,7 +1955,7 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Network may be monitored"</string>
-    <string name="done_button" msgid="1991471253042622230">"Finished"</string>
+    <string name="done_button" msgid="1991471253042622230">"Done"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Network monitoring"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"This device is managed by:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nYour administrator is capable of monitoring your network activity, including emails, apps and secure websites.\n\nFor more information, contact your administrator."</string>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"A third party is capable of monitoring your network activity, including emails, apps and secure websites.\n\nA trusted credential installed on your device is making this possible."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5db51f4f4c..58426d0110 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -517,7 +517,7 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz del teléfono"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y contenido multimedia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ajustes de recordatorio"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Enviar contenido a pantalla"</string>
+    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Enviar pantalla"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Habilitar pantalla inalámbrica"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No hay dispositivos cercanos."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index c6639f922c..a8c24a0eb9 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -278,7 +278,7 @@
     <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>
+    <string name="roaming" msgid="3596055926335478572">"Andmesiderändlus"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Ühenda rändluse ajal andmesideteenustega"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Ühenda rändluse ajal andmesideteenustega"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Kaotasite andmesideühenduse, kuna jätsite oma koduvõrgu andmerändluse väljalülitatuks."</string>
@@ -769,14 +769,14 @@
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Nõua telefoni kasutamiseks PIN-i"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Nõua tahvelarvuti kasutamiseks PIN-i"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Nõua telefoni kasutamiseks PIN-i"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"Muuda SIM-i PIN-koodi"</string>
-    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM-i PIN-kood"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"Muuda SIM-kaardi PIN-koodi"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM-kaardi PIN-kood"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM-kaardi lukustamine"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Ava SIM-kaart"</string>
-    <string name="sim_enter_old" msgid="6074196344494634348">"Vana SIM-i PIN-kood"</string>
-    <string name="sim_enter_new" msgid="8742727032729243562">"Uus SIM-i PIN-kood"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"SIM-kaardi vana PIN-kood"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"SIM-kaardi uus PIN-kood"</string>
     <string name="sim_reenter_new" msgid="3178510434642201544">"Sisestage uus PIN uuesti:"</string>
-    <string name="sim_change_pin" msgid="7328607264898359112">"SIM-i PIN-kood"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"SIM-kaardi PIN-kood"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Vale PIN-kood"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-koodid ei kattu"</string>
     <string name="sim_change_failed" msgid="304964924772218382">"PIN-koodi ei saa muuta.\nPIN-kood võib vale olla."</string>
@@ -1009,7 +1009,7 @@
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ükski rakendus pole hiljuti asukohateavet küsinud"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Asukohateenused"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Suur akukasutus"</string>
-    <string name="location_low_battery_use" msgid="8602232529541903596">"Väike akukasutus"</string>
+    <string name="location_low_battery_use" msgid="8602232529541903596">"Madala tarbimisega akukasutus"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Asukoharežiim"</string>
     <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Asukoha määramine GPS-i, WiFi- ja mobiilsidevõrgu abil"</string>
     <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Asukoha määramine WiFi- ja mobiilsidevõrgu abil"</string>
@@ -1833,7 +1833,7 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Kuva taustarakendustele dial. Rakendus ei reageeri"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Andmekasutus"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Andmete kasutamistsükkel"</string>
-    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Andmerändlus"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Andmesiderändlus"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Piira taustaandmeid"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Eraldi 4G kasutamine"</string>
     <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Kuva WiFi kasutust"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6654475789..0f7877288b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -927,7 +927,7 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Restauration des paramètres APN par défaut en cours..."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Rétablir param. par défaut"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"La réinitialisation des paramètres APN par défaut est terminée."</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Restaurer valeurs d\'usine"</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"Rétablir la configuration d\'usine"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Effacer toutes les données de la tablette"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Effacer toutes les données du téléphone"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index c59515eab3..5ff4a82087 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -321,7 +321,7 @@
     <item msgid="7878027809189330917">"मीडिया वॉल्‍यूम"</item>
     <item msgid="7260546305036218513">"अलार्म आवाज़"</item>
     <item msgid="9103719301075748925">"सूचना वॉल्‍यूम"</item>
-    <item msgid="7025966722295861512">"Bluetooth वॉल्‍यूम"</item>
+    <item msgid="7025966722295861512">"ब्लूटूथ वॉल्‍यूम"</item>
     <item msgid="4665183401128289653">"सचेत रखें"</item>
     <item msgid="8584357129746649222">"स्थान"</item>
     <item msgid="7669257279311110599">"स्थान"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f2c59a7344..61a4c190d2 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -109,15 +109,15 @@
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"अधिक वोल्‍टेज"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"अज्ञात त्रुटि"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"ठंडा"</string>
-    <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"आसपास के सब Bluetooth उप. के लि‍ए दिखाई दे रहा है (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"सभी आस-पास के Bluetooth उपकरणों के लि‍ए दिखाई दे रहा है"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"अन्‍य Bluetooth उपकरणों के लि‍ए दिखाई नहीं दे रहा है"</string>
+    <string name="bluetooth" msgid="5549625000628014477">"ब्लूटूथ"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"आसपास के सब ब्लूटूथ उप. के लि‍ए दिखाई दे रहा है (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"सभी आस-पास के ब्लूटूथ उपकरणों के लि‍ए दिखाई दे रहा है"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"अन्‍य ब्लूटूथ उपकरणों के लि‍ए दिखाई नहीं दे रहा है"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"केवल युग्‍मि‍त उपकरणों के लि‍ए दिखाई दे रहा है"</string>
-    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"दृश्यता समयबाह्य"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"समयबाह्य दृश्यता"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ध्‍वनि डायलिंग लॉक करें"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"जब स्‍क्रीन लॉक हो, तो bluetooth डायलर के उपयोग को रोकें"</string>
-    <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth उपकरण"</string>
+    <string name="bluetooth_devices" msgid="1886018064039454227">"ब्लूटूथ उपकरण"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"उपकरण नाम"</string>
     <string name="bluetooth_device_details" msgid="4594773497930028085">"उपकरण सेटिंग"</string>
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"प्रोफ़ाइल सेटिंग"</string>
@@ -141,31 +141,31 @@
     <string name="bluetooth_connecting" msgid="8555009514614320497">"कनेक्ट हो रहा है..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"युग्‍मित कर रहा है…"</string>
-    <string name="bluetooth_device" msgid="5291950341750186887">"अनामित Bluetooth उपकरण"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"अनामित ब्लूटूथ उपकरण"</string>
     <string name="progress_scanning" msgid="192587958424295789">"खोजना"</string>
-    <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"आस-पास कोई Bluetooth उपकरण नहीं मिला."</string>
-    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth युग्‍मन अनुरोध"</string>
+    <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"आस-पास कोई ब्लूटूथ उपकरण नहीं मिला."</string>
+    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"ब्लूटूथ युग्‍मन अनुरोध"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"युग्‍मन अनुरोध"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> के साथ युग्‍मित करने के लिए स्पर्श करें."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"प्राप्त फ़ाइलें दिखाएं"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth उपकरण चयनकर्ता"</string>
-    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth अनूमति अनुरोध"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"एक ऐप्स  Bluetooth को चालू करना चाहता है."</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"एक ऐप्स  आपके टेबलेट को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य Bluetooth उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"एक ऐप्स  आपके फ़ोन को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य Bluetooth उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"एक ऐप्स  आपके टेबलेट को अन्य Bluetooth उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में Bluetooth सेटिंग में बदल सकते हैं."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"एक ऐप्स  आपके फ़ोन को अन्य Bluetooth उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में Bluetooth सेटिंग में बदल सकते हैं."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g>, आस-पास के अन्य उपकरणों के साथ संचार करने के लिए Bluetooth प्रसारण चालू करना चाहता है. आप बाद में इसे Bluetooth सेटिंग में बदल सकते हैं."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"आस-पास के अन्य उपकरणों के साथ संचार करने के लिए <xliff:g id="APP_NAME">%1$s</xliff:g>, Bluetooth और Bluetooth प्रसारण चालू करना चाहता है. आप इसे बाद में Bluetooth सेटिंग में बदल सकते हैं."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"इस सुविधा के चालू होने पर, आपका फ़ोन आस-पास के अन्य उपकरणों के साथ संचार कर सकता है.\n\nप्रसारण, कम-पावर वाले Bluetooth सिग्नल का उपयोग करता है."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"एक ऐप्स  Bluetooth को चालू करना और आपके टेबलेट को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"एक ऐप्स  Bluetooth को चालू करना और आपके फ़ोन को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"एक ऐप्स  Bluetooth को चालू करना और आपके टेबलेट को अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में Bluetooth सेटिंग में बदल सकते हैं."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"एक ऐप्स  Bluetooth को चालू करना और आपके फ़ोन को अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में Bluetooth सेटिंग में बदल सकते हैं."</string>
-    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth चालू हो रहा है.."</string>
-    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth बंद कर रहे हैं…"</string>
+    <string name="device_picker" msgid="8398232791303186677">"ब्लूटूथ उपकरण चयनकर्ता"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"ब्लूटूथ अनूमति अनुरोध"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"एक ऐप्स  ब्लूटूथ को चालू करना चाहता है."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"एक ऐप्स  आपके टेबलेट को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य ब्लूटूथ उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"एक ऐप्स  आपके फ़ोन को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य ब्लूटूथ उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"एक ऐप्स  आपके टेबलेट को अन्य ब्लूटूथ उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में ब्लूटूथ सेटिंग में बदल सकते हैं."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"एक ऐप्स  आपके फ़ोन को अन्य ब्लूटूथ उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में ब्लूटूथ सेटिंग में बदल सकते हैं."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g>, आस-पास के अन्य उपकरणों के साथ संचार करने के लिए ब्लूटूथ प्रसारण चालू करना चाहता है. आप बाद में इसे ब्लूटूथ सेटिंग में बदल सकते हैं."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"आस-पास के अन्य उपकरणों के साथ संचार करने के लिए <xliff:g id="APP_NAME">%1$s</xliff:g>, ब्लूटूथ और ब्लूटूथ प्रसारण चालू करना चाहता है. आप इसे बाद में ब्लूटूथ सेटिंग में बदल सकते हैं."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"इस सुविधा के चालू होने पर, आपका फ़ोन आस-पास के अन्य उपकरणों के साथ संचार कर सकता है.\n\nप्रसारण, कम-पावर वाले ब्लूटूथ सिग्नल का उपयोग करता है."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"एक ऐप्स  ब्लूटूथ को चालू करना और आपके टेबलेट को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"एक ऐप्स  ब्लूटूथ को चालू करना और आपके फ़ोन को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"एक ऐप्स  ब्लूटूथ को चालू करना और आपके टेबलेट को अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में ब्लूटूथ सेटिंग में बदल सकते हैं."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"एक ऐप्स  ब्लूटूथ को चालू करना और आपके फ़ोन को अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में ब्लूटूथ सेटिंग में बदल सकते हैं."</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"ब्लूटूथ चालू हो रहा है.."</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"ब्लूटूथ बंद कर रहे हैं…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"स्‍वत: कनेक्‍ट करें"</string>
-    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth कनेक्शन अनुरोध"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ब्लूटूथ कनेक्शन अनुरोध"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" से कनेक्ट करने के लिए स्पर्श करें."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"क्या आप \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" से कनेक्ट करना चाहते हैं?"</string>
     <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"फ़ोन बुक एक्सेस अनुरोध"</string>
@@ -277,7 +277,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"हवाई जहाज मोड"</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="radio_controls_summary" msgid="1838624369870907268">"वाई-फ़ाई , ब्लूटूथ, हवाई जहाज़ मोड, मोबाइल नेटवर्क और VPN प्रबंधित करें"</string>
     <string name="roaming" msgid="3596055926335478572">"डेटा रोमिंग"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"रोमिंग के समय डेटा सेवाएं कनेक्ट करें"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"रोमिंग के समय डेटा सेवाएं कनेक्ट करें"</string>
@@ -296,8 +296,8 @@
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"नेटवर्क-प्रदत्त समय का उपयोग करें"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"नेटवर्क-प्रदत्त समय का उपयोग करें"</string>
     <string name="zone_auto" msgid="334783869352026648">"स्‍वचालित समय क्षेत्र"</string>
-    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"नेटवर्क-प्रदत्त समय क्षेत्र का उपयोग करें"</string>
-    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"नेटवर्क-प्रदत्त समय क्षेत्र का उपयोग करें"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"नेटवर्क द्वारा प्रदान किया गया समय क्षेत्र का उपयोग करें"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"नेटवर्क द्वारा प्रदान किया गया समय क्षेत्र का उपयोग करें"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-घंटे के प्रारूप का उपयोग करें"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"समय सेट करें"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"समय क्षेत्र को चुनें"</string>
@@ -440,12 +440,12 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"कोई सूचना श्रवणकर्ता इंस्टॉल नहीं है."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> सक्षम करें?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> सिस्टम द्वारा या इंस्टॉल किए गए किसी भी ऐप्स  द्वारा पोस्ट की गई ऐसी सूचनाएं पढ़ सकेगा, जिनमें संपर्क नाम तथा आपको भेजे गए संदेशों की सामग्री जैसी व्यक्तिगत जानकारी शामिल हो सकती है. वह इन सूचनाओं को ख़ारिज भी कर सकेगा या उनमें मौजूद स्पर्श कार्यवाही बटन स्पर्श कर सकेगा."</string>
-    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
-    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth चालू करें"</string>
-    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
+    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"ब्लूटूथ"</string>
+    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"ब्लूटूथ चालू करें"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"ब्लूटूथ"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"ब्लूटूथ"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"कनेक्‍शन प्रबंधित करें, उपकरण नाम और खोज योग्‍यता सेट करें"</string>
-    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth युग्‍मन अनुरोध"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"ब्लूटूथ युग्‍मन अनुरोध"</string>
     <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"इसके साथ युग्‍मित करने के लिए:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>उपकरण के लिए आवश्‍यक पिन लिखें:"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"इसके साथ युग्‍मित करने के लिए:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>उपकरण के लिए आवश्‍यक पासकी लिखें:"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"पिन में अक्षर या प्रतीक शामिल होते हैं"</string>
@@ -476,8 +476,8 @@
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"डिस्‍कनेक्‍ट करें और अयुग्‍मित करें"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"विकल्प…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"अतिरिक्त सेटिंग"</string>
-    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"उन्नत Bluetooth"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="4793562956642282639">"उपकरणों को देखने के लिए, Bluetooth को चालू करें."</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"उन्नत ब्लूटूथ"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="4793562956642282639">"उपकरणों को देखने के लिए, ब्लूटूथ को चालू करें."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"इससे कनेक्‍ट करें…"</string>
     <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"मीडिया ऑडियो"</string>
     <string name="bluetooth_profile_headset" msgid="8658779596261212609">"फ़ोन ऑडियो"</string>
@@ -492,9 +492,9 @@
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारा इंटरनेट पहुंच को डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को इस टेबलेट का इंटरनेट कनेक्‍शन शेयर करने से डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को इस फ़ोन का इंटरनेट कनेक्‍शन शेयर करने से डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
-    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"युग्‍मि‍त Bluetooth उपकरण"</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"युग्‍मि‍त ब्लूटूथ उपकरण"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"जोड़ दें"</string>
-    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Bluetooth उपकरण से कनेक्‍ट करें"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"ब्लूटूथ उपकरण से कनेक्‍ट करें"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"प्रोफ़ाइल"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"नाम बदलें"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"इनकमिंग फ़ाइल स्‍थानांतरण की अनुमति दें"</string>
@@ -541,56 +541,56 @@
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"नेटवर्क सेवा खोज"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"अन्‍य उपकरणों पर ऐप्स को इस उपकरण पर ऐप्स खोजने दें"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi-Fi चालू करें"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"वाई-फ़ाई  चालू करें"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi सेटिंग"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"वायरलेस पहुंच बिंदुओं को सेट अप और प्रबंधित करें"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi-Fi चुनें"</string>
-    <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi चालू हो रहा है…"</string>
-    <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi बंद हो रहा है…"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"वाई-फ़ाई  चुनें"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"वाई-फ़ाई  चालू हो रहा है…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"वाई-फ़ाई  बंद हो रहा है…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"त्रुटि"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"हवाई जहाज़ मोड में"</string>
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"नेटवर्क के लिए स्‍कैन नहीं कर सकता"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"नेटवर्क सूचना"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"खुला नेटवर्क उपलब्‍ध होने पर मुझे सूचित करें"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"खराब कनेक्‍शन से बचें"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"जब तक Wi-Fi नेटवर्क में अच्छा इंटरनेट कनेक्‍शन न हो, तब तक उसका उपयोग न करें"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"जब तक वाई-फ़ाई  नेटवर्क में अच्छा इंटरनेट कनेक्‍शन न हो, तब तक उसका उपयोग न करें"</string>
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"स्कैनिंग हमेशा उपलब्ध है"</string>
-    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Google की स्थान सेवा और अन्य ऐप्स  को नेटवर्क खोजने दें,  Wi-Fi बंद होने पर भी"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Google की स्थान सेवा और अन्य ऐप्स  को नेटवर्क खोजने दें,  वाई-फ़ाई  बंद होने पर भी"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"प्रमाणपत्र इंस्टाल करें"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"स्थान सटीकता को बेहतर बनाने तथा अन्य प्रयोजनों के लिए, Google और अन्य ऐप्स  आसपास के नेटवर्क स्कैन कर सकते हैं, भले ही Wi-Fi बंद हो. यदि आप ऐसा नहीं होने देना चाहते हैं, तो उन्नत &gt; स्कैनिंग हमेशा उपलब्ध पर जाएं."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"ऐप्स  आसपास के नेटवर्क स्कैन कर सकते हैं, भले ही Wi-Fi बंद हो. यदि आप ऐसा नहीं होने देना चाहते हैं, तो उन्नत &gt; स्कैनिंग हमेशा उपलब्ध पर जाएं."</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"स्थान सटीकता को बेहतर बनाने तथा अन्य प्रयोजनों के लिए, Google और अन्य ऐप्स  आसपास के नेटवर्क स्कैन कर सकते हैं, भले ही वाई-फ़ाई  बंद हो. यदि आप ऐसा नहीं होने देना चाहते हैं, तो उन्नत &gt; स्कैनिंग हमेशा उपलब्ध पर जाएं."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"ऐप्स  आसपास के नेटवर्क स्कैन कर सकते हैं, भले ही वाई-फ़ाई  बंद हो. यदि आप ऐसा नहीं होने देना चाहते हैं, तो उन्नत &gt; स्कैनिंग हमेशा उपलब्ध पर जाएं."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"फिर से न दिखाएं"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"प्रयोग में नहीं रहने के दौरान Wi-Fi चालू रखें"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"प्रयोग में नहीं रहने के दौरान वाई-फ़ाई  चालू रखें"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"सेटिंग बदलने में एक समस्‍या थी"</string>
-    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi ऑप्टिमाइज़ेशन"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi-Fi के चालू रहने पर बैटरी उपयोग को न्यूनतम करें"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"वाई-फ़ाई  ऑप्टिमाइज़ेशन"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"वाई-फ़ाई  के चालू रहने पर बैटरी उपयोग को न्यूनतम करें"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"नेटवर्क जोड़ें"</string>
-    <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi नेटवर्क"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"वाई-फ़ाई  नेटवर्क"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS पुश बटन"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"अधिक विकल्प"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS पिन प्रविष्टि"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi प्रत्यक्ष"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"वाई-फ़ाई  प्रत्यक्ष"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"स्कैन करें"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"अतिरिक्त सेटिंग"</string>
     <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_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_wifi_off" msgid="8056223875951079463">"उपलब्‍ध नेटवर्क देखने के लिए, वाई-फ़ाई  चालू करें."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"वाई-फ़ाई  नेटवर्क की खोज जारी है…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"आपको Wi‑Fi नेटवर्क बदलने की अनुमति नहीं है."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"अन्‍य नेटवर्क…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"अधिक"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"स्‍वचालित सेटअप (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="4080969509965288881">"सेटअप पूर्ण करने के लिए, आपके टेबलेट की Wi-Fi पर एक्सेस होनी चाहिए. सेटअप करने के बाद, आप मोबाइल डेटा और Wi-Fi के बीच स्विच कर सकते हैं."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"सेटअप पूर्ण करने के लिए, आपके टेबलेट की वाई-फ़ाई  पर एक्सेस होनी चाहिए. सेटअप करने के बाद, आप मोबाइल डेटा और वाई-फ़ाई  के बीच स्विच कर सकते हैं."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"उन्नत विकल्प दिखाएं"</string>
-    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi-Fi सुरक्षित सेटअप"</string>
+    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"वाई-फ़ाई  सुरक्षित सेटअप"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS प्रारंभ हो रहा है…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"अपने राउटर पर Wi-Fi सुरक्षित सेटअप बटन दबाएं. इसे \"WPS\" कहा जा सकता है या इसमें यह चिन्ह हो सकता है:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"अपने राउटर पर वाई-फ़ाई  सुरक्षित सेटअप बटन दबाएं. इसे \"WPS\" कहा जा सकता है या इसमें यह चिन्ह हो सकता है:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"अपने Wi‑Fi राउटर पर <xliff:g id="NUMBER">%1$s</xliff:g> पिन डालें. सेटअप पूर्ण होने में दो मिनट तक लग सकते हैं."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS सफल रहा. नेटवर्क से कनेक्‍ट हो रहा है…"</string>
-    <string name="wifi_wps_connected" msgid="7153432445748931183">"Wi-Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्ट है"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"वाई-फ़ाई  नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्ट है"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS पहले से ही चल रहा है और पूर्ण होने में दो मिनट तक लग सकते हैं"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS विफल रहा. कृपया कुछ मिनटों में पुन: प्रयास करें."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"वायरलेस राउटर सुरक्षा सेटिंग (WEP) समर्थित नहीं है"</string>
@@ -625,7 +625,7 @@
     <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_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_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>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"अस्वीकार करें"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"जोड़ दें"</string>
@@ -641,10 +641,10 @@
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"चेतावनी: आपको अतिरिक्त कैरियर डेटा शुल्क लग सकते हैं.\n\nफ़ोन सेटअप के लिए अत्यधिक नेटवर्क गतिविधि की आवश्यकता हो सकती है."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"चेतावनी: जब तक आपके पास इंटरनेट कनेक्शन न हो, तब तक टेबलेट सत्यापित नहीं कर पाएगा कि आपका सॉफ़्टवेयर अद्यतित है."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"चेतावनी: जब तक आपके पास इंटरनेट कनेक्शन न हो, तब तक फ़ोन सत्यापित नहीं कर पाएगा कि आपका सॉफ़्टवेयर अद्यतित है."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"टेबलेट इस Wi-Fi नेटवर्क से कनेक्ट नहीं हो सका था."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"फ़ोन इस Wi-Fi नेटवर्क से कनेक्ट नहीं हो सका था."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"टेबलेट इस वाई-फ़ाई  नेटवर्क से कनेक्ट नहीं हो सका था."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"फ़ोन इस वाई-फ़ाई  नेटवर्क से कनेक्ट नहीं हो सका था."</string>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"अतिरिक्त सेटिंग"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi-Fi फ़्रीक्वेंसी बैंड"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"वाई-फ़ाई  फ़्रीक्वेंसी बैंड"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"संचालन की फ़्रीक्‍वेंसी रेंज निर्दिष्ट करें"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"फ़्रीक्‍वेंसी बैंड सेट करने में समस्‍या थी."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC पता"</string>
@@ -660,7 +660,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"गेटवे"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"नेटवर्क उपसर्ग लंबाई"</string>
-    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi प्रत्यक्ष"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"वाई-फ़ाई  प्रत्यक्ष"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"उपकरण जानकारी"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"यह कनेक्‍शन याद रखें"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"उपकरण खोजें"</string>
@@ -676,13 +676,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"आमंत्रण रद्द करें?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"क्या आप <xliff:g id="PEER_NAME">%1$s</xliff:g> से कनेक्ट होने का आमंत्रण रद्द करना चाहते हैं?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"इस समूह को भूलें?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"पोर्टेबल Wi-Fi हॉटस्‍पॉट"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"पोर्टेबल वाई-फ़ाई  हॉटस्‍पॉट"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"हॉटस्‍पॉट को चालू किया जा रहा है…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"हॉटस्‍पॉट को बंद किया जा रहा है…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"पोर्टेबल हॉटस्‍पॉट <xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय"</string>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"पोर्टेबल Wi-Fi हॉटस्‍पॉट त्रुटि"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi-Fi हॉटस्‍पॉट सेट करें"</string>
-    <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> पोर्टेबल Wi-Fi हॉटस्‍पॉट"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"पोर्टेबल वाई-फ़ाई  हॉटस्‍पॉट त्रुटि"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"वाई-फ़ाई  हॉटस्‍पॉट सेट करें"</string>
+    <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> पोर्टेबल वाई-फ़ाई  हॉटस्‍पॉट"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="home_settings" msgid="212375129455718176">"होम"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"स्क्रीन सेटिंग देखें"</string>
@@ -824,8 +824,8 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"सिग्‍नल शक्ति"</string>
     <string name="status_roaming" msgid="2638800467430913403">"रोमिंग"</string>
     <string name="status_operator" msgid="2274875196954742087">"नेटवर्क"</string>
-    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC पता"</string>
-    <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth पता"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"वाई-फ़ाई  MAC पता"</string>
+    <string name="status_bt_address" msgid="4195174192087439720">"ब्लूटूथ पता"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"क्रमांक"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"अनुपलब्ध"</string>
     <string name="status_up_time" msgid="7294859476816760399">"चालू रहने का समय"</string>
@@ -966,7 +966,7 @@
     <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">"Bluetooth टेदरिंग"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ब्लूटूथ टेदरिंग"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"टेदरिंग"</string>
     <string name="tether_settings_title_all" msgid="8356136101061143841">"टेदरिंग और पोर्टेबल हॉटस्‍पॉट"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
@@ -976,7 +976,7 @@
     <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"USB संग्रहण के उपयोग में होने पर टेदर नहीं हो सकता"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB कनेक्ट नहीं किया गया"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB टेदरिंग त्रुटि"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth टेदरिंग"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ब्लूटूथ टेदरिंग"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"इस टेबलेट का इंटरनेट कनेक्‍शन शेयर किया जा रहा है"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"इस फ़ोन के इंटरनेट कनेक्‍शन को शेयर किया जा रहा है"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"इस टेबलेट का इंटरनेट कनेक्‍शन 1 उपकरण से शेयर किया जा रहा है"</string>
@@ -1011,13 +1011,13 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"अधिक बैटरी उपयोग"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"कम बैटरी उपयोग"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"स्थान मोड"</string>
-    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"स्थान निर्धारित करने के लिए GPS, Wi-Fi, और मोबाइल नेटवर्क का उपयोग करें"</string>
-    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"स्थान निर्धारित करने के लिए Wi-Fi और मोबाइल नेटवर्क का उपयोग करें"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"स्थान निर्धारित करने के लिए GPS, वाई-फ़ाई , और मोबाइल नेटवर्क का उपयोग करें"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"स्थान निर्धारित करने के लिए वाई-फ़ाई  और मोबाइल नेटवर्क का उपयोग करें"</string>
     <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"अपना स्थान निर्धारित करने के लिए GPS का उपयोग करें"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"पुनर्प्राप्त किया जा रहा है…"</string>
-    <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi और मोबाइल नेटवर्क स्थान"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"वाई-फ़ाई  और मोबाइल नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"आपके स्थान का तेज़ अनुमान लगाने हेतु, ऐप्स को Google की स्थानीय सेवा का उपयोग करने दें. अज्ञात स्थानीय डेटा एकत्रित करके Google को भेजा जाएगा."</string>
-    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi द्वारा निर्धारित किया गया स्‍थान"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"वाई-फ़ाई  द्वारा निर्धारित किया गया स्‍थान"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS उपग्रह"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"आपके स्थान का पता लगाने के लिए, ऐप्स  को आपके टेबलेट पर GPS का उपयोग करने दें"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"आपके स्थान का पता लगाने के लिए, ऐप्स  को आपके फ़ोन पर GPS का उपयोग करने दें"</string>
@@ -1098,7 +1098,7 @@
     <string name="verify_applications_summary" msgid="6737505521913263792">"हानि पहुंचा सकने वाले ऐप्स  का इंस्टॉलेशन अस्वीकार करें या पहले चेतावनी दें"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"अतिरिक्त सेटिंग"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"अधिक सेटिंग विकल्‍प सक्षम करें"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"ऐप्स जानकारी"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"ऐप्स की जानकारी"</string>
     <string name="storage_label" msgid="8700867073480107253">"संग्रहण"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"डिफ़ॉल्‍ट रूप से लॉन्‍च करें"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"डिफ़ॉल्‍ट"</string>
@@ -1108,7 +1108,7 @@
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"कैश साफ़ करें"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"कैश"</string>
     <string name="controls_label" msgid="7611113077086853799">"नियंत्रण"</string>
-    <string name="force_stop" msgid="7435006169872876756">"बंद करना बाध्‍य करें"</string>
+    <string name="force_stop" msgid="7435006169872876756">"बलपूर्वक रोकें"</string>
     <string name="total_size_label" msgid="1048676419552557254">"कुल"</string>
     <string name="application_size_label" msgid="8494609207373874267">"ऐप्स"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"USB संग्रहण ऐप्स"</string>
@@ -1190,7 +1190,7 @@
     <string name="app_forward_locked" msgid="6331564656683790866">"ऐप्स की प्रति नहीं बनाई जा सकती."</string>
     <string name="invalid_location" msgid="2786030127356312746">"इंस्‍टॉल स्‍थान मान्‍य नहीं है."</string>
     <string name="system_package" msgid="6222593098063037137">"सिस्‍टम के बारे में नई जानकारी बाहरी मीडिया से नहीं हटाया जा सकता."</string>
-    <string name="force_stop_dlg_title" msgid="977530651470711366">"बलपूर्वक बंद करें?"</string>
+    <string name="force_stop_dlg_title" msgid="977530651470711366">"बलपूर्वक रोकें?"</string>
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"यदि आप किसी ऐप्स को बलपूर्वक रोकते हैं, तो यह गलत व्यवहार कर सकता है."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"ऐप्स  नहीं ले जाया जा सका. <xliff:g id="REASON">%1$s</xliff:g>"</string>
@@ -1271,7 +1271,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"स्‍विच करने हेतु, Control-Spacebar दबाएं"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"सामान्य"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"कीबोर्ड लेआउट"</string>
-    <string name="user_dict_settings_title" msgid="3427169369758733521">"व्यक्तिगत शब्दकोश"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"निजी शब्दकोश"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"जोड़ें"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"शब्‍दकोश में जोड़ें"</string>
@@ -1332,8 +1332,8 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"बग रिपोर्ट लेने के लिए पावर मेनू में विकल्‍प शामिल करें"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"सचेत रहें"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"चार्ज होने के दौरान स्‍क्रीन कभी निष्‍क्रिय नहीं होगी"</string>
-    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI स्‍नूप लॉग सक्षम करें"</string>
-    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"फ़ाइल के सभी Bluetooth HCI पैकेट कैप्‍चर करें"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"ब्लूटूथ HCI स्‍नूप लॉग सक्षम करें"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"फ़ाइल के सभी ब्लूटूथ HCI पैकेट कैप्‍चर करें"</string>
     <string name="select_runtime_title" msgid="649783802363155346">"रनटाइम चुनें"</string>
     <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>
@@ -1381,7 +1381,7 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"सेवाएं"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"सिस्‍टम"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"कैप्शन"</string>
-    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"आवर्धन जेस्चर"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"अपने हिसाब से स्क्रिन बड़ा करें"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"इस सुविधा के चालू होने पर, आप स्क्रीन को तीन बार टैप करके ज़ूम इन और आउट कर सकते हैं.\n\nज़ूम इन होने पर, आप निम्न कार्य कर सकते हैं:\n"<ul><li>"पैन करना: स्क्रीन पर दो या अधिक अंगुलियों को खींचें."</li>\n<li>"ज़ूम स्तर एडजस्ट करना: दो या अधिक अंगुलियों को साथ में पिंच करें या उन्हें दूर फैलाएं."</li></ul>\n\n"आप तीन बार टैप करके और टैप किया हुआ रखकर, अपनी अंगुलियों के नीचे की सामग्री को अस्थायी रूप से आवर्धित भी कर सकते हैं. इस आवर्धित स्थिति में, आप स्क्रीन के विभिन्न भागों को एक्सप्लोर करने के लिए अपनी अंगुलियों को खींच सकते हैं. अपनी पूर्व स्थिति में पहुंचने के लिए अपनी अंगुली को उठाएं.\n\nध्यान दें: आवर्धन कार्यों के लिए कीबोर्ड और मार्गदर्शक बार को छोड़कर कहीं भी तीन बार टैप करें."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"आसान तरीका शॉर्टकट"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"चालू"</string>
@@ -1431,7 +1431,7 @@
     <string name="disable_service_message" msgid="2012273739481042318">"ठीक स्‍पर्श करने से <xliff:g id="SERVICE">%1$s</xliff:g> बंद हो जाएगी."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"कोई सेवा इंस्‍टॉल नहीं है"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"किसी स्‍क्रीन रीडर की आवश्‍यकता है?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack नेत्रहीन और कम-दृष्टि वाले उपयोगकर्ताओं के लिए बोलकर फ़ीडबैक प्रदान करता है. क्‍या आप इसे Android Market से निशुल्‍क इंस्‍टॉल करना चाहते हैं?"</string>
+    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack नेत्रहीन और कम-दृष्टि वाले उपयोगकर्ताओं के लिए बोलकर सुझाव प्रदान करता है. क्‍या आप इसे Android Market से निशुल्‍क इंस्‍टॉल करना चाहते हैं?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"कोई विवरण नहीं दिया गया."</string>
     <string name="settings_button" msgid="3006713718908152930">"सेटिंग"</string>
     <string name="print_settings" msgid="4742428530112487843">"प्रिंटिंग"</string>
@@ -1481,8 +1481,8 @@
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"उपकरण सक्रियण समय"</string>
-    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi चालू होने से अब तक का समय"</string>
-    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi चालू होने से अब तक का समय"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"वाई-फ़ाई  चालू होने से अब तक का समय"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"वाई-फ़ाई  चालू होने से अब तक का समय"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"इतिहास विवरण"</string>
     <string name="details_title" msgid="3792801565213935385">"विवरणों का उपयोग करें"</string>
@@ -1491,7 +1491,7 @@
     <string name="packages_subtitle" msgid="4736416171658062768">"शामिल पैकेज"</string>
     <string name="power_screen" msgid="3023346080675904613">"स्क्रीन"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
-    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"ब्लूटूथ"</string>
     <string name="power_cell" msgid="6596471490976003056">"सेल स्‍टैंडबाय"</string>
     <string name="power_phone" msgid="5392641106474567277">"ध्‍वनि कॉल"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"टेबलेट निष्‍क्रिय"</string>
@@ -1500,7 +1500,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU अग्रभाग"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"सचेत रखें"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi चल रहा है"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"वाई-फ़ाई  चल रहा है"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"टेबलेट"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"फ़ोन"</string>
     <string name="usage_type_data_send" msgid="3875198715268918671">"मोबाइल डेटा भेजा गया"</string>
@@ -1511,12 +1511,12 @@
     <string name="usage_type_video" msgid="4295357792078579944">"वीडियो"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"चालू करने का समय"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"बिना किसी सिग्‍नल के समय"</string>
-    <string name="battery_action_stop" msgid="649958863744041872">"बंद करना बाध्‍य करें"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"ऐप्स जानकारी"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"बलपूर्वक रोकें"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"ऐप्स की जानकारी"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"ऐप्स सेटिंग"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"स्‍क्रीन सेटिंग"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Wi‑Fi सेटिंग"</string>
-    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth सेटिंग"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"ब्लूटूथ सेटिंग"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"ध्‍वनि कॉल द्वारा उपयोग की गई बैटरी"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"टेबलेट के निष्‍क्रिय रहने पर उपयोग की गई बैटरी"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"फ़ोन के निष्‍क्रिय रहते समय उपयोग की गई बैटरी"</string>
@@ -1525,10 +1525,10 @@
     <string name="battery_desc_display" msgid="5432795282958076557">"स्क्रीन सेटिंग और बैकलाइट द्वारा उपयोग की गई बैटरी"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"स्‍क्रीन की रोशनी और/या स्‍क्रीन की समयबाह्य अवधि कम करें"</string>
     <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi‑Fi द्वारा उपयोग की गई बैटरी"</string>
-    <string name="battery_sugg_wifi" msgid="3355461362094706957">"जब Wi-Fi का उपयोग नहीं हो रहा हो या वह उपलब्‍ध नहीं हो, तो उसे बंद कर दें"</string>
-    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bluetooth द्वारा उपयोग की गई बैटरी"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"जब आप Bluetooth का उपयोग न कर रहे हों, तो उसे बंद कर दें"</string>
-    <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"किसी दूसरे Bluetooth उपकरण से कनेक्‍ट करने का प्रयास करें"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"जब वाई-फ़ाई  का उपयोग नहीं हो रहा हो या वह उपलब्‍ध नहीं हो, तो उसे बंद कर दें"</string>
+    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"ब्लूटूथ द्वारा उपयोग की गई बैटरी"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"जब आप ब्लूटूथ का उपयोग न कर रहे हों, तो उसे बंद कर दें"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"किसी दूसरे ब्लूटूथ उपकरण से कनेक्‍ट करने का प्रयास करें"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"ऐप्स द्वारा उपयोग की गई बैटरी"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"ऐप्स रोकें या अनइंस्‍टॉल करें"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"बैटरी की बचत मोड चुनें"</string>
@@ -1567,18 +1567,18 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"ध्‍वनि इनपुट और आउटपुट सेटिंग"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"बोलकर खोजें"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android कीबोर्ड"</string>
-    <string name="voice_category" msgid="1430370497125803904">"वाक्"</string>
+    <string name="voice_category" msgid="1430370497125803904">"बोली"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"ध्‍वनि पहचानकर्ता"</string>
     <string name="recognizer_settings_title" msgid="432493301215113154">"बोलकर खोजें"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"\'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\' के लिए सेटिंग"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"पाठ से वाक् सेटिंग"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"पाठ से वाक् आउटपुट"</string>
+    <string name="tts_settings" msgid="8186971894801348327">"पाठ से बोली सेटिंग"</string>
+    <string name="tts_settings_title" msgid="1237820681016639683">"पाठ से बोली आउटपुट"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"हमेशा मेरी सेटिंग का उपयोग करें"</string>
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"नीचे दी गईं डिफ़ॉल्ट सेटिंग ऐप्स सेटिंग को ओवरराइड करती हैं"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"डिफ़ॉल्‍ट सेटिंग"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"डिफ़ॉल्‍ट इंजन"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"बोले गए पाठ के लिए उपयोग किए जाने के लिए वाक् संश्लेषण इंजन सेट करता है"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"वाक् दर"</string>
+    <string name="tts_default_synth_summary" msgid="6482936537135251690">"बोले गए पाठ के लिए उपयोग किए जाने के लिए बोली संश्लेषण इंजन सेट करता है"</string>
+    <string name="tts_default_rate_title" msgid="6030550998379310088">"बोली दर"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"जिस गति से पाठ बोला जाता है"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"पिच"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"बोले गए पाठ के लहजे को प्रभावित करता है"</string>
@@ -1586,17 +1586,17 @@
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"भाषा नहीं चुनी गई है"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"बोले गए पाठ के लिए भाषा-विशिष्ट ध्‍वनि सेट करता है"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"एक उदाहरण सुनें"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"वाक् संश्लेषण का एक संक्षिप्त प्रदर्शन चलाएं"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"बोली संश्लेषण का एक संक्षिप्त प्रदर्शन चलाएं"</string>
     <string name="tts_install_data_title" msgid="4264378440508149986">"ध्‍वनि डेटा इंस्टॉल करें"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"वाक्-संश्लेषण के लिए आवश्‍यक ध्‍वनि डेटा इंस्‍टॉल करें"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"वाक् संश्लेषण के लिए आवश्‍यक ध्‍वनियां पहले ही इंस्‍टॉल कर दी गई हैं"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"बोली-संश्लेषण के लिए आवश्‍यक ध्‍वनि डेटा इंस्‍टॉल करें"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"बोली संश्लेषण के लिए आवश्‍यक ध्‍वनियां पहले ही इंस्‍टॉल कर दी गई हैं"</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"आपकी सेटिंग बदल गई हैं. यह उनके उच्‍चारण के तरीके का उदाहरण है."</string>
     <string name="tts_engine_error" msgid="3305141107104670703">"आपके द्वारा चुना गया इंजन चलाया नहीं जा सकता."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"कॉन्फ़िगर करें"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"अन्‍य इंजन चुनें"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"यह वाक् संश्लेषण इंजन पासवर्ड और क्रेडिट कार्ड नंबर जैसे निजी डेटा समेत आपके द्वारा बोले जाने वाले सभी पाठ को एकत्र कर सकता है. यह <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> इंजन से आता है. इस वाक् संश्लेषण इंजन के उपयोग को सक्षम करें?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"पाठ-से-वाक् आउटपुट के लिए इस भाषा को क्रियाशील नेटवर्क कनेक्शन की आवश्यकता है."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"यह वाक् संश्लेषण का एक उदाहरण है"</string>
+    <string name="tts_engine_security_warning" msgid="8786238102020223650">"यह बोली संश्लेषण इंजन पासवर्ड और क्रेडिट कार्ड नंबर जैसे निजी डेटा समेत आपके द्वारा बोले जाने वाले सभी पाठ को एकत्र कर सकता है. यह <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> इंजन से आता है. इस बोली संश्लेषण इंजन के उपयोग को सक्षम करें?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"पाठ-से-बोली आउटपुट के लिए इस भाषा को क्रियाशील नेटवर्क कनेक्शन की आवश्यकता है."</string>
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"यह बोली संश्लेषण का एक उदाहरण है"</string>
     <string name="tts_status_title" msgid="7268566550242584413">"डिफ़ॉल्ट भाषा स्थिति"</string>
     <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> पूरी तरह से समर्थित है"</string>
     <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> के लिए नेटवर्क कनेक्शन की आवश्यकता है"</string>
@@ -1613,21 +1613,21 @@
     <string name="pico_not_installed" msgid="6266845418419994311">"इंस्‍टॉल नहीं की गई"</string>
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"महिला"</string>
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"पुरुष"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"वाक् संश्लेषण इंजन इंस्‍टॉल किया गया"</string>
+    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"बोली संश्लेषण इंजन इंस्‍टॉल किया गया"</string>
     <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"उपयोग के पहले नया इंजन सक्षम करें."</string>
     <string name="tts_engine_settings_button" msgid="1030512042040722285">"इंजन सेटिंग लॉन्‍च करें"</string>
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"पसंदीदा इंजन"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"सामान्य"</string>
     <string name="gadget_title" msgid="5519037532720577836">"पावर नियंत्रण"</string>
-    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi सेटिंग के बारे में नई जानकारी मिलना"</string>
-    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth सेटिंग में नई जानकारी मिल रही है"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"वाई-फ़ाई  सेटिंग के बारे में नई जानकारी मिलना"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ब्लूटूथ सेटिंग में नई जानकारी मिल रही है"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"चालू"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"बंद"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"चालू हो रहा है"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"बंद हो रहा है"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
-    <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
+    <string name="gadget_bluetooth" msgid="8998572807378694410">"ब्लूटूथ"</string>
     <string name="gadget_location" msgid="2974757497945178165">"स्थान"</string>
     <string name="gadget_sync" msgid="858895763714222152">"समन्वयन करें"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"स्क्रीन की रोशनी <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1672,7 +1672,7 @@
     <string name="backup_data_summary" msgid="708773323451655666">"ऐप्स  डेटा, Wi‑Fi पासवर्ड, और अन्य सेटिंग को Google सर्वर पर सुरक्षित रखें"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"सुरक्षित खाता"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"वर्तमान में कोई भी खाता बैकअप डेटा संग्रहीत नहीं कर रहा है"</string>
-    <string name="auto_restore_title" msgid="5397528966329126506">"स्‍वचालित पुनर्स्थापना"</string>
+    <string name="auto_restore_title" msgid="5397528966329126506">"अपने आप डेटा रिस्टोर करें"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"किसी ऐप्स को पुन: इंस्‍टॉल करने पर, बैकअप ली गई सेटिंग और डेटा पुनर्स्‍थापित करें"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"डेस्‍कटॉप बैकअप पासवर्ड"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"डेस्‍कटॉप पूर्ण बैकअप वर्तमान में सुरक्षित नहीं हैं"</string>
@@ -1681,7 +1681,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"नया पासवर्ड तथा पुष्टि का मिलान नहीं होता है"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"सुरक्षित पासवर्ड सेट करने में विफल रहा"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"अपने Wi-Fi पासवर्ड, बुकमार्क, अन्य सेटिंग और ऐप्स डेटा को सुरक्षित रखें, साथ ही Google सर्वर से सभी प्रतियां मिटाएं?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"अपने वाई-फ़ाई  पासवर्ड, बुकमार्क, अन्य सेटिंग और ऐप्स डेटा को सुरक्षित रखें, साथ ही Google सर्वर से सभी प्रतियां मिटाएं?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"उपकरण की व्‍यवस्‍थापन सेटिंग"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"उपकरण व्‍यवस्‍थापक"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"निष्‍क्रिय करें"</string>
@@ -1697,7 +1697,7 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"सूचनाएं"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"कॉल की रिंगटोन और कंपन"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"सिस्टम"</string>
-    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi-Fi सेटअप"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"वाई-फ़ाई  सेटअप"</string>
     <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Wi‑Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्ट करें"</string>
     <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Wi‑Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्ट हो रहा है…"</string>
     <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Wi‑Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्ट हो गया"</string>
@@ -1722,7 +1722,7 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"कनेक्ट हो रहा है..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"अगले चरण पर जाएं"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP समर्थित नहीं है."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"आप सेटअप के दौरान किसी EAP Wi-Fi कनेक्‍शन को कॉन्‍िफ़गर नहीं कर सकते. सेटअप करने के बाद, आप उसे सेटिंग &gt; वायरलेस और नेटवर्क में कॉन्फ़िगर कर सकते हैं."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"आप सेटअप के दौरान किसी EAP वाई-फ़ाई  कनेक्‍शन को कॉन्‍िफ़गर नहीं कर सकते. सेटअप करने के बाद, आप उसे सेटिंग &gt; वायरलेस और नेटवर्क में कॉन्फ़िगर कर सकते हैं."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"कनेक्‍ट होने में कुछ मिनट लग सकते हैं..."</string>
     <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>
@@ -1830,13 +1830,13 @@
     <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>
+    <string name="show_all_anrs_summary" msgid="641908614413544127">"पृष्ठभूमि ऐप्स हेतु ऐप्स प्रतिसाद नहीं दे रहा डॉयलॉग दिखाएं"</string>
     <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_split_4g" msgid="5322857680792601899">"4G उपयोग अलग करें"</string>
-    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Wi-Fi उपयोग दिखाएं"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"वाई-फ़ाई  उपयोग दिखाएं"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"ईथरनेट उपयोग दिखाएं"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"मोबाइल हॉटस्पॉट"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"स्‍वत: समन्‍वयन डेटा"</string>
@@ -1850,7 +1850,7 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"मोबाइल डेटा सीमा सेट करें"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G डेटा सीमा सेट करें"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-3G डेटा सीमा सेट करें"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Wi-Fi डेटा सीमा सेट करें"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"वाई-फ़ाई  डेटा सीमा सेट करें"</string>
     <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"ईथरनेट"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"मोबाइल"</string>
@@ -1882,9 +1882,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"निर्दिष्ट सीमा तक पहुंचने पर आपका डेटा कनेक्‍शन अक्षम हो जाएगा.\n\nचूंकि डेटा उपयोग को आपके टेबलेट द्वारा मापा जाता है, और आपका कैरियर उपयोग के लिए भिन्‍न तरह से शुल्क ले सकता है, इसलिए सीमित उपयोग पर विचार करें."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"निर्दिष्ट सीमा तक पहुंचने पर आपका डेटा कनेक्‍शन अक्षम हो जाएगा.\n\nचूंकि डेटा उपयोग को आपके फ़ोन द्वारा मापा जाता है, और आपका कैरियर उपयोग के लिए भिन्‍न तरह से शुल्क ले सकता है, इसलिए सीमित उपयोग पर विचार करें."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"पृष्ठभूमि डेटा प्रतिबंधित करें?"</string>
-    <string name="data_usage_restrict_background" msgid="8447934953579275363">"यदि आप पृष्ठभूमि मोबाइल डेटा को प्रतिबंधित करते हैं, तो जब तक आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते, तब तक कुछ ऐप्स  और सेवाएं काम नहीं करेंगी."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"यदि आप पृष्ठभूमि मोबाइल डेटा को प्रतिबंधित करते हैं, तो जब तक आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते, तब तक कुछ ऐप्स  और सेवाएं काम नहीं करेंगी..\n\nयह सेटिंग इस टेबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"यदि आप पृष्ठभूमि मोबाइल डेटा को प्रतिबंधित करते हैं, तो जब तक आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते, तब तक कुछ ऐप्स  और सेवाएं काम नहीं करेंगी.\n\nयह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"यदि आप पृष्ठभूमि मोबाइल डेटा को प्रतिबंधित करते हैं, तो जब तक आप वाई-फ़ाई  नेटवर्क से कनेक्ट नहीं होते, तब तक कुछ ऐप्स  और सेवाएं काम नहीं करेंगी."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"यदि आप पृष्ठभूमि मोबाइल डेटा को प्रतिबंधित करते हैं, तो जब तक आप वाई-फ़ाई  नेटवर्क से कनेक्ट नहीं होते, तब तक कुछ ऐप्स  और सेवाएं काम नहीं करेंगी..\n\nयह सेटिंग इस टेबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"यदि आप पृष्ठभूमि मोबाइल डेटा को प्रतिबंधित करते हैं, तो जब तक आप वाई-फ़ाई  नेटवर्क से कनेक्ट नहीं होते, तब तक कुछ ऐप्स  और सेवाएं काम नहीं करेंगी.\n\nयह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</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">"चेतावनी"</font></string>
     <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">"सीमा"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"निकाले गए ऐप्स"</string>
@@ -1896,8 +1896,8 @@
     <string name="data_usage_metered_title" msgid="6204750602856383278">"मोबाइल हॉटस्पॉट"</string>
     <string name="data_usage_metered_body" msgid="4959032833706695848">"ऐसे WI-Fi नेटवर्क चुनें जो मोबाइल हॉटस्पॉट हैं. पृष्ठभूमि में होने पर एप्ल‍िकेशन को इन नेटवर्क का उपयोग करने से प्रतिबंधित किया जा सकता है. ऐप्स , बड़े डाउनलोड के लिए इन नेटवर्क का उपयोग से पहले चेतावनी भी दे सकते हैं."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"मोबाइल नेटवर्क"</string>
-    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wi-Fi नेटवर्क"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"मोबाइल हॉटस्पॉट चुनने के लिए, Wi-Fi चालू करें."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"वाई-फ़ाई  नेटवर्क"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"मोबाइल हॉटस्पॉट चुनने के लिए, वाई-फ़ाई  चालू करें."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"आपातकालीन कॉल"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"कॉल पर वापस लौटें"</string>
     <string name="vpn_name" msgid="4689699885361002297">"नाम"</string>
@@ -1977,7 +1977,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"उपयोगकर्ता"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"प्रतिबंधित प्रोफ़ाइल"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"नया उपयोगकर्ता जोड़ें"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"आप अतिरिक्त उपयोगकर्ता बनाकर इस उपकरण को अन्य लोगों से साझा कर सकते हैं. प्रत्येक उपयोगकर्ता के पास अपना स्वयं का स्थान होता है, जिसे वह अपने ऐप्स , वॉलपेपर, और ऐसी ही अन्य चीज़ों के साथ कस्टमाइज़ कर सकता है. उपयोगकर्ता Wi-Fi जैसी अन्य टेबलेट सेटिंग भी एडजस्ट कर सकते हैं जो सभी को प्रभावित करती है.\n\nआपके द्वारा नया उपयोगकर्ता बनाने के बाद, उस व्यक्ति को सेटअप प्रक्रिया से गुज़रना आवश्यक है.\n\nकोई भी उपयोगकर्ता अन्य सभी उपयोगकर्ताओं की ओर से ऐप्स  अनुमतियों के नई जानकारी को स्वीकार कर सकता है."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"आप अतिरिक्त उपयोगकर्ता बनाकर इस उपकरण को अन्य लोगों से साझा कर सकते हैं. प्रत्येक उपयोगकर्ता के पास अपना स्वयं का स्थान होता है, जिसे वह अपने ऐप्स , वॉलपेपर, और ऐसी ही अन्य चीज़ों के साथ कस्टमाइज़ कर सकता है. उपयोगकर्ता वाई-फ़ाई  जैसी अन्य टेबलेट सेटिंग भी एडजस्ट कर सकते हैं जो सभी को प्रभावित करती है.\n\nआपके द्वारा नया उपयोगकर्ता बनाने के बाद, उस व्यक्ति को सेटअप प्रक्रिया से गुज़रना आवश्यक है.\n\nकोई भी उपयोगकर्ता अन्य सभी उपयोगकर्ताओं की ओर से ऐप्स  अनुमतियों के नई जानकारी को स्वीकार कर सकता है."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"आपके द्वारा नया उपयोगकर्ता बनाने के बाद, उस व्यक्ति को सेटअप प्रक्रिया से गुज़रना आवश्यक है.\n\nकोई भी उपयोगकर्ता अन्य सभी उपयोगकर्ताओं की ओर से ऐप्स  अनुमतियों के नई जानकारी को स्वीकार कर सकता है."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"उपयोगकर्ता को अभी सेट करें?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"सुनिश्चित करें कि व्यक्ति टेबलेट लेने और अपना स्थान सेट करने के लिए उपलब्ध है"</string>
@@ -2034,8 +2034,8 @@
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"यह ऐप्स  आपके खातों को एक्सेस कर सकता है"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi और मोबाइल"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Wi‑Fi और मोबाइल सेटिंग में बदलाव की अनुमति दें"</string>
-    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
-    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Bluetooth युग्‍मन और सेटिंग में बदलाव की अनुमति दें"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"ब्लूटूथ"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"ब्लूटूथ युग्‍मन और सेटिंग में बदलाव की अनुमति दें"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"जब टेबलेट अन्य उपकरण को स्पर्श करे तो डेटा विनिमय करने दें"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"जब फ़ोन अन्य उपकरण को स्पर्श करे तो डेटा विनिमय करने दें"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 340b08e87e..e2f2504ddf 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -40,7 +40,7 @@
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Ehhez ki kell kapcsolni a csevegés regisztrációját"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Ite ramlista bekapcsolása"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Ite ramlista kikapcsolása"</string>
-    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM-kártya telefonkönyvének megtekintése"</string>
+    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM kártya telefonkönyvének megtekintése"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Fix hívószámok megtekintése"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Szolgáltatásszámok megtekintése"</string>
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"PDP-lista lekérése"</string>
@@ -324,7 +324,7 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Profiladatok"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Tartózkodási hely"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Biztonság"</string>
-    <string name="security_settings_summary" msgid="967393342537986570">"Saját pozíció beállítása, képernyőzár feloldása, SIM-kártya zárolása, hitelesítési adatok tárolójának zárolása"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Saját pozíció beállítása, képernyőzár feloldása, SIM kártya zárolása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Saját pozíció beállítása, képernyőzár feloldása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Jelszavak"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Titkosítás"</string>
@@ -761,27 +761,27 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatikus fényerő"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Betűméret"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Betűméret"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kártya lezárási beállításai"</string>
-    <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM-kártya zárolásának beállítása"</string>
-    <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kártya zárolása"</string>
-    <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM-kártya lezárása"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kártya lezárási beállításai"</string>
+    <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM kártya zárolásának beállítása"</string>
+    <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM kártya zárolása"</string>
+    <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM kártya lezárása"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"PIN kód kérése a táblagép használatához"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"PIN-kód kérése a telefon használatához"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"PIN kód kérése a táblagép használatához"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"PIN-kód kérése a telefon használatához"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"SIM-kártya PIN-kódjának módosítása"</string>
-    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM-kártya PIN-kódja"</string>
-    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM-kártya lezárása"</string>
-    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"SIM-kártya feloldása"</string>
-    <string name="sim_enter_old" msgid="6074196344494634348">"SIM-kártya régi PIN-kódja"</string>
-    <string name="sim_enter_new" msgid="8742727032729243562">"Új PIN-kód a SIM-kártyához"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"SIM kártya PIN kódjának módosítása"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM kártya PIN kódja"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM kártya lezárása"</string>
+    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"SIM kártya feloldása"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"SIM kártya régi PIN kódja"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"Új PIN kód a SIM kártyához"</string>
     <string name="sim_reenter_new" msgid="3178510434642201544">"Írja be újra az új PIN-kódot"</string>
-    <string name="sim_change_pin" msgid="7328607264898359112">"SIM-kártya PIN-kódja"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"SIM kártya PIN kódja"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Helytelen PIN kód"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"A PIN kódok nem egyeznek"</string>
     <string name="sim_change_failed" msgid="304964924772218382">"Nem lehet megváltoztatni a PIN kódot.\nLehet, hogy hibás a PIN kód."</string>
-    <string name="sim_change_succeeded" msgid="8556135413096489627">"A SIM-kártya PIN-kódja sikeresen módosításra került"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Nem lehet megváltoztatni a SIM-kártya zárolási állapotát.\nLehet, hogy hibás a PIN kód."</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"A SIM kártya PIN kódja sikeresen módosításra került"</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Nem lehet megváltoztatni a SIM kártya zárolási állapotát.\nLehet, hogy hibás a PIN kód."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Mégse"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Helytelen PIN kód a SIM kártyához; vegye fel a kapcsolatot szolgáltatójával az eszköz feloldásához."</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 20d2aaa051..d8535cda40 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -279,8 +279,8 @@
     <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>
-    <string name="roaming_enable" msgid="3737380951525303961">"Միանալ տվյալների ծառայություններին ռոումինգում գտնվելիս"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Միանալ տվյալների ծառայություններին ռոումինգում գտնվելիս"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Միանալ տվյալների փոխանցման ծառայություններին ռոումինգում գտնվելիս"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Միանալ տվյալների փոխանցման ծառայություններին ռոումինգում գտնվելիս"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Դուք կորցրել եք տվյալների կապը, քանի որ անջատված եք թողել ձեր գլխավոր ցանցի տվյալների ռոումինգը:"</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Միացնել"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Երբ դուք թույլատրում եք տվյալների ռոումինգ, հնարավոր է` ձեզնից գանձվեն զգալի ռոումիգային միջնորդավճարներ:"</string>
@@ -764,23 +764,23 @@
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM քարտի կողպման կարգավորումներ"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Կարգավորել SIM քարտի կողպումը"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM քարտի կողպում"</string>
-    <string name="sim_pin_toggle" msgid="1742123478029451888">"Կողպել SIM քարտը"</string>
+    <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM-քարտի կողպում"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Գրասալիկը օգտագործելու համար PIN է պահանջվում"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Հեռախոսն օգտագործելու համար PIN է անհրաժեշտ"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Գրասալիկն օգտագործելու համար PIN է պահանջվում"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Հեռախոսն օգտագործելու համար PIN է անհրաժեշտ"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"Փոխել SIM-ի PIN-ը"</string>
-    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM-Õ« PIN-Õ¨"</string>
-    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Կողպել SIM քարտը"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"Փոխել SIM-քարտի PIN-կոդը"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM-քարտի PIN-կոդը"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM-քարտի կողպում"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Ապակողպել SIM քարտը"</string>
-    <string name="sim_enter_old" msgid="6074196344494634348">"Հին SIM-ի PIN-ը"</string>
-    <string name="sim_enter_new" msgid="8742727032729243562">"Նոր SIM-ի PIN-ը"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"Հին SIM-քարտի PIN-կոդը"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"Նոր SIM-քարտի PIN-կոդը"</string>
     <string name="sim_reenter_new" msgid="3178510434642201544">"Նորից մուտքագրեք նոր PIN-ը"</string>
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Սխալ PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-երը չեն համընկնում"</string>
     <string name="sim_change_failed" msgid="304964924772218382">"Չհաջողվեց փոխել PIN-ը:\nՀնարավոր է` PIN-ը սխալ է:"</string>
-    <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-ի PIN-ը հաջողությամբ փոխվել է"</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-քարտի PIN-կոդը հաջողությամբ փոխվել է"</string>
     <string name="sim_lock_failed" msgid="5651596916127873626">"Հնարավոր չէ բացել SIM քարտի կողպված կարգավիճակը:\nՀնարավոր է` սխալ PIN է մուտքագրվել:"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Ô¼Õ¡Õ¾"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Չեղարկել"</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 03649051bc..85e30b6cdb 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -424,7 +424,7 @@
     <item msgid="3191973083884253830">"Tidak ada"</item>
     <item msgid="9089630089455370183">"Logcat"</item>
     <item msgid="5397807424362304288">"Systrace (Grafis)"</item>
-    <item msgid="1340692776955662664">"Panggil tumpukan di glGetError"</item>
+    <item msgid="1340692776955662664">"Telepon tumpukan di glGetError"</item>
   </string-array>
   <string-array name="show_non_rect_clip_entries">
     <item msgid="993742912147090253">"Nonaktif"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index ee3f70ee6d..5f0ade4b2b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -59,7 +59,7 @@
     <string name="radioInfo_data_suspended" msgid="5315325487890334196">"Ditangguhkan"</string>
     <string name="radioInfo_unknown" msgid="737385314432468266">"tak diketahui"</string>
     <string name="radioInfo_display_packets" msgid="8654359809877290639">"pkts"</string>
-    <string name="radioInfo_display_bytes" msgid="4018206969492931883">"byte"</string>
+    <string name="radioInfo_display_bytes" msgid="4018206969492931883">"bita"</string>
     <string name="radioInfo_display_dbm" msgid="3621221793699882781">"dBm"</string>
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
@@ -243,7 +243,7 @@
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Berhasil"</string>
     <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Perubahan diberlakukan ketika kabel USB tersambung kembali."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Aktifkan penyimpanan massal USB"</string>
-    <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Total byte:"</string>
+    <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Total bita:"</string>
     <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Penyimpanan USB tidak dipasang."</string>
     <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Tidak ada kartu SD."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Byte tersedia:"</string>
@@ -298,7 +298,7 @@
     <string name="zone_auto" msgid="334783869352026648">"Zona waktu otomatis"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Gunakan zona waktu yang disediakan jaringan"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Gunakan zona waktu yang disediakan jaringan"</string>
-    <string name="date_time_24hour" msgid="1193032284921000063">"Gunakan format 24-jam"</string>
+    <string name="date_time_24hour" msgid="1193032284921000063">"Gunakan format 24 jam"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Setel waktu"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Pilih zona waktu"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Setel tanggal"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 9af5346eea..a9db22cd17 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -274,7 +274,7 @@
     <item msgid="7136963238377062018">"volume voce"</item>
     <item msgid="4270236897655923007">"volume suoneria"</item>
     <item msgid="6325739889222559394">"volume contenuti multimediali"</item>
-    <item msgid="5762123934816216821">"volume allarme"</item>
+    <item msgid="5762123934816216821">"volume sveglia"</item>
     <item msgid="785049718065337473">"volume notifiche"</item>
     <item msgid="6700305533746877052">"volume bluetooth"</item>
     <item msgid="2029227495214047094">"mantieni attivo"</item>
@@ -319,7 +319,7 @@
     <item msgid="5660213838861789350">"Volume voce"</item>
     <item msgid="7983336752371254444">"Volume suoneria"</item>
     <item msgid="7878027809189330917">"Volume contenuti multimediali"</item>
-    <item msgid="7260546305036218513">"Volume allarme"</item>
+    <item msgid="7260546305036218513">"Volume sveglia"</item>
     <item msgid="9103719301075748925">"Volume notifiche"</item>
     <item msgid="7025966722295861512">"Volume Bluetooth"</item>
     <item msgid="4665183401128289653">"Mantieni attivo"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a37f4c0406..a70eb2ba2a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -701,7 +701,7 @@
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Suono di notifica predefinito"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Applicazioni multimediali"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Imposta il volume di musica e video"</string>
-    <string name="alarm_volume_title" msgid="2285597478377758706">"Allarme"</string>
+    <string name="alarm_volume_title" msgid="2285597478377758706">"Sveglia"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Impostazioni audio per dock collegato"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Toni tastierino"</string>
     <string name="sound_effects_enable_title" msgid="1171590821131077296">"Suoni alla pressione"</string>
@@ -711,11 +711,11 @@
     <string name="volume_media_description" msgid="7949355934788807863">"Musica, video, giochi e altri contenuti multimediali"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"Suoneria e notifiche"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"Notifiche"</string>
-    <string name="volume_alarm_description" msgid="8322615148532654841">"Allarmi"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Sveglie"</string>
     <string name="volume_ring_mute" msgid="3018992671608737202">"Disattiva audio suoneria e notifiche"</string>
     <string name="volume_media_mute" msgid="3399059928695998166">"Disattiva audio musica e altri contenuti multimediali"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Disattiva audio notifiche"</string>
-    <string name="volume_alarm_mute" msgid="4452239420351035936">"Disattiva audio allarmi"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Disattiva audio sveglie"</string>
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrazione quando squilla"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dock"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Impostazioni dock"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 33164beb6e..d87afd7c89 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1778,7 +1778,7 @@
     <string name="misc_files" msgid="6720680815969643497">"קובצי \'שונות\'"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"נבחרו <xliff:g id="NUMBER">%1$d</xliff:g> מתוך <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> מתוך <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="select_all" msgid="1562774643280376715">"בחר הכול"</string>
+    <string name="select_all" msgid="1562774643280376715">"בחר הכל"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"‏בדיקת HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"‏הגדר אופן בדיקת HDCP"</string>
     <string name="debug_debugging_category" msgid="6781250159513471316">"ניקוי באגים"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 0e4d7d1e52..7916b8e327 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -766,9 +766,9 @@
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM ბარათის დაბლოკვა"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM ბარათის დაბლოკვა"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"პლანშეტთან წვდომისთვის მოითხოვე PIN კოდი"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"ტელეფონზე წვდომისთვის მოთხოვნილი იქნას PIN-კოდი"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"ტელეფონზე წვდომისთვის PIN-ის მოთხოვნა"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"ტაბლეტზე წვდომისთვის მოთხოვნილი იქნას PIN-კოდი"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"ტელეფონზე წვდომისთვის მოთხოვნილი იქნას PIN-ი"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"ტელეფონზე წვდომისთვის PIN-ის მოთხოვნა"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"SIM-ის  PIN-ის შეცვლა"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM-ბარათის PIN-კოდი"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM ბარათის დაბლოკვა"</string>
diff --git a/res/values-km-rKH/arrays.xml b/res/values-km-rKH/arrays.xml
index 4ca5cf85c1..52af7c3b2e 100644
--- a/res/values-km-rKH/arrays.xml
+++ b/res/values-km-rKH/arrays.xml
@@ -129,7 +129,7 @@
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ប៊ូតុង​ចុច"</item>
-    <item msgid="1624323946324499595">"កូដ PIN ពី​ឧបករណ៍​"</item>
+    <item msgid="1624323946324499595">"កូដ PIN ពី​ឧបករណ៍"</item>
     <item msgid="5366790421523328066">"កូដ PIN ពី​ឧបករណ៍​នេះ"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
@@ -147,7 +147,7 @@
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ខ្សោយ"</item>
-    <item msgid="5615082285463430971">"មធ្យម​"</item>
+    <item msgid="5615082285463430971">"មធ្យម"</item>
     <item msgid="3565079809875324621">"ល្អ"</item>
     <item msgid="5702329417707689835">"ល្អ​ណាស់"</item>
   </string-array>
@@ -227,10 +227,10 @@
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"ឧបករណ៍​ផ្ទុក​ខាង​ក្នុង"</item>
     <item msgid="3738430123799803530">"កាត​អេសឌី​​ដែល​អាច​ដក​បាន"</item>
-    <item msgid="4498124044785815005">"ឲ្យ​ប្រព័ន្ធ​សម្រេចចិត្ត​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​"</item>
+    <item msgid="4498124044785815005">"ឲ្យ​ប្រព័ន្ធ​សម្រេចចិត្ត"</item>
   </string-array>
   <string-array name="app_ops_categories">
-    <item msgid="6358963769537892925">"ទី​តាំង​"</item>
+    <item msgid="6358963769537892925">"ទី​តាំង"</item>
     <item msgid="255608127647030286">"ផ្ទាល់ខ្លួន"</item>
     <item msgid="4588829735729884491">"ការ​ផ្ញើ​សារ"</item>
     <item msgid="886742181977884584">"មេឌៀ"</item>
@@ -271,7 +271,7 @@
     <item msgid="5124443975763747838">"ប៊ូតុង​មេឌៀ"</item>
     <item msgid="4547883971364273343">"ការ​ផ្ដោត​សំឡេង"</item>
     <item msgid="2603878814882344450">"កម្រិត​សំឡេង​មេ"</item>
-    <item msgid="7136963238377062018">"កម្រិត​សំឡេង​​"</item>
+    <item msgid="7136963238377062018">"កម្រិត​សំឡេង"</item>
     <item msgid="4270236897655923007">"កម្រិត​សំឡេង​រោទ៍"</item>
     <item msgid="6325739889222559394">"កម្រិត​សំឡេង​មេឌៀ"</item>
     <item msgid="5762123934816216821">"កម្រិត​សំឡេង​រោទ៍"</item>
@@ -282,9 +282,9 @@
     <item msgid="5753382310468855812">"​ពិនិត្យ​ទីតាំង​ថាមពល​​ខ្ពស់"</item>
   </string-array>
   <string-array name="app_ops_labels">
-    <item msgid="6602854600289714121">"ទី​តាំង​"</item>
-    <item msgid="8677040780775113033">"ទី​តាំង​"</item>
-    <item msgid="1660743989948992916">"ទី​តាំង​"</item>
+    <item msgid="6602854600289714121">"ទី​តាំង"</item>
+    <item msgid="8677040780775113033">"ទី​តាំង"</item>
+    <item msgid="1660743989948992916">"ទី​តាំង"</item>
     <item msgid="8791172739860195290">"ញ័រ"</item>
     <item msgid="383413555642128046">"អាន​ទំនាក់ទំនង"</item>
     <item msgid="3654594895269697313">"កែ​ទំនាក់ទំនង"</item>
@@ -292,13 +292,13 @@
     <item msgid="6248591205254641116">"កែ​បញ្ជី​ហៅ"</item>
     <item msgid="6093344633066170692">"អាន​ប្រតិទិន"</item>
     <item msgid="1334886368750347692">"កែ​ប្រតិទិន"</item>
-    <item msgid="1638204101698708656">"ទី​តាំង​"</item>
+    <item msgid="1638204101698708656">"ទី​តាំង"</item>
     <item msgid="2154671955760380322">"ប្រកាស​ការ​ជូន​ដំណឹង"</item>
-    <item msgid="4282477730595931828">"ទី​តាំង​"</item>
+    <item msgid="4282477730595931828">"ទី​តាំង"</item>
     <item msgid="4891423912898525905">"ហៅ​ទូរស័ព្ទ"</item>
     <item msgid="2623604824935968113">"អាន​សារ SMS/MMS"</item>
     <item msgid="4420177125221176306">"សរសេរ​សារ SMS/MMS"</item>
-    <item msgid="3986142739951490025">"ទទួល SMS/MMS​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​"</item>
+    <item msgid="3986142739951490025">"ទទួល SMS/MMS"</item>
     <item msgid="3984213795861739778">"ទទួល SMS/MMS"</item>
     <item msgid="3656243523752472788">"ទទួល SMS/MMS"</item>
     <item msgid="8105802370238551510">"ទទួល SMS/MMS"</item>
@@ -323,8 +323,8 @@
     <item msgid="9103719301075748925">"កម្រិត​សំឡេង​ការ​ជូន​ដំណឹង"</item>
     <item msgid="7025966722295861512">"កម្រិត​សំឡេង​ប៊្លូធូស"</item>
     <item msgid="4665183401128289653">"មិន​ដេក"</item>
-    <item msgid="8584357129746649222">"ទី​តាំង​"</item>
-    <item msgid="7669257279311110599">"ទី​តាំង​"</item>
+    <item msgid="8584357129746649222">"ទី​តាំង"</item>
+    <item msgid="7669257279311110599">"ទី​តាំង"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"ខ្លី"</item>
@@ -464,7 +464,7 @@
     <item msgid="6692305604213080515">"កំពុង​​ចាប់ផ្ដើម…"</item>
     <item msgid="8001704909356800092">"កំពុង​ត​ភ្ជាប់​…"</item>
     <item msgid="4039737283841672166">"បាន​តភ្ជាប់"</item>
-    <item msgid="4042143101664725090">"អស់​​ពេល​"</item>
+    <item msgid="4042143101664725090">"អស់​​ពេល"</item>
     <item msgid="7664124146786465092">"មិន​ជោគជ័យ"</item>
   </string-array>
   <string-array name="security_settings_premium_sms_values">
@@ -476,6 +476,6 @@
     <item msgid="7088762389498381203">"ធម្មតា"</item>
     <item msgid="4517779899383204000">"សម្របសម្រួល"</item>
     <item msgid="406385694840950802">"ទាប"</item>
-    <item msgid="4212263919458209842">"សំខាន់​"</item>
+    <item msgid="4212263919458209842">"សំខាន់"</item>
   </string-array>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 73747c9482..34438345d1 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -71,7 +71,7 @@
     <string name="small_font" msgid="2295331917424072635">"តូច"</string>
     <string name="medium_font" msgid="2068475425515133701">"ឧបករណ៍​ផ្ទុក"</string>
     <string name="large_font" msgid="599055175160971446">"ធំ"</string>
-    <string name="font_size_save" msgid="3450855718056759095">"យល់​ព្រម​"</string>
+    <string name="font_size_save" msgid="3450855718056759095">"យល់​ព្រម"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"កាត​អេសឌី"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"ស្ថានភាព​ថ្ម៖"</string>
@@ -196,7 +196,7 @@
     <string name="proxy_hostname_label" msgid="8490171412999373362">"ឈ្មោះ​ម៉ាស៊ីន​ប្រូកស៊ី"</string>
     <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"ប្រយ័ត្ន"</string>
-    <string name="proxy_error_dismiss" msgid="4993171795485460060">"យល់​ព្រម​"</string>
+    <string name="proxy_error_dismiss" msgid="4993171795485460060">"យល់​ព្រម"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"ឈ្មោះ​ម៉ាស៊ីន​ដែល​អ្នក​បាន​បញ្ចូល​មិន​ត្រឹមត្រូវ។"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"បញ្ជី​ដកចេញ​ដែល​អ្នក​បាន​បញ្ចូល​មិន​មាន​ទ្រង់ទ្រាយ​ត្រឹមត្រូវ។ សូម​បញ្ចូល​បញ្ជី​ដែន​​​ដ​ក​ចេញ​បំបែក​ដោយ​សញ្ញា​ក្បៀស។"</string>
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"អ្នក​ត្រូវ​តែ​បំពេញ​វាល​ច្រក។"</string>
@@ -259,7 +259,7 @@
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី​បាន​ភ្ជាប់​បាន​តែ​អាន"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"កាត​អេសឌី​​បាន​ភ្ជាប់​បាន​តែ​អាន"</string>
     <string name="skip_label" msgid="47510779345218297">"រំលង"</string>
-    <string name="next_label" msgid="4693520878012668114">"បន្ទាប់​"</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="device_info_label" msgid="6551553813651711205">"ព័ត៌មាន​ឧបករណ៍"</string>
@@ -270,7 +270,7 @@
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"ឧបករណ៍​ផ្ទុក​​យូអេសប៊ី"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"កាត​អេសឌី"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"ការ​កំណត់​ប្រូកស៊ី"</string>
-    <string name="cancel" msgid="6859253417269739139">"បោះ​បង់​"</string>
+    <string name="cancel" msgid="6859253417269739139">"បោះ​បង់"</string>
     <string name="settings_label" msgid="1626402585530130914">"ការ​កំណត់"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"ការ​កំណត់"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"កំណត់​ផ្លូវកាត់"</string>
@@ -299,9 +299,9 @@
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"ប្រើ​តំបន់​ពេលវេលា​បាន​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"ប្រើ​តំបន់​ពេលវេលា​បាន​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"ប្រើ​ទ្រង់ទ្រាយ ២៤ ម៉ោង"</string>
-    <string name="date_time_set_time" msgid="5716856602742530696">"កំណត់​ម៉ោង​"</string>
+    <string name="date_time_set_time" msgid="5716856602742530696">"កំណត់​ម៉ោង"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"ជ្រើស​តំបន់​ពេលវេលា"</string>
-    <string name="date_time_set_date" msgid="7021491668550232105">"កំណត់​កាល​បរិច្ឆេទ​"</string>
+    <string name="date_time_set_date" msgid="7021491668550232105">"កំណត់​កាល​បរិច្ឆេទ"</string>
     <string name="date_time_date_format" msgid="6951498879879281102">"ជ្រើស​ទ្រង់ទ្រាយ​កាល​បរិច្ឆេទ"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"តម្រៀប​តាម​អក្សរក្រម"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"តម្រៀប​តាម​តំបន់​ពេល​វេលា"</string>
@@ -322,7 +322,7 @@
     <string name="user_info_settings_title" msgid="1195015434996724736">"ព័ត៌មាន​អ្នកប្រើ"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"បង្ហាញ​ព័ត៌មាន​​ប្រវត្តិរូប​លើ​អេក្រង់ចាក់សោ"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"ព័ត៌មាន​ប្រវត្តិរូប"</string>
-    <string name="location_settings_title" msgid="1369675479310751735">"ទី​តាំង​"</string>
+    <string name="location_settings_title" msgid="1369675479310751735">"ទី​តាំង"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"សុវត្ថិភាព"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"កំណត់​ទីតាំង​របស់​ខ្ញុំ ដោះ​សោ​អេក្រង់ ចាក់​សោ​ស៊ីម​កាត ចាក់​សោ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"កំណត់​ទីតាំង​ខ្ញុំ, ការ​ដោះ​សោ​អេក្រង់, សោ​ឧបករណ៍​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
@@ -330,8 +330,8 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ការ​ដាក់​លេខ​កូដ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ដាក់​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ដាក់​លេខ​កូដ​ទូរស័ព្ទ"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"ទាមទារ​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់ ដើម្បី​ដោះ​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ​​របស់​អ្នក​រាល់​ពេល​​បើក​"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"ទាមទារ​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់ ដើម្បី​ដោះ​លេខ​កូដ​ទូរស័ព្ទ​របស់​អ្នក​រាល់​ពេល​​បើក​"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"ទាមទារ​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់ ដើម្បី​ដោះ​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ​​របស់​អ្នក​រាល់​ពេល​​បើក"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"ទាមទារ​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់ ដើម្បី​ដោះ​លេខ​កូដ​ទូរស័ព្ទ​របស់​អ្នក​រាល់​ពេល​​បើក"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"បាន​ដាក់លេខ​កូដ"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"អ្នក​អាច​ដាក់​លេខ​កូដ​គណនី ការ​កំណត់ កម្មវិធី និង​ទិន្នន័យ​បាន​ទាញ​យក មេឌៀ ​និង​​ឯកសារ​ផ្សេងៗ​របស់​អ្នក។ ពេល​អ្នក​ដាក់​លេខ​កូដ​​កុំព្យូទ័រ​បន្ទះ​​របស់​អ្នក អ្នក​ត្រូវ​តែ​បញ្ចូល​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់​ដើម្បី​ដោះ​លេខ​កូដ​របស់​អ្នក​​រាល់​ពេល​ចាប់ផ្ដើម​៖​ អ្នក​មិន​អាច​ដោះ​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ​​​របស់​អ្នក​បាន​​ទេ លើកលែង​តែ​អនុវត្ត​ការ​កំណត់​ទិន្នន័យ​ដូច​ចេញ​ពី​រោងចក្រ ដោយ​លុប​ទិន្នន័យ​របស់​អ្នក​ទាំងអស់។\n\nការ​​ដាក់លេខ​កូដ​ចំណាយ​ពេល​​មួយ​ម៉ោង។ អ្នក​ត្រូវ​បញ្ចូល​ថ្ម​ និង​ដោត​ជាប់​រហូត​ដល់​ពេល​ការ​ដាក់​លេខ​កូដ​បាន​បញ្ចប់។ បើ​អ្នក​ផ្អាក​ដំណើរការ​ដាក់​លេខ​កូដ​ អ្នក​នឹង​បាត់បង់​ទិន្នន័យ​មួយ​ចំនួន ឬ​ទាំង​អស់​របស់​អ្នក។"</string>
     <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"អ្នក​អាច​ដាក់​លេខ​កូដ​​គណនី ការ​កំណត់ កម្មវិធី និង​ទិន្នន័យ​បាន​ទាញ​យក មេឌៀ និង​​ឯកសារ​ផ្សេងៗ​របស់​អ្នក។ ពេល​អ្នក​ដាក់​លេខ​កូដ​ទូរស័ព្ទ​របស់​អ្នក អ្នក​ត្រូវ​តែ​បញ្ចូល​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់​ដើម្បី​ដោះ​លេខ​កូដ​របស់​អ្នក​​រាល់​ពេល​ចាប់ផ្ដើម​៖ អ្នក​មិន​អាច​ដោះ​លេខ​កូដ​ទូរស័ព្ទ​របស់​អ្នក​បាន​​ទេ លើកលែង​តែ​អនុវត្ត​ការ​កំណត់​ទិន្នន័យ​ដូច​ចេញ​ពី​រោងចក្រ ដោយ​លុប​ទិន្នន័យ​របស់​អ្នក​ទាំងអស់។\n\nការ​​ដាក់លេខ​កូដ​ចំណាយ​ពេល​​មួយ​ម៉ោង។ អ្នក​ត្រូវ​បញ្ចូល​ថ្ម​ និង​ដោត​ជាប់​រហូត​ដល់​ពេល​ការ​ដាក់​លេខ​កូដ​បាន​បញ្ចប់។ បើ​អ្នក​ផ្អាក​ដំណើរការ​ដាក់​លេខ​កូដ​ អ្នក​នឹង​បាត់បង់​ទិន្នន័យ​មួយ​ចំនួន ឬ​ទាំង​អស់​របស់​អ្នក។"</string>
@@ -370,7 +370,7 @@
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"សុវត្ថិភាព​មធ្យម"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"កូដ PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"សុវត្ថិភាព​ពី​មធ្យម​ទៅ​ខ្ពស់"</string>
-    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ពាក្យសម្ងាត់​"</string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ពាក្យសម្ងាត់"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"សុវត្ថិភាព​ខ្ពស់"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"បាន​បិទ​ដោយ​​អ្នក​គ្រប់គ្រង ការ​ដាក់​លេខ​កូដ​គោលនយោបាយ ឬ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"គ្មាន"</string>
@@ -378,7 +378,7 @@
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"ដោះ​សោ​តាម​​ទម្រង់​មុខ"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"លំនាំ"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"កូដ PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"ពាក្យសម្ងាត់​"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"ពាក្យសម្ងាត់"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"បិទ​ការ​ចាក់​សោ​អេក្រង់"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"លុប​​លំនាំ​ដោះ​សោ"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"លុប​កូដ​ PIN ដោះ​សោ"</string>
@@ -387,7 +387,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ប្ដូរ​កូដ​ PIN ដោះ​សោ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ប្ដូរ​ពាក្យសម្ងាត់​ដោះ​សោ"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"ពាក្យ​សម្ងាត់​ត្រូវ​មាន​យ៉ាង​ហោច​ណាស់ %d តួអក្សរ"</string>
-    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"កូដ PIN ត្រូវ​តែ​មាន​​យ៉ាង​ហោច​ណាស់ %d តួ​"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"កូដ PIN ត្រូវ​តែ​មាន​​យ៉ាង​ហោច​ណាស់ %d តួ"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"ប៉ះ បន្ត​ពេល​រួចរាល់"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"បន្ត"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​តិច​ជាង <xliff:g id="NUMBER">%d</xliff:g> តួអក្សរ។"</string>
@@ -423,10 +423,10 @@
     <item quantity="other" msgid="3952508584649046404">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​មាន​យ៉ាង​ហោច​ណាស់​តួអក្សរ​មិន​មែ​ន​ជា​អក្សរ %d ។"</item>
   </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"អ្នក​គ្រប់គ្រង​ឧបករណ៍​មិន​អនុញ្ញាត​ឲ្យ​ប្រើ​ពាក្យ​សម្ងាត់​បច្ចុប្បន្ន​ទេ។"</string>
-    <string name="lockpassword_ok_label" msgid="313822574062553672">"យល់​ព្រម​"</string>
-    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"បោះ​បង់​"</string>
-    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"បោះ​បង់​"</string>
-    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"បន្ទាប់​"</string>
+    <string name="lockpassword_ok_label" msgid="313822574062553672">"យល់​ព្រម"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"បោះ​បង់"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"បោះ​បង់"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"បន្ទាប់"</string>
     <string name="lock_setup" msgid="3355847066343753943">"ការ​រៀបចំ​បាន​បញ្ចប់។"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"ការ​គ្រប់គ្រង​ឧបករណ៍"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"អ្នក​គ្រប់គ្រង​ឧបករណ៍"</string>
@@ -456,7 +456,7 @@
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"ពី៖ &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ផ្គូផ្គង​ជា​មួយ​ឧបករណ៍​នេះ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"ដើម្បី​ផ្គូផ្គង​ជា​មួយ៖ <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>វាយ​បញ្ចូល៖ <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> បន្ទាប់​មក​ចុច​ Return ឬ Enter ។"</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"ផ្គូផ្គង"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"បោះ​បង់​"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"បោះ​បង់"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"មិន​អាច​ផ្គូផ្គង​ជា​មួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ។"</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"មិន​អាច​ផ្គូផ្គង​ជា​មួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ព្រោះ​​​កូដ PIN ឬ​លេខ​កូដ​មិន​ត្រឹមត្រូវ។"</string>
@@ -553,7 +553,7 @@
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ពេល​ជិះ​យន្ត"</string>
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"មិន​អាច​វិភាគ​រក​បណ្ដាញ"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"ការ​ជូន​ដំណឹង​បណ្ដាញ"</string>
-    <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"ជូន​ដំណឹង​ខ្ញុំ ពេល​​មាន​បណ្ដាញ​​"</string>
+    <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"ជូន​ដំណឹង​ខ្ញុំ ពេល​​មាន​បណ្ដាញ"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ជៀសវាង​ការ​តភ្ជាប់​ដែល​ខ្សោយ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"កុំ​ប្រើ​បណ្ដាញ​វ៉ាយហ្វាយ លុះ​ត្រា​វា​មាន​ការ​តភ្ជាប់​អ៊ីនធឺណិត​ល្អ"</string>
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"វិភាគ​រក​​គ្រប់ពេល"</string>
@@ -610,7 +610,7 @@
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"វិញ្ញាបនបត្រ​អ្នក​ប្រើ"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"អត្តសញ្ញាណ"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"អត្តសញ្ញាណ​អនាមិក"</string>
-    <string name="wifi_password" msgid="5948219759936151048">"ពាក្យសម្ងាត់​"</string>
+    <string name="wifi_password" msgid="5948219759936151048">"ពាក្យសម្ងាត់"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"បង្ហាញ​ពាក្យ​សម្ងាត់"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"ការ​កំណត់ IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(មិន​ផ្លាស់ប្ដូរ)"</string>
@@ -634,7 +634,7 @@
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"បាន​បរាជ័យ​ក្នុង​បំភ្លេច​បណ្ដាញ"</string>
     <string name="wifi_save" msgid="3331121567988522826">"រក្សាទុក"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"បាន​បរាជ័យ​ក្នុង​ការ​រក្សាទុក​បណ្ដាញ"</string>
-    <string name="wifi_cancel" msgid="6763568902542968964">"បោះ​បង់​"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"បោះ​បង់"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"រំលង"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"កុំ​រំលង"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ការ​ព្រមាន៖ អ្នក​អាច​​ត្រូវ​កាត់​លុយ​ថ្លៃ​សេវាកម្ម​ទិន្នន័យ​។\n\nការ​រៀបចំ​កុំព្យូទ័រ​បន្ទះ​អាច​ទាមទារ​សកម្មភាព​បណ្ដាញ​ដែល​សំខាន់។"</string>
@@ -651,7 +651,7 @@
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"អាសយដ្ឋាន IP"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"ការ​កំណត់ IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"រក្សាទុក"</string>
-    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"បោះ​បង់​"</string>
+    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"បោះ​បង់"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"បញ្ចូល​អាសយដ្ឋាន IP ដែល​ត្រឹមត្រូវ។"</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"បញ្ចូល​អាសយដ្ឋាន​ច្រកចេញ​ចូល​ដែល​ត្រឹមត្រូវ"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"បញ្ចូល​អាសយដ្ឋាន DNS ដែល​ត្រឹមត្រូវ។"</string>
@@ -720,11 +720,11 @@
     <string name="dock_settings" msgid="1820107306693002541">"ភ្ជាប់"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"កំណត់​ការ​ភ្ជាប់"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"សំឡេង"</string>
-    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"កំណត់​សម្រាប់​​ការ​ភ្ជាប់​ផ្ទៃតុ​"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"កំណត់​សម្រាប់​​ការ​ភ្ជាប់​ផ្ទៃតុ"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"កំណត់​សម្រាប់​ភ្ជាប់រថយន្ត"</string>
     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"មិន​បាន​ភ្ជាប់​កុំព្យូទ័រ​បន្ទះ"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"មិន​បាន​ភ្ជាប់ទូរស័ព្ទ"</string>
-    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"កំណត់​សម្រាប់​ការ​ភ្ជាប់​"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"កំណត់​សម្រាប់​ការ​ភ្ជាប់"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"រក​មិន​ឃើញ​ការ​ភ្ជាប់"</string>
     <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"អ្នក​ត្រូវ​ភ្ជាប់​កុំព្យូទ័រ​បន្ទះ មុន​នឹង​រៀបចំ​​​សំឡេង​​ភ្ជាប់។"</string>
     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"អ្នក​ត្រូវ​តែ​ភ្ជាប់​ទូរស័ព្ទ មុន​ពេល​កំណត់​សំឡេង​ភ្ជាប់។"</string>
@@ -782,8 +782,8 @@
     <string name="sim_change_failed" msgid="304964924772218382">"មិន​អាច​ប្ដូរ​កូដ PIN ។\nប្រហែលជា​កូដ PIN មិន​ត្រឹមត្រូវ។"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"បាន​ប្ដូរ​​​កូដ PIN ស៊ីម​កាត់​ដោយ​ជោគជ័យ"</string>
     <string name="sim_lock_failed" msgid="5651596916127873626">"មិន​អាច​ប្ដូរ​ស្ថានភាព​ការ​ចាក់​សោ​ស៊ីម​កាត។\nប្រហែល​ជា​កូដ​ PIN មិន​ត្រឹមត្រូវ។"</string>
-    <string name="sim_enter_ok" msgid="6475946836899218919">"យល់​ព្រម​"</string>
-    <string name="sim_enter_cancel" msgid="6240422158517208036">"បោះ​បង់​"</string>
+    <string name="sim_enter_ok" msgid="6475946836899218919">"យល់​ព្រម"</string>
+    <string name="sim_enter_cancel" msgid="6240422158517208036">"បោះ​បង់"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"លេខ​កូដ PIN ស៊ីម​មិន​ត្រឹមត្រូវ អ្នក​ត្រូវ​​ទាក់ទង​ក្រុមហ៊ុន​បញ្ជូន​របស់​អ្នក​ឥឡូវ​នេះ​ដើម្បី​ដោះ​សោ​ឧបករណ៍​របស់​អ្នក។"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"លេខ​កូដ PIN ស៊ីម​មិន​ត្រឹមត្រូវ, អ្នក​​មាន​ <xliff:g id="NUMBER">%d</xliff:g> ការ​ព្យាយាម​ដែល​នៅ​សល់​​​​មុន​ពេល​ដែល​អ្នក​ត្រូវ​​ទាក់ទង​​ក្រុមហ៊ុន​បញ្ជូន​​ដើម្បី​ដោះ​សោ​ឧបករណ៍​របស់​អ្នក។"</item>
@@ -871,7 +871,7 @@
     <string name="dlg_error_unmount_text" product="default" msgid="3073562815631781894">"មិន​អាច​ផ្ដាច់​​កាត​អេសឌី។ ព្យាយាម​ម្ដង​ទៀត​ពេល​ក្រោយ។"</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី​នឹង​​​ត្រូវ​បាន​ផ្ដាច់។"</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"កាត​អេសឌី​នឹង​ត្រូវ​បាន​ផ្ដាច់។"</string>
-    <string name="sd_ejecting_title" msgid="8824572198034365468">"ផ្ដាច់​"</string>
+    <string name="sd_ejecting_title" msgid="8824572198034365468">"ផ្ដាច់"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"ការ​ផ្ដាច់​​កំពុង​ដំណើរការ"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"អស់​ទំហំផ្ទុក"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"មុខងារ​ប្រព័ន្ធ​មួយ​ចំនួន​ដូច​ជា ការ​ធ្វើ​សម​កាល​កម្ម​អាច​ដំណើរការ​មិន​ត្រឹមត្រូវ។ ព្យាយាម​បង្កើត​ទំហំ ដោយ​លុប​ ឬ​​ដោះ​ខ្ទាស់​ធាតុ​មួយ​ចំនួន​ដូច​ជា កម្មវិធី ឬ​មាតិកា​មេឌៀ។"</string>
@@ -893,8 +893,8 @@
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
     <string name="apn_http_proxy" msgid="1826885957243696354">"ប្រូកស៊ី"</string>
     <string name="apn_http_port" msgid="3763259523984976226">"ច្រក"</string>
-    <string name="apn_user" msgid="455637547356117761">"ឈ្មោះ​អ្នក​ប្រើ​"</string>
-    <string name="apn_password" msgid="5412301994998250968">"ពាក្យសម្ងាត់​"</string>
+    <string name="apn_user" msgid="455637547356117761">"ឈ្មោះ​អ្នក​ប្រើ"</string>
+    <string name="apn_password" msgid="5412301994998250968">"ពាក្យសម្ងាត់"</string>
     <string name="apn_server" msgid="2436185314756372858">"ម៉ាស៊ីន​មេ"</string>
     <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
     <string name="apn_mms_proxy" msgid="5374082621073999275">"ប្រូកស៊ី MMS"</string>
@@ -996,7 +996,7 @@
     <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="9101230468757324260">"មិន​ស្គាល់​​ប្រតិបត្តិ​ករ​​ស៊ីមកាត"</string>
-    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s គ្មាន​តំបន់​បណ្ដាញ​ដែល​ផ្ដល់​បាន​​ស្គាល់​"</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>
     <string name="location_title" msgid="1029961368397484576">"ទីតាំង​ខ្ញុំ"</string>
@@ -1004,7 +1004,7 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ភាព​ត្រឹមត្រូវ​ខ្ពស់"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ការ​សន្សំ​ថ្ម"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"តែ​​ឧបករណ៍​ប៉ុណ្ណោះ"</string>
-    <string name="location_mode_location_off_title" msgid="2829713015012529465">"បិទទីតាំង​"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"បិទទីតាំង"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"សំណើ​ទីតាំង​ថ្មី"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"បច្ចុប្បន្ន​គ្មាន​កម្មវិធី​បាន​ស្នើ​ទីតាំង"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"សេវាកម្ម​ទីតាំង"</string>
@@ -1062,7 +1062,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"ប្ដូរ​​​កូដ​ PIN ដោះ​សោ"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"បញ្ជាក់​លំនាំ​បាន​រក្សាទុក"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"ព្យាយាម​ម្ដង​ទៀត៖"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"គូរ​​លំនាំ​ដោះ​សោ​"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"គូរ​​លំនាំ​ដោះ​សោ"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"ចុច ម៉ឺនុយ​សម្រាប់​ជំនួយ។"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ដក​ម្រាមដៃ​​ពេល​រួចរាល់។"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"ភ្ជាប់​ចំណុច​យ៉ាង​ហោច​ណាស់ <xliff:g id="NUMBER">%d</xliff:g> ។ ព្យាយាម​ម្ដង​ទៀត។"</string>
@@ -1156,8 +1156,8 @@
     <string name="recompute_size" msgid="7722567982831691718">"កំពុង​គណនា​ទំហំ​ឡើងវិញ…"</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"លុប​ទិន្នន័យ​កម្មវិធី?"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"ទិន្នន័យ​របស់​កម្មវិធី​នេះ​ទាំងអស់​នឹង​ត្រូវ​បាន​លុប​ជា​អចិន្ត្រៃយ៍។ រួមមាន ឯកសារ​ទាំងអស់, ការ​កំណត់, គណនី, មូលដ្ឋាន​ទិន្នន័យ ។ល។"</string>
-    <string name="dlg_ok" msgid="2402639055725653590">"យល់​ព្រម​"</string>
-    <string name="dlg_cancel" msgid="1674753358972975911">"បោះ​បង់​"</string>
+    <string name="dlg_ok" msgid="2402639055725653590">"យល់​ព្រម"</string>
+    <string name="dlg_cancel" msgid="1674753358972975911">"បោះ​បង់"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="8333723538280257243">"រក​មិន​ឃើញ​កម្មវិធី​ក្នុង​បញ្ជី​កម្មវិធី​បាន​ដំឡើង។"</string>
     <string name="clear_data_failed" msgid="1907582169616856698">"មិន​អាច​សម្អាត​ទិន្នន័យ​កម្មវិធី។"</string>
@@ -1278,14 +1278,14 @@
     <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"ឃ្លា"</string>
     <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"ជម្រើស​ច្រើន​ទៀត"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"ជម្រើស​តិច"</string>
-    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"យល់​ព្រម​"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"យល់​ព្រម"</string>
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"ពាក្យ"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"ផ្លូវកាត់៖"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"ភាសា៖"</string>
     <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"បញ្ចូល​ពាក្យ"</string>
     <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"ផ្លូវកាត់​ជម្រើស"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"កែ​ពាក្យ"</string>
-    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"កែសម្រួល​"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"កែសម្រួល"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"លុប"</string>
     <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"អ្នក​មិន​មាន​ពាក្យ​ក្នុង​វចនានុក្រម​អ្នក​ប្រើ។ បន្ថែម​ពាក្យ​ដោយ​ប៉ះ​ប៊ូតុង (+) ។"</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"សម្រាប់​ភាសា​ទាំងអស់"</string>
@@ -1301,8 +1301,8 @@
     <string name="quick_launch_shortcut" msgid="5090405067413522300">"ស្វែងរក + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
     <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"សម្អាត"</string>
     <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"ផ្លូវកាត់​របស់​អ្នក​សម្រាប់ <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) នឹង​ត្រូវ​បាន​សម្អាត។"</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"យល់​ព្រម​"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"បោះ​បង់​"</string>
+    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"យល់​ព្រម"</string>
+    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"បោះ​បង់"</string>
     <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"កម្មវិធី"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"ផ្លូវកាត់"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"ការ​បញ្ចូល​អត្ថបទ"</string>
@@ -1398,7 +1398,7 @@
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"បើក"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"បិទ"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"មើល​ជាមុន"</string>
-    <string name="captioning_standard_options_title" msgid="3284211791180335844">"ជម្រើស​ស្តង់​ដារ​"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"ជម្រើស​ស្តង់​ដារ"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"ភាសា"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"ទំហំ​អត្ថបទ"</string>
     <string name="captioning_preset" msgid="8939737196538429044">"រចនាប័ទ្ម​ចំណងជើង"</string>
@@ -1458,8 +1458,8 @@
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"ការ​បោះបង់ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_failed_state_title_template" msgid="1436099128973357969">"កំហុស​​ម៉ាស៊ីន​បោះពុម្ព <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_blocked_state_title_template" msgid="9065391617425962424">"បាន​ទប់ស្កាត់​ម៉ាស៊ីន​បោះពុម្ព <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
-    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"បាន​បង្ហាញ​ប្រ​អប់​ស្វែងរក​"</string>
-    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"បាន​លាក់​ប្រអប់​ស្វែងរក​"</string>
+    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"បាន​បង្ហាញ​ប្រ​អប់​ស្វែងរក"</string>
+    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"បាន​លាក់​ប្រអប់​ស្វែងរក"</string>
   <plurals name="print_search_result_count_utterance">
     <item quantity="one" msgid="1322401991353603285">"រក​ឃើញ​ម៉ាស៊ីន​បោះពុម្ព <xliff:g id="COUNT">%1$s</xliff:g>"</item>
     <item quantity="other" msgid="460211409510874128">"រក​ឃើញ​ម៉ាស៊ីន​បោះពុម្ព <xliff:g id="COUNT">%1$s</xliff:g>"</item>
@@ -1508,7 +1508,7 @@
     <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"បាន​ផ្ញើ​ទិន្នន័យ​វ៉ាយហ្វាយ"</string>
     <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"បាន​ទទួល​ទិន្នន័យ​វ៉ាយហ្វាយ"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"សំឡេង"</string>
-    <string name="usage_type_video" msgid="4295357792078579944">"វីដេអូ​"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"វីដេអូ"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"ពេលវេលា​បើក"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"ពេលវេលា​គ្មាន​សញ្ញា"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"បង្ខំ​ឲ្យ​បញ្ឈប់"</string>
@@ -1527,11 +1527,11 @@
     <string name="battery_desc_wifi" msgid="2375567464707394131">"ថ្មប្រើ​ដោយ​វ៉ាយហ្វាយ"</string>
     <string name="battery_sugg_wifi" msgid="3355461362094706957">"បិទ​វ៉ាយ​ហ្វាយ​​ពេល​មិន​ប្រើ​ ឬ​​​មិន​មាន"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"ថ្ម​បាន​ប្រើ​ដោយ​ប៊្លូធូស"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"បិទ​ប៊្លូធូស​ពេល​អ្នក​មិន​ប្រើ​"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"បិទ​ប៊្លូធូស​ពេល​អ្នក​មិន​ប្រើ"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"ព្យាយាម​តភ្ជាប់​​ទៅ​ឧបករណ៍​ប៊្លូធូស​ផ្សេង"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"ថ្ម​បាន​ប្រើ​ដោយ​កម្មវិធី"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"បញ្ឈប់ ឬ​លុប​កម្មវិធី"</string>
-    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ជ្រើស​របៀប​សន្សំ​ថ្ម​"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ជ្រើស​របៀប​សន្សំ​ថ្ម"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"កម្មវិធី​អាច​ផ្ដល់​ការ​កំណត់​ ដើម្បី​កាត់បន្ថយ​ការ​ប្រើ​ថ្ម"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ថ្ម​បាន​ប្រើ​ដោយ​អ្នក​ប្រើ"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> តាំង​ពី​បានដក"</string>
@@ -1541,12 +1541,12 @@
     <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">"ស្ថិតិ Geeky អំពី​ដំណើរការ​"</string>
-    <string name="app_memory_use" msgid="7849258480392171939">"ការ​ប្រើ​​អង្គ​ចងចាំ​"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"ស្ថិតិ Geeky អំពី​ដំណើរការ"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"ការ​ប្រើ​​អង្គ​ចងចាំ"</string>
     <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> កម្មវិធី​ចប់​នៅ <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"ផ្ទៃ​ខាង​ក្រោយ"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"ផ្ទៃ​ខាង​មុខ"</string>
-    <string name="process_stats_type_cached" msgid="6314925846944806511">"ទុក​ក្នុង​ឃ្លាំង​"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"ទុក​ក្នុង​ឃ្លាំង"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"​អង្គ​ចងចាំ​ឧបករណ៍ <xliff:g id="MEMSTATE">%1$s</xliff:g> បច្ចុប្បន្ន"</string>
     <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"ការ​ប្រើ​អង្គ​ចងចាំ​មធ្យម"</string>
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"ការ​ប្រើ​អង្គ​ចងចាំ​អតិបរមា"</string>
@@ -1562,7 +1562,7 @@
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"ប្រភេទ​ស្ថានភាព"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"ផ្ទៃ​ខាង​ក្រោយ"</string>
     <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"ផ្ទៃ​ខាង​មុខ"</string>
-    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"ទុក​ក្នុង​ឃ្លាំង​"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"ទុក​ក្នុង​ឃ្លាំង"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"ការ​បញ្ចូល &amp; បញ្ចេញ​សំឡេង"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"កំណត់​ការ​បញ្ចូល​​ &amp; បញ្ចេញ​សំឡេង"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ស្វែងរក​តាម​​សំឡេង"</string>
@@ -1628,7 +1628,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"បិទ"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"វ៉ាយហ្វាយ"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"ប៊្លូធូស"</string>
-    <string name="gadget_location" msgid="2974757497945178165">"ទី​តាំង​"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"ទី​តាំង"</string>
     <string name="gadget_sync" msgid="858895763714222152">"ធ្វើ​សម​កាល​កម្ម"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"ពន្លឺ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ស្វ័យប្រវត្តិ"</string>
@@ -1706,13 +1706,13 @@
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"បន្ថែម​បណ្ដាញ"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"ផ្ទុក​បញ្ជី​ឡើងវិញ"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"រំលង"</string>
-    <string name="wifi_setup_next" msgid="3388694784447820477">"បន្ទាប់​"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"បន្ទាប់"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"ថយក្រោយ"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"ព័ត៌មាន​លម្អិត​បណ្ដាញ"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"តភ្ជាប់"</string>
     <string name="wifi_setup_forget" msgid="2562847595567347526">"ភ្លេច"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"រក្សាទុក"</string>
-    <string name="wifi_setup_cancel" msgid="3185216020264410239">"បោះ​បង់​"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"បោះ​បង់"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"កំពុង​វិភាគ​រក​បណ្ដាញ…"</string>
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"ប៉ះ​បណ្ដាញ ដើម្បី​តភ្ជាប់​វា"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"តភ្ជាប់​ទៅ​បណ្ដាញ​មាន​ស្រាប់"</string>
@@ -1914,13 +1914,13 @@
     <string name="vpn_search_domains" msgid="5391995501541199624">"ដែន​ស្វែងរក DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"ម៉ាស៊ីន​មេ DNS (ឧ. 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"បញ្ជូន​ផ្លូវ​បន្ត (ឧ. 10.0.0.0/8)"</string>
-    <string name="vpn_username" msgid="1863901629860867849">"ឈ្មោះ​អ្នក​ប្រើ​"</string>
-    <string name="vpn_password" msgid="6756043647233596772">"ពាក្យសម្ងាត់​"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"ឈ្មោះ​អ្នក​ប្រើ"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"ពាក្យសម្ងាត់"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"រក្សាទុក​ព័ត៌មាន​គណនី"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(មិន​បាន​ប្រើ)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(កុំ​ផ្ទៀងផ្ទាត់​ម៉ាស៊ីន​មេ)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(បាន​ទទួល​ពី​ម៉ាស៊ីន​មេ)"</string>
-    <string name="vpn_cancel" msgid="1979937976123659332">"បោះ​បង់​"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"បោះ​បង់"</string>
     <string name="vpn_save" msgid="4233484051644764510">"រក្សាទុក"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"តភ្ជាប់"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"កែ​ប្រវត្តិរូប VPN"</string>
@@ -1948,7 +1948,7 @@
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"បញ្ចូល​ពាក្យ​សម្ងាត់​ថ្មី​សម្រាប់​ការ​បម្រុងទុក​ពេញលេញ​នៅ​ទី​នេះ"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"បញ្ចូល​ពាក្យ​សម្ងាត់​បម្រុង​ទុក​ពេញលេញ​ថ្មី​នៅ​ទី​នេះ​ម្ដង​ទៀត"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"កំណត់​ពាក្យ​សម្ងាត់​បម្រុងទុក"</string>
-    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"បោះ​បង់​"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"បោះ​បង់"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"បច្ចុប្បន្នភាព​ប្រព័ន្ធ​បន្ថែម"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"បិទ"</string>
@@ -2039,10 +2039,10 @@
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"ឲ្យ​ប្ដូរ​ទិន្នន័យ​ពេល​កុំព្យូទ័រ​បន្ទះ​ប៉ះ​ឧបករណ៍​ផ្សេង"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"ឲ្យ​ប្ដូរ​ទិន្នន័យ​ពេល​ទូរស័ព្ទ​ប៉ះ​ឧបករណ៍​ផ្សេង"</string>
-    <string name="restriction_location_enable_title" msgid="5020268888245775164">"ទី​តាំង​"</string>
+    <string name="restriction_location_enable_title" msgid="5020268888245775164">"ទី​តាំង"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"ឲ្យ​កម្មវិធី​ប្រើ​ព័ត៌មាន​ទីតាំង​របស់​អ្នក"</string>
     <string name="wizard_back" msgid="5567007959434765743">"ថយក្រោយ"</string>
-    <string name="wizard_next" msgid="3606212602795100640">"បន្ទាប់​"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"បន្ទាប់"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"បញ្ចប់"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"ថតរូប"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"ជ្រើស​រូបថត​ពី​វិចិត្រសាល"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 997dc9def3..ac7aafb516 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -371,7 +371,7 @@
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ຄວາມປອດໄພລະດັບປານກາງຫາສູງ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ລະຫັດຜ່ານ"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ຄວາມ​ປອດ​ໄພ​ສູງ​"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ຄວາມ​ປອດ​ໄພ​ສູງ"</string>
     <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>
@@ -537,7 +537,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"ປິດ"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"ບໍ່ສາມາດໃຊ້ໄດ້ເນື່ອງຈາກ NFC ຖືກປິດໄວ້"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"ເມື່ອເປີດໃຊ້ຄຸນສົມບັດນີ້ແລ້ວ ທ່ານຈະສາມາດປ່ອຍຄື່ນສັນຍານ ເພື່ອສົ່ງເນື້ອຫາແອັບຯໄປໃຫ້ອຸປະກອນທີ່ຮອງຮັບ NFC ເຄື່ອງອື່ນໄດ້ໂດຍການນຳອຸປະກອນມາຢູ່ໃກ້ໆກັນ. ຍົກຕົວຢ່າງເຊັ່ນ: ທ່ານສາມາດສົ່ງໜ້າເວັບ, ວິດີໂອ YouTube, ລາຍຊື່ຜູ່ຕິດຕໍ່ ແລະຂໍ້ມູນອື່ນໆ ໃຫ້ກັບອຸປະກອນອື່ນໂດຍໃຊ້ NFC ໄດ້.\n\nພຽງນຳອຸປະກອນມາຢູ່ໃກ້ໆກັນ (ໂດຍປົກກະຕິຈະເອົາດ້ານຫຼັງມາຕິດກັນ) ຈາກນັ້ນແຕະໃສ່ທີ່ໜ້າຈໍຂອງທ່ານ, ແອັບຯກໍຈະກວດສອບວ່າຈະສົ່ງຂໍ້ມູນຫຍັງແດ່."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"ເມື່ອ​ເປີດ​ໃຊ້​ຄຸນສົມບັດນີ້​ແລ້ວ​ທ່ານ​ຈະ​ສາມາດ​ປ່ອຍ​ຄື່ນ​ສັນຍານ​ເພື່ອ​ສົ່ງ​ເນື້ອຫາ​ແອັບຯ​ໄປ​ໃຫ້​ອຸປະກອນ​ທີ່​ຮອງຮັບ NFC ເຄື່ອງ​ອື່ນ​ໄດ້​ໂດຍ​ການ​ນຳ​ອຸປະກອນ​ມາ​ຢູ່​ໃກ້ໆ​ກັນ. ເຊັ່ນ: ທ່ານ​ສາມາດ​ສົ່ງ​ໜ້າ​ເວັບ, ວິດີໂອ YouTube, ລາຍຊື່​ຜູ່ຕິດຕໍ່ ແລະ​ຂໍ້ມູນ​ອື່ນໆ ໃຫ້​ກັບ​ອຸປະກອນ​ອື່ນ​ໂດຍ​ໃຊ້ NFC ໄດ້.\n\nພຽງ​ນຳ​ອຸປະກອນ​ມາ​ຢູ່​ໃກ້ໆ​ກັນ (ໂດຍ​ປົກກະຕິ​ຈະ​ເອົາ​ດ້ານ​ຫຼັງ​ມາ​ຕິດ​ກັນ) ຈາກນັ້ນ​ແຕະ​ໃສ່​ທີ່​ໜ້າ​ຈໍ​ຂອງ​ທ່ານ, ແອັບຯ​ກໍ​ຈະ​ກວດ​ສອບ​ວ່າ​ຈະ​ສົ່ງ​ຂໍ້ມູນ​ຫຍັງ​ແດ່."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"ການຄົ້ນຫາບໍລິການເຄືອຂ່າຍ"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"ອະນຸຍາດໃຫ້ແອັບຯໃນອຸປະກອນອື່ນ ສາມາດຊອກເຫັນແອັບຯໃນອຸປະກອນນີ້ໄດ້"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi​-Fi"</string>
@@ -626,7 +626,7 @@
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", ປ້ອງກັນດ້ວຍ <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"ບໍ່ໃຊ້"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ເພື່ອປັບປຸງຄວາມຖືກຕ້ອງຂອງສະຖານທີ່ ແລະເພື່ອຈຸດປະສົງອື່ນໆ, <xliff:g id="APP_NAME">%1$s</xliff:g> ຕ້ອງການເປີດນຳໃຊ້ການສະແກນເຄືອຂ່າຍ ເຖິງແມ່ນວ່າ Wi-Fi ຈະປິດກໍຕາມ.\n\nອະນຸຍາດການດຳເນີນການນີ້ ໃຫ້ກັບທຸກແອັບຯທີ່ຕ້ອງການສະແກນບໍ່?"</string>
-    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ອະ​ນຸ​ຍາດ​"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ອະ​ນຸ​ຍາດ"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"ປະ​ຕິ​ເສດ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"ເຊື່ອມຕໍ່"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ລົ້ມເຫລວໃນການເຊື່ອມຕໍ່ເຄືອຂ່າຍ"</string>
@@ -983,8 +983,8 @@
     <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"ກຳລັງແບ່ງປັນການເຊື່ອມຕໍ່ອິນເຕີເນັດ ຂອງໂທລະສັບໄປໃຫ້ 1 ອຸປະກອນ"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"ແບ່ງປັນການເຊື່ອມຕໍ່ອິນເຕີເນັດຂອງແທັບເລັດເຄື່ອງນີ້ໃຫ້ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ອຸປະກອນ"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"ແບ່ງປັນການເຊື່ອມຕໍ່ອິນເຕີເນັດຂອງໂທລະສັບເຄື່ອງນີ້ໃຫ້ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ອຸປະກອນ"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"ບໍ່ໄດ້ແບ່ງປັນການເຊື່ອມຕໍ່ຂອງແທັບເລັດນີ້"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"ບໍ່ໄດ້ແບ່ງປັນການເຊື່ອມຕໍ່ອິນເຕີເນັດຂອງໂທລະສັບເຄື່ອງນີ້"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"ບໍ່​ໄດ້​ປ່ອຍ​ສັນຍານ​ອິນເຕີເນັດ​ຂອງ​ແທັບເລັດ​ເຄື່ອງ​ນີ້"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"ບໍ່​ໄດ້​ປ່ອຍ​ສັນຍານ​ອິນເຕີເນັດ​ຂອງ​ໂທລະສັບ​ເຄື່ອງ​ນີ້"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"ບໍ່ໄດ້ປ່ອຍສັນຍານ"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"ບໍ່ສາມາດປ່ອຍສັນຍານໃຫ້ໄດ້ຫຼາຍກວ່າ <xliff:g id="MAXCONNECTION">%1$d</xliff:g> ອຸປະກອນ."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ຈະຖືກຍົກເລີກການປ່ອຍສັນຍານ."</string>
@@ -1452,7 +1452,7 @@
     <string name="print_print_jobs" msgid="3582094777756968793">"ວຽກ​ພິມ"</string>
     <string name="print_print_job" msgid="7563741676053287211">"ວຽກ​ພິມ"</string>
     <string name="print_restart" msgid="8373999687329384202">"ປິດເປີດໃໝ່"</string>
-    <string name="print_cancel" msgid="3621199386568672235">"ຍົກ​ເລີກ​"</string>
+    <string name="print_cancel" msgid="3621199386568672235">"ຍົກ​ເລີກ"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"ກຳລັງພິມ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"ກຳລັງຍົກເລີກ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 36e76b3bee..2a779912df 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -817,7 +817,7 @@
     <string name="status_prl_version" msgid="1007470446618081441">"PRL versija"</string>
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
-    <string name="status_network_type" msgid="3279383550222116235">"Mobilaus tinklo tipas"</string>
+    <string name="status_network_type" msgid="3279383550222116235">"Mobiliojo ryšio tinklo tipas"</string>
     <string name="status_latest_area_info" msgid="7222470836568238054">"Operatoriaus informacija"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobiliojo tinklo būsena"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Paslaugos būsena"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 58b1a6a224..548f0b51fe 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -769,14 +769,14 @@
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Lai izmantotu tālruni, ir nepieciešams PIN kods"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Pieprasīt PIN, lai lietotu planšetdatoru"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Lai izmantotu tālruni, ir nepieciešams PIN kods"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"Mainīt SIM PIN kodu"</string>
-    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN kods"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"Mainīt SIM kartes PIN kodu"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM kartes PIN kods"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Bloķēt SIM karti"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Atbloķēt SIM karti"</string>
-    <string name="sim_enter_old" msgid="6074196344494634348">"Vecs SIM PIN kods"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"Vecais SIM kartes PIN kods"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"Jauns SIM PIN"</string>
     <string name="sim_reenter_new" msgid="3178510434642201544">"Atkārtoti ievadiet jauno PIN."</string>
-    <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN kods"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"SIM kartes PIN kods"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Nepareizs PIN kods"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN kodi ir atšķirīgi"</string>
     <string name="sim_change_failed" msgid="304964924772218382">"Nevar mainīt PIN kodu.\nIespējams, ka PIN kods nav pareizs."</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 59bcc9f90e..7db9e44df6 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -770,7 +770,7 @@
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Personlig kode kreves for å bruke nettbrettet"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Krev PIN-kode for å bruke telefonen"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Endre SIM-PIN-kode"</string>
-    <string name="sim_enter_pin" msgid="6608715137008508432">"PIN-kode for SIM-kort"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"PIN-koden for SIM-kortet"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"LÃ¥s SIM-kortet"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"LÃ¥s opp SIM-kortet"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"Gammel PIN-kode for SIM-kort"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index bf0ac2b961..a9d0fdafba 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -232,7 +232,7 @@
     <string name="radio_info_http_client_test" msgid="5733604021077701555">"HTTP-client testen:"</string>
     <string name="ping_test_label" msgid="7255376471490860631">"Pingtest uitvoeren"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
-    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Bijwerken"</string>
+    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Updaten"</string>
     <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"Vernieuwen"</string>
     <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"DNS-controle in-/uitschakelen"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-specifieke gegevens/instellingen"</string>
@@ -1389,8 +1389,8 @@
     <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Wanneer deze functie is ingeschakeld, kunt u de toegankelijkheidsfuncties inschakelen in twee snelle stappen:\n\nStap 1: Houd de aan/uit-knop ingedrukt totdat u een geluid hoort of een trilling voelt.\n\nStap 2: Blijf het scherm met twee vingers aanraken totdat u een audiobevestiging hoort.\n\nAls het apparaat meerdere gebruikers heeft, wordt toegankelijkheid tijdelijk ingeschakeld met deze snelkoppeling op het vergrendelingsscherm totdat het apparaat wordt ontgrendeld."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Grote tekst"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Schermvergroting"</string>
-    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Schermvergroting automatisch bijwerken"</string>
-    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Schermvergroting bijwerken bij app-overgangen"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Schermvergroting automatisch updaten"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Schermvergroting updaten bij app-overgangen"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Aan/uit-knop beëindigt oproep"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Wachtwoorden voorlezen"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Vertraging voor blijven aanraken"</string>
@@ -1664,8 +1664,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"U moet een pincode of wachtwoord voor het vergrendelen van het scherm instellen voordat u de referentieopslag kunt gebruiken."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Toon voor noodoproep"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Gedrag bij noodoproepen instellen"</string>
-    <string name="privacy_settings" msgid="5446972770562918934">"Back-up maken en opnieuw instellen"</string>
-    <string name="privacy_settings_title" msgid="4856282165773594890">"Back-up maken en opnieuw instellen"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Back-up maken en resetten"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Back-up maken en resetten"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Back-up en herstel"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Persoonlijke gegevens"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Back-up maken van mijn gegevens"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3886fcc2c6..11cf7dcecb 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1138,7 +1138,7 @@
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Zresetować opcje aplikacji?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Zresetuje to wszystkie ustawienia:\n\n "<li>"wyłączonych aplikacji,"</li>\n" "<li>"powiadomień wyłączonych aplikacji,"</li>\n" "<li>"domyślnych aplikacji dla wybranych czynności,"</li>\n" "<li>"ograniczeń danych w tle dla aplikacji,"</li>\n" "<li>"wszystkich ograniczeń uprawnień."</li>\n\n" Nie utracisz żadnych danych aplikacji."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetuj aplikacje"</string>
-    <string name="manage_space_text" msgid="8852711522447794676">"Zarządzaj rozmiarem"</string>
+    <string name="manage_space_text" msgid="8852711522447794676">"Zarządzaj miejscem"</string>
     <string name="filter" msgid="2018011724373033887">"Filtr"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Wybierz opcje filtru"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Wszystkie"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 7c896b7854..0315b42d4d 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -769,7 +769,7 @@
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"É necessário o PIN para utilizar o telefone"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"É necessário o PIN para utilizar o tablet"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"É necessário o PIN para utilizar o telefone"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"Mudar PIN do SIM"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"Alterar o PIN do cartão SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN do SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Bloquear cartão SIM"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Desbloquear cartão SIM"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f4d3a79b2b..20f5ebbefc 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -46,7 +46,7 @@
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Obter a lista PDP"</string>
     <string name="radioInfo_service_in" msgid="1915416319177520020">"Em serviço"</string>
     <string name="radioInfo_service_out" msgid="5238736759641916278">"Fora de serviço"</string>
-    <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Apenas chamadas de emergência"</string>
+    <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Só chamadas de emergência"</string>
     <string name="radioInfo_service_off" msgid="1434084741785525415">"Rádio desativado"</string>
     <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Roaming"</string>
     <string name="radioInfo_roaming_not" msgid="2851853244069662307">"Não está em roaming"</string>
@@ -568,7 +568,7 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimizar o uso da bateria quando o Wi-Fi estiver ligado"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Adicionar rede"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Redes Wi-Fi"</string>
-    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botão de pressão WPS"</string>
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botão WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Mais opções"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Entrada de PIN WPS"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c01dc70e54..3ab77ade9a 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -858,7 +858,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Очистить SD-карту"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Удаление с внутреннего USB-накопителя телефона всех данных, включая музыку и фотографии."</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Удаляет все данные с SD-карты, например музыку и фотографии"</string>
-    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Очистить кэш?"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Очистить кеш?"</string>
     <string name="memory_clear_cache_message" msgid="4550262490807415948">"Будут удалены данные всех приложений."</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Функция MTP или PTP активирована"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Отключить USB-накопитель?"</string>
@@ -1104,9 +1104,9 @@
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"По умолчанию"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Совместимость с экраном"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Разрешения"</string>
-    <string name="cache_header_label" msgid="1877197634162461830">"Кэш"</string>
-    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Очистить кэш"</string>
-    <string name="cache_size_label" msgid="7505481393108282913">"Кэш"</string>
+    <string name="cache_header_label" msgid="1877197634162461830">"Кеш"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Очистить кеш"</string>
+    <string name="cache_size_label" msgid="7505481393108282913">"Кеш"</string>
     <string name="controls_label" msgid="7611113077086853799">"Элементы управления"</string>
     <string name="force_stop" msgid="7435006169872876756">"Остановить"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Всего"</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 08b102a888..b3d80c95be 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -33,7 +33,7 @@
     <item msgid="3342301044271143016">"15 sekúnd"</item>
     <item msgid="8881760709354815449">"30 sekúnd"</item>
     <item msgid="7589406073232279088">"1 minúta"</item>
-    <item msgid="7001195990902244174">"2 min."</item>
+    <item msgid="7001195990902244174">"2 minúty"</item>
     <item msgid="7489864775127957179">"5 minút"</item>
     <item msgid="2314124409517439288">"10 minút"</item>
     <item msgid="6864027152847611413">"30 minút"</item>
@@ -53,8 +53,8 @@
     <item msgid="6736512735606834431">"5 sekúnd"</item>
     <item msgid="8044619388267891375">"15 sekúnd"</item>
     <item msgid="1822002388249545488">"30 sekúnd"</item>
-    <item msgid="8538071621211916519">"1 min."</item>
-    <item msgid="5663439580228932882">"2 min."</item>
+    <item msgid="8538071621211916519">"1 minúta"</item>
+    <item msgid="5663439580228932882">"2 minúty"</item>
     <item msgid="49888496216106852">"5 minút"</item>
     <item msgid="9002737361305019353">"10 minút"</item>
     <item msgid="4322676235684793329">"30 minút"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 95da121bc1..946a0b17ff 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -203,7 +203,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" msgid="2523518669129974654">"Adresa URL PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"Webová adresa 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>
@@ -278,15 +278,15 @@
     <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>
-    <string name="roaming_enable" msgid="3737380951525303961">"Dátové služby sa môžu pripájať pri roamingu"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Dátové služby sa môžu pripojiť pri roamingu"</string>
-    <string name="roaming_reenable_message" msgid="9141007271031717369">"Pripojenie dátových služieb bolo prerušené, pretože ste opustili domovskú sieť a dátové služby pri roamingu máte vypnuté."</string>
+    <string name="roaming" msgid="3596055926335478572">"Dátový roaming"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Pripájať sa k dátovým službám pri roamingu"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Pripájať sa k dátovým službám pri roamingu"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"Dátové pripojenie bolo prerušené, pretože ste opustili domovskú sieť a máte vypnutý dátový roaming."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Zapnúť"</string>
-    <string name="roaming_warning" msgid="7625933694709170887">"Ak povolíte dátové služby pri roamingu, môžu sa účtovať vysoké poplatky."</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Ak povolíte dátové služby pri roamingu, môžu sa účtovať vysoké poplatky za roaming!\n\nToto nastavenie ovplyvní všetkých používateľov tohto tabletu."</string>
-    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Ak povolíte dátové služby pri roamingu, môžu sa účtovať vysoké poplatky za roaming!\n\nToto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
-    <string name="roaming_reenable_title" msgid="6068100976707316772">"Povoliť dátové služby pri roamingu?"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Ak povolíte dátový roaming, môžu sa vám účtovať vysoké poplatky."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Ak povolíte dátový roaming, môžu sa vám účtovať vysoké poplatky za roaming!\n\nToto nastavenie ovplyvní všetkých používateľov tohto tabletu."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Ak povolíte dátový roaming, môžu sa vám účtovať vysoké poplatky za roaming!\n\nToto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Povoliť dátový roaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Výber operátora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Zvoliť sieťového operátora"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Dátum a čas"</string>
@@ -745,7 +745,7 @@
     <string name="brightness" msgid="2354961343555249270">"Jas"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Nastavenia jasu obrazovky"</string>
     <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="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrať tapetu z"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Šetrič obrazovky"</string>
@@ -765,11 +765,11 @@
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Nastavenia zámky karty SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zámka karty SIM"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Uzamykať kartu SIM"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Ak chcete použiť tablet, musíte zadať kód PIN"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Ak chcete telefón použiť, musíte zadať kód PIN"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Ak chcete použiť tablet, musíte zadať kód PIN"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Ak chcete telefón použiť, musíte zadať kód PIN"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"Zmeniť kód PIN karty SIM"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Na použitie tabletu vyžadovať PIN"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Na použitie telefónu vyžadovať PIN"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Na použitie tabletu vyžadovať PIN"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Na použitie telefónu vyžadovať PIN"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"Zmeniť PIN karty SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"Kód PIN karty SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Uzamykať kartu SIM"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Odomknúť kartu SIM"</string>
@@ -1163,7 +1163,7 @@
     <string name="clear_data_failed" msgid="1907582169616856698">"Údaje aplikácie sa nepodarilo vymazať."</string>
     <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"Odinštalovať aktualizácie?"</string>
     <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Všetky aktualizácie tejto systémovej aplikácie systému Android budú odinštalované."</string>
-    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Vymazanie údajov"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Vymazať údaje"</string>
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Údaje aplikácie sa nepodarilo vymazať."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Táto aplikácia môže pristupovať k nasledujúcim funkciám tabletu:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Táto aplikácia môže pristupovať k nasledujúcim funkciám telefónu:"</string>
@@ -1833,7 +1833,7 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Zobrazovať dialóg „Aplikácia neodpovedá“ aj pre aplikácie na pozadí"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Využitie dát"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cyklus počítania dát"</string>
-    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Dátové služby pri roamingu"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Dátový roaming"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Obmedzenie dátových prenosov na pozadí"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Samostatné použitie 4G"</string>
     <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Zobraziť využitie Wi-Fi"</string>
@@ -2031,7 +2031,7 @@
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Nastaviť obmedzenia aplikácií"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Riadi: <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="app_not_supported_in_limited" msgid="913035259626149121">"Profily s obmedzeniami nepodporujú túto aplikáciu"</string>
-    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Táto aplikácia môže pristupovať k vašim účtom"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Táto aplikácia má prístup k vašim účtom"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Siete Wi-Fi a mobilné siete"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Povoliť úpravu nastavení sietí Wi-Fi a mobilných sietí"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 8cd60051c0..0a11a734be 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -278,7 +278,7 @@
     <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>
+    <string name="roaming" msgid="3596055926335478572">"Пренос подат. у ромингу"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Повезивање са услугом за податке током роминга"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Повезивање са услугом за податке током роминга"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Веза за пренос података је прекинута зато што сте напустили матичну мрежу са искљученим преносом података у ромингу."</string>
@@ -1008,8 +1008,8 @@
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Недавни захтеви за локацију"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ниједна апликација није скоро тражила локацију"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Услуге локације"</string>
-    <string name="location_high_battery_use" msgid="517199943258508020">"Велика искоришћеност батерије"</string>
-    <string name="location_low_battery_use" msgid="8602232529541903596">"Мала искоришћеност батерије"</string>
+    <string name="location_high_battery_use" msgid="517199943258508020">"Велика потрошња батерије"</string>
+    <string name="location_low_battery_use" msgid="8602232529541903596">"Мала потрошња батерије"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим локације"</string>
     <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Користите GPS, Wi‑Fi и мобилне мреже за одређивање локације"</string>
     <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Користите Wi‑Fi и мобилне мреже за одређивање локације"</string>
@@ -1664,9 +1664,9 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Треба да подесите PIN или лозинку за закључавање екрана да бисте могли да користите складиште акредитива."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тон за хитне позиве"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Подешавање понашања када се успоставља хитни позив"</string>
-    <string name="privacy_settings" msgid="5446972770562918934">"Прављење резервне копије и враћање на почетне вредности"</string>
-    <string name="privacy_settings_title" msgid="4856282165773594890">"Прављење резервне копије и враћање на почетне вредности"</string>
-    <string name="backup_section_title" msgid="7952232291452882740">"Прављење резервне копије и враћање"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Резервна копија и ресетовање"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Резервна копија и ресетовање"</string>
+    <string name="backup_section_title" msgid="7952232291452882740">"Резервна копија и ресетовање"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Лични подаци"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Прављење резервних копија мојих података"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Прављење резервних копија података о апликацијама, Wi-Fi лозинки и других подешавања на Google серверима"</string>
@@ -1764,7 +1764,7 @@
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Уклањањем овог налога избрисаћете све поруке, контакте и друге податке са таблета!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Уклањањем овог налога избрисаћете све поруке, контакте и друге податке са телефона!"</string>
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Неке апликације захтевају овај налог. Можете да га уклоните једино ако ресетујете таблет на фабричка подешавања (чиме бришете све личне податке) у менију Подешавања &gt; Резервна копија и ресетовање на фабричка подешавања."</string>
-    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Неке апликације захтевају овај налог. Можете да га уклоните једино ако ресетујете телефон на фабричка подешавања (чиме бришете све личне податке) у менију Подешавања &gt; Прављење резервне копије и ресетовање на фабричка подешавања."</string>
+    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Неке апликације захтевају овај налог. Можете да га уклоните једино ако ресетујете телефон на фабричка подешавања (чиме бришете све личне податке) у менију Подешавања &gt; Резервна копија и ресетовање."</string>
     <string name="provider_label" msgid="7724593781904508866">"Пријаве за Push"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
@@ -1946,7 +1946,7 @@
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Провера правописа"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Овде унесите тренутну лозинку за прављење резервне копије читавог система"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Овде унесите нову лозинку за прављење резервних копија читавог система"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Овде поново унесите нову лозинку за прављење резервне копије читавог система"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Унесите нову лозинку за резервну копију читавог система"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Постави лозинку резервне копије"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Откажи"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 9bb1d4352f..a75cdbe647 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -280,7 +280,7 @@
     <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>
+    <string name="roaming" msgid="3596055926335478572">"Data nje ya mtandao wa kawaida"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Unganisha huduma ya data  wakati niko nje ya mtandao wangu wa kawaida"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Unganisha huduma ya data wakati niko nje ya mtandao wangu wa kawaida"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Umepoteza muunganisho wa data kwa sababu uliondoka kwenye mtandao wako wa kawaida ukiwa umezima utumiaji data nje ya mtandao wa kawaida."</string>
@@ -397,7 +397,7 @@
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Nenosiri lazima liwe na vibambo chini ya <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Nenosiri lazima liwe chini ya tarakimu <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN lazima iwe na tarakimu 0-9."</string>
-    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Msimamizi wa kifaa haruhusu kutumia PIN ya hivi karibuni."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Kidhibiti cha kifaa hakiruhusu kutumia PIN iliyotumiwa hivi karibuni."</string>
     <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Nenosiri lina herufi isiyo sahihi."</string>
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Nenosiri lazima liwe na angalau herufi moja."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Nenosiri lazima liwe na angalau tarakimu moja."</string>
@@ -414,15 +414,15 @@
     <!-- no translation found for lockpassword_password_requires_symbols:other (1221290525051187757) -->
     <!-- String.format failed for translation -->
     <!-- no translation found for lockpassword_password_requires_nonletter:other (3952508584649046404) -->
-    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Msimamizi wa kifaa haruhusu kutumia nenosiri la hivi karibuni."</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Kidhibiti cha kifaa haruhusu kutumia nenosiri lililotumiwa hivi karibuni."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Sawa"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Ghairi"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Ghairi"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Ifuatayo"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Usanidi umekamilika."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Usimamizi wa kifaa"</string>
-    <string name="manage_device_admin" msgid="5059296715271077278">"Wasimamizi wa kifaa"</string>
-    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Angalia au uzime wasimamizi wa kifaa"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Vidhibiti vya kifaa"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Angalia au uzime vidhibiti vya kifaa"</string>
     <string name="manage_notification_access" msgid="5799781079264981979">"Kufikia arifa"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Programu haziwezi kusoma arifa"</string>
   <plurals name="manage_notification_access_summary_nonzero">
@@ -760,7 +760,7 @@
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Inahitaji PIN ili kutumia kompyuta kibao"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Unahitaji PIN ili utumie simu"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Itisha PIN ili kutumia kompyuta kibao"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"PIN iwe sharti ili kutumia simu"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Itisha PIN kabla uruhusu simu kutumiwa"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Badilisha PIN ya SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN ya SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Funga SIM kadi"</string>
@@ -797,7 +797,7 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Hali"</string>
     <string name="device_status" msgid="607405385799807324">"Hali"</string>
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Hadhi ya betri, mtandao na maelezo mengine"</string>
-    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Nambari a simu, mawimbi, n.k."</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Nambari ya simu, mawimbi, n.k."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Hifadhi"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Hifadhi mipangilio"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Ondoa hifadhi ya USB, angalia hifadhi inayopatikana"</string>
@@ -1677,15 +1677,15 @@
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Ungependa kuacha kuhifadhi nakala za manenosiri, alamisho, mipangilio mingine na data ya programu ya Wi-Fi, na ufute nakala zote kwenye seva za Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Mipangilio za usimamizi wa kifaa"</string>
-    <string name="active_device_admin_msg" msgid="6930903262612422111">"Msimamizi wa kifaa"</string>
+    <string name="active_device_admin_msg" msgid="6930903262612422111">"Kidhibiti cha kifaa"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Zima"</string>
-    <string name="select_device_admin_msg" msgid="2645509057946368094">"Wasimamizi wa kifaa"</string>
+    <string name="select_device_admin_msg" msgid="2645509057946368094">"Visimamizi vya kifaa"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Hakuna wasimamizi kifaa wanaopatikana"</string>
-    <string name="add_device_admin_msg" msgid="6246742476064507965">"Kisimamizi cha kifaa kiwashwe?"</string>
+    <string name="add_device_admin_msg" msgid="6246742476064507965">"Kidhibiti cha kifaa kiwashwe?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Washa"</string>
-    <string name="device_admin_add_title" msgid="7705551449705676363">"Msimamizi wa kifaa"</string>
+    <string name="device_admin_add_title" msgid="7705551449705676363">"Kidhibiti cha kifaa"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Kuwasha kisimamizi hiki kutaruhusu programu ya <xliff:g id="APP_NAME">%1$s</xliff:g> kufanya mambo yafuatayo:"</string>
-    <string name="device_admin_status" msgid="4252975713178851910">"Msimamizi huyu ni amilifu na anaruhusu programu <xliff:g id="APP_NAME">%1$s</xliff:g> kutenda uendeshi ifuatayo:"</string>
+    <string name="device_admin_status" msgid="4252975713178851910">"Kidhibiti hiki kinatumika na kinaruhusu programu ya <xliff:g id="APP_NAME">%1$s</xliff:g> kufanya yafuatayo:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Haina Kichwa"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Kawaida"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Arifa"</string>
@@ -1827,7 +1827,7 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Onyesha kisanduku kidadisi cha Programu Haiitikii kwa programu za usuli"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Matumizi ya data"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Kipindi cha kutumia data"</string>
-    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Utumiaji data nje ya mtandao wako wa kawaida"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Data nje ya mtandao wa kawaida"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Zuia data ya mandhari nyuma"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Matumizitenganifu ya 4G"</string>
     <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Onyesha matumizi ya Wi-Fi"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 6bdf9a7f9b..e2577ce07f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -279,8 +279,8 @@
     <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>
-    <string name="roaming_enable" msgid="3737380951525303961">"Підключ. до служб даних під час роумінгу"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Підключ. під час роумінгу до служб даних"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Підключатися до служб передавання даних у роумінгу"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Підключатися до служб передавання даних у роумінгу"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Доступ до даних утрачено, оскільки ви залишили домашню мережу з вимкненим роумінгом даних."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Увімкнути"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Якщо дозволити роумінг даних, може стягуватися значна плата за роумінг!"</string>
@@ -764,14 +764,14 @@
     <string name="sim_lock_settings" msgid="3392331196873564292">"Налашт. блокув. SIM-карти"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Налашт. блок. SIM-карти"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Блок. SIM-карти"</string>
-    <string name="sim_pin_toggle" msgid="1742123478029451888">"Забл. SIM-карту"</string>
+    <string name="sim_pin_toggle" msgid="1742123478029451888">"Блокування SIM-карти"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Для викор. прист. потр. PIN"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Для викор. тел. потріб. PIN"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Щоб увімкнути телефон, потрібен PIN"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Для викор. прист. потр. PIN"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Для викор. тел. потріб. PIN"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"Змін. PIN-код SIM"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Щоб увімкнути телефон, потрібен PIN"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"Змінення PIN-коду SIM-карти"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN SIM-карти"</string>
-    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Забл. SIM-карту"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Блокування SIM-карти"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Розблок. SIM-карту"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"Старий PIN SIM"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"Новий PIN SIM"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9e6e54b20c..7df5c564f7 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1063,7 +1063,7 @@
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Xác nhận hình đã lưu"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Thử lại:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Vẽ hình mở khóa"</string>
-    <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nhấn vào Trình đơn để được trợ giúp."</string>
+    <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nhấn vào Menu để được trợ giúp."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Thả ngón tay khi xong"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Kết nối ít nhất <xliff:g id="NUMBER">%d</xliff:g> điểm. Hãy thử lại."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Đã ghi hình"</string>
@@ -1328,8 +1328,8 @@
     <string name="enable_adb" msgid="7982306934419797485">"Gỡ lỗi USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Chế độ gỡ lỗi khi USB được kết nối"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Thu hồi ủy quyền gỡ lỗi USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Báo cáo lỗi trong trình đơn nguồn"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Bao gồm tùy chọn trong trình đơn nguồn để thêm báo cáo lỗi"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"Báo cáo lỗi trong menu nguồn"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Bao gồm tùy chọn trong menu nguồn để thêm báo cáo lỗi"</string>
     <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>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index be376b8606..deefc63be3 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -30,34 +30,34 @@
     <item msgid="8392017019801393511">"全部"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 秒"</item>
-    <item msgid="8881760709354815449">"30 秒"</item>
-    <item msgid="7589406073232279088">"1 分钟"</item>
-    <item msgid="7001195990902244174">"2 分钟"</item>
-    <item msgid="7489864775127957179">"5 分钟"</item>
-    <item msgid="2314124409517439288">"10 分钟"</item>
-    <item msgid="6864027152847611413">"30 分钟"</item>
+    <item msgid="3342301044271143016">"15秒"</item>
+    <item msgid="8881760709354815449">"30秒"</item>
+    <item msgid="7589406073232279088">"1分钟"</item>
+    <item msgid="7001195990902244174">"2分钟"</item>
+    <item msgid="7489864775127957179">"5分钟"</item>
+    <item msgid="2314124409517439288">"10分钟"</item>
+    <item msgid="6864027152847611413">"30分钟"</item>
   </string-array>
   <string-array name="dream_timeout_entries">
     <item msgid="3149294732238283185">"永不"</item>
-    <item msgid="2194151041885903260">"15 秒"</item>
-    <item msgid="5892295237131074341">"30 秒"</item>
-    <item msgid="3538441365970038213">"1 分钟"</item>
-    <item msgid="412343871668955639">"2 分钟"</item>
-    <item msgid="5076853889688991690">"5 分钟"</item>
-    <item msgid="1903860996174927898">"10 分钟"</item>
-    <item msgid="6415509612413178727">"30 分钟"</item>
+    <item msgid="2194151041885903260">"15秒"</item>
+    <item msgid="5892295237131074341">"30秒"</item>
+    <item msgid="3538441365970038213">"1分钟"</item>
+    <item msgid="412343871668955639">"2分钟"</item>
+    <item msgid="5076853889688991690">"5分钟"</item>
+    <item msgid="1903860996174927898">"10分钟"</item>
+    <item msgid="6415509612413178727">"30分钟"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"立即"</item>
-    <item msgid="6736512735606834431">"5 秒"</item>
-    <item msgid="8044619388267891375">"15 秒"</item>
-    <item msgid="1822002388249545488">"30 秒"</item>
-    <item msgid="8538071621211916519">"1 分钟"</item>
-    <item msgid="5663439580228932882">"2 分钟"</item>
-    <item msgid="49888496216106852">"5 分钟"</item>
-    <item msgid="9002737361305019353">"10 分钟"</item>
-    <item msgid="4322676235684793329">"30 分钟"</item>
+    <item msgid="6736512735606834431">"5秒"</item>
+    <item msgid="8044619388267891375">"15秒"</item>
+    <item msgid="1822002388249545488">"30秒"</item>
+    <item msgid="8538071621211916519">"1分钟"</item>
+    <item msgid="5663439580228932882">"2分钟"</item>
+    <item msgid="49888496216106852">"5分钟"</item>
+    <item msgid="9002737361305019353">"10分钟"</item>
+    <item msgid="4322676235684793329">"30分钟"</item>
   </string-array>
   <string-array name="entries_font_size">
     <item msgid="8166647333858618801">"小"</item>
@@ -140,9 +140,9 @@
     <item msgid="2330782789550628803">"超出范围"</item>
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="8151962652413645395">"2 分钟"</item>
-    <item msgid="8675215713017289017">"5 分钟"</item>
-    <item msgid="477015974247590543">"1 小时"</item>
+    <item msgid="8151962652413645395">"2分钟"</item>
+    <item msgid="8675215713017289017">"5分钟"</item>
+    <item msgid="477015974247590543">"1小时"</item>
     <item msgid="5198271470953124739">"永不超时"</item>
   </string-array>
   <string-array name="wifi_signal">
@@ -225,8 +225,8 @@
     <item msgid="2681427309183221543">"GID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
-    <item msgid="8151497958991952759">"设备内存"</item>
-    <item msgid="3738430123799803530">"可卸载的 SD 卡"</item>
+    <item msgid="8151497958991952759">"内部存储设备"</item>
+    <item msgid="3738430123799803530">"可卸载的SD卡"</item>
     <item msgid="4498124044785815005">"由系统确定"</item>
   </string-array>
   <string-array name="app_ops_categories">
@@ -247,7 +247,7 @@
     <item msgid="6546959730920410907">"修改通话记录"</item>
     <item msgid="446877710771379667">"读取日历"</item>
     <item msgid="7674458294386319722">"修改日历"</item>
-    <item msgid="8281201165558093009">"WLAN 扫描"</item>
+    <item msgid="8281201165558093009">"WLAN扫描"</item>
     <item msgid="8694611243479480497">"通知"</item>
     <item msgid="7776439107987345446">"手机网络扫描"</item>
     <item msgid="514615766544675057">"拨打电话"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5ee7833bf9..fb1fc9f2b6 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -40,7 +40,7 @@
     <string name="ims_reg_required_off" msgid="1720570343422743943">"需要关闭 IMS 注册"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"打开 LTE RAM 转储"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"关闭 LTE RAM 转储"</string>
-    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"查看 SIM 卡地址簿"</string>
+    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"查看SIM卡地址簿"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"查看固定拨号号码"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"查看服务拨号"</string>
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"获取 PDP 列表"</string>
@@ -64,16 +64,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"卸载 USB 存储设备"</string>
-    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"卸载 SD 卡"</string>
-    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"格式化 USB 存储设备"</string>
-    <string name="sdcard_format" product="default" msgid="6713185532039187532">"格式化 SD 卡"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"卸载USB存储设备"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"卸载SD卡"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"格式化USB存储设备"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"格式化SD卡"</string>
     <string name="small_font" msgid="2295331917424072635">"小"</string>
     <string name="medium_font" msgid="2068475425515133701">"中"</string>
     <string name="large_font" msgid="599055175160971446">"大"</string>
     <string name="font_size_save" msgid="3450855718056759095">"确定"</string>
-    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB 存储设备"</string>
-    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD 卡"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB存储设备"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD卡"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"电池状态："</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"是否已插电："</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"电池电量："</string>
@@ -241,23 +241,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"设置"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"失败"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"成功"</string>
-    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"重新连接 USB 线后更改就会生效。"</string>
-    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"启用 USB 大容量存储设备"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"重新连接USB线后更改就会生效。"</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"启用USB大容量存储设备"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"总字节数："</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"未装载 USB 存储设备。"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"无 SD 卡。"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"未装载USB存储设备。"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"无SD卡。"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"可用的字节数："</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"计算机正将 USB 存储设备用作大容量存储设备。"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"计算机正将 SD 卡用作大容量存储设备。"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"现在可以安全地移除该 USB 存储设备了。"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"现在可以安全地移除 SD 卡了。"</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB 存储设备仍在使用中便被移除！"</string>
-    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD 卡仍在使用中便被移除！"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"计算机正将USB存储设备用作大容量存储设备。"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"计算机正将SD卡用作大容量存储设备。"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"现在可以安全地移除该USB存储设备了。"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"现在可以安全地移除SD卡了。"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB存储设备仍在使用中便被移除！"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD卡仍在使用中便被移除！"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"已使用的字节数："</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"正在扫描 USB 存储设备中的媒体..."</string>
-    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"正从 SD 卡扫描媒体..."</string>
-    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"已将 USB 存储设备装载为只读设备。"</string>
-    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"已将 SD 卡装载为只读设备。"</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"正在扫描USB存储设备中的媒体..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"正从SD卡扫描媒体..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"已将USB存储设备装载为只读设备。"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"已将SD卡装载为只读设备。"</string>
     <string name="skip_label" msgid="47510779345218297">"跳过"</string>
     <string name="next_label" msgid="4693520878012668114">"下一步"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"语言"</string>
@@ -267,8 +267,8 @@
     <string name="display_label" msgid="8074070940506840792">"屏幕"</string>
     <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"平板电脑信息"</string>
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"手机信息"</string>
-    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB 存储设备"</string>
-    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD 卡"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB存储设备"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD卡"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"代理设置"</string>
     <string name="cancel" msgid="6859253417269739139">"取消"</string>
     <string name="settings_label" msgid="1626402585530130914">"设置"</string>
@@ -277,7 +277,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"飞行模式"</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="radio_controls_summary" msgid="1838624369870907268">"管理WLAN、蓝牙、飞行模式、移动网络和VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"移动数据网络漫游"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"漫游时连接到移动数据网络服务"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"漫游时连接到移动数据网络服务"</string>
@@ -298,7 +298,7 @@
     <string name="zone_auto" msgid="334783869352026648">"自动确定时区"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"使用网络提供的时区"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"使用网络提供的时区"</string>
-    <string name="date_time_24hour" msgid="1193032284921000063">"使用 24 小时格式"</string>
+    <string name="date_time_24hour" msgid="1193032284921000063">"使用24小时格式"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"设置时间"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"选择时区"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"设置日期"</string>
@@ -324,14 +324,14 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"个人资料信息"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"位置信息"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"安全"</string>
-    <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM 卡锁定和凭据存储锁定"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密码"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"加密"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"加密平板电脑"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"加密手机"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"您每次开机时都需要输入数字 PIN 或密码才能解密平板电脑"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"您每次开机时都需要输入数字 PIN 或密码才能解密手机"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"您每次开机时都需要输入PIN码或密码才能解密平板电脑"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"您每次开机时都需要输入PIN码或密码才能解密手机"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"您可以加密自己的帐户、设置、已下载的应用及其数据、媒体和其他文件。加密平板电脑后，您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除平板电脑上的所有数据。\n\n加密过程需要 1 小时或更长时间。在开始加密前，电池必须有电，并且在加密完成前必须一直连接电源。如果您中断加密过程，则会丢失部分或全部数据。"</string>
     <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"您可以加密自己的帐户、设置、已下载的应用及其数据、媒体和其他文件。加密手机后，您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除手机上的所有数据。\n\n加密过程需要 1 小时或更长时间。在开始加密前，电池必须有电，并且在加密完成前必须一直连接电源。如果您中断加密过程，则会丢失部分或全部数据。"</string>
@@ -339,19 +339,19 @@
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"加密手机"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"请为电池充电，然后重试。"</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"插上充电器，然后重试。"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"没有锁定屏幕 PIN 或密码"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"您需要先设置锁定屏幕 PIN 或密码才能开始加密。"</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"没有锁屏PIN码或密码"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"您需要先设置锁屏PIN码或密码才能开始加密。"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"要加密吗？"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"加密操作无法撤消，如果您中断该过程，则会丢失数据。加密过程需要 1 小时或更长时间，在此期间，平板电脑会重新启动数次。"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"加密操作无法撤消，如果您中断该过程，则会丢失数据。加密过程需要 1 小时或更长时间，在此期间，手机会重新启动数次。"</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"正在加密"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"正在加密您的平板电脑（已完成 <xliff:g id="PERCENT">^1</xliff:g>%），请耐心等待。"</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"正在加密您的手机（已完成 <xliff:g id="PERCENT">^1</xliff:g>%），请耐心等待。"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> 秒后重试。"</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g>秒后重试。"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"键入密码"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失败"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"加密过程中断，无法完成。因此，您已无法再使用平板电脑上的数据。\n\n要继续使用您的平板电脑，您需要恢复出厂设置。恢复出厂设置后对平板电脑进行设置时，您可以将之前备份到 Google 帐户的所有数据恢复到平板电脑中。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"加密过程中断，无法完成。因此，您已无法再使用手机上的数据。\n\n要继续使用您的手机，您需要恢复出厂设置。恢复出厂设置后对手机进行设置时，您可以将之前备份到 Google 帐户的所有数据恢复到手机中。"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"加密过程中断，无法完成。因此，您已无法再使用平板电脑上的数据。\n\n要继续使用您的平板电脑，您需要恢复出厂设置。恢复出厂设置后对平板电脑进行设置时，您可以将之前备份到Google帐户的所有数据恢复到平板电脑中。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"加密过程中断，无法完成。因此，您已无法再使用手机上的数据。\n\n要继续使用您的手机，您需要恢复出厂设置。恢复出厂设置后对手机进行设置时，您可以将之前备份到Google帐户的所有数据恢复到手机中。"</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"切换输入法"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"选择屏幕锁定方式"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"选择备份锁"</string>
@@ -394,7 +394,7 @@
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN 必须少于 <xliff:g id="NUMBER">%d</xliff:g> 位数。"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN 只能包含 0-9 的数字。"</string>
     <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"设备管理器不允许使用最近用过的PIN码。"</string>
-    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"密码包含非法字符。"</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"密码包含无效字符。"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"密码必须包含至少 1 个字母。"</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"密码必须包含至少 1 个数字。"</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"密码必须包含至少 1 个符号。"</string>
@@ -450,7 +450,7 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"要与 <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> 设备配对，请键入该设备所需的配对密钥："</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN 由字母或符号组成"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"通常为 0000 或 1234"</string>
-    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"您可能还需要在另一台设备上输入此 PIN。"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"您可能还需要在另一设备上输入此PIN码。"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"您可能还需要在另一台设备上输入此密钥。"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"要与以下设备配对：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;请确保其显示的配对密钥为：&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"来自：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;要与此设备配对吗？"</string>
@@ -541,56 +541,56 @@
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"网络服务发现"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"允许其他设备上的应用发现此设备上的应用"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"WLAN"</string>
-    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"打开 WLAN"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"打开WLAN"</string>
     <string name="wifi_settings" msgid="29722149822540994">"WLAN"</string>
-    <string name="wifi_settings_category" msgid="8719175790520448014">"WLAN 设置"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"WLAN设置"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"WLAN"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"设置和管理无线接入点"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"选择 WLAN"</string>
-    <string name="wifi_starting" msgid="6732377932749942954">"正在打开 WLAN…"</string>
-    <string name="wifi_stopping" msgid="8952524572499500804">"正在关闭 WLAN…"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"选择WLAN网络"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"正在打开WLAN…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"正在关闭WLAN…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"出错"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"正处于飞行模式下"</string>
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"扫描不到网络"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"网络通知"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"附近有开放网络时通知我"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"避开状况不佳的网络"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"仅在 WLAN 互联网连接状况良好时使用 WLAN 网络"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"仅在WLAN互联网连接状况良好时使用WLAN网络"</string>
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"随时都可扫描"</string>
     <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"即使在WLAN关闭时，也允许Google的位置信息服务和其他应用扫描网络"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"安装证书"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"为了提高位置信息精确度以及其他目的，Google 和其他应用可扫描附近的网络（在关闭了 WLAN 时也可进行扫描）。如果您不希望应用这么做，请进入“高级”&gt;“随时都可扫描”进行设置。"</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"应用可扫描附近的网络（在关闭了 WLAN 时也可进行扫描）。如果您不希望应用这么做，请进入“高级”&gt;“随时都可扫描”进行设置。"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"为了提高位置信息精确度以及其他目的，Google 和其他应用可扫描附近的网络（在关闭了WLAN时也可进行扫描）。如果您不希望应用这么做，请进入“高级”&gt;“随时都可扫描”进行设置。"</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"应用可扫描附近的网络（在关闭了WLAN时也可进行扫描）。如果您不希望应用这么做，请进入“高级”&gt;“随时都可扫描”进行设置。"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"不再显示"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"在休眠状态下保持 WLAN 网络连接"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"在休眠状态下保持WLAN网络连接"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"更改设置时出现问题"</string>
-    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"WLAN 优化"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"开启 WLAN 时尽可能节约电池用量"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"WLAN优化"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"开启WLAN时尽可能节约电池用量"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"添加网络"</string>
-    <string name="wifi_access_points" msgid="7053990007031968609">"WLAN 网络"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"WLAN网络"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS 按钮"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"更多选项"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN 输入"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"WLAN 直连"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"WLAN直连"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"扫描"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"高级"</string>
     <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_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>
+    <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>
     <string name="wifi_other_network" msgid="1048006316504242214">"其他网络…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"更多"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自动设置 (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="4080969509965288881">"为完成设置，您的平板电脑需要使用 WLAN 网络。设置完毕后，您将可以在移动数据网络和 WLAN 网络之间切换。"</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"为完成设置，您的平板电脑需要使用WLAN网络。设置完毕后，您将可以在移动数据网络和WLAN网络之间切换。"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"显示高级选项"</string>
-    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"WLAN 保护设置"</string>
+    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"WLAN保护设置"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"正在启动 WPS..."</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"请按下您路由器上的 WLAN 保护设置按钮，它可能会标为“WPS”或包含此符号："</string>
-    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"请在 WLAN 路由器上输入 PIN <xliff:g id="NUMBER">%1$s</xliff:g>。设置过程最多可能需要两分钟时间就能完成。"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"请按下您路由器上的WLAN保护设置按钮，它可能会标为“WPS”或包含此符号："</string>
+    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"请在WLAN路由器上输入PIN码<xliff:g id="NUMBER">%1$s</xliff:g>。设置过程最多可能需要两分钟时间就能完成。"</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS 已成功启动。正在连接网络..."</string>
-    <string name="wifi_wps_connected" msgid="7153432445748931183">"已连接到 WLAN 网络“<xliff:g id="NETWORK_NAME">%s</xliff:g>”"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"已连接到WLAN网络“<xliff:g id="NETWORK_NAME">%s</xliff:g>”"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"正在设置 WPS，此过程最多可能需要两分钟时间才能完成。"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS 未能成功启动。请过几分钟后重试。"</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"无线路由器安全设置 (WEP) 不受支持"</string>
@@ -625,7 +625,7 @@
     <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_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_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>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"拒绝"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"连接"</string>
@@ -641,10 +641,10 @@
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告：您可能需要额外支付运营商数据费。\n\n手机设置过程可能会消耗大量网络流量。"</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"警告：您必须连接到互联网，平板电脑才能验证您所使用的软件是否为最新版本。"</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"警告：您必须连接到互联网，手机才能验证您所使用的软件是否为最新版本。"</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"平板电脑无法连接到此 WLAN 网络。"</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"手机无法连接到此 WLAN 网络。"</string>
-    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"高级 WLAN"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"WLAN 频带"</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"平板电脑无法连接到此WLAN网络。"</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"手机无法连接到此WLAN网络。"</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"高级WLAN"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"WLAN频带"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"指定操作的频率范围"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"设置频带时出现问题。"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC 地址"</string>
@@ -660,7 +660,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"域名 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"网关"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"网络前缀长度"</string>
-    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"WLAN 直连"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"WLAN直连"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"设备信息"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"记住该连接"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"搜索设备"</string>
@@ -676,14 +676,14 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"取消邀请？"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"要取消连接<xliff:g id="PEER_NAME">%1$s</xliff:g>的邀请吗？"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"取消保存此群组？"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"便携式 WLAN 热点"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"便携式WLAN热点"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"正在打开热点..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"正在关闭热点..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"便携式热点 <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 已启用"</string>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"便携式 WLAN 热点错误"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"设置 WLAN 热点"</string>
-    <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>便携式 WLAN 热点"</string>
-    <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android 热点"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"便携式WLAN热点错误"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"设置WLAN热点"</string>
+    <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>便携式WLAN热点"</string>
+    <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android热点"</string>
     <string name="home_settings" msgid="212375129455718176">"主屏幕"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"显示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"声音"</string>
@@ -745,7 +745,7 @@
     <string name="brightness" msgid="2354961343555249270">"亮度"</string>
     <string name="brightness_summary" msgid="838917350127550703">"调整屏幕亮度"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
-    <string name="screen_timeout_summary" msgid="327761329263064327">"无操作 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"无操作<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"壁纸"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"选择壁纸来源"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"互动屏保"</string>
@@ -761,40 +761,40 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"自动调整亮度"</string>
     <string name="title_font_size" msgid="4405544325522105222">"字体大小"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"字体大小"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡锁定设置"</string>
-    <string name="sim_lock_settings_category" msgid="5136244267576697004">"设置 SIM 卡锁定"</string>
-    <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM 卡锁定"</string>
-    <string name="sim_pin_toggle" msgid="1742123478029451888">"锁定 SIM 卡"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"需要输入 PIN 才能使用平板电脑"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"需要输入 PIN 才能使用手机"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"需要输入 PIN 才能使用平板电脑"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"需要输入 PIN 才能使用手机"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"更改 SIM 卡 PIN"</string>
-    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM 卡 PIN"</string>
-    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"锁定 SIM 卡"</string>
-    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"解锁 SIM 卡"</string>
-    <string name="sim_enter_old" msgid="6074196344494634348">"旧 SIM 卡 PIN"</string>
-    <string name="sim_enter_new" msgid="8742727032729243562">"新 SIM 卡 PIN"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"SIM卡锁定设置"</string>
+    <string name="sim_lock_settings_category" msgid="5136244267576697004">"设置SIM卡锁定"</string>
+    <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM卡锁定"</string>
+    <string name="sim_pin_toggle" msgid="1742123478029451888">"锁定SIM卡"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"需要输入PIN码才能使用平板电脑"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"需要输入PIN码才能使用手机"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"需要输入PIN码才能使用平板电脑"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"需要输入PIN码才能使用手机"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"更改SIM卡PIN码"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM卡PIN码"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"锁定SIM卡"</string>
+    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"解锁SIM卡"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"旧SIM卡PIN码"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"新SIM卡PIN码"</string>
     <string name="sim_reenter_new" msgid="3178510434642201544">"重新输入新 PIN"</string>
-    <string name="sim_change_pin" msgid="7328607264898359112">"SIM 卡 PIN"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"SIM卡PIN码"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN 不正确"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN 不匹配"</string>
     <string name="sim_change_failed" msgid="304964924772218382">"无法更改 PIN。\nPIN 可能不正确。"</string>
-    <string name="sim_change_succeeded" msgid="8556135413096489627">"已成功更改 SIM 卡 PIN"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"无法更改 SIM 卡锁定状态。\nPIN 可能不正确。"</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"已成功更改SIM卡PIN码"</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"无法更改SIM卡锁定状态。\nPIN码可能不正确。"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"确定"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"取消"</string>
-    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM 卡 PIN 码不正确，您现在必须联系运营商为您解锁设备。"</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM卡PIN码不正确，您现在必须联系运营商为您解锁设备。"</string>
   <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"SIM 卡 PIN 码不正确，您还有<xliff:g id="NUMBER">%d</xliff:g>次尝试机会。如果仍然失败，则必须联系运营商帮您解锁设备。"</item>
-    <item quantity="other" msgid="77103619544346451">"SIM 卡 PIN 码不正确，您还有<xliff:g id="NUMBER">%d</xliff:g>次尝试机会。"</item>
+    <item quantity="one" msgid="4840607930166101114">"SIM卡PIN码不正确，您还有<xliff:g id="NUMBER">%d</xliff:g>次尝试机会。如果仍然失败，则必须联系运营商帮您解锁设备。"</item>
+    <item quantity="other" msgid="77103619544346451">"SIM卡PIN码不正确，您还有<xliff:g id="NUMBER">%d</xliff:g>次尝试机会。"</item>
   </plurals>
-    <string name="pin_failed" msgid="1848423634948587645">"SIM 卡 PIN 码操作失败！"</string>
+    <string name="pin_failed" msgid="1848423634948587645">"SIM卡PIN码操作失败！"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"平板电脑状态"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"手机状态"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"系统更新"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
-    <string name="firmware_version" msgid="4801135784886859972">"Android 版本"</string>
+    <string name="firmware_version" msgid="4801135784886859972">"Android版本"</string>
     <string name="model_number" msgid="3765737700545384794">"型号"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"设备 ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"基带版本"</string>
@@ -808,8 +808,8 @@
     <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="default" msgid="9176693537325988610">"卸载 SD 卡，查看可用存储设备"</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>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
@@ -824,15 +824,15 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"信号强度"</string>
     <string name="status_roaming" msgid="2638800467430913403">"漫游"</string>
     <string name="status_operator" msgid="2274875196954742087">"网络"</string>
-    <string name="status_wifi_mac_address" msgid="2202206684020765378">"WLAN MAC 地址"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"WLANMAC 地址"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"蓝牙地址"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"序列号"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"不可用"</string>
     <string name="status_up_time" msgid="7294859476816760399">"已开机时间"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"唤醒时间"</string>
     <string name="internal_memory" msgid="9129595691484260784">"内部存储空间"</string>
-    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB 存储设备"</string>
-    <string name="sd_memory" product="default" msgid="151871913888051515">"SD 卡"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB存储设备"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"SD卡"</string>
     <string name="memory_available" msgid="5052397223077021181">"可用空间"</string>
     <string name="memory_available_read_only" msgid="6497534390167920206">"可用空间（只读）"</string>
     <string name="memory_size" msgid="6629067715017232195">"总容量"</string>
@@ -845,41 +845,41 @@
     <string name="memory_media_misc_usage" msgid="235452944021647124">"其他"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"缓存数据"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"卸载共享存储设备"</string>
-    <string name="sd_eject" product="default" msgid="6915293408836853020">"卸载 SD 卡"</string>
-    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"卸载内部 USB 存储设备"</string>
-    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"需要先卸载 SD 卡，然后才能将其安全移除"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"插入要装载的 USB 存储设备"</string>
-    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"插入 SD 卡进行安装"</string>
-    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"装载 USB 存储设备"</string>
-    <string name="sd_mount" product="default" msgid="5940523765187704135">"安装 SD 卡"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"卸载SD卡"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"卸载内部USB存储设备"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"需要先卸载SD卡，然后才能将其安全移除"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"插入要装载的USB存储设备"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"插入SD卡进行安装"</string>
+    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"装载USB存储设备"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"安装SD卡"</string>
     <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
     <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
-    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"格式化 USB 存储设备"</string>
-    <string name="sd_format" product="default" msgid="2576054280507119870">"格式化 SD 卡"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"清除内部 USB 存储设备中的全部数据，例如音乐和照片"</string>
-    <string name="sd_format_summary" product="default" msgid="212703692181793109">"清除 SD 卡中的全部数据，例如音乐和照片"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"格式化USB存储设备"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"格式化SD卡"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"清除内部USB存储设备中的全部数据，例如音乐和照片"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"清除SD卡中的全部数据，例如音乐和照片"</string>
     <string name="memory_clear_cache_title" msgid="5423840272171286191">"是否清除缓存数据？"</string>
     <string name="memory_clear_cache_message" msgid="4550262490807415948">"此操作会清除所有应用的缓存数据。"</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP 或 PTP 功能已启用"</string>
-    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"要卸载 USB 存储设备吗？"</string>
-    <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"要卸载 SD 卡吗？"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"如果卸载该 USB 存储设备，您当前使用的某些应用会停止运行，并且在您重新装载该设备前可能都无法使用。"</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"如果卸载该 SD 卡，您当前使用的某些应用会停止，并且在您重新装载该 SD 卡前，这些应用可能都无法使用。"</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"要卸载USB存储设备吗？"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"要卸载SD卡吗？"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"如果卸载该USB存储设备，您当前使用的某些应用会停止运行，并且在您重新装载该设备前可能都无法使用。"</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"如果卸载该SD卡，您当前使用的某些应用会停止，并且在您重新装载该SD卡前，这些应用可能都无法使用。"</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="4346280469528260684">"无法卸载 USB 存储设备，请稍后重试。"</string>
-    <string name="dlg_error_unmount_text" product="default" msgid="3073562815631781894">"无法卸载 SD 卡，请稍后重试。"</string>
-    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"系统将会卸载 USB 存储设备。"</string>
-    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"系统将会卸载 SD 卡。"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="4346280469528260684">"无法卸载USB存储设备，请稍后重试。"</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="3073562815631781894">"无法卸载SD卡，请稍后重试。"</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"系统将会卸载USB存储设备。"</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"系统将会卸载SD卡。"</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"正在卸载"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"正在卸载"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"存储空间不足"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"某些系统功能（如同步）可能无法正常使用。请尝试删除或取消在本地保存某些内容（如应用数据或媒体内容），以便释放存储空间。"</string>
-    <string name="storage_menu_usb" msgid="5708207885333243384">"USB 计算机连接"</string>
-    <string name="storage_title_usb" msgid="679612779321689418">"USB 计算机连接"</string>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB计算机连接"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB计算机连接"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"连接方式"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"媒体设备 (MTP)"</string>
-    <string name="usb_mtp_summary" msgid="4617321473211391236">"让您可以在 Windows 上传输媒体文件，或在 Mac 上使用 Android 文件传输应用来传输文件（请参见 www.android.com/filetransfer）"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"让您可以在Windows上传输媒体文件，或在Mac上使用Android文件传输应用来传输文件（请参见www.android.com/filetransfer）"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"相机 (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"让您可以使用相机软件传输照片，并在不支持 MTP 的计算机上传输任何文件"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"安装文件传输工具"</string>
@@ -930,16 +930,16 @@
     <string name="master_clear_title" msgid="5907939616087039756">"恢复出厂设置"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"清除平板电脑上的所有数据"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"清除手机上的所有数据"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"此操作会清除您平板电脑"<b>"内存设备"</b>"中的所有数据，包括：\n\n"<li>"您的 Google 帐户"</li>\n<li>"系统及应用数据和设置"</li>\n<li>"已下载的应用"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"此操作会清除您手机"<b>"内存设备"</b>"中的所有数据，包括：\n\n"<li>"您的 Google 帐户"</li>\n<li>"系统及应用数据和设置"</li>\n<li>"已下载的应用"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"此操作会清除您平板电脑"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐户"</li>\n<li>"系统及应用数据和设置"</li>\n<li>"已下载的应用"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"此操作会清除您手机"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐户"</li>\n<li>"系统及应用数据和设置"</li>\n<li>"已下载的应用"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"目前，您已登录以下帐户：\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音乐"</li>\n<li>"照片"</li>\n<li>"其他的用户数据"</li></string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"要清除音乐、照片和其他用户数据，请清空该 "<b>"USB 存储设备"</b>"。"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"要清除音乐、图片和其他用户数据，您需要清空该 "<b>"SD 卡"</b>"。"</string>
-    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"格式化 USB 存储设备"</string>
-    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"格式化 SD 卡"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"清除该内部 USB 存储设备中的全部数据，例如音乐或照片"</string>
-    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"清除 SD 卡中的全部数据，例如音乐或照片"</string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"要清除音乐、照片和其他用户数据，请清空该 "<b>"USB存储设备"</b>"。"</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"要清除音乐、图片和其他用户数据，您需要清空该 "<b>"SD卡"</b>"。"</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"格式化USB存储设备"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"格式化SD卡"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"清除该内部USB存储设备中的全部数据，例如音乐或照片"</string>
+    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"清除SD卡中的全部数据，例如音乐或照片"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"重置平板电脑"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"重置手机"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"要清除所有个人信息和下载的应用吗？请注意，此操作无法撤消！"</string>
@@ -948,20 +948,20 @@
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"您需要绘制解锁图案以确认要恢复出厂设置。"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"“系统清除”服务不可用，因此未执行重置操作。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"要重置吗？"</string>
-    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"格式化 USB 存储设备"</string>
-    <string name="media_format_title" product="default" msgid="4427528440306787972">"格式化 SD 卡"</string>
-    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"清除 USB 存储设备中的全部数据"</string>
-    <string name="media_format_summary" product="default" msgid="3805714639375830120">"清除 SD 卡上的所有数据"</string>
-    <string name="media_format_desc" product="nosdcard" msgid="4557243156946319034">"要清空所有 USB 存储设备吗？如果这样做，您会丢失其中存储的"<b>"全部"</b>"数据！"</string>
-    <string name="media_format_desc" product="default" msgid="8764037252319942415">"要清空该 SD 卡吗？如果这样做，您会丢失其中存储的"<b>"全部"</b>"数据！"</string>
-    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"格式化 USB 存储设备"</string>
-    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"格式化 SD 卡"</string>
-    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"要清空 USB 存储设备（此操作会删除其中存储的全部文件）吗？请注意，此操作无法撤消！"</string>
-    <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"要清空该 SD 卡（此操作会删除其中存储的全部文件）吗？请注意，此操作无法撤消！"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"格式化USB存储设备"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"格式化SD卡"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"清除USB存储设备中的全部数据"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"清除SD卡上的所有数据"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4557243156946319034">"要清空所有USB存储设备吗？如果这样做，您会丢失其中存储的"<b>"全部"</b>"数据！"</string>
+    <string name="media_format_desc" product="default" msgid="8764037252319942415">"要清空该SD卡吗？如果这样做，您会丢失其中存储的"<b>"全部"</b>"数据！"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"格式化USB存储设备"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"格式化SD卡"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"要清空USB存储设备（此操作会删除其中存储的全部文件）吗？请注意，此操作无法撤消！"</string>
+    <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"要清空该SD卡（此操作会删除其中存储的全部文件）吗？请注意，此操作无法撤消！"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"清除全部内容"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"绘制您的解锁图案"</string>
-    <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="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="tether_settings_title_usb" msgid="6688416425801386511">"USB网络共享"</string>
@@ -971,10 +971,10 @@
     <string name="tether_settings_title_all" msgid="8356136101061143841">"网络共享与便携式热点"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB网络共享"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB 已连接，选中以共享网络"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"已连接USB，选中即可共享网络"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"已共享网络"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"使用 USB 存储设备时无法共享网络"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB 未连接"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"使用USB存储设备时无法共享网络"</string>
+    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB未连接"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB网络共享出错"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"蓝牙网络共享"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"共享该平板电脑的互联网连接"</string>
@@ -995,9 +995,9 @@
     <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="9101230468757324260">"未知的 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_insert_sim_card" msgid="9052590985784056395">"请插入SIM卡，然后重新启动"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"请连接到互联网"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
@@ -1011,20 +1011,20 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"高电耗"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"低电耗"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"位置信息模式"</string>
-    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"使用 GPS、WLAN 和移动网络确定位置"</string>
-    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"使用 WLAN 和移动网络确定位置"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"使用 GPS 确定您的位置"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"使用GPS、WLAN和移动网络确定位置"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"使用WLAN和移动网络确定位置"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"使用GPS确定您的位置"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"正在检索…"</string>
-    <string name="location_network_based" msgid="9134175479520582215">"WLAN 和移动网络位置信息"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"WLAN和移动网络位置信息"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允许应用使用Google位置信息服务更快地大致了解您所在的位置。系统将收集匿名位置数据并将其发送给Google。"</string>
-    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"通过 WLAN 确定位置"</string>
-    <string name="location_gps" msgid="8392461023569708478">"GPS 卫星定位"</string>
-    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"允许应用使用您平板电脑上的 GPS 定位您的位置"</string>
-    <string name="location_street_level" product="default" msgid="4617445745492014203">"允许应用使用您手机上的 GPS 定位您的位置"</string>
-    <string name="assisted_gps" msgid="4649317129586736885">"使用增强型 GPS"</string>
-    <string name="assisted_gps_enabled" msgid="8751899609589792803">"使用服务器来辅助 GPS（取消选中可降低网络使用率）"</string>
-    <string name="assisted_gps_disabled" msgid="6982698333968010748">"使用服务器来辅助 GPS（取消选中可提高 GPS 性能）"</string>
-    <string name="use_location_title" msgid="5206937465504979977">"位置和 Google 搜索"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"通过WLAN确定位置"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS卫星定位"</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"允许应用使用您平板电脑上的GPS定位您的位置"</string>
+    <string name="location_street_level" product="default" msgid="4617445745492014203">"允许应用使用您手机上的GPS定位您的位置"</string>
+    <string name="assisted_gps" msgid="4649317129586736885">"使用增强型GPS"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"使用服务器来辅助GPS（取消选中可降低网络使用率）"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"使用服务器来辅助GPS（取消选中可提高GPS性能）"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"位置信息和Google搜索"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"允许Google使用您的位置信息改善搜索结果和其他服务"</string>
     <string name="location_access_title" msgid="7064108942964081243">"允许使用我的位置信息"</string>
     <string name="location_access_summary" msgid="69031404093194341">"允许得到您许可的应用使用您的位置信息"</string>
@@ -1083,7 +1083,7 @@
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"更改解锁图案"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"如何绘制解锁图案"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"错误的尝试次数过多！"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> 秒后重试。"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g>秒后重试。"</string>
     <string name="activity_not_found" msgid="5551664692991605325">"您的手机上未安装相应应用。"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"管理应用"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理和删除已安装的应用"</string>
@@ -1100,7 +1100,7 @@
     <string name="advanced_settings_summary" msgid="4016682978071086747">"启用更多设置选项"</string>
     <string name="application_info_label" msgid="5736524913065714880">"应用信息"</string>
     <string name="storage_label" msgid="8700867073480107253">"存储"</string>
-    <string name="auto_launch_label" msgid="3012617472833815382">"默认启动"</string>
+    <string name="auto_launch_label" msgid="3012617472833815382">"默认操作"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"默认操作"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"屏幕兼容性"</string>
     <string name="permissions_label" msgid="2605296874922726203">"权限"</string>
@@ -1111,10 +1111,10 @@
     <string name="force_stop" msgid="7435006169872876756">"强行停止"</string>
     <string name="total_size_label" msgid="1048676419552557254">"总计"</string>
     <string name="application_size_label" msgid="8494609207373874267">"应用"</string>
-    <string name="external_code_size_label" msgid="3459343140355961335">"USB 存储（应用）"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB存储（应用）"</string>
     <string name="data_size_label" msgid="8679376373625710107">"数据"</string>
-    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB 存储（数据）"</string>
-    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD 卡"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB存储（数据）"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD卡"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"卸载"</string>
     <string name="uninstall_all_users_text" msgid="851857393177950340">"为所有用户卸载"</string>
     <string name="install_text" msgid="884360662922471113">"安装"</string>
@@ -1122,10 +1122,10 @@
     <string name="enable_text" msgid="9217362512327828987">"启用"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"清除数据"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"卸载更新"</string>
-    <string name="auto_launch_enable_text" msgid="2652825923953591251">"您已选择在默认情况下对某些操作启动此应用。"</string>
+    <string name="auto_launch_enable_text" msgid="2652825923953591251">"您已选择默认使用此应用处理某些操作。"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"您已选择允许该应用创建小部件并查看其数据。"</string>
-    <string name="auto_launch_disable_text" msgid="7800385822185540166">"无默认设置。"</string>
-    <string name="clear_activities" msgid="7408923511535174430">"清除默认设置"</string>
+    <string name="auto_launch_disable_text" msgid="7800385822185540166">"没有默认操作。"</string>
+    <string name="clear_activities" msgid="7408923511535174430">"清除默认操作"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"此应用可能不是针对您的屏幕设计的。您可以在此处调整其显示尺寸/比例，让它适合您的屏幕。"</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"启动时确认"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"调整应用的显示尺寸/比例"</string>
@@ -1136,7 +1136,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"显示缓存进程"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"重置应用偏好设置"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"要重置应用偏好设置吗？"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"这将重置以下所有偏好设置：\n\n "<li>"停用的应用"</li>\n" "<li>"停用的应用通知"</li>\n" "<li>"执行操作的默认应用"</li>\n" "<li>"应用的后台数据限制"</li>\n" "<li>"任何权限限制"</li>\n\n" 您将不会丢失任何应用数据。"</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"这将重置以下所有偏好设置：\n\n "<li>"停用的应用"</li>\n" "<li>"停用的应用通知"</li>\n" "<li>"执行操作的默认应用"</li>\n" "<li>"应用的后台流量限制"</li>\n" "<li>"权限限制"</li>\n\n" 您将不会丢失任何应用数据。"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"重置应用"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"管理空间"</string>
     <string name="filter" msgid="2018011724373033887">"过滤"</string>
@@ -1145,14 +1145,14 @@
     <string name="filter_apps_disabled" msgid="5364447573326472890">"已停用"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"已下载"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"正在运行"</string>
-    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 存储设备"</string>
-    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD 卡中"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB存储设备"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD卡中"</string>
     <string name="disabled" msgid="9206776641295849915">"未启用"</string>
     <string name="not_installed" msgid="1475144352069281880">"未安装"</string>
     <string name="no_applications" msgid="7336588977497084921">"无应用。"</string>
     <string name="internal_storage" msgid="1584700623164275282">"内部存储空间"</string>
-    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB 存储设备"</string>
-    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD 卡存储设备"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB存储设备"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD卡存储设备"</string>
     <string name="recompute_size" msgid="7722567982831691718">"正在重新计算大小..."</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"要删除应用数据吗？"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"系统会永久删除此应用的所有数据。删除的内容包括所有文件、设置、帐户、数据库等。"</string>
@@ -1162,11 +1162,11 @@
     <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">"系统将会卸载此 Android 系统应用的所有相关更新。"</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>
-    <string name="security_settings_desc" product="default" msgid="61749028818785244">"此应用有权访问您手机上的以下内容："</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"此应用拥有以下权限："</string>
+    <string name="security_settings_desc" product="default" msgid="61749028818785244">"此应用拥有以下权限："</string>
     <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"此应用可访问您平板电脑上的以下内容。为了提高性能和减少内存使用量，<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>可获得其中的部分权限，因为它与<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>运行在同一进程中。"</string>
     <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"此应用可访问您手机上的以下内容。为了提高性能和减少内存使用量，<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>可获得其中的部分权限，因为它与<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>运行在同一进程中。"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>和<xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
@@ -1181,9 +1181,9 @@
     <string name="version_text" msgid="9189073826278676425">"版本 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"移动"</string>
     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"移至平板电脑"</string>
-    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"移至手机内存"</string>
-    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"移至 USB 存储设备"</string>
-    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"移至 SD 卡"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"移至手机"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"移至USB存储设备"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"移至SD卡"</string>
     <string name="moving" msgid="6431016143218876491">"正在移动"</string>
     <string name="insufficient_storage" msgid="481763122991093080">"存储空间不足。"</string>
     <string name="does_not_exist" msgid="3476487214886606748">"应用不存在。"</string>
@@ -1217,7 +1217,7 @@
     <skip />
     <string name="service_background_processes" msgid="6844156253576174488">"可用：<xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="service_foreground_processes" msgid="7583975676795574276">"已用：<xliff:g id="MEMORY">%1$s</xliff:g>"</string>
-    <string name="memory" msgid="6609961111091483458">"RAM"</string>
+    <string name="memory" msgid="6609961111091483458">"内存"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_process_item_user_label" msgid="3129887865552025943">"用户：<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -1271,10 +1271,10 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"要切换，请按 Ctrl+空格键"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"默认"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"键盘布局"</string>
-    <string name="user_dict_settings_title" msgid="3427169369758733521">"个人词典"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"个人字典"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"添加"</string>
-    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"添加到词典"</string>
+    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"添加到字典"</string>
     <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"词组"</string>
     <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"显示更多选项"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"隐藏部分选项"</string>
@@ -1287,7 +1287,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"编辑字词"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"编辑"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"删除"</string>
-    <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"用户词典中没有您定义的任何字词。您可以触摸“添加”(+) 按钮添加字词。"</string>
+    <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"用户字典中没有您定义的任何字词。您可以触摸“添加”(+) 按钮添加字词。"</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"所有语言"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"更多语言..."</string>
     <string name="testing" msgid="6584352735303604146">"测试"</string>
@@ -1325,9 +1325,9 @@
     <string name="development_settings_title" msgid="215179176067683667">"开发者选项"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"设置应用开发选项"</string>
     <string name="development_settings_not_available" msgid="4308569041701535607">"此用户无法使用开发者选项"</string>
-    <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="enable_adb" msgid="7982306934419797485">"USB调试"</string>
+    <string name="enable_adb_summary" msgid="4881186971746056635">"连接USB后启用调试模式"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"撤消USB调试授权"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"电源键菜单错误报告"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"在电源键菜单中添加提交错误报告的选项"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"不锁定屏幕"</string>
@@ -1341,21 +1341,21 @@
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"显示无线显示认证选项"</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>
-    <string name="adb_warning_message" msgid="7316799925425402244">"USB 调试仅适用于开发工作。该功能可用于在您的计算机和设备之间复制数据、在您的设备上安装应用而不发送通知以及读取日志数据。"</string>
-    <string name="adb_keys_warning_message" msgid="6932230298032192937">"是否针对您之前授权的所有计算机撤消 USB 调试的访问权限？"</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"是否允许USB调试？"</string>
+    <string name="adb_warning_message" msgid="7316799925425402244">"USB调试仅适用于开发工作。该功能可用于在您的计算机和设备之间复制数据、在您的设备上安装应用而不发送通知以及读取日志数据。"</string>
+    <string name="adb_keys_warning_message" msgid="6932230298032192937">"是否针对您之前授权的所有计算机撤消USB调试的访问权限？"</string>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"允许开发设置？"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"这些设置仅适用于开发工作。一旦启用，会导致您的设备以及设备上的应用崩溃或出现异常。"</string>
-    <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"通过 USB 验证应用"</string>
+    <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"通过USB验证应用"</string>
     <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"通过 ADB/ADT 检查安装的应用是否存在有害行为。"</string>
-    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"对 USB 存储设备进行读写保护"</string>
-    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"应用必须申请读取 USB 存储设备的权限"</string>
-    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"要对 USB 存储设备进行读写保护吗？"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"如果 USB 存储设备受到读写保护，则应用必须申请相关权限才能读取外部存储设备中的数据。\n\n某些应用需要其开发者更新之后才能正常使用。"</string>
-    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"对 SD 卡进行读写保护"</string>
-    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"应用必须申请读取 SD 卡的权限"</string>
-    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"要对 SD 卡进行读写保护吗？"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"如果 SD 卡受到读写保护，则应用必须申请相关权限才能读取外部存储设备中的数据。\n\n某些应用需要其开发者更新之后才能正常使用。"</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"对USB存储设备进行读写保护"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"应用必须申请读取USB存储设备的权限"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"要对USB存储设备进行读写保护吗？"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"如果USB存储设备受到读写保护，则应用必须申请相关权限才能读取外部存储设备中的数据。\n\n某些应用需要其开发者更新之后才能正常使用。"</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"对SD卡进行读写保护"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"应用必须申请读取SD卡的权限"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"要对SD卡进行读写保护吗？"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"如果SD卡受到读写保护，则应用必须申请相关权限才能读取外部存储设备中的数据。\n\n某些应用需要其开发者更新之后才能正常使用。"</string>
     <string name="enable_terminal_title" msgid="95572094356054120">"本地终端"</string>
     <string name="enable_terminal_summary" msgid="67667852659359206">"启用终端应用，以便在本地访问 Shell"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"选择小工具"</string>
@@ -1363,10 +1363,10 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"是否允许该应用创建小部件并查看其数据？"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"当您创建小部件后，“<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>”将能查看其显示的所有数据。"</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"始终允许“<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>”创建小部件并查看其数据"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> 天 <xliff:g id="HOURS">%2$d</xliff:g> 小时 <xliff:g id="MINUTES">%3$d</xliff:g> 分 <xliff:g id="SECONDS">%4$d</xliff:g> 秒"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> 小时 <xliff:g id="MINUTES">%2$d</xliff:g> 分 <xliff:g id="SECONDS">%3$d</xliff:g> 秒"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> 分 <xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> 秒"</string>
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>天<xliff:g id="HOURS">%2$d</xliff:g>小时<xliff:g id="MINUTES">%3$d</xliff:g>分<xliff:g id="SECONDS">%4$d</xliff:g>秒"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>小时<xliff:g id="MINUTES">%2$d</xliff:g>分<xliff:g id="SECONDS">%3$d</xliff:g>秒"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>分<xliff:g id="SECONDS">%2$d</xliff:g>秒"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>秒"</string>
     <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>天<xliff:g id="HOURS">%2$d</xliff:g>小时<xliff:g id="MINUTES">%3$d</xliff:g>分钟"</string>
     <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>小时<xliff:g id="MINUTES">%2$d</xliff:g>分钟"</string>
     <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>分钟"</string>
@@ -1481,64 +1481,64 @@
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"设备唤醒时间"</string>
-    <string name="wifi_on_time" msgid="3208518458663637035">"WLAN 开启时间"</string>
-    <string name="bluetooth_on_time" msgid="3056108148042308690">"WLAN 开启时间"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"WLAN开启时间"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"WLAN开启时间"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"历史记录详细信息"</string>
     <string name="details_title" msgid="3792801565213935385">"使用详情"</string>
     <string name="details_subtitle" msgid="32593908269911734">"详细使用情况"</string>
-    <string name="controls_subtitle" msgid="390468421138288702">"调配电量"</string>
-    <string name="packages_subtitle" msgid="4736416171658062768">"包括的软件包"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"电量调配提示"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"包含的软件包"</string>
     <string name="power_screen" msgid="3023346080675904613">"屏幕"</string>
     <string name="power_wifi" msgid="1135085252964054957">"WLAN"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"蓝牙"</string>
-    <string name="power_cell" msgid="6596471490976003056">"手机待机"</string>
+    <string name="power_cell" msgid="6596471490976003056">"移动网络待机"</string>
     <string name="power_phone" msgid="5392641106474567277">"语音通话"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"平板电脑待机"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"手机待机"</string>
-    <string name="usage_type_cpu" msgid="715162150698338714">"CPU 总使用时间"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"CPU总使用时间"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU（前台）"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"保持唤醒状态"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="3134357198266380400">"WLAN 正在运行"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"WLAN运行时间"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"平板电脑"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"通话"</string>
     <string name="usage_type_data_send" msgid="3875198715268918671">"发送的移动数据量"</string>
     <string name="usage_type_data_recv" msgid="6694951443404021754">"接收的移动数据量"</string>
-    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"发送的 WLAN 数据量"</string>
-    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"接收的 WLAN 数据量"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"发送的WLAN数据量"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"接收的WLAN数据量"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"音频"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"视频"</string>
-    <string name="usage_type_on_time" msgid="3351200096173733159">"已运行时间"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"运行时间"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"无信号的时间"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"强行停止"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"应用信息"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"应用设置"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"屏幕设置"</string>
-    <string name="battery_action_wifi" msgid="8181553479021841207">"WLAN 设置"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"WLAN设置"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"蓝牙设置"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"语音通话所耗的电量"</string>
-    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"平板电脑待机时所耗电量"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"平板电脑待机时所耗的电量"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"手机待机时所耗的电量"</string>
-    <string name="battery_desc_radio" msgid="5479196477223185367">"手机射频所耗的电量"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"移动网络所耗的电量"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"不在信号覆盖范围内时切换到飞行模式，以节约电量"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"显示屏和背光所耗的电量"</string>
-    <string name="battery_sugg_display" msgid="3370202402045141760">"降低屏幕亮度，并且/或者缩短屏幕超时时间"</string>
-    <string name="battery_desc_wifi" msgid="2375567464707394131">"WLAN 耗电量"</string>
-    <string name="battery_sugg_wifi" msgid="3355461362094706957">"未使用或无法使用 WLAN 网络时关闭 WLAN"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"降低屏幕亮度，缩短休眠延时"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"WLAN网络所耗的电量"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"未使用或无法使用WLAN网络时将WLAN关闭"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"蓝牙所耗的电量"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"请在不使用蓝牙功能时将其关闭"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"尝试连接另一蓝牙设备"</string>
-    <string name="battery_desc_apps" msgid="8530418792605735226">"应用所耗电量"</string>
+    <string name="battery_desc_apps" msgid="8530418792605735226">"应用所耗的电量"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"停止或卸载应用"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"选择“耗电量低”模式"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"该应用中可能提供了用于减少耗电量的设置"</string>
-    <string name="battery_desc_users" msgid="7682989161885027823">"用户所耗电量"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"用户所耗的电量"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"拔下电源后已过 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <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">"Android OS"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"Android操作系统"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"媒体服务器"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"进程统计信息"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"运行中进程的相关技术统计信息"</string>
@@ -1548,8 +1548,8 @@
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"前台"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"缓存"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"设备内存当前状态：<xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"RAM 平均使用率"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM 最高使用率"</string>
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"内存平均使用率"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"内存最高使用率"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"运行时间"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"服务"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"时间长度"</string>
@@ -1566,7 +1566,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">"Android 键盘"</string>
+    <string name="keyboard_settings_title" msgid="5080115226780201234">"Android键盘"</string>
     <string name="voice_category" msgid="1430370497125803904">"语音"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"语音识别程序"</string>
     <string name="recognizer_settings_title" msgid="432493301215113154">"语音搜索"</string>
@@ -1619,7 +1619,7 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"首选引擎"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"常规"</string>
     <string name="gadget_title" msgid="5519037532720577836">"电量控制"</string>
-    <string name="gadget_toggle_wifi" msgid="319262861956544493">"正在更新 WLAN 设置"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"正在更新WLAN设置"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"正在更新蓝牙设置"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g><xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"开启"</string>
@@ -1638,9 +1638,9 @@
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"凭据存储"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"从存储设备安装"</string>
-    <string name="credentials_install" product="default" msgid="953914549998062317">"从 SD 卡安装"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"从SD卡安装"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"从存储设备安装证书"</string>
-    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"从 SD 卡安装证书"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"从SD卡安装证书"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"清除凭据"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"删除所有证书"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"信任的凭据"</string>
@@ -1661,7 +1661,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"凭据存储已删除。"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"系统无法清除凭据存储。"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"凭证存储已启用。"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"您需要先设置锁定屏幕 PIN 或密码才能使用凭据存储。"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"您需要先设置锁屏PIN码或密码才能使用凭据存储。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"紧急提示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"设置进行紧急呼救时的行为"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"备份和重置"</string>
@@ -1669,7 +1669,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"备份和还原"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"个人数据"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"备份我的数据"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"将应用数据、WLAN 密码和其他设置备份到 Google 服务器"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"将应用数据、WLAN密码和其他设置备份到Google服务器"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"备份帐户"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"目前没有帐户存储备份数据"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"自动还原"</string>
@@ -1681,7 +1681,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"新密码和确认密码不一致"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"设置备份密码失败"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"要停止备份您的 WLAN 密码、书签、其他设置和应用数据，并清除 Google 服务器上的所有副本吗？"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"要停止备份您的WLAN密码、书签、其他设置和应用数据，并清除Google服务器上的所有副本吗？"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"设备管理设置"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"设备管理器"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"取消激活"</string>
@@ -1697,10 +1697,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"通知"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"来电铃声和振动"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"系统"</string>
-    <string name="wifi_setup_title" msgid="2970260757780025029">"WLAN 设置"</string>
-    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"连接到 WLAN 网络“<xliff:g id="NETWORK_NAME">%s</xliff:g>”"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"正在连接到 WLAN 网络“<xliff:g id="NETWORK_NAME">%s</xliff:g>”…"</string>
-    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"已连接到 WLAN 网络“<xliff:g id="NETWORK_NAME">%s</xliff:g>”"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"WLAN设置"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"连接到WLAN网络“<xliff:g id="NETWORK_NAME">%s</xliff:g>”"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"正在连接到WLAN网络“<xliff:g id="NETWORK_NAME">%s</xliff:g>”…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"已连接到WLAN网络“<xliff:g id="NETWORK_NAME">%s</xliff:g>”"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"添加网络"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"未连接"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"添加网络"</string>
@@ -1722,9 +1722,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"正在连接..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"转至下一步"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"不支持 EAP。"</string>
-    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"您无法在设置过程中配置 EAP WLAN 连接。设置完毕后，您可以在“设置”&gt;“无线和网络”中进行配置。"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"您无法在设置过程中配置 EAPWLAN连接。设置完毕后，您可以在“设置”&gt;“无线和网络”中进行配置。"</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"建立连接可能需要几分钟时间..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"触摸"<b>"下一步"</b>"可继续进行设置。\n\n触摸"<b>"返回"</b>"可连接到其他 WLAN 网络。"</string>
+    <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_error" msgid="8703299118794272041">"同步错误。"</string>
@@ -1733,10 +1733,10 @@
     <string name="account_sync_settings_title" msgid="5131314922423053588">"同步"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"同步操作当前遇到了一些问题，很快便可恢复。"</string>
     <string name="add_account_label" msgid="7811707265834013767">"添加帐户"</string>
-    <string name="background_data" msgid="5779592891375473817">"后台数据"</string>
+    <string name="background_data" msgid="5779592891375473817">"后台流量"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"应用可以随时同步、发送和接收数据"</string>
-    <string name="background_data_dialog_title" msgid="6059217698124786537">"要停用后台数据吗？"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"停用后台数据可延长电池待机时间并减少数据流量的使用，但某些应用可能仍会使用后台数据连接。"</string>
+    <string name="background_data_dialog_title" msgid="6059217698124786537">"要关闭后台流量吗？"</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"停用后台流量可延长电池使用时间并减少流量耗用，但某些应用可能仍会使用后台数据网络。"</string>
     <string name="sync_automatically" msgid="1682730255435062059">"自动同步应用数据"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"同步功能已开启"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"同步功能已关闭"</string>
@@ -1769,7 +1769,7 @@
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"无法手动同步"</string>
-    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"目前，此条目的同步功能已停用。要更改此设置，请暂时启用后台数据和自动同步功能。"</string>
+    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"此项内容的同步功能目前未开启。要更改此设置，请暂时开启后台流量和自动同步功能。"</string>
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 地址"</string>
     <string name="enter_password" msgid="4131758584074246224">"键入密码以解密存储设备"</string>
@@ -1832,16 +1832,16 @@
     <string name="show_all_anrs" msgid="28462979638729082">"显示所有“应用无响应”(ANR)"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"为后台应用显示“应用无响应”对话框"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"流量使用情况"</string>
-    <string name="data_usage_cycle" msgid="5652529796195787949">"流量使用周期"</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_split_4g" msgid="5322857680792601899">"单独显示 4G 流量"</string>
-    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"显示 WLAN 使用情况"</string>
-    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"显示以太网使用情况"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"单独显示4G流量"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"显示WLAN流量"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"显示有线网络流量"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"移动热点"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"自动同步数据"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"更改周期..."</string>
-    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"流量使用周期的日期设置："</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"流量周期设置："</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"没有任何应用在此期间产生过数据流量。"</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"前台"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"后台"</string>
@@ -1850,9 +1850,9 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"设置移动数据流量限制"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"设置 4G 数据流量限制"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"设置 2G-3G 数据流量限制"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"设置 WLAN 数据流量上限"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"设置WLAN数据流量上限"</string>
     <string name="data_usage_tab_wifi" msgid="481146038146585749">"WLAN"</string>
-    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"以太网"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"有线网络"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"移动"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
@@ -1862,29 +1862,29 @@
     <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_summary" msgid="518658001418490405">"使用移动网络时停用后台数据。系统会尽量使用非移动网络。"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"要限制此应用使用后台数据，请先设置移动数据上限。"</string>
-    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"限制后台数据？"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"只能连接到移动网络时，此功能可能会导致需要使用后台数据的应用停止运行。\n\n您可以在相关应用的设置中查找更合适的数据流量控制选项。"</string>
-    <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"您只有在设置移动数据上限后才能限制后台数据。"</string>
+    <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"限制后台流量"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"使用移动网络时关闭后台流量。系统会尽量使用非移动网络。"</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"要限制此应用使用后台流量，请先设置移动数据流量上限。"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"要限制后台流量吗？"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"只能连接到移动网络时，此功能可能会导致需要使用后台流量的应用无法正常运行。\n\n您可以在相关应用的设置中为其设定更合适的数据流量控制选项。"</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"您需要先设置移动数据流量上限后才能限制后台流量。"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"要打开自动同步数据功能吗？"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"您在网络上对您的帐户进行的所有更改都会自动同步到您的平板电脑。\n\n有些帐户还可以将您在平板电脑上进行的所有更改自动同步到网络上。这就是 Google 帐户的精彩之处。\n\n要选择每个帐户中要同步哪些类型的信息，请转到“设置 &gt; 帐户”。"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"您在网络上对您的帐户进行的所有更改都会自动同步到您的手机。\n\n有些帐户还可以将您在手机上进行的所有更改自动同步到网络上。这就是 Google 帐户的精彩之处。\n\n要选择每个帐户中要同步哪些类型的信息，请转到“设置 &gt; 帐户”。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"您在网络上对您的帐户进行的所有更改都会自动同步到您的平板电脑。\n\n有些帐户还可以将您在平板电脑上进行的所有更改自动同步到网络上。这就是Google帐户的精彩之处。\n\n要选择每个帐户中要同步哪些类型的信息，请转到“设置 &gt; 帐户”。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"您在网络上对您的帐户进行的所有更改都会自动同步到您的手机。\n\n有些帐户还可以将您在手机上进行的所有更改自动同步到网络上。这就是Google帐户的精彩之处。\n\n要选择每个帐户中要同步哪些类型的信息，请转到“设置 &gt; 帐户”。"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"要关闭自动同步数据功能吗？"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"这样可以节省数据流量和电池电量，但您需要手动同步每个帐户才能获得最新信息，并且在有更新时不会收到通知。"</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"使用情况周期重置日期"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"流量重置日期"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"日期："</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"确定"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"设置流量使用量警告"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"设置数据使用限制"</string>
-    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"正在限制数据使用量"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"设置流量用量警告"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"设置流量限制"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"限制流量使用"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"达到指定的数据流量上限时，系统会停用您的移动数据连接。\n\n由于数据流量是由您的平板电脑计算得出的，您的运营商对于流量的计算方法可能有所不同，因此请考虑设置一个较低的上限。"</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"达到指定的数据流量上限时，系统会停用您的移动数据连接。\n\n由于数据流量是由您的手机计算得出的，您的运营商对于流量的计算方法可能有所不同，因此请考虑设置一个较低的上限。"</string>
-    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"限制后台数据？"</string>
-    <string name="data_usage_restrict_background" msgid="8447934953579275363">"如果您限制在后台使用移动数据网络，则在未连接到 WLAN 网络时，部分应用和服务将会无法运行。"</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"如果您限制在后台使用移动数据网络，则在未连接到 WLAN 网络时，部分应用和服务将会无法运行。\n\n此设置会影响这台平板电脑上的所有用户。"</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"如果您限制在后台使用移动数据网络，则在未连接到 WLAN 网络时，部分应用和服务将会无法运行。\n\n此设置会影响这部手机上的所有用户。"</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"要限制后台流量吗？"</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"如果您限制在后台使用移动数据网络，则在未连接到WLAN网络时，部分应用和服务将会无法运行。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"如果您限制在后台使用移动数据网络，则在未连接到WLAN网络时，部分应用和服务将会无法运行。\n\n此设置会影响这台平板电脑上的所有用户。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"如果您限制在后台使用移动数据网络，则在未连接到WLAN网络时，部分应用和服务将会无法运行。\n\n此设置会影响这部手机上的所有用户。"</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">"警告"</font></string>
     <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">"限制"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"已删除的应用"</string>
@@ -1894,10 +1894,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>：已使用约 <xliff:g id="TOTAL">%1$s</xliff:g>，由您的平板电脑计算得出。您的运营商对于流量的计算方法可能有所不同。"</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>：已使用约 <xliff:g id="TOTAL">%1$s</xliff:g>，由您的手机计算得出。您的运营商对于流量的计算方法可能有所不同。"</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"移动热点"</string>
-    <string name="data_usage_metered_body" msgid="4959032833706695848">"选择属于移动热点的 WLAN 网络。这样可限制应用在后台使用这些网络。应用在使用这些网络下载较大的文件时，还可能会发出警告。"</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"选择属于移动热点的WLAN网络。这样可限制应用在后台使用这些网络。应用在使用这些网络下载较大的文件时，还可能会发出警告。"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"移动网络"</string>
-    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"WLAN 网络"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"要选择移动热点，请打开 WLAN。"</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"WLAN网络"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"要选择移动热点，请打开WLAN。"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"紧急呼救"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"返回通话"</string>
     <string name="vpn_name" msgid="4689699885361002297">"名称"</string>
@@ -1923,16 +1923,16 @@
     <string name="vpn_cancel" msgid="1979937976123659332">"取消"</string>
     <string name="vpn_save" msgid="4233484051644764510">"保存"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"连接"</string>
-    <string name="vpn_edit" msgid="8647191407179996943">"编辑 VPN 配置文件"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"编辑VPN配置文件"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"连接到<xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <string name="vpn_create" msgid="5628219087569761496">"添加 VPN 配置文件"</string>
+    <string name="vpn_create" msgid="5628219087569761496">"添加VPN配置文件"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"修改配置文件"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"删除配置文件"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"始终开启的 VPN"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"选择要始终保持连接的 VPN 配置文件。只有在连接到此 VPN 之后才可以使用网络。"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"始终开启的VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"选择要始终保持连接的VPN配置文件。只有在连接到此VPN之后才可以使用网络。"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"无"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"始终开启的 VPN 需要服务器和 DNS 的 IP 地址。"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"始终开启的VPN需要服务器和DNS的IP地址。"</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"目前没有网络连接。请稍后重试。"</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"证书缺失。请修改配置文件。"</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"系统"</string>
@@ -1977,14 +1977,14 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"用户"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"受限个人资料"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"添加新用户"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"您可以通过创建新用户来与其他人共享此设备。每个用户都会有自己的空间，其中可以容纳他们自己的应用、壁纸等内容。用户可以调整 WLAN 等会影响到所有用户的平板电脑设置。\n\n您创建新用户后，该用户必须完成设置流程。\n\n任何用户均可代表其他所有用户接受应用的新权限。"</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"您可以通过创建新用户来与其他人共享此设备。每个用户都会有自己的空间，其中可以容纳他们自己的应用、壁纸等内容。用户可以调整WLAN等会影响到所有用户的平板电脑设置。\n\n您创建新用户后，该用户必须完成设置流程。\n\n任何用户均可代表其他所有用户接受应用的新权限。"</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"您创建新用户后，该用户必须完成设置流程。\n\n任何用户均可代表其他所有用户接受应用的新权限。"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"是否立即设置用户？"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"请让这个人拿过平板电脑，让其设置自己的空间。"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"要立即设置个人资料吗？"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"立即设置"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"以后再说"</string>
-    <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"只有平板电脑的拥有者可以管理用户。"</string>
+    <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"只有平板电脑的机主可以管理用户。"</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"只有手机的机主可以管理用户。"</string>
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"受限个人资料无法添加帐户"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"将<xliff:g id="USER_NAME">%1$s</xliff:g>从此设备中删除"</string>
@@ -2032,8 +2032,8 @@
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"受“<xliff:g id="APP">%1$s</xliff:g>”控制"</string>
     <string name="app_not_supported_in_limited" msgid="913035259626149121">"受限个人资料无法使用此应用"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"此应用可使用您的帐户"</string>
-    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"WLAN 和移动网络"</string>
-    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"允许修改 WLAN 和移动网络设置"</string>
+    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"WLAN和移动网络"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"允许修改WLAN和移动网络设置"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"蓝牙"</string>
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"允许修改蓝牙配对和设置"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index e38952c79a..ed15529eab 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -85,7 +85,7 @@
   </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
-    <item msgid="8934131797783724664">"掃描中…"</item>
+    <item msgid="8934131797783724664">"掃瞄中…"</item>
     <item msgid="8513729475867537913">"正在連線..."</item>
     <item msgid="515055375277271756">"正在驗證…"</item>
     <item msgid="1943354004029184381">"正在取得 IP 位址…"</item>
@@ -99,7 +99,7 @@
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
-    <item msgid="8878186979715711006">"掃描中…"</item>
+    <item msgid="8878186979715711006">"掃瞄中…"</item>
     <item msgid="355508996603873860">"正在連線到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="554971459996405634">"正在取得 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 的授權…"</item>
     <item msgid="7928343808033020343">"正在從 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 取得 IP 位址…"</item>
@@ -152,13 +152,13 @@
     <item msgid="5702329417707689835">"優"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"一律"</item>
-    <item msgid="844721238536786870">"僅限連接電源時採用"</item>
+    <item msgid="3269131034472904310">"永遠"</item>
+    <item msgid="844721238536786870">"只在充電時"</item>
     <item msgid="2990218920631468642">"永不 (增加數據用量)"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"一律"</item>
-    <item msgid="7433294150916905997">"僅限連接電源時採用"</item>
+    <item msgid="2124319326282651391">"永遠"</item>
+    <item msgid="7433294150916905997">"只在充電時"</item>
     <item msgid="1390404486722375028">"永不"</item>
   </string-array>
   <string-array name="wifi_frequency_band_entries">
@@ -376,12 +376,12 @@
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"不要檢查"</item>
     <item msgid="6042769699089883931">"僅檢查 DRM 內容"</item>
-    <item msgid="9174900380056846820">"一律檢查"</item>
+    <item msgid="9174900380056846820">"永遠檢查"</item>
   </string-array>
   <string-array name="hdcp_checking_summaries">
     <item msgid="505558545611516707">"不使用 HDCP 檢查"</item>
     <item msgid="3878793616631049349">"僅使用 HDCP 檢查 DRM 內容"</item>
-    <item msgid="45075631231212732">"一律使用 HDCP 檢查"</item>
+    <item msgid="45075631231212732">"永遠使用 HDCP 檢查"</item>
   </string-array>
   <string-array name="window_animation_scale_entries">
     <item msgid="8134156599370824081">"關閉動畫"</item>
@@ -433,8 +433,8 @@
   </string-array>
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"關閉"</item>
-    <item msgid="2751513398307949636">"在屏幕上以列顯示"</item>
-    <item msgid="8272260411216018353">"在屏幕上以行顯示"</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">
@@ -470,7 +470,7 @@
   <string-array name="security_settings_premium_sms_values">
     <item msgid="7389829271787670252">"詢問"</item>
     <item msgid="5077768429488260031">"永不允許"</item>
-    <item msgid="1417929597727989746">"一律允許"</item>
+    <item msgid="1417929597727989746">"永遠允許"</item>
   </string-array>
   <string-array name="ram_states">
     <item msgid="7088762389498381203">"正常"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index b1df4b106b..7243e8e0dd 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -76,8 +76,8 @@
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD 卡"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"電池狀態："</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"電源插頭："</string>
-    <string name="battery_info_scale_label" msgid="3649763192389778437">"電池存量："</string>
-    <string name="battery_info_level_label" msgid="8706526709307788737">"電池存量："</string>
+    <string name="battery_info_scale_label" msgid="3649763192389778437">"電量："</string>
+    <string name="battery_info_level_label" msgid="8706526709307788737">"電量："</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"電池狀態："</string>
     <string name="battery_info_technology_label" msgid="788304533220748681">"電池技術："</string>
     <string name="battery_info_voltage_label" msgid="8971764146757637863">"電池電壓："</string>
@@ -87,7 +87,7 @@
     <string name="battery_info_uptime" msgid="5548545143573527992">"已開機時間："</string>
     <string name="battery_info_awake_battery" msgid="2557725975486185849">"電池的啟用時間："</string>
     <string name="battery_info_awake_plugged" msgid="176716874713478188">"充電時的啟用時間："</string>
-    <string name="battery_info_screen_on" msgid="376277447175613889">"屏幕開啟時間："</string>
+    <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="5874340256342956252">"(AC)"</string>
@@ -122,7 +122,7 @@
     <string name="bluetooth_device_details" msgid="4594773497930028085">"裝置設定"</string>
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"個人資料設定"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"名稱未設定，改用帳戶名稱"</string>
-    <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"掃描裝置"</string>
+    <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"掃瞄裝置"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"為平板電腦重新命名"</string>
     <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"重新命名手機"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"重新命名"</string>
@@ -254,8 +254,8 @@
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB 儲存裝置在使用期間被移除！"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD 卡在使用期間被移除！"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"已用空間 (位元組)："</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"正在掃描 USB 儲存裝置中的媒體..."</string>
-    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"正在掃描 SD 卡中的媒體..."</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"正在掃瞄 USB 儲存裝置中的媒體..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"正在掃瞄 SD 卡中的媒體..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB 儲存裝置已掛接為唯讀裝置。"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD 記憶卡已掛接為唯讀裝置。"</string>
     <string name="skip_label" msgid="47510779345218297">"略過"</string>
@@ -287,7 +287,7 @@
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"如果您允許數據漫遊，可能需要支付高昂的漫遊費用！\n\n這項設定會影響這部平板電腦的所有用戶。"</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"如果您允許數據漫遊，可能需要支付高昂的漫遊費用！\n\n這項設定會影響這部手機的所有用戶。"</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"允許數據漫遊？"</string>
-    <string name="networks" msgid="6333316876545927039">"選擇電訊公司"</string>
+    <string name="networks" msgid="6333316876545927039">"選擇網絡供應商"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"選擇網絡供應商"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日期和時間"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"設定日期及時間"</string>
@@ -301,7 +301,7 @@
     <string name="date_time_24hour" msgid="1193032284921000063">"使用 24 小時格式"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"設定時間"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"選取時區"</string>
-    <string name="date_time_set_date" msgid="7021491668550232105">"日期設定"</string>
+    <string name="date_time_set_date" msgid="7021491668550232105">"設定日期"</string>
     <string name="date_time_date_format" msgid="6951498879879281102">"選擇日期格式"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"按英文字母排序"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"按時區排序"</string>
@@ -323,7 +323,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"在上鎖畫面上顯示個人檔案資料"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"個人檔案資料"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"位置"</string>
-    <string name="security_settings_title" msgid="7945465324818485460">"安全"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"安全性"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、螢幕解鎖及認證儲存空間鎖定"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密碼"</string>
@@ -340,7 +340,7 @@
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"請將電池充電，然後再試一次。"</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"請插上充電器，然後再試一次。"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"沒有鎖定螢幕的 PIN 或密碼"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"您必須先設定鎖定屏幕的 PIN 或密碼，才能開始加密。"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"您必須先設定鎖定螢幕的 PIN 或密碼，才能開始加密。"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"加密？"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"您無法取消加密操作，如果過程中斷，將會失去資料。加密程序需時 1 個小時或以上，您的平板電腦會在過程中重新啟動數次。"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"您無法取消加密操作，如果過程中斷，將會失去資料。加密程序需時 1 個小時或以上，您的手機會在過程中重新啟動數次。"</string>
@@ -353,12 +353,12 @@
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"加密程序中斷且未完成，因此您無法再存取平板電腦上的資料。\n\n如要繼續使用平板電腦，您必須恢復原廠設定。完成重設後，您可以在設定平板電腦時，還原先前備份至「Google 帳戶」的資料。"</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"加密程序中斷且未完成，因此您無法再存取手機上的資料。\n\n如要繼續使用手機，您必須恢復原廠設定。完成重設後，您可以在設定手機時，還原先前備份至「Google 帳戶」的資料。"</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"切換輸入法"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"選擇屏幕上鎖方式"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"選擇螢幕鎖定方式"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"選擇備份解鎖方式"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"屏幕鎖定"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"更改屏幕鎖定"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"螢幕鎖定"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"更改螢幕鎖定"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"變更或停用解鎖圖形、PIN 或密碼安全性"</string>
-    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"選擇您要鎖定屏幕的方式"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"選擇您要鎖定螢幕的方式"</string>
     <string name="unlock_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>
@@ -369,7 +369,7 @@
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"圖案"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"中等安全性設定"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"中高等安全性設定"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"中至高等安全性設定"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"密碼"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"高等安全性設定"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"已由管理員、加密政策或認證儲存空間停用"</string>
@@ -463,7 +463,7 @@
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"無法與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 通訊。"</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」拒絕配對要求。"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"無法連接「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。"</string>
-    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"掃描裝置"</string>
+    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"掃瞄裝置"</string>
     <string name="bluetooth_search_for_devices" msgid="5957007154213560390">"搜尋裝置"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"正在搜尋..."</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"裝置設定"</string>
@@ -537,7 +537,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"關閉"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC 已關閉，因此無法使用"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"當啟用這項功能時，您只要將裝置靠在一起，即可把應用程式內容放送至另一部支援 NFC 的裝置。例如，您可以放送「瀏覽器」頁面、YouTube 影片、「人物」聯絡人資料等內容。\n\n只要將裝置靠在一起 (通常是背靠背)，然後輕觸屏幕，接著應用程式會決定要放送哪些內容。"</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"開啟此功能後，您便可將裝置與另一部支援 NFC 的裝置靠在一起，以傳送應用程式內容，例如：瀏覽器網頁、YouTube 影片、聯絡人資料等。\n\n只要將裝置靠在一起 (通常是背靠背)，然後輕觸螢幕即可，應用程式會決定傳送哪些內容。"</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"網絡服務偵測"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"允許其他裝置上的應用程式偵測到這部裝置上的應用程式"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
@@ -551,28 +551,28 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"正在關閉 Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"錯誤"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"處於飛行模式"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"無法掃描網絡"</string>
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"無法掃瞄網絡"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"網絡通知"</string>
-    <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"可連上網絡時通知我"</string>
+    <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"有開放網絡時通知我"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"已避免欠佳的連線"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"除非互聯網連線穩定，否則不要使用 Wi-Fi 網絡"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"一律可掃瞄"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"永遠可掃瞄"</string>
     <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"讓 Google 的位置資訊服務和其他應用程式掃瞄網絡 (即使 Wi-Fi 已關閉)"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"安裝憑證"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"為了提高位置精確度及用於其他用途，Google 和其他應用程式可能會掃瞄附近的 Wi-Fi 網絡 (即使 Wi-Fi 功能已關閉)。如果您不想授予這項權限，可前往 [進階] &gt; [一律可掃瞄] 更改設定。"</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"應用程式可能會掃瞄附近的網絡 (即使 Wi-Fi 功能已關閉)。如果您不想授予這項權限，可前往 [進階] &gt; [一律可掃瞄] 更改設定。"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"為了提高位置精確度並用作其他用途，即使 Wi-Fi 已關閉，Google 和其他應用程式亦可能會掃瞄附近的網絡。如不想啟用此功能，可前往 [進階] &gt; [永遠可掃瞄] 更改設定。"</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"即使 Wi-Fi 已關閉，應用程式亦可能會掃瞄附近的網絡。如不想啟用此功能，可前往 [進階] &gt; [永遠可掃瞄] 更改設定。"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"不用再顯示"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"休眠期間仍連接 Wi-Fi 網絡"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"休眠時繼續連接 Wi-Fi 網絡"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"變更設定時發生問題"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi 優化"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"開啟 Wi-Fi 時盡可能節約電池用量"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"開啟 Wi-Fi 時盡量節約用電"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"新增網絡"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi 網絡"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS 按鈕"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"更多選項"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN 輸入"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"輸入 WPS PIN"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
-    <string name="wifi_menu_scan" msgid="1470911530412095868">"掃描"</string>
+    <string name="wifi_menu_scan" msgid="1470911530412095868">"掃瞄"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"進階設定"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"連線至網絡"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"刪除網絡"</string>
@@ -599,13 +599,13 @@
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"偵測到其他 WPS 工作階段，請在數分鐘後再試。"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"網絡 SSID"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"輸入 SSID"</string>
-    <string name="wifi_security" msgid="6603611185592956936">"安全"</string>
+    <string name="wifi_security" msgid="6603611185592956936">"安全性"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"訊號強度"</string>
     <string name="wifi_status" msgid="4824568012414605414">"狀態"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"連線速度"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP 位址"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP 方法"</string>
-    <string name="please_select_phase2" msgid="5231074529772044898">"階段 2 驗證"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"第二階段驗證"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA 憑證"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"用戶憑證"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"身分"</string>
@@ -617,7 +617,7 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(未指定)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"已儲存"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"已停用"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"已避免欠佳的互聯網連線"</string>
+    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"避免使用欠佳的互聯網連線"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"驗證問題"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"超出可用範圍"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"有 WPS 可供使用"</string>
@@ -635,8 +635,8 @@
     <string name="wifi_save" msgid="3331121567988522826">"儲存"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"無法儲存網絡"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"取消"</string>
-    <string name="wifi_skip_anyway" msgid="6965361454438011190">"一律跳過"</string>
-    <string name="wifi_dont_skip" msgid="7350341524881124808">"不要跳過"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"仍要略過"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"不要略過"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"警告：您可能需要支付額外的數據傳輸費用。\n\n平板電腦設定程序可佔用大量網絡流量。"</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告：您可能需要支付額外的數據傳輸費用。\n\n手機設定程序可佔用大量網絡流量。"</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"警告：您必須先連接互聯網，平板電腦才能驗證您所使用的軟件是否最新版本。"</string>
@@ -679,11 +679,11 @@
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"可攜式 Wi-Fi 熱點"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"正在開啟熱點…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"正在關閉熱點…"</string>
-    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"可攜式無線基地台 <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 已啟用"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"可攜式熱點 <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 已啟用"</string>
     <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"可攜式 Wi-Fi 熱點發生錯誤"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"設定 Wi-Fi 熱點"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> 可攜式 Wi-Fi 熱點"</string>
-    <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android 無線基地台"</string>
+    <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android 熱點"</string>
     <string name="home_settings" msgid="212375129455718176">"主畫面"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
@@ -705,7 +705,7 @@
     <string name="dock_settings_summary" msgid="455802113668982481">"隨附的座架音效設定"</string>
     <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="lock_sounds_enable_title" msgid="450098505659399520">"螢幕鎖定音效"</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>
@@ -743,7 +743,7 @@
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"旋轉平板電腦時自動切換瀏覽模式"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"旋轉手機時自動改變顯示方向"</string>
     <string name="brightness" msgid="2354961343555249270">"亮度"</string>
-    <string name="brightness_summary" msgid="838917350127550703">"調校屏幕亮度"</string>
+    <string name="brightness_summary" msgid="838917350127550703">"調校螢幕亮度"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 後"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"桌布"</string>
@@ -885,7 +885,7 @@
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"安裝檔案傳輸工具"</string>
     <string name="storage_other_users" msgid="808708845102611856">"其他用戶"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"電池狀態"</string>
-    <string name="battery_level_title" msgid="2965679202786873272">"電池存量"</string>
+    <string name="battery_level_title" msgid="2965679202786873272">"電量"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
     <string name="apn_edit" msgid="1354715499708424718">"編輯接入點"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"未設定"</string>
@@ -965,17 +965,17 @@
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"設定留言信箱、來電轉接、來電待接和來電顯示"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 網絡共享"</string>
-    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"可攜式無線基地台"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"可攜式熱點"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"藍牙網絡共享"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"網絡共享"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"網絡共享及便攜式熱點"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"網絡共享和可攜式熱點"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB 網絡共用"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"已連接 USB，選取即可進行網絡共用"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB 網絡共享"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"已連接 USB，勾選即可共享網絡"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"已共用網絡"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"使用 USB 儲存裝置時無法進行網絡共用"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"使用 USB 儲存裝置時無法共享網絡"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB 尚未連線"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB 網絡共用發生錯誤"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB 網絡共享發生錯誤"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"藍牙網絡共享"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"分享這個平板電腦的互聯網連線"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"分享這部手機的互聯網連線"</string>
@@ -986,7 +986,7 @@
     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"未分享這個平板電腦的互聯網連線"</string>
     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"未分享這部手機的互聯網連線"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"未共用網絡"</string>
-    <string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"最多只能讓 <xliff:g id="MAXCONNECTION">%1$d</xliff:g> 部裝置進行網絡共用。"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"不可與超過 <xliff:g id="MAXCONNECTION">%1$d</xliff:g> 部裝置分享網絡。"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的網絡共享即將中斷。"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"說明"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"流動網絡"</string>
@@ -1002,7 +1002,7 @@
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精確度"</string>
-    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"節約電池用量"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"省電模式"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"只限裝置"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"位置關閉"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近的定位要求"</string>
@@ -1057,7 +1057,7 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"已設定密碼"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"已設定 PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"已設定圖形"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"屏幕安全"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"螢幕安全"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"更改解鎖圖形"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"變更解鎖 PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"確認已儲存的圖形"</string>
@@ -1075,7 +1075,7 @@
     <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"繼續"</string>
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"解鎖圖形"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"需要解鎖圖形"</string>
-    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"必須畫出圖形來為屏幕解鎖"</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_power_button_instantly_locks" msgid="5735444062633666327">"按開關按鈕即時上鎖"</string>
@@ -1126,7 +1126,7 @@
     <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"您已選擇允許這應用程式建立小工具並存取其資料。"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"未設定預設值。"</string>
     <string name="clear_activities" msgid="7408923511535174430">"清除預設值"</string>
-    <string name="screen_compatibility_text" msgid="1616155457673106022">"這個應用程式的設計可能與您的屏幕不兼容；您可以在這裡進行設定，將應用程式調整成與您的屏幕兼容。"</string>
+    <string name="screen_compatibility_text" msgid="1616155457673106022">"這個應用程式的設計可能與您的螢幕不兼容；您可以在這裡進行設定，將應用程式調整成與您的螢幕兼容。"</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"啓動時詢問"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"調整應用程式比例"</string>
     <string name="unknown" msgid="1592123443519355854">"未知"</string>
@@ -1242,8 +1242,8 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"停止系統服務？"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"如果您停用這項服務，您平板電腦上的某些功能可能會停止正常運作，待您重新開機後才會恢復正常。"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"如果您停用這項服務，您手機上的某些功能可能會停止正常運作，待您重新開機後才會恢復正常。"</string>
-    <string name="language_settings" msgid="5292716747264442359">"語言與輸入裝置"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"語言與輸入裝置"</string>
+    <string name="language_settings" msgid="5292716747264442359">"語言和輸入設定"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"語言和輸入設定"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"語言設定"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"鍵盤與輸入法"</string>
     <string name="phone_language" msgid="8870144109924299673">"語言"</string>
@@ -1262,7 +1262,7 @@
     <string name="spellchecker_language" msgid="6041050114690541437">"語言"</string>
     <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"無法開啟 <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> 的設定"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"滑鼠/觸控板"</string>
-    <string name="pointer_speed" msgid="1221342330217861616">"指標速度"</string>
+    <string name="pointer_speed" msgid="1221342330217861616">"游標速度"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"遊戲控制器"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"使用震動"</string>
     <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"連接時使遊戲控制器產生震動。"</string>
@@ -1288,7 +1288,7 @@
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"編輯"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"刪除"</string>
     <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"您的用戶字典中沒有任何字詞，請輕觸 [新增] ( + ) 按鈕，即可新增字詞。"</string>
-    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"適用所有語言"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"所有語言"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"更多語言..."</string>
     <string name="testing" msgid="6584352735303604146">"測試"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"平板電腦資訊"</string>
@@ -1308,17 +1308,17 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"文字輸入"</string>
     <string name="input_method" msgid="5434026103176856164">"輸入法"</string>
     <string name="current_input_method" msgid="234072873286056438">"預設"</string>
-    <string name="input_method_selector" msgid="4311213129681430709">"輸入方式選取工具"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"輸入法選取工具"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"自動"</string>
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"永遠顯示"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"永遠隱藏"</string>
-    <string name="configure_input_method" msgid="1317429869771850228">"設定輸入方式"</string>
+    <string name="configure_input_method" msgid="1317429869771850228">"設定輸入法"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"設定"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"設定"</string>
     <string name="active_input_method_subtypes" msgid="3596398805424733238">"可用的輸入法"</string>
     <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"使用系統語言"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> 設定"</string>
-    <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"選擇啟用的輸入方式"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"選擇啟用的輸入法"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"螢幕鍵盤設定"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"實體鍵盤"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"實體鍵盤設定"</string>
@@ -1331,7 +1331,7 @@
     <string name="bugreport_in_power" msgid="4548816486587403971">"電源選單錯誤報告"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"在電源選單中包括取得錯誤報告的選項"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"保持啟用"</string>
-    <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電時屏幕一律不進入休眠狀態"</string>
+    <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電時螢幕永不休眠"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"啟用藍牙 HCI 窺探記錄"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"擷取單一檔案內的所有藍牙 HCI 封包"</string>
     <string name="select_runtime_title" msgid="649783802363155346">"選取執行階段"</string>
@@ -1362,7 +1362,7 @@
     <string name="widget_picker_title" msgid="9130684134213467557">"選擇小工具"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"是否要建立小工具並允許存取？"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"建立小工具後，「<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>」便可以存取所顯示的所有資料。"</string>
-    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"一律允許「<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>」建立小工具並存取其資料"</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"永遠允許「<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>」建立小工具並存取其資料"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> 天 <xliff:g id="HOURS">%2$d</xliff:g> 小時 <xliff:g id="MINUTES">%3$d</xliff:g> 分 <xliff:g id="SECONDS">%4$d</xliff:g> 秒"</string>
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> 時 <xliff:g id="MINUTES">%2$d</xliff:g> 分 <xliff:g id="SECONDS">%3$d</xliff:g> 秒"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> 分 <xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string>
@@ -1382,15 +1382,15 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"系統"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"字幕"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"放大手勢"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"當這項功能啟用時，您只要在屏幕上輕按三下，即可縮放。\n\n放大時，您可以：\n"<ul><li>"平移：使用兩隻或以上手指在屏幕上拖曳。"</li>\n<li>"調整縮放級數：併攏或分開兩隻或以上手指。"</li></ul>\n\n"此外，您只要輕按三下並按住不放，即可暫時放大手指所觸及的畫面。在這種放大狀態下，您可以手指拖曳，以探索畫面的不同部分。放開手指後，畫面將隨即回復原先的狀態。\n\n注意：除了鍵盤與導覽列部分外，您可在其他部分輕按三下，以放大畫面。"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"當這項功能啟用時，您只要在螢幕上輕按三下，即可縮放。\n\n放大時，您可以：\n"<ul><li>"平移：使用兩隻或以上手指在螢幕上拖曳。"</li>\n<li>"調整縮放級數：併攏或分開兩隻或以上手指。"</li></ul>\n\n"此外，您只要輕按三下並按住不放，即可暫時放大手指所觸及的畫面。在這種放大狀態下，您可以手指拖曳，以探索畫面的不同部分。放開手指後，畫面將隨即回復原先的狀態。\n\n注意：除了鍵盤與導覽列部分外，您可在其他部分輕按三下，以放大畫面。"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"協助工具捷徑"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"開啟"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"關閉"</string>
     <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"當這項功能開啟時，您可以以兩個步驟快速啟用協助工具：\n\n步驟 1：按住電源按鈕不放，直至聽見音效或感到震動。\n\n步驟 2：用兩隻手指輕觸並按住，直至聽見確認音效。\n\n如果有多位用戶共用裝置，在上鎖的畫面上使用這個捷徑可暫時啟用協助工具，直至為裝置解鎖為止。"</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"大字體"</string>
-    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"屏幕放大"</string>
-    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"自動更新屏幕放大設定"</string>
-    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"在應用程式轉場時更新屏幕放大設定"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"螢幕放大"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"自動更新螢幕放大設定"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"在應用程式轉場時更新螢幕放大設定"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"電源鍵可結束通話"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"朗讀密碼"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"輕觸並按住延遲"</string>
@@ -1430,7 +1430,7 @@
     <string name="disable_service_title" msgid="3624005212728512896">"停止「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"輕觸 [確定] 會停止「<xliff:g id="SERVICE">%1$s</xliff:g>」。"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"未安裝任何服務"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"需要屏幕閱讀器嗎？"</string>
+    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"需要螢幕閱讀器嗎？"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack 提供語音回應功能協助視障或視力不佳的用戶。現在可以免費從 Android Market 安裝這項功能，您要安裝嗎？"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"未提供說明。"</string>
     <string name="settings_button" msgid="3006713718908152930">"設定"</string>
@@ -1473,7 +1473,7 @@
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"電池電力剩餘時間：<xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"拔除插頭後已耗電 <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"充電中"</string>
-    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"屏幕開啟"</string>
+    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"螢幕開啟"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"開啟 GPS"</string>
     <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"啟用"</string>
@@ -1523,7 +1523,7 @@
     <string name="battery_desc_radio" msgid="5479196477223185367">"手機無線電耗電量"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"切換到飛行模式，讓裝置處於服務覆蓋範圍外時能節省電力"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"顯示與背光啟動時的耗電量"</string>
-    <string name="battery_sugg_display" msgid="3370202402045141760">"減低屏幕亮度和/或屏幕自動關閉時間"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"減低螢幕亮度和/或螢幕自動關閉時間"</string>
     <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi-Fi 耗電量"</string>
     <string name="battery_sugg_wifi" msgid="3355461362094706957">"不使用或無法使用時即關閉 Wi-Fi"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"藍牙耗電量"</string>
@@ -1531,7 +1531,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"嘗試連接另一部藍牙裝置"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"應用程式耗電量"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"停止或解除安裝應用程式"</string>
-    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"選取節約電池用量模式"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"選取省電模式"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"應用程式可能有提供節省電力的設定"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"用戶用電量"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"拔除插頭後已耗電 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -1573,7 +1573,7 @@
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"「<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>」設定"</string>
     <string name="tts_settings" msgid="8186971894801348327">"文字轉語音設定"</string>
     <string name="tts_settings_title" msgid="1237820681016639683">"文字轉語音輸出"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"一律使用我的設定"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"永遠使用我的設定"</string>
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"下列預設設定會覆寫應用程式設定"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"預設設定"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"預設引擎"</string>
@@ -1665,11 +1665,11 @@
     <string name="credentials_erased" msgid="2907836028586342969">"憑證儲存空間已清除。"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"無法清除憑證儲存空間。"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"已啟用認證儲存空間。"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"您必須先設定屏幕鎖定 PIN 或密碼，才能使用憑證儲存空間。"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"您必須先設定螢幕鎖定 PIN 或密碼，才能使用憑證儲存空間。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急警示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"設定撥打緊急電話時的運作方式"</string>
-    <string name="privacy_settings" msgid="5446972770562918934">"備份與重設"</string>
-    <string name="privacy_settings_title" msgid="4856282165773594890">"備份與重設"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"備份和重設"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"備份和重設"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"備份與還原"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"個人資料"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"備份我的資料"</string>
@@ -1717,7 +1717,7 @@
     <string name="wifi_setup_forget" msgid="2562847595567347526">"刪除"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"儲存"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"取消"</string>
-    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"正在掃描網絡..."</string>
+    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"正在掃瞄網絡..."</string>
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"請輕觸要連接的網絡"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"連線至現有網絡"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"連線至無安全保護措施的網絡"</string>
@@ -1767,8 +1767,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"您要移除帳戶嗎？"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"移除帳戶後，平板電腦上的訊息、通訊錄和其他資料將被一併刪除！"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"移除帳戶後，手機上的訊息、通訊錄和其他資料將被一併刪除！"</string>
-    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"部分應用程式需要使用這個帳戶。如要移除帳戶，您必須將平板電腦重設為原廠設定 (系統會刪除您所有的個人資料)；請前往 [設定] &gt; [備份與重設] 進行重設。"</string>
-    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"部分應用程式需要使用這個帳戶。如要移除帳戶，您必須將手機重設為原廠設定 (系統會刪除您所有的個人資料)；請前往 [設定] &gt; [備份與重設] 進行重設。"</string>
+    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"部分應用程式需要使用這個帳戶。如要移除帳戶，您必須將平板電腦重設為原廠設定 (系統會刪除您所有的個人資料)；請前往 [設定] &gt; [備份和重設] 進行重設。"</string>
+    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"部分應用程式需要使用這個帳戶。如要移除帳戶，您必須將手機重設為原廠設定 (系統會刪除您所有的個人資料)；請前往 [設定] &gt; [備份和重設] 進行重設。"</string>
     <string name="provider_label" msgid="7724593781904508866">"發送訂閱"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
@@ -1798,9 +1798,9 @@
     <string name="debug_hw_drawing_category" msgid="6220174216912308658">"硬件加速轉譯"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"監控"</string>
     <string name="strict_mode" msgid="1938795874357830695">"嚴格模式已啟用"</string>
-    <string name="strict_mode_summary" msgid="142834318897332338">"當應用程式在主執行緒中進行長時間作業時，讓屏幕閃爍"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"當應用程式在主執行緒中進行長時間作業時，讓螢幕閃爍"</string>
     <string name="pointer_location" msgid="6084434787496938001">"指標位置"</string>
-    <string name="pointer_location_summary" msgid="840819275172753713">"在屏幕上重疊顯示目前的觸控資料"</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_screen_updates" msgid="5470814345876056420">"顯示表層更新"</string>
@@ -1811,14 +1811,14 @@
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"在硬件層更新時閃動綠燈"</string>
     <string name="debug_hw_overdraw" msgid="2968692419951565417">"GPU 透支偵錯"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"停用 HW 重疊效果"</string>
-    <string name="disable_overlays_summary" msgid="3578941133710758592">"一律使用 GPU 進行畫面合成"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"永遠使用 GPU 進行畫面合成"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"啟用 OpenGL 追蹤"</string>
     <string name="debug_layout" msgid="5981361776594526155">"顯示版面界限"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"顯示剪輯範圍、邊界等"</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"強制使用從右至左的版面配置方向"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"強制將所有語言代碼的畫面配置方向改為從右至左"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"顯示 CPU 使用量"</string>
-    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"在屏幕上重疊顯示目前的 CPU 使用量"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"在螢幕上重疊顯示目前的 CPU 使用量"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"強制使用 GPU 轉譯"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"強制使用 GPU 進行 2D 繪圖"</string>
     <string name="force_msaa" msgid="7920323238677284387">"強制 4x MSAA"</string>
@@ -1867,7 +1867,7 @@
     <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_summary" msgid="518658001418490405">"停用流動網絡的背景資料。如果可連上，將使用非流動網絡。"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"停用流動網絡的背景資料。如可連接，將使用非流動網絡。"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"如要限制這個應用程式的背景資料，請先設定流動數據上限。"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"限制背景資料？"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"如果採用這項功能，當只可以連接流動網絡時，需要使用背景資料的應用程式可能會停止運作。\n\n您可以前往應用程式內的設定，找出更多適合的數據用量控制。"</string>
@@ -2029,7 +2029,7 @@
     <string name="help_label" msgid="1107174367904110532">"說明"</string>
     <string name="user_account_title" msgid="1127193807312271167">"內容帳戶"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"相片 ID"</string>
-    <string name="cell_broadcast_settings" msgid="8415582011920085222">"區域廣播"</string>
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"小區廣播短訊"</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"應用程式與內容限制"</string>
     <string name="user_rename" msgid="8523499513614655279">"重新命名"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"設定應用程式限制"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d8e9bd9cc3..9772bd87a9 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -770,13 +770,13 @@
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"需要 PIN 才能使用平板電腦"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"需要輸入 PIN 才可使用電話"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"變更 SIM PIN"</string>
-    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM 卡 PIN 碼"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"鎖定 SIM 卡"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"解除鎖定 SIM 卡"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"舊的 SIM PIN"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"新增 SIM PIN"</string>
     <string name="sim_reenter_new" msgid="3178510434642201544">"重新輸入新的 PIN"</string>
-    <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"SIM 卡 PIN 碼"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN 不正確"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN 不符"</string>
     <string name="sim_change_failed" msgid="304964924772218382">"無法變更 PIN。\nPIN 碼可能不正確。"</string>
@@ -1410,7 +1410,7 @@
     <string name="captioning_edge_color" msgid="3670094753735263238">"邊緣顏色"</string>
     <string name="captioning_edge_type" msgid="5997247394951682154">"邊緣類型"</string>
     <string name="captioning_typeface" msgid="1826169240566563259">"字型系列"</string>
-    <string name="captioning_preview_text" msgid="4067935959797375065">"字幕外觀如下"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"字幕外觀範例"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"預設"</string>
     <string name="color_none" msgid="3475640044925814795">"無"</string>
@@ -1431,7 +1431,7 @@
     <string name="disable_service_message" msgid="2012273739481042318">"輕觸 [確定] 會讓「<xliff:g id="SERVICE">%1$s</xliff:g>」停止。"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"未安裝任何服務"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"需要螢幕閱讀器嗎？"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack 提供語音回應功能協助視障或視力不佳的使用者。現在可以免費從 Android Market 安裝這項功能，您要安裝嗎？"</string>
+    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack 提供互動朗讀功能協助視障或視力不佳的使用者。現在可以免費從 Android Market 安裝這項功能，您要安裝嗎？"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"未提供說明。"</string>
     <string name="settings_button" msgid="3006713718908152930">"設定"</string>
     <string name="print_settings" msgid="4742428530112487843">"列印"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 8e334b7265..4de965cc37 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -764,14 +764,14 @@
     <string name="sim_lock_settings" msgid="3392331196873564292">"Izilungiselelo zokuvala ikhadi le-SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Hlela ukuvala ikhadi le-SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Ukuvala ikhadi le-SIM"</string>
-    <string name="sim_pin_toggle" msgid="1742123478029451888">"Vala ikhadi le-SIM"</string>
+    <string name="sim_pin_toggle" msgid="1742123478029451888">"Khiya ikhadi le-SIM"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Udinga i-PIN ukusebenzisa ithebhulethi"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Dinga i-PIN ukusebenzisa ifoni"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Udinga i-PIN ukusebenzisa ithebhulethi"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Dinga i-PIN ukusebenzisa ifoni"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Shintsha i-PIN ye-SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"I-SIM PIN"</string>
-    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Vala ikhadi le-SIM"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Khiya ikhadi le-SIM"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Vula ikhadi le-SIM"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"I-SIM PIN endala"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"I-SIM PIN entsha"</string>
-- 
2.11.0