diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2cc61b07b..04d499b26 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -239,7 +239,7 @@
     <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Només quan està en silenci"</string>
     <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mai"</string>
     <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibra"</string>
-    <string name="account_settings_ringtone" msgid="7922187231467500404">"Selecció del so de trucada"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Selecció del to"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Configuració del servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Elimina el compte"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"El compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\" s\'eliminarà del correu electrònic."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 88f5ea94d..25b7eacab 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -29,7 +29,7 @@
     <string name="send_action" msgid="1729766205562446418">"Enviar"</string>
     <string name="reply_action" msgid="4262472229221507619">"Responder"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Responder a todos"</string>
-    <string name="delete_action" msgid="8421026208288857155">"Suprimir"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Eliminar"</string>
     <string name="forward_action" msgid="669174181042344116">"Reenviar"</string>
     <string name="done_action" msgid="7497990549515580249">"Finalizado"</string>
     <string name="discard_action" msgid="6532206074859505968">"Descartar"</string>
@@ -82,7 +82,7 @@
     <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Marcado con asterisco"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Borradores"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Bandeja de salida"</string>
-    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Mantenga presionada una cuenta para actualizarla"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Mantén presionada una cuenta para actualizarla"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Casilla de correo"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Cargar más mensajes"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Enviar mensajes de salida"</string>
@@ -110,7 +110,7 @@
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Extrayendo archivo adjunto."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Extrayendo archivo adjunto<xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="message_view_invite_view" msgid="6256018854688891069">"Ver en Calendar »"</string>
-    <string name="message_view_invite_title" msgid="5024473745902772299">"Invitación de Calendar"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"Invitación de Calendario"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"¿Vas?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Sí"</string>
     <string name="message_view_invite_maybe" msgid="7555189462441562318">" Quizás"</string>
@@ -129,7 +129,7 @@
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Agregar una cuenta de Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Agregar una cuenta de Exchange ActiveSync"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"Puedes configurar el correo electrónico de la mayoría de las cuentas en sólo algunos pasos."</string>
-    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Puedes configurar una cuenta de intercambio en sólo algunos pasos."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Puedes configurar una cuenta de Exchange en sólo unos pasos."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Puedes configurar una cuenta de Exchange ActiveSync en sólo algunos pasos."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Dirección de correo elec."</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Contraseña"</string>
@@ -144,7 +144,7 @@
     <string name="account_setup_check_settings_canceling_msg" msgid="5077315503721883906">"Cancelando…"</string>
     <string name="account_setup_names_title" msgid="8875040521875381849">"Configurar correo electrónico"</string>
     <string name="account_setup_names_instructions" msgid="2880279273965835007">"Se ha configurado tu cuenta, ¡y el correo electrónico está en camino!"</string>
-    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Coloca un nombre a esta cuenta (opcional)"</string>
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Asigna un nombre a esta cuenta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tu nombre (mostrado en mensajes salientes)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Agregar nueva cuenta de correo electrónico"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"¿Qué tipo de cuenta es?"</string>
@@ -160,9 +160,9 @@
     <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Aceptar todos los certificados)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Suprimir correo electrónico del servidor"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Eliminar correo electrónico del servidor"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nunca"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Cuándo suprimo desde la bandeja de entrada"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Cuando suprimo desde la bandeja de entrada"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"prefijo de ruta IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
     <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Configuración saliente de servidor"</string>
@@ -180,7 +180,7 @@
     <string name="account_setup_options_title" msgid="8995162193118880993">"Opciones de cuenta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frecuencia de verificación de la bandeja de entrada"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nunca"</string>
-    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automático (Empujar)"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Comprobación automática"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Cada 5 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Cada 10 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Cada 15 minutos"</string>
@@ -212,7 +212,7 @@
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Este servidor requiere funciones de seguridad que no son compatibles con tu teléfono."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"La cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" requiere que se actualice la configuración de seguridad."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Actualizar la configuración de seguridad"</string>
-    <string name="account_security_title" msgid="4441470647344315196">"Dispositivo de seguridad"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Seguridad del dispositivo"</string>
     <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"El servidor <xliff:g id="SERVER">%s</xliff:g> requiere tu permiso para controlar de forma remota algunas funciones de seguridad en tu teléfono."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Editar detalles"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Configuración general"</string>
