[geary] Updated Spanish translation

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

commit 384dc179bc52f68c1464890ba01921aa5692d1e5
Author: Daniel Mustieles <daniel mustieles contractor bbva com>
Date:   Tue Feb 26 09:15:36 2019 +0100

    Updated Spanish translation

 po/es.po | 290 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 151 insertions(+), 139 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index d0ac4284..b8ea8cb8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17,8 +17,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: 2019-02-19 14:06+0000\n"
-"PO-Revision-Date: 2019-02-19 15:25+0100\n"
+"POT-Creation-Date: 2019-02-24 16:03+0000\n"
+"PO-Revision-Date: 2019-02-26 09:02+0100\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: es <gnome-es-list gnome org>\n"
 "Language: es\n"
@@ -45,7 +45,7 @@ msgstr "Enviar archivos mediante Geary"
 #: desktop/geary-autostart.desktop.in:3
 #: desktop/org.gnome.Geary.appdata.xml.in:11
 #: desktop/org.gnome.Geary.desktop.in:3
-#: src/client/accounts/accounts-editor-servers-pane.vala:539
+#: src/client/accounts/accounts-editor-servers-pane.vala:555
 msgid "Geary"
 msgstr "Geary"
 
@@ -57,7 +57,7 @@ msgstr "Correo-e"
 #: desktop/geary-autostart.desktop.in:5
 #: desktop/org.gnome.Geary.appdata.xml.in:15
 #: desktop/org.gnome.Geary.desktop.in:5
-#: src/client/application/geary-application.vala:22
+#: src/client/application/geary-application.vala:23
 msgid "Send and receive email"
 msgstr "Envíe y reciba mensajes de correo electrónico"
 
@@ -137,7 +137,7 @@ msgstr "Geary mostrando el editor de texto enriquecido"
 msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 msgstr "correo;correo-e;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 
-#: desktop/org.gnome.Geary.desktop.in:21 ui/gtk/menus.ui:7
+#: desktop/org.gnome.Geary.desktop.in:21
 msgid "Compose Message"
 msgstr "Redactar mensaje"
 
@@ -350,13 +350,13 @@ msgstr "Todos los demás"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:196
-#: src/client/accounts/accounts-editor-servers-pane.vala:300
+#: src/client/accounts/accounts-editor-servers-pane.vala:316
 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:211
-#: src/client/accounts/accounts-editor-servers-pane.vala:313
+#: src/client/accounts/accounts-editor-servers-pane.vala:329
 msgid "Check your receiving server details"
 msgstr "Compruebe los detalles del servidor de recepción"
 
@@ -366,13 +366,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:233
-#: src/client/accounts/accounts-editor-servers-pane.vala:334
+#: src/client/accounts/accounts-editor-servers-pane.vala:350
 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:247
-#: src/client/accounts/accounts-editor-servers-pane.vala:347
+#: src/client/accounts/accounts-editor-servers-pane.vala:363
 msgid "Check your sending server details"
 msgstr "Compruebe los detalles del servidor de envío"
 
@@ -401,14 +401,14 @@ msgstr "Cuenta no creada: %s"
 
 #. Translators: Label for the person's actual name when adding
 #. an account
-#: src/client/accounts/accounts-editor-add-pane.vala:552
+#: src/client/accounts/accounts-editor-add-pane.vala:551
 msgid "Your name"
 msgstr "Su nombre"
 
 #. Translators: Label used for the address part of an
 #. email address when editing a user's sender address
 #. preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:569
+#: src/client/accounts/accounts-editor-add-pane.vala:568
 #: src/client/accounts/accounts-editor-edit-pane.vala:501
 msgid "Email address"
 msgstr "Dirección de corre-e:"
@@ -418,7 +418,7 @@ msgstr "Dirección de corre-e:"
 #. Translators: This is used as a placeholder for the
 #. address part of an email address when editing a user's
 #. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:572
+#: src/client/accounts/accounts-editor-add-pane.vala:571
 #: src/client/accounts/accounts-editor-edit-pane.vala:469
 msgid "person example com"
 msgstr "correo ejemplo com"
