diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 28adb45..b50832e 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -199,7 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"የአስተናጋጁ መስክ ባዶ ከሆነ የወደብ መስኩ ባዶ መሆን አለበት።"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"የተየብከው ወደብ ትክክል አይደለም።"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"አሳሹ የHTTP ተተኪ ተጠቅሟል ሆኖም በሌሎች መተግበሪያዎች ላይጠቀም ይችላል።"</string>
-    <string name="proxy_url" msgid="2523518669129974654">"ፒ ኤ ሲ ዩ አር ኤል፦ "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"ፒ ኤ ሲ ዩአርኤል፦ "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ስፍራ:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"አጎራባችCID፡"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo፦"</string>
@@ -1114,7 +1114,7 @@
     <string name="uninstall_text" msgid="3644892466144802466">"አራግፍ"</string>
     <string name="uninstall_all_users_text" msgid="851857393177950340">"ለሁሉም ተጠቃሚዎች ያራግፉ"</string>
     <string name="install_text" msgid="884360662922471113">"ጫን"</string>
-    <string name="disable_text" msgid="6544054052049395202">"አታቦዝን"</string>
+    <string name="disable_text" msgid="6544054052049395202">"አቦዝን"</string>
     <string name="enable_text" msgid="9217362512327828987">"አንቃ"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"ውሂብ አጽዳ"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"አዘምኖች አትጫን"</string>
@@ -2009,7 +2009,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"የቅርጸ-ቁምፊ መጠን ይቀይሩ"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"መታ አድርገው ይክፈሉ"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"አንድ ጊዜ ብቻ መታ በማድረግ ይክፈሉ"</string>
-    <string name="nfc_payment_learn_more" msgid="5583407773744324447">"ተጨማሪ ይወቁ"</string>
+    <string name="nfc_payment_learn_more" msgid="5583407773744324447">"ተጨማሪ ለመረዳት"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"መተግበሪያዎችን አግኝ"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"እንደ ምርጫዎ ሆኖ ይዘጋጅ?"</string>
     <string name="nfc_payment_set_default" msgid="8961120988148253016">"መታ አድርገው በሚከፍሉበት ወቅት <xliff:g id="APP">%1$s</xliff:g> ሁልጊዜ ስራ ላይ ይዋል?"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 650f240..6740f29 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1686,7 +1686,7 @@
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Activar l\'administrador del dispositiu?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Activa"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrador del dispositiu"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"En activar aquest administrador, es permetrà que l\'aplicació <xliff:g id="APP_NAME">%1$s</xliff:g> dugui a terme les operacions següents:"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"En activar aquest administrador, l\'aplicació <xliff:g id="APP_NAME">%1$s</xliff:g> podrà dur a terme les operacions següents:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Aquest administrador està actiu i permet que l\'aplicació <xliff:g id="APP_NAME">%1$s</xliff:g> dugui a terme les operacions següents:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Sense títol"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"General"</string>
@@ -2000,7 +2000,7 @@
     <string name="user_delete_button" msgid="5131259553799403201">"Suprimeix"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permet aplicacions i contingut"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicacions amb restriccions"</string>
-    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Amplia configuració aplicació"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Desplega configuració aplicació"</string>
     <string name="home_app_uninstall_button" msgid="6808453012607962899">"Desinstal·la aquesta aplicació"</string>
     <string name="only_one_home_message" msgid="3538846733750242759">"La configuració d\'inici s\'amagarà fins que no instal·lis una altra aplicació d\'inici."</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Aquesta configuració afecta tots els usuaris de la tauleta."</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index b4a1d81..6849c86 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -475,7 +475,7 @@
   <string-array name="ram_states">
     <item msgid="7088762389498381203">"normální"</item>
     <item msgid="4517779899383204000">"střední"</item>
-    <item msgid="406385694840950802">"nízké"</item>
-    <item msgid="4212263919458209842">"kritické"</item>
+    <item msgid="406385694840950802">"nízká"</item>
+    <item msgid="4212263919458209842">"kritická"</item>
   </string-array>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 268152d..65e9d41 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1267,7 +1267,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Přepněte klávesami ctrl+mezerník"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Výchozí"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Rozložení klávesnice"</string>
-    <string name="user_dict_settings_title" msgid="3427169369758733521">"Osobní slovník"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Vlastní slovník"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Přidat"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Přidat do slovníku"</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 5ae9c61..a3c284b 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -243,11 +243,11 @@
     <item msgid="5387405117297558954">"vibrer"</item>
     <item msgid="3434165993711230924">"læs kontaktpersoner"</item>
     <item msgid="616161687718081936">"rediger kontaktpersoner"</item>
-    <item msgid="7638002295329050091">"læs opkaldsliste"</item>
+    <item msgid="7638002295329050091">"læse opkaldsliste"</item>
     <item msgid="6546959730920410907">"rediger opkaldslisten"</item>
     <item msgid="446877710771379667">"læs kalenderen"</item>
     <item msgid="7674458294386319722">"rediger kalenderen"</item>
-    <item msgid="8281201165558093009">"Wi-Fi-scanning"</item>
+    <item msgid="8281201165558093009">"Wi-Fi-søgning"</item>
     <item msgid="8694611243479480497">"underretning"</item>
     <item msgid="7776439107987345446">"mobilscanning"</item>
     <item msgid="514615766544675057">"ring til telefon"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 0408e89..4495928 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -188,12 +188,12 @@
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Brug ikke proxy til"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Gendan standarder"</string>
-    <string name="proxy_action_text" msgid="2957063145357903951">"Udført"</string>
-    <string name="proxy_hostname_label" msgid="8490171412999373362">"Proxyens værtsnavn"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Udfør"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Proxyens hostname"</string>
     <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Bemærk"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
-    <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Det indtastede værtsnavn er ikke gyldigt."</string>
+    <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Det indtastede hostname er ikke gyldigt."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Den indtastede udeladelsesliste er ikke korrekt formateret. Indtast en kommasepareret liste over udeladte domæner."</string>
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"Du skal udfylde portfeltet."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portfeltet skal være tomt, hvis værtsfeltet er tomt."</string>
@@ -224,7 +224,7 @@
     <string name="radio_info_network_type_label" msgid="3706382548257257987">"Netværkstype:"</string>
     <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Angiv den foretrukne netværkstype"</string>
     <string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Ping-IpAdr.:"</string>
-    <string name="radio_info_ping_hostname" msgid="3054888474808217853">"Ping-værtsnavn(www.google.com):"</string>
+    <string name="radio_info_ping_hostname" msgid="3054888474808217853">"Ping-hostname(www.google.com):"</string>
     <string name="radio_info_http_client_test" msgid="5733604021077701555">"HTTP-klienttest:"</string>
     <string name="ping_test_label" msgid="7255376471490860631">"Kør ping-test"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
@@ -254,7 +254,7 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Scanner SD-kort efter medier ..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB-lageret er skrivebeskyttet."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Det monterede SD-kort er skrivebeskyttet."</string>
-    <string name="skip_label" msgid="47510779345218297">"Skip"</string>
+    <string name="skip_label" msgid="47510779345218297">"Spring over"</string>
     <string name="next_label" msgid="4693520878012668114">"Næste"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Sprog"</string>
     <string name="activity_picker_label" msgid="6295660302548177109">"Vælg aktivitet"</string>
@@ -523,7 +523,7 @@
     <string name="wifi_display_details" msgid="7791118209992162698">"Skærmindstillinger"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Indstillinger for trådløs skærm"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Glem"</string>
-    <string name="wifi_display_options_done" msgid="5703116500357822557">"Udført"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Udfør"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Navn"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillad dataudveksling, når tabletten rører en anden enhed"</string>
@@ -731,7 +731,7 @@
     <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Afspil ikke lyd, når telefonen isættes og fjernes fra dockingstation"</string>
     <string name="account_settings" msgid="6403589284618783461">"Konti"</string>
     <string name="search_settings" msgid="1910951467596035063">"Søg"</string>
-    <string name="search_settings_summary" msgid="9205656546570654169">"Administrer søgeindstillinger og -oversigt"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Administrer søgeindstillinger og -historik"</string>
     <string name="display_settings" msgid="7965901687241669598">"Skærm"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Roter skærm automatisk"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Skift automatisk retning, når tabletcomputeren drejes"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index b7ebcfb..080d927 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -361,7 +361,7 @@
     <item msgid="4589278788192525675">"Schwarz auf Weiß"</item>
     <item msgid="1309255027325660115">"Gelb auf Schwarz"</item>
     <item msgid="2985943780939258562">"Gelb auf Blau"</item>
-    <item msgid="7520438652121629055">"Benutzerdefiniert"</item>
+    <item msgid="7520438652121629055">"Personalisiert"</item>
   </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4671055..8542090 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1336,8 +1336,8 @@
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Neu starten, um Laufzeit von <xliff:g id="OLD">%1$s</xliff:g> zu <xliff:g id="NEW">%2$s</xliff:g> zu ändern?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Kabellose Übertragung"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Optionen zur Zertifizierung für kabellose Übertragung anzeigen"</string>
-    <string name="allow_mock_location" msgid="2787962564578664888">"Falsche Standorte"</string>
-    <string name="allow_mock_location_summary" msgid="317615105156345626">"Falsche Standorte zulassen"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Simulierte Standorte"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Simulierte Standorte zulassen"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB-Debugging zulassen?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-Debugging ist nur für Entwicklungszwecke vorgesehen. Damit können Sie Daten zwischen Ihrem Computer und Ihrem Gerät kopieren, Apps auf Ihrem Gerät ohne Benachrichtigung installieren und Protokolldaten lesen."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Zugriff auf USB-Debugging für alle zuvor autorisierten Computer aufheben?"</string>
@@ -1383,7 +1383,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Bedienungshilfenverknüpfung"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"An"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Aus"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Wenn diese Funktion aktiviert ist, können Sie Bedienungshilfen schnell in zwei Schritten aktivieren:\n\nSchritt 1: Drücken und halten Sie die Ein-/Austaste, bis Sie einen Ton hören oder eine Vibration spüren.\n\nSchritt 2: Berühren und halten Sie mit zwei Fingern, bis Sie eine Audiobestätigung hören.\n\nFalls das Gerät mehrere Nutzer hat, werden die Bedienungshilfen durch Verwendung dieser Verknüpfung in der Bildschirmsperre solange aktiviert, bis das Gerät entsperrt ist."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Wenn diese Funktion aktiviert ist, können Sie Bedienungshilfen schnell in zwei Schritten aktivieren:\n\nSchritt 1: Drücken und halten Sie die Ein-/Aus-Taste, bis Sie einen Ton hören oder eine Vibration spüren.\n\nSchritt 2: Berühren und halten Sie mit zwei Fingern, bis Sie eine Audiobestätigung hören.\n\nFalls das Gerät mehrere Nutzer hat, werden die Bedienungshilfen durch Verwendung dieser Verknüpfung in der Bildschirmsperre solange aktiviert, bis das Gerät entsperrt ist."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Großer Text"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Bildschirmvergrößerung"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Vergrößerung autom. aktualisieren"</string>
@@ -1858,7 +1858,7 @@
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobiler Datenverkehr"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-/3G-Daten"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G-Daten"</string>
-    <string name="data_usage_app_settings" msgid="8430240158135453271">"App-Einstellungen anzeigen"</string>
+    <string name="data_usage_app_settings" msgid="8430240158135453271">"App-Einstellungen ansehen"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Hintergrunddaten beschränken"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Hintergrunddaten in Mobilfunknetzen deaktivieren und sofern verfügbar andere als Mobilfunknetze verwenden"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Legen Sie zur Beschränkung der App-Hintergrunddaten zuerst ein Mobildatenlimit fest."</string>
@@ -1946,7 +1946,7 @@
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Neues Passwort für vollständige Sicherungen erneut eingeben"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Passwort festlegen"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Abbrechen"</string>
-    <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</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">"Zusätzliche Systemupdates"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"Deaktiviert"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Moderat"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index a7f790e..d812e13 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -536,14 +536,14 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Kun tämä ominaisuus on käytössä, voit lähettää sovellusten sisältöä toiseen NFC-yhteensopivaan laitteeseen pitämällä laitteita lähekkäin. Voit lähettää esimerkiksi selaimen sivuja, YouTube-videoita ja yhteystietoja.\n\nAseta laitteet lähekkäin (yleensä taustat vastakkain) ja kosketa näyttöä. Sovellus määrittää lähetettävät tiedot."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Verkkopalveluhaku"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Anna muiden laitteiden sovelluksien löytää tämän laitteen sovelluksia"</string>
-    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wifi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ota wifi käyttöön"</string>
-    <string name="wifi_settings" msgid="29722149822540994">"Wifi"</string>
-    <string name="wifi_settings_category" msgid="8719175790520448014">"Wifi-asetukset"</string>
-    <string name="wifi_settings_title" msgid="3103415012485692233">"Wifi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi-asetukset"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Ota käyttöön ja hallinnoi langattoman yhteyden tukiasemia"</string>
     <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Valitse wifi-verkko"</string>
