[geary] Updated Spanish translation

[Daniel Mustieles García <dmustieles src gnome org>]

commit d55f9142154705d5116da94a300977cafdd2f2a0
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Mon Aug 24 12:52:11 2020 +0200

    Updated Spanish translation

 po/es.po | 562 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 316 insertions(+), 246 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index 518f43f8d..8e3eb0a13 100644
--- a/po/es.po
+++ b/po/es.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2020-07-30 04:08+0000\n"
-"PO-Revision-Date: 2020-08-14 10:58+0200\n"
+"POT-Creation-Date: 2020-08-18 09:04+0000\n"
+"PO-Revision-Date: 2020-08-24 12:44+0200\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: Spanish - Spain <gnome-es-list gnome org>\n"
 "Language: es_ES\n"
@@ -41,8 +41,8 @@ msgstr "Enviar archivos mediante Geary"
 #: desktop/geary-autostart.desktop.in.in:3
 #: desktop/org.gnome.Geary.appdata.xml.in.in:11
 #: desktop/org.gnome.Geary.desktop.in.in:3
-#: src/client/accounts/accounts-editor-servers-pane.vala:555
-#: src/client/application/application-main-window.vala:601
+#: src/client/accounts/accounts-editor-servers-pane.vala:560
+#: src/client/application/application-main-window.vala:608
 msgid "Geary"
 msgstr "Geary"
 
@@ -378,13 +378,13 @@ msgstr "Todos los demás"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:195
-#: src/client/accounts/accounts-editor-servers-pane.vala:316
+#: src/client/accounts/accounts-editor-servers-pane.vala:321
 msgid "Check your receiving login and password"
 msgstr "Compruebe el usuario y la contraseña del servidor de envío"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:210
-#: src/client/accounts/accounts-editor-servers-pane.vala:329
+#: src/client/accounts/accounts-editor-servers-pane.vala:334
 msgid "Check your receiving server details"
 msgstr "Compruebe los detalles del servidor de recepción"
 
@@ -394,13 +394,13 @@ msgstr "Compruebe los detalles del servidor de recepción"
 #. specify custom creds here
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:232
-#: src/client/accounts/accounts-editor-servers-pane.vala:350
+#: src/client/accounts/accounts-editor-servers-pane.vala:355
 msgid "Check your sending login and password"
 msgstr "Comprobar el usuario y la contraseña para envío de correo"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:246
-#: src/client/accounts/accounts-editor-servers-pane.vala:363
+#: src/client/accounts/accounts-editor-servers-pane.vala:368
 msgid "Check your sending server details"
 msgstr "Compruebe los detalles del servidor de envío"
 
@@ -456,14 +456,14 @@ msgstr "correo ejemplo com"
 #. Translators: Label for the user's login name for an
 #. IMAP, SMTP, etc service
 #: src/client/accounts/accounts-editor-add-pane.vala:593
-#: src/client/accounts/accounts-editor-servers-pane.vala:884
+#: src/client/accounts/accounts-editor-servers-pane.vala:889
 msgid "Login name"
 msgstr "Nombre de usuario"
 
 #. Translators: Label for the user's password for an IMAP,
 #. SMTP, etc service
 #: src/client/accounts/accounts-editor-add-pane.vala:607
-#: src/client/accounts/accounts-editor-servers-pane.vala:1006
+#: src/client/accounts/accounts-editor-servers-pane.vala:1011
 #: ui/password-dialog.glade:108
 msgid "Password"
 msgstr "Contraseña"
@@ -473,7 +473,7 @@ msgstr "Contraseña"
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's IMAP service.
 #: src/client/accounts/accounts-editor-add-pane.vala:629
-#: src/client/accounts/accounts-editor-servers-pane.vala:728
+#: src/client/accounts/accounts-editor-servers-pane.vala:733
 msgid "IMAP server"
 msgstr "Servidor IMAP"
 
@@ -488,7 +488,7 @@ msgstr "imap.ejemplo.com"
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's SMTP service.
 #: src/client/accounts/accounts-editor-add-pane.vala:638
-#: src/client/accounts/accounts-editor-servers-pane.vala:734
+#: src/client/accounts/accounts-editor-servers-pane.vala:739
 msgid "SMTP server"
 msgstr "Servidor SMTP"
 
@@ -633,55 +633,54 @@ msgstr[0] "hace %d día"
 msgstr[1] "hace %d días"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:255
-#: src/client/application/application-main-window.vala:2038
+#: src/client/application/application-main-window.vala:2061
 msgid "Undo"
 msgstr "Deshacer"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:264
-#: src/client/application/application-main-window.vala:2021
+#: src/client/application/application-main-window.vala:2044
 msgid "Redo"
 msgstr "Rehacer"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:358
-#: src/client/accounts/accounts-editor-list-pane.vala:446
+#: src/client/accounts/accounts-editor-list-pane.vala:454
 #: src/client/accounts/accounts-editor-row.vala:279
 msgid "Gmail"
 msgstr "Gmail"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:362
-#: src/client/accounts/accounts-editor-list-pane.vala:450
+#: src/client/accounts/accounts-editor-list-pane.vala:458
 #: src/client/accounts/accounts-editor-row.vala:283
 msgid "Outlook.com"
 msgstr "Outlook.com"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:366
-#: src/client/accounts/accounts-editor-list-pane.vala:454
+#: src/client/accounts/accounts-editor-list-pane.vala:462
 #: src/client/accounts/accounts-editor-row.vala:287
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but disabled by the user.
-#: src/client/accounts/accounts-editor-list-pane.vala:384
+#: src/client/accounts/accounts-editor-list-pane.vala:388
 msgid "This account has been disabled"
 msgstr "Esta cuenta se ha desactivado"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but because of some error are not able to be
 #. used.
-#: src/client/accounts/accounts-editor-list-pane.vala:393
+#: src/client/accounts/accounts-editor-list-pane.vala:397
 msgid "This account has encountered a problem and is unavailable"
 msgstr "Esta cuenta ha encontrado un problema y no está disponible"
 
-#. Translators: Label for adding a generic email account
-#: src/client/accounts/accounts-editor-list-pane.vala:443
+#: src/client/accounts/accounts-editor-list-pane.vala:466
 msgid "Other email providers"
 msgstr "Otros proveedores de correo-e"
 
 #. Translators: Notification shown after removing an
 #. account. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:560
+#: src/client/accounts/accounts-editor-list-pane.vala:572
 #, c-format
 msgid "Account “%s” removed"
 msgstr "Cuenta «%s» eliminada"
