diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 77801856452..35cf7372a70 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -753,7 +753,7 @@
     <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="4740866328425123395">\n\n"لمسح الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يلزم محو "<b>"وحدة تخزين USB"</b>"."</string>
-    <!-- syntax error in translation for master_clear_desc_erase_external_storage (7339100478676372901) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:177 in java.io.StringReader@66388993)  -->
+    <!-- syntax error in translation for master_clear_desc_erase_external_storage (7339100478676372901) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:177 in java.io.StringReader@2e8f4fb3)  -->
     <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="444834593696342279">"محو كل البيانات على وحدة تخزين USB الداخلية، مثل الموسيقى والصور."</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 16f412e350b..1aeef8e9f6f 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -130,12 +130,12 @@
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="643915340724070374">"Wenn Bildschirm sich abschaltet (mehr Mobildaten werden verwendet)"</item>
-    <item msgid="1549288661423279207">"Niemals, wenn im Netzbetrieb"</item>
+    <item msgid="1549288661423279207">"Nie, wenn im Netzbetrieb"</item>
     <item msgid="6592896328877671197">"Nie (erfordert mehr Akkuleistung)"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2659922042905569057">"Wenn Bildschirm sich abschaltet"</item>
-    <item msgid="8137861573803398334">"Niemals, wenn im Netzbetrieb"</item>
+    <item msgid="8137861573803398334">"Nie, wenn im Netzbetrieb"</item>
     <item msgid="5996547094658157629">"Nie (erfordert mehr Akkuleistung)"</item>
   </string-array>
   <string-array name="wifi_frequency_band_entries">
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 50cf3618f9e..f2e262276c1 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -272,7 +272,7 @@
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Inhaberinformationen auf Sperrbildschirm anzeigen"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Inhaberinformationen"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
-    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Text für Sperrbildschirm eingeben"</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Text für Sperrdisplay eingeben"</string>
     <string name="security_settings_title" msgid="5168491784222013179">"Standort &amp; Sicherheit"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Einstellungen für Standort &amp; Sicherheit"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Meinen Standort, Display-Entsperrung, SIM-Kartensperre und Sperre für Anmeldeinformationsspeicher festlegen"</string>
@@ -309,7 +309,7 @@
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Sperre (Muster, PIN, Passwort) ändern oder deaktivieren"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Methode zum Sperren des Bildschirms wählen"</string>
     <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"Aus"</string>
-    <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Niemals das Display sperren"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Nie das Display sperren"</string>
     <string name="unlock_set_unlock_none_title" msgid="7560817055143323842">"Nicht gesichert"</string>
     <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Kein Muster, Passwort oder PIN zum Entsp. des                                Displays nötig"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Muster"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7c62c58a71f..6e33c0c48c6 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -545,7 +545,7 @@
     <string name="ringtone_title" msgid="7037881886694206550">"Ήχος εισερχόμενης κλήσης"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="8741571721868253103">"Ένταση ήχου"</string>
-    <string name="ring_volume_title" msgid="7938706566797464165">"Ένταση ειδοποίησης ήχου"</string>
+    <string name="ring_volume_title" msgid="7938706566797464165">"Ένταση ήχου κουδουνίσματος"</string>
     <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Δόνηση στο αθόρυβο"</string>
     <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Να επιτρέπεται η ανάδραση με δόνηση στην αθόρυβη λειτουργία"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6cbfd848701..7cc28789ac4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -161,7 +161,7 @@
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"El nombre de host introducido no es válido."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"La lista de exclusión que has escrito no es correcta. Introduce una lista separada por comas de dominios excluidos."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Debes completar el campo de puerto."</string>
-    <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El campo de portal debe estar vacío si el campo de host también lo está."</string>
+    <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El campo de puerto debe estar vacío si el campo de host también lo está."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"El puerto introducido no es válido."</string>
     <string name="proxy_warning_limited_support" msgid="7442676587591460854">"El navegador utiliza el proxy HTTP, pero no puede utilizarlo ninguna otra aplicación."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicación:"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 21e2ddbb244..0aee6d834df 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -759,7 +759,7 @@
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"内部USBストレージ内の全データ（音楽、写真など）を消去する"</string>
     <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"SDカード内の全データ（音楽、写真など）を消去します。"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"タブレットをリセット"</string>
-    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"携帯電話をリセット"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"携帯端末をリセット"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"個人情報とダウンロードしたアプリケーションをすべて削除しますか？この操作を元に戻すことはできません。"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"すべて消去"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"ロック解除パターンを入力してください"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index be574acef32..b7d87f5ed11 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -903,7 +903,7 @@
     <string name="applications_settings_summary" msgid="2714215108369119717">"애플리케이션 관리, 빠른실행 바로가기 설정"</string>
     <string name="applications_settings_header" msgid="6018266337275422250">"애플리케이션 설정"</string>
     <string name="install_applications" msgid="4872012136210802181">"알 수 없는 소스"</string>