-    <string name="wifi_starting" msgid="6732377932749942954">"Wifi-yhteyttä otetaan käyttöön…"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi-yhteyttä otetaan käyttöön…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Poistetaan wifi-yhteyttä käytöstä…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Virhe"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Lentokonetilassa"</string>
@@ -560,10 +560,10 @@
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Älä näytä uudelleen"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Pidä wifi käytössä virransäästötilassa"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Asetuksen vaihtaminen epäonnistui"</string>
-    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wifi-optimointi"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi-optimointi"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Vähennä akun kulutusta, kun wifi on käytössä"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Lisää verkko"</string>
-    <string name="wifi_access_points" msgid="7053990007031968609">"Wifi-verkot"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi-verkot"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-painike"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Lisää asetuksia"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN"</string>
@@ -639,8 +639,8 @@
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"VAROITUS: Puhelin ei voi vahvistaa, että ohjelmisto on ajan tasalla, ennen kuin muodostat internetyhteyden."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet-laite ei voi muodostaa yhteyttä tähän wifi-verkkoon."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Puhelin ei voi muodostaa yhteyttä tähän wifi-verkkoon."</string>
-    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wifi-lisäasetukset"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wifi-taajuusalue"</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi-lisäasetukset"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi-Fi-taajuusalue"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Määritä toiminnan taajuusalue"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Ongelma taajuusalueen asettamisessa."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-osoite"</string>
@@ -712,7 +712,7 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Mykistä musiikki ja muu media"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Mykistä ilmoitukset"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Mykistä herätykset"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Värinä ja soittoääni"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Käytä värinää"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Telakointi"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Telakointiasetukset"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Ääni"</string>
@@ -820,7 +820,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Signaalin vahvuus"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Verkko"</string>
-    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wifi-yhteyden MAC-osoite"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi-yhteyden MAC-osoite"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-osoite"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Sarjanumero"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Ei käytettävissä"</string>
@@ -1011,7 +1011,7 @@
     <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Paikanna wifi- ja mobiiliverkkojen avulla"</string>
     <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Paikanna GPS:n avulla"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Haetaan…"</string>
-    <string name="location_network_based" msgid="9134175479520582215">"Wifi- ja mobiiliverkkosijainti"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi- ja mobiiliverkkosijainti"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Anna sovellusten arvioida sijaintisi Googlen sijaintipalvelulla. Anonyymejä sijaintitietoja kerätään ja lähetetään Googlelle."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Sijainti on määritetty wifi-yhteyden perusteella"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS-satelliitit"</string>
@@ -1471,14 +1471,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Ladataan"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Ruutu käytössä"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS käytössä"</string>
-    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wifi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Käytössä"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobiiliverkon signaali"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Laitteen käytössäoloaika"</string>
-    <string name="wifi_on_time" msgid="3208518458663637035">"Wifi-yhteyden käytössäoloaika"</string>
-    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wifi-yhteyden käytössäoloaika"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi-yhteyden käytössäoloaika"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi-yhteyden käytössäoloaika"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Historiatiedot"</string>
     <string name="details_title" msgid="3792801565213935385">"Käyttötiedot"</string>
@@ -1486,7 +1486,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Säädä virrankäyttöä"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Sisältyvät paketit"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ruutu"</string>
-    <string name="power_wifi" msgid="1135085252964054957">"Wifi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Kennot virransäästötilassa"</string>
     <string name="power_phone" msgid="5392641106474567277">"Äänipuhelut"</string>
@@ -1496,7 +1496,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Suorittimen käyttö etualalla"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ei virransäästötilaa"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wifi on käytössä"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi on käytössä"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Puhelin"</string>
     <string name="usage_type_data_send" msgid="3875198715268918671">"Lähetetty mobiilitiedonsiirto"</string>
@@ -1511,7 +1511,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Sovelluksen tiedot"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Sovellusasetukset"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Ruudun asetukset"</string>
-    <string name="battery_action_wifi" msgid="8181553479021841207">"Wifi-asetukset"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Wi-Fi-asetukset"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-asetukset"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Äänipuhelujen käyttämä akku"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Käytetty akun virta tablet-laitteen ollessa pois käytöstä"</string>
@@ -1520,7 +1520,7 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Vaihda lentokonetilaan säästääksesi akkua ollessasi katvealueella."</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Näytön ja taustavalon käyttämä akku"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Vähennä näytön kirkkautta ja/tai näytön sammumista"</string>
-    <string name="battery_desc_wifi" msgid="2375567464707394131">"Wifi-yhteyden käyttämä akku"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi-Fi-yhteyden käyttämä akku"</string>
     <string name="battery_sugg_wifi" msgid="3355461362094706957">"Poista wifi käytöstä, kun sitä ei käytetä tai kun yhteys ei ole käytettävissä"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bluetooth-yhteyden käyttämä akun virta"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Poista Bluetooth-yhteys käytöstä, kun et käytä sitä."</string>
@@ -1622,7 +1622,7 @@
     <string name="gadget_state_off" msgid="5220212352953066317">"pois käytöstä"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"otetaan käyttöön"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"poistetaan käytöstä"</string>
-    <string name="gadget_wifi" msgid="4712584536500629417">"Wifi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_location" msgid="2974757497945178165">"Sijainti"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synkronointi"</string>
@@ -1693,7 +1693,7 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Ilmoitukset"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Soittoääni ja värinä"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Järjestelmä"</string>
-    <string name="wifi_setup_title" msgid="2970260757780025029">"Wifi-asetukset"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi-Fi-asetukset"</string>
     <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Yhdistä wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Yhdistetään wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
     <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Yhdistetty wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -1847,7 +1847,7 @@
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Aseta 4G-tiedonsiirtoraja"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Aseta 2G-3G-tiedonsiirtoraja"</string>
     <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Aseta wifi-tiedons.raja"</string>
-    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wifi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobiili"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1892,7 +1892,7 @@
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobiiliyhteyden hotspotit"</string>
     <string name="data_usage_metered_body" msgid="4959032833706695848">"Valitse wifi-verkot, joita käytetään mobiiliyhteyden hotspotteina. Sovelluksia voidaan kieltää käyttämästä näitä verkkoja niiden toimiessa taustalla. Sovellukset voivat myös näyttää varoituksen ennen suurien tiedostojen lataamista näiden verkkojen kautta."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiiliverkot"</string>
-    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wifi-verkot"</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wi-Fi-verkot"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Ota wifi käyttöön valitaksesi mobiiliyhteyden hotspotteja."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hätäpuhelu"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Palaa puheluun"</string>
@@ -2028,7 +2028,7 @@
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Ohjaaja: <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="app_not_supported_in_limited" msgid="913035259626149121">"Tätä sovellusta ei tueta rajoitetuissa profiileissa"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Tämä sovellus saa käyttää tilejäsi"</string>
-    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wifi- ja mobiiliverkko"</string>
+    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi- ja mobiiliverkko"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Salli wifi- ja mobiiliverkkoasetuksien muokkaaminen"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Salli Bluetooth-parien ja -asetuksien muokkaaminen"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d41c5b4..6e19434 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -298,7 +298,7 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"समय सेट करें"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"समय क्षेत्र को चुनें"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"दिनांक सेट करें"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"डेटा प्रारूप चुनें"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"दिनांक प्रारूप चुनें"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"वर्णानुक्रम में क्रमित करें"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"समय क्षेत्र द्वारा क्रमित करें"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"तिथि"</string>
@@ -987,8 +987,8 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"सहायता"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"मोबाइल नेटवर्क"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"मोबाइल प्लान"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"डिफ़ॉल्ट SMS एप्लिकेशन"</string>
-    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS एप्लिकेशन बदलें?"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"डिफ़ॉल्ट SMS ऐप्लिकेशन"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS ऐप्लिकेशन बदलें?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"आपके SMS ऐप्स के रूप में <xliff:g id="CURRENT_APP">%2$s</xliff:g> के बजाय <xliff:g id="NEW_APP">%1$s</xliff:g> का उपयोग करें?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"आपके SMS ऐप्स के रूप में <xliff:g id="NEW_APP">%s</xliff:g> का उपयोग करें?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"अज्ञात SIM ऑपरेट"</string>
@@ -1539,7 +1539,7 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"प्रोसेस के आंकड़े"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"चल रही प्रक्रिया के बारे में आकंड़े"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"स्मृति उपयोग"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TIME">%2$s</xliff:g> में <xliff:g id="TYPE">%1$s</xliff:g> एप्लिकेशन"</string>
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TIME">%2$s</xliff:g> में <xliff:g id="TYPE">%1$s</xliff:g> ऐप्लिकेशन"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"पृष्ठभूमि"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"अग्रभूमि"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"संचित"</string>
@@ -1664,8 +1664,8 @@
     <string name="privacy_settings_title" msgid="4856282165773594890">"सुरक्षित करें और रीसेट करें"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"सुरक्षित करें और पुनर्स्‍थापित करें"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"निजी डेटा"</string>
-    <string name="backup_data_title" msgid="1239105919852668016">"मेरे डेटा का को सुरक्षित करें"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"ऐप्स  डेटा, Wi‑Fi पासवर्ड, और अन्य सेटिंग का Google सर्वर पर बैकअप लें"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"मेरे डेटा को सुरक्षित करें"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"ऐप्स  डेटा, Wi‑Fi पासवर्ड, और अन्य सेटिंग को Google सर्वर पर सुरक्षित रखें"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"सुरक्षित खाता"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"वर्तमान में कोई भी खाता बैकअप डेटा संग्रहीत नहीं कर रहा है"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"स्‍वचालित पुनर्स्थापना"</string>
@@ -1677,7 +1677,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"नया पासवर्ड तथा पुष्टि का मिलान नहीं होता है"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"सुरक्षित पासवर्ड सेट करने में विफल रहा"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"अपने Wi-Fi पासवर्ड, बुकमार्क, अन्य सेटिंग और ऐप्स  डेटा का बैक अप लेना रोकें, साथ ही Google सर्वर से सभी प्रतियां मिटाएं?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"अपने 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>
@@ -1797,10 +1797,10 @@
     <string name="show_touches_summary" msgid="6684407913145150041">"स्पर्श के लिए दिखाई देने वाले फ़ीडबैक दिखाएं"</string>
     <string name="show_screen_updates" msgid="5470814345876056420">"सतह के नई जानकारी दिखाएं"</string>
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"विंडो सतहें के नई जानकारी मिलने पर उन सभी को फ़्लैश करें"</string>
-    <string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU दृश्‍य के नई जानकारी दिखाएं"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU दृश्य की नई जानकारी दिखाएं"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU के साथ आरेखित करने पर विंडो में दृश्‍यों को फ़्लैश करें"</string>
-    <string name="show_hw_layers_updates" msgid="5645728765605699821">"हार्डवेयर लेयर अप. दिखाएं"</string>
-    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"हार्डवेयर लेयर का नई जानकारी मिलने पर हरे फ़्लैश होते हैं"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"हार्डवेयर लेयर की नई जानकारी"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"हार्डवेयर लेयर की नई जानकारी मिलने पर हरा फ़्लैश होता है"</string>
     <string name="debug_hw_overdraw" msgid="2968692419951565417">"GPU ओवरड्रॉ डीबग करें"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW ओवरले अक्षम करें"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"स्‍क्रीन संयोजन के लिए हमेशा GPU का उपयोग करें"</string>
@@ -1953,7 +1953,7 @@
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"नेटवर्क को मॉनीटर किया जा सकता है"</string>
     <string name="done_button" msgid="1991471253042622230">"पूर्ण"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"नेटवर्क मॉनिटरिंग"</string>
-    <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"यह उपकरण इसके द्वारा प्रबंधित है:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nआपका व्यवस्थापक, ईमेल, एप्लिकेशन, और सुरक्षित वेबसाइटों सहित, आपकी नेटवर्क गतिविधि को मॉनीटर करने में सक्षम है.\n\nअधिक जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें."</string>
+    <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"यह उपकरण इसके द्वारा प्रबंधित है:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nआपका व्यवस्थापक, ईमेल, ऐप्लिकेशन, और सुरक्षित वेबसाइटों सहित, आपकी नेटवर्क गतिविधि को मॉनीटर करने में सक्षम है.\n\nअधिक जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें."</string>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"एक तृतीय पक्ष ईमेल, ऐप्स और सुरक्षित वेबसाइटों सहित आपकी नेटवर्क गतिविधि को मॉनीटर करने में सक्षम है.\n\nआपके उपकरण पर इंस्टॉल किए गए एक विश्वसनीय क्रेंडेशियल के कारण ऐसा संभव हो रहा है."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"विश्वसनीय क्रेडेंशियल की जांच करें"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"उपयोगकर्ता"</string>
@@ -2001,8 +2001,8 @@
     <string name="application_restrictions" msgid="8207332020898004394">"ऐप्स  और सामग्री की अनुमति दें"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबंधों वाले ऐप्स"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ऐप्स  सेटिंग विस्तृत करें"</string>
-    <string name="home_app_uninstall_button" msgid="6808453012607962899">"इस एप्लिकेशन को अनइंस्टॉल करें"</string>
-    <string name="only_one_home_message" msgid="3538846733750242759">"होम सेटिंग तब तक छुपी रहेंगी, जब तक कि आप दूसरा होम एप्लिकेशन इंस्टॉल नहीं कर लेते."</string>
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"इस ऐप्लिकेशन को अनइंस्टॉल करें"</string>
+    <string name="only_one_home_message" msgid="3538846733750242759">"होम सेटिंग तब तक छुपी रहेंगी, जब तक कि आप दूसरा होम ऐप्लिकेशन इंस्टॉल नहीं कर लेते."</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"यह सेटिंग इस टेबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"यह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"भाषा बदलें"</string>
diff --git a/res/values-km-rKH/arrays.xml b/res/values-km-rKH/arrays.xml
index 52af7c3..4ca5cf8 100644
--- a/res/values-km-rKH/arrays.xml
+++ b/res/values-km-rKH/arrays.xml
@@ -129,7 +129,7 @@
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ប៊ូតុង​ចុច"</item>
-    <item msgid="1624323946324499595">"កូដ PIN ពី​ឧបករណ៍"</item>
+    <item msgid="1624323946324499595">"កូដ PIN ពី​ឧបករណ៍​"</item>
     <item msgid="5366790421523328066">"កូដ PIN ពី​ឧបករណ៍​នេះ"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
@@ -147,7 +147,7 @@
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ខ្សោយ"</item>
-    <item msgid="5615082285463430971">"មធ្យម"</item>
+    <item msgid="5615082285463430971">"មធ្យម​"</item>
     <item msgid="3565079809875324621">"ល្អ"</item>
     <item msgid="5702329417707689835">"ល្អ​ណាស់"</item>
   </string-array>