@@ -689,7 +688,7 @@ msgstr "Cuenta «%s» eliminada"
 #. Translators: Notification shown after removing an account
 #. is undone. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:567
+#: src/client/accounts/accounts-editor-list-pane.vala:579
 #, c-format
 msgid "Account “%s” restored"
 msgstr "Cuenta «%s» restaurada"
@@ -702,30 +701,30 @@ msgstr "Arrastre para mover este elemento"
 #. Translators: Label describes the service provider
 #. hosting the email account, e.g. Gmail, Yahoo, or some
 #. other generic IMAP service.
-#: src/client/accounts/accounts-editor-row.vala:295
+#: src/client/accounts/accounts-editor-row.vala:299
 msgid "Service provider"
 msgstr "Proveedor del servicio"
 
 #. Translators: This label describes what form of transport
 #. security (TLS, StartTLS, etc) used by an account's IMAP or SMTP
 #. service.
-#: src/client/accounts/accounts-editor-row.vala:469
+#: src/client/accounts/accounts-editor-row.vala:473
 msgid "Connection security"
 msgstr "Seguridad de la conexión"
 
 #. Translators: Label used when no auth scheme is used
 #. by an account's IMAP or SMTP service.
-#: src/client/accounts/accounts-editor-row.vala:480
-#: src/client/accounts/accounts-editor-servers-pane.vala:755
-#: src/client/accounts/accounts-editor-servers-pane.vala:970
+#: src/client/accounts/accounts-editor-row.vala:484
+#: src/client/accounts/accounts-editor-servers-pane.vala:760
+#: src/client/accounts/accounts-editor-servers-pane.vala:975
 msgid "None"
 msgstr "Ninguno"
 
-#: src/client/accounts/accounts-editor-row.vala:487
+#: src/client/accounts/accounts-editor-row.vala:491
 msgid "StartTLS"
 msgstr "StartTLS"
 
-#: src/client/accounts/accounts-editor-row.vala:494
+#: src/client/accounts/accounts-editor-row.vala:498
 msgid "TLS"
 msgstr "TLS"
 
@@ -733,35 +732,35 @@ msgstr "TLS"
 #. credentials (none, use IMAP, custom) when adding a new
 #. account
 #. Translators: An info bar button label
-#: src/client/accounts/accounts-editor-row.vala:535
-#: src/client/application/application-main-window.vala:553
+#: src/client/accounts/accounts-editor-row.vala:539
+#: src/client/application/application-main-window.vala:554
 msgid "Login"
 msgstr "Inicio de sesión"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (none) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:542
+#: src/client/accounts/accounts-editor-row.vala:546
 msgid "No login needed"
 msgstr "No se necesita inicio de sesión"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (use IMAP) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:550
+#: src/client/accounts/accounts-editor-row.vala:554
 msgid "Use same login as receiving"
 msgstr "Usar el mismo inicio de sesión para recibir"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (custom) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:558
+#: src/client/accounts/accounts-editor-row.vala:562
 msgid "Use a different login"
 msgstr "Usar un inicio de sesión diferente"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-servers-pane.vala:377
+#: src/client/accounts/accounts-editor-servers-pane.vala:382
 #, c-format
 msgid "Account not updated: %s"
 msgstr "Cuenta no actualizada: %s"
@@ -769,23 +768,23 @@ msgstr "Cuenta no actualizada: %s"
 #. Translators: This label describes the program that
 #. created the account, e.g. an SSO service like GOA, or
 #. locally by Geary.
-#: src/client/accounts/accounts-editor-servers-pane.vala:540
+#: src/client/accounts/accounts-editor-servers-pane.vala:545
 msgid "Account source"
 msgstr "Origen de la cuenta"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:552
+#: src/client/accounts/accounts-editor-servers-pane.vala:557
 msgid "GNOME Online Accounts"
 msgstr "Cuentas en línea de GNOME"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:611
+#: src/client/accounts/accounts-editor-servers-pane.vala:616
 msgid "Save draft email on server"
 msgstr "Guardar borrador en el servidor"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:666
+#: src/client/accounts/accounts-editor-servers-pane.vala:671
 msgid "Save sent email on server"
 msgstr "Guardar mensajes enviados en el servidor"
 
@@ -794,12 +793,12 @@ msgstr "Guardar mensajes enviados en el servidor"
 #. Translators: Label used when an account's IMAP or
 #. SMTP service uses OAuth2. The string replacement is
 #. the service's login name.
-#: src/client/accounts/accounts-editor-servers-pane.vala:956
+#: src/client/accounts/accounts-editor-servers-pane.vala:961
 #, c-format
 msgid "%s using OAuth2"
 msgstr "%s usa OAuth2"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:966
+#: src/client/accounts/accounts-editor-servers-pane.vala:971
 msgid "Use receiving server login"
 msgstr "Usar inicio de sesión del servidor para la recepción"
 
@@ -983,37 +982,37 @@ msgstr ""
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/application-client.vala:1049
+#: src/client/application/application-client.vala:1066
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr "La opción «--hidden» está obsoleta y se eliminará en el futuro."
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/application-client.vala:1082
+#: src/client/application/application-client.vala:1099
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Opción de la línea de comandos no reconocida: «%s»"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:499
+#: src/client/application/application-controller.vala:479
 #, c-format
 msgid "A problem occurred sending email for %s"
 msgstr "Ha ocurrido un error al enviar el correo para %s"
 
 #. / Notification body
-#: src/client/application/application-controller.vala:503
+#: src/client/application/application-controller.vala:483
 msgid "Email will not be sent until re-connected"
 msgstr "El correo no se enviará hasta que se vuelva a conectar"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:602
+#: src/client/application/application-controller.vala:582
 msgid "Conversation marked"
 msgid_plural "Conversations marked"
 msgstr[0] "Conversación marcada"
 msgstr[1] "Conversaciones marcadas"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:608
+#: src/client/application/application-controller.vala:588
 msgid "Conversation un-marked"
 msgid_plural "Conversations un-marked"
 msgstr[0] "Conversación desmarcada"
@@ -1022,8 +1021,8 @@ msgstr[1] "Conversaciones desmarcadas"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:634
-#: src/client/application/application-controller.vala:718
+#: src/client/application/application-controller.vala:614
+#: src/client/application/application-controller.vala:698
 #, c-format
 msgid "Conversation moved to %s"
 msgid_plural "Conversations moved to %s"