@@ -427,15 +427,15 @@ msgstr "correo ejemplo com"
 #. when adding an account
 #. Translators: Label for the user's login name for an
 #. IMAP, SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:586
-#: src/client/accounts/accounts-editor-servers-pane.vala:809
+#: src/client/accounts/accounts-editor-add-pane.vala:585
+#: src/client/accounts/accounts-editor-servers-pane.vala:880
 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:600
-#: src/client/accounts/accounts-editor-servers-pane.vala:928
+#: src/client/accounts/accounts-editor-add-pane.vala:599
+#: src/client/accounts/accounts-editor-servers-pane.vala:999
 #: ui/password-dialog.glade:108
 msgid "Password"
 msgstr "Contraseña"
@@ -444,14 +444,14 @@ msgstr "Contraseña"
 #. adding an account.
 #. 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:622
-#: src/client/accounts/accounts-editor-servers-pane.vala:656
+#: src/client/accounts/accounts-editor-add-pane.vala:621
+#: src/client/accounts/accounts-editor-servers-pane.vala:727
 msgid "IMAP server"
 msgstr "Servidor IMAP"
 
 #. Translators: Placeholder for the IMAP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:625
+#: src/client/accounts/accounts-editor-add-pane.vala:624
 msgid "imap.example.com"
 msgstr "imap.ejemplo.com"
 
@@ -459,14 +459,14 @@ msgstr "imap.ejemplo.com"
 #. adding an account.
 #. 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:631
-#: src/client/accounts/accounts-editor-servers-pane.vala:662
+#: src/client/accounts/accounts-editor-add-pane.vala:630
+#: src/client/accounts/accounts-editor-servers-pane.vala:733
 msgid "SMTP server"
 msgstr "Servidor SMTP"
 
 #. Translators: Placeholder for the SMTP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:634
+#: src/client/accounts/accounts-editor-add-pane.vala:633
 msgid "smtp.example.com"
 msgstr "smtp.ejemplo.com"
 
@@ -536,7 +536,7 @@ msgstr "Deshacer cambios en «%s»"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:690
+#: src/client/accounts/accounts-editor-edit-pane.vala:688
 #, c-format
 msgid "Add “%s” back"
 msgstr "Añadir «%s» de nuevo"
@@ -544,14 +544,14 @@ msgstr "Añadir «%s» de nuevo"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:732
+#: src/client/accounts/accounts-editor-edit-pane.vala:730
 msgid "Undo signature changes"
 msgstr "Deshacer cambios en la firma"
 
 #. Translators: This label describes the account
 #. preference for the length of time (weeks, months or
 #. years) that past email should be downloaded.
-#: src/client/accounts/accounts-editor-edit-pane.vala:780
+#: src/client/accounts/accounts-editor-edit-pane.vala:778
 msgid "Download mail"
 msgstr "Descargar correo"
 
@@ -560,44 +560,44 @@ msgstr "Descargar correo"
 #. should be downloaded for an account. The
 #. string substitution is the duration,
 #. e.g. "1 month back".
-#: src/client/accounts/accounts-editor-edit-pane.vala:812
+#: src/client/accounts/accounts-editor-edit-pane.vala:810
 #, c-format
 msgid "Change download period back to: %s"
 msgstr "Volver a cambiar el período de descarga a: %s"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:833
+#: src/client/accounts/accounts-editor-edit-pane.vala:831
 msgid "Everything"
 msgstr "Todo"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:837
+#: src/client/accounts/accounts-editor-edit-pane.vala:835
 msgid "2 weeks back"
 msgstr "hace 2 semanas"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:841
+#: src/client/accounts/accounts-editor-edit-pane.vala:839
 msgid "1 month back"
 msgstr "hace 1 mes"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:845
+#: src/client/accounts/accounts-editor-edit-pane.vala:843
 msgid "3 months back"
 msgstr "hace 3 meses"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:849
+#: src/client/accounts/accounts-editor-edit-pane.vala:847
 msgid "6 months back"
 msgstr "hace 6 meses"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:853
+#: src/client/accounts/accounts-editor-edit-pane.vala:851
 msgid "1 year back"
 msgstr "hace 1 año"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:857
