diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index ddf89f2b5ba..2e06347f6f9 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1476,8 +1476,8 @@
     <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>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"ባንተ ጡባዊ ተኮ መሰረት ይሰፈራል:: የአንተ  ማጓጓዣ ውሂብ አጠቃቀም ሒሳብ ማስያ ሊለያይ ይችላል::"</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"ባንተ ስልክ መሰረት ይሰፈራል:: የአንተ  ማጓጓዣ ውሂብ አጠቃቀም ሒሳብ ማስያ ሊለያይ ይችላል::"</string>
+    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"በአንተ ጡባዊ ተኮ መሰረት ይሰፈራል:: የአንተ  ማጓጓዣ ውሂብ አጠቃቀም ሒሳብ ማስያ ሊለያይ ይችላል::"</string>
+    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"በአንተ ስልክ መሰረት ይሰፈራል:: የአንተ  ማጓጓዣ ውሂብ አጠቃቀም ሒሳብ ማስያ ሊለያይ ይችላል::"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"የተንቀሳቃሽ ስልክ ውሂብ ይቦዝን?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"የተንቀሳቃሽ ስልክ ውሂብ ወሰን አዘጋጅ"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"የ4G ውሂብ ወሰን አዘጋጅ"</string>
@@ -1506,8 +1506,8 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"የውሂብ አጠቃቀም ማስጠንቀቂያ አዘጋጅ"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"የውሂብ አጠቃቀም ወሰን አዘጋጅ"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"የውሂብ አጠቃቀም መወሰን"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"የአንተ  <xliff:g id="NETWORKS">%1$s</xliff:g> ውሂብ ግንኙነት የተጠቀሰው ገደብ ላይ ሲደረስ ይቦዝናል፡፡ "\n\n"የውሂብ አጠቃቀም ባንተ ጡባዊ ተኮ መሰረት የሚሰፈር እንደመሆኑ፣ የአንተ  ማጓጓዣ ለአጠቃቀም በተለየ ሁኔታ፣ ወግ አጥባቂ የሆነ ገደብ መጠቀምህን ከግምት አስገባ፡፡"</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"የአንተ  <xliff:g id="NETWORKS">%1$s</xliff:g> ውሂብ ግንኙነት የተጠቀሰው ገደብ ላይ ሲደረስ ይቦዝናል፡፡ "\n\n"የውሂብ አጠቃቀም ባንተ ስልክ መሰረት የሚሰፈር እንደመሆኑ፣ የአንተ  ማጓጓዣ ለአጠቃቀም በተለየ ሁኔታ፣ ወግ አጥባቂ የሆነ ገደብ መጠቀምህን ከግምት አስገባ፡፡"</string>
+    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"የአንተ  <xliff:g id="NETWORKS">%1$s</xliff:g> ውሂብ ግንኙነት የተጠቀሰው ገደብ ላይ ሲደረስ ይቦዝናል፡፡ "\n\n"የውሂብ አጠቃቀም በአንተ ጡባዊ ተኮ መሰረት የሚሰፈር እንደመሆኑ፣ የአንተ  ማጓጓዣ ለአጠቃቀም በተለየ ሁኔታ፣ ወግ አጥባቂ የሆነ ገደብ መጠቀምህን ከግምት አስገባ፡፡"</string>
+    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"የአንተ  <xliff:g id="NETWORKS">%1$s</xliff:g> ውሂብ ግንኙነት የተጠቀሰው ገደብ ላይ ሲደረስ ይቦዝናል፡፡ "\n\n"የውሂብ አጠቃቀም በአንተ ስልክ መሰረት የሚሰፈር እንደመሆኑ፣ የአንተ  ማጓጓዣ ለአጠቃቀም በተለየ ሁኔታ፣ ወግ አጥባቂ የሆነ ገደብ መጠቀምህን ከግምት አስገባ፡፡"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"በስተጀርባ ውሂብ አግድ?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"የተንቀሳቃሽ ውሂብ ዳራን ከገደብከው ወደ Wi-Fi አውታረመረብ ካልተገናኘህ በቀር አንዳንድ መተግበሪያዎች እና አገልግሎቶች አይሰሩም::"</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>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a7994e75d79..29659ae674b 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1408,7 +1408,7 @@
     <string name="settings_backup_summary" msgid="7916877705938054035">"Zálohovat moje nastavení"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Synchronizovat"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Zrušit synchronizaci"</string>
-    <string name="sync_one_time_sync" msgid="6766593624598183090">"Dotykem provedete synchronizaci nyní<xliff:g id="LAST_SYNC_TIME">
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Synchronizaci provedete dotykem<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalendář"</string>
@@ -1427,7 +1427,7 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Některé aplikace tento účet vyžadují. Můžete jej odebrat pouze tím, že v tabletu v nabídce Nastavení &gt; Zálohovat a obnovit obnovíte tovární nastavení (vymažete tak všechna svá osobní data)."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Některé aplikace tento účet vyžadují. Můžete jej odebrat pouze tím, že v telefonu v nabídce Nastavení &gt; Zálohovat a obnovit obnovíte tovární nastavení (vymažete tak všechna svá osobní data)."</string>
     <string name="provider_label" msgid="7724593781904508866">"Zobrazit odběry"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"Synchronizace aplikace <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"<xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Nelze ručně synchronizovat"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synchronizace této položky je aktuálně deaktivována. Chcete-li nastavení změnit, dočasně zapněte přenos dat na pozadí a automatickou synchronizaci."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Nastavení sítě 4G"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 66ab5c34c9e..457015bdcd2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -303,8 +303,8 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Verschlüsselung"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tablet verschlüsseln"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefon verschlüsseln"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Eine numerische PIN oder ein Passwort einrichten, mit dem das Tablet beim Einschalten entschlüsselt werden muss."</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Eine numerische PIN oder ein Passwort einrichten, mit dem das Telefon beim Einschalten entschlüsselt werden muss."</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Numerische PIN oder Passwort festlegen, mit dem das Tablet beim Einschalten entschlüsselt werden muss."</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Numerische PIN oder Passwort festlegen, mit dem das Telefon beim Einschalten entschlüsselt werden muss."</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Verschlüsselt"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps und die entsprechenden Daten, Medien und sonstigen Dateien verschlüsseln. Nach einer Verschlüsselung Ihres Tablets müssen Sie bei jedem Einschalten des Geräts eine numerische PIN oder ein Passwort eingeben. Sie können die Verschlüsselung Ihres Tablets nur durch Zurücksetzen auf Werkseinstellungen aufheben, wobei alle auf dem Tablet befindlichen Daten gelöscht werden."\n\n"Die Verschlüsselung dauert mindestens eine Stunde. Der Akku muss beim Start des Vorgangs aufgeladen sein und das Tablet muss eingesteckt bleiben, bis die Verschlüsselung abgeschlossen ist. Wenn Sie den Verschlüsselungsvorgang unterbrechen, gehen einige oder alle Daten verloren."</string>
     <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps und die entsprechenden Daten, Medien und sonstigen Dateien verschlüsseln. Nach einer Verschlüsselung Ihres Telefons müssen Sie bei jedem Einschalten des Geräts eine numerische PIN oder ein Passwort eingeben. Sie können die Verschlüsselung Ihres Telefons nur durch Zurücksetzen auf die Werkseinstellungen aufheben, wobei alle auf ihm befindlichen Daten gelöscht werden."\n\n"Die Verschlüsselung dauert mindestens eine Stunde. Der Akku muss beim Start des Vorgangs aufgeladen sein und das Gerät muss eingesteckt bleiben, bis die Verschlüsselung abgeschlossen ist. Wenn Sie den Verschlüsselungsvorgang unterbrechen, gehen einige oder alle Daten verloren."</string>