@@ -1035,8 +1034,8 @@ msgstr[1] "Conversaciones movidas a %s"
 #. / of the source folder.
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:642
-#: src/client/application/application-controller.vala:664
+#: src/client/application/application-controller.vala:622
+#: src/client/application/application-controller.vala:644
 #, c-format
 msgid "Conversation restored to %s"
 msgid_plural "Conversations restored to %s"
@@ -1044,7 +1043,7 @@ msgstr[0] "Conversación restaurada a %s"
 msgstr[1] "Conversaciones restauradas a %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:685
+#: src/client/application/application-controller.vala:665
 msgid "Conversation archived"
 msgid_plural "Conversations archived"
 msgstr[0] "Conversación archivada"
@@ -1052,7 +1051,7 @@ msgstr[1] "Conversaciones archivadas"
 
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:741
+#: src/client/application/application-controller.vala:721
 #, c-format
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
@@ -1060,7 +1059,7 @@ msgstr[0] "Mensaje restaurado a %s"
 msgstr[1] "Mensajes restaurados a %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:762
+#: src/client/application/application-controller.vala:742
 msgid "Message archived"
 msgid_plural "Messages archived"
 msgstr[0] "Mensaje archivado"
@@ -1069,7 +1068,7 @@ msgstr[1] "Mensajes archivados"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:797
+#: src/client/application/application-controller.vala:777
 #, c-format
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
@@ -1079,7 +1078,7 @@ msgstr[1] "Mensajes movidos a %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:825
+#: src/client/application/application-controller.vala:805
 #, c-format
 msgid "Conversation labelled as %s"
 msgid_plural "Conversations labelled as %s"
@@ -1089,19 +1088,19 @@ msgstr[1] "Conversaciones etiquetadas como %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:833
+#: src/client/application/application-controller.vala:813
 #, c-format
 msgid "Conversation un-labelled as %s"
 msgid_plural "Conversations un-labelled as %s"
 msgstr[0] "Conversación desetiquetada como %s"
 msgstr[1] "Conversaciones desetiquetadas como %s"
 
-#: src/client/application/application-controller.vala:1319
+#: src/client/application/application-controller.vala:1297
 #, 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/application-controller.vala:1320
+#: src/client/application/application-controller.vala:1298
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -1126,20 +1125,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/application-controller.vala:1322
+#: src/client/application/application-controller.vala:1300
 msgid "_Rebuild"
 msgstr "_Reconstruir"
 
-#: src/client/application/application-controller.vala:1322
+#: src/client/application/application-controller.vala:1300
 msgid "E_xit"
 msgstr "_Salir"
 
-#: src/client/application/application-controller.vala:1332
+#: src/client/application/application-controller.vala:1310
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "No se puede reconstruir la base de datos para «%s»"
 
-#: src/client/application/application-controller.vala:1333
+#: src/client/application/application-controller.vala:1311
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -1152,88 +1151,89 @@ msgstr ""
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:1492
+#: src/client/application/application-controller.vala:1478
 #, c-format
 msgid "Email sent to %s"
 msgstr "Correo enviado a %s"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2515
+#: src/client/application/application-controller.vala:2509
 #, c-format
 msgid "Email to %s queued for delivery"
 msgstr "Correo a %s encolado para su entrega"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2579
+#: src/client/application/application-controller.vala:2573
 #, c-format
 msgid "Email to %s saved"
 msgstr "Correo a %s guardado"
 
 #. / Translators: A label for an in-app notification.
-#: src/client/application/application-controller.vala:2594
-#: src/client/application/application-controller.vala:2652
+#: src/client/application/application-controller.vala:2588
+#: src/client/application/application-controller.vala:2646
 msgid "Composer could not be restored"
 msgstr "No se pudo restaurar el editor"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2637
+#: src/client/application/application-controller.vala:2631
 #, c-format
 msgid "Email to %s discarded"
 msgstr "Correo a %s descartado"
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:539
+#: src/client/application/application-main-window.vala:540
 msgid "Working offline"
 msgstr "Trabajando en modo desconectado"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:541
+#: src/client/application/application-main-window.vala:542
 msgid "You will not be able to send or receive email until re-connected."
 msgstr "No podrá enviar ni recibir correo hasta que se vuelva a conectar."
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:548
+#: src/client/application/application-main-window.vala:549
 msgid "Login problem"
 msgstr "Problema de inicio de sesión"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:550
+#: src/client/application/application-main-window.vala:551
 msgid "An account has reported an incorrect login or password."
 msgstr ""
 "Una cuenta ha informado de un nombre de usuario o contraseña no válidos."
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:557
+#: src/client/application/application-main-window.vala:558
 msgid "Retry login, you will be prompted for your password"
 msgstr "Reintentar iniciar sesión, se le pedirá su contraseña"
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:564
+#: src/client/application/application-main-window.vala:565
 msgid "Security problem"
 msgstr "Problema de seguridad"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:566
-msgid "An account has reported an untrusted server.."
+#: src/client/application/application-main-window.vala:567
+#| msgid "An account has reported an untrusted server.."
+msgid "An account has reported an untrusted server."
 msgstr "Una cuenta ha informado de un servidor que no es de confianza."
 
 #. Translators: An info bar button label
-#: src/client/application/application-main-window.vala:569
+#: src/client/application/application-main-window.vala:570
 msgid "Check"
 msgstr "Comprobar"
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:573
+#: src/client/application/application-main-window.vala:574
 msgid "Check the security details for the connection"
 msgstr "Compruebe los detalles de seguridad de la conexión"
 
 #. / Translators: Main window title, first string
 #. / substitution being the currently selected folder name,
 #. / the second being the selected account name.
-#: src/client/application/application-main-window.vala:606
+#: src/client/application/application-main-window.vala:617
 #, c-format
 msgid "%s — %s"
 msgstr "%s — %s"
@@ -1241,50 +1241,50 @@ msgstr "%s — %s"
 #. Translators: The name of the folder group containing
 #. folders created by people (as opposed to special-use
 #. folders)
-#: src/client/application/application-main-window.vala:983
+#: src/client/application/application-main-window.vala:996
 #: src/client/folder-list/folder-list-account-branch.vala:43
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: src/client/application/application-main-window.vala:1272
+#: src/client/application/application-main-window.vala:1293
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "¿Quiere eliminar todos los mensajes de la carpeta «%s»?"
 
-#: src/client/application/application-main-window.vala:1273
+#: src/client/application/application-main-window.vala:1294
 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/application-main-window.vala:1274
+#: src/client/application/application-main-window.vala:1295
 msgid "This cannot be undone."
 msgstr "Esto no se puede deshacer."
 