@@ -227,10 +227,10 @@
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"ឧបករណ៍​ផ្ទុក​ខាង​ក្នុង"</item>
     <item msgid="3738430123799803530">"កាត​អេសឌី​​ដែល​អាច​ដក​បាន"</item>
-    <item msgid="4498124044785815005">"ឲ្យ​ប្រព័ន្ធ​សម្រេចចិត្ត"</item>
+    <item msgid="4498124044785815005">"ឲ្យ​ប្រព័ន្ធ​សម្រេចចិត្ត​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​"</item>
   </string-array>
   <string-array name="app_ops_categories">
-    <item msgid="6358963769537892925">"ទី​តាំង"</item>
+    <item msgid="6358963769537892925">"ទី​តាំង​"</item>
     <item msgid="255608127647030286">"ផ្ទាល់ខ្លួន"</item>
     <item msgid="4588829735729884491">"ការ​ផ្ញើ​សារ"</item>
     <item msgid="886742181977884584">"មេឌៀ"</item>
@@ -271,7 +271,7 @@
     <item msgid="5124443975763747838">"ប៊ូតុង​មេឌៀ"</item>
     <item msgid="4547883971364273343">"ការ​ផ្ដោត​សំឡេង"</item>
     <item msgid="2603878814882344450">"កម្រិត​សំឡេង​មេ"</item>
-    <item msgid="7136963238377062018">"កម្រិត​សំឡេង"</item>
+    <item msgid="7136963238377062018">"កម្រិត​សំឡេង​​"</item>
     <item msgid="4270236897655923007">"កម្រិត​សំឡេង​រោទ៍"</item>
     <item msgid="6325739889222559394">"កម្រិត​សំឡេង​មេឌៀ"</item>
     <item msgid="5762123934816216821">"កម្រិត​សំឡេង​រោទ៍"</item>
@@ -282,9 +282,9 @@
     <item msgid="5753382310468855812">"​ពិនិត្យ​ទីតាំង​ថាមពល​​ខ្ពស់"</item>
   </string-array>
   <string-array name="app_ops_labels">
-    <item msgid="6602854600289714121">"ទី​តាំង"</item>
-    <item msgid="8677040780775113033">"ទី​តាំង"</item>
-    <item msgid="1660743989948992916">"ទី​តាំង"</item>
+    <item msgid="6602854600289714121">"ទី​តាំង​"</item>
+    <item msgid="8677040780775113033">"ទី​តាំង​"</item>
+    <item msgid="1660743989948992916">"ទី​តាំង​"</item>
     <item msgid="8791172739860195290">"ញ័រ"</item>
     <item msgid="383413555642128046">"អាន​ទំនាក់ទំនង"</item>
     <item msgid="3654594895269697313">"កែ​ទំនាក់ទំនង"</item>
@@ -292,13 +292,13 @@
     <item msgid="6248591205254641116">"កែ​បញ្ជី​ហៅ"</item>
     <item msgid="6093344633066170692">"អាន​ប្រតិទិន"</item>
     <item msgid="1334886368750347692">"កែ​ប្រតិទិន"</item>
-    <item msgid="1638204101698708656">"ទី​តាំង"</item>
+    <item msgid="1638204101698708656">"ទី​តាំង​"</item>
     <item msgid="2154671955760380322">"ប្រកាស​ការ​ជូន​ដំណឹង"</item>
-    <item msgid="4282477730595931828">"ទី​តាំង"</item>
+    <item msgid="4282477730595931828">"ទី​តាំង​"</item>
     <item msgid="4891423912898525905">"ហៅ​ទូរស័ព្ទ"</item>
     <item msgid="2623604824935968113">"អាន​សារ SMS/MMS"</item>
     <item msgid="4420177125221176306">"សរសេរ​សារ SMS/MMS"</item>
-    <item msgid="3986142739951490025">"ទទួល SMS/MMS"</item>
+    <item msgid="3986142739951490025">"ទទួល SMS/MMS​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​"</item>
     <item msgid="3984213795861739778">"ទទួល SMS/MMS"</item>
     <item msgid="3656243523752472788">"ទទួល SMS/MMS"</item>
     <item msgid="8105802370238551510">"ទទួល SMS/MMS"</item>
@@ -323,8 +323,8 @@
     <item msgid="9103719301075748925">"កម្រិត​សំឡេង​ការ​ជូន​ដំណឹង"</item>
     <item msgid="7025966722295861512">"កម្រិត​សំឡេង​ប៊្លូធូស"</item>
     <item msgid="4665183401128289653">"មិន​ដេក"</item>
-    <item msgid="8584357129746649222">"ទី​តាំង"</item>
-    <item msgid="7669257279311110599">"ទី​តាំង"</item>
+    <item msgid="8584357129746649222">"ទី​តាំង​"</item>
+    <item msgid="7669257279311110599">"ទី​តាំង​"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"ខ្លី"</item>
@@ -464,7 +464,7 @@
     <item msgid="6692305604213080515">"កំពុង​​ចាប់ផ្ដើម…"</item>
     <item msgid="8001704909356800092">"កំពុង​ត​ភ្ជាប់​…"</item>
     <item msgid="4039737283841672166">"បាន​តភ្ជាប់"</item>
-    <item msgid="4042143101664725090">"អស់​​ពេល"</item>
+    <item msgid="4042143101664725090">"អស់​​ពេល​"</item>
     <item msgid="7664124146786465092">"មិន​ជោគជ័យ"</item>
   </string-array>
   <string-array name="security_settings_premium_sms_values">
@@ -476,6 +476,6 @@
     <item msgid="7088762389498381203">"ធម្មតា"</item>
     <item msgid="4517779899383204000">"សម្របសម្រួល"</item>
     <item msgid="406385694840950802">"ទាប"</item>
-    <item msgid="4212263919458209842">"សំខាន់"</item>
+    <item msgid="4212263919458209842">"សំខាន់​"</item>
   </string-array>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 7cb73ed..3bb3d18 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -71,7 +71,7 @@
     <string name="small_font" msgid="2295331917424072635">"តូច"</string>
     <string name="medium_font" msgid="2068475425515133701">"ឧបករណ៍​ផ្ទុក"</string>
     <string name="large_font" msgid="599055175160971446">"ធំ"</string>
-    <string name="font_size_save" msgid="3450855718056759095">"យល់​ព្រម"</string>
+    <string name="font_size_save" msgid="3450855718056759095">"យល់​ព្រម​"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"កាត​អេសឌី"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"ស្ថានភាព​ថ្ម៖"</string>
@@ -192,7 +192,7 @@
     <string name="proxy_hostname_label" msgid="8490171412999373362">"ឈ្មោះ​ម៉ាស៊ីន​ប្រូកស៊ី"</string>
     <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"ប្រយ័ត្ន"</string>
-    <string name="proxy_error_dismiss" msgid="4993171795485460060">"យល់​ព្រម"</string>
+    <string name="proxy_error_dismiss" msgid="4993171795485460060">"យល់​ព្រម​"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"ឈ្មោះ​ម៉ាស៊ីន​ដែល​អ្នក​បាន​បញ្ចូល​មិន​ត្រឹមត្រូវ។"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"បញ្ជី​ដកចេញ​ដែល​អ្នក​បាន​បញ្ចូល​មិន​មាន​ទ្រង់ទ្រាយ​ត្រឹមត្រូវ។ សូម​បញ្ចូល​បញ្ជី​ដែន​​​ដ​ក​ចេញ​បំបែក​ដោយ​សញ្ញា​ក្បៀស។"</string>
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"អ្នក​ត្រូវ​តែ​បំពេញ​វាល​ច្រក។"</string>
@@ -255,7 +255,7 @@
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី​បាន​ភ្ជាប់​បាន​តែ​អាន"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"កាត​អេសឌី​​បាន​ភ្ជាប់​បាន​តែ​អាន"</string>
     <string name="skip_label" msgid="47510779345218297">"រំលង"</string>
-    <string name="next_label" msgid="4693520878012668114">"បន្ទាប់"</string>
+    <string name="next_label" msgid="4693520878012668114">"បន្ទាប់​"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"ភាសា"</string>
     <string name="activity_picker_label" msgid="6295660302548177109">"ជ្រើស​សកម្មភាព"</string>
     <string name="device_info_label" msgid="6551553813651711205">"ព័ត៌មាន​ឧបករណ៍"</string>
@@ -266,7 +266,7 @@
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"ឧបករណ៍​ផ្ទុក​​យូអេសប៊ី"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"កាត​អេសឌី"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"ការ​កំណត់​ប្រូកស៊ី"</string>
-    <string name="cancel" msgid="6859253417269739139">"បោះ​បង់"</string>
+    <string name="cancel" msgid="6859253417269739139">"បោះ​បង់​"</string>
     <string name="settings_label" msgid="1626402585530130914">"ការ​កំណត់"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"ការ​កំណត់"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"កំណត់​ផ្លូវកាត់"</string>
@@ -295,9 +295,9 @@
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"ប្រើ​តំបន់​ពេលវេលា​បាន​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"ប្រើ​តំបន់​ពេលវេលា​បាន​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"ប្រើ​ទ្រង់ទ្រាយ ២៤ ម៉ោង"</string>
-    <string name="date_time_set_time" msgid="5716856602742530696">"កំណត់​ម៉ោង"</string>
+    <string name="date_time_set_time" msgid="5716856602742530696">"កំណត់​ម៉ោង​"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"ជ្រើស​តំបន់​ពេលវេលា"</string>
-    <string name="date_time_set_date" msgid="7021491668550232105">"កំណត់​កាល​បរិច្ឆេទ"</string>
+    <string name="date_time_set_date" msgid="7021491668550232105">"កំណត់​កាល​បរិច្ឆេទ​"</string>
     <string name="date_time_date_format" msgid="6951498879879281102">"ជ្រើស​ទ្រង់ទ្រាយ​កាល​បរិច្ឆេទ"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"តម្រៀប​តាម​អក្សរក្រម"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"តម្រៀប​តាម​តំបន់​ពេល​វេលា"</string>
@@ -318,7 +318,7 @@
     <string name="user_info_settings_title" msgid="1195015434996724736">"ព័ត៌មាន​អ្នកប្រើ"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"បង្ហាញ​ព័ត៌មាន​​ប្រវត្តិរូប​លើ​អេក្រង់ចាក់សោ"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"ព័ត៌មាន​ប្រវត្តិរូប"</string>
-    <string name="location_settings_title" msgid="1369675479310751735">"ទី​តាំង"</string>
+    <string name="location_settings_title" msgid="1369675479310751735">"ទី​តាំង​"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"សុវត្ថិភាព"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"កំណត់​ទីតាំង​របស់​ខ្ញុំ ដោះ​សោ​អេក្រង់ ចាក់​សោ​ស៊ីម​កាត ចាក់​សោ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"កំណត់​ទីតាំង​ខ្ញុំ, ការ​ដោះ​សោ​អេក្រង់, សោ​ឧបករណ៍​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
@@ -326,8 +326,8 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ការ​ដាក់​លេខ​កូដ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ដាក់​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ដាក់​លេខ​កូដ​ទូរស័ព្ទ"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"ទាមទារ​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់ ដើម្បី​ដោះ​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ​​របស់​អ្នក​រាល់​ពេល​​បើក"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"ទាមទារ​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់ ដើម្បី​ដោះ​លេខ​កូដ​ទូរស័ព្ទ​របស់​អ្នក​រាល់​ពេល​​បើក"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"ទាមទារ​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់ ដើម្បី​ដោះ​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ​​របស់​អ្នក​រាល់​ពេល​​បើក​"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"ទាមទារ​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់ ដើម្បី​ដោះ​លេខ​កូដ​ទូរស័ព្ទ​របស់​អ្នក​រាល់​ពេល​​បើក​"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"បាន​ដាក់លេខ​កូដ"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"អ្នក​អាច​ដាក់​លេខ​កូដ​គណនី ការ​កំណត់ កម្មវិធី និង​ទិន្នន័យ​បាន​ទាញ​យក មេឌៀ ​និង​​ឯកសារ​ផ្សេងៗ​របស់​អ្នក។ ពេល​អ្នក​ដាក់​លេខ​កូដ​​កុំព្យូទ័រ​បន្ទះ​​របស់​អ្នក អ្នក​ត្រូវ​តែ​បញ្ចូល​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់​ដើម្បី​ដោះ​លេខ​កូដ​របស់​អ្នក​​រាល់​ពេល​ចាប់ផ្ដើម​៖​ អ្នក​មិន​អាច​ដោះ​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ​​​របស់​អ្នក​បាន​​ទេ លើកលែង​តែ​អនុវត្ត​ការ​កំណត់​ទិន្នន័យ​ដូច​ចេញ​ពី​រោងចក្រ ដោយ​លុប​ទិន្នន័យ​របស់​អ្នក​ទាំងអស់។\n\nការ​​ដាក់លេខ​កូដ​ចំណាយ​ពេល​​មួយ​ម៉ោង។ អ្នក​ត្រូវ​បញ្ចូល​ថ្ម​ និង​ដោត​ជាប់​រហូត​ដល់​ពេល​ការ​ដាក់​លេខ​កូដ​បាន​បញ្ចប់។ បើ​អ្នក​ផ្អាក​ដំណើរការ​ដាក់​លេខ​កូដ​ អ្នក​នឹង​បាត់បង់​ទិន្នន័យ​មួយ​ចំនួន ឬ​ទាំង​អស់​របស់​អ្នក។"</string>
     <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"អ្នក​អាច​ដាក់​លេខ​កូដ​​គណនី ការ​កំណត់ កម្មវិធី និង​ទិន្នន័យ​បាន​ទាញ​យក មេឌៀ និង​​ឯកសារ​ផ្សេងៗ​របស់​អ្នក។ ពេល​អ្នក​ដាក់​លេខ​កូដ​ទូរស័ព្ទ​របស់​អ្នក អ្នក​ត្រូវ​តែ​បញ្ចូល​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់​ដើម្បី​ដោះ​លេខ​កូដ​របស់​អ្នក​​រាល់​ពេល​ចាប់ផ្ដើម​៖ អ្នក​មិន​អាច​ដោះ​លេខ​កូដ​ទូរស័ព្ទ​របស់​អ្នក​បាន​​ទេ លើកលែង​តែ​អនុវត្ត​ការ​កំណត់​ទិន្នន័យ​ដូច​ចេញ​ពី​រោងចក្រ ដោយ​លុប​ទិន្នន័យ​របស់​អ្នក​ទាំងអស់។\n\nការ​​ដាក់លេខ​កូដ​ចំណាយ​ពេល​​មួយ​ម៉ោង។ អ្នក​ត្រូវ​បញ្ចូល​ថ្ម​ និង​ដោត​ជាប់​រហូត​ដល់​ពេល​ការ​ដាក់​លេខ​កូដ​បាន​បញ្ចប់។ បើ​អ្នក​ផ្អាក​ដំណើរការ​ដាក់​លេខ​កូដ​ អ្នក​នឹង​បាត់បង់​ទិន្នន័យ​មួយ​ចំនួន ឬ​ទាំង​អស់​របស់​អ្នក។"</string>
