[balsa/wip/gmime3: 110/197] Update Spanish translation



commit 4dcaf1c840e7ca1abbdecb5714ddfa1b59ae074b
Author: Gloriana Cocozza <besttranslatedcr gmail com>
Date:   Mon Oct 16 09:55:16 2017 +0000

    Update Spanish translation

 po/es.po | 2784 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1589 insertions(+), 1195 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index aa22abb..522f1d2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: balsa.HEAD\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
 "product=balsa&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-07-02 15:31+0000\n"
-"PO-Revision-Date: 2017-08-01 10:21+0200\n"
+"POT-Creation-Date: 2017-10-03 11:09+0000\n"
+"PO-Revision-Date: 2017-10-16 11:47+0200\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: es <gnome-es-list gnome org>\n"
 "Language: es\n"
@@ -26,6 +26,49 @@ msgstr ""
 "X-Generator: Gtranslator 2.91.6\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../balsa.appdata.xml.in.h:1
+msgid ""
+"Balsa is a graphical mail client. While it is in active development, Balsa "
+"has many features such as:"
+msgstr ""
+"Balsa es un cliente de correo gráfico para clientes. Aunque se encuentra en "
+"desarrollo, Balsa presenta muchas características, tales como:"
+
+#: ../balsa.appdata.xml.in.h:2
+msgid "IMAP and POP3 support;"
+msgstr "soporte de IMAP y POP3;"
+
+#: ../balsa.appdata.xml.in.h:3
+msgid "sendmail or direct SMTP support;"
+msgstr "soporte de sendmail o SMTP directo;"
+
+#: ../balsa.appdata.xml.in.h:4
+msgid "optional multi-threaded retrieval and sending of messages;"
+msgstr "recuperación opcional multihilo y envío de mensajes;"
+
+#: ../balsa.appdata.xml.in.h:5
+msgid "support for all configurations of local mail folders;"
+msgstr ""
+"soporte para todas las configuraciones de las carpetas locales de correo;"
+
+#: ../balsa.appdata.xml.in.h:6
+msgid "automatic mail checking;"
+msgstr "revisión de correo automático;"
+
+# libinit_balsa/balsa-druid-page-directory.gob:194
+# libinit_balsa/balsa-druid-page-directory.gob:194
+#: ../balsa.appdata.xml.in.h:7
+msgid "mail printing;"
+msgstr "impresión de correo;"
+
+#: ../balsa.appdata.xml.in.h:8
+msgid "inline attachment viewing;"
+msgstr "visor de adjuntos incorporado;"
+
+#: ../balsa.appdata.xml.in.h:9
+msgid "and the proverbial much, much more."
+msgstr "y como siempre más y más."
+
 # src/filter-edit-dialog.c:783
 # src/filter-edit-dialog.c:693
 #: ../balsa.desktop.in.in.h:1 ../balsa-mailto-handler.desktop.in.in.h:1
@@ -86,8 +129,8 @@ msgstr "No se puede encontrar la dirección en la libreta"
 
 # libmutt/imap/imap_ssl.c:254
 # libmutt/imap/imap_ssl.c:254
-#: ../libbalsa/address-book.c:321 ../src/main-window.c:2923
-#: ../src/main-window.c:4227 ../src/sendmsg-window.c:3821
+#: ../libbalsa/address-book.c:321 ../src/main-window.c:2922
+#: ../src/main-window.c:4221 ../src/sendmsg-window.c:3818
 msgid "Unknown error"
 msgstr "Se ha producido un error desconocido"
 
@@ -180,21 +223,21 @@ msgstr "A_ñadir"
 # src/sendmsg-window.c:837
 # src/balsa-message.c:637 src/filter-edit-dialog.c:306 src/print.c:353
 # src/sendmsg-window.c:870
-#: ../libbalsa/address-view.c:160 ../src/balsa-mime-widget-message.c:748
+#: ../libbalsa/address-view.c:160 ../src/balsa-mime-widget-message.c:747
 #: ../src/balsa-print-object-header.c:171 ../src/sendmsg-window.c:717
-#: ../src/sendmsg-window.c:3528
+#: ../src/sendmsg-window.c:3525
 msgid "To:"
 msgstr "Para:"
 
 # src/balsa-message.c:574
 # src/balsa-message.c:638
-#: ../libbalsa/address-view.c:161 ../src/balsa-mime-widget-message.c:750
+#: ../libbalsa/address-view.c:161 ../src/balsa-mime-widget-message.c:749
 #: ../src/balsa-print-object-header.c:173 ../src/sendmsg-window.c:717
-#: ../src/sendmsg-window.c:3536
+#: ../src/sendmsg-window.c:3533
 msgid "CC:"
 msgstr "Cc:"
 
-#: ../libbalsa/address-view.c:162 ../src/balsa-mime-widget-message.c:752
+#: ../libbalsa/address-view.c:162 ../src/balsa-mime-widget-message.c:751
 #: ../src/balsa-print-object-header.c:175 ../src/sendmsg-window.c:717
 msgid "BCC:"
 msgstr "Cco:"
@@ -207,8 +250,8 @@ msgstr "Responder a:"
 
 # src/balsa-index.c:304 src/filter-edit-dialog.c:349
 # src/balsa-index.c:297 src/filter-edit-dialog.c:326
-#: ../libbalsa/body.c:121 ../libbalsa/mailbox_local.c:1843
-#: ../libbalsa/message.c:846
+#: ../libbalsa/body.c:121 ../libbalsa/mailbox_local.c:1829
+#: ../libbalsa/message.c:848
 msgid "(No subject)"
 msgstr "(Sin asunto)"
 
@@ -226,7 +269,7 @@ msgstr "No se pudo crear el flujo de salida"
 msgid "Could not read embedded message"
 msgstr "No se pudo leer el mensaje empotrado"
 
-#: ../libbalsa/filter.c:125 ../libbalsa/mailbox_local.c:871
+#: ../libbalsa/filter.c:125 ../libbalsa/mailbox_local.c:865
 msgid "Unable to load message body to match filter"
 msgstr "No se pudo cargar el cuerpo del mensaje que coincida con el filtro"
 
@@ -290,19 +333,19 @@ msgstr "Filtros no válidos %s para el buzón %s"
 # src/balsa-index.c:428
 # src/balsa-index.c:417
 #. FIXME: this is hack!
-#: ../libbalsa/filter-funcs.c:381 ../src/balsa-index.c:983
+#: ../libbalsa/filter-funcs.c:381 ../src/balsa-index.c:978
 msgid "To"
 msgstr "Para"
 
 # src/balsa-index.c:303
 # src/balsa-index.c:296
-#: ../libbalsa/filter-funcs.c:382 ../src/balsa-index.c:351
+#: ../libbalsa/filter-funcs.c:382 ../src/balsa-index.c:349
 msgid "From"
 msgstr "De"
 
 # src/balsa-index.c:304 src/filter-edit-dialog.c:349
 # src/balsa-index.c:297 src/filter-edit-dialog.c:326
-#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:367
+#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:365
 #: ../src/pref-manager.c:218
 msgid "Subject"
 msgstr "Asunto"
@@ -358,7 +401,7 @@ msgstr "Marcado"
 # src/pref-manager.c:1838
 #: ../libbalsa/filter-funcs.c:439
 msgid "Not "
-msgstr "No"
+msgstr "No "
 
 #: ../libbalsa/filter-funcs.c:455
 msgid "From %Y-%m-%d"
@@ -381,18 +424,18 @@ msgstr "O"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Fallo al descifrar la parte MIME: error de parseo"
 
-#: ../libbalsa/gmime-multipart-crypt.c:220
+#: ../libbalsa/gmime-multipart-crypt.c:222
 msgid "Cannot verify multipart/signed part due to missing subparts."
 msgstr ""
 "No se puede descifrar la parte multipart/encrypted porque faltan las "
 "subpartes."
 
-#: ../libbalsa/gmime-multipart-crypt.c:244
+#: ../libbalsa/gmime-multipart-crypt.c:246
 #, c-format
 msgid "unsupported protocol “%s”"
 msgstr "Protocolo «%s» no soportado"
 
-#: ../libbalsa/gmime-multipart-crypt.c:257
+#: ../libbalsa/gmime-multipart-crypt.c:259
 msgid ""
 "Cannot verify multipart/signed part: signature content-type does not match "
 "protocol."
@@ -400,7 +443,7 @@ msgstr ""
 "No se puede descifrar la parte multipart/encrypted: la firma del tipo de "
 "contenido no coincide con el protocolo."
 
-#: ../libbalsa/gmime-multipart-crypt.c:453
+#: ../libbalsa/gmime-multipart-crypt.c:455
 #, c-format
 msgid ""
 "Cannot decrypt multipart/encrypted part: unsupported encryption protocol "
@@ -409,11 +452,11 @@ msgstr ""
 "No se puede descifrar la parte multipart/encrypted: protocolo de cifrado "
 "«%s» no soportado."
 
-#: ../libbalsa/gmime-multipart-crypt.c:454
+#: ../libbalsa/gmime-multipart-crypt.c:456
 msgid "(none)"
 msgstr "(nada)"
 
-#: ../libbalsa/gmime-multipart-crypt.c:467
+#: ../libbalsa/gmime-multipart-crypt.c:469
 msgid ""
 "Cannot decrypt multipart/encrypted part: content-type does not match "
 "protocol."
@@ -421,13 +464,13 @@ msgstr ""
 "No se puede descifrar la parte multipart/encrypted: el tipo de contenido no "
 "coincide con el protocolo."
 
-#: ../libbalsa/gmime-multipart-crypt.c:482
+#: ../libbalsa/gmime-multipart-crypt.c:484
 msgid "Cannot decrypt multipart/encrypted part: unexpected content type"
 msgstr ""
 "No se puede descifrar la parte multipart/encrypted: tipo de contenido no "
 "esperado"
 
-#: ../libbalsa/gmime-multipart-crypt.c:524
+#: ../libbalsa/gmime-multipart-crypt.c:526
 msgid ""
 "Cannot decrypt multipart/encrypted part: failed to parse decrypted content"
 msgstr ""
@@ -474,41 +517,43 @@ msgstr "_Descargar imágenes"
 
 # src/main-window.c:399
 # src/main-window.c:401
-#: ../libbalsa/html.c:419 ../libbalsa/html.c:1089 ../libbalsa/identity.c:1702
-#: ../src/ab-window.c:148 ../src/mailbox-node.c:1113 ../src/main-window.c:3912
-#: ../src/toolbar-prefs.c:140
+#: ../libbalsa/html.c:419 ../libbalsa/html.c:1089 ../libbalsa/identity.c:1776
+#: ../src/ab-window.c:148 ../src/mailbox-node.c:1109 ../src/main-window.c:3906
+#: ../src/toolbar-prefs.c:140 ../ui/main-window.ui.h:72
+#: ../ui/message-window.ui.h:4 ../ui/sendmsg-window.ui.h:12
+#: ../ui/source-viewer.ui.h:2
 msgid "_Close"
 msgstr "_Cerrar"
 
 #. should "re" be localized ?
-#: ../libbalsa/identity.c:99 ../libbalsa/mailbox_local.c:1966
-#: ../libbalsa/mailbox_local.c:1968 ../src/sendmsg-window.c:3769
-#: ../src/sendmsg-window.c:3771
+#: ../libbalsa/identity.c:103 ../libbalsa/mailbox_local.c:1952
+#: ../libbalsa/mailbox_local.c:1954 ../src/sendmsg-window.c:3766
+#: ../src/sendmsg-window.c:3768
 msgid "Re:"
 msgstr "Re:"
 
-#: ../libbalsa/identity.c:100 ../src/sendmsg-window.c:3709
-#: ../src/sendmsg-window.c:3710 ../src/sendmsg-window.c:3711
+#: ../libbalsa/identity.c:104 ../src/sendmsg-window.c:3706
+#: ../src/sendmsg-window.c:3707 ../src/sendmsg-window.c:3708
 msgid "Fwd:"
 msgstr "Rnv:"
 
 # src/pref-manager.c:234 src/pref-manager.c:867
 # src/pref-manager.c:236 src/pref-manager.c:992
-#: ../libbalsa/identity.c:160
+#: ../libbalsa/identity.c:166
 msgid "New Identity"
 msgstr "Identidad nueva"
 
-#: ../libbalsa/identity.c:337
+#: ../libbalsa/identity.c:343
 #, c-format
 msgid "Error executing signature generator “%s”: %s"
 msgstr "Error al ejecutar el generador de firmas «%s»: %s"
 
-#: ../libbalsa/identity.c:346
+#: ../libbalsa/identity.c:352
 #, c-format
 msgid "Cannot read signature file “%s”: %s"
 msgstr "No se puede leer el archivo de firma «%s»: %s"
 
-#: ../libbalsa/identity.c:357
+#: ../libbalsa/identity.c:363
 #, c-format
 msgid "Signature in %s is not a UTF-8 text."
 msgstr "La firma en %s no es un texto UTF-8."
@@ -518,193 +563,194 @@ msgstr "La firma en %s no es un texto UTF-8."
 # src/sendmsg-window.c:1695
 # src/balsa-message.c:288 src/sendmsg-window.c:155 src/sendmsg-window.c:634
 # src/sendmsg-window.c:1728 src/sendmsg-window.c:1751
-#: ../libbalsa/identity.c:468 ../libbalsa/libbalsa-gpgme-cb.c:158
-#: ../libbalsa/libbalsa-gpgme-cb.c:359 ../libbalsa/smtp-server.c:472
+#: ../libbalsa/identity.c:474 ../libbalsa/libbalsa-gpgme-cb.c:191
+#: ../libbalsa/libbalsa-gpgme-cb.c:350 ../libbalsa/smtp-server.c:471
 #: ../src/ab-main.c:858 ../src/ab-window.c:141
 #: ../src/address-book-config.c:237 ../src/address-book-config.c:342
-#: ../src/address-book-config.c:388 ../src/balsa-app.c:89
-#: ../src/balsa-index.c:2657 ../src/balsa-mblist.c:1896
+#: ../src/address-book-config.c:388 ../src/balsa-app.c:86
+#: ../src/balsa-index.c:2649 ../src/balsa-mblist.c:1890
 #: ../src/balsa-message.c:1766 ../src/balsa-mime-widget-callbacks.c:85
-#: ../src/filter-edit-callbacks.c:1247 ../src/filter-edit-dialog.c:402
-#: ../src/filter-edit-dialog.c:571 ../src/filter-export-dialog.c:79
-#: ../src/filter-run-dialog.c:316 ../src/folder-conf.c:311
-#: ../src/folder-conf.c:573 ../src/folder-conf.c:806 ../src/mailbox-conf.c:462
+#: ../src/filter-edit-callbacks.c:1247 ../src/filter-edit-dialog.c:404
+#: ../src/filter-edit-dialog.c:573 ../src/filter-export-dialog.c:79
+#: ../src/filter-run-dialog.c:316 ../src/folder-conf.c:308
+#: ../src/folder-conf.c:570 ../src/folder-conf.c:803 ../src/mailbox-conf.c:462
 #: ../src/mailbox-conf.c:483 ../src/mailbox-conf.c:499
 #: ../src/mailbox-conf.c:1222 ../src/mailbox-conf.c:1259
-#: ../src/pref-manager.c:3298 ../src/sendmsg-window.c:532
-#: ../src/sendmsg-window.c:1557 ../src/sendmsg-window.c:2009
-#: ../src/sendmsg-window.c:3335 ../src/sendmsg-window.c:4698
-#: ../src/sendmsg-window.c:4995 ../src/sendmsg-window.c:5152
+#: ../src/pref-manager.c:3293 ../src/sendmsg-window.c:532
+#: ../src/sendmsg-window.c:1555 ../src/sendmsg-window.c:2007
+#: ../src/sendmsg-window.c:3332 ../src/sendmsg-window.c:4685
+#: ../src/sendmsg-window.c:4984 ../src/sendmsg-window.c:5141
 #: ../src/spell-check.c:382 ../src/store-address.c:208
 msgid "_Cancel"
 msgstr "C_ancelar"
 
-#: ../libbalsa/identity.c:469 ../libbalsa/libbalsa-gpgme-cb.c:157
-#: ../libbalsa/libbalsa-gpgme-cb.c:358 ../libbalsa/smtp-server.c:471
-#: ../src/ab-window.c:140 ../src/balsa-app.c:88 ../src/balsa-message.c:1767
+#: ../libbalsa/identity.c:475 ../libbalsa/libbalsa-gpgme-cb.c:190
+#: ../libbalsa/libbalsa-gpgme-cb.c:349 ../libbalsa/smtp-server.c:470
+#: ../src/ab-window.c:140 ../src/balsa-app.c:85 ../src/balsa-message.c:1767
 #: ../src/balsa-mime-widget-callbacks.c:86 ../src/filter-edit-callbacks.c:1246
-#: ../src/filter-edit-dialog.c:570 ../src/filter-export-dialog.c:78
-#: ../src/filter-run-dialog.c:315 ../src/main-window.c:4007
-#: ../src/pref-manager.c:3296 ../src/sendmsg-window.c:1556
-#: ../src/sendmsg-window.c:2010 ../src/sendmsg-window.c:3334
-#: ../src/sendmsg-window.c:4699 ../src/store-address.c:209
+#: ../src/filter-edit-dialog.c:572 ../src/filter-export-dialog.c:78
+#: ../src/filter-run-dialog.c:315 ../src/main-window.c:4001
+#: ../src/pref-manager.c:3291 ../src/sendmsg-window.c:1554
+#: ../src/sendmsg-window.c:2008 ../src/sendmsg-window.c:3331
+#: ../src/sendmsg-window.c:4686 ../src/store-address.c:209
 msgid "_OK"
 msgstr "_Aceptar"
 
 # src/main-window.c:396
 # src/main-window.c:395
-#: ../libbalsa/identity.c:481
+#: ../libbalsa/identity.c:487
 msgid "Current"
 msgstr "Actual"
 
 # src/pref-manager.c:1333
 # src/pref-manager.c:1476
-#: ../libbalsa/identity.c:731 ../libbalsa/smtp-server.c:179
+#: ../libbalsa/identity.c:740 ../libbalsa/smtp-server.c:178
 msgid "Default"
 msgstr "Predeterminado"
 
 # src/mailbox-conf.c:890
 # src/mailbox-conf.c:965
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:933
+#: ../libbalsa/identity.c:942
 msgid "_Face Path"
 msgstr "Ruta de la _cara"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:939
+#: ../libbalsa/identity.c:948
 msgid "_X-Face Path"
 msgstr "Ruta _X-Face"
 
 # src/address-book.c:477
 # src/address-book.c:523
 #. create the "General" tab
-#: ../libbalsa/identity.c:962
+#: ../libbalsa/identity.c:971
 msgid "General"
 msgstr "General"
 
 # src/pref-manager.c:234 src/pref-manager.c:867
 # src/pref-manager.c:236 src/pref-manager.c:992
-#: ../libbalsa/identity.c:964
+#: ../libbalsa/identity.c:973
 msgid "_Identity name:"
 msgstr "Nombre de la _identidad:"
 
 # src/store-address.c:50
 # src/store-address.c:52
-#: ../libbalsa/identity.c:966
+#: ../libbalsa/identity.c:975
 msgid "_Full name:"
 msgstr "Nombre _completo:"
 
 # src/store-address.c:52
 # src/store-address.c:54
-#: ../libbalsa/identity.c:968
+#: ../libbalsa/identity.c:977
 msgid "_Mailing address:"
 msgstr "_Dirección de correo:"
 
 # src/sendmsg-window.c:885
 # src/sendmsg-window.c:928
-#: ../libbalsa/identity.c:970
+#: ../libbalsa/identity.c:979
 msgid "Reply _to:"
 msgstr "_Responder a:"
 
 # src/filter-edit-dialog.c:454
 # src/filter-edit-dialog.c:404
-#: ../libbalsa/identity.c:972
+#: ../libbalsa/identity.c:981
 msgid "_Domain:"
 msgstr "_Dominio:"
 
 # src/main-window.c:421
 # src/main-window.c:428
 #. create the "Messages" tab
-#: ../libbalsa/identity.c:976
+#: ../libbalsa/identity.c:985
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../libbalsa/identity.c:978
+#: ../libbalsa/identity.c:987
 msgid "_BCC:"
 msgstr "_Cco:"
 
 # src/pref-manager.c:1007
 # src/pref-manager.c:1137
-#: ../libbalsa/identity.c:980
+#: ../libbalsa/identity.c:989
 msgid "Reply _string:"
 msgstr "_Cadena de respuesta:"
 
 # src/message-window.c:120
 # src/message-window.c:114
-#: ../libbalsa/identity.c:982
+#: ../libbalsa/identity.c:991
 msgid "F_orward string:"
 msgstr "Cadena de r_eenvío:"
 
-#: ../libbalsa/identity.c:985
+#: ../libbalsa/identity.c:994
 msgid "send messages in both plain text and _HTML format"
 msgstr "enviar mensajes tanto en formato texto plano como en _HTML"
 
 # src/filter-edit-dialog.c:626
 # src/filter-edit-dialog.c:538
-#: ../libbalsa/identity.c:988
+#: ../libbalsa/identity.c:997
 msgid "request positive (successful) _Delivery Status Notification by default"
 msgstr ""
-"Solicitar notificación de entrega de _mensaje (correcta) de forma "
+"Solicitar _notificación positiva (correcta) del estado de entrega de forma "
 "predeterminada"
 
 # src/filter-edit-dialog.c:626
 # src/filter-edit-dialog.c:538
-#: ../libbalsa/identity.c:992
+#: ../libbalsa/identity.c:1001
 msgid "request _Message Disposition Notification by default"
-msgstr "Solicitar notificación de entrega de _mensaje de forma predeterminada"
+msgstr ""
+"solicitar_notificación de disposición de mensaje de forma predeterminada"
 
 # libinit_balsa/balsa-druid-page-user.gob:91
 # libinit_balsa/balsa-druid-page-user.gob:91
-#: ../libbalsa/identity.c:1001
+#: ../libbalsa/identity.c:1010
 msgid "SMT_P server:"
 msgstr "Servidor SMT_P:"
 
 # src/pref-manager.c:237 src/pref-manager.c:949 src/pref-manager.c:1027
 # src/pref-manager.c:241 src/pref-manager.c:1074 src/pref-manager.c:1157
 #. create the "Signature" tab
-#: ../libbalsa/identity.c:1005
+#: ../libbalsa/identity.c:1014
 msgid "Signature"
 msgstr "Firma"
 
 # src/pref-manager.c:237 src/pref-manager.c:949 src/pref-manager.c:1027
 # src/pref-manager.c:241 src/pref-manager.c:1074 src/pref-manager.c:1157
-#: ../libbalsa/identity.c:1008
+#: ../libbalsa/identity.c:1017
 msgid "Signature _path"
 msgstr "Ruta de la _firma"
 
 # src/pref-manager.c:237 src/pref-manager.c:949 src/pref-manager.c:1027
 # src/pref-manager.c:1838
-#: ../libbalsa/identity.c:1011
+#: ../libbalsa/identity.c:1020
 msgid "_Execute signature"
 msgstr "_Ejecutar firma"
 
 # src/sendmsg-window.c:1434
 # src/sendmsg-window.c:1483
-#: ../libbalsa/identity.c:1014
+#: ../libbalsa/identity.c:1023
 msgid "Incl_ude signature"
 msgstr "Incl_uir firma"
 
-#: ../libbalsa/identity.c:1017
+#: ../libbalsa/identity.c:1026
 msgid "Include signature when for_warding"
 msgstr "Incluir firma cuando se _reenvíe"
 
-#: ../libbalsa/identity.c:1020
+#: ../libbalsa/identity.c:1029
 msgid "Include signature when rep_lying"
 msgstr "Incluir firma cua_ndo se conteste"
 
 # src/pref-manager.c:1021
 # src/pref-manager.c:1151
-#: ../libbalsa/identity.c:1023
+#: ../libbalsa/identity.c:1032
 msgid "_Add signature separator"
 msgstr "_Añadir separador de firma"
 
 # src/pref-manager.c:237 src/pref-manager.c:949 src/pref-manager.c:1027
 # src/pref-manager.c:241 src/pref-manager.c:1074 src/pref-manager.c:1157
-#: ../libbalsa/identity.c:1026
+#: ../libbalsa/identity.c:1035
 msgid "Prepend si_gnature"
 msgstr "An_teponer firma"
 
-#: ../libbalsa/identity.c:1032
+#: ../libbalsa/identity.c:1041
 msgid ""
 "Signing and encrypting messages are possible only if Balsa is built with "
 "cryptographic support."
@@ -712,53 +758,72 @@ msgstr ""
 "Sólo es posible firmar y cifrar mensajes si Balsa se construye con soporte "
 "criptográfico."
 
-#: ../libbalsa/identity.c:1037
+#: ../libbalsa/identity.c:1046
 msgid "Security"
 msgstr "Seguridad"
 
-#: ../libbalsa/identity.c:1040
+#: ../libbalsa/identity.c:1049
 msgid "sign messages by default"
 msgstr "firmar mensajes por omisión"
 
-#: ../libbalsa/identity.c:1043
+#: ../libbalsa/identity.c:1052
 msgid "encrypt messages by default"
 msgstr "cifrar mensajes por omisión"
 
-#: ../libbalsa/identity.c:1046
+#: ../libbalsa/identity.c:1055
 msgid "default protocol"
 msgstr "protocolo predeterminado"
 
-#: ../libbalsa/identity.c:1049
-msgid "always trust GnuPG keys when encrypting"
+#: ../libbalsa/identity.c:1058
+msgid "always trust GnuPG keys to encrypt messages"
 msgstr "confiar siempre en las claves GnuPG al cifrar"
 
-#: ../libbalsa/identity.c:1052
+#: ../libbalsa/identity.c:1061
 msgid "remind me if messages can be encrypted"
 msgstr "recordarme si se pueden cifrar los mensajes"
 
-#: ../libbalsa/identity.c:1055
+#: ../libbalsa/identity.c:1064
 msgid ""
-"use secret key with this id for signing\n"
+"use secret key with this id for signing GnuPG messages\n"
 "(leave empty for automatic selection)"
 msgstr ""
-"usar una clave secreta con esta ID para registrarse\n"
-"(vacío para una selección automática)"
+"usar una clave secreta con este ID para firmar mensajes GnuPG\n"
+"(dejar vacío para una selección automática)"
+
+#: ../libbalsa/identity.c:1068
+msgid ""
+"use certificate with this id for signing S/MIME messages\n"
+"(leave empty for automatic selection)"
+msgstr ""
+"usar una clave secreta con este ID para firmar mensajes S/MIME\n"
+"(dejar vacío para selección automática)"
+
+# src/sendmsg-window.c:1694
+# src/sendmsg-window.c:1749
+#: ../libbalsa/identity.c:1190
+#, c-format
+msgid "Error selecting key: %s"
+msgstr "Error al cargar la clave: %s"
+
+#: ../libbalsa/identity.c:1213
+msgid "Choose…"
+msgstr "Seleccionar…"
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../libbalsa/identity.c:1189
+#: ../libbalsa/identity.c:1260
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Ha ocurrido un error al leer el archivo %s: %s"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1199
+#: ../libbalsa/identity.c:1270
 #, c-format
 msgid "Face header file %s is too long (%lu bytes)."
 msgstr "El archivo de cabecera de la cara %s es demasiado largo (%lu bytes)."
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1209
+#: ../libbalsa/identity.c:1280
 #, c-format
 msgid "Face header file %s contains binary data."
 msgstr "El archivo de cabecera de la cara %s contiene datos binarios."
@@ -766,75 +831,76 @@ msgstr "El archivo de cabecera de la cara %s contiene datos binarios."
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1229 ../src/balsa-message.c:1591
+#: ../libbalsa/identity.c:1300 ../src/balsa-message.c:1591
 #, c-format
 msgid "Error loading Face: %s"
 msgstr "Ha ocurrido un error al cargar la cara: %s"
 
-#: ../libbalsa/identity.c:1408
+#: ../libbalsa/identity.c:1479
 msgid "Error: The identity does not have a name"
 msgstr "Error: La identidad no tiene un nombre"
 
-#: ../libbalsa/identity.c:1418
+#: ../libbalsa/identity.c:1489
 msgid "Error: An identity with that name already exists"
 msgstr "Error: Ya existe una identidad con ese nombre"
 
-#: ../libbalsa/identity.c:1611
+#: ../libbalsa/identity.c:1684
 msgid "Do you really want to delete the selected identity?"
 msgstr "¿Está seguro que quiere eliminar la identidad seleccionada?"
 
-#: ../libbalsa/identity.c:1656
+#: ../libbalsa/identity.c:1729
 #, c-format
 msgid "Error displaying help for identities: %s\n"
 msgstr "Error mostrando ayuda para identidades: %s\n"
 
 # src/main-window.c:259
 # src/main-window.c:262
-#: ../libbalsa/identity.c:1695
+#: ../libbalsa/identity.c:1768
 msgid "Manage Identities"
 msgstr "Gestionar identidades"
 
-#: ../libbalsa/identity.c:1699 ../libbalsa/smtp-server.c:473
+#: ../libbalsa/identity.c:1772 ../libbalsa/smtp-server.c:472
 #: ../src/address-book-config.c:238 ../src/address-book-config.c:340
 #: ../src/address-book-config.c:386 ../src/filter-edit-callbacks.c:1248
-#: ../src/filter-edit-dialog.c:572 ../src/filter-export-dialog.c:80
-#: ../src/filter-run-dialog.c:317 ../src/folder-conf.c:312
-#: ../src/folder-conf.c:574 ../src/folder-conf.c:807 ../src/main-window.c:3911
-#: ../src/pref-manager.c:3299 ../src/toolbar-prefs.c:141
+#: ../src/filter-edit-dialog.c:574 ../src/filter-export-dialog.c:80
+#: ../src/filter-run-dialog.c:317 ../src/folder-conf.c:309
+#: ../src/folder-conf.c:571 ../src/folder-conf.c:804 ../src/main-window.c:3905
+#: ../src/pref-manager.c:3294 ../src/toolbar-prefs.c:141 ../ui/ab-main.ui.h:16
+#: ../ui/main-window.ui.h:15
 msgid "_Help"
 msgstr "Ay_uda"
 
 # src/main-window.c:191
 # src/main-window.c:196
