From a9abfc0819fd16c317731d803296d73e7c6ad354 Mon Sep 17 00:00:00 2001
From: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Wed, 21 Jun 2017 10:48:26 +0000
Subject: [PATCH] Update Spanish translation

---
 po/es.po | 778 +++++++++++++++++++++++++++----------------------------
 1 file changed, 378 insertions(+), 400 deletions(-)

diff --git a/po/es.po b/po/es.po
index b04386bd..4510bd8c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,15 +10,15 @@
 # pakitochus <pakitochus@gmail.com>, 2012
 # Revo <revolution2000@gmail.com>, 2013
 # Rodrigo Cares <rcares@gmail.com>, 2012-2013
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2014-2015, 2015, 2016.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2014-2015, 2015, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=geary&keywords=I18N+L10N&component=internationalization\n"
-"POT-Creation-Date: 2016-12-20 08:23+0000\n"
-"PO-Revision-Date: 2016-12-21 16:47+0100\n"
+"POT-Creation-Date: 2017-04-30 12:02+0000\n"
+"PO-Revision-Date: 2017-06-21 12:44+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: es <gnome-es-list@gnome.org>\n"
 "Language: es\n"
@@ -46,50 +46,52 @@ msgid ""
 "desktop. It allows you to read, find and send email with a straightforward, "
 "modern interface."
 msgstr ""
+"Geary es una aplicación de correo-e pensada para las conversaciones, para el "
+"escritorio GNOME 3. Le permite leer, buscar y enviar correos con una "
+"interfaz sencilla y moderna."
 
 #: ../desktop/org.gnome.Geary.appdata.xml.in.h:4
 msgid ""
 "Conversations allow you to read a complete discussion without having to find "
 "and click from message to message."
 msgstr ""
+"Las conversaciones le permiten leer un hilo completo si tener que buscar y "
+"pulsa cada mensaje individual."
 
 #: ../desktop/org.gnome.Geary.appdata.xml.in.h:5
 msgid "Geary’s features include:"
-msgstr ""
+msgstr "Entre las características de Geary se incluyen:"
 
 #: ../desktop/org.gnome.Geary.appdata.xml.in.h:6
 msgid "Quick email account setup"
-msgstr ""
+msgstr "Configuración rápida de la cuenta de correo"
 
 #: ../desktop/org.gnome.Geary.appdata.xml.in.h:7
 msgid "Shows related messages together in conversations"
-msgstr ""
+msgstr "Mostrar mensajes relacionados entre ellos en las conversaciones"
 
 #: ../desktop/org.gnome.Geary.appdata.xml.in.h:8
 msgid "Fast, full text and keyword search"
-msgstr ""
+msgstr "Búsqueda de palabras clave rápida y por texto completo"
 
 #: ../desktop/org.gnome.Geary.appdata.xml.in.h:9
 msgid "Full-featured HTML and plain text message composer"
-msgstr ""
+msgstr "Editor completo de HYML y texto plano"
 
 #: ../desktop/org.gnome.Geary.appdata.xml.in.h:10
-#, fuzzy
 #| msgid "Show _notifications for new mail"
 msgid "Desktop notification of new mail"
-msgstr "Mostrar _notificaciones cuando llegue correo nuevo"
+msgstr "Notificaciones de escritorio cuando llegue correo nuevo"
 
 #: ../desktop/org.gnome.Geary.appdata.xml.in.h:11
 msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
-msgstr ""
+msgstr "Compatible con GMail, Yahoo! Mail, Outlook.com y otros servidores IMAP"
 
 #: ../desktop/org.gnome.Geary.desktop.in.h:2
-#| msgid "Gmail"
 msgid "Email"
 msgstr "Correo-e"
 
 #: ../desktop/org.gnome.Geary.desktop.in.h:3
-#| msgid "Geary Mail"
 msgid "Geary Email"
 msgstr "Correo Geary"
 
@@ -103,7 +105,7 @@ msgid "Compose Message"
 msgstr "Redactar mensaje"
 
 #: ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:20
+#: ../src/client/application/geary-application.vala:21
 msgid "Mail Client"
 msgstr "Cliente de correo"
 
@@ -198,75 +200,67 @@ msgstr "hace 4 años"
 msgid "Everything"
 msgstr "Todo"
 
-#: ../src/client/accounts/add-edit-page.vala:282
+#: ../src/client/accounts/add-edit-page.vala:283
 msgid "Edit"
 msgstr "Editar"
 
-#: ../src/client/accounts/add-edit-page.vala:284
+#: ../src/client/accounts/add-edit-page.vala:285
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: ../src/client/accounts/add-edit-page.vala:738
+#: ../src/client/accounts/add-edit-page.vala:751
 msgid "Remem_ber passwords"
 msgstr "Recor_dar las contraseñas"
 
-#: ../src/client/accounts/add-edit-page.vala:745 ../ui/login.glade.h:7
+#: ../src/client/accounts/add-edit-page.vala:758 ../ui/login.glade.h:7
 msgid "Remem_ber password"
 msgstr "Recor_dar la contraseña"
 
-#: ../src/client/accounts/add-edit-page.vala:779
+#: ../src/client/accounts/add-edit-page.vala:792
 msgid "Unable to validate:\n"
 msgstr "No se puede validar:\n"
 
-#: ../src/client/accounts/add-edit-page.vala:781
-#| msgid "        &#8226; Invalid account nickname.\n"
+#: ../src/client/accounts/add-edit-page.vala:794
 msgid "        • Invalid account nickname.\n"
 msgstr "        • Alias de cuenta no válido.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:784
-#| msgid "        &#8226; Email address already added to Geary.\n"
+#: ../src/client/accounts/add-edit-page.vala:797
 msgid "        • Email address already added to Geary.\n"
 msgstr "        • Ya se había añadido la dirección de correo a Geary.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:788
-#| msgid "        &#8226; IMAP connection error.\n"
+#: ../src/client/accounts/add-edit-page.vala:801
 msgid "        • IMAP connection error.\n"
 msgstr "        • Error de conexión IMAP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:791
-#| msgid "        &#8226; IMAP username or password incorrect.\n"
+#: ../src/client/accounts/add-edit-page.vala:804
 msgid "        • IMAP username or password incorrect.\n"
 msgstr "        • Nombre de usuario o contraseña IMAP incorrectos.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:794
-#| msgid "        &#8226; SMTP connection error.\n"
+#: ../src/client/accounts/add-edit-page.vala:807
 msgid "        • SMTP connection error.\n"
 msgstr "        • Error de conexión SMTP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:797
-#| msgid "        &#8226; SMTP username or password incorrect.\n"
+#: ../src/client/accounts/add-edit-page.vala:810
 msgid "        • SMTP username or password incorrect.\n"
 msgstr "        • El nombre de usuario o contraseña SMTP incorrectos.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:801
-#| msgid "        &#8226; Connection error.\n"
+#: ../src/client/accounts/add-edit-page.vala:814
 msgid "        • Connection error.\n"
 msgstr "        • Error de conexión.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:805
-#| msgid "        &#8226; Username or password incorrect.\n"
+#: ../src/client/accounts/add-edit-page.vala:818
 msgid "        • Username or password incorrect.\n"
 msgstr "        • Nombre de usuario o contraseña incorrectos.\n"
 
-#: ../src/client/application/geary-application.vala:21
+#: ../src/client/application/geary-application.vala:22
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: ../src/client/application/geary-application.vala:23
+#: ../src/client/application/geary-application.vala:24
 msgid "Visit the Geary web site"
 msgstr "Visite el sitio web de Geary"
 
-#: ../src/client/application/geary-application.vala:431
+#: ../src/client/application/geary-application.vala:464
 #, c-format
 msgid "About %s"
 msgstr "Acerca de %s"
@@ -274,11 +268,11 @@ msgstr "Acerca de %s"
 #. Translators: add your name and email address to receive
 #. credit in the About dialog For example: Yamada Taro
 #. <yamada.taro@example.com>
-#: ../src/client/application/geary-application.vala:435
+#: ../src/client/application/geary-application.vala:468
 msgid "translator-credits"
 msgstr ""
-"Adolfo Jayme Barrientos <fitojb@ubuntu.com>, 2012–2015\n"
-"Daniel Mustieles <daniel.mustieles@gmail.com>, 2015"
+"Daniel Mustieles <daniel.mustieles@gmail.com>, 2015 - 2017\n"
+"Adolfo Jayme Barrientos <fitojb@ubuntu.com>, 2012–2015"
 
 #: ../src/client/application/geary-args.vala:10
 msgid "Start Geary with hidden main window"