+#: src/client/accounts/accounts-editor-edit-pane.vala:855
 msgid "2 years back"
 msgstr "hace 2 años"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:861
+#: src/client/accounts/accounts-editor-edit-pane.vala:859
 msgid "4 years back"
 msgstr "hace 4 años"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:867
+#: src/client/accounts/accounts-editor-edit-pane.vala:865
 #, c-format
 msgid "%d day back"
 msgid_plural "%d days back"
@@ -686,8 +686,8 @@ 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:478
-#: src/client/accounts/accounts-editor-servers-pane.vala:681
-#: src/client/accounts/accounts-editor-servers-pane.vala:893
+#: src/client/accounts/accounts-editor-servers-pane.vala:752
+#: src/client/accounts/accounts-editor-servers-pane.vala:964
 #: src/engine/api/geary-special-folder-type.vala:58
 msgid "None"
 msgstr "Ninguno"
@@ -731,7 +731,7 @@ 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:361
+#: src/client/accounts/accounts-editor-servers-pane.vala:377
 #, c-format
 msgid "Account not updated: %s"
 msgstr "Cuenta no actualizada: %s"
@@ -739,47 +739,54 @@ 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:524
+#: src/client/accounts/accounts-editor-servers-pane.vala:540
 msgid "Account source"
 msgstr "Origen de la cuenta"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:536
+#: src/client/accounts/accounts-editor-servers-pane.vala:552
 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:595
+#: src/client/accounts/accounts-editor-servers-pane.vala:611
 msgid "Save drafts on server"
 msgstr "Guardar borradores en el servidor"
 
+#. Translators: This label describes an account
+#. preference.
+#: src/client/accounts/accounts-editor-servers-pane.vala:666
+#| msgid "_Save sent mail"
+msgid "Save sent email on server"
+msgstr "Guardar mensajes enviados en el servidor"
+
 #. Add a suffix for OAuth2 auth so people know they
 #. shouldn't expect to be prompted for a password
 #. 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:879
+#: src/client/accounts/accounts-editor-servers-pane.vala:950
 #, c-format
 msgid "%s using OAuth2"
 msgstr "%s usa OAuth2"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:889
+#: src/client/accounts/accounts-editor-servers-pane.vala:960
 msgid "Use receiving server login"
 msgstr "Usar inicio de sesión del servidor para la recepción"
 
-#: src/client/application/geary-application.vala:23
+#: src/client/application/geary-application.vala:24
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: src/client/application/geary-application.vala:24
+#: src/client/application/geary-application.vala:25
 msgid "Copyright 2016-2019 Geary Development Team."
 msgstr "Copyright 2016-2019 Equipo de desarrollo de Geary."
 
-#: src/client/application/geary-application.vala:26
+#: src/client/application/geary-application.vala:27
 msgid "Visit the Geary web site"
 msgstr "Visite el sitio web de Geary"
 
-#: src/client/application/geary-application.vala:420
+#: src/client/application/geary-application.vala:454
 #, c-format
 msgid "About %s"
 msgstr "Acerca de %s"
@@ -787,7 +794,7 @@ 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:424
+#: src/client/application/geary-application.vala:458
 msgid "translator-credits"
 msgstr ""
 "Daniel Mustieles <daniel mustieles gmail com>, 2015 - 2017\n"
@@ -877,23 +884,23 @@ msgstr "Opción de la línea de comandos «%s» no reconocida\n"
 
 #. Translators: File name used in save chooser when saving
 #. attachments that do not otherwise have a name.
-#: src/client/application/geary-controller.vala:61
+#: src/client/application/geary-controller.vala:58
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/client/application/geary-controller.vala:924
+#: src/client/application/geary-controller.vala:919
 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:937
+#: src/client/application/geary-controller.vala:932
 #, 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:938
+#: src/client/application/geary-controller.vala:933
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -918,20 +925,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:940
+#: src/client/application/geary-controller.vala:935
 msgid "_Rebuild"
 msgstr "_Reconstruir"
 
-#: src/client/application/geary-controller.vala:940
+#: src/client/application/geary-controller.vala:935
 msgid "E_xit"
 msgstr "_Salir"
 