-#. new button
-#: ../libbalsa/identity.c:1700 ../src/filter-edit-dialog.c:224
-#: ../src/mailbox-node.c:1078
+#. Translators: button "New" identity
+#: ../libbalsa/identity.c:1774
+msgctxt "identity"
 msgid "_New"
-msgstr "_Nuevo"
+msgstr "_Nueva"
 
 # src/filter-edit-dialog.c:425 src/sendmsg-window.c:514
 # src/filter-edit-dialog.c:384 src/sendmsg-window.c:543
-#: ../libbalsa/identity.c:1701 ../src/ab-main.c:853
-#: ../src/filter-edit-callbacks.c:1081 ../src/filter-edit-dialog.c:318
+#: ../libbalsa/identity.c:1775 ../src/ab-main.c:853
+#: ../src/filter-edit-callbacks.c:1081 ../src/filter-edit-dialog.c:320
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../libbalsa/identity.c:2083
+#: ../libbalsa/identity.c:2160
 msgid "GnuPG MIME mode"
 msgstr "Modo MIME de GnuPG"
 
-#: ../libbalsa/identity.c:2085
+#: ../libbalsa/identity.c:2162
 msgid "GnuPG OpenPGP mode"
 msgstr "Modo OpenPGP de GnuPG"
 
-#: ../libbalsa/identity.c:2087
+#: ../libbalsa/identity.c:2164
 msgid "GpgSM S/MIME mode"
 msgstr "Modo S/MIME de GpgSM"
 
 # src/pref-manager.c:240
 # src/pref-manager.c:246
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:288
+#: ../libbalsa/imap-server.c:286
 #, c-format
 msgid ""
 "IMAP server %s alert:\n"
@@ -846,90 +912,89 @@ msgstr ""
 # src/pref-manager.c:240
 # src/pref-manager.c:246
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:292
+#: ../libbalsa/imap-server.c:290
 #, c-format
 msgid "IMAP server %s error: %s"
 msgstr "Error del servidor de correo IMAP %s: %s"
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../libbalsa/imap-server.c:529 ../libbalsa/server.c:368
+#: ../libbalsa/imap-server.c:527 ../libbalsa/server.c:354
 #, c-format
 msgid "Error looking up password for %s@%s: %s\n"
 msgstr "Error al buscar la contraseña para %s@%s: %s\n"
 
-#: ../libbalsa/imap-server.c:531 ../libbalsa/server.c:370
+#: ../libbalsa/imap-server.c:529 ../libbalsa/server.c:356
 #, c-format
 msgid "Falling back\n"
 msgstr "Volviendo atrás\n"
 
 # src/mailbox-conf.c:827 src/mailbox-conf.c:886
 # src/mailbox-conf.c:904 src/mailbox-conf.c:961
-#: ../libbalsa/imap-server.c:541 ../libbalsa/imap-server.c:577
-#: ../libbalsa/server.c:379 ../libbalsa/server.c:413 ../libbalsa/server.c:471
-#: ../libbalsa/server.c:485
+#: ../libbalsa/imap-server.c:539 ../libbalsa/server.c:365
+#: ../libbalsa/server.c:428
 msgid "Balsa passwords"
 msgstr "Contraseñas de Balsa"
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../libbalsa/imap-server.c:550 ../libbalsa/server.c:388
-#: ../libbalsa/server.c:478
+#: ../libbalsa/imap-server.c:548 ../libbalsa/server.c:374
+#: ../libbalsa/server.c:435
 #, c-format
 msgid "Error storing password for %s@%s: %s\n"
 msgstr "Error al guardar la contraseña para %s@%s: %s\n"
 
 # libmutt/imap/imap_ssl.c:229
 # libmutt/imap/imap_ssl.c:229
-#: ../libbalsa/imap-server.c:628
+#: ../libbalsa/imap-server.c:595
 #, c-format
 msgid "Cannot connect to %s"
 msgstr "No se puede conectar con %s"
 
 # libmutt/imap/imap_ssl.c:229
 # libmutt/imap/imap_ssl.c:229
-#: ../libbalsa/imap-server.c:633 ../libbalsa/imap-server.c:638
+#: ../libbalsa/imap-server.c:600 ../libbalsa/imap-server.c:605
 #, c-format
 msgid "Cannot connect to the server: %s"
 msgstr "No se puede conectar con el servidor: %s"
 
-#: ../libbalsa/imap-server.c:787
+#: ../libbalsa/imap-server.c:754
 #, c-format
 msgid "Exceeded the number of connections per server %s"
 msgstr "Se sobrepasó el número de conexiones por servidor %s"
 
 # libmutt/imap/imap_ssl.c:297
 # libmutt/imap/imap_ssl.c:297
-#: ../libbalsa/libbalsa.c:369
+#: ../libbalsa/libbalsa.c:360
 msgid "Invalid date"
 msgstr "Fecha no válida"
 
 # libmutt/imap/imap_ssl.c:254
 # libmutt/imap/imap_ssl.c:254
-#: ../libbalsa/libbalsa.c:386 ../src/pref-manager.c:934
-#: ../src/pref-manager.c:3600
+#: ../libbalsa/libbalsa.c:377 ../src/pref-manager.c:934
+#: ../src/pref-manager.c:3595
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../libbalsa/libbalsa.c:528 ../libbalsa/libbalsa.c:633
+#: ../libbalsa/libbalsa.c:519 ../libbalsa/libbalsa.c:624
 msgid "SSL/TLS certificate"
 msgstr "Certificado SSL/TLS"
 
-#: ../libbalsa/libbalsa.c:532 ../libbalsa/libbalsa.c:637
+#: ../libbalsa/libbalsa.c:523 ../libbalsa/libbalsa.c:628
 msgid "_Accept Once"
 msgstr "_Aceptar una vez"
 
-#: ../libbalsa/libbalsa.c:533 ../libbalsa/libbalsa.c:638
+#: ../libbalsa/libbalsa.c:524 ../libbalsa/libbalsa.c:629
 msgid "Accept & _Save"
 msgstr "Acepta_r y guardar"
 
 # src/sendmsg-window.c:224
 # src/sendmsg-window.c:228
-#: ../libbalsa/libbalsa.c:534 ../libbalsa/libbalsa.c:639
+#: ../libbalsa/libbalsa.c:525 ../libbalsa/libbalsa.c:630
 msgid "_Reject"
 msgstr "_Rechazar"
 
-#: ../libbalsa/libbalsa.c:544
+#: ../libbalsa/libbalsa.c:535
 #, c-format
 msgid ""
 "<big><b>Authenticity of this certificate could not be verified.</b></big>\n"
@@ -938,7 +1003,7 @@ msgstr ""
 "<big><b>No se pudo verificar la autenticidad de este certificado.</b></big>\n"
 "Razón: %s"
 
-#: ../libbalsa/libbalsa.c:591
+#: ../libbalsa/libbalsa.c:582
 #, c-format
 msgid ""
 "Authenticity of this certificate could not be verified.\n"
@@ -951,7 +1016,7 @@ msgstr ""
 
 # libmutt/imap/imap_ssl.c:462
 # libmutt/imap/imap_ssl.c:462
-#: ../libbalsa/libbalsa.c:603
+#: ../libbalsa/libbalsa.c:594
 msgid ""
 "\n"
 "<b>This certificate was issued by:</b>\n"
@@ -959,7 +1024,7 @@ msgstr ""
 "\n"
 "<b>Este certificado lo ha emitido:</b>\n"
 
-#: ../libbalsa/libbalsa.c:614
+#: ../libbalsa/libbalsa.c:605
 #, c-format
 msgid ""
 "<b>This certificate is valid</b>\n"
@@ -972,30 +1037,30 @@ msgstr ""
 "a %s\n"
 "<b>Huella:</b> %s"
 
-#: ../libbalsa/libbalsa.c:688
+#: ../libbalsa/libbalsa.c:679
 #, c-format
 msgid "Connection to %s timed out. Abort?"
 msgstr "Se agotó el tiempo de conexión para %s. ¿Abortar?"
 
-#: ../libbalsa/libbalsa.c:845
+#: ../libbalsa/libbalsa.c:836
 #, c-format
 msgid "No image data"
 msgstr "Sin datos de imagen"
 
 # libmutt/imap/imap_ssl.c:297
 # libmutt/imap/imap_ssl.c:297
-#: ../libbalsa/libbalsa.c:879
+#: ../libbalsa/libbalsa.c:870
 #, c-format
 msgid "Invalid input format"
 msgstr "Formato de entrada no válido"
 
-#: ../libbalsa/libbalsa.c:883
+#: ../libbalsa/libbalsa.c:874
 #, c-format
 msgid "Internal buffer overrun"
 msgstr "Sobrepasado el búfer interno"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/libbalsa.c:900
+#: ../libbalsa/libbalsa.c:891
 #, c-format
 msgid "Bad X-Face data"
 msgstr "Datos X-Face erróneos"
@@ -1006,26 +1071,33 @@ msgstr "Su configuración de Balsa ahora se guarda en «~/.balsa/config»."
 
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
-#: ../libbalsa/libbalsa-gpgme.c:196
+#: ../libbalsa/libbalsa-gpgme.c:204
 msgid "could not create context"
 msgstr "no se pudo crear contexto"
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../libbalsa/libbalsa-gpgme.c:200
+#: ../libbalsa/libbalsa-gpgme.c:208
 #, c-format
 msgid "could not set protocol “%s”"
 msgstr "No se pudo establecer el protocolo «%s»"
 
+# src/balsa-message.c:301
+# src/balsa-message.c:331
+#: ../libbalsa/libbalsa-gpgme.c:262
+#, c-format
+msgid "could not set folder “%s” for engine “%s”"
+msgstr "no se pudo establecer la carpeta «%s» para el motor «%s»"
+
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
-#: ../libbalsa/libbalsa-gpgme.c:260 ../libbalsa/libbalsa-gpgme.c:271
-#: ../libbalsa/libbalsa-gpgme.c:373 ../libbalsa/libbalsa-gpgme.c:496
-#: ../libbalsa/libbalsa-gpgme.c:589
+#: ../libbalsa/libbalsa-gpgme.c:319 ../libbalsa/libbalsa-gpgme.c:330
+#: ../libbalsa/libbalsa-gpgme.c:432 ../libbalsa/libbalsa-gpgme.c:555
+#: ../libbalsa/libbalsa-gpgme.c:648
 msgid "could not get data from stream"
 msgstr "no se pudo obtener datos del flujo"
 
-#: ../libbalsa/libbalsa-gpgme.c:284 ../libbalsa/rfc3156.c:363
+#: ../libbalsa/libbalsa-gpgme.c:343 ../libbalsa/rfc3156.c:363
 #: ../libbalsa/rfc3156.c:368 ../libbalsa/rfc3156.c:534
 #: ../libbalsa/rfc3156.c:540
 msgid "signature verification failed"
@@ -1033,40 +1105,44 @@ msgstr "la verificación de la firma ha fallado"
 
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
-#: ../libbalsa/libbalsa-gpgme.c:381 ../libbalsa/libbalsa-gpgme.c:505
-#: ../libbalsa/libbalsa-gpgme.c:597
+#: ../libbalsa/libbalsa-gpgme.c:440 ../libbalsa/libbalsa-gpgme.c:564
+#: ../libbalsa/libbalsa-gpgme.c:656
 msgid "could not create new data object"
 msgstr "no se pudo crear el objeto de datos nuevo"
 
 # libmutt/imap/auth.c:373
 # libmutt/imap/auth.c:373
-#: ../libbalsa/libbalsa-gpgme.c:390
+#: ../libbalsa/libbalsa-gpgme.c:449
 msgid "signing failed"
 msgstr "la firma ha fallado"
 
-#: ../libbalsa/libbalsa-gpgme.c:464
+#: ../libbalsa/libbalsa-gpgme.c:523
 #, c-format
 msgid "combined signing and encryption is defined only for RFC 2440"
 msgstr "la firma y el cifrado combinado sólo están definidos para el RFC 2440"
 
-#: ../libbalsa/libbalsa-gpgme.c:532
+#: ../libbalsa/libbalsa-gpgme.c:591
 msgid "signing and encryption failed"
 msgstr "han fallado la firma y el descifrado"
 
-#: ../libbalsa/libbalsa-gpgme.c:534
+#: ../libbalsa/libbalsa-gpgme.c:593
 msgid "encryption failed"
 msgstr "el cifrado ha fallado"
 
-#: ../libbalsa/libbalsa-gpgme.c:607 ../libbalsa/rfc3156.c:434
+#: ../libbalsa/libbalsa-gpgme.c:666 ../libbalsa/rfc3156.c:434
 #: ../libbalsa/rfc3156.c:439
 msgid "decryption failed"
 msgstr "falló el descifrado"
 
-#: ../libbalsa/libbalsa-gpgme.c:760
+#: ../libbalsa/libbalsa-gpgme.c:771
+#, c-format
+msgid "No private key for protocol %s is available for the signer “%s”"
+msgstr ""
+"No existen clave privadas disponibles para el protocolo %s para el firmante "
+"«%s»"
+
+#: ../libbalsa/libbalsa-gpgme.c:921
 #, c-format
-#| msgid ""
-#| "%s: a key for %s is present, but it is expired, disabled, revoked or "
-#| "invalid"
 msgid ""
 "A key for “%s” is present, but it is expired, disabled, revoked or invalid"
 msgstr ""
@@ -1075,79 +1151,66 @@ msgstr ""
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../libbalsa/libbalsa-gpgme.c:763
+#: ../libbalsa/libbalsa-gpgme.c:924
 #, c-format
-#| msgid "could not list keys for “%s”"
 msgid "Could not find a key for “%s”"
 msgstr "No se pudo encontrar una clave para «%s»"
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../libbalsa/libbalsa-gpgme.c:778
+#: ../libbalsa/libbalsa-gpgme.c:939
 #, c-format
-#| msgid "%s: multiple keys for %s"
 msgid "Multiple keys for “%s”"
 msgstr "Claves múltiples para «%s»"
 
-#: ../libbalsa/libbalsa-gpgme.c:799
+#: ../libbalsa/libbalsa-gpgme.c:961
 #, c-format
-#| msgid "%s: insufficient validity for UID %s"
 msgid "Insufficient key validity"
 msgstr "Validez insuficiente para la clave"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:136
-msgid "User ID"
-msgstr "ID del usuario"
-
-#: ../libbalsa/libbalsa-gpgme-cb.c:136
-msgid "Key ID"
-msgstr "ID de clave"
-
-#: ../libbalsa/libbalsa-gpgme-cb.c:136
-msgid "Length"
-msgstr "Longitud"
-
-# src/main-window.c:259
-# src/main-window.c:262
-#: ../libbalsa/libbalsa-gpgme-cb.c:136
-msgid "Validity"
-msgstr "Validez"
-
 # src/sendmsg-window.c:191
 # src/sendmsg-window.c:196
 #. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/libbalsa-gpgme-cb.c:153
+#: ../libbalsa/libbalsa-gpgme-cb.c:186
 msgid "Select key"
 msgstr "Seleccione clave"
 
 # src/sendmsg-window.c:166
 # src/sendmsg-window.c:172
-#: ../libbalsa/libbalsa-gpgme-cb.c:174
+#: ../libbalsa/libbalsa-gpgme-cb.c:207
 #, c-format
-msgid "Select the private key for the signer %s"
-msgstr "Seleccione la clave privada para el firmante %s"
+msgid "Select the private key for the signer “%s”"
+msgstr "Seleccionar la clave privada para el firmante «%s»"
 
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
-#: ../libbalsa/libbalsa-gpgme-cb.c:179
+#: ../libbalsa/libbalsa-gpgme-cb.c:212
 #, c-format
-msgid "Select the public key for the recipient %s"
-msgstr "Seleccione la clave pública para el destinatario %s"
+msgid "Select the public key for the recipient “%s”"
+msgstr "Seleccione la clave pública para el destinatario «%s»"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:184
+#: ../libbalsa/libbalsa-gpgme-cb.c:217
 #, c-format
 msgid ""
-"There seems to be no public key for recipient %s in your key ring.\n"
+"There seems to be no public key for recipient “%s” in your key ring.\n"
 "If you are sure that the recipient owns a different key, select it from the "
 "list."
 msgstr ""
-"Esto no parece ser una clave pública para el destinatario %s en su depósito "
-"de claves.\n"
+"Parece que no hay claves públicas para el destinatario %s en su depósito de "
+"claves.\n"
 "Si está seguro de que el destinatario tiene una clave diferente, "
 "selecciónela en la lista."
 
+#: ../libbalsa/libbalsa-gpgme-cb.c:230
+msgid "Double-click key to show details"
+msgstr "Pulse dos veces sobre la clave para mostrar los detalles"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:278
+msgid "User ID"
+msgstr "ID del usuario"
+
 #. create the dialog
-#: ../libbalsa/libbalsa-gpgme-cb.c:323
+#: ../libbalsa/libbalsa-gpgme-cb.c:314
 #, c-format
 msgid ""
 "The owner trust for this key is “%s” only.\n"
@@ -1156,17 +1219,16 @@ msgstr ""
 "El propietario de confianza de esta clave sólo es «%s».\n"
 "¿Quiere usar de todos modos?"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:325
-#| msgid "Insufficient trust for recipient %s"
+#: ../libbalsa/libbalsa-gpgme-cb.c:316
 msgid "Insufficient key owner trust"
 msgstr "No hay suficiente confianza en el propietario de la clave"
 
 #. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/libbalsa-gpgme-cb.c:355
+#: ../libbalsa/libbalsa-gpgme-cb.c:346
 msgid "Enter Passphrase"
 msgstr "Introduzca la frase de paso"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:383
+#: ../libbalsa/libbalsa-gpgme-cb.c:374
 #, c-format
 msgid ""
 "%s\n"
@@ -1179,7 +1241,7 @@ msgstr ""
 "\n"
 "Clave: %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:388
+#: ../libbalsa/libbalsa-gpgme-cb.c:379
 #, c-format
 msgid ""
 "%s\n"
@@ -1194,66 +1256,79 @@ msgstr ""
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../libbalsa/libbalsa-gpgme-keys.c:81
-#| msgid "error loading key: %s"
+#: ../libbalsa/libbalsa-gpgme-keys.c:83
 msgid "error setting key list mode"
 msgstr "error al configurar el modo de lista de la clave"
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../libbalsa/libbalsa-gpgme-keys.c:88 ../libbalsa/libbalsa-gpgme-keys.c:113
+#: ../libbalsa/libbalsa-gpgme-keys.c:90 ../libbalsa/libbalsa-gpgme-keys.c:115
 #, c-format
 msgid "could not list keys for “%s”"
 msgstr "no se pudieron listar las claves para «%s»"
 
+# src/balsa-message.c:1316
+# src/balsa-message.c:1474
+#: ../libbalsa/libbalsa-gpgme-keys.c:190 ../libbalsa/libbalsa-gpgme-keys.c:230
+msgid "cannot create data buffer"
+msgstr "no se pudo crear el búfer de datos"
+
+# src/balsa-message.c:301
+# src/balsa-message.c:331
+#: ../libbalsa/libbalsa-gpgme-keys.c:198
+#, c-format
+msgid "exporting key for “%s” failed"
+msgstr "la exportación de la clave para «%s» ha fallado"
+
 #: ../libbalsa/libbalsa-gpgme-keys.c:234
+msgid "importing ASCII-armored key data failed"
+msgstr "la importación de la clave de datos armada, ASCII ha fallado"
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:311
 #, c-format
 msgid "Cannot find a key with fingerprint %s on the key server."
 msgstr ""
 "No se puede encontrar una clave cuya huella sea %s en el servidor de claves."
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:238
+#: ../libbalsa/libbalsa-gpgme-keys.c:315
 #, c-format
 msgid ""
+"Found %u key with fingerprint %s on the key server. Please check and import "
+"the proper key manually."
+msgid_plural ""
 "Found %u keys with fingerprint %s on the key server. Please check and import "
-"the proper key manually"
-msgstr ""
+"the proper key manually."
+msgstr[0] ""
+"Se han encontrado %u claves cuya huella es %s en el servidor de claves. "
+"Compruebe e importe manualmente la clave adecuada."
+msgstr[1] ""
 "Se han encontrado %u claves cuya huella es %s en el servidor de claves. "
 "Compruebe e importe manualmente la clave adecuada."
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:246
+#: ../libbalsa/libbalsa-gpgme-keys.c:325
 #, c-format
-#| msgid "Sending the external body request failed: %s"
 msgid "Searching the key server failed: %s"
 msgstr "Fallo al buscar el servidor de claves: %s"
 
-# src/address-book.c:499
-# src/address-book.c:558
-#: ../libbalsa/libbalsa-gpgme-keys.c:285
-#| msgid "_Re-import"
-msgid "Key imported"
-msgstr "Clave importada"
-
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../libbalsa/libbalsa-gpgme-keys.c:325
-#| msgid "error loading key: %s"
+#: ../libbalsa/libbalsa-gpgme-keys.c:404
 msgid "error importing key"
 msgstr "error al importar la clave"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:333
+#: ../libbalsa/libbalsa-gpgme-keys.c:448
 msgid "No key was imported or updated."
 msgstr "No se ha importado ni actualizado ninguna clave."
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:336
+#: ../libbalsa/libbalsa-gpgme-keys.c:451
 msgid "The key was imported into the local key ring."
 msgstr "La clave se ha importado en el depósito de claves local."
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:340
+#: ../libbalsa/libbalsa-gpgme-keys.c:455
 msgid "The key was updated in the local key ring:"
-msgstr "La clave se ha actualizado en el depósito de claves local."
+msgstr "La clave se ha actualizado en el depósito de claves local:"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:343
+#: ../libbalsa/libbalsa-gpgme-keys.c:458
 #, c-format
 msgid ""
 "\n"
@@ -1268,7 +1343,7 @@ msgstr[1] ""
 "\n"
 "• %d ID de usuarios nuevos"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:348
+#: ../libbalsa/libbalsa-gpgme-keys.c:463
 #, c-format
 msgid ""
 "\n"
@@ -1285,9 +1360,8 @@ msgstr[1] ""
 
 # src/sendmsg-window.c:1434
 # src/sendmsg-window.c:1483
-#: ../libbalsa/libbalsa-gpgme-keys.c:353
+#: ../libbalsa/libbalsa-gpgme-keys.c:468
 #, c-format
-#| msgid "Incl_ude signature"
 msgid ""
 "\n"
 "• %d new signature"
@@ -1301,7 +1375,7 @@ msgstr[1] ""
 "\n"
 "• %d firmas nuevas"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:359
+#: ../libbalsa/libbalsa-gpgme-keys.c:474
 #, c-format
 msgid ""
 "\n"
@@ -1316,196 +1390,189 @@ msgstr[1] ""
 "\n"
 "• %d revocaciones nuevas"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:365
-msgid "No changes for the key were found on the key server."
-msgstr "No se han encontrado cambios en la clave en el servidor de claves."
+#: ../libbalsa/libbalsa-gpgme-keys.c:480
+msgid "The existing key in the key ring was not changed."
+msgstr "La clave existente en el depósito de claves no se cambió."
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:74
+#: ../libbalsa/libbalsa-gpgme-widgets.c:76
 msgid "Key status:"
 msgstr "Estado de la clave:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:80
-#: ../libbalsa/libbalsa-gpgme-widgets.c:87
-#| msgid ""
-#| "\n"
-#| "User ID:"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:82
+#: ../libbalsa/libbalsa-gpgme-widgets.c:89
 msgid "User ID:"
 msgstr "ID del usuario:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:80
+#: ../libbalsa/libbalsa-gpgme-widgets.c:82
 msgid "None"
 msgstr "Ninguno"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:85
+#: ../libbalsa/libbalsa-gpgme-widgets.c:87
 msgid "Primary user ID:"
 msgstr "ID de usuario primario:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:97
-#| msgid ""
-#| "\n"
-#| "Key owner trust: %s"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:99
 msgid "Key owner trust:"
 msgstr "Confianza del propietario de la clave:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:107
+#: ../libbalsa/libbalsa-gpgme-widgets.c:109
 msgid "Additional User IDs"
 msgstr "ID de usuarios adicionales"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:125
+#: ../libbalsa/libbalsa-gpgme-widgets.c:127
 msgid "Issuer"
 msgstr "Emisor"
 
 # src/address-book.c:362 src/filter-edit-dialog.c:135
 # src/address-book.c:387 src/filter-edit-dialog.c:130
-#: ../libbalsa/libbalsa-gpgme-widgets.c:136
-#| msgid "Name"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:138
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:140
-#| msgid ""
-#| "\n"
-#| "Issuer serial number: %s"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:142
 msgid "Serial number:"
 msgstr "Número de serie:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:143
-#| msgid ""
-#| "\n"
-#| "Chain ID: %s"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:145
 msgid "Chain ID:"
 msgstr "ID de cadena:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:154
+#: ../libbalsa/libbalsa-gpgme-widgets.c:156
 msgid "Subkey used"
 msgstr "Subclave usada"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:162
+#: ../libbalsa/libbalsa-gpgme-widgets.c:164
 #, c-format
 msgid "Subkeys (%s only)"
 msgstr "Subclaves (sólo %s)"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:167
+#: ../libbalsa/libbalsa-gpgme-widgets.c:169
 msgid "Subkeys"
 msgstr "Subclaves"
 
 # src/main-window.c:399
 # src/main-window.c:401
-#: ../libbalsa/libbalsa-gpgme-widgets.c:217 ../src/toolbar-factory.c:167
+#: ../libbalsa/libbalsa-gpgme-widgets.c:219 ../src/toolbar-factory.c:163
 msgid "Close"
 msgstr "Cerrar"
 
 # src/sendmsg-window.c:222
 # src/sendmsg-window.c:226
-#: ../libbalsa/libbalsa-gpgme-widgets.c:221
-#| msgid "_No"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:223
 msgid "No"
 msgstr "No"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:221
-#| msgid "_Yes"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:223
 msgid "Yes"
-msgstr "Sí"
+msgstr "Sí"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:296
-#| msgid " revoked"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:298
 msgid "revoked"
 msgstr "revocada"
 
 # src/main-window.c:448
 # src/main-window.c:455
-#: ../libbalsa/libbalsa-gpgme-widgets.c:299
-#| msgid " expired"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:301
 msgid "expired"
 msgstr "caducada"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:302
-#| msgid " disabled"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:304
 msgid "disabled"
 msgstr "desactivada"
 
 # libmutt/imap/imap_ssl.c:297
 # libmutt/imap/imap_ssl.c:297
-#: ../libbalsa/libbalsa-gpgme-widgets.c:305
-#| msgid " invalid"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:307
 msgid "invalid"
 msgstr "no válida"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:443
+#: ../libbalsa/libbalsa-gpgme-widgets.c:445
 msgid "Status:"
 msgstr "Estado:"
 
 # libmutt/imap/imap_ssl.c:481
 # libmutt/imap/imap_ssl.c:481
-#: ../libbalsa/libbalsa-gpgme-widgets.c:447
-#| msgid ""
-#| "\n"
-#| "Key fingerprint: %s"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:449
 msgid "Fingerprint:"
 msgstr "Huella:"
 
 #: ../libbalsa/libbalsa-gpgme-widgets.c:452
+#: ../src/balsa-print-object-default.c:152
+#: ../src/balsa-print-object-default.c:154
+#: ../src/balsa-print-object-default.c:157
+msgid "Type:"
+msgstr "Tipo:"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:458
 msgid "Capabilities:"
 msgstr "Prestaciones:"
 
 # libmutt/imap/imap_ssl.c:297
 # libmutt/imap/imap_ssl.c:297
-#: ../libbalsa/libbalsa-gpgme-widgets.c:457
-#| msgid "Invalid date"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:463
 msgid "invalid timestamp"
 msgstr "fecha no válida"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:459
-#| msgid "Font available for printing"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:465
 msgid "not available"
 msgstr "no disponible"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:463
-#| msgid "_Create"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:469
 msgid "Created:"
 msgstr "Creada:"
 
 # src/pref-manager.c:194
 # src/pref-manager.c:193
-#: ../libbalsa/libbalsa-gpgme-widgets.c:467 ../libbalsa/rfc3156.c:687
+#: ../libbalsa/libbalsa-gpgme-widgets.c:473 ../libbalsa/rfc3156.c:687
 #: ../libbalsa/rfc3156.c:722 ../src/address-book-config.c:197
 msgid "never"
 msgstr "nunca"
 
 # src/main-window.c:448
 # src/main-window.c:455
-#: ../libbalsa/libbalsa-gpgme-widgets.c:471
-#| msgid " expired"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:477
 msgid "Expires:"
 msgstr "Caducidad:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:501
+#: ../libbalsa/libbalsa-gpgme-widgets.c:507
 msgid "sign"
 msgstr "firmar"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:504
-#| msgid "Encrypt"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:510
 msgid "encrypt"
 msgstr "cifrar"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:507
+#: ../libbalsa/libbalsa-gpgme-widgets.c:513
 msgid "certify"
 msgstr "certificar"
 
 # src/filter-edit-dialog.c:626
 # src/filter-edit-dialog.c:538
-#: ../libbalsa/libbalsa-gpgme-widgets.c:510
-#| msgid "_Authentication:"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:516
 msgid "authenticate"
 msgstr "autenticar"
 
-#: ../libbalsa/libbalsa-progress.c:65 ../src/main-window.c:3274
+#: ../libbalsa/libbalsa-gpgme-widgets.c:537
+#, c-format
+msgid "%u bit"
+msgid_plural "%u bits"
+msgstr[0] "%u bit"
+msgstr[1] "%u bits"
+
+# src/balsa-index-page.c:495
+# src/balsa-index-page.c:546
+#: ../libbalsa/libbalsa-gpgme-widgets.c:544
+#, c-format
+msgid " curve “%s”"
+msgstr " curva «%s»"
+
+#: ../libbalsa/libbalsa-progress.c:65 ../src/main-window.c:3271
 msgid "_Hide"
 msgstr "_Ocultar"
 
 # libmutt/mx.c:459 libmutt/mx.c:605
 # libmutt/mx.c:459 libmutt/mx.c:605