-#: src/client/application/application-main-window.vala:1275
+#: src/client/application/application-main-window.vala:1296
 #, c-format
 msgid "Empty %s"
 msgstr "Vaciar %s"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1332
+#: src/client/application/application-main-window.vala:1353
 msgid "Do you want to permanently delete this conversation?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "¿Quiere eliminar permanentemente esta conversación?"
 msgstr[1] "¿Quiere eliminar permanentemente estas conversaciones?"
 
-#: src/client/application/application-main-window.vala:1337
-#: src/client/application/application-main-window.vala:1352
+#: src/client/application/application-main-window.vala:1358
+#: src/client/application/application-main-window.vala:1373
 msgid "Delete"
 msgstr "Eliminar"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1347
+#: src/client/application/application-main-window.vala:1368
 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/application-main-window.vala:1670
+#: src/client/application/application-main-window.vala:1691
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1295,7 +1295,7 @@ msgstr "%s (%d)"
 #. Document (100.9MB)
 #. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
 #: src/client/components/components-attachment-pane.vala:107
-#: src/client/composer/composer-widget.vala:1930
+#: src/client/composer/composer-widget.vala:1989
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -1351,26 +1351,26 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:52
+#: src/client/components/components-preferences-window.vala:124
 msgid "_Automatically select next message"
 msgstr "Seleccionar el siguiente mensaje _automáticamente"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:62
+#: src/client/components/components-preferences-window.vala:134
 msgid "_Display conversation preview"
 msgstr "_Mostrar la vista previa de la conversación"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:72
+#: src/client/components/components-preferences-window.vala:144
 msgid "Use _three pane view"
 msgstr "Usar vista de _tres paneles"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:82
+#: src/client/components/components-preferences-window.vala:154
 msgid "Use _single key email shortcuts"
 msgstr "Usar atajo_s de correo de una sola tecla"
 
-#: src/client/components/components-preferences-window.vala:84
+#: src/client/components/components-preferences-window.vala:156
 msgid ""
 "Enable keyboard shortcuts for email actions that do not require pressing "
 "<Ctrl>"
@@ -1379,22 +1379,22 @@ msgstr ""
 "<Ctrl>"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:95
+#: src/client/components/components-preferences-window.vala:167
 msgid "_Watch for new mail when closed"
 msgstr "_Revisar si hay mensajes nuevos al cerrar"
 
 #. / Translators: Preferences tooltip
-#: src/client/components/components-preferences-window.vala:99
+#: src/client/components/components-preferences-window.vala:171
 msgid "Geary will keep running after all windows are closed"
 msgstr "Geary seguirá en ejecución después de haber cerrado todas la ventanas"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:117
+#: src/client/components/components-preferences-window.vala:189
 msgid "Preferences"
 msgstr "Preferencias"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:180
+#: src/client/components/components-preferences-window.vala:252
 msgid "Plugins"
 msgstr "Complementos"
 
@@ -1489,27 +1489,27 @@ msgstr "Buscar la cuenta %s"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but one is not provided.
-#: src/client/components/components-validator.vala:390
+#: src/client/components/components-validator.vala:394
 msgid "An email address is required"
 msgstr "Se necesita una dirección correo-e"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but the address is invalid.
-#: src/client/components/components-validator.vala:394
+#: src/client/components/components-validator.vala:398
 msgid "Not a valid email address"
 msgstr "Dirección correo-e no válida"
 
 #. Translators: Tooltip used when an entry requires a valid,
 #. resolvable server name to be entered, but one is not
 #. provided.
-#: src/client/components/components-validator.vala:440
+#: src/client/components/components-validator.vala:444
 msgid "A server name is required"
 msgstr "Se necesita un nombre de servidor"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. server name to be entered, but it was unable to be
 #. looked-up in the DNS.
-#: src/client/components/components-validator.vala:445
+#: src/client/components/components-validator.vala:449
 msgid "Could not look up server name"
 msgstr "No se pudo encontrar el nombre del servidor"
 
@@ -1569,7 +1569,9 @@ msgstr "Error al guardar los mensajes enviados"
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: src/client/components/stock.vala:19 ui/password-dialog.glade:196
+#: src/client/components/stock.vala:19
+#: src/client/plugin/mail-merge/mail-merge.vala:388
+#: ui/password-dialog.glade:196
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -1593,7 +1595,9 @@ msgstr "_Descartar"
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: src/client/components/stock.vala:26 ui/components-attachment-pane-menus.ui:7
+#: src/client/components/stock.vala:26
+#: src/client/plugin/mail-merge/mail-merge.vala:387
+#: ui/components-attachment-pane-menus.ui:7
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -1672,90 +1676,90 @@ msgstr ""
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:913
+#: src/client/composer/composer-widget.vala:997
 msgid "Do you want to keep or discard this draft message?"
 msgstr "¿Quiere mantener o descartar este mensaje en borrador?"
 
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. only Discard or Cancel.
-#: src/client/composer/composer-widget.vala:939
+#: src/client/composer/composer-widget.vala:1023
 msgid "Do you want to discard this draft message?"
 msgstr "¿Quiere descartar este mensaje en borrador?"
 
-#: src/client/composer/composer-widget.vala:1585
+#: src/client/composer/composer-widget.vala:1645
 msgid "Send message with an empty subject and body?"
 msgstr "¿Quiere enviar el mensaje sin asunto ni cuerpo?"
 
-#: src/client/composer/composer-widget.vala:1587
+#: src/client/composer/composer-widget.vala:1647
 msgid "Send message with an empty subject?"
 msgstr "¿Quiere enviar el mensaje sin asunto?"
 
-#: src/client/composer/composer-widget.vala:1589
+#: src/client/composer/composer-widget.vala:1649
 msgid "Send message with an empty body?"
 msgstr "¿Quiere enviar el mensaje sin cuerpo?"
 
-#: src/client/composer/composer-widget.vala:1598
+#: src/client/composer/composer-widget.vala:1658
 msgid "Send message without an attachment?"
 msgstr "¿Quiere enviar el mensaje sin el archivo adjunto?"
 
-#: src/client/composer/composer-widget.vala:1916
+#: src/client/composer/composer-widget.vala:1977
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "Ya se ha adjuntado «%s» para enviarlo."
 
-#: src/client/composer/composer-widget.vala:1952
-#: src/client/composer/composer-widget.vala:2002
+#: src/client/composer/composer-widget.vala:2009
+#: src/client/composer/composer-widget.vala:2059
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "«%s» es un archivo vacío."
 
