diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c5410554ecb..3663ab840d7 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -805,8 +805,8 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Gendannelse af fabriksdata"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Sletter alle data på tabletcomputeren"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Slet alle data på telefonen"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dette vil slette alle data fra tablettens "<b>"interne lager"</b>", f.eks.: "\n\n<li>"din Google-konto"</li>\n<li>"system- og appdata og -indstillinger"</li>\n<li>"downloadede apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Dette vil slette alle data fra telefonens "<b>"interne lager"</b>", f.eks.: "\n\n<li>"din Google-konto"</li>\n<li>"system- og appdata og -indstillinger"</li>\n<li>"downloadede apps"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dette sletter alle data fra tablettens "<b>"interne lager"</b>", f.eks.: "\n\n<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og applikationer"</li>\n<li>"downloadede applikationer"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Dette sletter alle data fra telefonens "<b>"interne lager"</b>", f.eks.: "\n\n<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og applikationer"</li>\n<li>"downloadede applikationer"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er i øjeblikket logget ind på disse konti:"\n</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Billeder"</li>\n<li>"Andre brugerdata"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ryd musik, billeder og andre brugerdata ved at formatere "<b>"USB-lager"</b>"."</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 3d781198aae..aa80ce6aece 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -214,8 +214,8 @@
   <string-array name="vibrate_entries">
     <item msgid="3388952299521009213">"Immer"</item>
     <item msgid="6293147072807231256">"Nie"</item>
-    <item msgid="1276641209451816572">"Nur im Lautlosmodus"</item>
-    <item msgid="8418930333779132418">"Außer im Lautlosmodus"</item>
+    <item msgid="1276641209451816572">"Nur im Lautlos-Modus"</item>
+    <item msgid="8418930333779132418">"Außer im Lautlos-Modus"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kurz"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3566f21199a..3563e9927fe 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -414,7 +414,7 @@
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"In der Regel 0000 oder 1234"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Möglicherweise müssen Sie diese PIN auch auf dem anderen Gerät eingeben."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Möglicherweise müssen Sie diesen Schlüssel auch auf dem anderen Gerät eingeben."</string>
-    <!-- syntax error in translation for bluetooth_confirm_passkey_msg (3708312912841950052) org.xmlpull.v1.XmlPullParserException: name expected (position:START_TAG <null>@1:241 in java.io.StringReader@742808b3)  -->
+    <!-- syntax error in translation for bluetooth_confirm_passkey_msg (3708312912841950052) org.xmlpull.v1.XmlPullParserException: name expected (position:START_TAG <null>@1:241 in java.io.StringReader@31d520c4)  -->
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Von:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pairing mit diesem Gerät durchführen?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Geben Sie zum Pairing mit <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> ein und drücken Sie anschließend die Eingabetaste."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Kopplung durchführen"</string>
@@ -586,13 +586,13 @@
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Töne"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Lautlosmodus"</string>
+    <string name="silent_mode_title" msgid="3181479108593217704">"Lautlos-Modus"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Klingelton"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Lautstärke"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musikeffekte"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Klingeltonlautstärke"</string>
-    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Im Lautlosmodus vibrieren"</string>
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Im Lautlos-Modus vibrieren"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibration"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Standardbenachrichtigung"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Benachrichtigungslicht"</string>
@@ -1493,7 +1493,7 @@
     <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Hintergrunddaten nur in Mobilfunknetzen deaktivieren und sofern verfügbar WLAN 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>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Hintergrunddaten beschränken?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Diese Funktion kann dazu führen, dass eine von Hintergrunddaten abhängige App nicht mehr funktioniert, wenn kein WLAN verfügbar ist."\n\n"Die innerhalb der App verfügbaren Einstellungen bieten geeignetere Steueroptionen zum Datenverbrauch."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Diese Funktion kann dazu führen, dass eine von Hintergrunddaten abhängige App nicht mehr funktioniert, wenn kein WLAN verfügbar ist."\n\n"Die innerhalb der App verfügbaren Einstellungen bieten geeignetere Steuerelemente zur Datennutzung."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Hintergrunddaten können nur beschränkt werden, wenn Sie ein Limit für mobile Daten festgelegt haben."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum für Zurücksetzung der Nutzungszyklen"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum (monatlich):"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 86f2449662a..a02221edc28 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1368,7 +1368,7 @@
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Δεν συνδέθηκε"</string>
     <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_skip" msgid="6661541841684895522">"Παράλειψη"</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>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 95d772ea4f1..4fef07dc0e9 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -343,7 +343,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Nivel de seguridad medio a alto"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contraseña"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Nivel de seguridad alto"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Inhab por admin/política encrip/almac credenciales"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Inhabilitado por administrador, política de encriptación o almacenamiento de credenciales"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ninguna"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Habilitar seguridad"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Desbloqueo facial"</string>