-#: ../libbalsa/libbalsa-vfs.c:557 ../src/sendmsg-window.c:4493
+#: ../libbalsa/libbalsa-vfs.c:557 ../src/sendmsg-window.c:4480
 #, c-format
 msgid "not a regular file"
 msgstr "no es un archivo regular"
@@ -1558,56 +1625,56 @@ msgstr "Ruta errónea al buzón local «%s»"
 msgid "Could not create a mailbox of type %s"
 msgstr "No se pudo crear un buzón del tipo %s"
 
-#: ../libbalsa/mailbox.c:854
+#: ../libbalsa/mailbox.c:852
 #, c-format
 msgid "Applying filter rules to %s"
 msgstr "Aplicando reglas de filtrado a: %s"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../libbalsa/mailbox.c:1019
+#: ../libbalsa/mailbox.c:1017
 #, c-format
 msgid "Copying from %s to %s"
 msgstr "Copiando de %s a %s"
 
-#: ../libbalsa/mailbox.c:1953
+#: ../libbalsa/mailbox.c:1936
 #, c-format
 msgid "libbalsa_mailbox_get_message: mailbox %s is closed"
 msgstr "libbalsa_mailbox_get_message: el buzón %s está cerrado"
 
 # src/main-window.c:403
 # src/main-window.c:406
-#: ../libbalsa/mailbox.c:2158
+#: ../libbalsa/mailbox.c:2141
 #, c-format
 msgid "Removing messages from source mailbox failed"
 msgstr "Ha fallado la eliminación de los mensajes del buzón de origen"
 
 # libmutt/imap/imap_ssl.c:254
 # libmutt/imap/imap_ssl.c:254
-#: ../libbalsa/mailbox.c:2985
+#: ../libbalsa/mailbox.c:2965
 msgid "from unknown"
 msgstr "desde desconocido"
 
 # src/main-window.c:177
 # src/main-window.c:184
-#: ../libbalsa/mailbox.c:2987
+#: ../libbalsa/mailbox.c:2967
 msgid "Loading…"
 msgstr "Cargando…"
 
-#: ../libbalsa/mailbox.c:3957
+#: ../libbalsa/mailbox.c:3927
 #, c-format
 msgid "Searching %s for partial messages"
 msgstr "Buscando %s para mensajes parciales"
 
 # libmutt/mx.c:1375
 # libmutt/mx.c:1375
-#: ../libbalsa/mailbox.c:4047
+#: ../libbalsa/mailbox.c:4017
 msgid "Reconstructing message"
 msgstr "Reconstruyendo el mensaje"
 
 # src/main-window.c:403
 # src/main-window.c:406
-#: ../libbalsa/mailbox.c:4306
+#: ../libbalsa/mailbox.c:4276
 #, c-format
 msgid "Finding duplicate messages in source mailbox failed"
 msgstr "Ha fallado la búsqueda de mensajes duplicados en el buzón de origen"
@@ -1638,18 +1705,18 @@ msgstr ""
 
 # libbalsa/mailbox_pop3.c:184
 # libbalsa/mailbox_pop3.c:198
-#: ../libbalsa/mailbox_imap.c:1124 ../libbalsa/mailbox_maildir.c:503
+#: ../libbalsa/mailbox_imap.c:1120 ../libbalsa/mailbox_maildir.c:503
 #: ../libbalsa/mailbox_mbox.c:754 ../libbalsa/mailbox_mh.c:539
 #, c-format
 msgid "%s: Opening %s Refcount: %d\n"
 msgstr "%s: Abriendo %s Conteo de ref: %d\n"
 
-#: ../libbalsa/mailbox_imap.c:1211
+#: ../libbalsa/mailbox_imap.c:1207
 #, c-format
 msgid "Downloading %ld kB"
 msgstr "Descargando %ld KiB"
 
-#: ../libbalsa/mailbox_imap.c:1610
+#: ../libbalsa/mailbox_imap.c:1606
 #, c-format
 msgid ""
 "IMAP SEARCH command failed for mailbox %s\n"
@@ -1658,46 +1725,46 @@ msgstr ""
 "El comando IMAP SEARCH falló para el buzón %s \n"
 "volviendo al método de búsqueda predeterminado"
 
-#: ../libbalsa/mailbox_imap.c:1670
+#: ../libbalsa/mailbox_imap.c:1666
 #, c-format
 msgid "No path found for mailbox “%s”, using “%s”"
 msgstr "No se encontró ruta para el buzón «%s», usando «%s»"
 
-#: ../libbalsa/mailbox_imap.c:1798 ../libbalsa/mailbox_imap.c:1839
+#: ../libbalsa/mailbox_imap.c:1794 ../libbalsa/mailbox_imap.c:1835
 #, c-format
 msgid "Cannot get IMAP handle"
 msgstr "No se encontró el manejador de IMAP"
 
-#: ../libbalsa/mailbox_imap.c:2444 ../libbalsa/mailbox_imap.c:2510
+#: ../libbalsa/mailbox_imap.c:2440 ../libbalsa/mailbox_imap.c:2506
 #, c-format
 msgid "Error fetching message from IMAP server: %s"
 msgstr "Error al bajar un mensaje del servidor IMAP: %s"
 
-#: ../libbalsa/mailbox_imap.c:2478
+#: ../libbalsa/mailbox_imap.c:2474
 #, c-format
 msgid "Downloading %u kB"
 msgstr "Descargando %u KiB"
 
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
-#: ../libbalsa/mailbox_imap.c:2522
+#: ../libbalsa/mailbox_imap.c:2518
 #, c-format
 msgid "Cannot create temporary file"
 msgstr "No se pudo crear el archivo temporal"
 
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
-#: ../libbalsa/mailbox_imap.c:2542
+#: ../libbalsa/mailbox_imap.c:2538
 #, c-format
 msgid "Cannot write to temporary file %s"
 msgstr "No se pudo escribir en el archivo temporal %s"
 
-#: ../libbalsa/mailbox_imap.c:2771 ../libbalsa/mailbox_imap.c:2890
+#: ../libbalsa/mailbox_imap.c:2767 ../libbalsa/mailbox_imap.c:2886
 #, c-format
 msgid "Uploading %ld kB"
 msgstr "Subiendo %ld KiB"
 
-#: ../libbalsa/mailbox_imap.c:3193
+#: ../libbalsa/mailbox_imap.c:3188
 msgid "Server-side threading not supported."
 msgstr "Los hilos de conversación en el lado del servidor no están soportados."
 
@@ -1719,31 +1786,31 @@ msgstr "El archivo de caché para el buzón %s será creado"
 msgid "Failed to read cache file %s: %s"
 msgstr "Falló al leer el archivo de caché %s: %s"
 
-#: ../libbalsa/mailbox_local.c:632 ../libbalsa/mailbox_local.c:651
-#: ../libbalsa/mailbox_local.c:675
+#: ../libbalsa/mailbox_local.c:632 ../libbalsa/mailbox_local.c:649
+#: ../libbalsa/mailbox_local.c:672
 #, c-format
 msgid "Cache file for mailbox %s will be repaired"
 msgstr "El archivo de cache para el buzón %s será reparado"
 
 # src/main-window.c:259
 # src/main-window.c:262
-#: ../libbalsa/mailbox_local.c:1248
+#: ../libbalsa/mailbox_local.c:1236
 #, c-format
 msgid "Filtering %s"
 msgstr "Filtrando %s"
 
-#: ../libbalsa/mailbox_local.c:1337
+#: ../libbalsa/mailbox_local.c:1325
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: ../libbalsa/mailbox_local.c:2135
+#: ../libbalsa/mailbox_local.c:2121
 #, c-format
 msgid "Open of %s failed. Errno = %d, "
 msgstr "Falló la apertura de %s. Nº de error = %d, "
 
 # libmutt/mbox.c:712
-#: ../libbalsa/mailbox_local.c:2157
+#: ../libbalsa/mailbox_local.c:2143
 #, c-format
 msgid "Failed to sync mailbox “%s”"
 msgstr "Falló al sincronizar buzón «%s»"
@@ -1826,7 +1893,7 @@ msgstr "No se pudo crear escribir el archivo %s: %s"
 #: ../libbalsa/mailbox_mbox.c:429
 #, c-format
 msgid "Failed to create temporary file “%s”: %s"
-msgstr "falló al crear el archivo temporal «%s»: %s"
+msgstr "Falló al crear el archivo temporal «%s»: %s"
 
 #: ../libbalsa/mailbox_mbox.c:441
 #, c-format
@@ -1959,7 +2026,7 @@ msgstr "Ha ocurrido un error al añadir el mensaje %d de %s a %s: %s"
 
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
-#: ../libbalsa/mailbox_pop3.c:495 ../libbalsa/send.c:787
+#: ../libbalsa/mailbox_pop3.c:495 ../libbalsa/send.c:797
 #, c-format
 msgid "Cannot load certificate file %s: %s"
 msgstr "No se pudo cargar el archivo de certificado %s: %s"
@@ -1987,145 +2054,147 @@ msgstr "Conectado"
 # libmutt/mx.c:848
 #: ../libbalsa/mailbox_pop3.c:654
 #, c-format
-msgid "%lu new messages (%s)"
-msgstr "%lu mensajes nuevo (%s)"
+msgid "%lu new message (%s)"
+msgid_plural "%lu new messages (%s)"
+msgstr[0] "%lu mensaje nuevo (%s)"
+msgstr[1] "%lu mensajes nuevos (%s)"
 
 # libmutt/imap/browse.c:93
 # libmutt/imap/browse.c:93
-#: ../libbalsa/mailbox_pop3.c:665
+#: ../libbalsa/mailbox_pop3.c:666
 msgid "Deleting messages on server…"
 msgstr "Eliminación de mensajes en el servidor…"
 
 # libmutt/imap/imap_ssl.c:481
 # libmutt/imap/imap_ssl.c:481
-#: ../libbalsa/mailbox_pop3.c:687
+#: ../libbalsa/mailbox_pop3.c:688
 #, c-format
 msgid "POP3 error: %s"
 msgstr "Error POP3: %s"
 
 #. done - clean up
-#: ../libbalsa/mailbox_pop3.c:694 ../libbalsa/send.c:1085
+#: ../libbalsa/mailbox_pop3.c:695 ../libbalsa/send.c:1094
 #, c-format
 msgid "Finished"
 msgstr "Terminado"
 
-#: ../libbalsa/message.c:618
+#: ../libbalsa/message.c:620
 #, c-format
 msgid "Mailbox (%s) is read-only: cannot change flags."
 msgstr "El buzón (%s) es de sólo lectura. No se pueden cambiar las marcas."
 
-#: ../libbalsa/misc.c:395
+#: ../libbalsa/misc.c:382
 msgid "West European"
 msgstr "Europeo occidental"
 
-#: ../libbalsa/misc.c:397 ../libbalsa/misc.c:431
+#: ../libbalsa/misc.c:384 ../libbalsa/misc.c:418
 msgid "East European"
 msgstr "Europeo oriental"
 
-#: ../libbalsa/misc.c:399
+#: ../libbalsa/misc.c:386
 msgid "South European"
 msgstr "Europeo del sur"
 
-#: ../libbalsa/misc.c:401
+#: ../libbalsa/misc.c:388
 msgid "North European"
 msgstr "Europeo del norte"
 
-#: ../libbalsa/misc.c:403 ../libbalsa/misc.c:433
+#: ../libbalsa/misc.c:390 ../libbalsa/misc.c:420
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: ../libbalsa/misc.c:405 ../libbalsa/misc.c:439
+#: ../libbalsa/misc.c:392 ../libbalsa/misc.c:426
 msgid "Arabic"
 msgstr "Árabe"
 
-#: ../libbalsa/misc.c:407 ../libbalsa/misc.c:435
+#: ../libbalsa/misc.c:394 ../libbalsa/misc.c:422
 msgid "Greek"
 msgstr "Griego"
 
-#: ../libbalsa/misc.c:409 ../libbalsa/misc.c:437
+#: ../libbalsa/misc.c:396 ../libbalsa/misc.c:424
 msgid "Hebrew"
 msgstr "Hebreo"
 
 # libinit_balsa/balsa-druid-page-directory.gob:60
 # libinit_balsa/balsa-druid-page-directory.gob:60
-#: ../libbalsa/misc.c:411
+#: ../libbalsa/misc.c:398
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../libbalsa/misc.c:413
+#: ../libbalsa/misc.c:400
 msgid "Nordic"
 msgstr "Nórdico"
 
-#: ../libbalsa/misc.c:415
+#: ../libbalsa/misc.c:402
 msgid "Thai"
-msgstr "Tailandés"
+msgstr "Tailandés"
 
-#: ../libbalsa/misc.c:417 ../libbalsa/misc.c:441
+#: ../libbalsa/misc.c:404 ../libbalsa/misc.c:428
 msgid "Baltic"
 msgstr "Báltico"
 
-#: ../libbalsa/misc.c:419
+#: ../libbalsa/misc.c:406
 msgid "Celtic"
 msgstr "Celta"
 
-#: ../libbalsa/misc.c:421
+#: ../libbalsa/misc.c:408
 msgid "West European (euro)"
 msgstr "Europeo occidental (euro)"
 
-#: ../libbalsa/misc.c:423
+#: ../libbalsa/misc.c:410
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../libbalsa/misc.c:425
+#: ../libbalsa/misc.c:412
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: ../libbalsa/misc.c:427
+#: ../libbalsa/misc.c:414
 msgid "Japanese"
-msgstr "Japonés"
+msgstr "Japonés"
 
-#: ../libbalsa/misc.c:429
+#: ../libbalsa/misc.c:416
 msgid "Korean"
 msgstr "Coreano"
 
 # libmutt/mbox.c:1028
-#: ../libbalsa/misc.c:622
+#: ../libbalsa/misc.c:609
 #, c-format
 msgid "Cannot open %s: %s"
 msgstr "No se pudo abrir %s: %s"
 
-#: ../libbalsa/misc.c:631
+#: ../libbalsa/misc.c:618
 #, c-format
 msgid "Cannot open %s: is a symbolic link"
 msgstr "No se puede abrir %s: es un enlace simbólico"
 
 # libmutt/mx.c:189
 # libmutt/mx.c:189
-#: ../libbalsa/misc.c:758
+#: ../libbalsa/misc.c:745
 msgid "Timeout exceeded while attempting fcntl lock!"
 msgstr "¡Expiró el tiempo para hacer el bloqueo fcntl!"
 
 # libmutt/mx.c:195
 # libmutt/mx.c:195
-#: ../libbalsa/misc.c:765
+#: ../libbalsa/misc.c:752
 #, c-format
 msgid "Waiting for fcntl lock… %d"
 msgstr "Esperando el bloqueo fcntl… %d"
 
 # libmutt/mx.c:223
 # libmutt/mx.c:223
-#: ../libbalsa/misc.c:793
+#: ../libbalsa/misc.c:780
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "¡Expiró el tiempo de espera cuando se intentaba el bloqueo flock!"
 
 # libmutt/mx.c:230
 # libmutt/mx.c:230
-#: ../libbalsa/misc.c:800
+#: ../libbalsa/misc.c:787
 #, c-format
 msgid "Waiting for flock attempt… %d"
 msgstr "Esperando para intentar el bloqueo flock… %d"
 
-#: ../libbalsa/misc.c:1077
+#: ../libbalsa/misc.c:1064
 #, c-format
 msgid "LDAP Directory for %s"
 msgstr "Directorio LDAP para %s"
@@ -2320,7 +2389,7 @@ msgstr "Firma S/MIME: "
 
 #: ../libbalsa/rfc3156.c:709
 msgid "(unknown protocol) "
-msgstr "(protocolo desconocido)"
+msgstr "(protocolo desconocido) "
 
 #: ../libbalsa/rfc3156.c:737
 #, c-format
@@ -2378,7 +2447,7 @@ msgstr ""
 
 #: ../libbalsa/rfc3156.c:788
 msgid " [Revoked]"
-msgstr "[Revocada]"
+msgstr " [Revocada]"
 
 # libmutt/imap/imap_ssl.c:297
 # libmutt/imap/imap_ssl.c:297
@@ -2406,17 +2475,17 @@ msgstr ""
 
 #: ../libbalsa/rfc3156.c:828
 msgid " revoked"
-msgstr "revocada"
+msgstr " revocada"
 
 # src/main-window.c:448
 # src/main-window.c:455
 #: ../libbalsa/rfc3156.c:833
 msgid " expired"
-msgstr "caducada"
+msgstr " caducada"
 
 #: ../libbalsa/rfc3156.c:838
 msgid " disabled"
-msgstr "desactivada"
+msgstr " desactivada"
 
 # libmutt/imap/imap_ssl.c:297
 # libmutt/imap/imap_ssl.c:297
@@ -2496,17 +2565,17 @@ msgstr "línea «%s» mal formada, valor o nombre vacío"
 
 # libinit_balsa/balsa-druid-page-user.gob:91
 # libinit_balsa/balsa-druid-page-user.gob:91
-#: ../libbalsa/send.c:206
+#: ../libbalsa/send.c:211
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: ../libbalsa/send.c:627
+#: ../libbalsa/send.c:635
 #, c-format
 msgid "Message %u of %u"
 msgstr "Mensaje %u de %u"
 
-#: ../libbalsa/send.c:650
+#: ../libbalsa/send.c:658
 #, c-format
 msgid "Cannot reach SMTP server %s (%s), any queued message will remain in %s."
 msgstr ""
@@ -2515,25 +2584,25 @@ msgstr ""
 
 # src/pref-manager.c:971
 # src/pref-manager.c:1099
-#: ../libbalsa/send.c:840
+#: ../libbalsa/send.c:850
 msgid "Sending Mail"
 msgstr "Enviando correo"
 
 # libmutt/imap/browse.c:93
 # libmutt/imap/browse.c:93
-#: ../libbalsa/send.c:946
+#: ../libbalsa/send.c:955
 #, c-format
 msgid "Save message in %s…"
 msgstr "Guardar mensaje en %s…"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../libbalsa/send.c:954
+#: ../libbalsa/send.c:963
 #, c-format
 msgid "Saving sent message to %s failed: %s"
 msgstr "Ha fallado al guardar el mensaje %s: %s"
 
-#: ../libbalsa/send.c:985
+#: ../libbalsa/send.c:994
 #, c-format
 msgid ""
 "Sending message failed: %s\n"
@@ -2544,27 +2613,27 @@ msgstr ""
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../libbalsa/send.c:1006
+#: ../libbalsa/send.c:1015
 #, c-format
 msgid "Sending queued messages to %s"
 msgstr "Enviando mensajes encolados a %s"
 
 # libmutt/imap/imap_ssl.c:229
 # libmutt/imap/imap_ssl.c:229
-#: ../libbalsa/send.c:1014
+#: ../libbalsa/send.c:1023
 #, c-format
 msgid "Connected to %s"
 msgstr "Conectado a %s"
 
 # src/mailbox-conf.c:581
-#: ../libbalsa/send.c:1068
+#: ../libbalsa/send.c:1077
 #, c-format
 msgid "Connecting SMTP server %s (%s) failed: %s"
 msgstr "Falló al conectar al servidor SMTP %s (%s): %s"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../libbalsa/send.c:1091
+#: ../libbalsa/send.c:1100
 #, c-format
 msgid "Transmitted %u message to %s"
 msgid_plural "Transmitted %u messages to %s"
@@ -2573,19 +2642,19 @@ msgstr[1] "Enviados %u mensajes a %s"
 
 # libmutt/mx.c:1375
 # libmutt/mx.c:1375
-#: ../libbalsa/send.c:1263 ../libbalsa/send.c:1329
+#: ../libbalsa/send.c:1280 ../libbalsa/send.c:1346
 #, c-format
 msgid "Cannot read %s: %s"
 msgstr "No se puede leer %s: %s"
 
 # libmutt/mx.c:1375
 # libmutt/mx.c:1375
-#: ../libbalsa/send.c:1266 ../libbalsa/send.c:1332
+#: ../libbalsa/send.c:1283 ../libbalsa/send.c:1349
 #, c-format
 msgid "Cannot read %s"
 msgstr "No se puede leer %s"
 
-#: ../libbalsa/send.c:1296
+#: ../libbalsa/send.c:1313
 #, c-format
 msgid ""
 "Cannot determine character set for text file “%s”; sending as MIME type “%s”"
@@ -2593,62 +2662,62 @@ msgstr ""
 "No puedo determinar el conjunto de caracteres para el archivo de texto «%s»; "
 "enviando como tipo MIME «%s»"
 
-#: ../libbalsa/send.c:1731
+#: ../libbalsa/send.c:1817
 msgid "This message will not be encrypted for the BCC: recipient."
 msgid_plural "This message will not be encrypted for the BCC: recipients."
-msgstr[0] "Este mensaje no se cifrará para el destinatario Cco:"
-msgstr[1] "Este mensaje no se cifrará para los destinatarios Cco:"
+msgstr[0] "Este mensaje no se cifrará para el Cco: destinatario."
+msgstr[1] "Este mensaje no se cifrará para los Cco: destinatarios."
 
-#: ../libbalsa/send.c:1826
+#: ../libbalsa/send.c:1912
 msgid "This message will not be encrypted for the BCC: recipient(s)."
-msgstr "Este mensaje no será cifrado para los destinatarios Cco:"
+msgstr "Este mensaje no será cifrado para los Cco: destinatario(s)."
 
 #. host, authentication method
-#: ../libbalsa/server.c:537
+#: ../libbalsa/server.c:485
 #, c-format
 msgid "Logging in to %s using %s"
 msgstr "Iniciando sesión en %s usando %s"
 
-#: ../libbalsa/smtp-server.c:298
+#: ../libbalsa/smtp-server.c:297
 msgid "SMTP over SSL (SMTPS)"
 msgstr "SMTP sobre SSL (SMTPS)"
 
 # src/main-window.c:448
 # src/main-window.c:455
-#: ../libbalsa/smtp-server.c:299 ../libinit_balsa/assistant_page_user.c:69
+#: ../libbalsa/smtp-server.c:298 ../libinit_balsa/assistant_page_user.c:69
 #: ../src/mailbox-conf.c:1295
 msgid "TLS required"
 msgstr "Se requiere TLS"
 
-#: ../libbalsa/smtp-server.c:300 ../libinit_balsa/assistant_page_user.c:70
+#: ../libbalsa/smtp-server.c:299 ../libinit_balsa/assistant_page_user.c:70
 #: ../src/mailbox-conf.c:1296
 msgid "TLS if possible (not recommended)"
 msgstr "TLS si es posible (no recomendado)"
 
-#: ../libbalsa/smtp-server.c:301 ../libinit_balsa/assistant_page_user.c:71
+#: ../libbalsa/smtp-server.c:300 ../libinit_balsa/assistant_page_user.c:71
 #: ../src/mailbox-conf.c:1297
 msgid "None (not recommended)"
 msgstr "Nada (no recomendado)"
 
-#: ../libbalsa/smtp-server.c:332
+#: ../libbalsa/smtp-server.c:331
 #, c-format
 msgid "Error displaying server help: %s\n"
 msgstr "Error al mostrar la ayuda del servidor: %s\n"
 
 # libinit_balsa/balsa-druid-page-user.gob:91
 # libinit_balsa/balsa-druid-page-user.gob:91
-#: ../libbalsa/smtp-server.c:467
+#: ../libbalsa/smtp-server.c:466
 msgid "SMTP Server"
 msgstr "Servidor SMTP"
 
 # src/sendmsg-window.c:228
 # src/sendmsg-window.c:232
-#: ../libbalsa/smtp-server.c:497 ../src/folder-conf.c:336
-#: ../src/mailbox-conf.c:1278 ../src/mailbox-conf.c:1391
+#: ../libbalsa/smtp-server.c:496 ../src/folder-conf.c:333
+#: ../src/mailbox-conf.c:1278 ../src/mailbox-conf.c:1388
 msgid "_Basic"
 msgstr "_Básico"
 
-#: ../libbalsa/smtp-server.c:502
+#: ../libbalsa/smtp-server.c:501
 msgid "_Descriptive Name:"
 msgstr "Nombre _descriptivo:"
 
@@ -2656,34 +2725,34 @@ msgstr "Nombre _descriptivo:"
 # src/mailbox-conf.c:891 src/mailbox-conf.c:949
 #. pop server
 #. imap server
-#: ../libbalsa/smtp-server.c:510 ../src/folder-conf.c:384
-#: ../src/mailbox-conf.c:1285 ../src/mailbox-conf.c:1400
+#: ../libbalsa/smtp-server.c:509 ../src/folder-conf.c:381
+#: ../src/mailbox-conf.c:1285 ../src/mailbox-conf.c:1397
 msgid "_Server:"
 msgstr "_Servidor:"
 
 #. security
-#: ../libbalsa/smtp-server.c:518 ../src/mailbox-conf.c:1290
+#: ../libbalsa/smtp-server.c:517 ../src/mailbox-conf.c:1290
 msgid "Se_curity:"
 msgstr "_Seguridad:"
 
 #. authentication or anonymous access
-#: ../libbalsa/smtp-server.c:522
+#: ../libbalsa/smtp-server.c:521
 msgid "Server requires authentication"
 msgstr "El servidor requiere autenticación"
 
 # src/filter-edit-dialog.c:626
 # src/filter-edit-dialog.c:538
-#: ../libbalsa/smtp-server.c:523
+#: ../libbalsa/smtp-server.c:522
 msgid "_Authentication:"
-msgstr "_Autenticación:"
+msgstr "_Autenticación:"
 
 # src/mailbox-conf.c:822 src/mailbox-conf.c:882
 # src/mailbox-conf.c:899 src/mailbox-conf.c:957
-#: ../libbalsa/smtp-server.c:529
+#: ../libbalsa/smtp-server.c:528
 msgid "_User Name:"
-msgstr " _Usuario:"
+msgstr "_Usuario:"
 
-#: ../libbalsa/smtp-server.c:536
+#: ../libbalsa/smtp-server.c:535
 msgid "_Pass Phrase:"
 msgstr "Frase de _paso:"
 
@@ -2693,43 +2762,43 @@ msgstr "Frase de _paso:"
 # src/address-book-config.c:459 src/filter-edit-dialog.c:379
 # src/mailbox-conf.c:279 src/mailbox-conf.c:1004 src/pref-manager.c:1230
 # src/pref-manager.c:2241
-#: ../libbalsa/smtp-server.c:549 ../src/folder-conf.c:374
-#: ../src/mailbox-conf.c:1329 ../src/mailbox-conf.c:1456
+#: ../libbalsa/smtp-server.c:548 ../src/folder-conf.c:371
+#: ../src/mailbox-conf.c:1329 ../src/mailbox-conf.c:1453
 msgid "_Advanced"
 msgstr "_Avanzado"
 
 #. client certificate and passphrase
 #. client certificate configuration
-#: ../libbalsa/smtp-server.c:552 ../src/mailbox-conf.c:264
+#: ../libbalsa/smtp-server.c:551 ../src/mailbox-conf.c:264
 msgid "Server requires client certificate"
 msgstr "El servidor requiere un certificado de cliente"
 
-#: ../libbalsa/smtp-server.c:553
+#: ../libbalsa/smtp-server.c:552
 msgid "_Client Certificate:"
 msgstr "_Certificado de cliente:"
 
-#: ../libbalsa/smtp-server.c:557 ../src/mailbox-conf.c:267
+#: ../libbalsa/smtp-server.c:556 ../src/mailbox-conf.c:267
 msgid "Choose Client Certificate"
 msgstr "Elegir certificado de cliente"
 
 # libmutt/imap/imap_ssl.c:523
 # libmutt/imap/imap_ssl.c:523
-#: ../libbalsa/smtp-server.c:559 ../src/mailbox-conf.c:266
+#: ../libbalsa/smtp-server.c:558 ../src/mailbox-conf.c:266
 msgid "Certificate _File:"
 msgstr "Archivo del _certificado:"
 
 # libmutt/imap/imap_ssl.c:523
 # libmutt/imap/imap_ssl.c:523
-#: ../libbalsa/smtp-server.c:566 ../src/mailbox-conf.c:272
+#: ../libbalsa/smtp-server.c:565 ../src/mailbox-conf.c:272
 msgid "Certificate _Pass Phrase:"
 msgstr "Frase de paso del _certificado:"
 
 #. split large messages
-#: ../libbalsa/smtp-server.c:575
+#: ../libbalsa/smtp-server.c:574
 msgid "Sp_lit message larger than"
 msgstr "_Partir el mensaje si es mayor de"
 
-#: ../libbalsa/smtp-server.c:580 ../src/pref-manager.c:2186
+#: ../libbalsa/smtp-server.c:579 ../src/pref-manager.c:2186
 msgid "MB"
 msgstr "MiB"
 
@@ -2747,8 +2816,8 @@ msgstr "Fuente del mensaje"
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../libbalsa/source-viewer.c:250 ../src/main-window.c:2069
-#: ../src/message-window.c:848
+#: ../libbalsa/source-viewer.c:250 ../src/main-window.c:2068
+#: ../src/message-window.c:844
 #, c-format
 msgid "Error adding from %s: %s\n"
 msgstr "Error al desde %s: %s\n"
@@ -2979,8 +3048,8 @@ msgid "_Type of mail server:"
 msgstr "_Tipo de servidor de correo:"
 
 #: ../libinit_balsa/assistant_page_user.c:114
-msgid "Connection _Security"
-msgstr "_Seguridad de la conexión"
+msgid "Connection _Security:"
+msgstr "Seguridad de la _conexión:"
 
 #: ../libinit_balsa/assistant_page_user.c:118
 msgid "Your email _login name:"
@@ -3071,7 +3140,7 @@ msgstr ""
 msgid "network client is already connected"
 msgstr "el cliente de red ya está conectado"
 
-#: ../libnetclient/net-client.c:155 ../libnetclient/net-client.c:198
+#: ../libnetclient/net-client.c:155 ../libnetclient/net-client.c:199
 #, c-format
 msgid "network client is not connected"
 msgstr "el cliente de red no está conectado"