@@ -957,7 +957,7 @@
     <string name="screen_compatibility_label" msgid="663250687205465394">"Bildschirmkompatibilität"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Berechtigungen"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
-    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Cache löschen"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Cache leeren"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"Cache"</string>
     <string name="controls_label" msgid="7611113077086853799">"Steuerung"</string>
     <string name="force_stop" msgid="7435006169872876756">"Stoppen erzwingen"</string>
@@ -1317,7 +1317,7 @@
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Zertifikate von SD-Karte installieren"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Anmeldedaten löschen"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alle Zertifikate entfernen"</string>
-    <string name="trusted_credentials" msgid="4266945289534242402">"Vertrauensw. Anmeldedaten"</string>
+    <string name="trusted_credentials" msgid="4266945289534242402">"Vertrauenswürdige Anmeldedaten"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vertrauenswürdige CA-Zertifikate anzeigen"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Geben Sie das Passwort für den Anmeldeinformationsspeicher ein."</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 9a7fe5b6b58..0d06b4626c2 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -96,7 +96,7 @@
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"Panas berlebih"</string>
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Mati"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Voltase berlebihan"</string>
-    <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Galat tidak dikenal"</string>
+    <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Kesalahan tidak dikenal"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Dingin"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Dapat ditemukan"</string>
@@ -113,8 +113,8 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nama perangkat"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Tidak ada setelan nama, menggunakan nama akun"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Memindai perangkat"</string>
-    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Ubah nama tablet"</string>
-    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Ubah nama ponsel"</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Ganti nama tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Ganti nama ponsel"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Ganti nama"</string>
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Putuskan sambungan?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Ini akan mengakhiri sambungan Anda dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -493,7 +493,7 @@
     <string name="wifi_settings_summary" msgid="668767638556052820">"Siapkan &amp; kelola titik akses nirkabel"</string>
     <string name="wifi_starting" msgid="6716593470710880000">"Hidupkan Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="244864762599017659">"Mematikan Wi-Fi..."</string>
-    <string name="wifi_error" msgid="3207971103917128179">"Galat"</string>
+    <string name="wifi_error" msgid="3207971103917128179">"Kesalahan"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Dalam mode Pesawat"</string>
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Tidak dapat memindai jaringan"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Pemberitahuan jaringan"</string>
@@ -581,7 +581,7 @@
     <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Perangkat yang tersedia"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portabel"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> hotspot portabel aktif"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Galat hotspot Wi-Fi portabel"</string>
+    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Kesalahan hotspot Wi-Fi portabel"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Konfigurasikan hotspot Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> hotspot Wi-Fi portabel"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
@@ -853,7 +853,7 @@
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Tertambat"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"Tidak bisa menambatkan ketika penyimpanan USB sedang digunakan"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB tidak tersambung"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Galat penambatan USB"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Kesalahan penambatan USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Penambatan bluetooth"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Berbagi sambungan Internet tablet ini"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Berbagi sambungan Internet ponsel ini"</string>
@@ -1161,7 +1161,7 @@
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Tombol daya mengakhiri panggilan"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Ucapkan sandi"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Jelajahi dengan sentuhan"</string>
-    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Ketika Jelajahi dengan Sentuhan dinyalakan, Anda dapat mendengar atau melihat uraian dari apa yang ada di bawah jari Anda."\n\n" Fitur ini untuk pengguna dengan penglihatan yang tidak terlalu bagus."</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Ketika Jelajahi dengan Sentuhan dinyalakan, Anda dapat mendengar atau melihat deskripsi dari apa yang ada di bawah jari Anda."\n\n" Fitur ini untuk pengguna dengan penglihatan yang tidak terlalu bagus."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Tundaan sentuh &amp; tahan"</string>
     <string name="accessibility_script_injection_title" msgid="3264723681038625967">"Pasang skrip web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Setelan"</string>
@@ -1183,7 +1183,7 @@
     <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Pasang skrip web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Apakah Anda ingin apl memasang skrip dari Google yang membuat konten webnya lebih mudah diakses?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Fitur ini mengubah cara perangkat Anda menanggapi sentuhan. Hidupkan?"</string>
-    <string name="accessibility_service_default_description" msgid="1072730037861494125">"Tidak tersedia uraian."</string>
+    <string name="accessibility_service_default_description" msgid="1072730037861494125">"Tidak tersedia deskripsi."</string>
     <string name="settings_button" msgid="3006713718908152930">"Setelan"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterai"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Apa yang menggunakan daya baterai"</string>
@@ -1392,7 +1392,7 @@
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Sentuh "<b>"Berikutnya"</b>" untuk melanjutkan penyiapan. "\n\n"Sentuh "<b>"Kembali"</b>" untuk menyambung dengan jaringan Wi-Fi yang berbeda."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronisasi diaktifkan"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinkronisasi dinonaktifkan"</string>
-    <string name="accessibility_sync_error" msgid="8703299118794272041">"Galat sinkronisasi."</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Kesalahan sinkronisasi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Setelan sinkronisasi"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Saat ini sinkronisasi mengalami masalah. Sinkronisasi akan segera berfungsi kembali."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Tambahkan akun"</string>
@@ -1403,7 +1403,7 @@
     <string name="sync_automatically" msgid="1682730255435062059">"Sinkronisasi otomatis data apl"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sinkronisasi AKTIF"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Sinkronisasi NONAKTIF:"</string>