@@ -913,7 +913,7 @@
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Inténtalo de nuevo:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Extraer un patrón de desbloqueo"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Presiona Menú para obtener ayuda."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Sacar el dedo cuando haya finalizado."</string>
+    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Levanta el dedo cuando termines."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Conectar al menos <xliff:g id="NUMBER">%d</xliff:g> puntos. Vuelve a intentarlo."</string>
     <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"¡Patrón grabado!"</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Extrae el patrón nuevamente para confirmar:"</string>
@@ -1042,7 +1042,7 @@
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
     <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> libre"</string>
-    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> utilizado"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> en uso"</string>
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
@@ -1457,8 +1457,8 @@
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Eliminar actividades"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruir todas las actividades en cuanto el usuario la abandona"</string>
     <string name="app_process_limit_title" msgid="4280600650253107163">"Tope de procesos de fondo"</string>
-    <string name="show_all_anrs" msgid="28462979638729082">"Mostrar todas las ANRS"</string>
-    <string name="show_all_anrs_summary" msgid="641908614413544127">"Mostrar la aplicación no responde para aplicaciones de fondo."</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Errores sin respuesta"</string>
+    <string name="show_all_anrs_summary" msgid="641908614413544127">"Mostrar error de que la aplicación no responde para aplicaciones en segundo plano"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclo de uso de datos"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming de datos"</string>
@@ -1524,7 +1524,7 @@
     <string name="vpn_show_options" msgid="7182688955890457003">"Mostrar opciones avanzadas"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Dominios de búsqueda de DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Servidores DNS (por ejemplo, 8.8.8.8)"</string>
-    <string name="vpn_routes" msgid="3818655448226312232">"Desviando rutas (por ejemplo, 10.0.0.0/8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Rutas de reenvío (por ejemplo, 10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="1863901629860867849">"Nombre de usuario"</string>
     <string name="vpn_password" msgid="6756043647233596772">"Contraseña"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"Guardar información de la cuenta"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f3388bd8f65..bf431a4560d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -232,7 +232,7 @@
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Bytes disponibles:"</string>
     <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB como almacenamiento masivo"</string>
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"La tarjeta SD se está utilizando como dispositivo de almacenamiento masivo."</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Es seguro extraer el almacenamiento USB."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Es seguro extraer el almacenamiento USB"</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Es seguro extraer la tarjeta SD"</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB extraído en uso"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"La tarjeta SD se ha extraído mientras estaba en uso."</string>
@@ -398,7 +398,7 @@
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Siguiente"</string>
-    <string name="lock_setup" msgid="1759001157415978959">"Configuración completa"</string>
+    <string name="lock_setup" msgid="1759001157415978959">"Configuración completada"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administración de dispositivos"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Administradores de dispositivos"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Ver o desactivar administradores de dispositivo"</string>
@@ -819,7 +819,7 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer teléfono"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"¿Quieres borrar toda tu información personal y las aplicaciones descargadas? Esta acción no se puede deshacer."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Borrar todo"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Crea tu patrón de desbloqueo."</string>
+    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Dibuja tu patrón de desbloqueo"</string>
     <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Debes crear un patrón de desbloqueo para confirmar el restablecimiento de los datos de fábrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No se ha reiniciado el sistema porque el servicio Borrado del sistema no está disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"¿Restablecer?"</string>