@@ -3081,50 +3150,50 @@ msgstr "el cliente de red no está conectado"
 msgid "reply length %lu exceeds the maximum allowed length %lu"
 msgstr "la longitud %lu de la respuesta supera la el máximo %lu permitido"
 
-#: ../libnetclient/net-client.c:181
+#: ../libnetclient/net-client.c:182
 #, c-format
 msgid "connection lost"
 msgstr "conexión perdida"
 
-#: ../libnetclient/net-client.c:229
+#: ../libnetclient/net-client.c:230
 #, c-format
 msgid "line too long"
 msgstr "línea demasiado larga"
 
 # src/message-window.c:120
 # src/message-window.c:114
-#: ../libnetclient/net-client.c:298
+#: ../libnetclient/net-client.c:299
 #, c-format
 msgid "error initializing certificate: %s"
 msgstr "error al inicializar el certificado: %s"
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../libnetclient/net-client.c:308
+#: ../libnetclient/net-client.c:309
 #, c-format
 msgid "error loading certificate: %s"
 msgstr "error al cargar el certificado: %s"
 
 # src/message-window.c:120
 # src/message-window.c:114
-#: ../libnetclient/net-client.c:316
+#: ../libnetclient/net-client.c:317
 #, c-format
 msgid "error initializing key: %s"
 msgstr "error al inicializar la clave: %s"
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../libnetclient/net-client.c:372
+#: ../libnetclient/net-client.c:373
 #, c-format
 msgid "error loading key: %s"
 msgstr "error al cargar la clave: %s"
 
-#: ../libnetclient/net-client.c:412
+#: ../libnetclient/net-client.c:413
 #, c-format
 msgid "not connected"
 msgstr "no conectado"
 
-#: ../libnetclient/net-client.c:414
+#: ../libnetclient/net-client.c:415
 #, c-format
 msgid "connection is already encrypted"
 msgstr "la conexión ya está cifrada"
@@ -3253,8 +3322,8 @@ msgstr "_Dirección"
 
 #: ../src/ab-main.c:848 ../src/address-book-config.c:226
 #: ../src/address-book-config.c:331 ../src/address-book-config.c:375
-#: ../src/filter-edit-dialog.c:498 ../src/main-window.c:3971
-#: ../src/pref-manager.c:3297
+#: ../src/filter-edit-dialog.c:500 ../src/main-window.c:3965
+#: ../src/pref-manager.c:3292
 msgid "_Apply"
 msgstr "_Aplicar"
 
@@ -3264,6 +3333,18 @@ msgstr "_Aplicar"
 msgid "F_ilter:"
 msgstr "F_iltro:"
 
+# src/pref-manager.c:1825
+# src/pref-manager.c:1995 src/pref-manager.c:2044
+#: ../src/ab-main.c:959
+msgid "Browse"
+msgstr "Examinar"
+
+# src/main-window.c:389
+# src/main-window.c:386
+#: ../src/ab-main.c:973 ../src/toolbar-factory.c:177
+msgid "Edit"
+msgstr "Editar"
+
 # src/address-book.c:362 src/filter-edit-dialog.c:135
 # src/address-book.c:387 src/filter-edit-dialog.c:130
 #: ../src/ab-window.c:184 ../src/filter-edit-dialog.c:207
@@ -3455,8 +3536,8 @@ msgstr "Activar _TLS"
 msgid "GPE Address Book"
 msgstr "Libreta de direcciones GPE"
 
-#: ../src/address-book-config.c:601 ../src/main-window.c:950
-#: ../src/main-window.c:4084
+#: ../src/address-book-config.c:601 ../src/main-window.c:949
+#: ../src/main-window.c:4078
 #, c-format
 msgid "Error displaying help: %s\n"
 msgstr "Error al mostrar la ayuda: %s\n"
@@ -3504,16 +3585,12 @@ msgid "_Remember password in Secret Service"
 msgstr "_Recordar la contraseña en el servicio secreto"
 
 #: ../src/balsa-app.c:67 ../src/folder-conf.c:284 ../src/mailbox-conf.c:1381
-msgid "_Remember password in keyring"
-msgstr "_Recordar la contraseña en el depósito de claves"
-
-#: ../src/balsa-app.c:70 ../src/folder-conf.c:287 ../src/mailbox-conf.c:1384
 msgid "_Remember password"
 msgstr "_Recordar  contraseña"
 
 # src/balsa-app.c:68
 # src/balsa-app.c:72
-#: ../src/balsa-app.c:76
+#: ../src/balsa-app.c:73
 #, c-format
 msgid ""
 "Opening remote mailbox %s.\n"
@@ -3524,131 +3601,135 @@ msgstr ""
 
 # src/balsa-app.c:71
 # src/balsa-app.c:76
-#: ../src/balsa-app.c:81
+#: ../src/balsa-app.c:78
 #, c-format
 msgid "_Password for %s@%s (%s):"
 msgstr "_Contraseña para %s@%s (%s):"
 
 # src/mailbox-conf.c:827 src/mailbox-conf.c:886
 # src/mailbox-conf.c:904 src/mailbox-conf.c:961
-#: ../src/balsa-app.c:84
+#: ../src/balsa-app.c:81
 msgid "Password needed"
 msgstr "Se necesita contraseña"
 
 # libmutt/mbox.c:1028
-#: ../src/balsa-app.c:523
+#: ../src/balsa-app.c:518
 #, c-format
 msgid "Couldn’t open mailbox “%s”"
 msgstr "No se pudo abrir el buzón «%s»"
 
 # src/balsa-index.c:305
 # src/balsa-index.c:298
-#: ../src/balsa-index.c:384 ../src/pref-manager.c:219
+#: ../src/balsa-index.c:382 ../src/pref-manager.c:219
 msgid "Date"
 msgstr "Fecha"
 
 # src/filter-edit-dialog.c:45
 # src/filter-edit-dialog.c:44
-#: ../src/balsa-index.c:399 ../src/pref-manager.c:220
-#: ../src/sendmsg-window.c:2699
+#: ../src/balsa-index.c:397 ../src/pref-manager.c:220
+#: ../src/sendmsg-window.c:2697
 msgid "Size"
 msgstr "Tamaño"
 
 # src/balsa-index-page.c:495
 # src/balsa-index-page.c:546
-#: ../src/balsa-index.c:1653
+#: ../src/balsa-index.c:1647
 #, c-format
 msgid "Move to Trash failed: %s"
 msgstr "Ha fallado el envío a la papelera: %s"
 
 # src/main-window.c:295 src/message-window.c:107
 # src/main-window.c:301 src/message-window.c:103
-#: ../src/balsa-index.c:1811
+#: ../src/balsa-index.c:1805 ../ui/main-window.ui.h:76
+#: ../ui/message-window.ui.h:21
 msgid "_Reply…"
 msgstr "_Responder…"
 
 # src/main-window.c:302 src/message-window.c:113
 # src/main-window.c:308
-#: ../src/balsa-index.c:1813
+#: ../src/balsa-index.c:1807
 msgid "Reply To _All…"
 msgstr "Responder a _todos…"
 
 # src/main-window.c:302 src/message-window.c:113
 # src/main-window.c:308
-#: ../src/balsa-index.c:1815
+#: ../src/balsa-index.c:1809
 msgid "Reply To _Group…"
 msgstr "Responder al _grupo…"
 
 # src/main-window.c:310 src/message-window.c:120
 # src/main-window.c:315 src/message-window.c:114
-#: ../src/balsa-index.c:1817
+#: ../src/balsa-index.c:1811 ../ui/main-window.ui.h:79
+#: ../ui/message-window.ui.h:24
 msgid "_Forward Attached…"
 msgstr "_Reenviar adjunto…"
 
 # src/balsa-index-page.c:486
 # src/balsa-index-page.c:534
-#: ../src/balsa-index.c:1819
+#: ../src/balsa-index.c:1813 ../ui/main-window.ui.h:80
+#: ../ui/message-window.ui.h:25
 msgid "Forward _Inline…"
 msgstr "Reenviar _en línea…"
 
-#: ../src/balsa-index.c:1821
+#: ../src/balsa-index.c:1815 ../ui/main-window.ui.h:81
 msgid "_Pipe through…"
 msgstr "_Filtrar a través de…"
 
 # src/main-window.c:360
 # src/main-window.c:360
-#: ../src/balsa-index.c:1823
+#: ../src/balsa-index.c:1817 ../ui/main-window.ui.h:90
 msgid "_Store Address…"
 msgstr "_Almacenar dirección…"
 
 # src/main-window.c:338
 # src/main-window.c:341
-#: ../src/balsa-index.c:1837 ../src/mailbox-node.c:1105
-#: ../src/mailbox-node.c:1121 ../src/pref-manager.c:2019
-#: ../src/pref-manager.c:2104 ../src/pref-manager.c:2798
+#: ../src/balsa-index.c:1831 ../src/mailbox-node.c:1101
+#: ../src/mailbox-node.c:1117 ../src/pref-manager.c:2019
+#: ../src/pref-manager.c:2104 ../src/pref-manager.c:2798 ../ui/ab-main.ui.h:11
+#: ../ui/main-window.ui.h:70
 msgid "_Delete"
 msgstr "_Eliminar"
 
 # src/main-window.c:345
 # src/main-window.c:347
-#: ../src/balsa-index.c:1841
+#: ../src/balsa-index.c:1835
 msgid "_Undelete"
 msgstr "Rec_uperar"
 
 # src/balsa-index-page.c:495
 # src/balsa-index-page.c:546
-#: ../src/balsa-index.c:1845
+#: ../src/balsa-index.c:1839
 msgid "Move To _Trash"
 msgstr "Mover a la _papelera"
 
-#: ../src/balsa-index.c:1849
+#: ../src/balsa-index.c:1843
 msgid "T_oggle"
 msgstr "_Conmutar"
 
 # src/main-window.c:352
 # src/main-window.c:353
-#: ../src/balsa-index.c:1852
+#: ../src/balsa-index.c:1846 ../ui/main-window.ui.h:64
 msgid "_Flagged"
 msgstr "_Marcado"
 
 # src/balsa-mblist.c:218
 # src/balsa-mblist.c:218
-#: ../src/balsa-index.c:1855
+#: ../src/balsa-index.c:1849
 msgid "_Unread"
 msgstr "_No leído"
 
 # src/filter-edit-dialog.c:53
 # src/filter-edit-dialog.c:51
-#: ../src/balsa-index.c:1863
+#: ../src/balsa-index.c:1857
 msgid "_Move to"
 msgstr "_Mover a"
 
-#: ../src/balsa-index.c:1870
+#: ../src/balsa-index.c:1864
 msgid "_View Source"
 msgstr "_Ver fuente"
 
 # libmutt/mbox.c:712
-#: ../src/balsa-index.c:2116
+#: ../src/balsa-index.c:2110
 #, c-format
 msgid "Failed to copy %d message to mailbox “%s”: %s"
 msgid_plural "Failed to copy %d messages to mailbox “%s”: %s"
@@ -3657,14 +3738,14 @@ msgstr[1] "Falló al copiar %d mensajes al buzón «%s»: %s"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../src/balsa-index.c:2128
+#: ../src/balsa-index.c:2122
 #, c-format
 msgid "Copied to “%s”."
 msgstr "Copiado a «%s»."
 
 # src/balsa-index-page.c:495
 # src/balsa-index-page.c:546
-#: ../src/balsa-index.c:2129
+#: ../src/balsa-index.c:2123
 #, c-format
 msgid "Moved to “%s”."
 msgstr "Movido a «%s»."
@@ -3673,69 +3754,69 @@ msgstr "Movido a «%s»."
 # src/mblist-window.c:528
 # src/mblist-window.c:501 src/mblist-window.c:517 src/mblist-window.c:536
 # src/mblist-window.c:551
-#: ../src/balsa-index.c:2233
+#: ../src/balsa-index.c:2225
 #, c-format
 msgid "Committing mailbox %s failed."
 msgstr "Ha fallado el efectuar cambios en el buzón %s."
 
 # libmutt/mx.c:1375
 # libmutt/mx.c:1375
-#: ../src/balsa-index.c:2342
+#: ../src/balsa-index.c:2334
 #, c-format
 msgid "Cannot process the message: %s"
 msgstr "No se puede procesar el mensaje: %s"
 
 # libmutt/mbox.c:712
-#: ../src/balsa-index.c:2458
+#: ../src/balsa-index.c:2450
 #, c-format
 msgid "Cannot access message %u to pass to %s"
 msgstr "No se puede acceder al mensaje %u para pasarlo a %s"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../src/balsa-index.c:2485
+#: ../src/balsa-index.c:2477
 #, c-format
 msgid "Cannot read message %u to pass to %s"
 msgstr "No se puede leer el mensaje %u para pasarlo a %s"
 
-#: ../src/balsa-index.c:2652
+#: ../src/balsa-index.c:2644
 msgid "Pipe message through a program"
 msgstr "Filtrar mensajes a través de un programa"
 
-#: ../src/balsa-index.c:2656
+#: ../src/balsa-index.c:2648
 msgid "_Run"
 msgstr "_Ejecutar"
 
-#: ../src/balsa-index.c:2668
+#: ../src/balsa-index.c:2660
 msgid "Specify the program to run:"
 msgstr "Especifique el programa a ejecutar:"
 
 # src/balsa-mblist.c:218 src/mailbox-conf.c:950
 # src/balsa-mblist.c:218 src/mailbox-conf.c:1023
-#: ../src/balsa-mblist.c:353
+#: ../src/balsa-mblist.c:350
 msgid "Mailbox"
 msgstr "Buzón"
 
 # libmutt/mbox.c:712
-#: ../src/balsa-mblist.c:1147 ../src/balsa-mblist.c:1197
+#: ../src/balsa-mblist.c:1143 ../src/balsa-mblist.c:1193
 msgid "Failed to find mailbox"
 msgstr "No se pudo encontrar buzón"
 
 # src/main-window.c:259
 # src/main-window.c:262
-#: ../src/balsa-mblist.c:1775
+#: ../src/balsa-mblist.c:1769
 msgid "_Other…"
 msgstr "_Otros…"
 
 # src/filter-edit-dialog.c:53
 # src/filter-edit-dialog.c:51
-#: ../src/balsa-mblist.c:1892
+#: ../src/balsa-mblist.c:1886
 msgid "Choose destination folder"
 msgstr "Elegir carpeta de destino"
 
 # src/main-window.c:259
 # src/main-window.c:262
-#: ../src/balsa-mblist.c:2086
+#: ../src/balsa-mblist.c:2080
 msgid "Other…"
 msgstr "Otros…"
 
@@ -3763,11 +3844,11 @@ msgstr "No se encontró"
 msgid "Find:"
 msgstr "Buscar:"
 
-#: ../src/balsa-message.c:620 ../src/toolbar-factory.c:149
+#: ../src/balsa-message.c:620 ../src/toolbar-factory.c:145
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../src/balsa-message.c:627 ../src/toolbar-factory.c:150
+#: ../src/balsa-message.c:627 ../src/toolbar-factory.c:146
 msgid "Next"
 msgstr "Siguiente"
 
@@ -4079,7 +4160,7 @@ msgstr "Cierre las otras instancias de este mensaje e inténtelo de nuevo."
 
 # src/balsa-message.c:718
 # src/balsa-message.c:780
-#: ../src/balsa-mime-widget.c:240 ../src/balsa-mime-widget-message.c:176
+#: ../src/balsa-mime-widget.c:241 ../src/balsa-mime-widget-message.c:176
 #: ../src/balsa-mime-widget-message.c:222
 #, c-format
 msgid "File name: %s"
@@ -4087,38 +4168,38 @@ msgstr "Nombre del archivo: %s"
 
 # src/message-window.c:120
 # src/message-window.c:114
-#: ../src/balsa-mime-widget.c:256
+#: ../src/balsa-mime-widget.c:257
 #, c-format
 msgid "Error reading message part: %s"
 msgstr "Ha ocurrido un error al leer la parte del mensaje: %s"
 
-#: ../src/balsa-mime-widget.c:288
+#: ../src/balsa-mime-widget.c:289
 #, c-format
 msgid "Type: %s (%s)"
 msgstr "Tipo: %s (%s)"
 
 # src/balsa-message.c:713
 # src/balsa-message.c:775
-#: ../src/balsa-mime-widget.c:292
+#: ../src/balsa-mime-widget.c:293
 #, c-format
 msgid "Content Type: %s"
 msgstr "Tipo de contenido: %s"
 
 # src/balsa-message.c:709
 # src/balsa-message.c:771
-#: ../src/balsa-mime-widget.c:306
+#: ../src/balsa-mime-widget.c:307
 msgid "No open or view action defined for this content type"
 msgstr "No hay definida ninguna acción ver o abrir para este tipo de contenido"
 
 # src/balsa-message.c:725
 # src/balsa-message.c:788
-#: ../src/balsa-mime-widget.c:311
+#: ../src/balsa-mime-widget.c:312
 msgid "S_ave part"
 msgstr "_Guardar parte"
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../src/balsa-mime-widget-callbacks.c:52 ../src/sendmsg-window.c:1452
+#: ../src/balsa-mime-widget-callbacks.c:52 ../src/sendmsg-window.c:1450
 #, c-format
 msgid "Could not launch application: %s"
 msgstr "No se pudo lanzar la aplicación: %s"
@@ -4147,18 +4228,56 @@ msgstr "El archivo ya existe. ¿Sobreescribir?"
 msgid "Unlink %s: %s"
 msgstr "Desenlazar %s: %s"
 
-#: ../src/balsa-mime-widget-crypto.c:93
+# src/balsa-message.c:301
+# src/balsa-message.c:331
+#: ../src/balsa-mime-widget-crypto.c:76 ../src/balsa-mime-widget-text.c:156
+#, c-format
+msgid "Could not save a text part: %s"
+msgstr "No se pudo guardar una parte de texto: %s"
+
+# libmutt/mbox.c:1028
+#: ../src/balsa-mime-widget-crypto.c:83
+#, c-format
+msgid "Could not process GnuPG keys: %s"
+msgstr "No se pudieron procesar las claves GnuPG: %s"
+
+#: ../src/balsa-mime-widget-crypto.c:132
 msgid "_Search key server for this key"
 msgstr "_Buscar un servidor de claves para esta clave"
 
-#: ../src/balsa-mime-widget-crypto.c:95
-#| msgid "_Run GnuPG to check for an update of this key"
+#: ../src/balsa-mime-widget-crypto.c:134
 msgid "_Search key server for updates of this key"
 msgstr "_Buscar un servidor de claves para actualizaciones de esta clave"
 
+#: ../src/balsa-mime-widget-crypto.c:265
+#, c-format
+msgid ""
+"Import GnuPG key:\n"
+"%s"
+msgstr ""
+"Importar clave GnuPG key:\n"
+"%s"
+
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../src/balsa-mime-widget-image.c:119 ../src/balsa-mime-widget-image.c:252
+#: ../src/balsa-mime-widget-crypto.c:272
+#, c-format
+msgid "Error importing key data: %s"
+msgstr "Error al importar la clave de datos: %s"
+
+# src/address-book.c:499
+# src/address-book.c:558
+#: ../src/balsa-mime-widget-crypto.c:309
+msgid "(imported)"
+msgstr "(importada)"
+
+#: ../src/balsa-mime-widget-crypto.c:317
+msgid "Import key into the local key ring"
+msgstr "Importar la clave dentro del depósito de claves local"
+
+# src/sendmsg-window.c:1694
+# src/sendmsg-window.c:1749
+#: ../src/balsa-mime-widget-image.c:119 ../src/balsa-mime-widget-image.c:248
 #, c-format
 msgid "Error loading attached image: %s\n"
 msgstr "Ha ocurrido un error al cargar la imagen adjunta: %s\n"
@@ -4232,8 +4351,8 @@ msgstr "_Enviar mensaje para obtener esta parte"
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../src/balsa-mime-widget-message.c:323 ../src/balsa-mime-widget-text.c:811
-#: ../src/sendmsg-window.c:1487
+#: ../src/balsa-mime-widget-message.c:323 ../src/balsa-mime-widget-text.c:808
+#: ../src/sendmsg-window.c:1485
 #, c-format
 msgid "Error showing %s: %s\n"
 msgstr "Error al mostrar %s:%s\n"
@@ -4257,27 +4376,27 @@ msgid "Reply…"
 msgstr "Responder…"
 
 #. Gmail sometimes fails to do that.
-#: ../src/balsa-mime-widget-message.c:712
+#: ../src/balsa-mime-widget-message.c:711
 msgid "Error:"
 msgstr "Error:"
 
-#: ../src/balsa-mime-widget-message.c:713
+#: ../src/balsa-mime-widget-message.c:712
 msgid "IMAP server did not report message structure"
 msgstr "El servidor IMAP no devolvió la estructura del mensaje"
 
 # src/balsa-message.c:580 src/print.c:345 src/sendmsg-window.c:842
 # src/balsa-message.c:625 src/print.c:358 src/sendmsg-window.c:876
-#: ../src/balsa-mime-widget-message.c:726
-#: ../src/balsa-print-object-header.c:156 ../src/sendmsg-window.c:747
-#: ../src/sendmsg-window.c:749 ../src/sendmsg-window.c:841
-#: ../src/sendmsg-window.c:3513 ../src/sendmsg-window.c:5030
+#: ../src/balsa-mime-widget-message.c:725
+#: ../src/balsa-print-object-header.c:156 ../src/sendmsg-window.c:746
+#: ../src/sendmsg-window.c:748 ../src/sendmsg-window.c:839
+#: ../src/sendmsg-window.c:3510 ../src/sendmsg-window.c:5019
 msgid "Subject:"
 msgstr "Asunto:"
 
 # src/balsa-message.c:564 src/print.c:348
 # src/balsa-message.c:628 src/print.c:361
-#: ../src/balsa-mime-widget-message.c:731
-#: ../src/balsa-print-object-header.c:164 ../src/sendmsg-window.c:3509
+#: ../src/balsa-mime-widget-message.c:730
+#: ../src/balsa-print-object-header.c:164 ../src/sendmsg-window.c:3506
 msgid "Date:"
 msgstr "Fecha:"
 
@@ -4286,36 +4405,29 @@ msgstr "Fecha:"
 # src/balsa-message.c:633 src/filter-edit-dialog.c:316 src/print.c:348
 # src/sendmsg-window.c:867
 #. addresses
-#: ../src/balsa-mime-widget-message.c:737
-#: ../src/balsa-print-object-header.c:169 ../src/sendmsg-window.c:3520
+#: ../src/balsa-mime-widget-message.c:736
+#: ../src/balsa-print-object-header.c:169 ../src/sendmsg-window.c:3517
 msgid "From:"
 msgstr "De:"
 
 # src/sendmsg-window.c:885
 # src/sendmsg-window.c:928
-#: ../src/balsa-mime-widget-message.c:744
+#: ../src/balsa-mime-widget-message.c:743
 msgid "Reply-To:"
 msgstr "Responder a:"
 
-#: ../src/balsa-mime-widget-message.c:757
+#: ../src/balsa-mime-widget-message.c:756
 #: ../src/balsa-print-object-header.c:177
 msgid "FCC:"
 msgstr "Fcc:"
 
 # src/filter-edit-dialog.c:626
 # src/filter-edit-dialog.c:538
-#: ../src/balsa-mime-widget-message.c:765
+#: ../src/balsa-mime-widget-message.c:764
 #: ../src/balsa-print-object-header.c:180
 msgid "Disposition-Notification-To:"
 msgstr "Notificación:"
 
-# src/balsa-message.c:301
-# src/balsa-message.c:331
-#: ../src/balsa-mime-widget-text.c:156
-#, c-format
-msgid "Could not save a text part: %s"
-msgstr "No se pudo guardar una parte de texto: %s"
-
 #: ../src/balsa-mime-widget-text.c:507
 msgid "Copy link"
 msgstr "Copiar enlace"
@@ -4332,7 +4444,7 @@ msgstr "Enviar enlace…"
 
 # src/balsa-message.c:1247
 # src/balsa-message.c:1417
-#: ../src/balsa-mime-widget-text.c:548 ../src/balsa-mime-widget-text.c:1089
+#: ../src/balsa-mime-widget-text.c:548 ../src/balsa-mime-widget-text.c:1086
 msgid "Save…"
 msgstr "Guardar…"
 
@@ -4342,42 +4454,43 @@ msgstr "Resaltar frases estructuradas"
 
 # libmutt/mx.c:630
 # libmutt/mx.c:630
-#: ../src/balsa-mime-widget-text.c:789
+#: ../src/balsa-mime-widget-text.c:786
 #, c-format
 msgid "Calling URL %s…"
 msgstr "Llamando a la URL %s…"
 
-#: ../src/balsa-mime-widget-text.c:1056
+#: ../src/balsa-mime-widget-text.c:1053
 msgid "Zoom In"
 msgstr "Ampliar"
 
-#: ../src/balsa-mime-widget-text.c:1061
+#: ../src/balsa-mime-widget-text.c:1058
 msgid "Zoom Out"
 msgstr "Reducir"
 
-#: ../src/balsa-mime-widget-text.c:1066
+#: ../src/balsa-mime-widget-text.c:1063
 msgid "Zoom 100%"
 msgstr "Ampliación 100%"
 
 # src/sendmsg-window.c:191
 # src/sendmsg-window.c:196
-#: ../src/balsa-mime-widget-text.c:1075
+#: ../src/balsa-mime-widget-text.c:1072 ../ui/main-window.ui.h:28
+#: ../ui/message-window.ui.h:7 ../ui/sendmsg-window.ui.h:19
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: ../src/balsa-mime-widget-text.c:1098
+#: ../src/balsa-mime-widget-text.c:1095
 msgid "Print…"
 msgstr "Imprimir…"
 
 # src/main-window.c:360
 # src/main-window.c:360
-#: ../src/balsa-mime-widget-text.c:1236
+#: ../src/balsa-mime-widget-text.c:1233
 msgid "S_tore Address"
 msgstr "A_lmacenar dirección"
 
 # src/store-address.c:50
 # src/store-address.c:52
-#: ../src/balsa-mime-widget-text.c:1243
+#: ../src/balsa-mime-widget-text.c:1240
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
@@ -4385,33 +4498,33 @@ msgstr "Nombre completo:"
 # src/address-book.c:435
 # libinit_balsa/balsa-druid-page-user.gob:83 src/address-book.c:252
 # src/address-book.c:470
-#: ../src/balsa-mime-widget-text.c:1244
+#: ../src/balsa-mime-widget-text.c:1241
 msgid "Nick Name:"
 msgstr "Apodo:"
 
 # src/filter-edit-dialog.c:490
 # src/address-book-config.c:321
-#: ../src/balsa-mime-widget-text.c:1245
+#: ../src/balsa-mime-widget-text.c:1242
 msgid "First Name:"
 msgstr "Nombre:"
 
 # src/address-book-config.c:351
 # src/address-book-config.c:381
-#: ../src/balsa-mime-widget-text.c:1246
+#: ../src/balsa-mime-widget-text.c:1243
 msgid "Last Name:"
 msgstr "Apellido:"
 
-#: ../src/balsa-mime-widget-text.c:1247
+#: ../src/balsa-mime-widget-text.c:1244
 msgid "Organization:"
 msgstr "Organización:"
 
 # src/store-address.c:52
 # src/store-address.c:54
-#: ../src/balsa-mime-widget-text.c:1249
+#: ../src/balsa-mime-widget-text.c:1246
 msgid "Email Address:"
-msgstr "Dirección de correo-e:"
+msgstr "Dirección de correo-e:"
 
-#: ../src/balsa-mime-widget-text.c:1277
+#: ../src/balsa-mime-widget-text.c:1274
 #, c-format
 msgid ""
 "The message sent by %s with subject “%s” contains 8-bit characters, but no "
@@ -4456,7 +4569,7 @@ msgstr[1] "Participantes:"
 
 #: ../src/balsa-mime-widget-vcalendar.c:211
 msgid "Description:"
-msgstr "Descripción:"
+msgstr "Descripción:"
 
 #: ../src/balsa-mime-widget-vcalendar.c:232
 msgid "The sender asks you for a reply to this request:"
@@ -4483,12 +4596,6 @@ msgstr "Petición de calendario iTIP"
 msgid "Sending the iTIP calendar reply failed: %s"
 msgstr "Falló al enviar la respuesta al calendario iTIP: %s"
 
-#: ../src/balsa-print-object-default.c:152
-#: ../src/balsa-print-object-default.c:154
-#: ../src/balsa-print-object-default.c:157
-msgid "Type:"
-msgstr "Tipo:"
-
 # src/filter-edit-dialog.c:490
 # src/filter-edit-dialog.c:436
 #: ../src/balsa-print-object-default.c:162
@@ -4556,7 +4663,7 @@ msgstr "Participantes"
 msgid "Attendee"
 msgstr "Participante"
 
-#: ../src/balsa-print-object-text.c:680 ../src/sendmsg-window.c:2711
+#: ../src/balsa-print-object-text.c:680 ../src/sendmsg-window.c:2709
 msgid "Description"
 msgstr "Descripción"
 
@@ -4646,13 +4753,13 @@ msgstr "_Limpiar"
 
 # src/filter-edit-dialog.c:313
 # src/filter-edit-dialog.c:296
-#: ../src/filter-edit-callbacks.c:963 ../src/main-window.c:3955
+#: ../src/filter-edit-callbacks.c:963 ../src/main-window.c:3949
 msgid "_Body"
 msgstr "_Cuerpo"
 
 # src/sendmsg-window.c:222
 # src/sendmsg-window.c:226
-#: ../src/filter-edit-callbacks.c:964 ../src/main-window.c:3956
+#: ../src/filter-edit-callbacks.c:964 ../src/main-window.c:3950
 msgid "_To:"
 msgstr "_A:"
 
@@ -4660,7 +4767,7 @@ msgstr "_A:"
 # src/sendmsg-window.c:835
 # src/balsa-message.c:633 src/filter-edit-dialog.c:316 src/print.c:348
 # src/sendmsg-window.c:867
-#: ../src/filter-edit-callbacks.c:965 ../src/main-window.c:3957
+#: ../src/filter-edit-callbacks.c:965 ../src/main-window.c:3951
 msgid "_From:"
 msgstr "_De:"
 