@@ -335,7 +329,7 @@ msgstr "Revocar todos los certificados de servidores con advertencias de TLS"
 
 #: ../src/client/application/geary-args.vala:27
 msgid "Perform a graceful quit"
-msgstr ""
+msgstr "Salir elegantemente"
 
 #: ../src/client/application/geary-args.vala:28
 msgid "Display program version"
@@ -359,7 +353,6 @@ msgstr "Falló al analizar las opciones de la línea de comandos: %s\n"
 
 #: ../src/client/application/geary-args.vala:72
 #, c-format
-#| msgid "Unrecognized command line option \"%s\"\n"
 msgid "Unrecognized command line option “%s”\n"
 msgstr "Opción de la línea de comandos «%s» no reconocida\n"
 
@@ -406,7 +399,7 @@ msgid "Mark as not S_pam"
 msgstr "Marcar como no _spam"
 
 #: ../src/client/application/geary-controller.vala:76
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:448
 msgid "Mark conversation"
 msgstr "Marcar conversación"
 
@@ -423,7 +416,7 @@ msgid "Add label to conversations"
 msgstr "Añadir etiqueta a las conversaciones"
 
 #: ../src/client/application/geary-controller.vala:80
-#: ../src/client/application/geary-controller.vala:471
+#: ../src/client/application/geary-controller.vala:487
 msgid "Move conversation"
 msgstr "Mover conversación"
 
@@ -431,97 +424,95 @@ msgstr "Mover conversación"
 msgid "Move conversations"
 msgstr "Mover conversaciones"
 
-#: ../src/client/application/geary-controller.vala:434
-#| msgid "_Mark as..."
+#: ../src/client/application/geary-controller.vala:450
 msgid "_Mark as…"
 msgstr "_Marcar como…"
 
-#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/application/geary-controller.vala:456
 msgid "Mark as _Read"
 msgstr "Marcar como _leído"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:462
 msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
-#: ../src/client/application/geary-controller.vala:452
+#: ../src/client/application/geary-controller.vala:468
 msgid "_Star"
 msgstr "_Destacar"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:473
 msgid "U_nstar"
 msgstr "_No destacar"
 
-#: ../src/client/application/geary-controller.vala:467
+#: ../src/client/application/geary-controller.vala:483
 msgid "Add label"
 msgstr "Añadir etiqueta"
 
-#: ../src/client/application/geary-controller.vala:468
+#: ../src/client/application/geary-controller.vala:484
 msgid "_Label"
 msgstr "_Etiquetar"
 
-#: ../src/client/application/geary-controller.vala:472
+#: ../src/client/application/geary-controller.vala:488
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../src/client/application/geary-controller.vala:476
+#: ../src/client/application/geary-controller.vala:492
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Redactar un mensaje nuevo (Ctrl+N, N)"
 
-#: ../src/client/application/geary-controller.vala:480
+#: ../src/client/application/geary-controller.vala:496
 #: ../ui/conversation-email-menus.ui.h:1
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../src/client/application/geary-controller.vala:481
+#: ../src/client/application/geary-controller.vala:497
 msgid "Reply (Ctrl+R, R)"
 msgstr "Responder (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:485
+#: ../src/client/application/geary-controller.vala:501
 msgid "R_eply All"
 msgstr "R_esponder a todos"
 
-#: ../src/client/application/geary-controller.vala:486
+#: ../src/client/application/geary-controller.vala:502
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Responder a todos (Ctrl+Mayús+R, Mayús+R)"
 
-#: ../src/client/application/geary-controller.vala:491
+#: ../src/client/application/geary-controller.vala:507
 #: ../ui/conversation-email-menus.ui.h:3
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: ../src/client/application/geary-controller.vala:492
+#: ../src/client/application/geary-controller.vala:508
 msgid "Forward (Ctrl+L, F)"
 msgstr "Reenviar (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:522
+#: ../src/client/application/geary-controller.vala:538
 msgid "Empty _Spam…"
 msgstr "Vaciar _Spam…"
 
-#: ../src/client/application/geary-controller.vala:526
+#: ../src/client/application/geary-controller.vala:542
 msgid "Empty _Trash…"
 msgstr "Vaciar la _papelera…"
 
 #. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:558
+#: ../src/client/application/geary-controller.vala:574
 msgid "Toggle search bar"
 msgstr "Conmutar la barra de búsqueda"
 
 #. No callback is connected, since we bind the toggle button to the find bar visibility
-#: ../src/client/application/geary-controller.vala:563
-#| msgid "Toggle search bar"
+#: ../src/client/application/geary-controller.vala:579
 msgid "Toggle find bar"
 msgstr "Conmutar la barra de búsqueda"
 
-#: ../src/client/application/geary-controller.vala:741
+#: ../src/client/application/geary-controller.vala:757
 msgid "Unable to store server trust exception"
 msgstr "No se pudo almacenar la excepción de seguridad para el servidor"
 
-#: ../src/client/application/geary-controller.vala:976
+#: ../src/client/application/geary-controller.vala:992
 msgid "Your settings are insecure"
 msgstr "Su configuración no es segura"
 
-#: ../src/client/application/geary-controller.vala:977
+#: ../src/client/application/geary-controller.vala:993
 msgid ""
 "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
 "username and password could be read by another person on the network.  Are "
@@ -531,27 +522,29 @@ msgstr ""
 "otra persona podría leer su nombre de usuario y contraseña en la misma red. "
 "¿Está seguro de que quiere hacer esto?"
 
-#: ../src/client/application/geary-controller.vala:978
+#: ../src/client/application/geary-controller.vala:994
 msgid "Co_ntinue"
 msgstr "Co_ntinuar"
 
-#: ../src/client/application/geary-controller.vala:1025
+#: ../src/client/application/geary-controller.vala:1041
 msgid "Error connecting to the server"
 msgstr "Error al conectar al servidor"
 
-#: ../src/client/application/geary-controller.vala:1026
+#: ../src/client/application/geary-controller.vala:1042
 msgid ""
 "Geary encountered an error while connecting to the server.  Please try again "
 "in a few moments."
 msgstr ""
+"Geary ha encontrado un error al conectar al servidor. Inténtelo de nuevo "
+"pasados unos momentos."
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/application/geary-controller.vala:1079
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Error al enviar el mensaje"
 
-#: ../src/client/application/geary-controller.vala:1064
+#: ../src/client/application/geary-controller.vala:1080
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -561,12 +554,12 @@ msgstr ""
 
 #. Displayed in the space-limited status bar when a message fails to be uploaded
 #. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1068
+#: ../src/client/application/geary-controller.vala:1084
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Error al guardar los mensajes enviados"
 
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1085
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -574,19 +567,19 @@ msgstr ""
 "Geary encontró un error al guardar un mensaje enviado en Enviados. El "
 "mensaje permanecerá en la Bandeja de salida hasta que lo elimine."
 
-#: ../src/client/application/geary-controller.vala:1138
+#: ../src/client/application/geary-controller.vala:1154
 msgid "Labels"
 msgstr "Etiquetas"
 
 #. give the user two options: reset the Account local store, or exit Geary.  A third
 #. could be done to leave the Account in an unopened state, but we don't currently
 #. have provisions for that.
-#: ../src/client/application/geary-controller.vala:1150
+#: ../src/client/application/geary-controller.vala:1166
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "No se pudo abrir la base de datos local para %s"
 
-#: ../src/client/application/geary-controller.vala:1151
+#: ../src/client/application/geary-controller.vala:1167
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -611,21 +604,20 @@ msgstr ""
 "Reconstruir la base de datos destruirá todo el correo guardado de forma "
 "local y sus adjuntos. <b>El correo del servidor permanecerá intacto.</b>"
 
-#: ../src/client/application/geary-controller.vala:1153
+#: ../src/client/application/geary-controller.vala:1169
 msgid "_Rebuild"
 msgstr "_Reconstruir"
 
-#: ../src/client/application/geary-controller.vala:1153
+#: ../src/client/application/geary-controller.vala:1169
 msgid "E_xit"
 msgstr "_Salir"
 
-#: ../src/client/application/geary-controller.vala:1162
+#: ../src/client/application/geary-controller.vala:1178
 #, c-format
-#| msgid "Unable to rebuild database for \"%s\""
 msgid "Unable to rebuild database for “%s”"
 msgstr "No se puede reconstruir la base de datos para «%s»"
 