-#: src/client/composer/composer-widget.vala:1990
+#: src/client/composer/composer-widget.vala:2047
 #, c-format
 msgid "“%s” could not be found."
 msgstr "No se pudo encontrar «%s»."
 
-#: src/client/composer/composer-widget.vala:1996
+#: src/client/composer/composer-widget.vala:2053
 #, c-format
 msgid "“%s” is a folder."
 msgstr "«%s» es una carpeta."
 
-#: src/client/composer/composer-widget.vala:2015
+#: src/client/composer/composer-widget.vala:2072
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "No se pudo abrir «%s» para lectura."
 
-#: src/client/composer/composer-widget.vala:2023
+#: src/client/composer/composer-widget.vala:2080
 msgid "Cannot add attachment"
 msgstr "No se puede adjuntar el archivo"
 
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:2083
+#: src/client/composer/composer-widget.vala:2140
 #: src/client/conversation-viewer/conversation-email.vala:542
-#: src/client/util/util-email.vala:236 ui/conversation-message.ui:312
+#: src/client/util/util-email.vala:249 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "Para:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:2089
+#: src/client/composer/composer-widget.vala:2146
 #: src/client/conversation-viewer/conversation-email.vala:547
-#: src/client/util/util-email.vala:241 ui/conversation-message.ui:357
+#: src/client/util/util-email.vala:254 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "Cc:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:2095
+#: src/client/composer/composer-widget.vala:2152
 #: src/client/conversation-viewer/conversation-email.vala:552
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "Cco:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:2101
+#: src/client/composer/composer-widget.vala:2158
 msgid "Reply-To: "
 msgstr "Responder a:"
 
-#: src/client/composer/composer-widget.vala:2353
+#: src/client/composer/composer-widget.vala:2410
 msgid "Select Color"
 msgstr "Seleccionar color"
 
@@ -1764,14 +1768,14 @@ msgstr "Seleccionar color"
 #. 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:2542
+#: src/client/composer/composer-widget.vala:2599
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s mediante %2$s"
 
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2899
+#: src/client/composer/composer-widget.vala:2959
 msgid "Images"
 msgstr "Imágenes"
 
@@ -1788,51 +1792,51 @@ msgid "Search for more languages"
 msgstr "Buscar más idiomas"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:335
+#: src/client/conversation-list/conversation-list-view.vala:339
 msgid "Move conversation to _Trash"
 msgid_plural "Move conversations to _Trash"
 msgstr[0] "Mover conversación a la _papelera"
 msgstr[1] "Mover conversaciones a la _papelera"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:347
+#: src/client/conversation-list/conversation-list-view.vala:351
 msgid "_Delete conversation"
 msgid_plural "_Delete conversations"
 msgstr[0] "_Eliminar conversación"
 msgstr[1] "_Eliminar conversaciones"
 
-#: src/client/conversation-list/conversation-list-view.vala:360
+#: src/client/conversation-list/conversation-list-view.vala:364
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Marcar como _leído"
 
-#: src/client/conversation-list/conversation-list-view.vala:368
+#: src/client/conversation-list/conversation-list-view.vala:372
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
-#: src/client/conversation-list/conversation-list-view.vala:376
+#: src/client/conversation-list/conversation-list-view.vala:380
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "_No destacar"
 
-#: src/client/conversation-list/conversation-list-view.vala:383
+#: src/client/conversation-list/conversation-list-view.vala:387
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "_Destacar"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:392
+#: src/client/conversation-list/conversation-list-view.vala:396
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Responder"
 
-#: src/client/conversation-list/conversation-list-view.vala:398
+#: src/client/conversation-list/conversation-list-view.vala:402
 msgid "R_eply All"
 msgstr "R_esponder a todos"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:404
+#: src/client/conversation-list/conversation-list-view.vala:408
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Reenviar"
@@ -1843,19 +1847,19 @@ msgstr "Yo"
 
 #. Translators: Human-readable version of the RFC 822 From header
 #: src/client/conversation-viewer/conversation-email.vala:537
-#: src/client/util/util-email.vala:227
+#: src/client/util/util-email.vala:240
 msgid "From:"
 msgstr "De:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
 #: src/client/conversation-viewer/conversation-email.vala:557
-#: src/client/util/util-email.vala:232
+#: src/client/util/util-email.vala:245
 msgid "Date:"
 msgstr "Fecha:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
 #: src/client/conversation-viewer/conversation-email.vala:567
-#: src/client/util/util-email.vala:230
+#: src/client/util/util-email.vala:243
 msgid "Subject:"
 msgstr "Asunto:"
 
@@ -2109,14 +2113,12 @@ msgid_plural "%d results"
 msgstr[0] "%d resultado"
 msgstr[1] "%d resultados"
 
-#: src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in:4
+#. Translators: This is an internal plugin so this name does not need
+#. to be tanslated
+#: src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in:6
 msgid "Desktop Notifications"
 msgstr "Notificaciones del escritorio"
 
-#: src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in:5
-msgid "Displays desktop notifications when new email is delivered"
-msgstr "Muestra notificaciones del escritorio cuando llegue correo nuevo"
-
 #. / Notification body when a message as been received
 #. / and other unread messages have not been
 #. / seen. First string substitution is the message
@@ -2182,30 +2184,31 @@ msgstr "Crear plantillas reutilizables para enviar correo"
 #. the front for the default. English names do not need to be
 #. included.
 #: src/client/plugin/email-templates/email-templates.vala:29
+#: src/client/plugin/mail-merge/mail-merge.vala:29
 msgid "Templates | Template Mail | Template Email | Template E-Mail"
 msgstr ""
 "Plantillas | Plantilla de correo | Plantillas correo-e | Plantillas mensajes"
 
 #. Translators: The name of the folder used to
 #. store email templates
-#: src/client/plugin/email-templates/email-templates.vala:195
+#: src/client/plugin/email-templates/email-templates.vala:201
 msgid "Templates"
 msgstr "Plantillas"
 
 #. Translators: Info bar button label for creating a
 #. new email template
-#: src/client/plugin/email-templates/email-templates.vala:276
+#: src/client/plugin/email-templates/email-templates.vala:282
 msgid "New"
 msgstr "Nueva"
 
 #. Translators: Infobar status label for an email template
-#: src/client/plugin/email-templates/email-templates.vala:287
+#: src/client/plugin/email-templates/email-templates.vala:293
 msgid "Message template"
 msgstr "Plantilla de mensaje"
 
 #. Translators: Info bar button label for sending an
 #. email template