@@ -4670,7 +4777,7 @@ msgstr "_De:"
 msgid "_Subject"
 msgstr "A_sunto"
 
-#: ../src/filter-edit-callbacks.c:967 ../src/main-window.c:3959
+#: ../src/filter-edit-callbacks.c:967 ../src/main-window.c:3953
 msgid "_CC:"
 msgstr "_Cc:"
 
@@ -4731,7 +4838,7 @@ msgstr "T_ipo de búsqueda:"
 msgid "Edit condition for filter: "
 msgstr "Editar condición para filtro: "
 
-#: ../src/filter-edit-callbacks.c:1483 ../src/save-restore.c:1884
+#: ../src/filter-edit-callbacks.c:1483 ../src/save-restore.c:1883
 msgid "Filter with no condition was omitted"
 msgstr "El filtro sin condiciones fue ignorado"
 
@@ -4838,96 +4945,109 @@ msgstr "O"
 msgid "AND"
 msgstr "Y"
 
+# src/main-window.c:191
+# src/main-window.c:196
+#. new button
+#. Translators: button "New" filter
+#: ../src/filter-edit-dialog.c:225
+msgctxt "filter"
+msgid "_New"
+msgstr "_Nuevo"
+
 # src/filter-edit-dialog.c:490
 # src/filter-edit-dialog.c:436
 #. The name entry
-#: ../src/filter-edit-dialog.c:258
+#: ../src/filter-edit-dialog.c:259
 msgid "_Filter name:"
 msgstr "Nombre del _filtro:"
 
 #. The filter op-code : "OR" or "AND" all the conditions
-#: ../src/filter-edit-dialog.c:272
+#: ../src/filter-edit-dialog.c:273
 msgid "Operation between conditions:"
 msgstr "Operación entre condiciones:"
 
 # src/main-window.c:389
 # src/main-window.c:386
-#: ../src/filter-edit-dialog.c:309
+#: ../src/filter-edit-dialog.c:310 ../ui/main-window.ui.h:26
+#: ../ui/message-window.ui.h:5 ../ui/sendmsg-window.ui.h:13
+#: ../ui/source-viewer.ui.h:3
 msgid "_Edit"
 msgstr "_Editar"
 
 # src/filter-edit-dialog.c:222
 # src/filter-edit-dialog.c:218
-#: ../src/filter-edit-dialog.c:314
+#. Translators: button "New" filter match
+#: ../src/filter-edit-dialog.c:316
+msgctxt "filter match"
 msgid "Ne_w"
-msgstr "N_uevo"
+msgstr "filtro de coincidencia Nuev_o"
 
-#: ../src/filter-edit-dialog.c:346
+#: ../src/filter-edit-dialog.c:348
 msgid "Foreground"
 msgstr "Primer plano"
 
-#: ../src/filter-edit-dialog.c:357
+#: ../src/filter-edit-dialog.c:359
 msgid "Background"
 msgstr "Fondo"
 
 # src/filter-edit-dialog.c:626
 # src/filter-edit-dialog.c:538
 #. The notification area
-#: ../src/filter-edit-dialog.c:383
+#: ../src/filter-edit-dialog.c:385
 msgid "Notification:"
 msgstr "Notificación:"
 
 # src/filter-edit-dialog.c:635
 # src/filter-edit-dialog.c:547
 #. Notification buttons
-#: ../src/filter-edit-dialog.c:395
+#: ../src/filter-edit-dialog.c:397
 msgid "Play sound:"
 msgstr "Reproducir sonido:"
 
 # src/filter-edit-dialog.c:643
 # src/filter-edit-dialog.c:554
-#: ../src/filter-edit-dialog.c:400
+#: ../src/filter-edit-dialog.c:402
 msgid "Use Sound…"
 msgstr "Usar sonido…"
 
 # src/mblist-window.c:446
 # src/mblist-window.c:469
-#: ../src/filter-edit-dialog.c:403 ../src/mailbox-node.c:1111
+#: ../src/filter-edit-dialog.c:405 ../src/mailbox-node.c:1107
 msgid "_Open"
 msgstr "_Abrir"
 
 # src/filter-edit-dialog.c:652
 # src/filter-edit-dialog.c:559
-#: ../src/filter-edit-dialog.c:418
+#: ../src/filter-edit-dialog.c:420
 msgid "Pop-up text:"
 msgstr "Texto emergente:"
 
 # src/filter-edit-dialog.c:671
 # src/filter-edit-dialog.c:574
 #. The action area
-#: ../src/filter-edit-dialog.c:435
+#: ../src/filter-edit-dialog.c:437
 msgid "Action to perform:"
 msgstr "Acción a efectuar:"
 
 # src/filter-edit-dialog.c:738
 # src/filter-edit-dialog.c:650
-#: ../src/filter-edit-dialog.c:489
+#: ../src/filter-edit-dialog.c:491
 msgid "Match"
 msgstr "Coincidencia"
 
 # src/filter-edit-dialog.c:741
 # src/filter-edit-dialog.c:653
-#: ../src/filter-edit-dialog.c:492
+#: ../src/filter-edit-dialog.c:494
 msgid "Action"
 msgstr "Acción"
 
 # src/filter-edit-dialog.c:755
 # src/filter-edit-dialog.c:666
-#: ../src/filter-edit-dialog.c:503
+#: ../src/filter-edit-dialog.c:505
 msgid "Re_vert"
 msgstr "Re_vertir"
 
-#: ../src/filter-edit-dialog.c:554
+#: ../src/filter-edit-dialog.c:556
 msgid "A filter run dialog is open. Close it before you can modify filters."
 msgstr ""
 "Un diálogo de ejecución de filtros está abierto. Ciérrelo antes para poder "
@@ -4935,11 +5055,11 @@ msgstr ""
 
 # src/main-window.c:259
 # src/main-window.c:262
-#: ../src/filter-edit-dialog.c:567
+#: ../src/filter-edit-dialog.c:569
 msgid "Filters"
 msgstr "Filtros"
 
-#: ../src/filter-edit-dialog.c:635
+#: ../src/filter-edit-dialog.c:637
 #, c-format
 msgid "Filter “%s” has no condition."
 msgstr "El filtro «%s» no tiene condiciones."
@@ -5044,7 +5164,7 @@ msgstr "Bajar el filtro seleccionado"
 # src/sendmsg-window.c:928
 #: ../src/filter-run-dialog.c:443
 msgid "A_pply Now!"
-msgstr "_Aplicar ya"
+msgstr "A_plicar ya"
 
 #: ../src/filter-run-dialog.c:489
 msgid ""
@@ -5062,82 +5182,82 @@ msgstr "Error al mostrar la ayuda de configuración: %s\n"
 
 # src/pref-manager.c:1162
 # src/pref-manager.c:1298
-#: ../src/folder-conf.c:306
+#: ../src/folder-conf.c:303
 msgid "Remote IMAP folder"
 msgstr "Carpeta IMAP remota"
 
 # src/address-book-config.c:132 src/mailbox-conf.c:301 src/mailbox-conf.c:925
 # src/address-book-config.c:134 src/mailbox-conf.c:287
 # src/mailbox-conf.c:1000
-#: ../src/folder-conf.c:310 ../src/folder-conf.c:805 ../src/mailbox-conf.c:608
+#: ../src/folder-conf.c:307 ../src/folder-conf.c:802 ../src/mailbox-conf.c:608
 msgid "_Update"
 msgstr "Act_ualizar"
 
-#: ../src/folder-conf.c:310
+#: ../src/folder-conf.c:307
 msgid "C_reate"
 msgstr "_Crear"
 
-#: ../src/folder-conf.c:341
+#: ../src/folder-conf.c:338
 msgid "_Max number of connections:"
 msgstr "Número _máximo de conexiones:"
 
-#: ../src/folder-conf.c:347 ../src/mailbox-conf.c:1451
+#: ../src/folder-conf.c:344 ../src/mailbox-conf.c:1448
 msgid "Enable _persistent cache"
 msgstr "Activar caché _persistente"
 
-#: ../src/folder-conf.c:354
+#: ../src/folder-conf.c:351
 msgid "Use IDLE command"
 msgstr "Usar el comando IDLE"
 
-#: ../src/folder-conf.c:361 ../src/mailbox-conf.c:1454
+#: ../src/folder-conf.c:358 ../src/mailbox-conf.c:1451
 msgid "Enable _bug workarounds"
 msgstr "Activar arreglos de _bugs"
 
-#: ../src/folder-conf.c:368
+#: ../src/folder-conf.c:365
 msgid "Use STATUS for mailbox checking"
 msgstr "Usar STATUS para la comprobación de buzones"
 
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:377
+#: ../src/folder-conf.c:374
 msgid "Descriptive _name:"
 msgstr "_Nombre descriptivo:"
 
 # src/mailbox-conf.c:822 src/mailbox-conf.c:882
 # src/mailbox-conf.c:899 src/mailbox-conf.c:957
 #. username
-#: ../src/folder-conf.c:392 ../src/mailbox-conf.c:1303
+#: ../src/folder-conf.c:389 ../src/mailbox-conf.c:1303
 msgid "Use_r name:"
 msgstr "Nombre de _usuario:"
 
 # src/mailbox-conf.c:827 src/mailbox-conf.c:886
 # src/mailbox-conf.c:904 src/mailbox-conf.c:961
-#: ../src/folder-conf.c:398
+#: ../src/folder-conf.c:395
 msgid "_Password:"
 msgstr "_Contraseña:"
 
-#: ../src/folder-conf.c:405 ../src/mailbox-conf.c:1414
+#: ../src/folder-conf.c:402 ../src/mailbox-conf.c:1411
 msgid "_Anonymous access"
 msgstr "Acceso _anónimo"
 
-#: ../src/folder-conf.c:416
+#: ../src/folder-conf.c:413
 msgid "Subscribed _folders only"
 msgstr "Sólo carpetas _suscritas"
 
-#: ../src/folder-conf.c:419
+#: ../src/folder-conf.c:416
 msgid "Always show _Inbox"
 msgstr "Siempre mostrar la _Bandeja de entrada"
 
-#: ../src/folder-conf.c:422
+#: ../src/folder-conf.c:419
 msgid "Pr_efix:"
 msgstr "Pr_efijo:"
 
 # src/pref-manager.c:1821
 # src/pref-manager.c:1991 src/pref-manager.c:2040
-#: ../src/folder-conf.c:569
+#: ../src/folder-conf.c:566
 msgid "Select parent folder"
 msgstr "Seleccione carpeta madre"
 
-#: ../src/folder-conf.c:648
+#: ../src/folder-conf.c:645
 #, c-format
 msgid ""
 "Renaming Inbox is special!\n"
@@ -5152,11 +5272,11 @@ msgstr ""
 "La bandeja de entrada y sus subcarpetas se conservarán.\n"
 "¿Qué quiere hacer?"
 
-#: ../src/folder-conf.c:655
+#: ../src/folder-conf.c:652
 msgid "Question"
 msgstr "Pregunta"
 
-#: ../src/folder-conf.c:659
+#: ../src/folder-conf.c:656
 msgid "Rename Inbox"
 msgstr "Renombrar la bandeja de entrada"
 
@@ -5165,21 +5285,21 @@ msgstr "Renombrar la bandeja de entrada"
 # src/sendmsg-window.c:1695
 # src/balsa-message.c:288 src/sendmsg-window.c:155 src/sendmsg-window.c:634
 # src/sendmsg-window.c:1728 src/sendmsg-window.c:1751
-#: ../src/folder-conf.c:661
+#: ../src/folder-conf.c:658
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/folder-conf.c:686
+#: ../src/folder-conf.c:683
 #, c-format
 msgid "Folder rename failed. Reason: %s"
 msgstr "Hubo un fallo al renombrar la carpeta con motivo: %s"
 
-#: ../src/folder-conf.c:738
+#: ../src/folder-conf.c:735
 #, c-format
 msgid "Folder creation failed. Reason: %s"
 msgstr "Hubo un fallo al crear la carpeta con motivo: %s"
 
-#: ../src/folder-conf.c:785
+#: ../src/folder-conf.c:782
 msgid ""
 "An IMAP folder that is not a mailbox\n"
 "has no properties that can be changed."
@@ -5188,56 +5308,56 @@ msgstr ""
 "no tiene propiedades que puedan ser cambiadas."
 
 # libmutt/mbox.c:1066
-#: ../src/folder-conf.c:801
+#: ../src/folder-conf.c:798
 msgid "Remote IMAP subfolder"
 msgstr "Subcarpeta IMAP remota"
 
-#: ../src/folder-conf.c:805
+#: ../src/folder-conf.c:802
 msgid "_Create"
 msgstr "_Crear"
 
-#: ../src/folder-conf.c:835
+#: ../src/folder-conf.c:832
 msgid "Create subfolder"
 msgstr "Crear subcarpeta"
 
 # src/filter-edit-dialog.c:490
 # src/filter-edit-dialog.c:436
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:843
+#: ../src/folder-conf.c:840
 msgid "_Folder name:"
 msgstr "_Nombre de la carpeta:"
 
-#: ../src/folder-conf.c:849
+#: ../src/folder-conf.c:846
 msgid "Host:"
 msgstr "Anfitrión:"
 
-#: ../src/folder-conf.c:858
+#: ../src/folder-conf.c:855
 msgid "Subfolder of:"
 msgstr "Subcarpeta de:"
 
 # src/pref-manager.c:1825
 # src/pref-manager.c:1995 src/pref-manager.c:2044
-#: ../src/folder-conf.c:863
+#: ../src/folder-conf.c:860
 msgid "_Browse…"
 msgstr "E_xaminar…"
 
-#: ../src/folder-conf.c:877
+#: ../src/folder-conf.c:874
 msgid "read-only"
 msgstr "sólo lectura"
 
-#: ../src/folder-conf.c:878
+#: ../src/folder-conf.c:875
 msgid "read-write"
 msgstr "lectura y escritura"
 
-#: ../src/folder-conf.c:879
+#: ../src/folder-conf.c:876
 msgid "admin"
 msgstr "administrador"
 
-#: ../src/folder-conf.c:880
+#: ../src/folder-conf.c:877
 msgid "post"
 msgstr "publicar"
 
-#: ../src/folder-conf.c:881
+#: ../src/folder-conf.c:878
 msgid "append"
 msgstr "añadir"
 
@@ -5247,19 +5367,19 @@ msgstr "añadir"
 # src/balsa-index-page.c:542 src/filter-edit-dialog.c:224
 # src/main-window.c:442 src/mblist-window.c:475 src/pref-manager.c:1243
 # src/pref-manager.c:2253
-#: ../src/folder-conf.c:882
+#: ../src/folder-conf.c:879
 msgid "delete"
 msgstr "eliminar"
 
-#: ../src/folder-conf.c:883
+#: ../src/folder-conf.c:880
 msgid "special"
 msgstr "especial"
 
-#: ../src/folder-conf.c:889
+#: ../src/folder-conf.c:886
 msgid "Permissions:"
 msgstr "Permisos:"
 
-#: ../src/folder-conf.c:896
+#: ../src/folder-conf.c:893
 msgid ""
 "\n"
 "detailed permissions are available only for open folders"
@@ -5267,7 +5387,7 @@ msgstr ""
 "\n"
 "los permisos detallados sólo están disponibles para carpetas abiertas"
 
-#: ../src/folder-conf.c:903
+#: ../src/folder-conf.c:900
 msgid ""
 "\n"
 "the server does not support ACLs"
@@ -5277,32 +5397,32 @@ msgstr ""
 
 # src/pref-manager.c:1235
 # src/pref-manager.c:1376
-#: ../src/folder-conf.c:912
+#: ../src/folder-conf.c:909
 msgid "mine: "
 msgstr "mios: "
 
-#: ../src/folder-conf.c:950
+#: ../src/folder-conf.c:947
 msgid "Quota:"
 msgstr "Cuota:"
 
-#: ../src/folder-conf.c:954
+#: ../src/folder-conf.c:951
 msgid "quota information available only for open folders"
 msgstr "la información de cuota sólo está disponible para carpetas abiertas"
 
-#: ../src/folder-conf.c:959
+#: ../src/folder-conf.c:956
 msgid "the server does not support quotas"
 msgstr "el servidor no soporta cuotas"
 
-#: ../src/folder-conf.c:961
+#: ../src/folder-conf.c:958
 msgid "no limits"
 msgstr "sin límites"
 
-#: ../src/folder-conf.c:966
+#: ../src/folder-conf.c:963
 #, c-format
 msgid "%s of %s (%.1f%%) used"
 msgstr "%s de %s (%.1f%%) usado"
 
-#: ../src/folder-conf.c:1003
+#: ../src/folder-conf.c:1000
 msgid ""
 "This folder is not stored in configuration. I do not yet know how to remove "
 "it from remote server."
@@ -5312,7 +5432,7 @@ msgstr ""
 
 # src/mailbox-conf.c:157
 # src/mailbox-conf.c:157
-#: ../src/folder-conf.c:1012
+#: ../src/folder-conf.c:1009
 #, c-format
 msgid ""
 "This will remove the folder “%s” from the list.\n"
@@ -5322,7 +5442,7 @@ msgstr ""
 "Podrá usar más tarde «Carpeta IMAP nueva» para agregar esta carpeta "
 "nuevamente.\n"
 
-#: ../src/folder-conf.c:1020
+#: ../src/folder-conf.c:1017
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -5332,7 +5452,7 @@ msgstr "Confirmar"
 msgid "Information — Balsa"
 msgstr "Información - Balsa"
 
-#: ../src/information-dialog.c:235 ../src/main-window.c:3976
+#: ../src/information-dialog.c:235 ../src/main-window.c:3970
 msgid "_Clear"
 msgstr "_Limpiar"
 
@@ -5340,29 +5460,29 @@ msgstr "_Limpiar"
 msgid "Cl_ose"
 msgstr "Ce_rrar"
 
-#: ../src/information-dialog.c:358
+#: ../src/information-dialog.c:354
 #, c-format
 msgid "WARNING: "
 msgstr "ATENCIÓN: "
 
-#: ../src/information-dialog.c:361
+#: ../src/information-dialog.c:357
 #, c-format
 msgid "ERROR: "
 msgstr "ERROR: "
 
-#: ../src/information-dialog.c:364
+#: ../src/information-dialog.c:360
 #, c-format
 msgid "FATAL: "
 msgstr "FATAL: "
 
 # src/pref-manager.c:194
 # src/pref-manager.c:193
-#: ../src/mailbox-conf.c:207 ../src/mailbox-conf.c:1536
+#: ../src/mailbox-conf.c:207 ../src/mailbox-conf.c:1533
 #: ../src/pref-manager.c:212 ../src/pref-manager.c:1152
 msgid "Never"
 msgstr "Nunca"
 
-#: ../src/mailbox-conf.c:208 ../src/mailbox-conf.c:1537
+#: ../src/mailbox-conf.c:208 ../src/mailbox-conf.c:1534
 msgid "If Possible"
 msgstr "Si es posible"
 
@@ -5517,7 +5637,7 @@ msgstr "Configurador de buzón remoto"
 # src/mailbox-conf.c:786 src/mailbox-conf.c:810 src/mailbox-conf.c:870
 # src/mailbox-conf.c:862 src/mailbox-conf.c:887 src/mailbox-conf.c:945
 #. mailbox name
-#: ../src/mailbox-conf.c:1282 ../src/mailbox-conf.c:1394
+#: ../src/mailbox-conf.c:1282 ../src/mailbox-conf.c:1391
 msgid "Mailbox _name:"
 msgstr "_Nombre del buzón:"
 
@@ -5528,7 +5648,7 @@ msgstr "POP3 sobre SSL (POP3S)"
 # src/mailbox-conf.c:827 src/mailbox-conf.c:886
 # src/mailbox-conf.c:904 src/mailbox-conf.c:961
 #. password field
-#: ../src/mailbox-conf.c:1308 ../src/mailbox-conf.c:1426
+#: ../src/mailbox-conf.c:1308 ../src/mailbox-conf.c:1423
 msgid "Pass_word:"
 msgstr "_Contraseña:"
 
@@ -5565,27 +5685,27 @@ msgstr "Superponer comandos"
 # src/mailbox-conf.c:822 src/mailbox-conf.c:882
 # src/mailbox-conf.c:899 src/mailbox-conf.c:957
 #. username
-#: ../src/mailbox-conf.c:1407
+#: ../src/mailbox-conf.c:1404
 msgid "_Username:"
 msgstr "Nombre de _usuario:"
 
 # src/mailbox-conf.c:890
 # src/mailbox-conf.c:965
-#: ../src/mailbox-conf.c:1431
+#: ../src/mailbox-conf.c:1428
 msgid "F_older path:"
 msgstr "Ruta de la _carpeta:"
 
 # src/pref-manager.c:234 src/pref-manager.c:867
 # src/pref-manager.c:236 src/pref-manager.c:992
-#: ../src/mailbox-conf.c:1515
+#: ../src/mailbox-conf.c:1512
 msgid "_Identity:"
 msgstr "_Identidad:"
 
-#: ../src/mailbox-conf.c:1538 ../src/pref-manager.c:1154
+#: ../src/mailbox-conf.c:1535 ../src/pref-manager.c:1154
 msgid "Always"
 msgstr "Siempre"
 
-#: ../src/mailbox-conf.c:1542
+#: ../src/mailbox-conf.c:1539
 msgid ""
 "_Decrypt and check\n"
 "signatures automatically:"
@@ -5593,11 +5713,11 @@ msgstr ""
 "_Descifrar y comprobar\n"
 "firmas automáticamente:"
 
-#: ../src/mailbox-conf.c:1569
+#: ../src/mailbox-conf.c:1566
 msgid "Show _Recipient column instead of Sender"
 msgstr "Mostrar columna del _destinatario en vez del remitente"
 
-#: ../src/mailbox-conf.c:1583
+#: ../src/mailbox-conf.c:1580
 msgid "_Subscribe for new mail check"
 msgstr "_Suscribirse para comprobación de correo"
 
@@ -5628,104 +5748,112 @@ msgstr "Falló el escrutinio de %s: %s"
 
 # src/mailbox-conf.c:718
 # src/mailbox-conf.c:793
-#: ../src/mailbox-node.c:1063
+#: ../src/mailbox-node.c:1058
 msgid "Local _mbox mailbox…"
 msgstr "Buzón _mbox local…"
 
 # src/mailbox-conf.c:718
 # src/mailbox-conf.c:793
-#: ../src/mailbox-node.c:1065
+#: ../src/mailbox-node.c:1060
 msgid "Local Mail_dir mailbox…"
 msgstr "Buzón Mail_dir local…"
 
 # src/mailbox-conf.c:718
 # src/mailbox-conf.c:793
-#: ../src/mailbox-node.c:1067
+#: ../src/mailbox-node.c:1062
 msgid "Local M_H mailbox…"
 msgstr "Buzón M_H local…"
 
 # libmutt/mbox.c:1066
-#: ../src/mailbox-node.c:1069
+#: ../src/mailbox-node.c:1064
 msgid "Remote _IMAP mailbox…"
 msgstr "Buzón _IMAP remoto…"
 
 # src/pref-manager.c:1162
 # src/pref-manager.c:1298
-#: ../src/mailbox-node.c:1072
+#: ../src/mailbox-node.c:1067
 msgid "Remote IMAP _folder…"
 msgstr "Carpeta IMAP remota…"
 
 # libmutt/mbox.c:1066
-#: ../src/mailbox-node.c:1074
+#: ../src/mailbox-node.c:1069
 msgid "Remote IMAP _subfolder…"
 msgstr "_Subcarpeta IMAP remota…"
 
+# src/main-window.c:191
+# src/main-window.c:196
+#. Translators: popup menu item "New" mailbox or folder
+#: ../src/mailbox-node.c:1074
+msgctxt "mailbox"
+msgid "_New"
+msgstr "_Nuevo"
+
 #. clicked on the empty space
-#: ../src/mailbox-node.c:1085 ../src/mailbox-node.c:1101
+#: ../src/mailbox-node.c:1081 ../src/mailbox-node.c:1097
 msgid "_Rescan"
 msgstr "_Revisar"
 
 # src/mblist-window.c:450
 # src/mblist-window.c:473
-#: ../src/mailbox-node.c:1095
+#: ../src/mailbox-node.c:1091
 msgid "_Properties…"
 msgstr "_Propiedades…"
 
-#: ../src/mailbox-node.c:1125
+#: ../src/mailbox-node.c:1121
 msgid "_Subscribe"
 msgstr "_Suscribir"
 
-#: ../src/mailbox-node.c:1127
+#: ../src/mailbox-node.c:1123
 msgid "_Unsubscribe"
 msgstr "_Desuscribir"
 
 # src/mblist-window.c:456
 # src/mblist-window.c:479
-#: ../src/mailbox-node.c:1133
+#: ../src/mailbox-node.c:1129
 msgid "Mark as _Inbox"
 msgstr "Marcar como bandeja de _entrada"
 
 # src/mblist-window.c:457
 # src/mblist-window.c:480
-#: ../src/mailbox-node.c:1135
+#: ../src/mailbox-node.c:1131
 msgid "_Mark as Sentbox"
 msgstr "Marcar como bandeja de _salida"
 
 # src/mblist-window.c:458
 # src/mblist-window.c:481
-#: ../src/mailbox-node.c:1137
+#: ../src/mailbox-node.c:1133
 msgid "Mark as _Trash"
 msgstr "Marcar como _papelera"
 
 # src/mblist-window.c:459
 # src/mblist-window.c:482
-#: ../src/mailbox-node.c:1139
+#: ../src/mailbox-node.c:1135
 msgid "Mark as D_raftbox"
 msgstr "Marcar como bandeja de _borradores"
 
-#: ../src/mailbox-node.c:1142
+#: ../src/mailbox-node.c:1138
 msgid "_Empty trash"
 msgstr "_Vaciar la papelera"
 
-#: ../src/mailbox-node.c:1147
+#: ../src/mailbox-node.c:1143
 msgid "_Edit/Apply filters"
 msgstr "_Editar/Aplicar filtros"
 
 # libinit_balsa/balsa-druid-page-directory.gob:101
 # libinit_balsa/balsa-druid-page-directory.gob:101
-#: ../src/mailbox-node.c:1234
+#: ../src/mailbox-node.c:1230
 #, c-format
 msgid "The path “%s” does not lead to a mailbox."
 msgstr "La ruta «%s» aparentemente no lleva a un buzón."
 
-#: ../src/mailbox-node.c:1247
+#: ../src/mailbox-node.c:1243
 #, c-format
 msgid "Local mailbox %s loaded as: %s\n"
 msgstr "Buzón local %s cargado como %s\n"
 
 # src/filter-edit-dialog.c:52
 # src/filter-edit-dialog.c:50
-#: ../src/mailbox-node.c:1278
+#: ../src/mailbox-node.c:1274
 #, c-format
 msgid "Local folder %s\n"
 msgstr "Carpeta local %s\n"
@@ -5767,59 +5895,59 @@ msgid "Trash"
 msgstr "Papelera"
 
 # libmutt/mbox.c:1066
-#: ../src/main.c:384
+#: ../src/main.c:375
 msgid "Compressing mail folders…"
 msgstr "Comprimiendo las carpetas de correo…"
 
-#: ../src/main.c:648
+#: ../src/main.c:632
 msgid "Get new mail on start-up"
 msgstr "Obtener el correo nuevo al iniciar"
 
-#: ../src/main.c:650
+#: ../src/main.c:634
 msgid "Compose a new email to EMAIL@ADDRESS"
 msgstr "Redactar un correo-e nuevo a CORREO@DIRECCIÓN"
 
-#: ../src/main.c:652
+#: ../src/main.c:636
 msgid "Attach file at URI"
 msgstr "Adjuntar archivo al URI"
 
-#: ../src/main.c:655
+#: ../src/main.c:639
 msgid "Opens MAILBOXNAME"
 msgstr "Abre NOMBREBUZÓN"
 
-#: ../src/main.c:655
+#: ../src/main.c:639
 msgid "MAILBOXNAME"
 msgstr "NOMBREBUZÓN"
 
 # libmutt/mx.c:459 libmutt/mx.c:605
 # libmutt/mx.c:459 libmutt/mx.c:605
-#: ../src/main.c:658
+#: ../src/main.c:642
 msgid "Opens first unread mailbox"
 msgstr "Abre el primer buzón no leído"
 
-#: ../src/main.c:661
+#: ../src/main.c:645
 msgid "Opens default Inbox on start-up"
 msgstr "Abre la bandeja de entrada predeterminado al inicio"
 
 # libmutt/mx.c:1375
 # libmutt/mx.c:1375
-#: ../src/main.c:664
+#: ../src/main.c:648
 msgid "Prints number unread and unsent messages"
 msgstr "Imprimir el número de mensajes no leídos y no enviados"
 
-#: ../src/main.c:666
+#: ../src/main.c:650
 msgid "Debug IMAP connection"
 msgstr "Depurar la conexión IMAP"
 
-#: ../src/main.c:667
+#: ../src/main.c:651
 msgid "Show help options"
 msgstr "Mostrar opciones de ayuda"
 
-#: ../src/main.c:668
+#: ../src/main.c:652
 msgid "Show version"
-msgstr "Mostrar versión"
+msgstr "Mostrar versión"
 
-#: ../src/main-window.c:280
+#: ../src/main-window.c:279
 msgid ""
 "Balsa is sending a mail now.\n"
 "Abort sending?"
@@ -5827,66 +5955,68 @@ msgstr ""
 "Balsa está enviando un correo ahora.\n"
 "¿Abortar el envío?"
 
-#: ../src/main-window.c:450
+#: ../src/main-window.c:449
 msgid "Subject or Sender Contains:"
 msgstr "El asunto o el remitente contiene:"
 
-#: ../src/main-window.c:451
+#: ../src/main-window.c:450
 msgid "Subject or Recipient Contains:"
 msgstr "El asunto o el receptor contiene:"
 
-#: ../src/main-window.c:452
+#: ../src/main-window.c:451
 msgid "Subject Contains:"
 msgstr "El asunto contiene:"
 
-#: ../src/main-window.c:453
+#: ../src/main-window.c:452
 msgid "Body Contains:"
 msgstr "El cuerpo contiene:"
 