@@ -834,7 +834,7 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"¿Quieres borrar el almacenamiento USB y eliminar todos sus archivos? Esta acción no se puede deshacer."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"¿Quieres borrar la tarjeta SD y eliminar todos sus archivos? Esta acción no se puede deshacer."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Borrar todo"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Crea tu patrón de desbloqueo."</string>
+    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Dibuja tu patrón de desbloqueo"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Debes dibujar el patrón de desbloqueo para confirmar que quieres borrar el almacenamiento USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Debes dibujar el patrón de desbloqueo para confirmar que quieres borrar la tarjeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ajustes de llamada"</string>
@@ -848,7 +848,7 @@
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Anclaje de USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB conectado, sin anclaje a red"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Anclado a red"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"No se puede hacer el anclaje a red si el almacenamiento USB está en uso."</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"No se puede hacer el anclaje a red si el almacenamiento USB está en uso"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB no conectado"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Error de anclaje de USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Anclaje de Bluetooth"</string>
@@ -1063,7 +1063,7 @@
     <string name="main_running_process_description" msgid="1130702347066340890">"Proceso principal en uso"</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Servicio <xliff:g id="COMP_NAME">%1$s</xliff:g> en uso"</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Proveedor <xliff:g id="COMP_NAME">%1$s</xliff:g> en uso"</string>
-    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"¿Deseas detener el servicio del sistema?"</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"¿Quieres detener el servicio del sistema?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Si detienes este servicio, es posible que algunas funciones del tablet dejen de funcionar correctamente hasta que reinicies el dispositivo."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Si detienes este servicio, es posible que algunas funciones del teléfono dejen de funcionar correctamente hasta que reinicies el dispositivo."</string>
     <string name="language_settings" msgid="5292716747264442359">"Idioma/Introducción texto"</string>
@@ -1569,7 +1569,7 @@
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Introduce aquí la contraseña actual de copia de seguridad completa"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Introduce una contraseña nueva para copias de seguridad completas."</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Vuelve a escribir aquí la nueva contraseña de copia de seguridad completa"</string>
-    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Definir contraseña de copia de seguridad"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Establecer contraseña"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index adb3c5e2247..b72e90d4140 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -430,7 +430,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>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 55d6a973e02..4a0344c2546 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1439,7 +1439,7 @@
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-tarkistus"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Aseta HDCP-tarkistus"</string>
     <string name="debug_ui_category" msgid="9023948280291055349">"Käyttöliittymä"</string>
-    <string name="strict_mode" msgid="1938795874357830695">"Strict mode käytössä"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Tiukka tila käytössä"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Vilkuta näyttöä sovellusten tehdessä pitkiä toimia"</string>
     <string name="pointer_location" msgid="6084434787496938001">"Osoittimen sijainti"</string>
     <string name="pointer_location_summary" msgid="840819275172753713">"Ruudun peittokuva näyttää nykyiset kosketustiedot"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 853f5a6f590..50f45ac317c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -335,7 +335,7 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Faire glisser"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Aucune sécurité"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Reconnaissance faciale"</string>
+    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Sécurité faible, expérimental"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Schéma"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Sécurité moyenne"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index b42a3ba098d..b13d3ae7660 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1387,7 +1387,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP समर्थित नहीं है."</string>
     <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"आप सेटअप करते समय किसी EAP Wi-Fi कनेक्‍शन को कॉन्‍िफ़गर नहीं कर सकते. सेटअप करने के बाद, आप उसे सेटिंग &gt; वायरलेस और नेटवर्क में कॉन्फ़िगर कर सकते हैं."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"कनेक्‍ट होने में कुछ मिनट लग सकते हैं..."</string>