-#: ../src/client/application/geary-controller.vala:1163
+#: ../src/client/application/geary-controller.vala:1179
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -638,14 +630,14 @@ msgstr ""
 
 #. some other problem opening the account ... as with other flow path, can't run
 #. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1185
-#: ../src/client/application/geary-controller.vala:1195
-#: ../src/client/application/geary-controller.vala:1206
+#: ../src/client/application/geary-controller.vala:1201
+#: ../src/client/application/geary-controller.vala:1211
+#: ../src/client/application/geary-controller.vala:1222
 #, c-format
 msgid "Unable to open local mailbox for %s"
 msgstr "No se puede abrir el buzón local para %s"
 
-#: ../src/client/application/geary-controller.vala:1186
+#: ../src/client/application/geary-controller.vala:1202
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -664,13 +656,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1196
-#| msgid ""
-#| "The version number of the local mail database is formatted for a newer "
-#| "version of Geary. Unfortunately, the database cannot be \"rolled back\" "
-#| "to work with this version of Geary.\n"
-#| "\n"
-#| "Please install the latest version of Geary and try again."
+#: ../src/client/application/geary-controller.vala:1212
 msgid ""
 "The version number of the local mail database is formatted for a newer "
 "version of Geary. Unfortunately, the database cannot be “rolled back” to "
@@ -684,7 +670,7 @@ msgstr ""
 "\n"
 "Instale la última versión de Geary e inténtelo de nuevo."
 
-#: ../src/client/application/geary-controller.vala:1207
+#: ../src/client/application/geary-controller.vala:1223
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -696,17 +682,16 @@ msgstr ""
 "\n"
 "Revise su conexión de red y reinicie Geary."
 
-#: ../src/client/application/geary-controller.vala:1982
+#: ../src/client/application/geary-controller.vala:1999
 msgid "Undo move (Ctrl+Z)"
 msgstr "Deshacer mover (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:1992
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:2009
 #| msgid "Are you sure you want to open \"%s\"?"
 msgid "Are you sure you want to open these attachments?"
-msgstr "¿Está seguro de que quiere abrir «%s»?"
+msgstr "¿Está seguro de que quiere abrir estos adjuntos?"
 
-#: ../src/client/application/geary-controller.vala:1993
+#: ../src/client/application/geary-controller.vala:2010
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -714,88 +699,88 @@ msgstr ""
 "Los archivos adjuntos podrían causar daños a su sistema. Abra solo los "
 "archivos que provengan de fuentes fiables."
 
-#: ../src/client/application/geary-controller.vala:1994
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:2011
 #| msgid "Don't _ask me again"
 msgid "Don’t _ask me again"
 msgstr "No volver a _preguntarme"
 
-#: ../src/client/application/geary-controller.vala:2038
-#, fuzzy, c-format
+#: ../src/client/application/geary-controller.vala:2121
+#, c-format
 #| msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Ya existe un archivo llamado «%s». ¿Quiere reemplazarlo?"
 
-#: ../src/client/application/geary-controller.vala:2040
-#, fuzzy, c-format
+#: ../src/client/application/geary-controller.vala:2123
+#, c-format
 #| msgid ""
 #| "The file already exists in \"%s\".  Replacing it will overwrite its "
 #| "contents."
 msgid ""
 "The file already exists in “%s”.  Replacing it will overwrite its contents."
-msgstr "El archivo ya existe en «%s». Reemplazarlo sobrescribirá su contenido."
+msgstr ""
+"El archivo ya existe en «%s». Si lo reemplaza sobrescribirá su contenido."
 
-#: ../src/client/application/geary-controller.vala:2043
+#: ../src/client/application/geary-controller.vala:2126
 msgid "_Replace"
 msgstr "_Reemplazar"
 
 #. Find out what to do with the inline composers.
 #. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2396
+#: ../src/client/application/geary-controller.vala:2374
 msgid "Close open draft messages?"
 msgstr "¿Quiere cerrar los mensajes en borrador abiertos?"
 
-#: ../src/client/application/geary-controller.vala:2518
+#: ../src/client/application/geary-controller.vala:2496
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "¿Quiere eliminar todos los mensajes de la carpeta «%s»?"
 
-#: ../src/client/application/geary-controller.vala:2519
+#: ../src/client/application/geary-controller.vala:2497
 msgid "This removes the email from Geary and your email server."
 msgstr ""
 "Esto eliminará el mensaje de Geary y del servidor de correo electrónico."
 
-#: ../src/client/application/geary-controller.vala:2520
+#: ../src/client/application/geary-controller.vala:2498
 msgid "This cannot be undone."
 msgstr "Esto no se puede deshacer."
 
-#: ../src/client/application/geary-controller.vala:2521
+#: ../src/client/application/geary-controller.vala:2499
 #, c-format
 msgid "Empty %s"
 msgstr "Vaciar %s"
 
-#: ../src/client/application/geary-controller.vala:2538
+#: ../src/client/application/geary-controller.vala:2516
 #, c-format
 msgid "Error emptying %s"
 msgstr "Error al vaciar «%s»"
 
-#: ../src/client/application/geary-controller.vala:2568
+#: ../src/client/application/geary-controller.vala:2546
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "¿Quiere eliminar permanentemente este mensaje?"
 msgstr[1] "¿Quiere eliminar permanentemente estos mensajes?"
 