-#: src/client/application/geary-controller.vala:949
+#: src/client/application/geary-controller.vala:944
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "No se puede reconstruir la base de datos para «%s»"
 
-#: src/client/application/geary-controller.vala:950
+#: src/client/application/geary-controller.vala:945
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -942,15 +949,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/client/application/geary-controller.vala:1803
+#: src/client/application/geary-controller.vala:1800
 msgid "Undo move (Ctrl+Z)"
 msgstr "Deshacer mover (Ctrl+Z)"
 
-#: src/client/application/geary-controller.vala:1813
+#: src/client/application/geary-controller.vala:1810
 msgid "Are you sure you want to open these attachments?"
 msgstr "¿Está seguro de que quiere abrir estos adjuntos?"
 
-#: src/client/application/geary-controller.vala:1814
+#: src/client/application/geary-controller.vala:1811
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -958,14 +965,14 @@ 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:1815
+#: src/client/application/geary-controller.vala:1812
 msgid "Don’t _ask me again"
 msgstr "No volver a _preguntarme"
 
 #. Translators: Dialog primary label when prompting to
 #. overwrite a file. The string substitution is the file'sx
 #. name.
-#: src/client/application/geary-controller.vala:1944
+#: src/client/application/geary-controller.vala:1941
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Ya existe un archivo llamado «%s». ¿Quiere reemplazarlo?"
@@ -973,77 +980,77 @@ msgstr "Ya existe un archivo llamado «%s». ¿Quiere reemplazarlo?"
 #. Translators: Dialog secondary label when prompting to
 #. overwrite a file. The string substitution is the parent
 #. folder's name.
-#: src/client/application/geary-controller.vala:1951
+#: src/client/application/geary-controller.vala:1948
 #, c-format
 msgid ""
 "The file already exists in “%s”.  Replacing it will overwrite its contents."
 msgstr ""
 "El archivo ya existe en «%s». Si lo reemplaza sobrescribirá su contenido."
 
-#: src/client/application/geary-controller.vala:1955
+#: src/client/application/geary-controller.vala:1952
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/client/application/geary-controller.vala:2231
+#: src/client/application/geary-controller.vala:2228
 msgid "Close the draft message?"
 msgid_plural "Close all draft messages?"
 msgstr[0] "¿Quiere cerrar el mensaje en borrador?"
 msgstr[1] "¿Quiere cerrar los mensajes en borrador?"
 
-#: src/client/application/geary-controller.vala:2357
+#: src/client/application/geary-controller.vala:2354
 #, 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:2358
+#: src/client/application/geary-controller.vala:2355
 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:2359
+#: src/client/application/geary-controller.vala:2356
 msgid "This cannot be undone."
 msgstr "Esto no se puede deshacer."
 
-#: src/client/application/geary-controller.vala:2360
+#: src/client/application/geary-controller.vala:2357
 #, c-format
 msgid "Empty %s"
 msgstr "Vaciar %s"
 
-#: src/client/application/geary-controller.vala:2377
+#: src/client/application/geary-controller.vala:2374
 #, c-format
 msgid "Error emptying %s"
 msgstr "Error al vaciar «%s»"
 
-#: src/client/application/geary-controller.vala:2409
+#: src/client/application/geary-controller.vala:2406
 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:2411
+#: src/client/application/geary-controller.vala:2408
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/client/application/geary-controller.vala:2425
+#: src/client/application/geary-controller.vala:2422
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Deshacer envío a la papelera (Ctrl+Z)"
 
-#: src/client/application/geary-controller.vala:2475
+#: src/client/application/geary-controller.vala:2472
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Deshacer archivado (Ctrl+Z)"
 
-#: src/client/application/geary-controller.vala:2520
+#: src/client/application/geary-controller.vala:2517
 msgid "Undo (Ctrl+Z)"
 msgstr "Deshacer (Ctrl+Z)"
 
 #. Translators: The label for an in-app notification. The
 #. string substitution is a list of recipients of the email.
-#: src/client/application/geary-controller.vala:2597
+#: src/client/application/geary-controller.vala:2598
 #, c-format
 msgid "Successfully sent mail to %s."
 msgstr "Correo enviado correctamente a %s."
 