-#: ../src/main-window.c:454
+#: ../src/main-window.c:453
 msgid "Older than (days):"
 msgstr "Más antiguo que (días):"
 
-#: ../src/main-window.c:455
+#: ../src/main-window.c:454
 msgid "Old at most (days):"
 msgstr "Como mucho más antiguo que (días):"
 
-#: ../src/main-window.c:975
+#: ../src/main-window.c:974
 msgid "translator-credits"
 msgstr ""
+"Gloriana Cocozza <besttranslatedcr gmail com>, 2017\n"
+"Daniel Mustieles <daniel mustieles gmail com>, 2017\n"
 "Jorge González <jorgegonz svn gnome org>, 2007-2010\n"
 "Jorge Bernal <koke amedias org>\n"
 "Francisco F. Serrador <serrador cvs gnome org>"
 
-#: ../src/main-window.c:986
+#: ../src/main-window.c:985
 msgid "The Balsa email client is part of the GNOME desktop environment."
 msgstr "El cliente de correo-e Balsa es parte del entorno de escritorio GNOME."
 
 # src/filter-edit-dialog.c:783
 # src/filter-edit-dialog.c:693
 #. license ?
-#: ../src/main-window.c:991
+#: ../src/main-window.c:990
 msgid "About Balsa"
 msgstr "Acerca de Balsa"
 
-#: ../src/main-window.c:1013
+#: ../src/main-window.c:1012
 msgid "Balsa closes files and connections. Please wait…"
 msgstr "Balsa cierra los archivos y conexiones. Espere…"
 
-#: ../src/main-window.c:1403
+#: ../src/main-window.c:1402
 msgid "You can apply filters only on mailbox\n"
 msgstr "Sólo puede aplicar filtros en su buzón\n"
 
 # libmutt/imap/auth.c:373
 # libmutt/imap/auth.c:373
-#: ../src/main-window.c:1423
+#: ../src/main-window.c:1422
 #, c-format
 msgid "Removing duplicates failed: %s"
 msgstr "La eliminación de duplicados falló: %s"
 
 # src/pref-manager.c:1058
 # src/pref-manager.c:1188
-#: ../src/main-window.c:1429
+#: ../src/main-window.c:1428
 #, c-format
 msgid "Removed %d duplicate"
 msgid_plural "Removed %d duplicates"
@@ -5895,12 +6025,12 @@ msgstr[1] "%d duplicados eliminados"
 
 # src/pref-manager.c:237 src/pref-manager.c:949 src/pref-manager.c:1027
 # src/pref-manager.c:1838
-#: ../src/main-window.c:1434
+#: ../src/main-window.c:1433
 msgid "No duplicates found"
 msgstr "No se encontraron duplicados"
 
 # libmutt/mbox.c:712
-#: ../src/main-window.c:2922
+#: ../src/main-window.c:2921
 #, c-format
 msgid ""
 "Unable to Open Mailbox!\n"
@@ -5911,59 +6041,59 @@ msgstr ""
 
 # src/balsa-message.c:701
 # src/balsa-message.c:812
-#: ../src/main-window.c:2957
+#: ../src/main-window.c:2956
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
 # src/pref-manager.c:971
 # src/pref-manager.c:1099
-#: ../src/main-window.c:3270 ../src/main-window.c:3288
+#: ../src/main-window.c:3267 ../src/main-window.c:3285
 msgid "Checking Mail…"
 msgstr "Comprobando correo…"
 
 # src/mailbox-conf.c:718
 # src/mailbox-conf.c:793
-#: ../src/main-window.c:3428
+#: ../src/main-window.c:3425
 #, c-format
 msgid "IMAP mailbox: %s"
 msgstr "Buzón IMAP: %s"
 
 # src/mailbox-conf.c:718
 # src/mailbox-conf.c:793
-#: ../src/main-window.c:3432
+#: ../src/main-window.c:3429
 #, c-format
 msgid "Local mailbox: %s"
 msgstr "Buzón local: %s"
 
-#: ../src/main-window.c:3600
+#: ../src/main-window.c:3595
 msgid "Finished Checking."
 msgstr "La comprobación ha terminado."
 
-#: ../src/main-window.c:3643
+#: ../src/main-window.c:3637
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Ha recibido %d mensaje nuevo."
 msgstr[1] "Ha recibido %d mensajes nuevos."
 
-#: ../src/main-window.c:3646
+#: ../src/main-window.c:3640
 msgid "You have new mail."
 msgstr "Tiene correo nuevo."
 
-#: ../src/main-window.c:3714 ../src/main-window.c:3749
+#: ../src/main-window.c:3708 ../src/main-window.c:3743
 msgid "Balsa: New mail"
 msgstr "Balsa: Correo nuevo"
 
 # src/main-window.c:399
 # src/main-window.c:401
-#: ../src/main-window.c:3907
+#: ../src/main-window.c:3901
 msgid "Search mailbox"
 msgstr "Buscar buzón"
 
 # src/filter-edit-dialog.c:570
 # src/filter-edit-dialog.c:491
-#: ../src/main-window.c:3933
+#: ../src/main-window.c:3927
 msgid "_Search for:"
 msgstr "_Buscar:"
 
@@ -5971,56 +6101,56 @@ msgstr "_Buscar:"
 # libinit_balsa/balsa-druid-page-directory.gob:60
 #. builds the toggle buttons to specify fields concerned by
 #. * the search.
-#: ../src/main-window.c:3946
+#: ../src/main-window.c:3940
 msgid "In:"
 msgstr "En:"
 
 # src/balsa-index.c:304 src/filter-edit-dialog.c:349
 # src/balsa-index.c:297 src/filter-edit-dialog.c:326
-#: ../src/main-window.c:3958
+#: ../src/main-window.c:3952
 msgid "S_ubject"
 msgstr "_Asunto"
 
 # src/message-window.c:120
 # src/message-window.c:114
 #. Frame with Apply and Clear buttons
-#: ../src/main-window.c:3963
+#: ../src/main-window.c:3957
 msgid "Show only matching messages"
 msgstr "Mostrar sólo los mensajes que coincidan"
 
 # src/balsa-message.c:651
 # src/balsa-message.c:713
 #. Frame with OK button
-#: ../src/main-window.c:3984
+#: ../src/main-window.c:3978
 msgid "Open next matching message"
 msgstr "Abrir el siguiente mensaje coincidente"
 
-#: ../src/main-window.c:3996
+#: ../src/main-window.c:3990
 msgid "_Reverse search"
 msgstr "Búsqueda _invertida"
 
 # src/filter-edit-dialog.c:313
 # src/filter-edit-dialog.c:296
-#: ../src/main-window.c:4001
+#: ../src/main-window.c:3995
 msgid "_Wrap around"
 msgstr "_Ajustar cuerpo"
 
 # libmutt/mbox.c:1028
-#: ../src/main-window.c:4225
+#: ../src/main-window.c:4219
 #, c-format
 msgid "Could not open trash: %s"
 msgstr "No se pudo abrir la papelera: %s"
 
 # libmutt/mx.c:1050
 # libmutt/mx.c:1050
-#: ../src/main-window.c:4360
+#: ../src/main-window.c:4354
 #, c-format
 msgid "Balsa: %s (read-only)"
 msgstr "Balsa: %s (sólo lectura)"
 
 # src/filter-edit-dialog.c:783
 # src/filter-edit-dialog.c:693
-#: ../src/main-window.c:4362
+#: ../src/main-window.c:4356
 #, c-format
 msgid "Balsa: %s"
 msgstr "Balsa: %s"
@@ -6029,28 +6159,28 @@ msgstr "Balsa: %s"
 # src/mailbox-conf.c:793
 #. xgettext: this is the first part of the message
 #. * "Shown mailbox: %s with %d messages, %d new, %d hidden".
-#: ../src/main-window.c:4862
+#: ../src/main-window.c:4849
 #, c-format
 msgid "Shown mailbox: %s "
 msgstr "Buzón mostrado: %s "
 
 # libmutt/mx.c:1375
 # libmutt/mx.c:1375
-#: ../src/main-window.c:4867
+#: ../src/main-window.c:4854
 #, c-format
 msgid "with %d message"
 msgid_plural "with %d messages"
 msgstr[0] "con %d mensaje"
 msgstr[1] "con %d mensajes"
 
-#: ../src/main-window.c:4874
+#: ../src/main-window.c:4861
 #, c-format
 msgid ", %d new"
 msgid_plural ", %d new"
 msgstr[0] ", %d nuevo"
 msgstr[1] ", %d nuevos"
 
-#: ../src/main-window.c:4881
+#: ../src/main-window.c:4868
 #, c-format
 msgid ", %d hidden"
 msgid_plural ", %d hidden"
@@ -6059,25 +6189,25 @@ msgstr[1] ", %d ocultos"
 
 # libmutt/mx.c:1375
 # libmutt/mx.c:1375
-#: ../src/main-window.c:4926
+#: ../src/main-window.c:4913
 #, c-format
 msgid "The next unread message is in %s"
 msgstr "El siguiente mensaje no leído está en %s"
 
-#: ../src/main-window.c:4933
+#: ../src/main-window.c:4920
 #, c-format
 msgid "Do you want to select %s?"
 msgstr "¿Quiere seleccionar %s?"
 
 # src/filter-edit-dialog.c:425 src/sendmsg-window.c:514
 # src/filter-edit-dialog.c:384 src/sendmsg-window.c:543
-#: ../src/message-window.c:303
+#: ../src/message-window.c:299 ../ui/message-window.ui.h:19
 msgid "M_ove"
 msgstr "M_over"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../src/message-window.c:748
+#: ../src/message-window.c:744
 #, c-format
 msgid "Message from %s: %s"
 msgstr "Mensaje de %s: %s"
@@ -6188,13 +6318,13 @@ msgid "Remote POP3 mailbox…"
 msgstr "Buzón POP3 remoto…"
 
 # libmutt/mbox.c:1066
-#: ../src/pref-manager.c:1705
+#: ../src/pref-manager.c:1705 ../ui/main-window.ui.h:7
 msgid "Remote IMAP mailbox…"
 msgstr "Buzón IMAP remoto…"
 
 # src/pref-manager.c:1162
 # src/pref-manager.c:1298
-#: ../src/pref-manager.c:1709
+#: ../src/pref-manager.c:1709 ../ui/main-window.ui.h:8
 msgid "Remote IMAP folder…"
 msgstr "Carpeta IMAP remota…"
 
@@ -6205,7 +6335,7 @@ msgid "Remote mailbox servers"
 msgstr "Servidores de buzones remotos"
 
 #: ../src/pref-manager.c:1987 ../src/pref-manager.c:2752
-#: ../src/sendmsg-window.c:2681
+#: ../src/sendmsg-window.c:2679
 msgid "Type"
 msgstr "Tipo"
 
@@ -6226,7 +6356,7 @@ msgstr "_Modificar"
 # libinit_balsa/balsa-druid-page-user.gob:94
 #: ../src/pref-manager.c:2039
 msgid "Local mail directory"
-msgstr "Directorio de correo _local:"
+msgstr "Directorio de correo local"
 
 # libinit_balsa/balsa-druid-page-user.gob:94
 # libinit_balsa/balsa-druid-page-user.gob:94
@@ -6577,7 +6707,7 @@ msgstr "Mostrar diálogo de progreso"
 
 # src/address-book.c:369
 # src/address-book.c:394
-#: ../src/pref-manager.c:2732 ../src/pref-manager.c:3350
+#: ../src/pref-manager.c:2732 ../src/pref-manager.c:3345
 msgid "Address books"
 msgstr "Libretas de direcciones"
 
@@ -6646,7 +6776,7 @@ msgstr "Inspeccionar las carpetas locales hasta la profundidad"
 msgid "Scan IMAP folders to depth"
 msgstr "Inspeccionar las carpetas IMAP hasta la profundidad"
 
-#: ../src/pref-manager.c:2906 ../src/pref-manager.c:3364
+#: ../src/pref-manager.c:2906 ../src/pref-manager.c:3359
 msgid "Miscellaneous"
 msgstr "Varios"
 
@@ -6741,15 +6871,15 @@ msgstr "Mensajes de estado"
 # src/filter-edit-dialog.c:783
 # src/filter-edit-dialog.c:693
 #. must NOT be modal
-#: ../src/pref-manager.c:3292
+#: ../src/pref-manager.c:3287
 msgid "Balsa Preferences"
 msgstr "Preferencias de Balsa"
 
-#: ../src/pref-manager.c:3355 ../src/toolbar-factory.c:166
+#: ../src/pref-manager.c:3350 ../src/toolbar-factory.c:162
 msgid "Spelling"
 msgstr "Ortografía"
 
-#: ../src/pref-manager.c:3360
+#: ../src/pref-manager.c:3355
 msgid "Start-up"
 msgstr "Inicio"
 
@@ -6865,11 +6995,11 @@ msgstr "_Derecha"
 msgid "Error printing message: %s"
 msgstr "Error al imprimir el mensaje: %s"
 
-#: ../src/save-restore.c:588
+#: ../src/save-restore.c:586
 msgid "Error during filters loading: "
 msgstr "Error durante la carga de filtros: "
 
-#: ../src/save-restore.c:590
+#: ../src/save-restore.c:588
 #, c-format
 msgid ""
 "Error during filters loading: %s\n"
@@ -6878,11 +7008,11 @@ msgstr ""
 "Error durante la carga de filtros: %s\n"
 "Los filtros pueden tener errores."
 
-#: ../src/save-restore.c:711
+#: ../src/save-restore.c:710
 msgid "The option not to recognize “format=flowed” text has been removed."
 msgstr "La opción de no reconocer text «format=flowed» se ha eliminado."
 
-#: ../src/save-restore.c:988
+#: ../src/save-restore.c:987
 msgid ""
 "The option not to send “format=flowed” text is now on the Options menu of "
 "the compose window."
@@ -6890,14 +7020,14 @@ msgstr ""
 "La opción no enviar texto «format=flowed» está ahora en el menú Opciones de "
 "la ventana de redacción."
 
-#: ../src/save-restore.c:1027
+#: ../src/save-restore.c:1026
 msgid ""
 "The option to request a MDN is now on the Options menu of the compose window."
 msgstr ""
 "La opción para solicitar un MDN está ahora en el menú de Opciones de la "
 "ventana de redacción."
 
-#: ../src/save-restore.c:1104
+#: ../src/save-restore.c:1103
 msgid ""
 "This version of Balsa uses a new user interface; if you have changed Balsa’s "
 "keyboard accelerators, you will need to set them again."
@@ -7099,17 +7229,17 @@ msgstr ""
 "El mensaje a «%s» se ha modificado.\n"
 "¿Guardar mensaje en borradores?"
 
-#: ../src/sendmsg-window.c:818
-msgid "Gnome editor is not defined in your preferred applications."
+#: ../src/sendmsg-window.c:816
+msgid "GNOME editor is not defined in your preferred applications."
 msgstr "El editor de GNOME no está definido en sus aplicaciones preferidas."
 
 # src/pref-manager.c:234 src/pref-manager.c:867
 # src/pref-manager.c:236 src/pref-manager.c:992
-#: ../src/sendmsg-window.c:891
+#: ../src/sendmsg-window.c:889
 msgid "Select Identity"
 msgstr "Seleccionar la identidad"
 
-#: ../src/sendmsg-window.c:1406
+#: ../src/sendmsg-window.c:1404
 #, c-format
 msgid ""
 "Saying yes will not send the file “%s” itself, but just a MIME message/"
@@ -7125,15 +7255,15 @@ msgstr ""
 "\n"
 "¿Quiere realmente adjuntar este archivo como referencia?"
 
-#: ../src/sendmsg-window.c:1419
+#: ../src/sendmsg-window.c:1417
 msgid "Attach as Reference?"
 msgstr "¿Adjuntar como referencia?"
 
-#: ../src/sendmsg-window.c:1552
+#: ../src/sendmsg-window.c:1550
 msgid "Choose character set"
 msgstr "Elegir conjunto de caracteres"
 
-#: ../src/sendmsg-window.c:1560
+#: ../src/sendmsg-window.c:1558
 #, c-format
 msgid ""
 "File\n"
@@ -7146,63 +7276,63 @@ msgstr ""
 "no está codificado en US-ASCII o UTF-8\n"
 "Elija el conjunto de caracteres empleado para codificar el archivo."
 
-#: ../src/sendmsg-window.c:1580
+#: ../src/sendmsg-window.c:1578
 msgid "Attach as MIME type:"
 msgstr "Adjuntar como tipo MIME:"
 
-#: ../src/sendmsg-window.c:1641
+#: ../src/sendmsg-window.c:1639
 #, c-format
 msgid "Character set for file %s changed from “%s” to “%s”."
 msgstr "El conjunto de caracteres del archivo %s cambió de «%s» a «%s»."
 
 # src/balsa-index.c:304 src/filter-edit-dialog.c:349
 # src/balsa-index.c:297 src/filter-edit-dialog.c:326
-#: ../src/sendmsg-window.c:1684 ../src/sendmsg-window.c:5034
+#: ../src/sendmsg-window.c:1682 ../src/sendmsg-window.c:5023
 msgid "(no subject)"
 msgstr "(Sin asunto)"
 
-#: ../src/sendmsg-window.c:1722
+#: ../src/sendmsg-window.c:1720
 #, c-format
 msgid "Cannot create file URI object for %s"
 msgstr "No se puede crear el objeto URI de archivo para %s"
 
 # libmutt/imap/imap_ssl.c:254
 # libmutt/imap/imap_ssl.c:254
-#: ../src/sendmsg-window.c:1730
+#: ../src/sendmsg-window.c:1728
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: ../src/sendmsg-window.c:1770
+#: ../src/sendmsg-window.c:1768
 msgid "forwarded message"
 msgstr "mensaje reenviado"
 
-#: ../src/sendmsg-window.c:1775
+#: ../src/sendmsg-window.c:1773
 #, c-format
 msgid "Message from %s, subject: “%s”"
 msgstr "Mensaje de %s, asunto: «%s»"
 
 # src/filter-edit-dialog.c:425 src/sendmsg-window.c:514
 # src/filter-edit-dialog.c:384 src/sendmsg-window.c:543
-#: ../src/sendmsg-window.c:1853 ../src/sendmsg-window.c:1926
+#: ../src/sendmsg-window.c:1851 ../src/sendmsg-window.c:1924
 msgid "Remove"
 msgstr "Eliminar"
 
 # src/mblist-window.c:446
 # src/mblist-window.c:469
-#: ../src/sendmsg-window.c:1938
+#: ../src/sendmsg-window.c:1936
 msgid "Open…"
 msgstr "Abrir…"
 
-#: ../src/sendmsg-window.c:1950
+#: ../src/sendmsg-window.c:1948
 msgid "(URL)"
 msgstr "(URL)"
 
-#: ../src/sendmsg-window.c:2006
+#: ../src/sendmsg-window.c:2004
 msgid "Attach file"
 msgstr "Adjuntar archivo"
 
-#: ../src/sendmsg-window.c:2119 ../src/sendmsg-window.c:2222
-#: ../src/sendmsg-window.c:6860
+#: ../src/sendmsg-window.c:2117 ../src/sendmsg-window.c:2220
+#: ../src/sendmsg-window.c:6862
 msgid ""
 "Attaching message failed.\n"
 "Possible reason: not enough temporary space"
@@ -7214,174 +7344,174 @@ msgstr ""
 # src/sendmsg-window.c:835
 # src/balsa-message.c:633 src/filter-edit-dialog.c:316 src/print.c:348
 # src/sendmsg-window.c:867
-#: ../src/sendmsg-window.c:2441
+#: ../src/sendmsg-window.c:2439
 msgid "F_rom:"
 msgstr "_De:"
 
 # src/balsa-message.c:580 src/print.c:345 src/sendmsg-window.c:842
 # src/balsa-message.c:625 src/print.c:358 src/sendmsg-window.c:876
 #. Subject:
-#: ../src/sendmsg-window.c:2591
+#: ../src/sendmsg-window.c:2589
 msgid "S_ubject:"
 msgstr "As_unto:"
 
-#: ../src/sendmsg-window.c:2618
+#: ../src/sendmsg-window.c:2616
 msgid "F_CC:"
 msgstr "F_cc:"
 
 # src/sendmsg-window.c:891
 # src/sendmsg-window.c:934
 #. Attachment list
-#: ../src/sendmsg-window.c:2644
+#: ../src/sendmsg-window.c:2642
 msgid "_Attachments:"
 msgstr "_Adjuntos:"
 
-#: ../src/sendmsg-window.c:2688
+#: ../src/sendmsg-window.c:2686
 msgid "Mode"
 msgstr "Modo"
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../src/sendmsg-window.c:3034
+#: ../src/sendmsg-window.c:3032
 #, c-format
 msgid "Could not save attachment: %s"
 msgstr "No se pudo guardar el adjunto: %s"
 
 # src/balsa-index.c:304 src/filter-edit-dialog.c:349
 # src/balsa-index.c:297 src/filter-edit-dialog.c:326
-#: ../src/sendmsg-window.c:3058
+#: ../src/sendmsg-window.c:3056
 msgid "No subject"
 msgstr "Sin asunto"
 
-#: ../src/sendmsg-window.c:3092
+#: ../src/sendmsg-window.c:3090
 #, c-format
 msgid "inlined file “%s” (%s)"
 msgstr "archivo incluido en línea «%s» (%s)"
 
-#: ../src/sendmsg-window.c:3095
+#: ../src/sendmsg-window.c:3093
 #, c-format
 msgid "attached file “%s” (%s)"
 msgstr "archivo adjunto «%s» (%s)"
 
-#: ../src/sendmsg-window.c:3099
+#: ../src/sendmsg-window.c:3097
 #, c-format
 msgid "inlined %s part"
 msgstr "%s partes incluidas en línea"
 
-#: ../src/sendmsg-window.c:3101
+#: ../src/sendmsg-window.c:3099
 #, c-format
 msgid "attached %s part"
 msgstr "parte %s adjuntada"
 
-#: ../src/sendmsg-window.c:3169
+#: ../src/sendmsg-window.c:3166
 #, c-format
 msgid "message from %s, subject “%s”"
 msgstr "mensaje de %s, asunto: «%s»"
 
-#: ../src/sendmsg-window.c:3296
+#: ../src/sendmsg-window.c:3293
 msgid "quoted"
 msgstr "citado"
 
 # src/sendmsg-window.c:891
 # src/sendmsg-window.c:934
-#: ../src/sendmsg-window.c:3301 ../src/sendmsg-window.c:3304
+#: ../src/sendmsg-window.c:3298 ../src/sendmsg-window.c:3301
 msgid "quoted attachment"
 msgstr "adjunto citado"
 
 # src/pref-manager.c:1821
 # src/pref-manager.c:1991 src/pref-manager.c:2040
-#: ../src/sendmsg-window.c:3330
+#: ../src/sendmsg-window.c:3327
 msgid "Select parts for quotation"
 msgstr "Seleccione partes para citarlas"
 
-#: ../src/sendmsg-window.c:3341
+#: ../src/sendmsg-window.c:3338
 msgid "Select the parts of the message which shall be quoted in the reply"
 msgstr "Seleccione las partes del mensaje que se citarán en la respuesta"
 
-#: ../src/sendmsg-window.c:3494
+#: ../src/sendmsg-window.c:3491
 msgid "you"
 msgstr "usted"
 
-#: ../src/sendmsg-window.c:3503
+#: ../src/sendmsg-window.c:3500
 #, c-format
 msgid "------forwarded message from %s------\n"
 msgstr "------mensaje reenviado de %s------\n"
 
 # src/main-window.c:421
 # src/main-window.c:428
-#: ../src/sendmsg-window.c:3540
+#: ../src/sendmsg-window.c:3537
 #, c-format
 msgid "Message-ID: %s\n"
 msgstr "Message-ID: %s\n"
 
-#: ../src/sendmsg-window.c:3546
+#: ../src/sendmsg-window.c:3543
 msgid "References:"
 msgstr "Referencias:"
 
-#: ../src/sendmsg-window.c:3557
+#: ../src/sendmsg-window.c:3554
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "El %s, %s escribió:\n"
 
-#: ../src/sendmsg-window.c:3559
+#: ../src/sendmsg-window.c:3556
 #, c-format
 msgid "%s wrote:\n"
 msgstr "%s escribió:\n"
 
 # src/pref-manager.c:237 src/pref-manager.c:949 src/pref-manager.c:1027
 # src/pref-manager.c:1838
-#: ../src/sendmsg-window.c:3672
+#: ../src/sendmsg-window.c:3669
 msgid "No signature found!"
-msgstr "No se ha encontrado la firma."
+msgstr "No se encontraron firmas."
 
 # src/balsa-message.c:651
 # src/balsa-message.c:713
-#: ../src/sendmsg-window.c:3813
+#: ../src/sendmsg-window.c:3810
 msgid "Could not save message."
 msgstr "No se pudo guardar el mensaje."
 
 # libmutt/mbox.c:1028
-#: ../src/sendmsg-window.c:3820
+#: ../src/sendmsg-window.c:3817
 #, c-format
 msgid "Could not open draftbox: %s"
 msgstr "No se pudo abrir el buzón de borradores: %s"
 
 # src/main-window.c:421
 # src/main-window.c:428
-#: ../src/sendmsg-window.c:3845
+#: ../src/sendmsg-window.c:3842
 msgid "Message saved."
 msgstr "Mensaje guardado."
 
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
-#: ../src/sendmsg-window.c:4470 ../src/sendmsg-window.c:4478
-#: ../src/sendmsg-window.c:4485 ../src/sendmsg-window.c:4492
-#: ../src/sendmsg-window.c:4516
+#: ../src/sendmsg-window.c:4457 ../src/sendmsg-window.c:4465
+#: ../src/sendmsg-window.c:4472 ../src/sendmsg-window.c:4479
+#: ../src/sendmsg-window.c:4503
 #, c-format
 msgid "Could not attach the file %s: %s."
-msgstr "No se pudo adjuntar el archivo %s: %s"
+msgstr "No se pudo adjuntar el archivo %s: %s."
 
-#: ../src/sendmsg-window.c:4471
+#: ../src/sendmsg-window.c:4458
 msgid "not an absolute path"
 msgstr "no es una ruta absoluta"
 
 # libinit_balsa/balsa-druid-page-user.gob:94
 # libinit_balsa/balsa-druid-page-user.gob:94
-#: ../src/sendmsg-window.c:4479
+#: ../src/sendmsg-window.c:4466
 msgid "not in your directory"
 msgstr "no está en su directorio"
 
 # src/pref-manager.c:1087
 # src/pref-manager.c:1218
-#: ../src/sendmsg-window.c:4486
+#: ../src/sendmsg-window.c:4473
 msgid "does not exist"
 msgstr "no existe"
 
-#: ../src/sendmsg-window.c:4517
+#: ../src/sendmsg-window.c:4504
 msgid "not in current directory"
 msgstr "no está en el directorio actual"
 
-#: ../src/sendmsg-window.c:4567
+#: ../src/sendmsg-window.c:4554
 msgid ""
 "The link that you selected created\n"
 "a “Blind copy” (BCC) address.\n"
@@ -7393,21 +7523,21 @@ msgstr ""
 "Compruebe que la\n"
 "dirección es apropiada."
 
-#: ../src/sendmsg-window.c:4676
+#: ../src/sendmsg-window.c:4663
 #, c-format
 msgid "Cannot not read the file “%s”: %s"
 msgstr "No se puede leer el archivo «%s»: %s"
 
 # src/sendmsg-window.c:1434
 # src/sendmsg-window.c:1483
-#: ../src/sendmsg-window.c:4695
+#: ../src/sendmsg-window.c:4682
 msgid "Include file"
 msgstr "Incluir archivo"
 
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:4880
+#: ../src/sendmsg-window.c:4867
 #, c-format
 msgid "Could not load Face header file %s: %s"
 msgstr "No se pudo cargar el archivo de cabeceras de la cara %s: %s"
@@ -7415,32 +7545,32 @@ msgstr "No se pudo cargar el archivo de cabeceras de la cara %s: %s"
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:4883
+#: ../src/sendmsg-window.c:4870
 #, c-format
 msgid "Could not load X-Face header file %s: %s"
 msgstr "No se pudo cargar el archivo de cabeceras de X-Face %s: %s"
 
 # src/balsa-index.c:304 src/filter-edit-dialog.c:349
 # src/balsa-index.c:297 src/filter-edit-dialog.c:326
-#: ../src/sendmsg-window.c:4991
+#: ../src/sendmsg-window.c:4980
 msgid "No Subject"
 msgstr "Sin asunto"
 
 # src/address-book.c:477
 # src/address-book.c:523
-#: ../src/sendmsg-window.c:4996
+#: ../src/sendmsg-window.c:4985
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../src/sendmsg-window.c:5017
+#: ../src/sendmsg-window.c:5006
 msgid "You did not specify a subject for this message"
 msgstr "No especificó un asunto para este mensaje"
 
-#: ../src/sendmsg-window.c:5018
+#: ../src/sendmsg-window.c:5007
 msgid "If you would like to provide one, enter it below."
 msgstr "Si quiere proporcionar uno, introdúzcalo abajo."
 
-#: ../src/sendmsg-window.c:5111
+#: ../src/sendmsg-window.c:5100
 #, c-format
 msgid ""
 "You did not select encryption for this message, although %s public keys are "
@@ -7451,19 +7581,19 @@ msgstr ""
 "%s están disponibles para todos los destinatarios. Para proteger su "
 "privacidad el mensaje se podría cifrar con %s."
 
-#: ../src/sendmsg-window.c:5133
+#: ../src/sendmsg-window.c:5122
 msgid "Send _encrypted"
 msgstr "Enviar ci_frado"
 
-#: ../src/sendmsg-window.c:5148
+#: ../src/sendmsg-window.c:5137
 msgid "Send _unencrypted"
 msgstr "Enviar _sin cifrado"
 
-#: ../src/sendmsg-window.c:5208
+#: ../src/sendmsg-window.c:5197
 msgid "You selected OpenPGP security for this message.\n"
 msgstr "Seleccionó seguridad OpenPGP para este mensaje.\n"
 