-    <!-- syntax error in translation for wifi_setup_description_connected (5235991893829582459) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:192 in java.io.StringReader@72e3b895)  -->
+    <!-- syntax error in translation for wifi_setup_description_connected (5235991893829582459) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:192 in java.io.StringReader@1a0f73c1)  -->
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"समन्वयन सक्षम"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"समन्वयन अक्षम"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"समन्वयन त्रुटि."</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 25a6d3bfd06..702f168b4ae 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -261,12 +261,12 @@
     <string name="radio_controls_title" msgid="6889937359495515769">"Selengkapnya..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Jaringan &amp; nirkabel"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Kelola Wi-Fi, Bluetooth, mode pesawat, jaringan seluler, &amp; VPN"</string>
-    <string name="roaming" msgid="3596055926335478572">"Data roaming"</string>
+    <string name="roaming" msgid="3596055926335478572">"Roaming data"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Sambungkan ke layanan data ketika roaming"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Sambungkan ke layanan data ketika roaming"</string>
-    <string name="roaming_reenable_message" msgid="9141007271031717369">"Anda telah kehilangan konektivitas data karena data roaming pada jaringan utama Anda biarkan dalam keadaan mati."</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"Anda telah kehilangan konektivitas data karena Anda meninggalkan jaringan asal dalam keadaan roaming data dimatikan."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Hidupkan"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Izinkan data roaming? Anda mungkin dikenai tarif jelajah yang tinggi!"</string>
+    <string name="roaming_warning" msgid="1269870211689178511">"Izinkan roaming data? Anda mungkin dikenai tarif jelajah yang tinggi!"</string>
     <string name="roaming_reenable_title" msgid="7626425894611573131">"Perhatian"</string>
     <string name="networks" msgid="6333316876545927039">"Pilihan operator"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Pilih operator jaringan"</string>
@@ -311,8 +311,8 @@
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Enkripsi ponsel"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Isi daya baterai Anda dan coba lagi."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Pasang pengisi daya Anda dan coba lagi."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Tidak ada PIN atau sandi kunci layar"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Anda harus menyetel PIN atau sandi kunci layar sebelum dapat memulai enkripsi."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Tidak ada PIN atau sandi pengunci layar"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Anda harus menyetel PIN atau sandi pengunci layar sebelum dapat memulai enkripsi."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Konfirmasi enkripsi"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Enkripsi tablet? Operasi ini tidak dapat dibatalkan dan jika Anda menghentikannya, data akan hilang. Enkripsi membutuhkan waktu satu jam atau lebih, saat itu tablet akan dimulai ulang beberapa kali."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Enkripsi ponsel? Operasi ini tidak dapat dibatalkan dan jika Anda menghentikannya, data akan hilang. Enkripsi membutuhkan waktu satu jam atau lebih, saat itu ponsel akan dimulai ulang beberapa kali."</string>
@@ -1327,7 +1327,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Penyimpanan kredensial dihapus."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Penyimpanan kredensial tidak dapat dihapus."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Penyimpanan kredensial diaktifkan."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Anda harus menyetel PIN atau sandi kunci layar sebelum dapat menggunakan penyimpanan kredensial."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Anda harus menyetel PIN atau sandi pengunci layar sebelum dapat menggunakan penyimpanan kredensial."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nada darurat"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Setel perilaku ketika panggilan darurat dilakukan"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Buat cadangan &amp; setel ulang"</string>
@@ -1461,7 +1461,7 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Tmplkn dialog Apl Tidak Merespons utk apl ltr blkg"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Daur penggunaan data"</string>
-    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Data roaming"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming data"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Batasi data latar belakang"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Pisahkan penggunaan 4G"</string>
     <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Tampilkan penggunaan Wi-Fi"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e50c12fc484..7e42ffdce55 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -485,7 +485,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"OFF"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFCがOFFのため使用できません"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Androidビーム"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"この機能をONにすると、別のNFC対応の端末を近づけて持ち、アプリのコンテンツを転送することができます。たとえば、ブラウザのページ、YouTubeの動画、連絡先などを転送できます。"\n\n"2 つの端末を近づけて（通常は背面を向かい合わせにして）、画面をタップします。何を転送するかはアプリが判断します。"</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"この機能をONにすると、別のNFC対応の端末を近づけて持ち、アプリのコンテンツをビームすることができます。たとえば、ブラウザのページ、YouTubeの動画、連絡先などをビームできます。"\n\n"2 つの端末を近づけて（通常は背面を向かい合わせにして）、画面をタップします。何をビームするかはアプリが判断します。"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-FiをONにする"</string>
     <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 12a0d531141..224fb8631a8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -499,7 +499,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Varsle når et åpent nettverk er tilgjengelig"</string>
     <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Unngå dårlige tilkoblinger"</string>
     <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Ikke bruk et Wi-Fi-nettverk med mindre det har en brukbar Internett-tilkobling"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Ha Wi-Fi aktivert i dvalemodus"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Hold Wi-Fi aktivert i dvalemodus"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Det oppstod et problem under endring av innstillingen"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Legg til nettverk"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Trådløse nettverk"</string>