-#: src/client/application/geary-controller.vala:2679
+#: src/client/application/geary-controller.vala:2680
 msgid "Failed to open default text editor."
 msgstr "Falló al abrir el editor de textos predeterminado."
 
@@ -1074,42 +1081,36 @@ msgid "Could not look up server name"
 msgstr "No se pudo encontrar el nombre del servidor"
 
 #: src/client/components/main-toolbar.vala:151
-#| msgid "Mark conversation"
 msgid "Mark conversation"
 msgid_plural "Mark conversations"
 msgstr[0] "Marcar conversación"
 msgstr[1] "Marcar conversaciones"
 
 #: src/client/components/main-toolbar.vala:156
-#| msgid "Add label to conversation"
 msgid "Add label to conversation"
 msgid_plural "Add label to conversations"
 msgstr[0] "Añadir etiqueta a la conversación"
 msgstr[1] "Añadir etiqueta a las conversaciones"
 
 #: src/client/components/main-toolbar.vala:161
-#| msgid "Move conversation"
 msgid "Move conversation"
 msgid_plural "Move conversations"
 msgstr[0] "Mover conversación"
 msgstr[1] "Mover conversaciones"
 
 #: src/client/components/main-toolbar.vala:166
-#| msgid "Archive conversation (A)"
 msgid "Archive conversation (A)"
 msgid_plural "Archive conversations (A)"
 msgstr[0] "Archivar conversación (A)"
 msgstr[1] "Archivar conversaciones (A)"
 
 #: src/client/components/main-toolbar.vala:175
-#| msgid "Move conversation to Trash (Delete, Backspace)"
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgid_plural "Move conversations to Trash (Delete, Backspace)"
 msgstr[0] "Mover conversación a la papelera (Supr, Retroceso)"
 msgstr[1] "Mover conversaciones a la papelera (Supr, Retroceso)"
 
 #: src/client/components/main-toolbar.vala:183
-#| msgid "Delete conversation (Shift+Delete)"
 msgid "Delete conversation (Shift+Delete)"
 msgid_plural "Delete conversations (Shift+Delete)"
 msgstr[0] "Eliminar conversación (Mayús+Supr)"
@@ -1356,7 +1357,7 @@ msgstr "_Aceptar"
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/client/components/stock.vala:21 ui/gtk/menus.ui:34
+#: src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Acerca de"
 
@@ -1372,7 +1373,7 @@ msgstr "_Cerrar"
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/client/components/stock.vala:25 ui/gtk/menus.ui:29
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:56
 msgid "_Help"
 msgstr "Ay_uda"
 
@@ -1380,7 +1381,7 @@ msgstr "Ay_uda"
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/client/components/stock.vala:27 ui/gtk/menus.ui:17
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:46
 msgid "_Preferences"
 msgstr "_Preferencias"
 
@@ -1389,7 +1390,7 @@ msgstr "_Preferencias"
 msgid "_Print…"
 msgstr "_Imprimir…"
 
-#: src/client/components/stock.vala:29 ui/gtk/menus.ui:38
+#: src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Salir"
 
@@ -1417,19 +1418,19 @@ msgstr "Enlace a URL no válido"
 msgid "Invalid email address"
 msgstr "Dirección correo-e no válida"
 
-#: src/client/composer/composer-widget.vala:157
+#: src/client/composer/composer-widget.vala:150
 msgid "Saved"
 msgstr "Guardado"
 
-#: src/client/composer/composer-widget.vala:158
+#: src/client/composer/composer-widget.vala:151
 msgid "Saving"
 msgstr "Guardando"
 
-#: src/client/composer/composer-widget.vala:159
+#: src/client/composer/composer-widget.vala:152
 msgid "Error saving"
 msgstr "Error al guardar"
 
-#: src/client/composer/composer-widget.vala:160
+#: src/client/composer/composer-widget.vala:153
 msgid "Press Backspace to delete quote"
 msgstr "Pulse Retroceso para eliminar la cita"
 
@@ -1437,7 +1438,7 @@ msgstr "Pulse Retroceso para eliminar la cita"
 #. 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:169