-#: ../src/sendmsg-window.c:5213
+#: ../src/sendmsg-window.c:5202
 msgid ""
 "The message text will be sent as plain text and as HTML, but only the plain "
 "part can be signed.\n"
@@ -7471,12 +7601,12 @@ msgstr ""
 "El mensaje de texto se enviará como texto plano y HTML pero sólo sólo se "
 "puede firmar la parte plana.\n"
 
-#: ../src/sendmsg-window.c:5218
+#: ../src/sendmsg-window.c:5207
 msgid ""
 "The message contains attachments, which cannot be signed or encrypted.\n"
 msgstr "El mensaje contiene adjuntos que no se pueden firmar o cifrar.\n"
 
-#: ../src/sendmsg-window.c:5222
+#: ../src/sendmsg-window.c:5211
 msgid ""
 "You should select MIME mode if the complete message shall be protected. Do "
 "you really want to proceed?"
@@ -7484,42 +7614,42 @@ msgstr ""
 "Debería seleccionar el modo MIME si se debe proteger el mensaje completo. "
 "¿Realmente quiere seguir adelante?"
 
-#: ../src/sendmsg-window.c:5247
+#: ../src/sendmsg-window.c:5236
 #, c-format
 msgid "sending message with GPG mode %d"
 msgstr "enviando mensaje con modo GPG %d"
 
-#: ../src/sendmsg-window.c:5275
+#: ../src/sendmsg-window.c:5264
 msgid "Message could not be created"
 msgstr "El mensaje no se pudo crear"
 
-#: ../src/sendmsg-window.c:5277
+#: ../src/sendmsg-window.c:5266
 msgid "Message could not be queued in outbox"
 msgstr "El mensaje no se pudo poner en la cola de salida"
 
-#: ../src/sendmsg-window.c:5279
+#: ../src/sendmsg-window.c:5268
 msgid "Message could not be saved in sentbox"
 msgstr "El mensaje no se pudo guardar en el buzón de enviados"
 
 # src/sendmsg-window.c:1403
 # src/sendmsg-window.c:1454
-#: ../src/sendmsg-window.c:5281
+#: ../src/sendmsg-window.c:5270
 msgid "Message could not be sent"
 msgstr "El mensaje no se pudo enviar"
 
 # src/sendmsg-window.c:1403
 # src/sendmsg-window.c:1454
-#: ../src/sendmsg-window.c:5284
+#: ../src/sendmsg-window.c:5273
 msgid "Message could not be signed"
 msgstr "El mensaje no se pudo firmar"
 
-#: ../src/sendmsg-window.c:5286
+#: ../src/sendmsg-window.c:5275
 msgid "Message could not be encrypted"
 msgstr "El mensaje no se pudo cifrar"
 
 # libmutt/imap/auth.c:373
 # libmutt/imap/auth.c:373
-#: ../src/sendmsg-window.c:5292
+#: ../src/sendmsg-window.c:5281
 #, c-format
 msgid ""
 "Send failed: %s\n"
@@ -7530,57 +7660,57 @@ msgstr ""
 
 # libmutt/imap/auth.c:373
 # libmutt/imap/auth.c:373
-#: ../src/sendmsg-window.c:5297
+#: ../src/sendmsg-window.c:5286
 #, c-format
 msgid "Send failed: %s"
 msgstr "El envío falló: %s"
 
 # src/balsa-message.c:651
 # src/balsa-message.c:713
-#: ../src/sendmsg-window.c:5396
+#: ../src/sendmsg-window.c:5387
 #, c-format
 msgid "Could not postpone message: %s"
 msgstr "No se pudo posponer el mensaje: %s"
 
 # src/main-window.c:421
 # src/main-window.c:428
-#: ../src/sendmsg-window.c:5417
+#: ../src/sendmsg-window.c:5408
 msgid "Message postponed."
 msgstr "Mensaje pospuesto."
 
 # src/balsa-message.c:651
 # src/balsa-message.c:713
-#: ../src/sendmsg-window.c:5422
+#: ../src/sendmsg-window.c:5413
 msgid "Could not postpone message."
 msgstr "No se pudo posponer el mensaje."
 
-#: ../src/sendmsg-window.c:5634
+#: ../src/sendmsg-window.c:5625
 #, c-format
 msgid "Error starting spell checker: %s"
 msgstr "Error al iniciar el comprobador de ortografía: %s"
 
 # src/sendmsg-window.c:1129
 # src/sendmsg-window.c:1180
-#: ../src/sendmsg-window.c:6385
+#: ../src/sendmsg-window.c:6383
 #, c-format
 msgid "Reply to %s: %s"
 msgstr "Responder a %s: %s"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../src/sendmsg-window.c:6390
+#: ../src/sendmsg-window.c:6388
 #, c-format
 msgid "Forward message to %s: %s"
 msgstr "Reenviar mensaje a %s: %s"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../src/sendmsg-window.c:6394
+#: ../src/sendmsg-window.c:6392
 #, c-format
 msgid "New message to %s: %s"
 msgstr "Mensaje nuevo a %s: %s"
 
-#: ../src/sendmsg-window.c:6559
+#: ../src/sendmsg-window.c:6560 ../ui/sendmsg-window.ui.h:33
 msgid "_Language"
 msgstr "_Idioma"
 
@@ -7649,7 +7779,7 @@ msgstr "Terminar la comprobación ortográfica"
 msgid "Revert all changes and finish spell checking"
 msgstr "Revertir todos los cambios y terminar la comprobación ortográfica"
 
-#: ../src/spell-check.c:1018
+#: ../src/spell-check.c:1016
 #, c-format
 msgid "BalsaSpellCheck: Enchant Error: %s\n"
 msgstr "ComprobaciónDeEscrituraDeBalsa: error de enchant: %s\n"
@@ -7702,7 +7832,7 @@ msgstr "Libreta de direcciones:"
 # src/sendmsg-window.c:867
 #: ../src/store-address.c:336
 msgid "From: "
-msgstr "De:"
+msgstr "De: "
 
 #: ../src/store-address.c:337
 msgid "To: "
@@ -7718,39 +7848,39 @@ msgstr "Cco: "
 
 # src/balsa-message.c:725
 # src/balsa-message.c:788
-#: ../src/toolbar-factory.c:140
+#: ../src/toolbar-factory.c:136
 msgid "Separator"
 msgstr "Separador"
 
-#: ../src/toolbar-factory.c:141
+#: ../src/toolbar-factory.c:137
 msgid "Quit"
 msgstr "Salir"
 
-#: ../src/toolbar-factory.c:142
+#: ../src/toolbar-factory.c:138
 msgid "Check"
 msgstr "Comprobar"
 
 # src/main-window.c:399
 # src/main-window.c:401
-#: ../src/toolbar-factory.c:143
+#: ../src/toolbar-factory.c:139
 msgid "Compose"
 msgstr "Redactar"
 
 # libmutt/imap/util.c:43
 # libmutt/imap/util.c:43
-#: ../src/toolbar-factory.c:144
+#: ../src/toolbar-factory.c:140
 msgid "Continue"
 msgstr "Continuar"
 
 # src/main-window.c:295 src/message-window.c:107
 # src/main-window.c:301 src/message-window.c:103
-#: ../src/toolbar-factory.c:145
+#: ../src/toolbar-factory.c:141
 msgid "Reply"
 msgstr "Responder"
 
 # src/main-window.c:302 src/message-window.c:113
 # src/main-window.c:308
-#: ../src/toolbar-factory.c:146
+#: ../src/toolbar-factory.c:142
 msgid ""
 "Reply\n"
 "to all"
@@ -7760,7 +7890,7 @@ msgstr ""
 
 # src/main-window.c:302 src/message-window.c:113
 # src/main-window.c:308
-#: ../src/toolbar-factory.c:147
+#: ../src/toolbar-factory.c:143
 msgid ""
 "Reply\n"
 "to group"
@@ -7770,11 +7900,11 @@ msgstr ""
 
 # src/message-window.c:120
 # src/message-window.c:114
-#: ../src/toolbar-factory.c:148
+#: ../src/toolbar-factory.c:144
 msgid "Forward"
 msgstr "Reenviar"
 
-#: ../src/toolbar-factory.c:151
+#: ../src/toolbar-factory.c:147
 msgid ""
 "Next\n"
 "unread"
@@ -7786,7 +7916,7 @@ msgstr ""
 # SI HAY MARCA LA QUITA... SI NO HAY MARCA LA PONE
 # src/balsa-index-page.c:503 src/main-window.c:352
 # src/balsa-index-page.c:555
-#: ../src/toolbar-factory.c:152
+#: ../src/toolbar-factory.c:148
 msgid ""
 "Next\n"
 "flagged"
@@ -7794,7 +7924,7 @@ msgstr ""
 "Siguiente\n"
 "marcado"
 
-#: ../src/toolbar-factory.c:153
+#: ../src/toolbar-factory.c:149
 msgid ""
 "Previous\n"
 "part"
@@ -7802,7 +7932,7 @@ msgstr ""
 "Parte\n"
 "anterior"
 
-#: ../src/toolbar-factory.c:154
+#: ../src/toolbar-factory.c:150
 msgid ""
 "Next\n"
 "part"
@@ -7810,7 +7940,7 @@ msgstr ""
 "Siguiente\n"
 "parte"
 
-#: ../src/toolbar-factory.c:155
+#: ../src/toolbar-factory.c:151
 msgid ""
 "Trash /\n"
 "Delete"
@@ -7818,15 +7948,15 @@ msgstr ""
 "Papelera/\n"
 "Borrar"
 
-#: ../src/toolbar-factory.c:156
+#: ../src/toolbar-factory.c:152 ../ui/sendmsg-window.ui.h:8
 msgid "Postpone"
 msgstr "Posponer"
 
-#: ../src/toolbar-factory.c:157
+#: ../src/toolbar-factory.c:153
 msgid "Print"
 msgstr "Imprimir"
 
-#: ../src/toolbar-factory.c:158
+#: ../src/toolbar-factory.c:154
 msgid ""
 "Request\n"
 "MDN"
@@ -7836,39 +7966,40 @@ msgstr ""
 
 # src/address-book.c:477
 # src/address-book.c:523
-#: ../src/toolbar-factory.c:159
+#: ../src/toolbar-factory.c:155 ../ui/sendmsg-window.ui.h:6
 msgid "Send"
 msgstr "Enviar"
 
-#: ../src/toolbar-factory.c:160
+#: ../src/toolbar-factory.c:156
 msgid "Send queued"
 msgstr "Enviar encolados"
 
-#: ../src/toolbar-factory.c:161
+#: ../src/toolbar-factory.c:157
 msgid "Exchange"
 msgstr "Intercambiar"
 
-#: ../src/toolbar-factory.c:162 ../src/toolbar-factory.c:194
+#: ../src/toolbar-factory.c:158 ../src/toolbar-factory.c:190
+#: ../ui/sendmsg-window.ui.h:7
 msgid "Queue"
 msgstr "Encolar"
 
-#: ../src/toolbar-factory.c:163
+#: ../src/toolbar-factory.c:159
 msgid "Attach"
 msgstr "Adjuntar"
 
 # src/balsa-message.c:1247
 # src/balsa-message.c:1417
-#: ../src/toolbar-factory.c:164
+#: ../src/toolbar-factory.c:160
 msgid "Save"
 msgstr "Guardar"
 
 # src/pref-manager.c:234 src/pref-manager.c:867
 # src/pref-manager.c:236 src/pref-manager.c:992
-#: ../src/toolbar-factory.c:165
+#: ../src/toolbar-factory.c:161
 msgid "Identity"
 msgstr "Identidad"
 
-#: ../src/toolbar-factory.c:168
+#: ../src/toolbar-factory.c:164
 msgid ""
 "Toggle\n"
 "new"
@@ -7876,11 +8007,11 @@ msgstr ""
 "Activar\n"
 "nuevo"
 
-#: ../src/toolbar-factory.c:169
+#: ../src/toolbar-factory.c:165
 msgid "Mark all"
 msgstr "Marcar todos"
 
-#: ../src/toolbar-factory.c:170
+#: ../src/toolbar-factory.c:166
 msgid ""
 "All\n"
 "headers"
@@ -7890,7 +8021,7 @@ msgstr ""
 
 # src/filter-edit-dialog.c:783
 # src/filter-edit-dialog.c:693
-#: ../src/toolbar-factory.c:171
+#: ../src/toolbar-factory.c:167
 msgid ""
 "Reset\n"
 "Filter"
@@ -7898,33 +8029,33 @@ msgstr ""
 "Restablecer\n"
 "filtro"
 
-#: ../src/toolbar-factory.c:172
+#: ../src/toolbar-factory.c:168
 msgid "Message Preview"
 msgstr "Vista previa del mensaje"
 
-#: ../src/toolbar-factory.c:174
+#: ../src/toolbar-factory.c:170
 msgid "Sign"
 msgstr "Firmar"
 
-#: ../src/toolbar-factory.c:175
+#: ../src/toolbar-factory.c:171
 msgid "Encrypt"
 msgstr "Cifrar"
 
 # src/balsa-mblist.c:218
 # src/balsa-mblist.c:218
-#: ../src/toolbar-factory.c:177
+#: ../src/toolbar-factory.c:173 ../ui/sendmsg-window.ui.h:14
 msgid "Undo"
 msgstr "Deshacer"
 
-#: ../src/toolbar-factory.c:178
+#: ../src/toolbar-factory.c:174 ../ui/sendmsg-window.ui.h:15
 msgid "Redo"
 msgstr "Rehacer"
 
-#: ../src/toolbar-factory.c:179
+#: ../src/toolbar-factory.c:175
 msgid "Expunge"
 msgstr "Purgar"
 
-#: ../src/toolbar-factory.c:180
+#: ../src/toolbar-factory.c:176
 msgid ""
 "Empty\n"
 "Trash"
@@ -7932,43 +8063,37 @@ msgstr ""
 "Vaciar\n"
 "la papelera"
 
-# src/main-window.c:389
-# src/main-window.c:386
-#: ../src/toolbar-factory.c:181
-msgid "Edit"
-msgstr "Editar"
-
-#: ../src/toolbar-factory.c:407
+#: ../src/toolbar-factory.c:399
 #, c-format
 msgid "Unknown toolbar icon “%s”"
 msgstr "Icono «%s» de la barra de herramientas desconocido"
 
-#: ../src/toolbar-factory.c:484
+#: ../src/toolbar-factory.c:476
 msgid "Queue this message for sending"
 msgstr "Encolar este mensaje para enviarlo"
 
-#: ../src/toolbar-factory.c:496
+#: ../src/toolbar-factory.c:488
 msgid "Text Be_low Icons"
 msgstr "Texto _debajo de los iconos"
 
-#: ../src/toolbar-factory.c:497
+#: ../src/toolbar-factory.c:489
 msgid "Priority Text Be_side Icons"
 msgstr "Prioridad de texto j_unto a los iconos"
 
-#: ../src/toolbar-factory.c:499
+#: ../src/toolbar-factory.c:491
 msgid "_Icons Only"
 msgstr "Sólo _iconos"
 
-#: ../src/toolbar-factory.c:500
+#: ../src/toolbar-factory.c:492
 msgid "_Text Only"
 msgstr "Sólo _texto"
 
-#: ../src/toolbar-factory.c:764
+#: ../src/toolbar-factory.c:754
 #, c-format
 msgid "Use Desktop _Default (%s)"
 msgstr "Usar los pre_determinados del escritorio (%s)"
 
-#: ../src/toolbar-factory.c:790
+#: ../src/toolbar-factory.c:780
 msgid "_Customize Toolbars…"
 msgstr "_Personalizar barras de herramientas…"
 
@@ -8037,6 +8162,622 @@ msgstr "Añadir el elemento seleccionado a la barra de herramientas"
 msgid "Move selected item down"
 msgstr "Bajar el elemento seleccionado"
 
+# src/main-window.c:259
+# src/main-window.c:262
+#: ../ui/ab-main.ui.h:1 ../ui/main-window.ui.h:18 ../ui/message-window.ui.h:1
+#: ../ui/sendmsg-window.ui.h:1 ../ui/source-viewer.ui.h:1
+msgid "_File"
+msgstr "_Archivo"
+
+# src/main-window.c:191
+# src/main-window.c:196
+#. Translators: main menu item - New address book
+#: ../ui/ab-main.ui.h:3
+msgctxt "address book"
+msgid "_New"
+msgstr "_Nuevo"
+
+# src/address-book-config.c:240
+# src/address-book-config.c:265
+#: ../ui/ab-main.ui.h:4
+msgid "_VCard Address Book (GnomeCard)"
+msgstr "Libreta de direcciones _VCard (GnomeCard)"
+
+#: ../ui/ab-main.ui.h:5
+msgid "_External query (a program)"
+msgstr "_Petición externa (un programa)"
+
+# src/address-book-config.c:256
+# src/address-book-config.c:283
+#: ../ui/ab-main.ui.h:6
+msgid "_LDIF Address Book"
+msgstr "Libreta de direcciones _LDIF"
+
+# src/address-book-config.c:256
+# src/address-book-config.c:283
+#: ../ui/ab-main.ui.h:7
+msgid "_LDAP Address Book"
+msgstr "Libreta de direcciones _LDAP"
+
+# src/address-book.c:369
+# src/address-book.c:394
+#: ../ui/ab-main.ui.h:8
+msgid "_GPE Address Book"
+msgstr "Libreta de direcciones _GPE"
+
+# src/address-book.c:369
+# src/address-book.c:394
+#: ../ui/ab-main.ui.h:9
+msgid "_Rubrica Address Book"
+msgstr "Libreta de direcciones de _Rúbrica"
+
+# src/mblist-window.c:450
+# src/mblist-window.c:473
+#: ../ui/ab-main.ui.h:10 ../ui/main-window.ui.h:69
+msgid "_Properties"
+msgstr "_Propiedades"
+
+#: ../ui/ab-main.ui.h:12 ../ui/main-window.ui.h:17
+msgid "_Quit"
+msgstr "_Salir"
+
+#: ../ui/ab-main.ui.h:13
+msgid "_Entry"
+msgstr "_Entrada"
+
+# src/pref-manager.c:234 src/pref-manager.c:867
+# src/pref-manager.c:236 src/pref-manager.c:992
+#: ../ui/ab-main.ui.h:14
+msgid "_New Entry"
+msgstr "Entrada _nueva"
+
+# src/main-window.c:338
+# src/main-window.c:341
+#: ../ui/ab-main.ui.h:15
+msgid "_Delete Entry"
+msgstr "_Borrar entrada"
+
+#: ../ui/ab-main.ui.h:17 ../ui/main-window.ui.h:16
+msgid "_About"
+msgstr "Acerca _de"
+
+# src/main-window.c:191
+# src/main-window.c:196
+#. Translators: app menu item - New message or mailbox
+#: ../ui/main-window.ui.h:2
+msgctxt "appmenu"
+msgid "_New"
+msgstr "_Nuevo"
+
+# src/main-window.c:421
+# src/main-window.c:428
+#: ../ui/main-window.ui.h:3 ../ui/message-window.ui.h:20
+msgid "_Message"
+msgstr "_Mensaje"
+
+# src/mailbox-conf.c:718
+# src/mailbox-conf.c:793
+#: ../ui/main-window.ui.h:4
+msgid "Local mbox mailbox…"
+msgstr "Buzón mbox local…"
+
+# src/mailbox-conf.c:718
+# src/mailbox-conf.c:793
+#: ../ui/main-window.ui.h:5
+msgid "Local Maildir mailbox…"
+msgstr "Buzón Maildir local…"
+
+# src/mailbox-conf.c:718
+# src/mailbox-conf.c:793
+#: ../ui/main-window.ui.h:6
+msgid "Local MH mailbox…"
+msgstr "Buzón MH local…"
+
+# libmutt/mbox.c:1066
+#: ../ui/main-window.ui.h:9
+msgid "Remote IMAP subfolder…"
+msgstr "Subcarpeta IMAP remota…"
+
+# libinit_balsa/balsa-druid-page-user.gob:104
+# libinit_balsa/balsa-druid-page-user.gob:104
+#: ../ui/main-window.ui.h:10
+msgid "_Settings"
+msgstr "_Configuración"
+
+#: ../ui/main-window.ui.h:11
+msgid "_Toolbars…"
+msgstr "_Barras de herramientas…"
+
+# src/main-window.c:259
+# src/main-window.c:262
+#: ../ui/main-window.ui.h:12
+msgid "_Identities…"
+msgstr "_Identidades…"
+
+# src/address-book.c:369
+# src/address-book.c:394
+#: ../ui/main-window.ui.h:13
+msgid "_Address Book"
+msgstr "_Libreta de direcciones"
+
+#: ../ui/main-window.ui.h:14
+msgid "_Preferences"
+msgstr "_Preferencias"
+
+#: ../ui/main-window.ui.h:19
+msgid "New _Message"
+msgstr "Mensaje _nuevo"
+
+# libmutt/imap/util.c:43
+# libmutt/imap/util.c:43
+#: ../ui/main-window.ui.h:20
+msgid "_Continue"
+msgstr "_Continuar"
+
+#: ../ui/main-window.ui.h:21
+msgid "_Get New Mail"
+msgstr "_Obtener correo nuevo"
+
+#: ../ui/main-window.ui.h:22
+msgid "_Send Queued Mail"
+msgstr "_Enviar correos encolados"
+
+#: ../ui/main-window.ui.h:23
+msgid "Send and _Receive Mail"
+msgstr "Enviar y _recibir correo"
+
+#: ../ui/main-window.ui.h:24 ../ui/message-window.ui.h:2
+msgid "Page _Setup"
+msgstr "Configuración de _página"
+
+#: ../ui/main-window.ui.h:25 ../ui/message-window.ui.h:3
+#: ../ui/sendmsg-window.ui.h:11
+msgid "_Print…"
+msgstr "_Imprimir…"
+
+# src/filter-edit-dialog.c:313
+# src/filter-edit-dialog.c:296
+#: ../ui/main-window.ui.h:27 ../ui/message-window.ui.h:6
+#: ../ui/sendmsg-window.ui.h:17 ../ui/source-viewer.ui.h:4
+msgid "_Copy"
+msgstr "_Copiar"
+
+# src/mailbox-conf.c:822 src/mailbox-conf.c:882
+# src/mailbox-conf.c:899 src/mailbox-conf.c:957
+#: ../ui/main-window.ui.h:29
+msgid "Select _Thread"
+msgstr "Seleccionar con_versación"
+
+#: ../ui/main-window.ui.h:30
+msgid "_Find"
+msgstr "_Buscar"
+
+#: ../ui/main-window.ui.h:31
+msgid "Find Ne_xt"
+msgstr "Buscar _siguiente"
+
+# libmutt/mx.c:1065
+# libmutt/mx.c:1065
+#: ../ui/main-window.ui.h:32 ../ui/message-window.ui.h:8
+msgid "Find in _Message"
+msgstr "Buscar en el _mensaje"
+
+# src/main-window.c:259
+# src/main-window.c:262
+#: ../ui/main-window.ui.h:33
+msgid "F_ilters…"
+msgstr "F_iltros…"
+
+#: ../ui/main-window.ui.h:34
+msgid "_Export Filters…"
+msgstr "_Exportar filtros…"
+
+# src/main-window.c:191
+# src/main-window.c:196
+#: ../ui/main-window.ui.h:35 ../ui/message-window.ui.h:9
+#: ../ui/source-viewer.ui.h:6
+msgid "_View"
+msgstr "_Ver"
+
+# src/pref-manager.c:1087
+# src/pref-manager.c:1218
+#: ../ui/main-window.ui.h:36
+msgid "_Show Mailbox Tree"
+msgstr "Mo_strar árbol de buzones"
+
+# src/mailbox-conf.c:786 src/mailbox-conf.c:810 src/mailbox-conf.c:870
+# src/mailbox-conf.c:862 src/mailbox-conf.c:887 src/mailbox-conf.c:945
+#: ../ui/main-window.ui.h:37
+msgid "Show Mailbox _Tabs"
+msgstr "Mostrar _solapas del buzón"
+
+#: ../ui/main-window.ui.h:38 ../ui/message-window.ui.h:10
+#: ../ui/sendmsg-window.ui.h:28
+msgid "Show Too_lbar"
+msgstr "Mostrar barra de _herramientas"
+
+#: ../ui/main-window.ui.h:39
+msgid "Show St_atus Bar"
+msgstr "Mostrar barra de _estado"
+
+#: ../ui/main-window.ui.h:40
+msgid "Show _Index Filter"
+msgstr "Mostrar filtro índ_ice"
+
+#: ../ui/main-window.ui.h:41 ../ui/message-window.ui.h:11
+msgid "_Wrap"
+msgstr "_Auto-ajuste"
+
+# src/main-window.c:267 src/message-window.c:61
+# src/main-window.c:269
+#: ../ui/main-window.ui.h:42 ../ui/message-window.ui.h:12
+msgid "_No Headers"
+msgstr "_Sin cabeceras"
+
+#: ../ui/main-window.ui.h:43 ../ui/message-window.ui.h:13
+msgid "S_elected Headers"
+msgstr "Cabeceras s_eleccionadas"
+
+#: ../ui/main-window.ui.h:44 ../ui/message-window.ui.h:14
+msgid "All _Headers"
+msgstr "Todas las _cabeceras"
+
+#: ../ui/main-window.ui.h:45
+msgid "_Flat index"
+msgstr "Índice _plano"
+
+#: ../ui/main-window.ui.h:46
+msgid "Si_mple threading"
+msgstr "Conversaciones si_mples"
+
+#: ../ui/main-window.ui.h:47
+msgid "_JWZ threading"
+msgstr "Conversaciones _JWZ"
+
+#: ../ui/main-window.ui.h:48
+msgid "E_xpand All"
+msgstr "E_xpandir todo"
+
+#: ../ui/main-window.ui.h:49
+msgid "_Collapse All"
+msgstr "_Contraer todo"
+
+#: ../ui/main-window.ui.h:50 ../ui/message-window.ui.h:15
+msgid "Zoom _In"
+msgstr "_Ampliar"
+
+#: ../ui/main-window.ui.h:51 ../ui/message-window.ui.h:16
+msgid "Zoom _Out"
+msgstr "_Reducir"
+
+#: ../ui/main-window.ui.h:53 ../ui/message-window.ui.h:18
+#, no-c-format
+msgid "Zoom _100%"
+msgstr "Ampliación al _100%"
+
+# src/balsa-mblist.c:218 src/mailbox-conf.c:950
+# src/balsa-mblist.c:218 src/mailbox-conf.c:1023
+#: ../ui/main-window.ui.h:54
+msgid "Mail_box"
+msgstr "_Buzón"
+
+#: ../ui/main-window.ui.h:55 ../ui/message-window.ui.h:30
+msgid "Next Message"
+msgstr "Mensaje siguiente"
+
+#: ../ui/main-window.ui.h:56 ../ui/message-window.ui.h:31
+msgid "Previous Message"
+msgstr "Mensaje anterior"
+
+#: ../ui/main-window.ui.h:57 ../ui/message-window.ui.h:32
+msgid "Next Unread Message"
+msgstr "Siguiente mensaje no leído"
+
+#: ../ui/main-window.ui.h:58 ../ui/message-window.ui.h:33
+msgid "Next Flagged Message"
+msgstr "Siguiente mensaje marcado"
+
+# libmutt/mx.c:1065
+# libmutt/mx.c:1065
+#: ../ui/main-window.ui.h:59
+msgid "_Hide Messages"
+msgstr "_Ocultar mensajes"
+
+# src/main-window.c:338
+# src/main-window.c:341
+#: ../ui/main-window.ui.h:60
+msgid "_Deleted"
+msgstr "_Borrado"
+
+# src/balsa-index-page.c:492 src/filter-edit-dialog.c:228
+# src/main-window.c:435 src/mblist-window.c:452 src/pref-manager.c:1112
+# src/pref-manager.c:2027
+# src/balsa-index-page.c:542 src/filter-edit-dialog.c:224
+# src/main-window.c:442 src/mblist-window.c:475 src/pref-manager.c:1243
+# src/pref-manager.c:2253
+#: ../ui/main-window.ui.h:61
+msgid "Un_deleted"
+msgstr "R_ecuperado"
+
+#: ../ui/main-window.ui.h:62
+msgid "_Read"
+msgstr "_Leído"
+
+# src/balsa-mblist.c:218
+# src/balsa-mblist.c:218
+#: ../ui/main-window.ui.h:63
+msgid "Un_read"
+msgstr "_No leído"
+
+# src/main-window.c:352
+# src/main-window.c:353
+#: ../ui/main-window.ui.h:65
+msgid "Un_flagged"
+msgstr "_Desmarcado"
+
+# src/balsa-mblist.c:218
+# src/balsa-mblist.c:218
+#: ../ui/main-window.ui.h:66
+msgid "_Answered"
+msgstr "_Respondido"
+
+# src/mailbox-conf.c:827 src/mailbox-conf.c:886
+# src/mailbox-conf.c:904 src/mailbox-conf.c:961
+#: ../ui/main-window.ui.h:67
+msgid "Un_answered"
+msgstr "_No contestado"
+
+# src/filter-edit-dialog.c:783
+# src/filter-edit-dialog.c:693
+#: ../ui/main-window.ui.h:68
+msgid "_Reset Filter"
+msgstr "Restablecer _filtro"
+
+# libmutt/mx.c:1065
+# libmutt/mx.c:1065
+#: ../ui/main-window.ui.h:71
+msgid "E_xpunge Deleted Messages"
+msgstr "_Purgar los mensajes borrados"
+
+# libinit_balsa/balsa-druid-page-directory.gob:60
+# libinit_balsa/balsa-druid-page-directory.gob:60
+#: ../ui/main-window.ui.h:73
+msgid "Empty _Trash"
+msgstr "Vaciar _papelera"
+
+# src/filter-edit-dialog.c:783
+# src/filter-edit-dialog.c:693
+#: ../ui/main-window.ui.h:74
+msgid "Select _Filters…"
+msgstr "Seleccionar _filtros…"
+
+# src/pref-manager.c:1058
+# src/pref-manager.c:1188
+#: ../ui/main-window.ui.h:75
+msgid "_Remove Duplicates"
+msgstr "_Eliminar duplicados"
+
+# src/main-window.c:302 src/message-window.c:113
+# src/main-window.c:308
+#: ../ui/main-window.ui.h:77 ../ui/message-window.ui.h:22
+msgid "Reply to _All…"
+msgstr "Responder a _todos…"
+
+# src/main-window.c:302 src/message-window.c:113
+# src/main-window.c:308
+#: ../ui/main-window.ui.h:78 ../ui/message-window.ui.h:23
+msgid "Reply to _Group…"
+msgstr "Responder al _grupo…"
+
+#: ../ui/main-window.ui.h:82 ../ui/message-window.ui.h:26
+msgid "_Next Part"
+msgstr "_Siguiente parte"
+
+#: ../ui/main-window.ui.h:83 ../ui/message-window.ui.h:27
+msgid "_Previous Part"
+msgstr "_Anterior parte"
+
+#: ../ui/main-window.ui.h:84 ../ui/message-window.ui.h:28
+msgid "Save Current Part…"
+msgstr "Guardar parte actual…"
+
+#: ../ui/main-window.ui.h:85 ../ui/message-window.ui.h:29
+msgid "_View Source…"
+msgstr "_Ver fuente…"
+
+# src/sendmsg-window.c:191
+# src/sendmsg-window.c:196
+#: ../ui/main-window.ui.h:86 ../ui/source-viewer.ui.h:5
+msgid "_Select Text"
+msgstr "_Seleccionar texto"
+
+# src/balsa-index-page.c:495
+# src/balsa-index-page.c:546
+#: ../ui/main-window.ui.h:87 ../ui/message-window.ui.h:34
+msgid "_Move to Trash"
+msgstr "_Mover a la papelera"
+
+#: ../ui/main-window.ui.h:88
+msgid "_Toggle Flag"
+msgstr "_Conmutar marca"
+
+# src/main-window.c:191
+# src/main-window.c:196
+#: ../ui/main-window.ui.h:89
+msgid "_New"
+msgstr "_Nuevo"
+
+#: ../ui/sendmsg-window.ui.h:2
+msgid "_Include File…"
+msgstr "_Incluir archivo…"
+
+# src/main-window.c:310 src/message-window.c:120
+# src/main-window.c:315 src/message-window.c:114
+#: ../ui/sendmsg-window.ui.h:3
+msgid "_Attach File…"
+msgstr "_Adjuntar archivo…"
+
+#: ../ui/sendmsg-window.ui.h:4
+msgid "I_nclude Messages…"
+msgstr "I_ncluir mensajes…"
+
+#: ../ui/sendmsg-window.ui.h:5
+msgid "Attach _Messages…"
+msgstr "Adjuntar _mensajes…"
+
+# src/balsa-message.c:1247
+# src/balsa-message.c:1417
+#: ../ui/sendmsg-window.ui.h:9
+msgid "_Save"
+msgstr "_Guardar"
+
+#: ../ui/sendmsg-window.ui.h:10
+msgid "Page S_etup"
+msgstr "Configuración de p_ágina"
+
+#: ../ui/sendmsg-window.ui.h:16
+msgid "Cu_t"
+msgstr "Cor_tar"
+
+#: ../ui/sendmsg-window.ui.h:18
+msgid "_Paste"
+msgstr "_Pegar"
+
+# src/filter-edit-dialog.c:313
+# src/filter-edit-dialog.c:296
+#: ../ui/sendmsg-window.ui.h:20
+msgid "_Wrap Body"
+msgstr "_Ajustar cuerpo"
+
+# src/sendmsg-window.c:191
+# src/sendmsg-window.c:196
+#: ../ui/sendmsg-window.ui.h:21
+msgid "_Reflow Selected Text"
+msgstr "_Refluir texto seleccionado"
+
+# src/sendmsg-window.c:1434
+# src/sendmsg-window.c:1483
+#: ../ui/sendmsg-window.ui.h:22
+msgid "Insert Si_gnature"
+msgstr "Incl_uir firma"
+
+#: ../ui/sendmsg-window.ui.h:23
+msgid "_Quote Message(s)"
+msgstr "_Citar mensaje(s)"
+
+#: ../ui/sendmsg-window.ui.h:24
+msgid "C_heck Spelling"
+msgstr "Comprobar _ortografía"
+
+# src/pref-manager.c:234 src/pref-manager.c:867
+# src/pref-manager.c:236 src/pref-manager.c:992
+#: ../ui/sendmsg-window.ui.h:25
+msgid "Select _Identity…"
+msgstr "Seleccionar la _identidad…"
+
+#: ../ui/sendmsg-window.ui.h:26
+msgid "Edit with GNOME-Editor"
+msgstr "Editar con el editor de Gnome"
+
+#: ../ui/sendmsg-window.ui.h:27
+msgid "_Show"
+msgstr "_Mostrar"
+
+# src/balsa-message.c:569 src/filter-edit-dialog.c:337 src/print.c:336
+# src/sendmsg-window.c:835
+# src/balsa-message.c:633 src/filter-edit-dialog.c:316 src/print.c:348
+# src/sendmsg-window.c:867
+#: ../ui/sendmsg-window.ui.h:29
+msgid "F_rom"
+msgstr "_De"
+
+#: ../ui/sendmsg-window.ui.h:30
+msgid "Rec_ipients"
+msgstr "Dest_inatarios"
+
+# src/sendmsg-window.c:885
+# src/sendmsg-window.c:928
+#: ../ui/sendmsg-window.ui.h:31
+msgid "R_eply To"
+msgstr "R_esponder a"
+
+# src/balsa-message.c:578
+# src/balsa-message.c:642
+#: ../ui/sendmsg-window.ui.h:32
+msgid "F_cc"
+msgstr "R_cc"
+
+# src/mblist-window.c:446
+# src/mblist-window.c:469
+#: ../ui/sendmsg-window.ui.h:34
+msgid "_Options"
+msgstr "_Opciones"
+
+# src/filter-edit-dialog.c:626
+# src/filter-edit-dialog.c:538
+#: ../ui/sendmsg-window.ui.h:35
+msgid "_Request Disposition Notification"
+msgstr "_Solicitar notificación de entrega"
+
+# src/filter-edit-dialog.c:626
+# src/filter-edit-dialog.c:538
+#: ../ui/sendmsg-window.ui.h:36
+msgid "_Request Delivery Status Notification"
+msgstr "_Solicitar notificación de estado de entrega"
+
+#: ../ui/sendmsg-window.ui.h:37
+msgid "_Format = Flowed"
+msgstr "_Format = Flowed"
+
+#: ../ui/sendmsg-window.ui.h:38
+msgid "Send as plain text and _HTML"
+msgstr "Enviar como texto plano y _HTML"
+
+#: ../ui/sendmsg-window.ui.h:39
+msgid "_Sign Message"
+msgstr "_Firmar mensaje"
+
+#: ../ui/sendmsg-window.ui.h:40
+msgid "_Encrypt Message"
+msgstr "_Cifrar mensaje"
+
+#: ../ui/sendmsg-window.ui.h:41
+msgid "GnuPG uses _MIME mode"
+msgstr "GnuPG usa el _modo MIME"
+
+#: ../ui/sendmsg-window.ui.h:42
+msgid "GnuPG uses old _OpenPGP mode"
+msgstr "GnuPG usa el modo antiguo _OpenPGP"
+
+#: ../ui/sendmsg-window.ui.h:43
+msgid "S/MIME mode (_GpgSM)"
+msgstr "Modo _S/MIME (_GpgSM)"
+
+#: ../ui/sendmsg-window.ui.h:44
+msgid "Attach GnuPG _Public Key"
+msgstr "Adjuntar la clave pública GnuPG"
+
+#: ../ui/source-viewer.ui.h:7
+msgid "_Escape Special Characters"
+msgstr "_Caracteres especiales de escape"
+
+#~ msgid "Key ID"
+#~ msgstr "ID de clave"
+
+#~ msgid "Length"
+#~ msgstr "Longitud"
+
+# src/main-window.c:259
+# src/main-window.c:262
+#~ msgid "Validity"
+#~ msgstr "Validez"
+
+#~ msgid "No changes for the key were found on the key server."
+#~ msgstr "No se han encontrado cambios en la clave en el servidor de claves."
+
+#~ msgid "_Remember password in keyring"
+#~ msgstr "_Recordar la contraseña en el depósito de claves"
+
 # src/balsa-message.c:301
 # src/balsa-message.c:331
 #~ msgid "%s: could not find a key for %s"