-#: ../src/client/application/geary-controller.vala:2570
+#: ../src/client/application/geary-controller.vala:2548
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../src/client/application/geary-controller.vala:2602
+#: ../src/client/application/geary-controller.vala:2580
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Deshacer archivado (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2617
+#: ../src/client/application/geary-controller.vala:2595
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Deshacer envío a la papelera (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2671
+#: ../src/client/application/geary-controller.vala:2649
 msgid "Undo (Ctrl+Z)"
 msgstr "Deshacer (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2802
+#: ../src/client/application/geary-controller.vala:2780
 msgid "Failed to open default text editor."
 msgstr "Falló al abrir el editor de textos predeterminado."
 
-#: ../src/client/components/main-window.vala:341
+#: ../src/client/components/main-window.vala:389
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -824,7 +809,6 @@ msgstr "Buscar la cuenta %s"
 
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
 #: ../src/client/components/status-bar.vala:26
-#| msgid "Sending..."
 msgid "Sending…"
 msgstr "Enviando…"
 
@@ -866,7 +850,6 @@ msgstr "_Preferencias"
 
 #: ../src/client/components/stock.vala:28
 #: ../ui/conversation-email-menus.ui.h:7
-#| msgid "_Print..."
 msgid "_Print…"
 msgstr "_Imprimir…"
 
@@ -882,29 +865,44 @@ msgstr "_Eliminar"
 msgid "_Keep"
 msgstr "_Mantener"
 
-#: ../src/client/composer/composer-widget.vala:146
+#: ../src/client/composer/composer-link-popover.vala:150
+msgid "Link URL is not correctly formatted, e.g. http://example.com"
+msgstr "El URL del enlace no tiene el formato correcto, ej. http://ejemplo.com"
+
+#: ../src/client/composer/composer-link-popover.vala:157
+msgid "Invalid link URL"
+msgstr "Enlace a URL no válido"
+
+#: ../src/client/composer/composer-link-popover.vala:157
+#| msgid "Remove email address"
+msgid "Invalid email address"
+msgstr "Dirección correo-e no válida"
+
+#: ../src/client/composer/composer-widget.vala:154
 msgid "Saved"
 msgstr "Guardado"
 
-#: ../src/client/composer/composer-widget.vala:147
+#: ../src/client/composer/composer-widget.vala:155
 msgid "Saving"
 msgstr "Guardando"
 
-#: ../src/client/composer/composer-widget.vala:148
+#: ../src/client/composer/composer-widget.vala:156
 msgid "Error saving"
 msgstr "Error al guardar"
 
-#: ../src/client/composer/composer-widget.vala:149
+#: ../src/client/composer/composer-widget.vala:157
 msgid "Press Backspace to delete quote"
 msgstr "Pulse Retroceso para eliminar la cita"
 
-#: ../src/client/composer/composer-widget.vala:150
+#: ../src/client/composer/composer-widget.vala:158
 msgid "New Message"
 msgstr "Mensaje nuevo"
 
-#. A list of keywords, separated by pipe ("|") characters, that suggest an attachment; since
-#. this is full-word checking, include all variants of each word.  No spaces are allowed.
-#: ../src/client/composer/composer-widget.vala:208
+#. Translators: This is list of keywords, separated by pipe ("|")
+#. characters, that suggest an attachment; since this is full-word
+#. checking, include all variants of each word.  No spaces are
+#. allowed.
+#: ../src/client/composer/composer-widget.vala:167
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -912,54 +910,29 @@ msgstr ""
 "adjuntar|adjuntando|adjunta|anexo|anexar|archivo|archivos|fichero|ficheros|"
 "adjunto|adjuntos|"
 
-#: ../src/client/composer/composer-widget.vala:1192
-#: ../src/client/composer/composer-widget.vala:1196
+#: ../src/client/composer/composer-widget.vala:1122
+#: ../src/client/composer/composer-widget.vala:1141
 msgid "Do you want to discard this message?"
 msgstr "¿Quiere descartar este mensaje?"
 
-#: ../src/client/composer/composer-widget.vala:1363
+#: ../src/client/composer/composer-widget.vala:1245
 msgid "Send message with an empty subject and body?"
 msgstr "¿Quiere enviar el mensaje sin asunto ni cuerpo?"
 
-#: ../src/client/composer/composer-widget.vala:1365
+#: ../src/client/composer/composer-widget.vala:1247
 msgid "Send message with an empty subject?"
 msgstr "¿Quiere enviar el mensaje sin asunto?"
 
-#: ../src/client/composer/composer-widget.vala:1367
+#: ../src/client/composer/composer-widget.vala:1249
 msgid "Send message with an empty body?"
 msgstr "¿Quiere enviar el mensaje sin cuerpo?"
 
-#: ../src/client/composer/composer-widget.vala:1369
+#: ../src/client/composer/composer-widget.vala:1253
 msgid "Send message without an attachment?"
 msgstr "¿Quiere enviar el mensaje sin el archivo adjunto?"
 
-#: ../src/client/composer/composer-widget.vala:1608
+#: ../src/client/composer/composer-widget.vala:1515
 #, c-format
-#| msgid "\"%s\" could not be found."
-msgid "“%s” could not be found."
-msgstr "No se pudo encontrar «%s»."
-
-#: ../src/client/composer/composer-widget.vala:1614
-#, c-format
-#| msgid "\"%s\" is a folder."
-msgid "“%s” is a folder."
-msgstr "«%s» es una carpeta."
-
-#: ../src/client/composer/composer-widget.vala:1620
-#, c-format
-#| msgid "\"%s\" is an empty file."
-msgid "“%s” is an empty file."
-msgstr "«%s» es un archivo vacío."
-
-#: ../src/client/composer/composer-widget.vala:1633
-#, c-format
-#| msgid "\"%s\" could not be opened for reading."
-msgid "“%s” could not be opened for reading."
-msgstr "No se pudo abrir «%s» para lectura."
-
-#: ../src/client/composer/composer-widget.vala:1640
-#, c-format
-#| msgid "\"%s\" already attached for delivery."
 msgid "“%s” already attached for delivery."
 msgstr "Ya se ha adjuntado «%s» para enviarlo."
 
@@ -968,68 +941,85 @@ msgstr "Ya se ha adjuntado «%s» para enviarlo."
 #. description of the document type, the second will
 #. be a human-friendly size string. For example:
 #. Document (100.9MB)
-#: ../src/client/composer/composer-widget.vala:1648
-#: ../src/client/conversation-viewer/conversation-email.vala:145
+#: ../src/client/composer/composer-widget.vala:1523
+#: ../src/client/conversation-viewer/conversation-email.vala:138
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/client/composer/composer-widget.vala:1667
+#: ../src/client/composer/composer-widget.vala:1560
+#, c-format
+msgid "“%s” could not be found."
+msgstr "No se pudo encontrar «%s»."
+
+#: ../src/client/composer/composer-widget.vala:1566
+#, c-format
+msgid "“%s” is a folder."
+msgstr "«%s» es una carpeta."
+
+#: ../src/client/composer/composer-widget.vala:1572
+#, c-format
+msgid "“%s” is an empty file."
+msgstr "«%s» es un archivo vacío."
+
+#: ../src/client/composer/composer-widget.vala:1585
+#, c-format
+msgid "“%s” could not be opened for reading."
+msgstr "No se pudo abrir «%s» para lectura."
+
+#: ../src/client/composer/composer-widget.vala:1593
 msgid "Cannot add attachment"
 msgstr "No se puede adjuntar el archivo"
 
-#: ../src/client/composer/composer-widget.vala:1712
+#: ../src/client/composer/composer-widget.vala:1645
 msgid "To: "
 msgstr "Para: "
 
-#: ../src/client/composer/composer-widget.vala:1715
+#: ../src/client/composer/composer-widget.vala:1648
 msgid "Cc: "
 msgstr "Cc: "
 
-#: ../src/client/composer/composer-widget.vala:1718
+#: ../src/client/composer/composer-widget.vala:1651
 msgid "Bcc: "
 msgstr "Cco: "
 
-#: ../src/client/composer/composer-widget.vala:1721
+#: ../src/client/composer/composer-widget.vala:1654
 msgid "Reply-To: "
 msgstr "Responder a:"
 
-#: ../src/client/composer/composer-widget.vala:1909
+#: ../src/client/composer/composer-widget.vala:1786
 msgid "Select Color"
 msgstr "Seleccionar color"
 
-#: ../src/client/composer/composer-widget.vala:2124
-msgid "_Inspect"
-msgstr "_Inspeccionar"
-
 #. Displayed in the From dropdown to indicate an "alternate email address"
 #. for an account.  The first printf argument will be the alternate email
 #. address, and the second will be the account's primary email address.
-#: ../src/client/composer/composer-widget.vala:2305
+#: ../src/client/composer/composer-widget.vala:1986
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s mediante %2$s"
 
 #. Composer label (with mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2347
+#: ../src/client/composer/composer-widget.vala:2028
 msgid "_From:"
 msgstr "_De:"
 
-#: ../src/client/composer/composer-widget.vala:2422
-#, c-format
-#| msgid "%s - Conversation Inspector"
-msgid "%s — Composer Inspector"
-msgstr "%s: inspector de conversaciones"
-
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: ../src/client/composer/composer-widget.vala:2462
-#| msgid "Show Images"
+#: ../src/client/composer/composer-widget.vala:2252
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../src/client/composer/spell-check-popover.vala:210
+#: ../src/client/composer/spell-check-popover.vala:117
+msgid "Remove this language from the preferred list"
+msgstr "Quitar este idioma de la lista de favoritos"
+
+#: ../src/client/composer/spell-check-popover.vala:121
+msgid "Add this language to the preferred list"
+msgstr "Añadir este idioma de la lista de favoritos"
+
+#: ../src/client/composer/spell-check-popover.vala:217
 msgid "Search for more languages"
 msgstr "Buscar más idiomas"
 
@@ -1041,73 +1031,70 @@ msgstr "Yo"
 #. attachments with unknown file types.
 #: ../src/client/conversation-viewer/conversation-email.vala:124
 msgid "Unknown"
-msgstr ""
+msgstr "Desconocido"
 
 #. Preview headers
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: ../src/client/conversation-viewer/conversation-message.vala:360
+#: ../src/client/conversation-viewer/conversation-message.vala:331
 msgid "No sender"
-msgstr ""
+msgstr "Sin remitente"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the header preview for a message.
-#: ../src/client/conversation-viewer/conversation-message.vala:720
+#: ../src/client/conversation-viewer/conversation-message.vala:586
 msgid ", "
 msgstr ", "
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-message.vala:1228
-msgid " (Invalid?)"
-msgstr " (¿No válido?)"
+#. Translators: This string is used as the HTML IMG ALT
+#. attribute value when displaying an inline image in an email
+#. that did not specify a file name. E.g. <IMG ALT="Image" ...
+#: ../src/client/conversation-viewer/conversation-message.vala:707
+#| msgid "Images"
+msgid "Image"
+msgstr "Imagen"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:73
-#| msgid "No conversations selected."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:72
 msgid "No conversations selected"
 msgstr "No hay ninguna conversación seleccionada."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:75
+#: ../src/client/conversation-viewer/conversation-viewer.vala:74
 msgid "Selecting a conversation from the list will display it here"
-msgstr ""
+msgstr "Al seleccionar una conversación de la lista se mostrará aquí"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:80
-#| msgid "%u conversation selected."
-#| msgid_plural "%u conversations selected."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:79
 msgid "Multiple conversations selected"
 msgstr "Varias conversaciones seleccionadas"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:82
+#: ../src/client/conversation-viewer/conversation-viewer.vala:81
 msgid "Choosing an action will apply to all selected conversations"
 msgstr ""
+"Al elegir una acción ésta se aplicará a todas las conversaciones "
+"seleccionadas"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:87
-#: ../src/client/conversation-viewer/conversation-viewer.vala:94
-#, fuzzy
+#: ../src/client/conversation-viewer/conversation-viewer.vala:86
+#: ../src/client/conversation-viewer/conversation-viewer.vala:93
 #| msgid "No conversations in folder."
 msgid "No conversations found"
-msgstr "No hay conversaciones en la carpeta."
+msgstr "No se han encontrado conversaciones"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:89
+#: ../src/client/conversation-viewer/conversation-viewer.vala:88
 msgid "This folder does not contain any conversations"
-msgstr ""
+msgstr "Esta carpeta no contiene conversaciones"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:96
+#: ../src/client/conversation-viewer/conversation-viewer.vala:95
 msgid "Your search returned no results, try refining your search terms"
 msgstr ""
+"La búsqueda no ha devuelto resultados, intente refinar los términos de la "
+"búsqueda"
 
-#: ../src/client/conversation-viewer/conversation-web-view.vala:198
-#, c-format
-#| msgid "%s - Conversation Inspector"
-msgid "%s — Conversation Inspector"
-msgstr "%s: inspector de conversaciones"
-
-#: ../src/client/dialogs/attachment-dialog.vala:24
-#: ../src/client/dialogs/attachment-dialog.vala:26
+#: ../src/client/dialogs/attachment-dialog.vala:28
+#: ../src/client/dialogs/attachment-dialog.vala:30
 msgid "Choose a file"
 msgstr "Elija un archivo"
 
-#: ../src/client/dialogs/attachment-dialog.vala:24
-#: ../src/client/dialogs/attachment-dialog.vala:26
+#: ../src/client/dialogs/attachment-dialog.vala:28
+#: ../src/client/dialogs/attachment-dialog.vala:30
 msgid "_Attach"
 msgstr "_Adjuntar"
 
@@ -1122,9 +1109,6 @@ msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr "No se pudo comprobar la identidad del servidor de correo %s en %s:%u."
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:44
-#| msgid ""
-#| "Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-#| "your username and password to be transmitted insecurely."
 msgid ""
 "Selecting “Trust This Server” or “Always Trust This Server” may cause your "
 "username and password to be transmitted insecurely."
@@ -1134,9 +1118,6 @@ msgstr ""
 "servidor»."
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:52
-#| msgid ""
-#| "Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-#| "server."
 msgid ""
 "Selecting “Don’t Trust This Server” will cause Geary not to access this "
 "server."
@@ -1149,9 +1130,6 @@ msgid "Geary will not add or update this email account."
 msgstr "Geary no añadirá ni actualizará esta cuenta de correo electrónico."
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:59
-#| msgid ""
-#| "Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-#| "this account."
 msgid ""
 "Selecting “Don’t Trust This Server” will cause Geary to stop accessing this "
 "account."
@@ -1172,38 +1150,31 @@ msgstr ""
 "servicio de correo electrónico si tiene dudas con respecto a estos problemas."
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:73
-#| msgid "The server's certificate is not signed by a known authority"
 msgid "The server’s certificate is not signed by a known authority"
 msgstr "El certificado del servidor no está firmado por una autoridad conocida"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:76
-#| msgid "The server's identity does not match the identity in the certificate"
 msgid "The server’s identity does not match the identity in the certificate"
 msgstr ""
 "La identidad del servidor no coincide con la identidad en el certificado"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:79
-#| msgid "The server's certificate has expired"
 msgid "The server’s certificate has expired"
 msgstr "El certificado del servidor ha caducado"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:82
-#| msgid "The server's certificate has not been activated"
 msgid "The server’s certificate has not been activated"
 msgstr "No se ha activado el certificado del servidor"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:85
-#| msgid "The server's certificate has been revoked and is now invalid"
 msgid "The server’s certificate has been revoked and is now invalid"
 msgstr "Se ha revocado el certificado del servidor y ya no es válido"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:88
-#| msgid "The server's certificate is considered insecure"
 msgid "The server’s certificate is considered insecure"
 msgstr "El certificado del servidor se considera inseguro"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:91
-#| msgid "An error has occurred processing the server's certificate"
 msgid "An error has occurred processing the server’s certificate"
 msgstr "Ocurrió un error al procesar el certificado del servidor"
 
@@ -1251,7 +1222,6 @@ msgstr[1] "%d resultados"
 
 #: ../src/client/notification/libmessagingmenu.vala:75
 #, c-format
-#| msgid "%s - New Messages"
 msgid "%s — New Messages"
 msgstr "%s: mensajes nuevos"
 
@@ -1369,7 +1339,7 @@ msgid "%A"
 msgstr "%A"
 
 #: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:907
+#: ../src/engine/rfc822/rfc822-message.vala:908
 msgid "(no subject)"
 msgstr "(sin asunto)"
 
@@ -1695,66 +1665,61 @@ msgstr "Archivo | Archivos"
 
 #. / Format for the datetime that a message being replied to was received
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/engine/rfc822/rfc822-utils.vala:215
+#: ../src/engine/rfc822/rfc822-utils.vala:236
 msgid "%a, %b %-e, %Y at %-l:%M %p"
 msgstr "%a, %-e de %b %Y a las %-l:%M %p"
 
 #. / The quoted header for a message being replied to.
 #. / %1$s will be substituted for the date, and %2$s will be substituted for
 #. / the original sender.
-#: ../src/engine/rfc822/rfc822-utils.vala:221
+#: ../src/engine/rfc822/rfc822-utils.vala:242
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr "El %1$s, %2$s escribió:"
 
 #. / The quoted header for a message being replied to (in case the date is not known).
 #. / %s will be replaced by the original sender.
-#: ../src/engine/rfc822/rfc822-utils.vala:228
+#: ../src/engine/rfc822/rfc822-utils.vala:249
 #, c-format
 msgid "%s wrote:"
 msgstr "%s escribió:"
 
 #. / The quoted header for a message being replied to (in case the sender is not known).
 #. / %s will be replaced by the original date
-#: ../src/engine/rfc822/rfc822-utils.vala:234
+#: ../src/engine/rfc822/rfc822-utils.vala:255
 #, c-format
 msgid "On %s:"
 msgstr "El %s:"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
+#: ../src/engine/rfc822/rfc822-utils.vala:278
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Mensaje reenviado ----------"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
+#: ../src/engine/rfc822/rfc822-utils.vala:282
 #, c-format
 msgid "From: %s\n"
 msgstr "De: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
+#: ../src/engine/rfc822/rfc822-utils.vala:283
 #, c-format
 msgid "Subject: %s\n"
 msgstr "Asunto: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
+#: ../src/engine/rfc822/rfc822-utils.vala:284
 #, c-format
 msgid "Date: %s\n"
 msgstr "Fecha: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
+#: ../src/engine/rfc822/rfc822-utils.vala:287
 #, c-format
 msgid "To: %s\n"
 msgstr "Para: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
+#: ../src/engine/rfc822/rfc822-utils.vala:290
 #, c-format
 msgid "Cc: %s\n"
 msgstr "Cc: %s\n"
 
-#. / Placeholder filename for attachments with no filename.
-#: ../src/engine/rfc822/rfc822-utils.vala:364
-msgid "none"
-msgstr "sin nombre"
-
 #: ../ui/account_cannot_remove.glade.h:1
 msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
 msgstr ""
@@ -1797,7 +1762,6 @@ msgid "_Trust This Server"
 msgstr "_Confiar en este servidor"
 
 #: ../ui/certificate_warning_dialog.glade.h:4
-#| msgid "_Don't Trust This Server"
 msgid "_Don’t Trust This Server"
 msgstr "_No confiar en este servidor"
 
@@ -1829,6 +1793,31 @@ msgstr "Descartar y cerrar"
 msgid "Save and Close"
 msgstr "Guardar y cerrar"
 
+#. Note that this button and the Update button will never be shown at the same time to the user.
+#: ../ui/composer-link-popover.ui.h:2
+msgid "Insert the new link with this URL"
+msgstr "Insertar el enlace nuevo con este URL"
+
+#: ../ui/composer-link-popover.ui.h:3
+msgid "Link URL"
+msgstr "Enlazar URL"
+
+#. Note that this button and the Insert button will never be shown at the same time to the user.
+#: ../ui/composer-link-popover.ui.h:5
+msgid "Update this link’s URL"
+msgstr "Actualizar el URL de este enlace"
+
+#: ../ui/composer-link-popover.ui.h:6
+#| msgctxt "Outlook localised name"
+#| msgid "Deleted Items"
+msgid "Delete this link"
+msgstr "Eliminar este enlace"
+
+#: ../ui/composer-link-popover.ui.h:7
+#| msgid "_Open Link"
+msgid "Open this link"
+msgstr "Abrir este enlace"
+
 #: ../ui/composer-menus.ui.h:1
 msgid "S_ans Serif"
 msgstr "S_ans serif"
@@ -1882,22 +1871,22 @@ msgid "_Copy"
 msgstr "_Copiar"
 
 #: ../ui/composer-menus.ui.h:14
-msgid "Copy _Link"
-msgstr "Copiar en_lace"
-
-#: ../ui/composer-menus.ui.h:15
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../ui/composer-menus.ui.h:16
+#: ../ui/composer-menus.ui.h:15
 msgctxt "Clipboard paste with rich text"
 msgid "Paste _With Formatting"
 msgstr "Pegar con _formato"
 
-#: ../ui/composer-menus.ui.h:17
+#: ../ui/composer-menus.ui.h:16
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
+#: ../ui/composer-menus.ui.h:17 ../ui/conversation-message-menus.ui.h:9
+msgid "_Inspect…"
+msgstr "_Inspeccionar…"
+
 #. Address(es) e-mail is to be sent to
 #: ../ui/composer-widget.ui.h:2
 msgid "_To"
@@ -1933,78 +1922,84 @@ msgid "To add them as attachments"
 msgstr "Para añadirlos como adjuntos"
 
 #: ../ui/composer-widget.ui.h:11
+#| msgid "Undo trash (Ctrl+Z)"
+msgid "Undo last edit (Ctrl+Z)"
+msgstr "Deshacer la última edición (Ctrl+Z)"
+
+#: ../ui/composer-widget.ui.h:12
+msgid "Redo last edit  (Ctrl+Shift+Z)"
+msgstr "Rehacer la última edición  (Ctrl+Mayús+Z)"
+
+#: ../ui/composer-widget.ui.h:13
 msgid "Bold (Ctrl+B)"
 msgstr "Negrita (Ctrl+B)"
 
-#: ../ui/composer-widget.ui.h:12
+#: ../ui/composer-widget.ui.h:14
 msgid "Italic (Ctrl+I)"
 msgstr "Cursiva (Ctrl+I)"
 
-#: ../ui/composer-widget.ui.h:13
+#: ../ui/composer-widget.ui.h:15
 msgid "Underline (Ctrl+U)"
 msgstr "Subrayado (Ctrl+U)"
 
-#: ../ui/composer-widget.ui.h:14
+#: ../ui/composer-widget.ui.h:16
 msgid "Strikethrough (Ctrl+K)"
 msgstr "Tachado (Ctrl+K)"
 
-#: ../ui/composer-widget.ui.h:15
+#: ../ui/composer-widget.ui.h:17
 msgid "Quote text  (Ctrl+])"
 msgstr "Citar el texto  (Ctrl+])"
 
-#: ../ui/composer-widget.ui.h:16
-#| msgid "Unquote text (Ctrl+[)"
+#: ../ui/composer-widget.ui.h:18
 msgid "Unquote text  (Ctrl+[)"
 msgstr "Eliminar cita del texto (Ctrl+[)"
 
-#: ../ui/composer-widget.ui.h:17
-msgid "Link (Ctrl+L)"
-msgstr "Enlace (Ctr+L)"
-
-#: ../ui/composer-widget.ui.h:18
-#| msgid "Italic (Ctrl+I)"
-msgid "Image (Ctrl+G)"
-msgstr "Imagen (Ctrl+G)"
-
 #: ../ui/composer-widget.ui.h:19
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Quitar formato (Ctrl+Espacio)"
+msgid "Insert or update selection link (Ctrl+L)"
+msgstr "Insertar o actualizar el enlace seleccionado (Ctrl+L)"
 
 #: ../ui/composer-widget.ui.h:20
-msgid "Select spell checking language"
+#| msgid "Image (Ctrl+G)"
+msgid "Insert an image (Ctrl+G)"
+msgstr "Insertar una imagen (Ctrl+G)"
+
+#: ../ui/composer-widget.ui.h:21
+#| msgid "Remove formatting (Ctrl+Space)"
+msgid "Remove selection formatting (Ctrl+Space)"
+msgstr "Quitar formato de la selección (Ctrl+Espacio)"
+
+#: ../ui/composer-widget.ui.h:22
+#| msgid "Select spell checking language"
+msgid "Select spell checking languages"
 msgstr "Seleccione el idioma de la revisión ortográfica"
 
 #: ../ui/conversation-email.ui.h:1
-#| msgid "Save All A_ttachments..."
 msgid "Save all attachments"
 msgstr "Guardar todos los adjuntos"
 
 #. Note: The application will never show this button at the same time as unstar_button, one will always be hidden.
 #: ../ui/conversation-email.ui.h:3
 msgid "Mark this message as starred"
-msgstr ""
+msgstr "Marcar este mensaje como favorito"
 
 #. Note: The application will never show this button at the same time as star_button, one will always be hidden.
 #: ../ui/conversation-email.ui.h:5
 msgid "Mark this message as not starred"
-msgstr ""
+msgstr "Marcar este mensaje como no favorito"
 
 #: ../ui/conversation-email.ui.h:6
 msgid "Display the message menu"
-msgstr ""
+msgstr "Mostrar el menú de mensajes"
 
 #: ../ui/conversation-email.ui.h:7
-#| msgid "Cannot add attachment"
 msgid "Open selected attachments"
 msgstr "Abrir los adjuntos seleccionados"
 
 #: ../ui/conversation-email.ui.h:8
-#| msgid "Save All A_ttachments..."
 msgid "Save selected attachments"
 msgstr "Guardar los adjuntos seleccionados"
 
 #: ../ui/conversation-email.ui.h:9
-#| msgid "Save All A_ttachments..."
 msgid "Select all attachments"
 msgstr "Guardar todos los adjuntos"
 
@@ -2013,17 +2008,15 @@ msgid "Edit Draft"
 msgstr "Editar borrador"
 
 #: ../ui/conversation-email.ui.h:11
-#, fuzzy
 #| msgid "%u read message"
 #| msgid_plural "%u read messages"
 msgid "Draft message"
-msgstr "%u mensaje leído"
+msgstr "Borrador"
 
 #: ../ui/conversation-email.ui.h:12
-#, fuzzy
 #| msgid "This message contains remote images."
 msgid "This message has not yet been sent."
-msgstr "Este mensaje contiene imágenes remotas."
+msgstr "Este mensaje no se ha enviado todavía."
 
 #: ../ui/conversation-email.ui.h:13
 msgid "Try Again"
@@ -2034,22 +2027,20 @@ msgid "Message not saved"
 msgstr "Mensaje no guardado"
 
 #: ../ui/conversation-email.ui.h:15
-#, fuzzy
 #| msgid "This message was sent successfully, but could not be saved to %s."
 msgid "This message was sent, but has not been saved to your account."
-msgstr "Este mensaje se envió correctamente pero no se pudo guardar en %s."
+msgstr ""
+"Este mensaje se envió correctamente pero no se ha guardado en su cuenta."
 
 #: ../ui/conversation-email-menus.ui.h:2
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
 #: ../ui/conversation-email-menus.ui.h:4
-#| msgid "_Mark as Read"
 msgid "_Mark Read"
 msgstr "_Marcar como leído"
 
 #: ../ui/conversation-email-menus.ui.h:5
-#| msgid "_Mark as Unread"
 msgid "_Mark Unread"
 msgstr "_Marcar como no leído"
 
@@ -2062,13 +2053,41 @@ msgid "_View Source"
 msgstr "_Ver código fuente"
 
 #: ../ui/conversation-email-menus.ui.h:11
-#| msgid "_Save"
 msgid "_Save All"
 msgstr "Guardar _todo"
 
+#: ../ui/conversation-message-menus.ui.h:1
+msgid "_Open Link"
+msgstr "A_brir enlace"
+
+#: ../ui/conversation-message-menus.ui.h:2
+msgid "Copy Link _Address"
+msgstr "Copiar enlace a la _dirección"
+
+#: ../ui/conversation-message-menus.ui.h:3
+msgid "Send New _Message…"
+msgstr "Enviar _mensaje nuevo…"
+
+#: ../ui/conversation-message-menus.ui.h:4
+msgid "Copy Email _Address"
+msgstr "Copiar dirección de _correo"
+
+#: ../ui/conversation-message-menus.ui.h:5
+msgid "Save _Image As…"
+msgstr "_Guardar imagen como…"
+
+#: ../ui/conversation-message-menus.ui.h:6
+msgid "_Select All"
+msgstr "Seleccionar _todo"
+
+#: ../ui/conversation-message-menus.ui.h:8
+#| msgid "Search for more languages"
+msgid "Search for messages from"
+msgstr "Buscar mensajes de"
+
 #: ../ui/conversation-message.ui.h:1
 msgid "From <email>"
-msgstr ""
+msgstr "De <correo>"
 
 #: ../ui/conversation-message.ui.h:2
 msgid "1/1/1970\t"
@@ -2076,19 +2095,17 @@ msgstr "1/1/1970\t"
 
 #: ../ui/conversation-message.ui.h:3
 msgid "Preview body text."
-msgstr ""
+msgstr "Vista previa del texto del cuerpo"
 
 #: ../ui/conversation-message.ui.h:4
 msgid "Sent by:"
 msgstr "Enviado por:"
 
 #: ../ui/conversation-message.ui.h:5
-#| msgid "Reply-To: "
 msgid "Reply to:"
 msgstr "Responder a:"
 
 #: ../ui/conversation-message.ui.h:6
-#| msgid "Subject:"
 msgid "Subject"
 msgstr "Asunto"
 
@@ -2118,72 +2135,42 @@ msgstr "Imágenes remotas no mostradas"
 
 #: ../ui/conversation-message.ui.h:13
 msgid "Only show remote images from senders you trust."
-msgstr ""
+msgstr "Mostrar sólo las imágenes remotas de los remitentes en los que confíe"
 
 #: ../ui/conversation-message.ui.h:14
-#| msgid "This link appears to go to"
-msgid "This link appears to go to:"
-msgstr "Parece que este enlace apunta a:"
-
-#: ../ui/conversation-message.ui.h:15
-#| msgid "but actually goes to"
 msgid "But actually goes to:"
 msgstr "Pero en realidad apunta a:"
 
-#: ../ui/conversation-message-menus.ui.h:1
-#| msgid "_Open"
-msgid "_Open Link"
-msgstr "A_brir enlace"
+#: ../ui/conversation-message.ui.h:15
+#| msgid "This link appears to go to:"
+msgid "The link appears to go to:"
+msgstr "Parece que este enlace apunta a:"
 
-#: ../ui/conversation-message-menus.ui.h:2
-#| msgid "Copy _Email Address"
-msgid "Copy Link _Address"
-msgstr "Copiar enlace a la _dirección"
+#: ../ui/conversation-message.ui.h:16
+msgid "Deceptive link found"
+msgstr "Enlace engañoso encontrado"
 
-#: ../ui/conversation-message-menus.ui.h:3
-#| msgid "New Message"
-msgid "Send New _Message…"
-msgstr "Enviar _mensaje nuevo…"
+#: ../ui/conversation-message.ui.h:17
+msgid "The email sender may be leading you to the wrong web site."
+msgstr ""
+"El remitente del correo puede estar llevándole a un sitio web incorrecto."
 
-#: ../ui/conversation-message-menus.ui.h:4
-#| msgid "Copy _Email Address"
-msgid "Copy Email _Address"
-msgstr "Copiar dirección de _correo"
-
-#: ../ui/conversation-message-menus.ui.h:5
-#| msgid "_Save Image As..."
-msgid "Save _Image As…"
-msgstr "_Guardar imagen como…"
-
-#: ../ui/conversation-message-menus.ui.h:6
-#| msgid "Select _All"
-msgid "_Select All"
-msgstr "Seleccionar _todo"
-
-#: ../ui/conversation-message-menus.ui.h:8
-#, fuzzy
-#| msgid "Search for more languages"
-msgid "Search for messages from"
-msgstr "Buscar más idiomas"
-
-#: ../ui/conversation-message-menus.ui.h:9
-#| msgid "_Inspect"
-msgid "_Inspect…"
-msgstr "_Inspeccionar…"
+#: ../ui/conversation-message.ui.h:18
+msgid "If unsure, contact the sender and ask before continuing."
+msgstr "Si no está seguro, pregunte con el remitente antes de continuar."
 
 #: ../ui/conversation-viewer.ui.h:1
-#, fuzzy
 #| msgid "Mark conversation"
 msgid "Find in conversation"
-msgstr "Marcar conversación"
+msgstr "Buscar en la conversación"
 
 #: ../ui/conversation-viewer.ui.h:2
 msgid "Find the previous occurrence of the search string."
-msgstr ""
+msgstr "Busca la aparición anterior de la cadena de búsqueda."
 
 #: ../ui/conversation-viewer.ui.h:3
 msgid "Find the next occurrence of the search string."
-msgstr ""
+msgstr "Busca la siguiente aparición de la cadena de búsqueda."
 
 #: ../ui/edit_alternate_emails.glade.h:1
 msgid "Remove email address"
@@ -2223,10 +2210,9 @@ msgid "label"
 msgstr "etiqueta"
 
 #: ../ui/gtk/help-overlay.ui.h:1
-#, fuzzy
 #| msgid "%s - Conversation Inspector"
 msgid "Conversation Shortcuts"
-msgstr "%s: inspector de conversaciones"
+msgstr "Atajos de conversaciones"
 
 #: ../ui/gtk/help-overlay.ui.h:2
 msgctxt "shortcut window"
@@ -2236,28 +2222,25 @@ msgstr "General"
 #: ../ui/gtk/help-overlay.ui.h:3
 msgctxt "shortcut window"
 msgid "Move focus to the next/previous pane"
-msgstr ""
+msgstr "Mover el foco al panel siguiente/anterior"
 
 #: ../ui/gtk/help-overlay.ui.h:4
-#, fuzzy
 #| msgid "Move conversations"
 msgctxt "shortcut window"
 msgid "Move focus to conversation list"
-msgstr "Mover conversaciones"
+msgstr "Mover el foco a lista de conversaciones"
 
 #: ../ui/gtk/help-overlay.ui.h:5
-#, fuzzy
 #| msgid "Use %s to open a new composer window"
 msgctxt "shortcut window"
 msgid "Detach composer window"
-msgstr "Usar %s para abrir una ventana nueva del editor"
+msgstr "Desacoplar la ventana del editor"
 
 #: ../ui/gtk/help-overlay.ui.h:6
-#, fuzzy
 #| msgid "Use %s to open a new composer window"
 msgctxt "shortcut window"
 msgid "Close composer window"
-msgstr "Usar %s para abrir una ventana nueva del editor"
+msgstr "Cerrar la ventana del editor"
 
 #: ../ui/gtk/help-overlay.ui.h:7
 msgctxt "shortcut window"
@@ -2265,7 +2248,6 @@ msgid "Show keyboard shortcuts"
 msgstr "Mostrar los atajos de teclado"
 
 #: ../ui/gtk/help-overlay.ui.h:8
-#| msgid "Show Images"
 msgctxt "shortcut window"
 msgid "Show help"
 msgstr "Mostrar la ayuda"
@@ -2276,7 +2258,6 @@ msgid "Quit the application"
 msgstr "Salir de la aplicación"
 
 #: ../ui/gtk/help-overlay.ui.h:10
-#| msgid "Search"
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "Buscar"
@@ -2287,7 +2268,6 @@ msgid "Jump to search box"
 msgstr "Enfocar el cuadro de búsqueda"
 
 #: ../ui/gtk/help-overlay.ui.h:12
-#| msgid "Add label to conversation"
 msgctxt "shortcut window"
 msgid "Find in current conversation"
 msgstr "Buscar en la conversación actual"
@@ -2295,40 +2275,34 @@ msgstr "Buscar en la conversación actual"
 #: ../ui/gtk/help-overlay.ui.h:13
 msgctxt "shortcut window"
 msgid "Find next/previous in current conversation"
-msgstr ""
+msgstr "Buscar siguiente/anterior en la conversación actual"
 
 #: ../ui/gtk/help-overlay.ui.h:14
-#| msgid "Notifications"
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "Acciones"
 
 #: ../ui/gtk/help-overlay.ui.h:15
-#| msgid "Compose Message"
 msgctxt "shortcut window"
 msgid "Compose a new message"
 msgstr "Redactar un mensaje nuevo"
 
 #: ../ui/gtk/help-overlay.ui.h:16
-#| msgid "Reply to _All"
 msgctxt "shortcut window"
 msgid "Reply to sender "
 msgstr "Responder al remitente "
 
 #: ../ui/gtk/help-overlay.ui.h:17
-#| msgid "Reply to _All"
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "Responder a todos"
 
 #: ../ui/gtk/help-overlay.ui.h:18
-#| msgid "_Forward"
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "Reenviar"
 
 #: ../ui/gtk/help-overlay.ui.h:19
-#| msgid "Archive"
 msgctxt "shortcut window"
 msgid "Archive"
 msgstr "Archivar"
@@ -2339,31 +2313,26 @@ msgid "Move to trash"
 msgstr "Mover a la papelera"
 
 #: ../ui/gtk/help-overlay.ui.h:21
-#| msgid "Toggle search bar"
 msgctxt "shortcut window"
 msgid "Toggle spam"
 msgstr "Marcar o desmarcar como «spam»"
 
 #: ../ui/gtk/help-overlay.ui.h:22
-#| msgid "Move conversation"
 msgctxt "shortcut window"
 msgid "Move the conversation"
 msgstr "Mover la conversación"
 
 #: ../ui/gtk/help-overlay.ui.h:23
-#| msgid "Delete conversation"
 msgctxt "shortcut window"
 msgid "Label the conversation"
 msgstr "Etiquetar la conversación"
 
 #: ../ui/gtk/help-overlay.ui.h:24
-#| msgid "Mark as _Unread"
 msgctxt "shortcut window"
 msgid "Mark read"
 msgstr "Marcar como leído"
 
 #: ../ui/gtk/help-overlay.ui.h:25
-#| msgid "Mark as _Unread"
 msgctxt "shortcut window"
 msgid "Mark unread"
 msgstr "Marcar como no leído"
@@ -2394,25 +2363,21 @@ msgid "Additional Shortcuts"
 msgstr "Atajos adicionales"
 
 #: ../ui/gtk/help-overlay.ui.h:31
-#| msgid "_Star"
 msgctxt "shortcut window"
 msgid "Star"
 msgstr "Destacar"
 
 #: ../ui/gtk/help-overlay.ui.h:32
-#| msgid "U_nstar"
 msgctxt "shortcut window"
 msgid "Unstar"
 msgstr "Quitar el destaque"
 
 #: ../ui/gtk/help-overlay.ui.h:33
-#| msgid "Delete"
 msgctxt "shortcut window"
 msgid "Delete"
 msgstr "Eliminar"
 
 #: ../ui/gtk/help-overlay.ui.h:34
-#| msgid "Delete conversation"
 msgctxt "shortcut window"
 msgid "Jump to next (older) conversation"
 msgstr "Ir a la siguiente conversación (más antigua)"
@@ -2420,40 +2385,33 @@ msgstr "Ir a la siguiente conversación (más antigua)"
 #: ../ui/gtk/help-overlay.ui.h:35
 msgctxt "shortcut window"
 msgid "Jump to previous (newer) conversation"
-msgstr ""
+msgstr "Ir a la conversación anterior (más reciente)"
 
 #: ../ui/gtk/help-overlay.ui.h:36
-#| msgid "Composer"
 msgid "Composer Shortcuts"
 msgstr "Atajos del editor"
 
 #: ../ui/gtk/help-overlay.ui.h:37
-#| msgid "Quote text  (Ctrl+])"
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "Citar el texto"
 
 #: ../ui/gtk/help-overlay.ui.h:38
-#| msgid "Unquote text (Ctrl+[)"
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "Eliminar cita del texto"
 
 #: ../ui/gtk/help-overlay.ui.h:39
-#| msgid "Send"
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "Enviar"
 
 #: ../ui/gtk/help-overlay.ui.h:40
-#| msgctxt "Search operator"
-#| msgid "attachment"
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "Añadir un adjunto"
 
 #: ../ui/gtk/help-overlay.ui.h:41
-#| msgid "_Rich Text"
 msgctxt "shortcut window"
 msgid "Rich text mode"
 msgstr "Texto enriquecido"
@@ -2469,7 +2427,6 @@ msgid "Italicize text"
 msgstr "Texto en cursiva"
 
 #: ../ui/gtk/help-overlay.ui.h:44
-#| msgid "Underline (Ctrl+U)"
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Subrayar el texto"
@@ -2485,7 +2442,6 @@ msgid "Insert a link"
 msgstr "Insertar un enlace"
 
 #: ../ui/gtk/help-overlay.ui.h:47
-#| msgid "Remove formatting (Ctrl+Space)"
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Eliminar el formato"
@@ -2622,7 +2578,7 @@ msgstr "No se _requiere autenticación"
 msgid "Use IMAP cre_dentials"
 msgstr "Utilizar cre_denciales IMAP"
 
-#: ../ui/login.glade.h:34 ../ui/preferences.glade.h:5
+#: ../ui/login.glade.h:34
 msgid "Composer"
 msgstr "Redactor"
 
@@ -2662,47 +2618,43 @@ msgstr "_Recordar la contraseña"
 msgid "_Authenticate"
 msgstr "_Autenticar"
 
-#: ../ui/preferences.glade.h:1
+#: ../ui/preferences-dialog.ui.h:1
 msgid "Reading"
 msgstr "Lectura"
 
-#: ../ui/preferences.glade.h:2
+#: ../ui/preferences-dialog.ui.h:2
 msgid "_Automatically select next message"
 msgstr "Seleccionar el siguiente mensaje _automáticamente"
 
-#: ../ui/preferences.glade.h:3
+#: ../ui/preferences-dialog.ui.h:3
 msgid "_Display conversation preview"
 msgstr "_Mostrar la vista previa de la conversación"
 
-#: ../ui/preferences.glade.h:4
+#: ../ui/preferences-dialog.ui.h:4
 msgid "Use _three pane view"
 msgstr "Usar vista de _tres paneles"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Activar corrección _ortográfica"
-
-#: ../ui/preferences.glade.h:7
+#: ../ui/preferences-dialog.ui.h:5
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: ../ui/preferences.glade.h:8
+#: ../ui/preferences-dialog.ui.h:6
 msgid "_Play notification sounds"
 msgstr "_Reproducir un sonido para las notificaciones"
 
-#: ../ui/preferences.glade.h:9
+#: ../ui/preferences-dialog.ui.h:7
 msgid "Show _notifications for new mail"
 msgstr "Mostrar _notificaciones cuando llegue correo nuevo"
 
-#: ../ui/preferences.glade.h:10
+#: ../ui/preferences-dialog.ui.h:8
 msgid "Always _watch for new mail"
 msgstr "_Revisar siempre si hay mensajes nuevos"
 
-#: ../ui/preferences.glade.h:11
+#: ../ui/preferences-dialog.ui.h:9
 msgid "Geary will run in the background and notify of new mail"
 msgstr "Geary se ejecutará en segundo plano y le notificará de mensajes nuevos"
 
-#: ../ui/preferences.glade.h:12
+#: ../ui/preferences-dialog.ui.h:10
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -2734,6 +2686,32 @@ msgstr "Dirección de correo:"
 msgid "Geary update in progress…"
 msgstr "Actualización de Geary en proceso…"
 
+#~ msgid "_Inspect"
+#~ msgstr "_Inspeccionar"
+
+#~| msgid "%s - Conversation Inspector"
+#~ msgid "%s — Composer Inspector"
+#~ msgstr "%s: inspector de conversaciones"
+
+#~ msgid " (Invalid?)"
+#~ msgstr " (¿No válido?)"
+
+#~| msgid "%s - Conversation Inspector"
+#~ msgid "%s — Conversation Inspector"
+#~ msgstr "%s: inspector de conversaciones"
+
+#~ msgid "none"
+#~ msgstr "sin nombre"
+
+#~ msgid "Copy _Link"
+#~ msgstr "Copiar en_lace"
+
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Enlace (Ctr+L)"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Activar corrección _ortográfica"
+
 #~ msgid "Empty"
 #~ msgstr "Vaciar"