@@ -537,7 +537,7 @@
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktivert"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Ungikk dårlig internettforbindelse"</string>
     <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Nettverket ble unngått på grunn av dårlig forbindelse. Slå av denne funksjonen på skjermen Innstillinger &gt; Wi-Fi, under menyvalget Avansert."</string>
+    <string name="wifi_disabled_help" msgid="5416325603334140666">"Nettverket ble unngått på grunn av dårlig forbindelse. Slå av denne funksjonen under Innstillinger &gt; Wi-Fi, under menyvalget Avansert."</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentiseringsproblem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Utenfor område"</string>
     <string name="wifi_wps_available_first_item" msgid="3538912605343585226">"Beskyttet nettverk tilgjengelig"</string>
@@ -549,7 +549,7 @@
     <string name="wifi_forget" msgid="8168174695608386644">"Slett"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Lagre"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Avbryt"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"En annen Wi-Fi-beskyttet økt er oppdaget. Prøv på nytt om noen minutter."</string>
+    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"En annen beskyttet Wi-Fi økt ble oppdaget. Prøv på nytt om noen minutter."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avansert Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frekvensbånd"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Angi operasjonens frekvensområde"</string>
@@ -570,7 +570,7 @@
     <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Konfigurer node-til-node-tilkobling"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Enhetsinformasjon"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Wi-Fi-beskyttet konfigurasjon"</string>
+    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Wi-Fi, beskyttet konfigurasjon"</string>
     <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Skriv inn personlig kode"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Husk denne tilkoblingen"</string>
     <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Søk"</string>
@@ -1336,15 +1336,15 @@
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personlige data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhetskopier data"</string>
     <string name="backup_data_summary" msgid="9157861529438245957">"Sikkerhetskopier appdata, Wi-Fi-passord og andre innstillinger til Googles tjenere"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"Sikkerhetskop. av konto"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Sikkerhetskopikonto"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ingen konto lagrer for øyeblikket sikkerhetskopierte data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Auto-gjenoppretting"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Når du installerer en app, bør du gjenopprette sikkerhetskopierte innstillinger og data"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Passord for sikkerhetskopiering på datamaskin"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Fullstendig sikkerhetskopiering på stasjonær datamaskin beskyttes ikke for øybelikket."</string>
+    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Fullstendig sikkerhetskopiering på datamaskin beskyttes ikke for øybelikket."</string>
     <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Velg for å endre eller fjerne passordet for fullstendige sikkerhetskopier på datamaskin"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Vil du stoppe sikkerhetskopiering av Wi-Fi passord, bokmerker, andre innstillinger og appdata, samt slette alle kopier på Googles tjenere?"</string>