-    <string name="sync_error" msgid="5060969083117872149">"Galat sinkronisasi"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Kesalahan sinkronisasi"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Setelan cadangan"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Cadangkan setelan saya"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinkronkan sekarang"</string>
@@ -1579,5 +1579,5 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Setel sandi cadangan"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Batal"</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">"Pemutakhiran sistem tambahan"</string>
+    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Pembaruan sistem tambahan"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 66a137e795f..eb3a9683a63 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -113,7 +113,7 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"שם המכשיר"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"לא הוגדר שם, משתמש בשם החשבון"</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="tablet" msgid="787970073150631155">"שנה שם טאבלט"</string>
     <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"שנה שם טלפון"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"שנה שם"</string>
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"להתנתק?"</string>
@@ -248,7 +248,7 @@
     <string name="device_info_label" msgid="6551553813651711205">"מידע על המכשיר"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"מידע על הסוללה"</string>
     <string name="display_label" msgid="8074070940506840792">"מסך"</string>
-    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"פרטי טבלט"</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>
@@ -301,21 +301,21 @@
     <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="tablet" msgid="1060273569887301457">"הצפן טאבלט"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"הצפן טלפון"</string>
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"דורש PIN מספרי או סיסמה לפענוח הטבלט בכל הפעלה"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"דורש PIN מספרי או סיסמה לפענוח הטלפון בכל הפעלה"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"מוצפן"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"תוכל להצפין את החשבונות וההגדרות שלך, וכן את היישומים שהורדת והנתונים, המדיה וקבצים אחרים שלהם. לאחר הצפנת הטבלט, עליך להזין קוד PIN מספרי או סיסמה כדי לבטל את ההצפנה בכל הפעלה של הטבלט: תוכל לבטל את הצפנת הטבלט רק על ידי ביצוע איפוס נתוני יצרן, פעולה שתגרום למחיקת כל הנתונים שלך."\n\n"ההצפנה נמשכת שעה או יותר. עליך להתחיל בהצפנה עם סוללה טעונה ולהשאיר את הטבלט מחובר עד להשלמת ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד חלק מהנתונים או את כולם."</string>
     <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"תוכל להצפין את החשבונות וההגדרות שלך, כמו גם את היישומים שהורדת והנתונים, המדיה וקבצים אחרים שלהם. לאחר הצפנת הטלפון, עליך להזין קוד PIN מספרי או סיסמה כדי לבטל את ההצפנה בכל הפעלה של הטלפון: תוכל לבטל את הצפנת הטלפון רק על ידי איפוס נתוני היצרן, פעולה שתגרום למחיקת כל הנתונים שלך."\n\n"ההצפנה נמשכת שעה או יותר. עליך להתחיל בהצפנה עם סוללה טעונה ולהשאיר את הטלפון מחובר עד להשלמת תהליך ההצפנה. אם תפסיק את תהליך ההצפנה לפני סיומו, תאבד חלק מהנתונים או את כולם."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"הצפן טבלט"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"הצפן טאבלט"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"הצפן טלפון"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"טען את הסוללה ונסה שוב."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"חבר את המטען ונסה שוב."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"אין PIN או סיסמה לנעילת מסך"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"עליך להגדיר PIN או סיסמה לנעילת מסך לפני שתוכל להתחיל בהצפנה."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"אשר הצפנה"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"להצפין טבלט? פעולה זו היא בלתי הפיכה והפסקתה תגרום לאובדן נתונים. ההצפנה אורכת שעה או יותר, ובמהלך זמן זה הטבלט יופעל מחדש מספר פעמים."</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"להצפין טאבלט? פעולה זו היא בלתי הפיכה והפסקתה תגרום לאובדן נתונים. ההצפנה אורכת שעה או יותר, ובמהלך זמן זה הטאבלט יופעל מחדש מספר פעמים."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"להצפין טלפון? פעולה זו היא בלתי הפיכה והפסקתה תגרום לאובדן נתונים. ההצפנה אורכת שעה או יותר, ובמהלך זמן זה הטלפון יופעל מחדש מספר פעמים."</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>
@@ -452,7 +452,7 @@
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ינותק מהאודיו של הדיבורית."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ינותק ממכשיר הקלט."</string>
     <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="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_online_mode_title" msgid="3689050071425683114">"התחברות"</string>
@@ -680,7 +680,7 @@
     <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>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"סטטוס טבלט"</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>
@@ -818,7 +818,7 @@
     <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="tablet" msgid="3130786116528304116">"איפוס טאבלט"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"איפוס טלפון"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"למחוק את כל המידע האישי שלך והיישומים שהורדת? לא ניתן לבטל את הפעולה!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"מחק הכל"</string>
@@ -855,13 +855,13 @@
     <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_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"משתף את החיבור לאינטרנט של טבלט זה"</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">"משתף את החיבור לאינטרנט של טבלט זה עם מכשיר אחד"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"משתף את החיבור לאינטרנט של טאבלט זה עם מכשיר אחד"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"משתף את החיבור לאינטרנט של טלפון זה עם מכשיר אחד"</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="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="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>
@@ -1098,7 +1098,7 @@
     <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"לא מוגדרות מילים במילון המשתמש. הוסף מילה על ידי נגיעה בלחצן \'הוסף\' (+)."</string>
     <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"כל השפות"</string>
     <string name="testing" msgid="6584352735303604146">"בדיקה"</string>