-#: src/client/plugin/email-templates/email-templates.vala:291
+#: src/client/plugin/email-templates/email-templates.vala:297
 msgid "Send"
 msgstr "Enviar"
 
@@ -2213,18 +2216,82 @@ msgstr "Enviar"
 #. existing email template
 #. Translators: Info bar button label for editing a draft
 #. email
-#: src/client/plugin/email-templates/email-templates.vala:299
-#: src/client/plugin/special-folders/special-folders.vala:180
+#: src/client/plugin/email-templates/email-templates.vala:305
+#: src/client/plugin/mail-merge/mail-merge.vala:332
+#: src/client/plugin/special-folders/special-folders.vala:187
 msgid "Edit"
 msgstr "Editar"
 
-#: src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in:4
+#. Translators: This is an internal plugin so this name does not need
+#. to be tanslated
+#: src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in:6
 msgid "Folder Highlight"
 msgstr "Resaltado de carpeta"
 
-#: src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in:5
-msgid "Highlights folders that have newly delivered mail"
-msgstr "Resalta carpetas que tienen correo nuevo"
+#. / Translators: Menu item label for invoking mail
+#. / merge in composer
+#. / Translators: File chooser title after invoking mail
+#. / merge in composer
+#. Translators: The name of the folder used to
+#. display merged email
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:5
+#: src/client/plugin/mail-merge/mail-merge.vala:284
+#: src/client/plugin/mail-merge/mail-merge.vala:385
+#: src/client/plugin/mail-merge/mail-merge.vala:484
+msgid "Mail Merge"
+msgstr "Combinación de correo"
+
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:6
+msgid "Fill in and send email templates using a spreadsheet"
+msgstr "Rellene y envíe plantillas de correo usando una hoja de cálculo"
+
+#. Translators: Info bar label for starting sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:118
+#| msgctxt "shortcut window"
+#| msgid "Star"
+msgid "Start"
+msgstr "Comenzar"
+
+#. Translators: Info bar label for pausing sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:130
+msgid "Pause"
+msgstr "Pausar"
+
+#. Translators: Info bar description for the mail merge
+#. folder. The first string substitution the number of email
+#. already sent, the second is the total number to send.
+#: src/client/plugin/mail-merge/mail-merge.vala:239
+#, c-format
+#| msgid "Sent Sound"
+msgid "Sent %u of %u"
+msgstr "Enviados %u de %u"
+
+#. Translators: Infobar status label for an email mail merge
+#. template
+#: src/client/plugin/mail-merge/mail-merge.vala:320
+#| msgid "Message template"
+msgid "Mail merge template"
+msgstr "Plantilla de combinación de correo"
+
+#. Translators: Info bar button label for performing a
+#. mail-merge on an email template
+#: src/client/plugin/mail-merge/mail-merge.vala:324
+msgid "Merge"
+msgstr "Combinar"
+
+#. / Translators: Action bar menu button label for
+#. / mail-merge plugin
+#: src/client/plugin/mail-merge/mail-merge.vala:373
+#| msgid "Insert an image"
+msgid "Insert field"
+msgstr "Insertar campo"
+
+#. / Translators: File chooser filer label
+#: src/client/plugin/mail-merge/mail-merge.vala:392
+msgid "Comma separated values (CSV)"
+msgstr "Valores separados por comas (CSV)"
 
 #: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
 msgid "Messaging Menu"
@@ -2235,19 +2302,17 @@ msgid "Displays Unity Messaging Menu notifications for new email"
 msgstr ""
 "Muestra las notificaciones del menú de mensajes de Unity para correo nuevo"
 
-#: src/client/plugin/messaging-menu/messaging-menu.vala:75
+#: src/client/plugin/messaging-menu/messaging-menu.vala:79
 #, c-format
 msgid "%s — New Messages"
 msgstr "%s: mensajes nuevos"
 
-#: src/client/plugin/notification-badge/notification-badge.plugin.desktop.in:4
+#. Translators: This is an internal plugin so this name does not need
+#. to be tanslated.
+#: src/client/plugin/notification-badge/notification-badge.plugin.desktop.in:6
 msgid "Notification Badge"
 msgstr "Insignia de la notificación"
 
-#: src/client/plugin/notification-badge/notification-badge.plugin.desktop.in:5
-msgid "Displays a dock badge showing the number of new messages"
-msgstr "Muestra una insignia que indica el número de mensajes"
-
 #: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
 msgid "Sent Sound"
 msgstr "Sonido de enviado"
@@ -2258,36 +2323,38 @@ msgstr ""
 "Reproduce el sonido del escritorio de correo enviado cuando se envía un "
 "correo"
 
-#: src/client/plugin/special-folders/special-folders.plugin.desktop.in:4
+#. Translators: This is an internal plugin so this name does not need
+#. to be tanslated.
+#: src/client/plugin/special-folders/special-folders.plugin.desktop.in:6
 msgid "Special Folders"
 msgstr "Carpetas especiales"
 
 #. Translators: Info bar button label for emptying
 #. trash/spam folders
-#: src/client/plugin/special-folders/special-folders.vala:160
+#: src/client/plugin/special-folders/special-folders.vala:167
 msgid "Empty"
 msgstr "Vaciar"
 
 #. Translators: Info bar status message for a draft email
-#: src/client/plugin/special-folders/special-folders.vala:172
+#: src/client/plugin/special-folders/special-folders.vala:179
 msgid "Draft message"
 msgstr "Borrador"
 
 #. Translators: Info bar status description for a draft
 #. email
-#: src/client/plugin/special-folders/special-folders.vala:175
+#: src/client/plugin/special-folders/special-folders.vala:182
 msgid "This message has not yet been sent."
 msgstr "Este mensaje no se ha enviado todavía."
 
 #. Translators: Info bar status message for an sent but
 #. unsaved email
-#: src/client/plugin/special-folders/special-folders.vala:191
+#: src/client/plugin/special-folders/special-folders.vala:198
 msgid "Message not saved"
 msgstr "Mensaje no guardado"
 
 #. Translators: Info bar status description for a sent but
 #. unsaved email
-#: src/client/plugin/special-folders/special-folders.vala:194
+#: src/client/plugin/special-folders/special-folders.vala:201
 msgid "This message was sent, but has not been saved to your account."
 msgstr ""
 "Este mensaje se envió correctamente pero no se ha guardado en su cuenta."
@@ -2360,32 +2427,37 @@ msgstr "Ayer"
 msgid "%A"
 msgstr "%A"
 