@@ -8398,53 +9139,22 @@ msgstr "Bajar el elemento seleccionado"
 #~ "\n"
 #~ "Dirección de correo: %s"
 
-# src/main-window.c:259
-# src/main-window.c:262
-#~ msgid "_File"
-#~ msgstr "_Archivo"
-
-# src/main-window.c:191
-# src/main-window.c:196
-#~ msgid "_View"
-#~ msgstr "_Ver"
-
 #~ msgid "Close the window"
 #~ msgstr "Cerrar la ventana"
 
-# src/filter-edit-dialog.c:313
-# src/filter-edit-dialog.c:296
-#~ msgid "_Copy"
-#~ msgstr "_Copiar"
-
 # src/filter-edit-dialog.c:652
 # src/filter-edit-dialog.c:559
 #~ msgid "Copy text"
 #~ msgstr "Copiar el texto"
 
-# src/sendmsg-window.c:191
-# src/sendmsg-window.c:196
-#~ msgid "_Select Text"
-#~ msgstr "_Seleccionar texto"
-
 # src/pref-manager.c:961
 # src/pref-manager.c:1088
 #~ msgid "Select entire mail"
 #~ msgstr "Selecciona el correo completo"
 
-#~ msgid "_Escape Special Characters"
-#~ msgstr "_Caracteres especiales de escape"
-
 #~ msgid "Escape special and non-ASCII characters"
 #~ msgstr "Escapar caracteres especiales y no ASCII"
 
-#~ msgid "_Entry"
-#~ msgstr "_Entrada"
-
-# src/address-book.c:369
-# src/address-book.c:394
-#~ msgid "Rubrica Address Book"
-#~ msgstr "Libreta de direcciones de Rubrica"
-
 # src/address-book.c:369
 # src/address-book.c:394
 #~ msgid "Edit address book properties"
@@ -8455,33 +9165,17 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "Delete address book"
 #~ msgstr "Borrar la libreta de direcciones"
 
-#~ msgid "_Quit"
-#~ msgstr "_Salir"
-
 #~ msgid "Exit the program"
 #~ msgstr "Salir del programa"
 
-# src/pref-manager.c:234 src/pref-manager.c:867
-# src/pref-manager.c:236 src/pref-manager.c:992
-#~ msgid "_New Entry"
-#~ msgstr "Entrada _nueva"
-
 #~ msgid "Add new entry"
 #~ msgstr "Añadir una nueva entrada"
 
-# src/main-window.c:338
-# src/main-window.c:341
-#~ msgid "_Delete Entry"
-#~ msgstr "_Borrar entrada"
-
 # src/pref-manager.c:234 src/pref-manager.c:867
 # src/pref-manager.c:236 src/pref-manager.c:992
 #~ msgid "Delete entry"
 #~ msgstr "Borrar entrada"
 
-#~ msgid "_About"
-#~ msgstr "Acerca _de"
-
 #~ msgid ""
 #~ "This is an inline %s signed %s message part:\n"
 #~ "%s"
@@ -8529,21 +9223,6 @@ msgstr "Bajar el elemento seleccionado"
 
 # src/balsa-mblist.c:218 src/mailbox-conf.c:950
 # src/balsa-mblist.c:218 src/mailbox-conf.c:1023
-#~ msgid "Mail_box"
-#~ msgstr "_Buzón"
-
-# src/main-window.c:421
-# src/main-window.c:428
-#~ msgid "_Message"
-#~ msgstr "_Mensaje"
-
-# libinit_balsa/balsa-druid-page-user.gob:104
-# libinit_balsa/balsa-druid-page-user.gob:104
-#~ msgid "_Settings"
-#~ msgstr "_Configuración"
-
-# src/balsa-mblist.c:218 src/mailbox-conf.c:950
-# src/balsa-mblist.c:218 src/mailbox-conf.c:1023
 #~ msgid "Mail_boxes"
 #~ msgstr "_Buzones"
 
@@ -8565,42 +9244,23 @@ msgstr "Bajar el elemento seleccionado"
 
 # src/main-window.c:259
 # src/main-window.c:262
-#~ msgid "F_ilters"
-#~ msgstr "F_iltros"
-
-# src/main-window.c:259
-# src/main-window.c:262
 #~ msgid "Manage filters"
 #~ msgstr "Administrar filtros"
 
-# libmutt/imap/util.c:43
-# libmutt/imap/util.c:43
-#~ msgid "_Continue"
-#~ msgstr "_Continuar"
-
 #~ msgid "Continue editing current message"
 #~ msgstr "Continuar la edición del mensaje actual"
 
-#~ msgid "_Get New Mail"
-#~ msgstr "_Obtener correo nuevo"
-
 #~ msgid "Fetch new incoming mail"
 #~ msgstr "Bajar el correo nuevo entrante"
 
 #~ msgid "Send messages from the outbox"
 #~ msgstr "Enviar mensaje desde la bandeja de salida"
 
-#~ msgid "Send and _Receive Mail"
-#~ msgstr "Enviar y _recibir correo"
-
 # libmutt/mx.c:1065
 # libmutt/mx.c:1065
 #~ msgid "Send and Receive messages"
 #~ msgstr "Envía y recibe mensajes"
 
-#~ msgid "Page _Setup"
-#~ msgstr "Configuración de _página"
-
 #~ msgid "Set up page for printing"
 #~ msgstr "Configurar la página para impresión"
 
@@ -8694,18 +9354,9 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "Export filters as Sieve scripts"
 #~ msgstr "Exportar filtros como scripts Sieve"
 
-#~ msgid "Prefere_nces"
-#~ msgstr "Prefere_ncias"
-
-#~ msgid "E_xpand All"
-#~ msgstr "E_xpandir todo"
-
 #~ msgid "Expand all threads"
 #~ msgstr "Expandir todos los hilos"
 
-#~ msgid "_Collapse All"
-#~ msgstr "_Contraer todo"
-
 #~ msgid "Collapse all expanded threads"
 #~ msgstr "Contraer todos los hilos expandidos"
 
@@ -8720,14 +9371,6 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "No magnification"
 #~ msgstr "Sin aumento"
 
-#~ msgid "Next Unread Message"
-#~ msgstr "Siguiente mensaje no leído"
-
-# libinit_balsa/balsa-druid-page-directory.gob:60
-# libinit_balsa/balsa-druid-page-directory.gob:60
-#~ msgid "Empty _Trash"
-#~ msgstr "Vaciar _papelera"
-
 # src/main-window.c:403
 # src/main-window.c:406
 #~ msgid "Delete messages from the Trash mailbox"
@@ -8739,11 +9382,6 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "Customize toolbars"
 #~ msgstr "Personalizar barras de herramientas"
 
-# src/main-window.c:259
-# src/main-window.c:262
-#~ msgid "_Identities..."
-#~ msgstr "_Identidades…"
-
 #~ msgid "Create and set current identities"
 #~ msgstr "Crear y establecer identidades actuales"
 
@@ -8755,31 +9393,6 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "Table of Contents"
 #~ msgstr "Tabla de contenidos"
 
-#~ msgid "_Find"
-#~ msgstr "_Buscar"
-
-#~ msgid "Find Ne_xt"
-#~ msgstr "Buscar _siguiente"
-
-#~ msgid "Next Message"
-#~ msgstr "Mensaje siguiente"
-
-#~ msgid "Previous Message"
-#~ msgstr "Mensaje anterior"
-
-#~ msgid "Next Flagged Message"
-#~ msgstr "Siguiente mensaje marcado"
-
-# libmutt/mx.c:1065
-# libmutt/mx.c:1065
-#~ msgid "_Hide Messages"
-#~ msgstr "_Ocultar mensajes"
-
-# src/filter-edit-dialog.c:783
-# src/filter-edit-dialog.c:693
-#~ msgid "_Reset Filter"
-#~ msgstr "Restablecer _filtro"
-
 # src/filter-edit-dialog.c:783
 # src/filter-edit-dialog.c:693
 #~ msgid "Reset mailbox filter"
@@ -8799,11 +9412,6 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "Delete the selected mailbox"
 #~ msgstr "Borrar el buzón seleccionado"
 
-# libmutt/mx.c:1065
-# libmutt/mx.c:1065
-#~ msgid "E_xpunge Deleted Messages"
-#~ msgstr "_Purgar los mensajes borrados"
-
 #~ msgid "Expunge messages marked as deleted in the current mailbox"
 #~ msgstr "Purgar los mensajes marcados como borrados en el buzón actual"
 
@@ -8812,20 +9420,10 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "Close mailbox"
 #~ msgstr "Cerrar buzón"
 
-# src/filter-edit-dialog.c:783
-# src/filter-edit-dialog.c:693
-#~ msgid "Select _Filters"
-#~ msgstr "Seleccionar _filtros"
-
 #~ msgid "Select filters to be applied automatically to current mailbox"
 #~ msgstr ""
 #~ "Seleccionar los filtros que se aplicarán automáticamente al buzón actual"
 
-# src/pref-manager.c:1058
-# src/pref-manager.c:1188
-#~ msgid "_Remove Duplicates"
-#~ msgstr "_Eliminar duplicados"
-
 #~ msgid "Reply to the current message"
 #~ msgstr "Responder al mensaje actual"
 
@@ -8881,11 +9479,6 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "Pipe the message through another program"
 #~ msgstr "Filtrar el mensaje a través de otro programa"
 
-# src/mailbox-conf.c:822 src/mailbox-conf.c:882
-# src/mailbox-conf.c:899 src/mailbox-conf.c:957
-#~ msgid "Select _Thread"
-#~ msgstr "Seleccionar con_versación"
-
 #~ msgid "Select all messages in current thread"
 #~ msgstr "Seleccionar todos los mensajes en la conversación actual"
 
@@ -8894,23 +9487,14 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "Print current message"
 #~ msgstr "Imprimir el mensaje actual"
 
-#~ msgid "Save Current Part..."
-#~ msgstr "Guardar parte actual…"
-
 #~ msgid "Save currently displayed part of message"
 #~ msgstr "Guarda la parte mostrada actualmente del mensaje"
 
-#~ msgid "_Next Part"
-#~ msgstr "_Siguiente parte"
-
 # src/main-window.c:317 src/message-window.c:126
 # src/main-window.c:322 src/message-window.c:119
 #~ msgid "Next part in message"
 #~ msgstr "Siguiente parte en el mensaje"
 
-#~ msgid "_Previous Part"
-#~ msgstr "_Anterior parte"
-
 #~ msgid "Previous part in message"
 #~ msgstr "Parte anterior en el mensaje"
 
@@ -8919,21 +9503,11 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "Copy message"
 #~ msgstr "Copiar mensaje"
 
-# libmutt/mx.c:1065
-# libmutt/mx.c:1065
-#~ msgid "Find in _Message"
-#~ msgstr "Buscar en el _mensaje"
-
 # libmutt/imap/browse.c:93
 # libmutt/imap/browse.c:93
 #~ msgid "Find a string in this message"
 #~ msgstr "Buscar una cadena en este mensaje"
 
-# src/balsa-index-page.c:495
-# src/balsa-index-page.c:546
-#~ msgid "_Move to Trash"
-#~ msgstr "_Mover a la papelera"
-
 #~ msgid "Move the current message to Trash mailbox"
 #~ msgstr "Mueve el mensaje actual a la papelera"
 
@@ -8945,53 +9519,21 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "Toggle New"
 #~ msgstr "Conmutar nuevo"
 
-#~ msgid "_Toggle Flag"
-#~ msgstr "_Conmutar marca"
-
 #~ msgid "Toggle flagged"
 #~ msgstr "Conmutar marcados"
 
-# src/main-window.c:338
-# src/main-window.c:341
-#~ msgid "_Deleted"
-#~ msgstr "_Borrado"
-
 #~ msgid "Toggle deleted flag"
 #~ msgstr "Conmutar marca de borrado"
 
-# src/balsa-mblist.c:218
-# src/balsa-mblist.c:218
-#~ msgid "_Answered"
-#~ msgstr "_Respondido"
-
 #~ msgid "Toggle Answered"
 #~ msgstr "Conmutar respondido"
 
-# src/pref-manager.c:1087
-# src/pref-manager.c:1218
-#~ msgid "_Show Mailbox Tree"
-#~ msgstr "Mo_strar árbol de buzones"
-
 #~ msgid "Toggle display of mailbox and folder tree"
 #~ msgstr "Conmutar entre mostrar buzón o árbol de carpetas"
 
-# src/mailbox-conf.c:786 src/mailbox-conf.c:810 src/mailbox-conf.c:870
-# src/mailbox-conf.c:862 src/mailbox-conf.c:887 src/mailbox-conf.c:945
-#~ msgid "Show Mailbox _Tabs"
-#~ msgstr "Mostrar _solapas del buzón"
-
 #~ msgid "Toggle display of mailbox notebook tabs"
 #~ msgstr "Conmutar la muestra de solapas del buzón"
 
-#~ msgid "Show Too_lbar"
-#~ msgstr "Mostrar barra de _herramientas"
-
-#~ msgid "Show St_atus Bar"
-#~ msgstr "Mostrar barra de _estado"
-
-#~ msgid "Show _Index Filter"
-#~ msgstr "Mostrar filtro índ_ice"
-
 #~ msgid "_Descending"
 #~ msgstr "_Descendente"
 
@@ -9006,39 +9548,9 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "Enable quick message index filter"
 #~ msgstr "Activar el filtro rápido de indexado de mensajes"
 
-#~ msgid "_Wrap"
-#~ msgstr "_Auto-ajuste"
-
 #~ msgid "Wrap message lines"
 #~ msgstr "Auto-ajustar las líneas del mensaje"
 
-# src/balsa-index-page.c:492 src/filter-edit-dialog.c:228
-# src/main-window.c:435 src/mblist-window.c:452 src/pref-manager.c:1112
-# src/pref-manager.c:2027
-# src/balsa-index-page.c:542 src/filter-edit-dialog.c:224
-# src/main-window.c:442 src/mblist-window.c:475 src/pref-manager.c:1243
-# src/pref-manager.c:2253
-#~ msgid "Un_Deleted"
-#~ msgstr "_Recuperado"
-
-#~ msgid "_Read"
-#~ msgstr "_Leído"
-
-# src/balsa-mblist.c:218
-# src/balsa-mblist.c:218
-#~ msgid "Un_read"
-#~ msgstr "_No leído"
-
-# src/main-window.c:352
-# src/main-window.c:353
-#~ msgid "Un_flagged"
-#~ msgstr "_Desmarcado"
-
-# src/mailbox-conf.c:827 src/mailbox-conf.c:886
-# src/mailbox-conf.c:904 src/mailbox-conf.c:961
-#~ msgid "Un_answered"
-#~ msgstr "_No contestado"
-
 # src/store-address.c:137
 # src/store-address.c:149
 #~ msgid "Show all headers"
@@ -9047,41 +9559,21 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "Show preview pane"
 #~ msgstr "Muestra el panel de vista previa"
 
-# src/main-window.c:267 src/message-window.c:61
-# src/main-window.c:269
-#~ msgid "_No Headers"
-#~ msgstr "_Sin cabeceras"
-
 #~ msgid "Display no headers"
 #~ msgstr "No mostrar cabeceras"
 
-#~ msgid "S_elected Headers"
-#~ msgstr "Cabeceras s_eleccionadas"
-
 #~ msgid "Display selected headers"
 #~ msgstr "Mostrar las cabeceras seleccionadas"
 
-#~ msgid "All _Headers"
-#~ msgstr "Todas las _cabeceras"
-
 #~ msgid "Display all headers"
 #~ msgstr "Muestra todas las cabeceras"
 
-#~ msgid "_Flat index"
-#~ msgstr "Índice _plano"
-
 #~ msgid "No threading at all"
 #~ msgstr "Sin hilos"
 
-#~ msgid "Si_mple threading"
-#~ msgstr "Conversaciones si_mples"
-
 #~ msgid "Simple threading algorithm"
 #~ msgstr "Algoritmo de hilos simples"
 
-#~ msgid "_JWZ threading"
-#~ msgstr "Conversaciones _JWZ"
-
 #~ msgid "Elaborate JWZ threading"
 #~ msgstr "Elaborar conversaciones JWZ"
 
@@ -9203,39 +9695,17 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "Error setting GConf field: %s\n"
 #~ msgstr "Error al establecer el campo GConf: %s\n"
 
-#~ msgid "_Show"
-#~ msgstr "_Mostrar"
-
-# src/mblist-window.c:446
-# src/mblist-window.c:469
-#~ msgid "_Options"
-#~ msgstr "_Opciones"
-
-#~ msgid "_Include File..."
-#~ msgstr "_Incluir archivo…"
-
 # src/sendmsg-window.c:1434
 # src/sendmsg-window.c:1483
 #~ msgid "Include a file"
 #~ msgstr "Incluir un archivo"
 
-# src/main-window.c:310 src/message-window.c:120
-# src/main-window.c:315 src/message-window.c:114
-#~ msgid "_Attach File..."
-#~ msgstr "_Adjuntar archivo…"
-
 #~ msgid "Attach a file"
 #~ msgstr "Adjuntar un archivo"
 
-#~ msgid "I_nclude Message(s)"
-#~ msgstr "I_ncluir mensaje(s)"
-
 #~ msgid "Include selected message(s)"
 #~ msgstr "Incluir los mensajes seleccionados"
 
-#~ msgid "Attach _Message(s)"
-#~ msgstr "Adjuntar _mensaje(s)"
-
 #~ msgid "Attach selected message(s)"
 #~ msgstr "Adjuntar los mensajes seleccionados"
 
@@ -9263,39 +9733,12 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "Redo most recent change"
 #~ msgstr "Rehacer el cambio más reciente"
 
-#~ msgid "Cu_t"
-#~ msgstr "Cor_tar"
-
 #~ msgid "Copy to the clipboard"
 #~ msgstr "Copiar al portapapeles"
 
-#~ msgid "_Paste"
-#~ msgstr "_Pegar"
-
 #~ msgid "Paste from the clipboard"
 #~ msgstr "Pegar desde el portapapeles"
 
-# src/filter-edit-dialog.c:313
-# src/filter-edit-dialog.c:296
-#~ msgid "_Wrap Body"
-#~ msgstr "_Ajustar cuerpo"
-
-# src/sendmsg-window.c:191
-# src/sendmsg-window.c:196
-#~ msgid "_Reflow Selected Text"
-#~ msgstr "_Refluir texto seleccionado"
-
-# src/sendmsg-window.c:1434
-# src/sendmsg-window.c:1483
-#~ msgid "Insert Si_gnature"
-#~ msgstr "Incl_uir firma"
-
-#~ msgid "_Quote Message(s)"
-#~ msgstr "_Citar mensaje(s)"
-
-#~ msgid "C_heck Spelling"
-#~ msgstr "Comprobar _ortografía"
-
 #~ msgid "Check the spelling of the message"
 #~ msgstr "Comprueba la ortografía del mensaje"
 
@@ -9309,9 +9752,6 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "Select the Identity to use for the message"
 #~ msgstr "Selecciona la identidad para usar en el mensaje"
 
-#~ msgid "_Edit with Gnome-Editor"
-#~ msgstr "_Editar con Gnome-Editor"
-
 #~ msgid "Edit the current message with the default Gnome editor"
 #~ msgstr "Edita el mensaje actual con el editor predeterminado de GNOME"
 
@@ -9345,51 +9785,14 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "Too_lbar"
 #~ msgstr "_Barra de herramientas"
 
-# src/balsa-message.c:569 src/filter-edit-dialog.c:337 src/print.c:336
-# src/sendmsg-window.c:835
-# src/balsa-message.c:633 src/filter-edit-dialog.c:316 src/print.c:348
-# src/sendmsg-window.c:867
-#~ msgid "F_rom"
-#~ msgstr "_De:"
-
-#~ msgid "Rec_ipients"
-#~ msgstr "Dest_inatarios"
-
-# src/sendmsg-window.c:885
-# src/sendmsg-window.c:928
-#~ msgid "R_eply To"
-#~ msgstr "R_esponder a"
-
-# src/balsa-message.c:578
-# src/balsa-message.c:642
-#~ msgid "F_cc"
-#~ msgstr "R_cc"
-
-# src/filter-edit-dialog.c:626
-# src/filter-edit-dialog.c:538
-#~ msgid "_Request Disposition Notification"
-#~ msgstr "_Solicitar notificación de entrega"
-
 # src/filter-edit-dialog.c:626
 # src/filter-edit-dialog.c:538
 #~ msgid "Request Message Disposition Notification"
 #~ msgstr "Solicitar notificación de entrega"
 
-#~ msgid "_Format = Flowed"
-#~ msgstr "_Format = Flowed"
-
-#~ msgid "Send as plain text and _HTML"
-#~ msgstr "Enviar como texto plano y _HTML"
-
-#~ msgid "_Sign Message"
-#~ msgstr "_Firmar mensaje"
-
 #~ msgid "Sign message using GPG"
 #~ msgstr "Firma el mensaje usando GPG"
 
-#~ msgid "_Encrypt Message"
-#~ msgstr "_Cifrar mensaje"
-
 #~ msgid "Encrypt message using GPG"
 #~ msgstr "Cifrar el mensaje usando GPG"
 
@@ -9400,15 +9803,6 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgstr ""
 #~ "firma el mensaje usando GNUPG para todos los destinatarios en Para: y Cc:"
 
-#~ msgid "_GnuPG uses MIME mode"
-#~ msgstr "_GnuPG usa el modo MIME"
-
-#~ msgid "_GnuPG uses old OpenPGP mode"
-#~ msgstr "_GnuPG usa el modo antiguo OpenPGP"
-
-#~ msgid "_S/MIME mode (GpgSM)"
-#~ msgstr "Modo _S/MIME (GpgSM)"
-
 # src/sendmsg-window.c:1403
 # src/sendmsg-window.c:1454
 #~ msgid "Could not compile %s"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]