-    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"פרטי טבלט"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"פרטי טאבלט"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"מידע על הטלפון"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"מידע על סוללה"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"הפעלה מהירה"</string>
@@ -1215,14 +1215,14 @@
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</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="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_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="8234997940652067049">"Wi-Fi פועל"</string>
-    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"טבלט"</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="2857401966985425427">"הנתונים נשלחו"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"הנתונים התקבלו"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 968f5bb0cfc..a5a7c872a49 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -927,7 +927,7 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Måste rita grafiskt lösenord för att låsa upp skärmen"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Gör mönster synligt"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrera vid tryck"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Strömbrytaren låses direkt"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Avstängningsknappen låses direkt"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Ange grafiskt lösenord"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Byt grafiskt lösenord"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Så här ritar du ett grafiskt lösenord"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d2d9b4e2009..e685020f03d 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -288,7 +288,7 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sắp xếp theo múi giờ"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Ngày"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Thời gian"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Cải tiến tính năng khớp khuôn mặt"</string>
+    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Cải tiến khớp khuôn mặt"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Tự động khóa"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> sau khi ngủ"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Hiển thị th.tin chủ sở hữu trên màn hình khóa"</string>
@@ -1305,7 +1305,7 @@
     <string name="tts_engine_settings_button" msgid="1030512042040722285">"Cài đặt khởi chạy công cụ"</string>
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Công cụ ưu tiên"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Chung"</string>
-    <string name="gadget_title" msgid="5519037532720577836">"Kiểm soát nguồn điện"</string>
+    <string name="gadget_title" msgid="5519037532720577836">"Kiểm soát điện năng"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Đang cập nhật cài đặt Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Đang cập nhật cài đặt Bluetooth"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index be92faabb24..73014fdb575 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -139,15 +139,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"显示接收到的文件"</string>
     <string name="device_picker" msgid="8721012448931226323">"蓝牙设备选择器"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"蓝牙权限请求"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"某个应用程序想要打开蓝牙。允许该程序打开蓝牙吗？"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"您平板电脑上的某个应用程序想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。允许该程序执行相应操作吗？"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"您手机上的某个应用程序想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。允许该程序执行相应操作吗？"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"您平板电脑上的某个应用程序想让其他蓝牙设备“一直可检测到”您的平板电脑。允许该程序执行相应操作吗？"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"您手机上的某个应用程序想让其他蓝牙设备“一直可检测到”您的手机。允许该程序执行相应操作吗？"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"您平板电脑上的某个应用程序想要打开蓝牙，以便其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。允许该程序打开蓝牙吗？"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"您手机上的某个应用程序想要打开蓝牙，以便其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。允许该程序打开蓝牙吗？"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"您平板电脑上的某个应用程序想要打开蓝牙，以便其他设备可检测到您的平板电脑。允许该程序打开蓝牙吗？"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"您手机上的某个应用程序想要打开蓝牙，以便其他设备可检测到您的手机。允许该程序打开蓝牙吗？"</string>
+    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"某个应用想要打开蓝牙。允许该程序打开蓝牙吗？"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"您平板电脑上的某个应用想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。允许该程序执行相应操作吗？"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"您手机上的某个应用想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。允许该程序执行相应操作吗？"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"您平板电脑上的某个应用想让其他蓝牙设备“一直可检测到”您的平板电脑。允许该程序执行相应操作吗？"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"您手机上的某个应用想让其他蓝牙设备“一直可检测到”您的手机。允许该程序执行相应操作吗？"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"您平板电脑上的某个应用想要打开蓝牙，以便其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。允许该程序打开蓝牙吗？"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"您手机上的某个应用想要打开蓝牙，以便其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。允许该程序打开蓝牙吗？"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"您平板电脑上的某个应用想要打开蓝牙，以便其他设备可检测到您的平板电脑。允许该程序打开蓝牙吗？"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"您手机上的某个应用想要打开蓝牙，以便其他设备可检测到您的手机。允许该程序打开蓝牙吗？"</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>
@@ -187,7 +187,7 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"您必须填写端口字段。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"如果主机字段为空，则端口字段必须为空。"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"您键入的端口无效。"</string>
-    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"该浏览器使用 HTTP 代理，但其他应用程序可能不会使用。"</string>
+    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"该浏览器使用 HTTP 代理，但其他应用可能不会使用。"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"地点："</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相邻的 CID："</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"数据尝试次数："</string>
@@ -306,8 +306,8 @@
     <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="923629233459331136">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体和其他文件。加密平板电脑后，您每次开机时都必须输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除平板电脑上的所有数据。"\n\n"加密过程需要一个小时或更长时间。在开始加密前，需要确保电池有电，并且在加密完成前必须一直连接电源。如果您中断加密过程，会丢失部分或全部数据。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体和其他文件。加密手机后，您每次开机时都必须输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除手机上的所有数据。"\n\n"加密过程需要一个小时或更长时间。在开始加密前，需要确保电池有电，并且在加密完成前必须一直连接电源。如果您中断加密过程，会丢失部分或全部数据。"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"您可以加密自己的帐户、设置、已下载的应用及其数据、媒体和其他文件。加密平板电脑后，您每次开机时都必须输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除平板电脑上的所有数据。"\n\n"加密过程需要一个小时或更长时间。在开始加密前，需要确保电池有电，并且在加密完成前必须一直连接电源。如果您中断加密过程，会丢失部分或全部数据。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"您可以加密自己的帐户、设置、已下载的应用及其数据、媒体和其他文件。加密手机后，您每次开机时都必须输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除手机上的所有数据。"\n\n"加密过程需要一个小时或更长时间。在开始加密前，需要确保电池有电，并且在加密完成前必须一直连接电源。如果您中断加密过程，会丢失部分或全部数据。"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"加密平板电脑"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"加密手机"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"请为电池充电，然后重试。"</string>
@@ -480,11 +480,11 @@
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" msgid="5237208142892767592">"允许手机在接触其他设备时交换数据"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"已准备好通过 NFC 传输应用程序内容"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"已准备好通过 NFC 传输应用内容"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"关闭"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"无法使用，因为 NFC 已关闭"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"打开此功能后，您只需将自己的设备与另一台支持 NFC 的设备靠在一起，即可将您设备上的应用程序内容同步分享给对方。例如，您可以发送网页、YouTube 视频、“分享对象”联系人等等。"\n\n"您只需将设备靠在一起（通常是背靠背）然后触摸屏幕即可，所分享的内容是由该应用程序确定的。"</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"打开此功能后，您只需将自己的设备与另一台支持 NFC 的设备靠在一起，即可将您设备上的应用内容同步分享给对方。例如，您可以发送网页、YouTube 视频、“分享对象”联系人等等。"\n\n"您只需将设备靠在一起（通常是背靠背）然后触摸屏幕即可，所分享的内容是由该应用确定的。"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"打开 Wi-Fi"</string>
     <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
@@ -723,7 +723,7 @@
     <string name="memory_available" msgid="5052397223077021181">"可用空间"</string>
     <string name="memory_size" msgid="6629067715017232195">"总容量"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"正在计算..."</string>
-    <string name="memory_apps_usage" msgid="7064506641121346242">"应用程序"</string>
+    <string name="memory_apps_usage" msgid="7064506641121346242">"应用"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"媒体"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"下载内容"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"图片、视频"</string>
@@ -746,8 +746,8 @@
     <string name="read_only" msgid="6702420168629076340">" （只读）"</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_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>