+#: src/client/composer/composer-widget.vala:162
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1448,34 +1449,34 @@ 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:1128
+#: src/client/composer/composer-widget.vala:1121
 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:1156
+#: src/client/composer/composer-widget.vala:1149
 msgid "Do you want to discard this draft message?"
 msgstr "¿Quiere descartar este mensaje en borrador?"
 
-#: src/client/composer/composer-widget.vala:1273
+#: src/client/composer/composer-widget.vala:1266
 msgid "Send message with an empty subject and body?"
 msgstr "¿Quiere enviar el mensaje sin asunto ni cuerpo?"
 
-#: src/client/composer/composer-widget.vala:1275
+#: src/client/composer/composer-widget.vala:1268
 msgid "Send message with an empty subject?"
 msgstr "¿Quiere enviar el mensaje sin asunto?"
 
-#: src/client/composer/composer-widget.vala:1277
+#: src/client/composer/composer-widget.vala:1270
 msgid "Send message with an empty body?"
 msgstr "¿Quiere enviar el mensaje sin cuerpo?"
 
-#: src/client/composer/composer-widget.vala:1281
+#: src/client/composer/composer-widget.vala:1274
 msgid "Send message without an attachment?"
 msgstr "¿Quiere enviar el mensaje sin el archivo adjunto?"
 
-#: src/client/composer/composer-widget.vala:1586
+#: src/client/composer/composer-widget.vala:1579
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "Ya se ha adjuntado «%s» para enviarlo."
@@ -1485,63 +1486,63 @@ 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:1594
+#: src/client/composer/composer-widget.vala:1587
 #: src/client/conversation-viewer/conversation-email.vala:173
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: src/client/composer/composer-widget.vala:1631
+#: src/client/composer/composer-widget.vala:1624
 #, c-format
 msgid "“%s” could not be found."
 msgstr "No se pudo encontrar «%s»."
 
-#: src/client/composer/composer-widget.vala:1637
+#: src/client/composer/composer-widget.vala:1630
 #, c-format
 msgid "“%s” is a folder."
 msgstr "«%s» es una carpeta."
 
-#: src/client/composer/composer-widget.vala:1643
+#: src/client/composer/composer-widget.vala:1636
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "«%s» es un archivo vacío."
 
-#: src/client/composer/composer-widget.vala:1656
+#: src/client/composer/composer-widget.vala:1649
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "No se pudo abrir «%s» para lectura."
 
-#: src/client/composer/composer-widget.vala:1664
+#: src/client/composer/composer-widget.vala:1657
 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:1714
+#: src/client/composer/composer-widget.vala:1707
 #: src/client/conversation-viewer/conversation-email.vala:975
 #: src/engine/rfc822/rfc822-utils.vala:298 ui/conversation-message.ui:313
 msgid "To:"
 msgstr "Para:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1720
+#: src/client/composer/composer-widget.vala:1713
 #: src/client/conversation-viewer/conversation-email.vala:980
 #: src/engine/rfc822/rfc822-utils.vala:303 ui/conversation-message.ui:358
 msgid "Cc:"
 msgstr "Cc:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:1726
+#: src/client/composer/composer-widget.vala:1719
 #: src/client/conversation-viewer/conversation-email.vala:985
 #: ui/conversation-message.ui:403
 msgid "Bcc:"
 msgstr "Cco:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:1732
+#: src/client/composer/composer-widget.vala:1725
 msgid "Reply-To: "
 msgstr "Responder a:"
 
-#: src/client/composer/composer-widget.vala:1872
+#: src/client/composer/composer-widget.vala:1865
 msgid "Select Color"
 msgstr "Seleccionar color"
 
@@ -1550,20 +1551,20 @@ 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:2062
+#: src/client/composer/composer-widget.vala:2055
 #, 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:2121
+#: src/client/composer/composer-widget.vala:2116
 msgid "_From:"
 msgstr "_De:"
 
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2349
+#: src/client/composer/composer-widget.vala:2344
 msgid "Images"
 msgstr "Imágenes"
 
@@ -1588,22 +1589,22 @@ msgid "Delete conversation"
 msgstr "Eliminar conversación"
 
 #: src/client/conversation-list/conversation-list-view.vala:286