-    <string name="install_unknown_applications" msgid="6612824788917283662">"시판되지 않은 애플리케이션 설치 허용"</string>
+    <string name="install_unknown_applications" msgid="6612824788917283662">"마켓에 등록되지 않은 애플리케이션 설치 허용"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"태블릿 및 개인 정보는 출처를 알 수 없는 애플리케이션의 공격에 더욱 취약합니다. 사용자는 이러한 애플리케이션을 사용하여 발생할 수 있는 태블릿 손상이나 데이터 손실에 대해 사용자가 단독으로 책임이 있음을 동의합니다."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"휴대전화 및 개인 정보는 출처를 알 수 없는 애플리케이션의 공격에 더욱 취약합니다. 사용자는 이러한 애플리케이션을 사용하여 발생할 수 있는 휴대전화 손상이나 데이터 손실에 대해 사용자가 단독으로 책임이 있음을 동의합니다."</string>
     <string name="application_info_label" msgid="1150486628158409543">"애플리케이션 정보"</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 3a51c72f36e..e0c153c548f 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -200,7 +200,7 @@
     <item msgid="8418930333779132418">"Somente fora do modo silencioso"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
-    <item msgid="3511504869290423954">"Curta-metragem"</item>
+    <item msgid="3511504869290423954">"Curto"</item>
     <item msgid="2560532955514699713">"Médio"</item>
     <item msgid="2372711992605524591">"Longo"</item>
   </string-array>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 48956e9459e..536069cca68 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -534,7 +534,7 @@
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Ponto de acesso portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ativo"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erro de ponto de acesso Wi-Fi portátil"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Configurar ponto de acesso Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"ponto de acesso Wi-Fi portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
+    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Ponto de acesso Wi-Fi portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Ponto de acesso Android"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Som"</string>
     <string name="display_settings_title" msgid="2378894265964357591">"Tela"</string>
@@ -570,8 +570,8 @@
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Reproduzir som ao fazer uma seleção de tela"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Reproduzir som ao fazer uma seleção de tela"</string>
     <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Sons de bloqueio de tela"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Reproduzir sons ao bloquear e desbloquear a tela."</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Reproduzir sons ao bloquear e desbloquear a tela."</string>
+    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Reproduzir sons ao bloquear e desbloquear a tela"</string>
+    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Reproduzir sons ao bloquear e desbloquear a tela"</string>
     <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Retorno com vibração"</string>
     <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrar ao pressionar teclas e em algumas interações com a interface"</string>
     <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrar ao pressionar teclas e em algumas interações com a interface de usuário"</string>
@@ -813,7 +813,7 @@
     <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Compart. a conexão de Internet deste telefone com um disp."</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Compart. a conexão de Internet deste tablet com <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Compart. a conexão de Internet deste telefone com <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Não está compart. a conexão de Internet do tablet"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"A conexão de Internet não está compartilhada"</string>
     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Não está compart. a conexão de Internet deste tel."</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Erro ao vincular Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Não é possível vincular a mais de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos"</string>
@@ -1197,13 +1197,13 @@
     <string name="recognizer_title" msgid="3231385184559054457">"Reconhecedor de voz"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Config. do reconhecedor de voz"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Configurações para \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Configurações da Conversão de texto em voz"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Configurações da Conversão de texto em voz"</string>
+    <string name="tts_settings" msgid="8186971894801348327">"Configurações da conversão de texto em voz"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Configurações da conversão de texto em voz"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usar minhas config."</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"As conf. padrão abaixo substituem as conf. do aplicativo"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Configurações padrão"</string>
     <string name="tts_default_synth_title" msgid="29467896463371992">"Mecanismo padrão"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Define o mecanismo de síntese de fala a ser usado para texto falado."</string>
+    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Define o mecanismo de síntese de fala a ser usado para texto falado"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Taxa de fala"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocidade em que o texto é falado"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Frequência do som"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index fa12c42bd2c..cc8b24c18d4 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -129,7 +129,7 @@
     <item msgid="5702329417707689835">"Utmärkt"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="643915340724070374">"När skärmen stängs av (fler mobila data används)"</item>
+    <item msgid="643915340724070374">"När skärmen stängs av (använder mer mobildata)"</item>
     <item msgid="1549288661423279207">"Aldrig när den är inkopplad"</item>
     <item msgid="6592896328877671197">"Aldrig (batteriförbrukningen ökar)"</item>
   </string-array>