@@ -808,8 +808,8 @@
     <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>
@@ -820,7 +820,7 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"清除 SD 卡中的全部数据，例如音乐或照片"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"重置平板电脑"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"重置手机"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"要清除所有个人信息和下载的应用程序吗？请注意，此操作无法撤消！"</string>
+    <string name="master_clear_final_desc" msgid="7209547812233487345">"要清除所有个人信息和下载的应用吗？请注意，此操作无法撤消！"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"清除全部内容"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"绘制您的解锁图案"</string>
     <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"您必须绘制解锁图案才能确认恢复出厂设置。"</string>
@@ -870,10 +870,10 @@
     <string name="network_settings_title" msgid="7967552516440151852">"移动网络"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Google 的位置服务"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"允许应用程序使用来自 Wi-Fi 或移动网络的数据确定您的大致位置"</string>
+    <string name="location_neighborhood_level" msgid="1337612962522836900">"允许应用使用来自 Wi-Fi 或移动网络的数据确定您的大致位置"</string>
     <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"通过 Wi-Fi 确定位置"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS 卫星"</string>
-    <string name="location_street_level" msgid="4244496898967415234">"允许应用程序使用 GPS 对您进行定位"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"允许应用使用 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>
@@ -939,18 +939,18 @@
     <string name="lock_title" product="default" msgid="4059246467204273930">"手机安全设置"</string>
     <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"创建个人屏幕解锁图案可防止他人未经许可使用您的平板电脑。用手指按任意顺序连接下一屏幕上的点，但至少要连接四个点。"\n\n"准备好开始了吗？请触摸“下一步”。"</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"创建个人屏幕解锁图案可防止他人未经许可使用您的手机。在下一屏幕上滑动手指以任意顺序连接至少四个点。"\n\n"准备好开始了吗？请触摸“下一步”。"</string>
-    <string name="manageapplications_settings_title" msgid="7041951105633616745">"管理应用程序"</string>
-    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理和删除已安装的应用程序"</string>
-    <string name="applications_settings" msgid="1721442176406964682">"应用程序"</string>
-    <string name="applications_settings_summary" msgid="6683465446264515367">"管理应用程序、设置快速启动快捷方式"</string>
-    <string name="applications_settings_header" msgid="1014813055054356646">"应用程序设置"</string>
+    <string name="manageapplications_settings_title" msgid="7041951105633616745">"管理应用"</string>
+    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理和删除已安装的应用"</string>
+    <string name="applications_settings" msgid="1721442176406964682">"应用"</string>
+    <string name="applications_settings_summary" msgid="6683465446264515367">"管理应用、设置快速启动快捷方式"</string>
+    <string name="applications_settings_header" msgid="1014813055054356646">"应用设置"</string>
     <string name="install_applications" msgid="4872012136210802181">"未知来源"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"允许安装不是从电子市场获取的应用程序"</string>
-    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"您的平板电脑和个人数据更容易受到从未知来源获取的应用程序的攻击。对于因使用这些应用程序而造成的平板电脑损坏或数据丢失，您同意自行承担全部责任。"</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"您的手机和个人数据更容易受到从未知来源获取的应用程序的攻击。对于因使用这些应用程序而造成的手机损坏或数据丢失，您同意自行承担全部责任。"</string>
+    <string name="install_unknown_applications" msgid="8149117044297868948">"允许安装不是从电子市场获取的应用"</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"您的平板电脑和个人数据更容易受到从未知来源获取的应用的攻击。对于因使用这些应用而造成的平板电脑损坏或数据丢失，您同意自行承担全部责任。"</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"您的手机和个人数据更容易受到从未知来源获取的应用的攻击。对于因使用这些应用而造成的手机损坏或数据丢失，您同意自行承担全部责任。"</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="screen_compatibility_label" msgid="663250687205465394">"屏幕兼容性"</string>
@@ -961,8 +961,8 @@
     <string name="controls_label" msgid="7611113077086853799">"控件"</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>
+    <string name="application_size_label" msgid="8494609207373874267">"应用"</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>
@@ -971,12 +971,12 @@
     <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="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="enable_compatibility" msgid="5806819252068617811">"调整应用的显示尺寸/比例"</string>
     <string name="unknown" msgid="1592123443519355854">"未知"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"按名称排序"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"按大小排序"</string>
@@ -991,27 +991,27 @@
     <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="no_applications" msgid="7336588977497084921">"无应用程序。"</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="recompute_size" msgid="7722567982831691718">"正在重新计算大小..."</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"要删除应用程序数据吗？"</string>
-    <string name="clear_data_dlg_text" msgid="8847257251846779938">"系统会永久删除此应用程序的所有数据。删除的内容包括所有文件、设置、帐户、数据库等。"</string>
+    <string name="clear_data_dlg_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="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>
+    <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="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="computing_size" msgid="1599186977475211186">"正在计算..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"无法计算包大小"</string>
-    <string name="empty_list_msg" msgid="5993162337235907160">"未安装任何第三方应用程序。"</string>
+    <string name="empty_list_msg" msgid="5993162337235907160">"未安装任何第三方应用。"</string>
     <string name="version_text" msgid="9189073826278676425">"版本 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"移动"</string>
     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"移至平板电脑"</string>
@@ -1020,26 +1020,26 @@
     <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>
-    <string name="app_forward_locked" msgid="6331564656683790866">"应用程序受版权保护。"</string>
+    <string name="does_not_exist" msgid="3476487214886606748">"应用不存在。"</string>
+    <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_text" msgid="7208364204467835578">"强行停止某个应用程序可能会导致其出现异常。"</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"强行停止某个应用可能会导致其出现异常。"</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
-    <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"无法移动应用程序。<xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"无法移动应用。<xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"首选安装位置"</string>
-    <string name="app_install_location_summary" msgid="5155453752692959098">"更改安装新应用程序时使用的首选安装位置"</string>
-    <string name="app_disable_dlg_title" msgid="3916469657537695436">"要停用内置应用程序吗？"</string>
-    <string name="app_disable_dlg_text" msgid="3562567756362627323">"如果停用内置应用程序，其他应用程序可能会出现异常。"</string>
+    <string name="app_install_location_summary" msgid="5155453752692959098">"更改安装新应用时使用的首选安装位置"</string>
+    <string name="app_disable_dlg_title" msgid="3916469657537695436">"要停用内置应用吗？"</string>
+    <string name="app_disable_dlg_text" msgid="3562567756362627323">"如果停用内置应用，其他应用可能会出现异常。"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"存储空间使用情况"</string>
-    <string name="storageuse_settings_summary" msgid="3748286507165697834">"查看应用程序使用的存储空间"</string>
+    <string name="storageuse_settings_summary" msgid="3748286507165697834">"查看应用使用的存储空间"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"正在运行的服务"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"查看和控制当前正在运行的服务"</string>
     <string name="service_restarting" msgid="2242747937372354306">"正在重新启动"</string>
     <string name="cached" msgid="1059590879740175019">"缓存的后台进程"</string>
     <string name="no_running_services" msgid="2059536495597645347">"当前未运行任何服务。"</string>