@@ -366,7 +366,7 @@
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"សុវត្ថិភាព​មធ្យម"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"កូដ PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"សុវត្ថិភាព​ពី​មធ្យម​ទៅ​ខ្ពស់"</string>
-    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ពាក្យសម្ងាត់"</string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ពាក្យសម្ងាត់​"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"សុវត្ថិភាព​ខ្ពស់"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"បាន​បិទ​ដោយ​​អ្នក​គ្រប់គ្រង ការ​ដាក់​លេខ​កូដ​គោលនយោបាយ ឬ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"គ្មាន"</string>
@@ -374,7 +374,7 @@
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"ដោះ​សោ​តាម​​ទម្រង់​មុខ"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"លំនាំ"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"កូដ PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"ពាក្យសម្ងាត់"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"ពាក្យសម្ងាត់​"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"បិទ​ការ​ចាក់​សោ​អេក្រង់"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"លុប​​លំនាំ​ដោះ​សោ"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"លុប​កូដ​ PIN ដោះ​សោ"</string>
@@ -383,7 +383,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ប្ដូរ​កូដ​ PIN ដោះ​សោ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ប្ដូរ​ពាក្យសម្ងាត់​ដោះ​សោ"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"ពាក្យ​សម្ងាត់​ត្រូវ​មាន​យ៉ាង​ហោច​ណាស់ %d តួអក្សរ"</string>
-    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"កូដ PIN ត្រូវ​តែ​មាន​​យ៉ាង​ហោច​ណាស់ %d តួ"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"កូដ PIN ត្រូវ​តែ​មាន​​យ៉ាង​ហោច​ណាស់ %d តួ​"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"ប៉ះ បន្ត​ពេល​រួចរាល់"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"បន្ត"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​តិច​ជាង <xliff:g id="NUMBER">%d</xliff:g> តួអក្សរ។"</string>
@@ -419,10 +419,10 @@
     <item quantity="other" msgid="3952508584649046404">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​មាន​យ៉ាង​ហោច​ណាស់​តួអក្សរ​មិន​មែ​ន​ជា​អក្សរ %d ។"</item>
   </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"អ្នក​គ្រប់គ្រង​ឧបករណ៍​មិន​អនុញ្ញាត​ឲ្យ​ប្រើ​ពាក្យ​សម្ងាត់​បច្ចុប្បន្ន​ទេ។"</string>
-    <string name="lockpassword_ok_label" msgid="313822574062553672">"យល់​ព្រម"</string>
-    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"បោះ​បង់"</string>
-    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"បោះ​បង់"</string>
-    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"បន្ទាប់"</string>
+    <string name="lockpassword_ok_label" msgid="313822574062553672">"យល់​ព្រម​"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"បោះ​បង់​"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"បោះ​បង់​"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"បន្ទាប់​"</string>
     <string name="lock_setup" msgid="3355847066343753943">"ការ​រៀបចំ​បាន​បញ្ចប់។"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"ការ​គ្រប់គ្រង​ឧបករណ៍"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"អ្នក​គ្រប់គ្រង​ឧបករណ៍"</string>
@@ -452,7 +452,7 @@
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"ពី៖ &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ផ្គូផ្គង​ជា​មួយ​ឧបករណ៍​នេះ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"ដើម្បី​ផ្គូផ្គង​ជា​មួយ៖ <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>វាយ​បញ្ចូល៖ <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> បន្ទាប់​មក​ចុច​ Return ឬ Enter ។"</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"ផ្គូផ្គង"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"បោះ​បង់"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"បោះ​បង់​"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"មិន​អាច​ផ្គូផ្គង​ជា​មួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ។"</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"មិន​អាច​ផ្គូផ្គង​ជា​មួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ព្រោះ​​​កូដ PIN ឬ​លេខ​កូដ​មិន​ត្រឹមត្រូវ។"</string>
@@ -549,7 +549,7 @@
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ពេល​ជិះ​យន្ត"</string>
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"មិន​អាច​វិភាគ​រក​បណ្ដាញ"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"ការ​ជូន​ដំណឹង​បណ្ដាញ"</string>
-    <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"ជូន​ដំណឹង​ខ្ញុំ ពេល​​មាន​បណ្ដាញ"</string>
+    <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"ជូន​ដំណឹង​ខ្ញុំ ពេល​​មាន​បណ្ដាញ​​"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ជៀសវាង​ការ​តភ្ជាប់​ដែល​ខ្សោយ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"កុំ​ប្រើ​បណ្ដាញ​វ៉ាយហ្វាយ លុះ​ត្រា​វា​មាន​ការ​តភ្ជាប់​អ៊ីនធឺណិត​ល្អ"</string>
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"វិភាគ​រក​​គ្រប់ពេល"</string>
@@ -606,7 +606,7 @@
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"វិញ្ញាបនបត្រ​អ្នក​ប្រើ"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"អត្តសញ្ញាណ"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"អត្តសញ្ញាណ​អនាមិក"</string>
-    <string name="wifi_password" msgid="5948219759936151048">"ពាក្យសម្ងាត់"</string>
+    <string name="wifi_password" msgid="5948219759936151048">"ពាក្យសម្ងាត់​"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"បង្ហាញ​ពាក្យ​សម្ងាត់"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"ការ​កំណត់ IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(មិន​ផ្លាស់ប្ដូរ)"</string>
@@ -630,7 +630,7 @@
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"បាន​បរាជ័យ​ក្នុង​បំភ្លេច​បណ្ដាញ"</string>
     <string name="wifi_save" msgid="3331121567988522826">"រក្សាទុក"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"បាន​បរាជ័យ​ក្នុង​ការ​រក្សាទុក​បណ្ដាញ"</string>
-    <string name="wifi_cancel" msgid="6763568902542968964">"បោះ​បង់"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"បោះ​បង់​"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"រំលង"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"កុំ​រំលង"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ការ​ព្រមាន៖ អ្នក​អាច​​ត្រូវ​កាត់​លុយ​ថ្លៃ​សេវាកម្ម​ទិន្នន័យ​។\n\nការ​រៀបចំ​កុំព្យូទ័រ​បន្ទះ​អាច​ទាមទារ​សកម្មភាព​បណ្ដាញ​ដែល​សំខាន់។"</string>
@@ -647,7 +647,7 @@
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"អាសយដ្ឋាន IP"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"ការ​កំណត់ IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"រក្សាទុក"</string>
-    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"បោះ​បង់"</string>
+    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"បោះ​បង់​"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"បញ្ចូល​អាសយដ្ឋាន IP ដែល​ត្រឹមត្រូវ។"</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"បញ្ចូល​អាសយដ្ឋាន​ច្រកចេញ​ចូល​ដែល​ត្រឹមត្រូវ"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"បញ្ចូល​អាសយដ្ឋាន DNS ដែល​ត្រឹមត្រូវ។"</string>
@@ -716,11 +716,11 @@
     <string name="dock_settings" msgid="1820107306693002541">"ភ្ជាប់"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"កំណត់​ការ​ភ្ជាប់"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"សំឡេង"</string>
-    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"កំណត់​សម្រាប់​​ការ​ភ្ជាប់​ផ្ទៃតុ"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"កំណត់​សម្រាប់​​ការ​ភ្ជាប់​ផ្ទៃតុ​"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"កំណត់​សម្រាប់​ភ្ជាប់រថយន្ត"</string>
     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"មិន​បាន​ភ្ជាប់​កុំព្យូទ័រ​បន្ទះ"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"មិន​បាន​ភ្ជាប់ទូរស័ព្ទ"</string>
-    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"កំណត់​សម្រាប់​ការ​ភ្ជាប់"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"កំណត់​សម្រាប់​ការ​ភ្ជាប់​"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"រក​មិន​ឃើញ​ការ​ភ្ជាប់"</string>
     <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"អ្នក​ត្រូវ​ភ្ជាប់​កុំព្យូទ័រ​បន្ទះ មុន​នឹង​រៀបចំ​​​សំឡេង​​ភ្ជាប់។"</string>
     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"អ្នក​ត្រូវ​តែ​ភ្ជាប់​ទូរស័ព្ទ មុន​ពេល​កំណត់​សំឡេង​ភ្ជាប់។"</string>
@@ -778,8 +778,8 @@
     <string name="sim_change_failed" msgid="304964924772218382">"មិន​អាច​ប្ដូរ​កូដ PIN ។\nប្រហែលជា​កូដ PIN មិន​ត្រឹមត្រូវ។"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"បាន​ប្ដូរ​​​កូដ PIN ស៊ីម​កាត់​ដោយ​ជោគជ័យ"</string>
     <string name="sim_lock_failed" msgid="5651596916127873626">"មិន​អាច​ប្ដូរ​ស្ថានភាព​ការ​ចាក់​សោ​ស៊ីម​កាត។\nប្រហែល​ជា​កូដ​ PIN មិន​ត្រឹមត្រូវ។"</string>
-    <string name="sim_enter_ok" msgid="6475946836899218919">"យល់​ព្រម"</string>
-    <string name="sim_enter_cancel" msgid="6240422158517208036">"បោះ​បង់"</string>
+    <string name="sim_enter_ok" msgid="6475946836899218919">"យល់​ព្រម​"</string>
+    <string name="sim_enter_cancel" msgid="6240422158517208036">"បោះ​បង់​"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"លេខ​កូដ PIN ស៊ីម​មិន​ត្រឹមត្រូវ អ្នក​ត្រូវ​​ទាក់ទង​ក្រុមហ៊ុន​បញ្ជូន​របស់​អ្នក​ឥឡូវ​នេះ​ដើម្បី​ដោះ​សោ​ឧបករណ៍​របស់​អ្នក។"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"លេខ​កូដ PIN ស៊ីម​មិន​ត្រឹមត្រូវ, អ្នក​​មាន​ <xliff:g id="NUMBER">%d</xliff:g> ការ​ព្យាយាម​ដែល​នៅ​សល់​​​​មុន​ពេល​ដែល​អ្នក​ត្រូវ​​ទាក់ទង​​ក្រុមហ៊ុន​បញ្ជូន​​ដើម្បី​ដោះ​សោ​ឧបករណ៍​របស់​អ្នក។"</item>
@@ -867,7 +867,7 @@
     <string name="dlg_error_unmount_text" product="default" msgid="3073562815631781894">"មិន​អាច​ផ្ដាច់​​កាត​អេសឌី។ ព្យាយាម​ម្ដង​ទៀត​ពេល​ក្រោយ។"</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី​នឹង​​​ត្រូវ​បាន​ផ្ដាច់។"</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"កាត​អេសឌី​នឹង​ត្រូវ​បាន​ផ្ដាច់។"</string>
-    <string name="sd_ejecting_title" msgid="8824572198034365468">"ផ្ដាច់"</string>
+    <string name="sd_ejecting_title" msgid="8824572198034365468">"ផ្ដាច់​"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"ការ​ផ្ដាច់​​កំពុង​ដំណើរការ"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"អស់​ទំហំផ្ទុក"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"មុខងារ​ប្រព័ន្ធ​មួយ​ចំនួន​ដូច​ជា ការ​ធ្វើ​សម​កាល​កម្ម​អាច​ដំណើរការ​មិន​ត្រឹមត្រូវ។ ព្យាយាម​បង្កើត​ទំហំ ដោយ​លុប​ ឬ​​ដោះ​ខ្ទាស់​ធាតុ​មួយ​ចំនួន​ដូច​ជា កម្មវិធី ឬ​មាតិកា​មេឌៀ។"</string>
@@ -889,8 +889,8 @@
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
     <string name="apn_http_proxy" msgid="1826885957243696354">"ប្រូកស៊ី"</string>
     <string name="apn_http_port" msgid="3763259523984976226">"ច្រក"</string>
-    <string name="apn_user" msgid="455637547356117761">"ឈ្មោះ​អ្នក​ប្រើ"</string>
-    <string name="apn_password" msgid="5412301994998250968">"ពាក្យសម្ងាត់"</string>
+    <string name="apn_user" msgid="455637547356117761">"ឈ្មោះ​អ្នក​ប្រើ​"</string>
+    <string name="apn_password" msgid="5412301994998250968">"ពាក្យសម្ងាត់​"</string>
     <string name="apn_server" msgid="2436185314756372858">"ម៉ាស៊ីន​មេ"</string>
     <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
     <string name="apn_mms_proxy" msgid="5374082621073999275">"ប្រូកស៊ី MMS"</string>