+    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Vil du stoppe sikkerhetskopiering av Wi-Fi-passord, bokmerker, andre innstillinger og appdata, samt slette alle kopier på Googles tjenere?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Innstillinger for enhetsadministrasjon"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Enhetsadministrator"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Deaktiver"</string>
@@ -1422,8 +1422,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Vil du fjerne kontoen?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Hvis du fjerner denne kontoen, slettes alle tilhørende meldinger, kontakter og andre data fra nettbrettet!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Hvis du fjerner denne kontoen, slettes alle tilhørende meldinger, kontakter og andre data fra telefonen!"</string>
-    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Denne kontoen er nødvendig for noen apper. Du kan bare fjerne den ved å tilbakestille nettbrettet til fabrikkinnstillingene (som sletter alle dine personlige data) i  Sikkerhetskopier under Innstillinger og tilbakestill."</string>
-    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Denne kontoen er nødvendig for enkelte apper. Du kan bare fjerne den ved å tilbakestille telefonen til fabrikkinnstillinger (som sletter alle dine personlige data) i Sikkerhetskopier og tilbakestill under Innstillinger."</string>
+    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Denne kontoen er nødvendig for noen apper. Du kan bare fjerne den ved å tilbakestille nettbrettet til fabrikkinnstillingene (noe som sletter alle dine personlige data) i Sikkerhetskopiering og tilbakestilling under Innstillinger."</string>
+    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Denne kontoen er nødvendig for enkelte apper. Du kan bare fjerne den ved å tilbakestille telefonen til fabrikkinnstillingene (noe som sletter alle dine personlige data) i Sikkerhetskopiering og tilbakestilling under Innstillinger."</string>
     <string name="provider_label" msgid="7724593781904508866">"Push-abonnementer"</string>
     <string name="sync_item_title" msgid="1931551540462877488">"Synkroniser <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Kan ikke synkronisere manuelt"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 8a3c76b97b4..b6bbff7e428 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -549,7 +549,7 @@
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeten"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Opslaan"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annuleren"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Er is nog een Wifi Protected-sessie gedetecteerd. Probeer het over een paar minuten opnieuw."</string>
+    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Er is nog een Wifi Protected-sessie gedetecteerd. Probeer het later opnieuw."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Geavanceerde Wi-Fi-instellingen"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frequentieband"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Het frequentiebereik voor gebruik opgeven"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9daa2f40b59..eaf2a810bc7 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -343,7 +343,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Segurança média a elevada"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Palavra-passe"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Segurança elevada"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Des. pelo adm., política de encrip. ou arm. de cred."</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desativ. p/ administ., política de encript. ou armazen. de credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nenhum"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Deslizar"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Desbloqueio de Rosto"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3f23608f7aa..e452be43e3b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1140,7 +1140,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешить использование фиктивных местоположений"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Разрешить отладку USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Отладка по USB – это режим, который позволяет использовать ваше устройство как внешний накопитель: перемещать файлы (с компьютера и на компьютер), напрямую устанавливать приложения, а также просматривать системные журналы."</string>
-    <string name="gadget_picker_title" msgid="98374951396755811">"Выбор·гаджета"</string>
+    <string name="gadget_picker_title" msgid="98374951396755811">"Выбор гаджета"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Выбор виджета"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> дн. <xliff:g id="HOURS">%2$d</xliff:g> ч. <xliff:g id="MINUTES">%3$d</xliff:g> мин. <xliff:g id="SECONDS">%4$d</xliff:g> с."</string>
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> ч. <xliff:g id="MINUTES">%2$d</xliff:g> мин. <xliff:g id="SECONDS">%3$d</xliff:g> с."</string>
@@ -1566,9 +1566,9 @@
     <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Хорошо. Для дальнейшей прокрутки списка продолжайте движение пальцами вверх."</string>
     <string name="accessibility_tutorial_lesson_2_text_4" msgid="3055831259260848004">"Это всё. Чтобы выйти, нажмите кнопку \"<xliff:g id="FINISH">%s</xliff:g>\"."</string>
     <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Проверка правописания"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Введите текущий пароль для полного резервного копирования"</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Введите новый пароль для полного резервного копирования"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Подтвердите пароль к полной резервной копии"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Введите текущий пароль"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Введите новый пароль"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Подтвердите пароль"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Сохранить пароль"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Отмена"</string>
     <!-- String.format failed for translation -->
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 28f49e9fe26..23870119afd 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -302,8 +302,8 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kryptera pekdatorn"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kryptera telefonen"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Kräv PIN-kod eller lösenord för att dekryptera pekdatorn varje gång den slås på"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Ange PIN-kod eller lösenord för att dekryptera telefonen varje gång den slås på"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Ange PIN-kod eller lösenord för att dekryptera pekdatorn varje gång du slår på den"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Ange PIN-kod eller lösenord för att dekryptera telefonen varje gång du slår på den"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krypterad"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Du kan kryptera konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du har krypterat pekdatorn måste du ange en PIN-kod eller ett lösenord varje gång du startar enheten för att den ska dekrypteras. Pekdatorn kan inte dekrypteras utan att standardinställningarna återställs, vilket innebär att alla data tas bort."\n\n"Krypteringen kan ta en timme eller mer. Se till att batteriet är laddat innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter krypteringen kan du förlora en del eller alla data."</string>
     <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Du kan kryptera konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du har krypterat mobilen måste du ange en PIN-kod eller ett lösenord varje gång du startar enheten för att den ska dekrypteras. Mobilen kan inte dekrypteras utan att standardinställningarna återställs, vilket innebär att alla data tas bort."\n\n"Krypteringen kan ta en timme eller mer. Se till att batteriet är laddat innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter krypteringen kan du förlora en del eller alla data."</string>