-#. / 12 hours format for 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/client/util/util-date.vala:216
+#. / 12 hours format for 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/client/util/util-date.vala:218
 msgid "%a, %b %-e, %Y at %l:%M %P"
 msgstr "%a, %e de %b de %Y a las %l:%M %P"
 
-#. / 24 hours 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/client/util/util-date.vala:220
+#. / 24 hours 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/client/util/util-date.vala:224
 msgid "%a, %b %-e, %Y at %H:%M"
 msgstr "%a, %e de %b de %Y a las %H:%M"
 
-#. / 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/client/util/util-date.vala:224
+#. / 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/client/util/util-date.vala:230
 msgid "%a, %b %-e, %Y at %X"
 msgstr "%a, %e de %b de %Y a las %X %p"
 
-#: src/client/util/util-email.vala:38
+#. Translators: Label used when an email has a missing or
+#. an empty subject
+#: src/client/util/util-email.vala:50
 msgid "(No subject)"
 msgstr "(Sin asunto)"
 
 #. / Translators: This is shown for displaying a list of email
 #. / recipients that happens to be empty, i.e. contains no
 #. / email addresses.
-#: src/client/util/util-email.vala:135
+#: src/client/util/util-email.vala:148
 msgid "(No recipients)"
 msgstr "(No hay destinatarios)"
 
@@ -2394,7 +2466,7 @@ msgstr "(No hay destinatarios)"
 #. / addresses. The first (string) substitution is
 #. / address of the first, the second substitution is
 #. / the number of n - 1 remaining recipients.
-#: src/client/util/util-email.vala:147
+#: src/client/util/util-email.vala:160
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
@@ -2404,26 +2476,26 @@ msgstr[1] "%s y %d otros"
 #. / 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/client/util/util-email.vala:180
+#: src/client/util/util-email.vala:193
 #, 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/client/util/util-email.vala:187
+#: src/client/util/util-email.vala:200
 #, 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/client/util/util-email.vala:193
+#: src/client/util/util-email.vala:206
 #, c-format
 msgid "On %s:"
 msgstr "El %s:"
 
-#: src/client/util/util-email.vala:222
+#: src/client/util/util-email.vala:235
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Mensaje reenviado ----------"
 
@@ -2663,7 +2735,7 @@ msgstr "sin-leer"
 #. Draft mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:929
+#: src/engine/imap-engine/imap-engine-generic-account.vala:996
 msgid "Drafts | Draft"
 msgstr "Borradores | Borrador | Drafts | Draft"
 
@@ -2671,7 +2743,7 @@ msgstr "Borradores | Borrador | Drafts | Draft"
 #. Sent mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:938
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1005
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 "Enviados | Correo enviado | Bandeja de salida | Sent | Sent Mail | Sent "
@@ -2679,7 +2751,7 @@ msgstr ""
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:943
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1010
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Elementos enviados"
@@ -2688,7 +2760,7 @@ msgstr "Elementos enviados"
 #. Junk/Spam mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:953
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1020
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2700,13 +2772,13 @@ msgstr ""
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:963
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1030
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Papelera | Eliminados | Trash | Rubbish | Rubbish Bin"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:968
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1035
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Elementos eliminados"
@@ -2715,22 +2787,22 @@ msgstr "Elementos eliminados"
 #. Archive mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:978
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1045
 msgid "Archive | Archives"
 msgstr "Archivo | Archivos"
 
-#: src/engine/rfc822/rfc822-message.vala:531
+#: src/engine/rfc822/rfc822-message.vala:528
 #, c-format
 msgid "Could not determine mime type for “%s”."
 msgstr "No se pudo determinar el tipo MIME de «%s»"
 
-#: src/engine/rfc822/rfc822-message.vala:542
+#: src/engine/rfc822/rfc822-message.vala:539
 #, c-format
 msgid "Could not determine content type for mime type “%s” on “%s”."
 msgstr ""
 "No se pudo determinar el tipo de contenido para el tipo MIME «%s» en «%s»."
 
-#: src/engine/rfc822/rfc822-message.vala:1001
+#: src/engine/rfc822/rfc822-message.vala:1013
 msgid "(no subject)"
 msgstr "(sin asunto)"
 
@@ -2911,168 +2983,168 @@ msgid "_Inspect…"
 msgstr "_Inspeccionar…"
 
 #. Geary account mail will be sent from
-#: ui/composer-widget.ui:60
+#: ui/composer-widget.ui:61
 msgid "_From"
 msgstr "_De"
 
 #. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:130
+#: ui/composer-widget.ui:131
 msgid "_To"
 msgstr "_Para"
 
-#: ui/composer-widget.ui:158
+#: ui/composer-widget.ui:159
 msgid "Show Cc, Bcc, and Reply-To fields"
 msgstr "Mostrar los campos Cc, Cco y Responder a"
 
-#: ui/composer-widget.ui:219
+#: ui/composer-widget.ui:220
 msgid "_Cc"
 msgstr "_Cc"
 
-#: ui/composer-widget.ui:267
+#: ui/composer-widget.ui:268
 msgid "_Bcc"
 msgstr "Cc_o"
 
-#: ui/composer-widget.ui:315
+#: ui/composer-widget.ui:316
 msgid "_Reply-To"
 msgstr "_Responder a:"
 
-#: ui/composer-widget.ui:372
+#: ui/composer-widget.ui:373
 msgid "_Subject"
 msgstr "A_sunto"
 
-#: ui/composer-widget.ui:445
+#: ui/composer-widget.ui:446
 msgid "Drop files here"
 msgstr "Suelte los archivos aquí"
 
-#: ui/composer-widget.ui:461
+#: ui/composer-widget.ui:462
 msgid "To add them as attachments"
 msgstr "Para añadirlos como adjuntos"
 
-#: ui/composer-widget.ui:602
+#: ui/composer-widget.ui:615
 msgid "Bold text"
 msgstr "Texto en negrita"
 
-#: ui/composer-widget.ui:626
+#: ui/composer-widget.ui:639
 msgid "Italic text"
 msgstr "Texto en cursiva"
 
-#: ui/composer-widget.ui:650
+#: ui/composer-widget.ui:663
 msgid "Underline text"
 msgstr "Subrayar el texto"
 
-#: ui/composer-widget.ui:674
+#: ui/composer-widget.ui:687
 msgid "Strikethrough text"
 msgstr "Tachar el texto"
 
-#: ui/composer-widget.ui:707
+#: ui/composer-widget.ui:720
 msgid "Insert bulleted list"
 msgstr "Insertar lista de topos"
 