@@ -236,7 +236,7 @@
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar también cuando llegue un correo electrónico"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Siempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Sólo cuando esté en silencio"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Solo en modo silencioso"</string>
     <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
     <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Seleccionar el tono de timbre"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f833320ea..e2be86558 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -55,7 +55,7 @@
     <string name="add_cc_bcc_action" msgid="5569074812077509737">"Ajouter Cc/CCi"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Ajouter une pièce jointe"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Paramètres d\'image mémoire"</string>
-    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Choisir·une·pièce·jointe"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Choisir une pièce jointe"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"Chargement des messages..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"Envoi des messages en cours"</string>
     <string name="status_network_error" msgid="6045933332005067021">"Erreur de connexion"</string>
@@ -212,7 +212,7 @@
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Ce serveur nécessite des fonctionnalités de sécurité que votre téléphone ne prend pas en charge."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Le compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\" nécessite une mise à jour de ses paramètres de sécurité."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Mettre à jour les paramètres de sécurité"</string>
-    <string name="account_security_title" msgid="4441470647344315196">"Sécurité du périphérique"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Sécurité de l\'appareil"</string>
     <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Vous devez autoriser le serveur <xliff:g id="SERVER">%s</xliff:g> à contrôler à distance certaines fonctionnalités de sécurité de votre téléphone."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Modifier les infos"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Paramètres généraux"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 6717e4b8d..eb63112d6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -154,7 +154,7 @@
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP3"</string>
     <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Server IMAP"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Porta"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo di protezione"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo di sicurezza"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nessuna"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Accetta tutti i certificati)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
@@ -168,7 +168,7 @@
     <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Impostazioni server posta in uscita"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Porta"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo di protezione"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo di sicurezza"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Richiedi accesso"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nome utente"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Password"</string>
@@ -205,15 +205,15 @@
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Impossibile connettersi al server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS richiesto ma non supportato dal server."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"I metodi di autenticazione non sono supportati dal server."</string>
-    <string name="account_setup_failed_security" msgid="6142264248671379943">"Impossibile aprire la connessione al server a causa di un errore di protezione."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"Impossibile aprire la connessione al server a causa di un errore di sicurezza."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Impossibile aprire la connessione al server."</string>
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Amministrazione protezione da remoto"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Il server <xliff:g id="SERVER">%s</xliff:g> richiede che tu consenta il controllo remoto di alcune funzionalità di protezione del tuo telefono. Completare la configurazione dell\'account?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Per questo server sono richieste funzionalità di protezione non supportate dal tuo telefono."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"È richiesto l\'aggiornamento delle impostazioni di protezione per l\'account \"<xliff:g id="ACCOUNT">%s</xliff:g>\"."</string>
-    <string name="security_notification_content_title" msgid="8096231937552848281">"Aggiorna impostazioni di protezione"</string>
-    <string name="account_security_title" msgid="4441470647344315196">"Protezione dispositivo"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Il server <xliff:g id="SERVER">%s</xliff:g> richiede che tu consenta il controllo remoto di alcune funzionalità di protezione del tuo telefono."</string>
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Amministrazione sicurezza da remoto"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Il server <xliff:g id="SERVER">%s</xliff:g> richiede che tu consenta il controllo remoto di alcune funzionalità di sicurezza del tuo telefono. Completare la configurazione dell\'account?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Per questo server sono richieste funzionalità di sicurezza non supportate dal tuo telefono."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"È richiesto l\'aggiornamento delle impostazioni di sicurezza per l\'account \"<xliff:g id="ACCOUNT">%s</xliff:g>\"."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Aggiorna impostazioni di sicurezza"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"sicurezza dispositivo"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Il server <xliff:g id="SERVER">%s</xliff:g> richiede che tu consenta il controllo remoto di alcune funzionalità di sicurezza del tuo telefono."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Modifica dettagli"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Impostazioni generali"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Account predefinito"</string>
@@ -261,7 +261,7 @@
     <string name="exception_updated" msgid="3397583105901142050">"I dettagli di questo evento sono cambiati per la data: <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"Impossibile creare l\'account con AccountManager. Riprova."</string>
     <string name="device_admin_label" msgid="8680224994637869414">"Posta"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"Abilita norme di protezione specificate dal server"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Abilita norme di sicurezza specificate dal server"</string>
     <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Calendario Exchange aggiunto"</string>
     <string name="gal_searching_fmt" msgid="6140450617663543464">"Ricerca in <xliff:g id="DOMAIN">%s</xliff:g> in corso..."</string>
   <plurals name="gal_completed_fmt">
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 83e4c3ab8..3bda45e46 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -70,7 +70,7 @@
     <item quantity="few" msgid="1991747245324120305">"ב-<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> חשבונות"</item>
     <item quantity="other" msgid="2723797835410343458">"ב-<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> חשבונות"</item>
   </plurals>