-    <string name="service_started_by_app" msgid="818675099014723551">"已由应用程序启动。"</string>
+    <string name="service_started_by_app" msgid="818675099014723551">"已由应用启动。"</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
     <string name="service_background_processes" msgid="6844156253576174488">"可用空间：<xliff:g id="MEMORY">%1$s</xliff:g>"</string>
@@ -1051,15 +1051,15 @@
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> 个进程和 <xliff:g id="NUMSERVICES">%2$d</xliff:g> 个服务"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> 个进程和 <xliff:g id="NUMSERVICES">%2$d</xliff:g> 个服务"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> 个进程和 <xliff:g id="NUMSERVICES">%2$d</xliff:g> 个服务"</string>
-    <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"正在运行的应用程序"</string>
+    <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"正在运行的应用"</string>
     <string name="no_services" msgid="7133900764462288263">"无活动服务"</string>
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"服务"</string>
     <string name="runningservicedetails_processes_title" msgid="928115582044655268">"进程"</string>
     <string name="service_stop" msgid="6369807553277527248">"停止"</string>
     <string name="service_manage" msgid="1876642087421959194">"设置"</string>
-    <string name="service_stop_description" msgid="9146619928198961643">"此服务由其应用程序启动。停止服务可能会导致应用程序无法运行。"</string>
-    <string name="heavy_weight_stop_description" msgid="2979218727598321095">"无法安全地停止该应用程序。如果强行停止，可能会导致您目前的部分工作内容丢失。"</string>
-    <string name="background_process_stop_description" msgid="5034773197139654588">"这是旧应用程序进程，仍在运行，以备不时之需。通常不建议停止。"</string>
+    <string name="service_stop_description" msgid="9146619928198961643">"此服务由其应用启动。停止服务可能会导致应用无法运行。"</string>
+    <string name="heavy_weight_stop_description" msgid="2979218727598321095">"无法安全地停止该应用。如果强行停止，可能会导致您目前的部分工作内容丢失。"</string>
+    <string name="background_process_stop_description" msgid="5034773197139654588">"这是旧应用进程，仍在运行，以备不时之需。通常不建议停止。"</string>
     <string name="service_manage_description" msgid="7050092269951613102">"目前正在使用“<xliff:g id="CLIENT_NAME">%1$s</xliff:g>”。触摸“设置”可以对其进行控制。"</string>
     <string name="main_running_process_description" msgid="1130702347066340890">"正在使用的主要进程。"</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"正在使用服务<xliff:g id="COMP_NAME">%1$s</xliff:g>。"</string>
@@ -1082,8 +1082,8 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"按空格键两次可插入句号"</string>
     <string name="show_password" msgid="3001113966880559611">"使密码可见"</string>
     <string name="show_password_summary" msgid="7345931695292850058"></string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"此输入法可能会收集您输入的所有文字，包括密码和信用卡号等个人数据。它源自应用程序“<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>”。要使用此输入法吗？"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"此拼写检查工具可能会收集您键入的所有文字，包括密码和信用卡号等个人数据。它源自应用程序“<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>”。要使用此拼写检查工具吗？"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"此输入法可能会收集您输入的所有文字，包括密码和信用卡号等个人数据。它源自应用“<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>”。要使用此输入法吗？"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"此拼写检查工具可能会收集您键入的所有文字，包括密码和信用卡号等个人数据。它源自应用“<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>”。要使用此拼写检查工具吗？"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"鼠标/触控板"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"指针速度"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"用户词典"</string>
@@ -1102,15 +1102,15 @@
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"手机信息"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"电池信息"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"快速启动"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"设置启动应用程序的键盘快捷键"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"分配给应用程序"</string>
+    <string name="quick_launch_summary" msgid="8101133819188001190">"设置启动应用的键盘快捷键"</string>
+    <string name="quick_launch_assign_application" msgid="6240064079456617501">"分配给应用"</string>
     <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"无快捷键"</string>
     <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_display_mode_applications" msgid="1734058461846126775">"应用程序"</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>
     <string name="input_method" msgid="5434026103176856164">"输入法"</string>
@@ -1130,7 +1130,7 @@
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"物理键盘"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"物理键盘设置"</string>
     <string name="development_settings_title" msgid="215179176067683667">"开发人员选项"</string>
-    <string name="development_settings_summary" msgid="1815795401632854041">"设置应用程序开发选项"</string>
+    <string name="development_settings_summary" msgid="1815795401632854041">"设置应用开发选项"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB 调试"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"连接 USB 后启用调试模式"</string>
     <string name="verifier_device_identifier" msgid="5079997701152411060">"开发设备 ID"</string>
@@ -1140,7 +1140,7 @@
     <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_warning_message" msgid="7316799925425402244">"USB 调试仅适用于开发工作。该功能可用于在您的计算机和设备之间复制数据、在您的设备上安装应用而不发送通知以及读取日志数据。"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"选择小工具"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"选择窗口小部件"</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>
@@ -1150,7 +1150,7 @@
     <string name="usage_stats_label" msgid="5890846333487083609">"使用情况统计数据"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"使用情况统计数据"</string>
     <string name="display_order_text" msgid="8592776965827565271">"排序方式："</string>
-    <string name="app_name_label" msgid="5440362857006046193">"应用程序"</string>
+    <string name="app_name_label" msgid="5440362857006046193">"应用"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"次数"</string>
     <string name="usage_time_label" msgid="295954901452833058">"使用时间"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"辅助功能"</string>
@@ -1181,7 +1181,7 @@
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"需要屏幕阅读器吗？"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"“话语提示”可提供语音反馈以帮助盲人和有视力障碍的用户。您要通过 Android 电子市场免费安装该服务吗？"</string>
     <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"要安装网页脚本吗？"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"您要允许应用程序安装来自 Google 的脚本，以便于您浏览这些应用程序的网页内容吗？"</string>