@@ -992,7 +992,7 @@
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"ប្រើ <xliff:g id="NEW_APP">%1$s</xliff:g> ជំនួស​ឲ្យ <xliff:g id="CURRENT_APP">%2$s</xliff:g> ជា​កម្មវិធី​សារ SMS របស់​អ្នក?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"ប្រើ <xliff:g id="NEW_APP">%s</xliff:g> ជា​កម្មវិធី​សារ SMS របស់​អ្នក?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"មិន​ស្គាល់​​ប្រតិបត្តិ​ករ​​ស៊ីមកាត"</string>
-    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s គ្មាន​តំបន់​បណ្ដាញ​ដែល​ផ្ដល់​បាន​​ស្គាល់"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s គ្មាន​តំបន់​បណ្ដាញ​ដែល​ផ្ដល់​បាន​​ស្គាល់​"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"សូម​បញ្ចូល​ស៊ីមកាត និង​ចាប់ផ្ដើម​ឡើង​វិញ"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"សូម​ភ្ជាប់​អ៊ីនធឺណិត"</string>
     <string name="location_title" msgid="1029961368397484576">"ទីតាំង​ខ្ញុំ"</string>
@@ -1000,7 +1000,7 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ភាព​ត្រឹមត្រូវ​ខ្ពស់"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ការ​សន្សំ​ថ្ម"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"តែ​​ឧបករណ៍​ប៉ុណ្ណោះ"</string>
-    <string name="location_mode_location_off_title" msgid="2829713015012529465">"បិទទីតាំង"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"បិទទីតាំង​"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"សំណើ​ទីតាំង​ថ្មី"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"បច្ចុប្បន្ន​គ្មាន​កម្មវិធី​បាន​ស្នើ​ទីតាំង"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"សេវាកម្ម​ទីតាំង"</string>
@@ -1058,7 +1058,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"ប្ដូរ​​​កូដ​ PIN ដោះ​សោ"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"បញ្ជាក់​លំនាំ​បាន​រក្សាទុក"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"ព្យាយាម​ម្ដង​ទៀត៖"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"គូរ​​លំនាំ​ដោះ​សោ"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"គូរ​​លំនាំ​ដោះ​សោ​"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"ចុច ម៉ឺនុយ​សម្រាប់​ជំនួយ។"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ដក​ម្រាមដៃ​​ពេល​រួចរាល់។"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"ភ្ជាប់​ចំណុច​យ៉ាង​ហោច​ណាស់ <xliff:g id="NUMBER">%d</xliff:g> ។ ព្យាយាម​ម្ដង​ទៀត។"</string>
@@ -1152,8 +1152,8 @@
     <string name="recompute_size" msgid="7722567982831691718">"កំពុង​គណនា​ទំហំ​ឡើងវិញ…"</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"លុប​ទិន្នន័យ​កម្មវិធី?"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"ទិន្នន័យ​របស់​កម្មវិធី​នេះ​ទាំងអស់​នឹង​ត្រូវ​បាន​លុប​ជា​អចិន្ត្រៃយ៍។ រួមមាន ឯកសារ​ទាំងអស់, ការ​កំណត់, គណនី, មូលដ្ឋាន​ទិន្នន័យ ។ល។"</string>
-    <string name="dlg_ok" msgid="2402639055725653590">"យល់​ព្រម"</string>
-    <string name="dlg_cancel" msgid="1674753358972975911">"បោះ​បង់"</string>
+    <string name="dlg_ok" msgid="2402639055725653590">"យល់​ព្រម​"</string>
+    <string name="dlg_cancel" msgid="1674753358972975911">"បោះ​បង់​"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="8333723538280257243">"រក​មិន​ឃើញ​កម្មវិធី​ក្នុង​បញ្ជី​កម្មវិធី​បាន​ដំឡើង។"</string>
     <string name="clear_data_failed" msgid="1907582169616856698">"មិន​អាច​សម្អាត​ទិន្នន័យ​កម្មវិធី។"</string>
@@ -1274,14 +1274,14 @@
     <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"ឃ្លា"</string>
     <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"ជម្រើស​ច្រើន​ទៀត"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"ជម្រើស​តិច"</string>
-    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"យល់​ព្រម"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"យល់​ព្រម​"</string>
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"ពាក្យ"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"ផ្លូវកាត់៖"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"ភាសា៖"</string>
     <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"បញ្ចូល​ពាក្យ"</string>
     <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"ផ្លូវកាត់​ជម្រើស"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"កែ​ពាក្យ"</string>
-    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"កែសម្រួល"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"កែសម្រួល​"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"លុប"</string>
     <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"អ្នក​មិន​មាន​ពាក្យ​ក្នុង​វចនានុក្រម​អ្នក​ប្រើ។ បន្ថែម​ពាក្យ​ដោយ​ប៉ះ​ប៊ូតុង (+) ។"</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"សម្រាប់​ភាសា​ទាំងអស់"</string>
@@ -1297,8 +1297,8 @@
     <string name="quick_launch_shortcut" msgid="5090405067413522300">"ស្វែងរក + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
     <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"សម្អាត"</string>
     <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"ផ្លូវកាត់​របស់​អ្នក​សម្រាប់ <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) នឹង​ត្រូវ​បាន​សម្អាត។"</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"យល់​ព្រម"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"បោះ​បង់"</string>
+    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"យល់​ព្រម​"</string>
+    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"បោះ​បង់​"</string>
     <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"កម្មវិធី"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"ផ្លូវកាត់"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"ការ​បញ្ចូល​អត្ថបទ"</string>
@@ -1394,7 +1394,7 @@
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"បើក"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"បិទ"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"មើល​ជាមុន"</string>
-    <string name="captioning_standard_options_title" msgid="3284211791180335844">"ជម្រើស​ស្តង់​ដារ"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"ជម្រើស​ស្តង់​ដារ​"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"ភាសា"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"ទំហំ​អត្ថបទ"</string>
     <string name="captioning_preset" msgid="8939737196538429044">"រចនាប័ទ្ម​ចំណងជើង"</string>
@@ -1454,8 +1454,8 @@
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"ការ​បោះបង់ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_failed_state_title_template" msgid="1436099128973357969">"កំហុស​​ម៉ាស៊ីន​បោះពុម្ព <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_blocked_state_title_template" msgid="9065391617425962424">"បាន​ទប់ស្កាត់​ម៉ាស៊ីន​បោះពុម្ព <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
-    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"បាន​បង្ហាញ​ប្រ​អប់​ស្វែងរក"</string>
-    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"បាន​លាក់​ប្រអប់​ស្វែងរក"</string>
+    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"បាន​បង្ហាញ​ប្រ​អប់​ស្វែងរក​"</string>
+    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"បាន​លាក់​ប្រអប់​ស្វែងរក​"</string>
   <plurals name="print_search_result_count_utterance">
     <item quantity="one" msgid="1322401991353603285">"រក​ឃើញ​ម៉ាស៊ីន​បោះពុម្ព <xliff:g id="COUNT">%1$s</xliff:g>"</item>
     <item quantity="other" msgid="460211409510874128">"រក​ឃើញ​ម៉ាស៊ីន​បោះពុម្ព <xliff:g id="COUNT">%1$s</xliff:g>"</item>
@@ -1504,7 +1504,7 @@
     <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"បាន​ផ្ញើ​ទិន្នន័យ​វ៉ាយហ្វាយ"</string>
     <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"បាន​ទទួល​ទិន្នន័យ​វ៉ាយហ្វាយ"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"សំឡេង"</string>
-    <string name="usage_type_video" msgid="4295357792078579944">"វីដេអូ"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"វីដេអូ​"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"ពេលវេលា​បើក"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"ពេលវេលា​គ្មាន​សញ្ញា"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"បង្ខំ​ឲ្យ​បញ្ឈប់"</string>
@@ -1523,11 +1523,11 @@
     <string name="battery_desc_wifi" msgid="2375567464707394131">"ថ្មប្រើ​ដោយ​វ៉ាយហ្វាយ"</string>
     <string name="battery_sugg_wifi" msgid="3355461362094706957">"បិទ​វ៉ាយ​ហ្វាយ​​ពេល​មិន​ប្រើ​ ឬ​​​មិន​មាន"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"ថ្ម​បាន​ប្រើ​ដោយ​ប៊្លូធូស"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"បិទ​ប៊្លូធូស​ពេល​អ្នក​មិន​ប្រើ"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"បិទ​ប៊្លូធូស​ពេល​អ្នក​មិន​ប្រើ​"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"ព្យាយាម​តភ្ជាប់​​ទៅ​ឧបករណ៍​ប៊្លូធូស​ផ្សេង"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"ថ្ម​បាន​ប្រើ​ដោយ​កម្មវិធី"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"បញ្ឈប់ ឬ​លុប​កម្មវិធី"</string>
-    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ជ្រើស​របៀប​សន្សំ​ថ្ម"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ជ្រើស​របៀប​សន្សំ​ថ្ម​"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"កម្មវិធី​អាច​ផ្ដល់​ការ​កំណត់​ ដើម្បី​កាត់បន្ថយ​ការ​ប្រើ​ថ្ម"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ថ្ម​បាន​ប្រើ​ដោយ​អ្នក​ប្រើ"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> តាំង​ពី​បានដក"</string>
@@ -1537,12 +1537,12 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"ប្រព័ន្ធ​ប្រតិបត្តិការ Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"ស្ថិតិ​​ដំណើរការ"</string>
-    <string name="process_stats_summary" msgid="109387941605607762">"ស្ថិតិ Geeky អំពី​ដំណើរការ"</string>
-    <string name="app_memory_use" msgid="7849258480392171939">"ការ​ប្រើ​​អង្គ​ចងចាំ"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"ស្ថិតិ Geeky អំពី​ដំណើរការ​"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"ការ​ប្រើ​​អង្គ​ចងចាំ​"</string>
     <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> កម្មវិធី​ចប់​នៅ <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"ផ្ទៃ​ខាង​ក្រោយ"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"ផ្ទៃ​ខាង​មុខ"</string>
-    <string name="process_stats_type_cached" msgid="6314925846944806511">"ទុក​ក្នុង​ឃ្លាំង"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"ទុក​ក្នុង​ឃ្លាំង​"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"​អង្គ​ចងចាំ​ឧបករណ៍ <xliff:g id="MEMSTATE">%1$s</xliff:g> បច្ចុប្បន្ន"</string>
     <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"ការ​ប្រើ​អង្គ​ចងចាំ​មធ្យម"</string>
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"ការ​ប្រើ​អង្គ​ចងចាំ​អតិបរមា"</string>
@@ -1558,7 +1558,7 @@
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"ប្រភេទ​ស្ថានភាព"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"ផ្ទៃ​ខាង​ក្រោយ"</string>
     <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"ផ្ទៃ​ខាង​មុខ"</string>
-    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"ទុក​ក្នុង​ឃ្លាំង"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"ទុក​ក្នុង​ឃ្លាំង​"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"ការ​បញ្ចូល &amp; បញ្ចេញ​សំឡេង"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"កំណត់​ការ​បញ្ចូល​​ &amp; បញ្ចេញ​សំឡេង"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ស្វែងរក​តាម​​សំឡេង"</string>
@@ -1624,7 +1624,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"បិទ"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"វ៉ាយហ្វាយ"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"ប៊្លូធូស"</string>
-    <string name="gadget_location" msgid="2974757497945178165">"ទី​តាំង"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"ទី​តាំង​"</string>
     <string name="gadget_sync" msgid="858895763714222152">"ធ្វើ​សម​កាល​កម្ម"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"ពន្លឺ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ស្វ័យប្រវត្តិ"</string>
@@ -1702,13 +1702,13 @@
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"បន្ថែម​បណ្ដាញ"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"ផ្ទុក​បញ្ជី​ឡើងវិញ"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"រំលង"</string>
-    <string name="wifi_setup_next" msgid="3388694784447820477">"បន្ទាប់"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"បន្ទាប់​"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"ថយក្រោយ"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"ព័ត៌មាន​លម្អិត​បណ្ដាញ"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"តភ្ជាប់"</string>
     <string name="wifi_setup_forget" msgid="2562847595567347526">"ភ្លេច"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"រក្សាទុក"</string>