-    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"תיבת דואר נכנס"</string>
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"דואר נכנס"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"תיבת דואר יוצא"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"טיוטות"</string>
     <string name="mailbox_name_display_trash" msgid="9139069064580630647">"פח אשפה"</string>
@@ -78,7 +78,7 @@
     <string name="mailbox_name_display_junk" msgid="9046762505977999288">"דואר זבל"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"גרסה: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"חשבונות"</string>
-    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"תיבת דואר נכנס משולבת"</string>
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"דואר נכנס משולב"</string>
     <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"מסומן בכוכב"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"טיוטות"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"תיבת דואר יוצא"</string>
@@ -178,7 +178,7 @@
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"השתמש בחיבור מאובטח (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"קבל את כל אישורי SSL"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"אפשרויות חשבון"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"תדירות הבדיקה של תיבת דואר נכנס"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"תדירות הבדיקה של דואר נכנס"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"אף פעם"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"אוטומטית (דחיפה)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"כל 5 דקות"</string>
@@ -221,7 +221,7 @@
     <string name="account_settings_notify_label" msgid="1630001017303007974">"התראות דוא\"ל"</string>
     <string name="account_settings_exchange_summary" msgid="8498451479029626317">"תדירות סנכרון, התראות וכדומה"</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"הצג הודעה בשורת המצב כאשר מגיע דוא\"ל"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"תדירות בדיקה של תיבת דואר נכנס"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"תדירות בדיקה של דואר נכנס"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"הגדרות דואר נכנס"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"הגדרות דואר יוצא"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"שם חשבון"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 979c7d237..117a7a228 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="read_attachment_label" msgid="1162255191991555285">"Bijlagen van e-mail lezen"</string>
-    <string name="read_attachment_desc" msgid="7594746717616308643">"Staat deze toepassing toe om uw e-mailbijlagen te lezen."</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Staat deze app toe uw e-mailbijlagen te lezen."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"Gegevens e-mailprovider openen"</string>
-    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Hiermee geeft u deze toepassing toegang tot uw e-maildatabase, inclusief ontvangen berichten, verzonden berichten, gebruikersnamen en wachtwoorden."</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Hiermee geeft u deze app toegang tot uw e-maildatabase, inclusief ontvangen berichten, verzonden berichten, gebruikersnamen en wachtwoorden."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Opstellen"</string>
     <string name="debug_title" msgid="5175710493691536719">"Foutopsporing"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 7948edcd0..97841bb85 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -21,7 +21,7 @@
     <string name="permission_access_provider_label" msgid="4274353114641168675">"E-posta sağlayıcı verilerine eriş"</string>
     <string name="permission_access_provider_desc" msgid="1513898266889541617">"Alınan iletiler, gönderilen iletiler, kullanıcı adları ve şifreler de dahil olmak üzere E-posta veritabanınıza erişmek için bu uygulamaya izin verir."</string>
     <string name="app_name" msgid="5815426892327290362">"E-posta"</string>
-    <string name="compose_title" msgid="427986915662706899">"Oluştur"</string>
+    <string name="compose_title" msgid="427986915662706899">"E-Posta Yaz"</string>
     <string name="debug_title" msgid="5175710493691536719">"Hata Ayıklama"</string>
     <string name="next_action" msgid="3931301986364184415">"İleri"</string>
     <string name="okay_action" msgid="8365197396795675617">"Tamam"</string>
@@ -43,7 +43,7 @@
     <string name="refresh_action" msgid="5951383001436708175">"Yenile"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Hesap ekle"</string>
     <string name="deselect_all_action" msgid="253663239459688238">"Tüm seçimleri iptal et"</string>
-    <string name="compose_action" msgid="4045702519637388045">"Oluştur"</string>
+    <string name="compose_action" msgid="4045702519637388045">"E-Posta Yaz"</string>
     <string name="search_action" msgid="6325101454876682308">"Ara"</string>
     <string name="open_action" msgid="936766723989190816">"Aç"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Hesap ayarları"</string>
@@ -90,7 +90,7 @@
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Konu"</string>
-    <string name="message_compose_body_hint" msgid="7575406246484103697">"Posta Oluştur"</string>
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"E-Posta Yaz"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Orijinal İleti --------"\n"Konu: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Gönderen: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Alıcı:<xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> şunu yazdı:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Alıntılanan metin"</string>