+    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"您要允许应用安装来自 Google 的脚本，以便于您浏览这些应用的网页内容吗？"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"此功能会更改您的设备对触摸的响应方式。要打开吗？"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"没有提供说明。"</string>
     <string name="settings_button" msgid="3006713718908152930">"设置"</string>
@@ -1231,8 +1231,8 @@
     <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_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="2272741639606146903">"Wi-Fi 设置"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"蓝牙设置"</string>
@@ -1248,10 +1248,10 @@
     <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="7287643439298561315">"手动控制 GPS，以阻止应用程序使用它"</string>
-    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"该应用程序中可能提供了用于减少耗电量的设置"</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="7287643439298561315">"手动控制 GPS，以阻止应用使用它"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"该应用中可能提供了用于减少耗电量的设置"</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>
@@ -1269,7 +1269,7 @@
     <string name="tts_settings" msgid="8186971894801348327">"文字转语音设置"</string>
     <string name="tts_settings_title" msgid="1237820681016639683">"文字转语音 (TTS) 输出"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"总是使用我的设置"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"使用以下默认设置代替应用程序设置"</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>
@@ -1337,16 +1337,16 @@
     <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="9157861529438245957">"将应用程序数据、Wi-Fi 密码和其他设置备份到 Google 服务器"</string>
+    <string name="backup_data_summary" msgid="9157861529438245957">"将应用数据、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_summary" msgid="4235615056371993807">"重新安装某个应用程序后，系统会还原已经备份的设置和数据"</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="4780151366296088113">"桌面完整备份当前未设置保护。"</string>
     <string name="local_backup_password_summary_change" msgid="3615162467655442441">"选择以更改或删除桌面完整备份的密码"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"要停止备份您的 Wi-Fi 密码、书签、其他设置以及应用程序数据，并清除 Google 服务器上的所有副本吗？"</string>
+    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"要停止备份您的 Wi-Fi 密码、书签、其他设置以及应用数据，并清除 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>
@@ -1355,8 +1355,8 @@
     <string name="add_device_admin_msg" msgid="6246742476064507965">"要激活设备管理器吗？"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"激活"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"设备管理器"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"激活此管理器可允许应用程序“<xliff:g id="APP_NAME">%1$s</xliff:g>”执行以下操作："</string>
-    <string name="device_admin_status" msgid="4252975713178851910">"此管理器已激活，允许应用程序“<xliff:g id="APP_NAME">%1$s</xliff:g>”执行以下操作："</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"激活此管理器可允许应用“<xliff:g id="APP_NAME">%1$s</xliff:g>”执行以下操作："</string>
+    <string name="device_admin_status" msgid="4252975713178851910">"此管理器已激活，允许应用“<xliff:g id="APP_NAME">%1$s</xliff:g>”执行以下操作："</string>
     <string name="untitled_apn" msgid="1230060359198685513">"未命名"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"常规"</string>
     <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"铃声和通知"</string>
@@ -1397,10 +1397,10 @@
     <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_summary" msgid="8328521479872763452">"应用程序可以随时同步、发送和接收数据"</string>
+    <string name="background_data_summary" msgid="8328521479872763452">"应用可以随时同步、发送和接收数据"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"要停用后台数据吗？"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"停用后台数据可延长电池待机时间并减少数据流量的使用，但某些应用程序可能仍会使用后台数据连接。"</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"自动同步应用程序数据"</string>
+    <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>
     <string name="sync_error" msgid="5060969083117872149">"同步出错"</string>
@@ -1414,7 +1414,7 @@
     <string name="sync_calendar" msgid="9056527206714733735">"日历"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"联系人"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"欢迎使用“Google Sync”！"</font>\n"Google 的这款同步数据工具可让您随时随地访问您的联系人、约会以及更多信息。"</string>
-    <string name="header_application_sync_settings" msgid="6205903695598000286">"应用程序同步设置"</string>
+    <string name="header_application_sync_settings" msgid="6205903695598000286">"应用同步设置"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"数据与同步"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"更改密码"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"帐户设置"</string>
@@ -1424,8 +1424,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>
     <string name="sync_item_title" msgid="1931551540462877488">"同步<xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"无法手动同步"</string>
@@ -1445,7 +1445,7 @@
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"设置 HDCP 检查行为"</string>
     <string name="debug_ui_category" msgid="9023948280291055349">"用户界面"</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="show_touches" msgid="1356420386500834339">"显示触摸操作"</string>
@@ -1455,15 +1455,15 @@
     <string name="show_cpu_usage" msgid="2389212910758076024">"显示 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="8642000962902609976">"在应用程序中使用 2D 硬件加速"</string>
+    <string name="force_hw_ui_summary" msgid="8642000962902609976">"在应用中使用 2D 硬件加速"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"窗口动画缩放"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"过渡动画缩放"</string>
-    <string name="debug_applications_category" msgid="4206913653849771549">"应用程序"</string>
+    <string name="debug_applications_category" msgid="4206913653849771549">"应用"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"不保留活动"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"用户离开后即销毁每个活动"</string>
     <string name="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" 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_menu_roaming" msgid="8042359966835203296">"数据漫游"</string>
@@ -1473,7 +1473,7 @@
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"显示以太网使用情况"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"更改周期..."</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"流量使用周期的日期设置："</string>
-    <string name="data_usage_empty" msgid="8621855507876539282">"没有任何应用程序在此期间产生过数据流量。"</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>
     <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"由您的平板电脑计算而得。您的运营商对于数据流量的计算可能有所不同。"</string>