-#: ui/main-toolbar-menus.ui:16
+#: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Marcar como _leído"
 
 #: src/client/conversation-list/conversation-list-view.vala:289
-#: ui/main-toolbar-menus.ui:20
+#: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
 #: src/client/conversation-list/conversation-list-view.vala:292
-#: ui/main-toolbar-menus.ui:28
+#: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "_No destacar"
 
 #: src/client/conversation-list/conversation-list-view.vala:294
-#: ui/main-toolbar-menus.ui:24
+#: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "_Destacar"
 
@@ -3075,22 +3076,16 @@ msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Eliminar el formato"
 
-#: ui/gtk/menus.ui:13
-msgid "A_ccounts"
-msgstr "_Cuentas"
-
-#: ui/gtk/menus.ui:23
-msgid "_Keyboard Shortcuts"
-msgstr "Atajos del _teclado"
+#: ui/main-toolbar.ui:23
+#| msgid "Compose Message"
+msgctxt "tooltip"
+msgid "Compose Message"
+msgstr "Redactar mensaje"
 
-#: ui/main-toolbar.ui:51
+#: ui/main-toolbar.ui:52
 msgid "Toggle search bar"
 msgstr "Conmutar la barra de búsqueda"
 
-#: ui/main-toolbar.ui:72
-msgid "Empty Spam or Trash folders"
-msgstr "Vaciar las carpetas Spam o Papelera"
-
 #: ui/main-toolbar.ui:112
 msgid "Reply"
 msgstr "Responder"
@@ -3111,21 +3106,35 @@ msgstr "Conmutar la barra de búsqueda"
 msgid "_Archive"
 msgstr "_Archivar"
 
-#: ui/main-toolbar-menus.ui:5
+#: ui/main-toolbar-menus.ui:21
+msgid "Mark as S_pam"
+msgstr "Marcar como _spam"
+
+#: ui/main-toolbar-menus.ui:25
+msgid "Mark as not S_pam"
+msgstr "Marcar como no _spam"
+
+#: ui/main-toolbar-menus.ui:32
 msgid "Empty _Spam…"
 msgstr "Vaciar _Spam…"
 
-#: ui/main-toolbar-menus.ui:9
+#: ui/main-toolbar-menus.ui:36
 msgid "Empty _Trash…"
 msgstr "Vaciar la _papelera…"
 
-#: ui/main-toolbar-menus.ui:32
-msgid "Mark as S_pam"
-msgstr "Marcar como _spam"
+#: ui/main-toolbar-menus.ui:42
+#| msgid "Accounts"
+msgid "_Accounts"
+msgstr "_Cuentas"
 
-#: ui/main-toolbar-menus.ui:36
-msgid "Mark as not S_pam"
-msgstr "Marcar como no _spam"
+#: ui/main-toolbar-menus.ui:50
+msgid "_Keyboard Shortcuts"
+msgstr "Atajos del _teclado"
+
+#: ui/main-toolbar-menus.ui:61
+#| msgid "_About"
+msgid "_About Geary"
+msgstr "_Acerca de Geary"
 
 #. Infobar title when one or more accounts are offline
 #: ui/main-window.ui:183
@@ -3321,6 +3330,12 @@ msgstr "Detalles:"
 msgid "Geary update in progress…"
 msgstr "Actualización de Geary en proceso…"
 
+#~ msgid "A_ccounts"
+#~ msgstr "_Cuentas"
+
+#~ msgid "Empty Spam or Trash folders"
+#~ msgstr "Vaciar las carpetas Spam o Papelera"
+
 #~ msgid "Delete conversations (Shift+Delete)"
 #~ msgstr "Eliminar conversaciones (Mayús+Supr)"
 
@@ -3558,9 +3573,6 @@ msgstr "Actualización de Geary en proceso…"
 #~ msgid "Work, Home, etc."
 #~ msgstr "Trabajo, casa, etc."
 
-#~ msgid "_Save sent mail"
-#~ msgstr "_Guardar mensajes enviados"
-
 #~ msgid "Addi_tional email addresses…"
 #~ msgstr "Direcciones de correo-e adicionales…"