@@ -1568,7 +1568,7 @@
     <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Stavningskorrigering"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Ange det aktuella lösenordet för den fullständiga säkerhetskopian här"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Ange ett nytt lösenord för fullständiga säkerhetskopior här"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Skriv in lösenordet för den nya fullständiga säkerhetskopian på nytt här"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Skriv in det nya fullständiga reservlösenordet här"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Ange lösenord för säkerhetskopia"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Avbryt"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g> %%"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3f07a2aff61..0ea9d840eb2 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -76,13 +76,13 @@
     <string name="battery_info_temperature_label" msgid="1968383098818648037">"电池温度："</string>
     <string name="battery_info_temperature_units" msgid="9098950587249987550">"° C"</string>
     <string name="battery_info_uptime" msgid="5548545143573527992">"启动后的时间："</string>
-    <string name="battery_info_awake_battery" msgid="2557725975486185849">"电池的唤醒时间："</string>
+    <string name="battery_info_awake_battery" msgid="2557725975486185849">"使用电池电量的未休眠时间："</string>
     <string name="battery_info_awake_plugged" msgid="176716874713478188">"充电时的唤醒时间："</string>
     <string name="battery_info_screen_on" msgid="376277447175613889">"屏幕开启时间："</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"未知"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"正在充电"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"（交流电）"</string>
-    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB 绑定选项)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"正在耗电"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"未在充电"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"电量充足"</string>
@@ -432,7 +432,7 @@
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"已配对的设备"</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_disconnect" msgid="8220072022970148683">"断开网络共享"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"配对和连接"</string>
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"取消配对"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"断开连接和取消配对"</string>
@@ -595,7 +595,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"静音时振动"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"振动"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"默认通知"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"闪动通知指示灯"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"有通知时指示灯闪烁"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"铃声"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"通知"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"将来电音量用作通知音量"</string>
@@ -606,7 +606,7 @@
     <string name="dock_settings_summary" msgid="455802113668982481">"附加底座的音频设置"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"拨号键盘触摸音效"</string>
     <string name="sound_effects_enable_title" msgid="1171590821131077296">"触摸提示音"</string>
-    <string name="lock_sounds_enable_title" msgid="450098505659399520">"屏幕锁定提示音"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"锁屏提示音"</string>
     <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"触摸时振动"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"降噪"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"音乐、视频、游戏和其他媒体"</string>
@@ -839,19 +839,19 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"您必须绘制解锁图案，以确认对 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_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_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="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_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>
@@ -860,9 +860,9 @@
     <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>
+    <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>
     <string name="tethering_help_button_text" msgid="656117495547173630">"帮助"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"移动网络"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
@@ -1189,7 +1189,7 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔下电源后的电量消耗情况"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"重置后的电量消耗情况"</string>
-    <string name="battery_stats_on_battery" msgid="4970762168505236033">"电量已用时间：<xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"电池电量已用时间：<xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"拔下电源后已过 <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"正在充电"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"屏幕已开启"</string>