@@ -1493,12 +1493,12 @@
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"移动数据"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G 数据"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G 数据"</string>
-    <string name="data_usage_app_settings" msgid="8430240158135453271">"查看应用程序设置"</string>
+    <string name="data_usage_app_settings" msgid="8430240158135453271">"查看应用设置"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"限制后台数据"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"仅在使用移动数据网络时停用后台数据。系统会尽量使用 Wi-Fi 连接。"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"要限制此应用程序使用后台数据，请先设置移动数据上限。"</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"要限制此应用使用后台数据，请先设置移动数据上限。"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"限制后台数据？"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"在没有 Wi-Fi 连接的情况下，此功能可能导致需要后台数据的应用程序停止运行。"\n\n"您可以在相关应用程序内的设置中查找更合适的数据流量控制选项。"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"在没有 Wi-Fi 连接的情况下，此功能可能导致需要后台数据的应用停止运行。"\n\n"您可以在相关应用内的设置中查找更合适的数据流量控制选项。"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"您只有在设置移动数据上限后才能限制后台数据。"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"使用情况周期重置日期"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"日期："</string>
@@ -1509,10 +1509,10 @@
     <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"达到指定的数据使用上限时，系统会停用您的<xliff:g id="NETWORKS">%1$s</xliff:g>数据连接。"\n\n"由于数据流量是由您的平板电脑计算而得的，您的运营商对于流量的计算方法可能有所不同，因此请考虑设置一个较低的上限。"</string>
     <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"达到指定的数据使用上限时，系统会停用您的<xliff:g id="NETWORKS">%1$s</xliff:g>数据连接。"\n\n"由于数据流量是由您的手机计算而得的，您的运营商对于流量的计算方法可能有所不同，因此请考虑设置一个较低的上限。"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"限制后台数据？"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"如果限制后台移动数据，那么除非您已连接到 Wi-Fi 网络，否则部分应用程序和服务会无法运行。"</string>
+    <string name="data_usage_restrict_background" msgid="6387252645350792955">"如果限制后台移动数据，那么除非您已连接到 Wi-Fi 网络，否则部分应用和服务会无法运行。"</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>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"已删除的应用"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"已接收 <xliff:g id="RECEIVED">%1$s</xliff:g>，已发送 <xliff:g id="SENT">%2$s</xliff:g>"</string>
     <string name="data_usage_total_during_range" msgid="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>：已使用约 <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"紧急呼救"</string>
@@ -1560,14 +1560,14 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"完成"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"跳过教程"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"第 1 课：浏览屏幕"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"打开“触摸浏览”功能后，您可以触摸屏幕以了解手指触摸处的组件。例如，当前屏幕中包含应用程序图标，您可以触摸屏幕，然后随意滑动手指，找出其中某个应用程序。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"打开“触摸浏览”功能后，您可以触摸屏幕以了解手指触摸处的组件。例如，当前屏幕中包含应用图标，您可以触摸屏幕，然后随意滑动手指，找出其中某个应用。"</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"做得不错！请继续在屏幕上随意滑动您的手指，至少再找到一个图标。"</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"要激活您正触摸的应用程序，只需点按一下即可。滑动您的手指，直到找到“<xliff:g id="APP_NAME">%s</xliff:g>”的图标，然后点按一下该图标即可将其激活。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"要激活您正触摸的应用，只需点按一下即可。滑动您的手指，直到找到“<xliff:g id="APP_NAME">%s</xliff:g>”的图标，然后点按一下该图标即可将其激活。"</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"您的手指正在触摸“<xliff:g id="APP_NAME">%s</xliff:g>”图标。点按一下即可激活该图标。"</string>
     <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"您的手指移到了“<xliff:g id="APP_NAME">%s</xliff:g>”图标上，但是又移开了。请在屏幕四周缓缓滑动您的手指，直到再次找到“浏览器”图标为止。"</string>
     <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"做得不错！要开始学习下一课，请找到并激活“<xliff:g id="NEXT">%s</xliff:g>”按钮，此按钮位于屏幕右下角附近。"</string>
     <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"第 2 课：使用两根手指执行滚动操作"</string>
-    <string name="accessibility_tutorial_lesson_2_text_1" msgid="8764686624055084454">"要滚动浏览列表，您可以沿着屏幕滑动两根手指。例如，当前屏幕包含了一个应用程序名称列表，可供您上下滚动浏览。请先使用一根手指四处滑动，尝试找出列表中的几个项目。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="8764686624055084454">"要滚动浏览列表，您可以沿着屏幕滑动两根手指。例如，当前屏幕包含了一个应用名称列表，可供您上下滚动浏览。请先使用一根手指四处滑动，尝试找出列表中的几个项目。"</string>
     <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"做得不错！请继续在屏幕上随意滑动您的手指，至少再找到一个列表项。"</string>
     <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"现在请将两根手指放到某个列表项上，并向上滑动手指。如果到达屏幕顶端，请移开手指，并将手指放在列表中的下方位置，然后继续向上滑动。"</string>
     <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"做得不错！请继续向上滑动您的手指，以滚动浏览更多内容。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b41ebdb3f5d..3b0478333b8 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -288,7 +288,7 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"依時區排序"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"日期"</string>
     <string name="time_picker_title" msgid="483460752287255019">"時間"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"提升臉部配對精準度"</string>
+    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"加強臉部辨識精準度"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"自動鎖定"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"休眠 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>後"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"在鎖定畫面上顯示擁有者資訊"</string>
@@ -491,7 +491,7 @@
     <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi 設定"</string>
     <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"設定、管理無線網路存取點"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"開啟 Wi-Fi？"</string>
+    <string name="wifi_starting" msgid="6716593470710880000">"Wi-Fi 開啟中…"</string>
     <string name="wifi_stopping" msgid="244864762599017659">"正在關閉 Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"錯誤"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"處於飛行模式時"</string>
@@ -1462,7 +1462,7 @@
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"不要保留活動"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"使用者離開活動後立刻刪除所有活動內容"</string>
     <string name="app_process_limit_title" msgid="4280600650253107163">"背景處理程序限制"</string>
-    <string name="show_all_anrs" msgid="28462979638729082">"顯示所有 ANR"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"顯示所有無回應程式"</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>
@@ -1509,7 +1509,7 @@
     <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"達到指定的流量上限時，系統會停用您的 <xliff:g id="NETWORKS">%1$s</xliff:g> 數據連線。"\n\n"由於資料用量需依您的平板電腦來計算，而您的行動通訊業者計費方式可能有所不同，請考慮使用保守估計的上限值。"</string>
     <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"達到指定的流量上限時，系統會停用您的 <xliff:g id="NETWORKS">%1$s</xliff:g> 數據連線。"\n\n"由於資料用量需依您的手機來計算，而您的行動通訊業者計費方式可能有所不同，請考慮使用保守估計的上限值。"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"限制背景資料？"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"如果您限制背景行動數據傳輸，則必須連線至 Wi-Fi 網路才能使用特定應用程式與服務。"</string>
+    <string name="data_usage_restrict_background" msgid="6387252645350792955">"如果您限制背景行動數據傳輸，則必須連線至 Wi-Fi 網路，否則部分應用程式和服務無法運作。"</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>