-#: ui/composer-widget.ui:731
+#: ui/composer-widget.ui:744
 msgid "Insert numbered list"
 msgstr "Insertar lista numerada"
 
-#: ui/composer-widget.ui:764
+#: ui/composer-widget.ui:777
 msgid "Indent or quote text"
 msgstr "Sangrar o citar texto"
 
-#: ui/composer-widget.ui:788
+#: ui/composer-widget.ui:801
 msgid "Un-indent or unquote text"
 msgstr "Quitar la sangría o la cita del texto"
 
-#: ui/composer-widget.ui:817
+#: ui/composer-widget.ui:830
 msgid "Remove text formatting"
 msgstr "Quitar el formato del texto"
 
-#: ui/composer-widget.ui:836
+#: ui/composer-widget.ui:849
 msgid "Change font type"
 msgstr "Cambiar tipo de la tipografía"
 
-#: ui/composer-widget.ui:851
+#: ui/composer-widget.ui:864
 msgid "Sans Serif"
 msgstr "Sans serif"
 
-#: ui/composer-widget.ui:862
+#: ui/composer-widget.ui:875
 msgid "Serif"
 msgstr "Serif"
 
-#: ui/composer-widget.ui:873
+#: ui/composer-widget.ui:886
 msgid "Fixed Width"
 msgstr "Anchura fija"
 
-#: ui/composer-widget.ui:899
+#: ui/composer-widget.ui:912
 msgid "Change font color"
 msgstr "Cambiar color de la tipografía"
 
-#: ui/composer-widget.ui:914
+#: ui/composer-widget.ui:927
 msgid "Change font size"
 msgstr "Cambiar tamaño de la tipografía"
 
-#: ui/composer-widget.ui:949
+#: ui/composer-widget.ui:962
 msgid "Insert or update text link"
 msgstr "Insertar o actualizar el enlace seleccionado"
 
-#: ui/composer-widget.ui:973
+#: ui/composer-widget.ui:986
 msgid "Insert an image"
 msgstr "Insertar una imagen"
 
-#: ui/composer-widget.ui:1015
+#: ui/composer-widget.ui:1028
 msgid "Undo last edit"
 msgstr "Deshacer la última edición"
 
-#: ui/composer-widget.ui:1039
+#: ui/composer-widget.ui:1052
 msgid "Redo last edit"
 msgstr "Deshacer la última edición"
 
-#: ui/composer-widget.ui:1068 ui/composer-widget.ui:1093
+#: ui/composer-widget.ui:1081 ui/composer-widget.ui:1106
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
 
-#: ui/composer-widget.ui:1117
+#: ui/composer-widget.ui:1130
 msgid "Add original attachments"
 msgstr "Añadir adjuntos originales"
 
-#: ui/composer-widget.ui:1162
+#: ui/composer-widget.ui:1175
 msgid "More options"
 msgstr "Más opciones"
 
-#: ui/composer-widget.ui:1182
+#: ui/composer-widget.ui:1195
 msgid "Show formatting toolbar"
 msgstr "Mostrar barra de herramientas de formato"
 
-#: ui/composer-widget.ui:1200
+#: ui/composer-widget.ui:1213
 msgid "Select spell checking languages"
 msgstr "Seleccione el idioma de la revisión ortográfica"
 
-#: ui/composer-widget.ui:1263
+#: ui/composer-widget.ui:1273
 msgid "S_ans Serif"
 msgstr "S_ans serif"
 
-#: ui/composer-widget.ui:1268
+#: ui/composer-widget.ui:1278
 msgid "S_erif"
 msgstr "S_erif"
 
-#: ui/composer-widget.ui:1273
+#: ui/composer-widget.ui:1283
 msgid "_Fixed Width"
 msgstr "_Anchura fija"
 
-#: ui/composer-widget.ui:1283
+#: ui/composer-widget.ui:1293
 msgid "_Small"
 msgstr "_Pequeño"
 
-#: ui/composer-widget.ui:1288
+#: ui/composer-widget.ui:1298
 msgid "_Medium"
 msgstr "_Mediano"
 
-#: ui/composer-widget.ui:1293
+#: ui/composer-widget.ui:1303
 msgid "Lar_ge"
 msgstr "_Grande"
 
-#: ui/composer-widget.ui:1303
+#: ui/composer-widget.ui:1313
 msgid "_Rich Text"
 msgstr "Texto en_riquecido"
 
-#: ui/composer-widget.ui:1308
+#: ui/composer-widget.ui:1318
 msgid "_Plain Text"
 msgstr "Texto _plano"
 
@@ -3093,11 +3165,6 @@ msgid "Save _All"
 msgstr "Guardar _todo"
 
 #: ui/components-inspector-error-view.ui:33
-#| msgid ""
-#| "If the problem is serious or persists, please save and send these details "
-#| "to the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing "
-#| "list</a> or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/";
-#| "ReportingABug\">new bug report</a>."
 msgid ""
 "If the problem is serious or persists, please save and send these details to "
 "one of the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>contact "
@@ -3545,8 +3612,6 @@ msgid "Add attachment"
 msgstr "Añadir un adjunto"
 
 #: ui/gtk/help-overlay.ui:395
-#| msgctxt "shortcut window"
-#| msgid "Detach composer window"
 msgctxt "shortcut window"
 msgid "Detach the composer"
 msgstr "Desacoplar la ventana del editor"
@@ -3701,6 +3766,15 @@ msgstr "_Autenticar"
 msgid "Geary update in progress…"
 msgstr "Actualización de Geary en proceso…"
 
+#~ msgid "Displays desktop notifications when new email is delivered"
+#~ msgstr "Muestra notificaciones del escritorio cuando llegue correo nuevo"
+
+#~ msgid "Highlights folders that have newly delivered mail"
+#~ msgstr "Resalta carpetas que tienen correo nuevo"
+
+#~ msgid "Displays a dock badge showing the number of new messages"
+#~ msgstr "Muestra una insignia que indica el número de mensajes"
+
 #~ msgctxt "shortcut window"
 #~ msgid "Find in current conversations"
 #~ msgstr "Buscar en las conversaciones actual"
@@ -3974,10 +4048,6 @@ msgstr "Actualización de Geary en proceso…"
 #~ msgid "Additional Shortcuts"
 #~ msgstr "Atajos adicionales"
 
-#~ msgctxt "shortcut window"
-#~ msgid "Star"
-#~ msgstr "Destacar"
-
 #~ msgctxt "shortcut window"
 #~ msgid "Unstar"
 #~ msgstr "Quitar el destaque"