-    <string name="wifi_setup_cancel" msgid="3185216020264410239">"បោះ​បង់"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"បោះ​បង់​"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"កំពុង​វិភាគ​រក​បណ្ដាញ…"</string>
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"ប៉ះ​បណ្ដាញ ដើម្បី​តភ្ជាប់​វា"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"តភ្ជាប់​ទៅ​បណ្ដាញ​មាន​ស្រាប់"</string>
@@ -1910,13 +1910,13 @@
     <string name="vpn_search_domains" msgid="5391995501541199624">"ដែន​ស្វែងរក DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"ម៉ាស៊ីន​មេ DNS (ឧ. 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"បញ្ជូន​ផ្លូវ​បន្ត (ឧ. 10.0.0.0/8)"</string>
-    <string name="vpn_username" msgid="1863901629860867849">"ឈ្មោះ​អ្នក​ប្រើ"</string>
-    <string name="vpn_password" msgid="6756043647233596772">"ពាក្យសម្ងាត់"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"ឈ្មោះ​អ្នក​ប្រើ​"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"ពាក្យសម្ងាត់​"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"រក្សាទុក​ព័ត៌មាន​គណនី"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(មិន​បាន​ប្រើ)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(កុំ​ផ្ទៀងផ្ទាត់​ម៉ាស៊ីន​មេ)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(បាន​ទទួល​ពី​ម៉ាស៊ីន​មេ)"</string>
-    <string name="vpn_cancel" msgid="1979937976123659332">"បោះ​បង់"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"បោះ​បង់​"</string>
     <string name="vpn_save" msgid="4233484051644764510">"រក្សាទុក"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"តភ្ជាប់"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"កែ​ប្រវត្តិរូប VPN"</string>
@@ -1944,7 +1944,7 @@
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"បញ្ចូល​ពាក្យ​សម្ងាត់​ថ្មី​សម្រាប់​ការ​បម្រុងទុក​ពេញលេញ​នៅ​ទី​នេះ"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"បញ្ចូល​ពាក្យ​សម្ងាត់​បម្រុង​ទុក​ពេញលេញ​ថ្មី​នៅ​ទី​នេះ​ម្ដង​ទៀត"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"កំណត់​ពាក្យ​សម្ងាត់​បម្រុងទុក"</string>
-    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"បោះ​បង់"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"បោះ​បង់​"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"បច្ចុប្បន្នភាព​ប្រព័ន្ធ​បន្ថែម"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"បិទ"</string>
@@ -2035,10 +2035,10 @@
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"ឲ្យ​ប្ដូរ​ទិន្នន័យ​ពេល​កុំព្យូទ័រ​បន្ទះ​ប៉ះ​ឧបករណ៍​ផ្សេង"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"ឲ្យ​ប្ដូរ​ទិន្នន័យ​ពេល​ទូរស័ព្ទ​ប៉ះ​ឧបករណ៍​ផ្សេង"</string>
-    <string name="restriction_location_enable_title" msgid="5020268888245775164">"ទី​តាំង"</string>
+    <string name="restriction_location_enable_title" msgid="5020268888245775164">"ទី​តាំង​"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"ឲ្យ​កម្មវិធី​ប្រើ​ព័ត៌មាន​ទីតាំង​របស់​អ្នក"</string>
     <string name="wizard_back" msgid="5567007959434765743">"ថយក្រោយ"</string>
-    <string name="wizard_next" msgid="3606212602795100640">"បន្ទាប់"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"បន្ទាប់​"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"បញ្ចប់"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"ថតរូប"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"ជ្រើស​រូបថត​ពី​វិចិត្រសាល"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e0b6358..5648f8d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1406,7 +1406,7 @@
     <string name="captioning_edge_color" msgid="3670094753735263238">"가장자리 색상"</string>
     <string name="captioning_edge_type" msgid="5997247394951682154">"가장자리 유형"</string>
     <string name="captioning_typeface" msgid="1826169240566563259">"글꼴 모음"</string>
-    <string name="captioning_preview_text" msgid="4067935959797375065">"캡션이 다음과 같이 표시됩니다."</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"자막이 다음과 같이 표시됩니다."</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"기본값"</string>
     <string name="color_none" msgid="3475640044925814795">"없음"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index df25170..6d74abf 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -367,7 +367,7 @@
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ຄວາມປອດໄພລະດັບປານກາງຫາສູງ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ລະຫັດຜ່ານ"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ຄວາມ​ປອດ​ໄພ​ສູງ"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ຄວາມ​ປອດ​ໄພ​ສູງ​"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"ຖືກປິດການນຳໃຊ້ໂດຍຜູ່ເບິ່ງແຍງລະບົບ, ນະໂຍບາຍການເຂົ້າລະຫັດ ຫຼືບ່ອນເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ບໍ່ໃຊ້"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"ເລື່ອນ"</string>
@@ -622,7 +622,7 @@
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", ປ້ອງກັນດ້ວຍ <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"ບໍ່ໃຊ້"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ເພື່ອປັບປຸງຄວາມຖືກຕ້ອງຂອງສະຖານທີ່ ແລະເພື່ອຈຸດປະສົງອື່ນໆ, <xliff:g id="APP_NAME">%1$s</xliff:g> ຕ້ອງການເປີດນຳໃຊ້ການສະແກນເຄືອຂ່າຍ ເຖິງແມ່ນວ່າ Wi-Fi ຈະປິດກໍຕາມ.\n\nອະນຸຍາດການດຳເນີນການນີ້ ໃຫ້ກັບທຸກແອັບຯທີ່ຕ້ອງການສະແກນບໍ່?"</string>
-    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ອະ​ນຸ​ຍາດ"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ອະ​ນຸ​ຍາດ​"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"ປະ​ຕິ​ເສດ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"ເຊື່ອມຕໍ່"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ລົ້ມເຫລວໃນການເຊື່ອມຕໍ່ເຄືອຂ່າຍ"</string>
@@ -1448,7 +1448,7 @@
     <string name="print_print_jobs" msgid="3582094777756968793">"ວຽກ​ພິມ"</string>
     <string name="print_print_job" msgid="7563741676053287211">"ວຽກ​ພິມ"</string>
     <string name="print_restart" msgid="8373999687329384202">"ປິດເປີດໃໝ່"</string>
-    <string name="print_cancel" msgid="3621199386568672235">"ຍົກ​ເລີກ"</string>
+    <string name="print_cancel" msgid="3621199386568672235">"ຍົກ​ເລີກ​"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"ກຳລັງພິມ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"ກຳລັງຍົກເລີກ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 92746c7..eb72800 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -738,8 +738,8 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Perjungti padėtį automatiškai, kai sukamas telefonas"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Sukant planšetinį kompiuterį automatiškai perjungti orientaciją"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Perjungti padėtį automatiškai, kai sukamas telefonas"</string>
-    <string name="brightness" msgid="2354961343555249270">"Ryškumas"</string>
-    <string name="brightness_summary" msgid="838917350127550703">"Reguliuoti ekrano ryškumą"</string>
+    <string name="brightness" msgid="2354961343555249270">"Šviesumas"</string>
+    <string name="brightness_summary" msgid="838917350127550703">"Reguliuoti ekrano šviesumą"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Užmigti"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neveiklumo"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Darbalaukio fonas"</string>
@@ -754,7 +754,7 @@
     <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kada svajoti"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Pradėti dabar"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Nustatymai"</string>
-    <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis ryškumas"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis šviesumas"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Šrifto dydis"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kortelės užrakto nustatymai"</string>
@@ -1626,7 +1626,7 @@
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_location" msgid="2974757497945178165">"Vietovė"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sinchronizavimas"</string>
-    <string name="gadget_brightness_template" msgid="930541920933123603">"Skaistis <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Šviesumas <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatinis"</string>
     <string name="gadget_brightness_state_full" msgid="6814570109772137631">"visiškas"</string>
     <string name="gadget_brightness_state_half" msgid="3696671957608774204">"pusinis"</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index b296d17..e2b3f08 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -424,7 +424,7 @@
     <item msgid="3191973083884253830">"Ingen"</item>
     <item msgid="9089630089455370183">"Logcat"</item>
     <item msgid="5397807424362304288">"Systrace (grafikk)"</item>
-    <item msgid="1340692776955662664">"Ring stabel på glGetError"</item>
+    <item msgid="1340692776955662664">"Kall-stack ved glGetError"</item>
   </string-array>
   <string-array name="show_non_rect_clip_entries">
     <item msgid="993742912147090253">"Av"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 0b38596..5f7e8fd 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1973,7 +1973,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Bruker"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Begrenset profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Legg til ny bruker"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Du kan dele denne enheten med andre personer ved å opprette flere brukere. Hver bruker får sitt eget område som de kan tilpasse med egne apper, bakgrunner osv. Brukere kan også tilpasse innstillinger på nettbrettet som påvirker alle, for eksempel for Wi-Fi.\n\nNår du oppretter nye brukere, må de gå gjennom en konfigurasjonsprosess.\n\nAlle brukere kan godta oppdaterte apptillatelser på vegne av de andre brukerne."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Du kan dele denne enheten med andre folk ved å opprette flere brukere. Hver bruker får sitt eget område som de kan tilpasse med egne apper, bakgrunner osv. Brukere kan også tilpasse innstillinger på nettbrettet som påvirker alle, for eksempel for Wi-Fi.\n\nNår du oppretter nye brukere, må de gå gjennom en konfigurasjonsprosess.\n\nAlle brukere kan godta oppdaterte apptillatelser på vegne av de andre brukerne."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Når du oppretter nye brukere, må de gå gjennom en konfigureringsprosess.\n\nAlle brukere kan godta oppdaterte apptillatelser på vegne av de andre brukerne."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Konfigurere brukeren nå?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Sørg for at personen er tilgjengelig for å bruke nettbrettet og konfigurere området sitt"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6a83533..011977c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1720,7 +1720,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP wordt niet ondersteund."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"U kunt een wifi-verbinding van het type EAP niet configureren tijdens het instellen. U kunt dit na het instellen doen via \'Instellingen\' &gt; \'Draadloos en netwerken\'."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Verbinding maken kan enkele minuten duren..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Raak "<b>"Volgende"</b>" aan om door te gaan met de configuratie.\n\nRaak "<b>"Terug"</b>" aan om verbinding te maken met een ander wifi-netwerk."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Tik op "<b>"Volgende"</b>" om door te gaan met de configuratie.\n\nTik op "<b>"Terug"</b>" om verbinding te maken met een ander wifi-netwerk."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisatie is ingeschakeld"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchroniseren uitgeschakeld"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synchronisatiefout."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 42caf92..43ff809 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -558,7 +558,7 @@
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Aby poprawić dokładność lokalizacji (i w innych celach), aplikacje Google i inne mogą skanować sieci w pobliżu, nawet gdy Wi-Fi jest wyłączone. Jeśli nie chcesz, aby tak się działo, wybierz Zaawansowane &gt; Skanowanie zawsze dostępne."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikacje mogą wyszukiwać sieci w pobliżu, nawet gdy Wi-Fi jest wyłączone. Jeśli nie chcesz, aby tak się działo, wybierz Zaawansowane &gt; Skanowanie zawsze dostępne."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Nie pokazuj ponownie"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Nie wyłączaj Wi-Fi w trybie uśpienia"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi włączone w trybie uśpienia"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Wystąpił problem ze zmianą ustawienia"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optymalizacja Wi-Fi"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalizuj zużycie baterii po włączeniu Wi-Fi"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 5a6ac64..01c6119 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -513,7 +513,7 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ca difuzor"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pentru muzică şi fişiere media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Reţineţi setările"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Ecran de trimitere"</string>
+    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Proiectați ecranul"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activați ecranul wireless"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nu s-au găsit dispozitive în apropiere."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Se conectează"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 64c71cb..0d6f78b 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -347,7 +347,7 @@
   </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="6022616153255438487">"Нет"</item>
-    <item msgid="1352974708028506778">"Контур"</item>
+    <item msgid="1352974708028506778">"Сплошной"</item>
     <item msgid="5850876295428722675">"С тенью"</item>
   </string-array>
   <string-array name="captioning_opacity_selector_titles">
@@ -361,7 +361,7 @@
     <item msgid="4589278788192525675">"Черный на белом"</item>
     <item msgid="1309255027325660115">"Желтый на черном"</item>
     <item msgid="2985943780939258562">"Желтый на синем"</item>
-    <item msgid="7520438652121629055">"Пользовательский"</item>
+    <item msgid="7520438652121629055">"Собственный"</item>
   </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 595e7dd..980b4d3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -464,7 +464,7 @@
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Поиск..."</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Настройки устройства"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Подключенные устройства"</string>
-    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Список"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Доступные устройства"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Подключить"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Отключить"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Выполнить сопряжение и подключить"</string>
@@ -936,7 +936,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>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 2813659..08b102a 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -129,8 +129,8 @@
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Stlačenie tlačidla"</item>
-    <item msgid="1624323946324499595">"Kód PIN zo zdieľaného zariad."</item>
-    <item msgid="5366790421523328066">"Kód PIN zo zariadenia"</item>
+    <item msgid="1624323946324499595">"PIN zo zdieľaného zariadenia"</item>
+    <item msgid="5366790421523328066">"PIN zo zariadenia"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
     <item msgid="1701505390737218306">"Pripojené"</item>
@@ -225,7 +225,7 @@
     <item msgid="2681427309183221543">"GID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
-    <item msgid="8151497958991952759">"Interný ukladací priestor zariadenia"</item>
+    <item msgid="8151497958991952759">"Interné úložisko zariadenia"</item>
     <item msgid="3738430123799803530">"Odnímateľná karta SD"</item>
     <item msgid="4498124044785815005">"Automaticky vyberie systém"</item>
   </string-array>
@@ -333,10 +333,10 @@
   </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="1319652728542138112">"Predvolené"</item>
-    <item msgid="1016452621833735880">"Sans-serif"</item>
-    <item msgid="2496277987934654454">"Sans-serif – zúžené"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
+    <item msgid="1016452621833735880">"Bezpätkové"</item>
+    <item msgid="2496277987934654454">"Bezpätkové zhustené"</item>
+    <item msgid="4406003087391086325">"Pätkové"</item>
+    <item msgid="1558362802170124073">"Neproporcionálne"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Veľmi malé"</item>
@@ -346,7 +346,7 @@
     <item msgid="9044232017390975191">"Veľmi veľké"</item>
   </string-array>
   <string-array name="captioning_edge_type_selector_titles">
-    <item msgid="6022616153255438487">"Žiadne"</item>
+    <item msgid="6022616153255438487">"Žiadny"</item>
     <item msgid="1352974708028506778">"Obrys"</item>
     <item msgid="5850876295428722675">"Tieň"</item>
   </string-array>
@@ -424,7 +424,7 @@
     <item msgid="3191973083884253830">"Žiadne"</item>
     <item msgid="9089630089455370183">"Logcat"</item>
     <item msgid="5397807424362304288">"Systrace (grafika)"</item>
-    <item msgid="1340692776955662664">"Volať zásobník pri chybe glGetError"</item>
+    <item msgid="1340692776955662664">"Zásobník volaní glGetError"</item>
   </string-array>
   <string-array name="show_non_rect_clip_entries">
     <item msgid="993742912147090253">"Vypnuté"</item>
@@ -435,7 +435,7 @@
     <item msgid="2193584639058893150">"Vypnuté"</item>
     <item msgid="2751513398307949636">"Na obrazovke v podobe stĺpcov"</item>
     <item msgid="8272260411216018353">"Na obrazovke v podobe riadkov"</item>
-    <item msgid="120512413928262547">"V adb shell dumpsys gfxinfo"</item>
+    <item msgid="120512413928262547">"V „adb shell dumpsys gfxinfo“"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Vypnuté"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 5ff4658..8534028 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1786,7 +1786,7 @@
     <string name="wait_for_debugger" msgid="1202370874528893091">"Čakať na ladiaci nástroj"</string>
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Aplikácia čaká na pripojenie ladiaceho nástroja"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Vstup"</string>
-    <string name="debug_drawing_category" msgid="6755716469267367852">"Kresba"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Nákres"</string>
     <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Hardvérom zrýchlené vykresľovanie"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitorovanie"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Prísny režim bol povolený"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index fce1030..c95ae4b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -329,8 +329,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="3839235202103924154">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када будете шифровали таблет, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите. Не можете да дешифрујете таблет осим ако га не вратите на фабричке податке, чиме ћете избрисати све податке.\n\nШифровање траје сат времена или дуже. Потребно је да почнете са напуњеном батеријом и да не искључујете таблет док се шифровање не доврши. Ако прекинете процес шифровања, изгубићете све податке или део њих."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када будете шифровали телефон, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите. Не можете да дешифрујете телефон осим ако га не вратите на фабричке податке, чиме ћете избрисати све податке.\n\nШифровање траје сат времена или дуже. Потребно је да почнете са напуњеном батеријом и да не искључујете телефон док се шифровање не доврши. Ако прекинете процес шифровања, изгубићете све податке или део њих."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када будете шифровали таблет, треба да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите. Не можете да дешифрујете таблет осим ако га не ресетујете на фабричка подешавања, чиме ћете избрисати све податке.\n\nШифровање траје сат времена или дуже. Потребно је да почнете са напуњеном батеријом и да не искључујете таблет док се шифровање не доврши. Ако прекинете процес шифровања, изгубићете све податке или део њих."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када будете шифровали телефон, треба да унесете нумерички 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>
@@ -346,8 +346,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Покушајте поново за <xliff:g id="DELAY">^1</xliff:g> секунди."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Унесите лозинку"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифровање није успело"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на таблету више нису доступни. \n\n Да бисте наставили да користите таблет, потребно је да га вратите на фабричка подешавања. Када подесите таблет након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на телефону више нису доступни. \n\nДа бисте наставили да користите телефон, потребно је да га вратите на фабричка подешавања. Када подесите телефон након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на таблету више нису доступни. \n\n Да бисте наставили да користите таблет, треба да га ресетујете. Када га подесите након ресетовања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на телефону више нису доступни. \n\nДа бисте наставили да користите телефон, треба да га ресетујете. Када га подесите након ресетовања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Пребаци методе уноса"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Избор закључав. екрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Закључавање рез. коп."</string>
@@ -860,7 +860,7 @@
     <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 меморију, неке апликације које користите ће се зауставити и можда неће бити доступне док поново не прикључите USB меморију."</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"Уколико извадите SD картицу, неке апликације које користите ће се зауставити и можда неће бити доступне све док поново не ставите SD картицу."</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>
@@ -923,15 +923,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Враћање подразумеваних подешавања назива приступне тачке."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Поново постави подразумевано"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Поновно постављање подразумеваних подешавања назива приступне тачке је завршено"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Враћање фабричких података"</string>
+    <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_accounts" product="default" msgid="6412857499147999073">\n\n"Тренутно сте пријављени на следеће налоге:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Фотографије"</li>\n<li>"Други кориснички подаци"</li></string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, потребно је да избришете "<b>"USB меморију"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, потребно је да избришете садржај "<b>"SD картице"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, треба да избришете "<b>"USB меморију"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, треба да избришете садржај "<b>"SD картице"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Избриши USB меморију"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Избриши SD картицу"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Обриши све податке из интерне USB меморије, као што су музика и фотографије."</string>
@@ -941,7 +941,7 @@
     <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="826193821455182780">"Треба да нацртате шаблон за откључавање да бисте потврдили враћање фабричких података."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Треба да нацртате шаблон за откључавање да бисте потврдили ресетовање на фабричка подешавања."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Није обављено враћање на почетне вредности зато што услуга брисања система није доступна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Враћање на почетне вредности?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Брисање USB меморије"</string>
@@ -1591,7 +1591,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Конфигуриши"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Изабери други уређај"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ова технологија за синтезу говора можда може да прикупља сав текст који ће бити изговорен, укључујући личне податке као што су лозинке и бројеви кредитних картица. То потиче из технологије <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Желите ли да омогућите коришћење ове технологије за синтезу говора?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"За овај језик је потребна исправна мрежна веза за претварање језика у говор."</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"За овај језик је потребна исправна мрежна веза за претварање текста у говор."</string>
     <string name="tts_default_sample_string" msgid="4040835213373086322">"Ово је пример синтезе говора"</string>
     <string name="tts_status_title" msgid="7268566550242584413">"Статус подразумеваног језика"</string>
     <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> је подржан у потпуности"</string>
@@ -1759,8 +1759,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">"Пријаве за Push"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
@@ -1960,7 +1960,7 @@
     <string name="user_list_title" msgid="7937158411137563543">"Корисници и профили"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Додај корисника или профил"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Ограничени профил"</string>
-    <string name="user_need_lock_message" msgid="2596365678651842785">"Да бисте могли да направите ограничени профил, потребно је да подесите закључавање екрана да бисте заштитили апликације и личне податке."</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Да бисте могли да направите ограничени профил, треба да подесите закључавање екрана да бисте заштитили апликације и личне податке."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Подеси закључавање"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Није подешено"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Није подешен – Ограничени профил"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index f3cecef..a372fea 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -629,7 +629,7 @@
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ILANI: Huenda ukatozwa gharama ya ziada ya data ya mtoa huduma.\n\nUsanidi wa simu unaweza kuhitaji huduma muhimu ya mtandao."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ILANI:Hadi uwe na muunganisho wa intaneti, kompyuta kibao yako haitaweza kuthibitisha kuwa programu yako imesasishwa."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ILANI: Hadi uwe na muunganisho wa intaneti, simu haitaweza kuthibitisha kuwa programu yako imesasishwa."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Kompyuta ndogo haikuweza kuunganishwa kwenye mtandao huu wa Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Kompyuta kibao haikuweza kuunganishwa kwenye mtandao huu wa Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Simu haikuweza kuunganishwa kwenye mtandao huu wa Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi mahiri"</string>
     <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Bendi ya masafa ya Wi-Fi"</string>
@@ -755,7 +755,7 @@
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Funga SIM kadi"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Inahitaji PIN ili kutumia kompyuta kibao"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Unahitaji PIN ili utumie simu"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Inahitaji PIN ili kutumia kompyuta ndogo"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Itisha PIN ili kutumia kompyuta kibao"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"PIN iwe sharti ili kutumia simu"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Badilisha PIN ya SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN ya SIM"</string>
@@ -908,7 +908,7 @@
     <string name="menu_save" msgid="8109345640668285399">"Hifadhi"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"Tupa"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
-    <string name="error_name_empty" msgid="8418502878620394756">"Sehemu ya jina haiwezi kuwa tupu"</string>
+    <string name="error_name_empty" msgid="8418502878620394756">"Sehemu hii haiwezi kuachwa ikiwa haijajazwa."</string>
     <string name="error_apn_empty" msgid="6056233831214537267">"APN haiwezi kuwa tupu."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Sehemu ya MCC lazima iwe na nambari 3."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Sehemu ya MNC lazima iwe na nambari 2 au 3."</string>
@@ -1281,7 +1281,7 @@
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Ya lugha zote"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Lugha zaidi..."</string>
     <string name="testing" msgid="6584352735303604146">"Majaribio"</string>
-    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Maelezo ya kompyuta ndogo"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Maelezo ya kompyuta kibao"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Maelezo ya simu"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Maelezo ya betri"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Kufungua kwa kasi"</string>
@@ -1659,7 +1659,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Hifadhi nakala rudufu na uzirejeshe"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Data za kibinafsi"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Hifadhi nakala ya data yangu"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"Hifadhi nakala ya data ya programu, manenosiri ya Wi-Fi, na mipangilio mingine kwenye seva za Google"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"Hifadhi nakala ya data ya programu, manenosiri ya Wi-Fi na mipangilio mingine kwenye seva za Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Akaunti mbadala"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Hakuna akaunti ambayo kwa sasa inahifadhi nakala rudufu za data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Onyesha upya otomatiki"</string>
@@ -1680,7 +1680,7 @@
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Kisimamizi cha kifaa kiwashwe?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Washa"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Msimamizi wa kifaa"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"Kuwasha kisimamizi kutaruhusu programu ya <xliff:g id="APP_NAME">%1$s</xliff:g> kufanya mambo yafuatayo:"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"Kuwasha kisimamizi hiki kutaruhusu programu ya <xliff:g id="APP_NAME">%1$s</xliff:g> kufanya mambo yafuatayo:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Msimamizi huyu ni amilifu na anaruhusu programu <xliff:g id="APP_NAME">%1$s</xliff:g> kutenda uendeshi ifuatayo:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Haina Kichwa"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Kawaida"</string>
@@ -1728,8 +1728,8 @@
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Lemaza data ya usuli?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"Kulemaza data za usuli huongeza maisha ya betri na hupunguza utumiaji wa data. Programu zingine za kompyuta huenda bado zikatumia muunganisho wa data za usuli."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"Sawazisha kiotomatiki programu ya data"</string>
-    <string name="sync_enabled" msgid="4551148952179416813">"Kusawazishwa Kumewezeshwa"</string>
-    <string name="sync_disabled" msgid="8511659877596511991">"Sawazisha Kumezimwa"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Usawazishaji umewashwa"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Usawazishaji umezimwa"</string>
     <string name="sync_error" msgid="5060969083117872149">"Hitilafu ya usawazishaji"</string>
     <string name="last_synced" msgid="4242919465367022234">"Ilisawazishwa mwisho <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"Inasawazisha sasa..."</string>
@@ -1974,7 +1974,7 @@
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Ungependa kuweka wasifu sasa?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Sanidi sasa"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Siyo sasa"</string>
-    <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Mmiliki wa kompyuta ndogo pekee ndiye anayeweza kudhibiti watumiaji."</string>
+    <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Mmiliki wa kompyuta kibao pekee ndiye anayeweza kudhibiti watumiaji."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Mmiliki wa simu pekee ndiye anayeweza kudhibiti watumiaji."</string>
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Wasifu zilizodhibitiwa haziwezi kuongeza akaunti"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Futa <xliff:g id="USER_NAME">%1$s</xliff:g> kutoka kwenye kifaa hiki"</string>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 977bdef..6cd2967 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -453,9 +453,9 @@
   </string-array>
   <string-array name="vpn_types_long">
     <item msgid="2732002039459078847">"PPTP VPN"</item>
-    <item msgid="3799752201662127867">"L2TP/IPSec VPN พร้อมด้วยคีย์ที่แบ่งปันไว้ล่วงหน้า"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN พร้อมด้วยคีย์ที่แชร์ไว้ล่วงหน้า"</item>
     <item msgid="4725504331295252103">"L2TP/IPSec VPN พร้อมด้วยใบรับรอง"</item>
-    <item msgid="7526551163264034377">"IPSec VPN พร้อมด้วยคีย์ที่แบ่งปันไว้ล่วงหน้าและการตรวจสอบสิทธิ์ Xauth"</item>
+    <item msgid="7526551163264034377">"IPSec VPN พร้อมด้วยคีย์ที่แชร์ไว้ล่วงหน้าและการตรวจสอบสิทธิ์ Xauth"</item>
     <item msgid="8064740940687465039">"IPSec VPN พร้อมด้วยใบรับรองและการตรวจสอบสิทธิ์ Xauth"</item>
     <item msgid="4946199982372391490">"IPSec VPN พร้อมด้วยใบรับรองและการตรวจสอบสิทธิ์แบบผสม"</item>
   </string-array>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 4962b7f..1574e21 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -480,14 +480,14 @@
     <string name="bluetooth_profile_opp" msgid="9168139293654233697">"การถ่ายโอนไฟล์"</string>
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"อุปกรณ์อินพุต"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"การเข้าถึงอินเทอร์เน็ต"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"การแบ่งปันการเชื่อมต่ออินเทอร์เน็ต"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"การแชร์การเชื่อมต่ออินเทอร์เน็ต"</string>
     <string name="bluetooth_profile_map" msgid="5465271250454324383">"การเข้าถึงข้อความ"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกตัดการเชื่อมต่อจากเสียงของสื่อ"</string>
     <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="default" msgid="5266851881175033601">"<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">"อุปกรณ์บลูทูธที่จับคู่"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"เชื่อมต่อ"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"เชื่อมต่อกับอุปกรณ์บลูทูธ"</string>
@@ -501,7 +501,7 @@
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ไม่ได้เชื่อมต่อกับเซิร์ฟเวอร์สำหรับโอนไฟล์"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"เชื่อมต่อกับอุปกรณ์อินพุตแล้ว"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"เชื่อมต่อกับอุปกรณ์สำหรับการเข้าถึงอินเทอร์เน็ต"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"กำลังแบ่งปันอินเทอร์เน็ตกับอุปกรณ์"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"กำลังแชร์อินเทอร์เน็ตกับอุปกรณ์"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"ใช้สำหรับระบบเสียงของสื่อ"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ใช้สำหรับระบบเสียงของโทรศัพท์"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ใช้สำหรับการโอนไฟล์"</string>
@@ -973,14 +973,14 @@
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"ไม่ได้เชื่อมต่อ USB"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"ข้อผิดพลาดในการปล่อยสัญญาณของ USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ปล่อยสัญญาณบลูทูธ"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"กำลังแบ่งปันอินเทอร์เน็ตของแท็บเล็ตนี้"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"กำลังแบ่งปันการเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์นี้"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"กำลังแบ่งปันอินเทอร์เน็ตของแท็บเล็ตนี้กับอุปกรณ์ 1 เครื่อง"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"กำลังแบ่งปันอินเทอร์เน็ตของโทรศัพท์นี้กับอุปกรณ์ 1 เครื่อง"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"กำลังแบ่งปันการเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตนี้กับอุปกรณ์ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> เครื่อง"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"กำลังแบ่งปันการเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์นี้กับอุปกรณ์ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> เครื่อง"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"ไม่แบ่งปันการเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตนี้"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"ไม่แบ่งปันการเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์นี้"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"กำลังแชร์อินเทอร์เน็ตของแท็บเล็ตนี้"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"กำลังแชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์นี้"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"กำลังแชร์อินเทอร์เน็ตของแท็บเล็ตนี้กับอุปกรณ์ 1 เครื่อง"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"กำลังแชร์อินเทอร์เน็ตของโทรศัพท์นี้กับอุปกรณ์ 1 เครื่อง"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"กำลังแชร์การเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตนี้กับอุปกรณ์ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> เครื่อง"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"กำลังแชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์นี้กับอุปกรณ์ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> เครื่อง"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"ไม่แชร์การเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตนี้"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"ไม่แชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์นี้"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"ไม่สามารถเชื่อมต่อ"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"ไม่สามารถปล่อยการเชื่อมต่อมากกว่า <xliff:g id="MAXCONNECTION">%1$d</xliff:g> อุปกรณ์"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกยกเลิกการปล่อยสัญญาณ"</string>
@@ -1151,7 +1151,7 @@
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"ที่เก็บข้อมูลการ์ด Sd"</string>
     <string name="recompute_size" msgid="7722567982831691718">"กำลังคำนวณขนาดใหม่..."</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"ลบข้อมูลในแอปพลิเคชันหรือไม่"</string>
-    <string name="clear_data_dlg_text" msgid="8847257251846779938">"ข้อมูลทั้งหมดของแอปพลิเคชันนี้จะถูกลบอย่างถาวร ซึ่งรวมถึงไฟล์ การตั้งค่า บัญชี ฐานข้อมูล และอื่นๆ ทั้งหมด"</string>
+    <string name="clear_data_dlg_text" msgid="8847257251846779938">"ข้อมูลทั้งหมดของแอปพลิเคชันนี้ จะถูกลบอย่างถาวร ซึ่งรวมถึงไฟล์ การตั้งค่าบัญชี ฐานข้อมูล และอื่นๆ ทั้งหมด"</string>
     <string name="dlg_ok" msgid="2402639055725653590">"ตกลง"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"ยกเลิก"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -1172,7 +1172,7 @@
     <string name="security_settings_billing_desc" msgid="8061019011821282358">"แอปพลิเคชันนี้อาจมีการเรียกเก็บเงิน:"</string>
     <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"ส่ง SMS พรีเมียม"</string>
     <string name="computing_size" msgid="1599186977475211186">"กำลังคำนวณ..."</string>
-    <string name="invalid_size_value" msgid="7563537715280712285">"คำนวณขนาดแพคเกจไม่ได้"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"คำนวณขนาดแพ็กเกจไม่ได้"</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>
@@ -1324,8 +1324,8 @@
     <string name="enable_adb" msgid="7982306934419797485">"การแก้ไขข้อบกพร่อง USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"โหมดแก้ไขข้อบกพร่องเมื่อเชื่อมต่อ USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"ยกเลิกการให้สิทธิ์การแก้ปัญหา USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"รายงานบั๊กเกี่ยวกับเมนูเปิดปิด"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"เพิ่มตัวเลือกในเมนูเปิดปิดสำหรับการใช้รายงานบั๊ก"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"รายงานข้อบกพร่องเกี่ยวกับเมนูเปิดปิด"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"เพิ่มตัวเลือกในเมนูเปิดปิดสำหรับการใช้รายงานข้อบกพร่อง"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"เปิดหน้าจอค้าง"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"หน้าจอจะไม่เข้าสู่โหมดสลีปขณะชาร์จ"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"เปิดใช้งานบันทึกสอดแนมบลูทูธ HCI"</string>
@@ -1902,7 +1902,7 @@
     <string name="vpn_mppe" msgid="6639001940500288972">"การเข้ารหัส PPP (MPPE)"</string>
     <string name="vpn_l2tp_secret" msgid="529359749677142076">"ข้อมูลลับ L2TP"</string>
     <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"ตัวระบุ IPSec"</string>
-    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"คีย์ IPSec ที่แบ่งปันไว้ล่วงหน้า"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"คีย์ IPSec ที่แชร์ไว้ล่วงหน้า"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"ใบรับรองผู้ใช้ IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"ใบรับรอง IPSec CA"</string>
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"ใบรับรองเซิร์ฟเวอร์ IPSec"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index c0b0824..77ac72a 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1683,7 +1683,7 @@
     <string name="remove_device_admin" msgid="3596845261596451437">"Деактивувати"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Адміністратори пристрою"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Немає доступн. адміністраторів мережі"</string>
-    <string name="add_device_admin_msg" msgid="6246742476064507965">"Актив-ти адміністратора пристрою?"</string>
+    <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>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 4fd848c..2ccf6c9 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -168,7 +168,7 @@
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Thời gian sử dụng"</item>
-    <item msgid="3703676222230317933">"Số lần khởi chạy"</item>
+    <item msgid="3703676222230317933">"Số lần chạy"</item>
     <item msgid="2502754479975776899">"Tên ứng dụng"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -461,7 +461,7 @@
   </string-array>
   <string-array name="vpn_states">
     <item msgid="8621078286418985762">"Đã ngắt kết nối"</item>
-    <item msgid="6692305604213080515">"Đang khởi chạy..."</item>
+    <item msgid="6692305604213080515">"Đang chạy..."</item>
     <item msgid="8001704909356800092">"Đang kết nối…"</item>
     <item msgid="4039737283841672166">"Đã kết nối"</item>
     <item msgid="4042143101664725090">"Thời gian chờ"</item>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 0deecf5..be376b8 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -94,7 +94,7 @@
     <item msgid="7979680559596111948">"正在断开连接..."</item>
     <item msgid="1634960474403853625">"已断开连接"</item>
     <item msgid="746097431216080650">"失败"</item>
-    <item msgid="6367044185730295334">"已阻止"</item>
+    <item msgid="6367044185730295334">"已停用"</item>
     <item msgid="503942654197908005">"暂时关闭（网络状况不佳）"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
@@ -108,7 +108,7 @@
     <item msgid="7698638434317271902">"正在断开与 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 的连接..."</item>
     <item msgid="197508606402264311">"已断开连接"</item>
     <item msgid="8578370891960825148">"失败"</item>
-    <item msgid="5660739516542454527">"已阻止"</item>
+    <item msgid="5660739516542454527">"已停用"</item>
     <item msgid="1805837518286731242">"暂时关闭（网络状况不佳）"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
@@ -427,7 +427,7 @@
     <item msgid="1340692776955662664">"glGetError 上的调用堆栈"</item>
   </string-array>
   <string-array name="show_non_rect_clip_entries">
-    <item msgid="993742912147090253">"关"</item>
+    <item msgid="993742912147090253">"关闭"</item>
     <item msgid="675719912558941285">"以蓝色填充非矩形剪裁区域"</item>
     <item msgid="1064373276095698656">"以绿色突出显示测试绘制命令"</item>
   </string-array>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index eca370d..74a7612 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -165,7 +165,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"触摸可连接到“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”。"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"要连接到“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”吗？"</string>
     <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"电话簿权限申请"</string>
-    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s想访问您的联系人信息和通话记录。要向%2$s授予访问权限吗？"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s想要使用您的通讯录和通话记录。要向%2$s授予权限吗？"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"不要再询问"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"下次不再询问"</string>
     <string name="bluetooth_map_request" msgid="4595727689513143902">"消息权限申请"</string>
@@ -194,7 +194,7 @@
     <string name="proxy_error" msgid="8926675299638611451">"注意"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"确定"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"您键入的主机名无效。"</string>
-    <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"您键入的排除列表的格式不正确。请键入以逗号分隔的排除域列表。"</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"您输入的排除列表格式有误。请输入以逗号分隔的排除网域列表。"</string>
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"您需要填写端口字段。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"如果主机字段为空，则端口字段必须为空。"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"您键入的端口无效。"</string>
@@ -389,7 +389,7 @@
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"密码必须少于 <xliff:g id="NUMBER">%d</xliff:g> 个字符。"</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN 必须少于 <xliff:g id="NUMBER">%d</xliff:g> 位数。"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN 只能包含 0-9 的数字。"</string>
-    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"设备管理员不允许使用最近用过的 PIN。"</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"设备管理器不允许使用最近用过的PIN码。"</string>
     <string name="lockpassword_illegal_character" msgid="8742901630116866738">"密码包含非法字符。"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"密码必须包含至少 1 个字母。"</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"密码必须包含至少 1 个数字。"</string>
@@ -418,7 +418,7 @@
     <item quantity="one" msgid="4594051152085925921">"密码必须包含至少 1 个非字母字符。"</item>
     <item quantity="other" msgid="3952508584649046404">"密码必须包含至少 %d 个非字母字符。"</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"设备管理员不允许使用最近用过的密码。"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"设备管理器不允许使用最近用过的密码。"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"确定"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"取消"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"取消"</string>
@@ -427,7 +427,7 @@
     <string name="device_admin_title" msgid="3562216873644263804">"设备管理"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"设备管理器"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"查看或停用设备管理器"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"通知读取权限"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"通知使用权"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"应用无法读取通知"</string>
   <plurals name="manage_notification_access_summary_nonzero">
     <item quantity="one" msgid="8344183614159211585">"%d个应用可以读取通知"</item>
@@ -960,19 +960,19 @@
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"您需要绘制解锁图案以确认要清空 SD 卡。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通话设置"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"设置语音信箱、来电转接、来电等待和本机号码显示"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 共享网络"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB网络共享"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"便携式热点"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"蓝牙共享网络"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"蓝牙网络共享"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"网络共享"</string>
     <string name="tether_settings_title_all" msgid="8356136101061143841">"网络共享与便携式热点"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB 共享网络"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB网络共享"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB 已连接，选中以共享网络"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"已共享网络"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"使用 USB 存储设备时无法共享网络"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB 未连接"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB 共享网络出错"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"蓝牙共享网络"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB网络共享出错"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"蓝牙网络共享"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"共享该平板电脑的互联网连接"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"共享该手机的互联网连接"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"将该平板电脑的互联网连接与 1 台设备共享"</string>
@@ -1039,7 +1039,7 @@
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"正在加载..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"安全信息"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全信息"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="232523852222964470">"您没有数据连接。要立即查看此信息，请通过已联网的任意计算机访问 %s。"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="232523852222964470">"您没有数据连接。要立即查看此信息，请使用联网的计算机访问%s。"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"正在加载..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"选择您的密码"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"选择您的图案"</string>
@@ -1172,7 +1172,7 @@
     <string name="security_settings_billing_desc" msgid="8061019011821282358">"使用此应用可能会产生费用："</string>
     <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"发送付费短信"</string>
     <string name="computing_size" msgid="1599186977475211186">"正在计算..."</string>
-    <string name="invalid_size_value" msgid="7563537715280712285">"无法计算包的大小。"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"无法计算软件包的大小。"</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>
@@ -1639,8 +1639,8 @@
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"从 SD 卡安装证书"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"清除凭据"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"删除所有证书"</string>
-    <string name="trusted_credentials" msgid="4266945289534242402">"受信任的凭据"</string>
-    <string name="trusted_credentials_summary" msgid="6735221351155686632">"显示受信任的 CA 证书"</string>
+    <string name="trusted_credentials" msgid="4266945289534242402">"信任的凭据"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"显示信任的CA证书"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"存储类型"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"硬件支持"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"仅限软件"</string>
@@ -1753,14 +1753,14 @@
     <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>
-    <string name="remove_account_label" msgid="5921986026504804119">"删除帐户"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"移除帐户"</string>
     <string name="header_add_an_account" msgid="756108499532023798">"添加帐户"</string>
     <string name="finish_button_label" msgid="481587707657751116">"完成"</string>
-    <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="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="provider_label" msgid="7724593781904508866">"推送订阅"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
@@ -1907,7 +1907,7 @@
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA 证书"</string>
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec 服务器证书"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"显示高级选项"</string>
-    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS 搜索域"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS搜索网域"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS 服务器（例如 8.8.8.8）"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"转发路线（例如 10.0.0.0/8）"</string>
     <string name="vpn_username" msgid="1863901629860867849">"用户名"</string>
@@ -1953,9 +1953,9 @@
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"网络可能会受到监控"</string>
     <string name="done_button" msgid="1991471253042622230">"完成"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"网络监控"</string>
-    <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"此设备由以下企业域管理：\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\n您的管理员可以监控您的网络活动，包括收发电子邮件、使用应用和浏览安全网站。\n\n如要了解详情，请与您的管理员联系。"</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"第三方可以监控您的网络活动，包括收发电子邮件、使用应用和浏览安全网站。\n\n如果您在设备上安装受信任的凭据，就可能出现这种情况。"</string>
-    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"查看受信任的凭据"</string>
+    <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"此设备由以下网域管理：\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\n您的管理员可以监控您的网络活动，包括收发电子邮件、使用应用和浏览安全网站。\n\n如要了解详情，请与您的管理员联系。"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"第三方可以监控您的网络活动，包括收发电子邮件、使用应用和浏览安全网站。\n\n出现这种情况的原因是您在设备上安装了信任的凭据。"</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"查看信任的凭据"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"用户"</string>
     <string name="user_list_title" msgid="7937158411137563543">"用户和个人资料"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"添加用户或个人资料"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 56380bf..766c7ff 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -959,7 +959,7 @@
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"您必須畫出解鎖圖形以確認要清除 USB 儲存裝置的資料。"</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"請畫出解鎖圖形，確認您要清除 SD 卡中的資料。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
-    <string name="call_settings_summary" msgid="7291195704801002886">"設定語音信箱、來電轉接、來電待接及本機號碼顯示"</string>
+    <string name="call_settings_summary" msgid="7291195704801002886">"設定語音信箱、來電轉接、來電待接及來電顯示"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 網路共用"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"可攜式無線基地台"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"藍牙網路共用"</string>