[balsa/gtk3] Updated Spanish translation



commit 853134e0b605cac146158043f8db42ff59011a5a
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Fri Sep 30 10:24:23 2016 +0000

    Updated Spanish translation

 po/es.po | 6815 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 3506 insertions(+), 3309 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index cf1c92f..18bb898 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,107 +8,119 @@
 # Francisco Javier F. Serrador <serrador cvs gnome org>, 2003, 2004, 2005, 2006.
 # Jorge Bernal <koke amedias org>, 2004, 2005.
 # Jorge González <jorgegonz svn gnome org>, 2007, 2008, 2009, 2010.
+# Daniel Mustieles <daniel mustieles gmail com>, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: balsa.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=balsa&component=general\n"
-"POT-Creation-Date: 2010-08-13 17:06+0000\n"
-"PO-Revision-Date: 2010-08-16 09:02+0200\n"
-"Last-Translator: Jorge González <jorgegonz svn gnome org>\n"
-"Language-Team: Español <gnome-es-list gnome org>\n"
+"product=balsa&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-09-23 21:54+0000\n"
+"PO-Revision-Date: 2016-09-30 12:21+0200\n"
+"Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
+"Language-Team: Español; Castellano <gnome-es-list gnome org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Gtranslator 2.91.6\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 # src/filter-edit-dialog.c:783
 # src/filter-edit-dialog.c:693
-#: ../balsa.desktop.in.h:1
+#: ../balsa.desktop.in.in.h:1 ../balsa-mailto-handler.desktop.in.in.h:1
 msgid "Balsa"
 msgstr "Balsa"
 
-#: ../balsa.desktop.in.h:2
+#: ../balsa.desktop.in.in.h:2 ../balsa-mailto-handler.desktop.in.in.h:2
 msgid "E-Mail utility"
 msgstr "Utilidad de correo-e"
 
+# src/pref-manager.c:1333
+# src/pref-manager.c:1476
+#: ../balsa.desktop.in.in.h:3 ../balsa-mailto-handler.desktop.in.in.h:3
+#| msgid "Default Client"
+msgid "Mail Client"
+msgstr "Cliente de correo-e"
+
+#: ../balsa.desktop.in.in.h:4 ../balsa-mailto-handler.desktop.in.in.h:4
+#| msgid "The Balsa E-Mail Client"
+msgid "Balsa Mail Client"
+msgstr "El cliente de correo-e Balsa"
+
 # libbalsa/address-book-ldap.c:310 libbalsa/address-book-vcard.c:174
 # libbalsa/address-book-ldap.c:322 libbalsa/address-book-vcard.c:192
 #. The externq database doesn't support Id's, sorry!
-#: ../libbalsa/address-book-extern.c:211 ../libbalsa/address-book-ldap.c:496
-#: ../libbalsa/address-book-ldif.c:332
+#: ../libbalsa/address-book-extern.c:211 ../libbalsa/address-book-ldif.c:332
 msgid "No-Id"
 msgstr "Sin Id"
 
 # libbalsa/address-book-ldap.c:317 libbalsa/address-book-vcard.c:183
 # libbalsa/address-book-ldap.c:329 libbalsa/address-book-vcard.c:201
-#: ../libbalsa/address-book-extern.c:216 ../libbalsa/address-book-extern.c:371
-#: ../libbalsa/address-book-ldap.c:502 ../libbalsa/address-book-ldif.c:311
+#: ../libbalsa/address-book-extern.c:216 ../libbalsa/address-book-extern.c:374
+#: ../libbalsa/address-book-ldap.c:500 ../libbalsa/address-book-ldif.c:311
 #: ../libbalsa/address-book-ldif.c:335 ../libbalsa/address-book-ldif.c:354
 #: ../libbalsa/address-book-ldif.c:358 ../libbalsa/address-book-vcard.c:160
-#: ../libbalsa/address-book-vcard.c:258 ../libbalsa/address.c:403
+#: ../libbalsa/address-book-vcard.c:258 ../libbalsa/address.c:406
 msgid "No-Name"
 msgstr "Sin nombre"
 
-#: ../libbalsa/address-book-ldap.c:284
+#: ../libbalsa/address-book-ldap.c:283
 msgid "SASL Interaction\n"
 msgstr "Interacción con SASL\n"
 
-#: ../libbalsa/address-book-ldap.c:331
+#: ../libbalsa/address-book-ldap.c:330
 msgid "TLS requested but not compiled in"
 msgstr "Se pidió TLS pero no hay soporte TLS compilado"
 
 # libbalsa/address-book.c:163
 # libbalsa/address-book.c:170
-#: ../libbalsa/address-book-ldap.c:611
+#: ../libbalsa/address-book-ldap.c:609
 msgid "Undefined location of user address book"
 msgstr "Ubicación indefinida de la libreta de direcciones del usuario"
 
-#: ../libbalsa/address-book.c:316 ../libbalsa/filter-error.c:47
+#: ../libbalsa/address-book.c:314 ../libbalsa/filter-error.c:47
 msgid "No error"
 msgstr "Sin errores"
 
 # libbalsa/address-book.c:163
 # libbalsa/address-book.c:170
-#: ../libbalsa/address-book.c:317
+#: ../libbalsa/address-book.c:315
 msgid "Cannot read from address book"
 msgstr "No se puede leer del libreta de direcciones"
 
 # libbalsa/address-book.c:163
 # libbalsa/address-book.c:170
-#: ../libbalsa/address-book.c:318
+#: ../libbalsa/address-book.c:316
 msgid "Cannot write to address book"
 msgstr "No se puede escribir al libreta de direcciones"
 
 # libmutt/imap/imap_ssl.c:229
 # libmutt/imap/imap_ssl.c:229
-#: ../libbalsa/address-book.c:319
+#: ../libbalsa/address-book.c:317
 msgid "Cannot connect to the server"
 msgstr "No se puede conectar con el servidor"
 
 # libbalsa/address-book.c:163
 # libbalsa/address-book.c:170
-#: ../libbalsa/address-book.c:320
+#: ../libbalsa/address-book.c:318
 msgid "Cannot search in the address book"
 msgstr "No se puede buscar en el libreta de direcciones"
 
-#: ../libbalsa/address-book.c:322
+#: ../libbalsa/address-book.c:320
 msgid "Cannot add duplicate entry"
 msgstr "No se puede agregar una entrada duplicada"
 
 # libbalsa/address-book.c:163
 # libbalsa/address-book.c:170
-#: ../libbalsa/address-book.c:324
+#: ../libbalsa/address-book.c:322
 msgid "Cannot find address in address book"
 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:325 ../src/main-window.c:2334
-#: ../src/main-window.c:4779 ../src/sendmsg-window.c:4147
+#: ../libbalsa/address-book.c:323 ../src/main-window.c:2916
+#: ../src/main-window.c:4252 ../src/sendmsg-window.c:3797
 msgid "Unknown error"
 msgstr "Se ha producido un error desconocido"
 
@@ -116,49 +128,48 @@ msgstr "Se ha producido un error desconocido"
 # 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:129 ../src/balsa-mime-widget-message.c:738
-#: ../src/balsa-print-object-header.c:170 ../src/sendmsg-window.c:1106
-#: ../src/sendmsg-window.c:3810 ../src/store-address.c:332
+#: ../libbalsa/address-view.c:162 ../src/balsa-mime-widget-message.c:750
+#: ../src/balsa-print-object-header.c:171 ../src/sendmsg-window.c:718
+#: ../src/sendmsg-window.c:3504
 msgid "To:"
 msgstr "Para:"
 
 # src/balsa-message.c:574
 # src/balsa-message.c:638
-#: ../libbalsa/address-view.c:130 ../src/balsa-mime-widget-message.c:739
-#: ../src/balsa-print-object-header.c:172 ../src/sendmsg-window.c:1106
-#: ../src/sendmsg-window.c:3818 ../src/store-address.c:333
+#: ../libbalsa/address-view.c:163 ../src/balsa-mime-widget-message.c:752
+#: ../src/balsa-print-object-header.c:173 ../src/sendmsg-window.c:718
+#: ../src/sendmsg-window.c:3512
 msgid "Cc:"
 msgstr "Cc:"
 
 # src/balsa-message.c:575
 # src/balsa-message.c:639
-#: ../libbalsa/address-view.c:131 ../src/balsa-mime-widget-message.c:740
-#: ../src/balsa-print-object-header.c:174 ../src/sendmsg-window.c:1106
-#: ../src/store-address.c:334
+#: ../libbalsa/address-view.c:164 ../src/balsa-mime-widget-message.c:754
+#: ../src/balsa-print-object-header.c:175 ../src/sendmsg-window.c:718
 msgid "Bcc:"
 msgstr "Cco:"
 
 # src/sendmsg-window.c:885
 # src/sendmsg-window.c:928
-#: ../libbalsa/address-view.c:133
+#: ../libbalsa/address-view.c:165
 msgid "Reply To:"
 msgstr "Responder a:"
 
 # src/filter-edit-dialog.c:490
 # src/address-book-config.c:321
-#: ../libbalsa/address.c:949
+#: ../libbalsa/address.c:954
 msgid "D_isplayed Name:"
 msgstr "Nombre _mostrado:"
 
 # src/filter-edit-dialog.c:490
 # src/address-book-config.c:321
-#: ../libbalsa/address.c:950
+#: ../libbalsa/address.c:955
 msgid "_First Name:"
 msgstr "_Nombre:"
 
 # src/address-book-config.c:351
 # src/address-book-config.c:381
-#: ../libbalsa/address.c:951
+#: ../libbalsa/address.c:956
 msgid "_Last Name:"
 msgstr "Ape_llidos:"
 
@@ -166,17 +177,17 @@ msgstr "Ape_llidos:"
 # src/address-book.c:435
 # libinit_balsa/balsa-druid-page-user.gob:83 src/address-book.c:252
 # src/address-book.c:470
-#: ../libbalsa/address.c:952
+#: ../libbalsa/address.c:957
 msgid "_Nickname:"
 msgstr "_Apodo:"
 
-#: ../libbalsa/address.c:953
+#: ../libbalsa/address.c:958
 msgid "O_rganization:"
 msgstr "O_rganización:"
 
 # src/store-address.c:52
 # src/store-address.c:54
-#: ../libbalsa/address.c:954
+#: ../libbalsa/address.c:959
 msgid "_Email Address:"
 msgstr "_Correo electrónico:"
 
@@ -186,29 +197,27 @@ msgstr "_Correo electrónico:"
 # 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
-#. Right/Add button
-#: ../libbalsa/address.c:973 ../src/filter-edit-callbacks.c:1067
-#: ../src/filter-run-dialog.c:329
+#: ../libbalsa/address.c:978 ../src/filter-edit-callbacks.c:1071
 msgid "A_dd"
 msgstr "A_ñadir"
 
 # 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:123 ../libbalsa/mailbox_local.c:1765
+#: ../libbalsa/body.c:123 ../libbalsa/mailbox_local.c:1841
 #: ../libbalsa/message.c:845
 msgid "(No subject)"
 msgstr "(Sin asunto)"
 
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
-#: ../libbalsa/body.c:352 ../libbalsa/body.c:399
+#: ../libbalsa/body.c:395 ../libbalsa/body.c:442
 #, c-format
 msgid "Failed to create output stream"
 msgstr "No se pudo crear el flujo de salida"
 
 # src/balsa-message.c:651
 # src/balsa-message.c:713
-#: ../libbalsa/body.c:543
+#: ../libbalsa/body.c:574
 #, c-format
 msgid "Could not read embedded message"
 msgstr "No se pudo leer el mensaje empotrado"
@@ -232,200 +241,232 @@ msgstr "Hay un error en la sintaxis de la expresión regular"
 msgid "Attempt to apply an invalid filter"
 msgstr "Se intentó aplicar un filtro no válido"
 
-#: ../libbalsa/filter-file.c:141
+# src/balsa-index.c:428
+# src/balsa-index.c:417
+#. FIXME: this is hack!
+#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:985
+msgid "To"
+msgstr "Para"
+
+# src/balsa-index.c:303
+# src/balsa-index.c:296
+#: ../libbalsa/filter-funcs.c:384 ../src/balsa-index.c:353
+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:385 ../src/balsa-index.c:369
+#: ../src/pref-manager.c:397
+msgid "Subject"
+msgstr "Asunto"
+
+# src/balsa-message.c:574
+# src/balsa-message.c:638
+#: ../libbalsa/filter-funcs.c:386
+#, fuzzy
+#| msgid "Cc:"
+msgid "Cc"
+msgstr "Cc:"
+
+# src/filter-edit-dialog.c:313
+# src/filter-edit-dialog.c:296
+#: ../libbalsa/filter-funcs.c:387
+#, fuzzy
+#| msgid "_Body"
+msgid "Body"
+msgstr "_Cuerpo"
+
+# src/main-window.c:267 src/message-window.c:61
+# src/main-window.c:269
+#: ../libbalsa/filter-funcs.c:392
+#, fuzzy, c-format
+#| msgid "_Headers"
+msgid "Header:%s"
+msgstr "_Cabeceras"
+
+# src/main-window.c:191
+# src/main-window.c:196
+#: ../libbalsa/filter-funcs.c:414
+#, fuzzy
+#| msgid "_New"
+msgid "New"
+msgstr "_Nuevo"
+
+# 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
+#: ../libbalsa/filter-funcs.c:415 ../src/filter-edit-callbacks.c:994
+msgid "Deleted"
+msgstr "Eliminado"
+
+# src/main-window.c:448
+# src/main-window.c:455
+#: ../libbalsa/filter-funcs.c:416 ../src/filter-edit-callbacks.c:994
+msgid "Replied"
+msgstr "Respondido"
+
+# HE DECIDIDO QUEDARME CON ESTA TRADUCCIÓN. SE ADMITEN SUGERENCIAS
+# 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
+#: ../libbalsa/filter-funcs.c:417 ../src/filter-edit-callbacks.c:994
+msgid "Flagged"
+msgstr "Marcado"
+
+# src/pref-manager.c:237 src/pref-manager.c:949 src/pref-manager.c:1027
+# src/pref-manager.c:1838
+#: ../libbalsa/filter-funcs.c:441
+#, fuzzy
+#| msgid "Not found"
+msgid "Not "
+msgstr "No se encontró"
+
+#: ../libbalsa/filter-funcs.c:457
+msgid "From %Y-%m-%d"
+msgstr ""
+
+#: ../libbalsa/filter-funcs.c:463
+msgid "To %Y-%m-%d"
+msgstr ""
+
+#: ../libbalsa/filter-funcs.c:471
+#, fuzzy
+#| msgid "End"
+msgid "And"
+msgstr "Final"
+
+#: ../libbalsa/filter-funcs.c:474
+msgid "Or"
+msgstr ""
+
+#: ../libbalsa/filter-file.c:135
 #, c-format
 msgid "Invalid filters %s for mailbox %s"
 msgstr "Filtros inválidos %s para el buzón %s"
 
-#: ../libbalsa/filter.c:129 ../libbalsa/mailbox_local.c:845
+#: ../libbalsa/filter.c:127 ../libbalsa/mailbox_local.c:866
 msgid "Unable to load message body to match filter"
 msgstr "No se pudo cargar el cuerpo del mensaje que coincida con el filtro"
 
 # src/main-window.c:259
 # src/main-window.c:262
-#: ../libbalsa/filter.c:236
+#: ../libbalsa/filter.c:234
 #, c-format
 msgid "Invalid filter: %s"
 msgstr "Filtro no válido %s"
 
-#: ../libbalsa/filter.c:284 ../libbalsa/filter.c:307
+#: ../libbalsa/filter.c:282 ../libbalsa/filter.c:305
 #, c-format
 msgid "Bad mailbox name for filter: %s"
 msgstr "Nombre de buzón erróneo para el filtro %s"
 
 # src/pref-manager.c:1491
 # src/pref-manager.c:1644
-#: ../libbalsa/filter.c:288
+#: ../libbalsa/filter.c:286
 #, c-format
 msgid "Error when copying messages: %s"
 msgstr "Ha ocurrido un error durante la copia de mensajes: %s"
 
 # src/message-window.c:120
 # src/message-window.c:114
-#: ../libbalsa/filter.c:298
+#: ../libbalsa/filter.c:296
 #, c-format
 msgid "Error when trashing messages: %s"
 msgstr "Ha ocurrido un error durante la eliminación de los mensajes: %s"
 
 # src/pref-manager.c:1491
 # src/pref-manager.c:1644
-#: ../libbalsa/filter.c:311
+#: ../libbalsa/filter.c:309
 #, c-format
 msgid "Error when moving messages: %s"
 msgstr "Ha ocurrido un error durante el movimiento de mensajes: %s"
 
-#: ../libbalsa/gmime-application-pkcs7.c:237
-#: ../libbalsa/gmime-application-pkcs7.c:380
+#: ../libbalsa/gmime-application-pkcs7.c:125
 #, c-format
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Fallo al descifrar la parte MIME: error de parseo"
 
-#: ../libbalsa/gmime-gpgme-context.c:300 ../libbalsa/rfc3156.c:1730
-#, c-format
-msgid ""
-"The passphrase for this key was bad, please try again!\n"
-"\n"
-"Key: %s"
+#: ../libbalsa/gmime-multipart-crypt.c:222
+msgid "Cannot verify multipart/signed part due to missing subparts."
 msgstr ""
-"La frase de paso de esta clave era incorrecta. Inténtelo de nuevo.\n"
-"\n"
-"Clave: %s"
 
-#: ../libbalsa/gmime-gpgme-context.c:305 ../libbalsa/rfc3156.c:1735
-#, c-format
-msgid ""
-"Please enter the passphrase for the secret key!\n"
-"\n"
-"Key: %s"
+#: ../libbalsa/gmime-multipart-crypt.c:248
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Disable support for protocol %s."
+msgid "unsupported protocol '%s'"
 msgstr ""
-"Introduzca la frase de paso para la clave secreta:\n"
 "\n"
-"Clave: %s"
-
-# src/balsa-message.c:1316
-# src/balsa-message.c:1474
-#: ../libbalsa/gmime-gpgme-context.c:424 ../libbalsa/gmime-gpgme-context.c:497
-#: ../libbalsa/gmime-gpgme-context.c:505 ../libbalsa/gmime-gpgme-context.c:614
-#: ../libbalsa/gmime-gpgme-context.c:694
-msgid "could not get data from stream"
-msgstr "no se pudo obtener datos del flujo"
-
-# src/balsa-message.c:1316
-# src/balsa-message.c:1474
-#: ../libbalsa/gmime-gpgme-context.c:429 ../libbalsa/gmime-gpgme-context.c:620
-#: ../libbalsa/gmime-gpgme-context.c:699
-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/gmime-gpgme-context.c:436
-msgid "signing failed"
-msgstr "la firma ha fallado"
-
-#: ../libbalsa/gmime-gpgme-context.c:516 ../libbalsa/rfc3156.c:638
-#: ../libbalsa/rfc3156.c:643 ../libbalsa/rfc3156.c:958
-#: ../libbalsa/rfc3156.c:964
-msgid "signature verification failed"
-msgstr "la verificación de la firma ha fallado"
-
-#: ../libbalsa/gmime-gpgme-context.c:580
-#, 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/gmime-gpgme-context.c:643
-msgid "signing and encryption failed"
-msgstr "han fallado la firma y el descifrado"
-
-#: ../libbalsa/gmime-gpgme-context.c:645
-msgid "encryption failed"
-msgstr "el cifrado ha fallado"
-
-#: ../libbalsa/gmime-gpgme-context.c:708 ../libbalsa/rfc3156.c:777
-#: ../libbalsa/rfc3156.c:782
-msgid "decryption failed"
-msgstr "falló el descifrado"
-
-# src/balsa-message.c:1316
-# src/balsa-message.c:1474
-#: ../libbalsa/gmime-gpgme-context.c:765
-msgid "could not create context"
-msgstr "no se pudo crear contexto"
-
-#: ../libbalsa/gmime-gpgme-context.c:824
-#, c-format
-msgid "the crypto engine for protocol OpenPGP is not available"
-msgstr "el motor de cifrado para el protocolo OpenPGP no está disponible"
+"Desactivar soporte para el protocolo %s."
 
-#: ../libbalsa/gmime-gpgme-context.c:834
-#, c-format
-msgid "the crypto engine for protocol CMS is not available"
-msgstr "el motor de cifrado para el protocolo CMS no está disponible"
+#: ../libbalsa/gmime-multipart-crypt.c:261
+msgid ""
+"Cannot verify multipart/signed part: signature content-type does not match "
+"protocol."
+msgstr ""
 
-#: ../libbalsa/gmime-gpgme-context.c:841
+#: ../libbalsa/gmime-multipart-crypt.c:462
 #, c-format
-msgid "invalid crypto engine %d"
-msgstr "motor de cifrado inválido %d"
+msgid ""
+"Cannot decrypt multipart/encrypted part: unsupported encryption protocol "
+"'%s'."
+msgstr ""
 
-# src/balsa-message.c:301
-# src/balsa-message.c:331
-#: ../libbalsa/gmime-gpgme-context.c:872 ../libbalsa/gmime-gpgme-context.c:899
-#, c-format
-msgid "could not list keys for \"%s\""
-msgstr "no se pudo listar las claves para «%s»"
+#: ../libbalsa/gmime-multipart-crypt.c:463
+msgid "(none)"
+msgstr ""
 
-#: ../libbalsa/gmime-gpgme-context.c:915
-#, c-format
+#: ../libbalsa/gmime-multipart-crypt.c:476
 msgid ""
-"%s: a key for %s is present, but it is expired, disabled, revoked or invalid"
+"Cannot decrypt multipart/encrypted part: content-type does not match "
+"protocol."
 msgstr ""
-"%s: hay presente una clave para %s, pero ha caducado, está desactivada, ha "
-"sido revocada o es inválida"
 
-# src/balsa-message.c:301
-# src/balsa-message.c:331
-#: ../libbalsa/gmime-gpgme-context.c:919
-#, c-format
-msgid "%s: could not find a key for %s"
-msgstr "%s: no pudo encontrar una clave para %s"
+#: ../libbalsa/gmime-multipart-crypt.c:491
+msgid "Cannot decrypt multipart/encrypted part: unexpected content type"
+msgstr ""
 
-#: ../libbalsa/gmime-gpgme-context.c:924
-#, c-format
+#: ../libbalsa/gmime-multipart-crypt.c:533
 msgid ""
-"%s: a key with id %s is present, but it is expired, disabled, revoked or "
-"invalid"
+"Cannot decrypt multipart/encrypted part: failed to parse decrypted content"
 msgstr ""
-"%s: hay presente una clave con ID %s, pero ha caducado, está desactivada, ha "
-"sido revocada o es inválida"
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../libbalsa/gmime-gpgme-context.c:928
-#, c-format
-msgid "%s: could not find a key with id %s"
-msgstr "%s: no se pudo encontrar una clave con ID %s"
-
-# src/balsa-message.c:301
-# src/balsa-message.c:331
-#: ../libbalsa/gmime-gpgme-context.c:942
-#, c-format
-msgid "%s: multiple keys for %s"
-msgstr "%s: claves múltiples para %s"
-
-#: ../libbalsa/gmime-gpgme-context.c:987
+#: ../libbalsa/html.c:68
 #, c-format
-msgid "%s: insufficient validity for uid %s"
-msgstr "%s: validez insuficiente para el uid %s"
+msgid "Could not get an HTML part: %s"
+msgstr "No se pudo obtener una parte HTML: %s"
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../libbalsa/html.c:68
-#, c-format
-msgid "Could not get an HTML part: %s"
+#: ../libbalsa/html.c:121
+#, fuzzy, c-format
+#| msgid "Could not get an HTML part: %s"
+msgid "Could not convert HTML part to text: %s"
 msgstr "No se pudo obtener una parte HTML: %s"
 
-#: ../libbalsa/html.c:340
+#: ../libbalsa/html.c:402
+#, fuzzy
+#| msgid ""
+#| "This message part contains images from a remote server. To protect your "
+#| "privacy, Balsa has not downloaded them. You may choose to download them "
+#| "if you trust the server."
+msgid ""
+"This message part contains images from a remote server.\n"
+"To protect your privacy, Balsa has not downloaded them.\n"
+"You may choose to download them if you trust the server."
+msgstr ""
+"Esta parte del mensaje contiene partes de imágenes de un servidor remoto. "
+"Para proteger su privacidad, Balsa no las ha descargado. Puede escoger "
+"descargarlas si confía en el servidor."
+
+#: ../libbalsa/html.c:410 ../libbalsa/html.c:1078
 msgid ""
 "This message part contains images from a remote server. To protect your "
 "privacy, Balsa has not downloaded them. You may choose to download them if "
@@ -435,230 +476,290 @@ msgstr ""
 "Para proteger su privacidad, Balsa no las ha descargado. Puede escoger "
 "descargarlas si confía en el servidor."
 
-#: ../libbalsa/html.c:348
+#: ../libbalsa/html.c:419 ../libbalsa/html.c:1089
 msgid "_Download images"
 msgstr "_Descargar imágenes"
 
+# src/main-window.c:399
+# src/main-window.c:401
+#: ../libbalsa/html.c:421 ../libbalsa/html.c:1091 ../libbalsa/identity.c:1736
+#: ../src/ab-window.c:140 ../src/mailbox-conf.c:1162
+#: ../src/mailbox-node.c:1115 ../src/main-window.c:3945
+#: ../src/toolbar-prefs.c:142
+msgid "_Close"
+msgstr "_Cerrar"
+
 #. should "re" be localized ?
-#: ../libbalsa/identity.c:103 ../libbalsa/mailbox_local.c:1884
-#: ../libbalsa/mailbox_local.c:1886 ../src/sendmsg-window.c:4044
-#: ../src/sendmsg-window.c:4046
+#: ../libbalsa/identity.c:103 ../libbalsa/mailbox_local.c:1960
+#: ../libbalsa/mailbox_local.c:1962 ../src/sendmsg-window.c:3745
+#: ../src/sendmsg-window.c:3747
 msgid "Re:"
 msgstr "Re:"
 
-#: ../libbalsa/identity.c:104 ../src/sendmsg-window.c:3984
-#: ../src/sendmsg-window.c:3985 ../src/sendmsg-window.c:3986
+#: ../libbalsa/identity.c:104 ../src/sendmsg-window.c:3685
+#: ../src/sendmsg-window.c:3686 ../src/sendmsg-window.c:3687
 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:165
+#: ../libbalsa/identity.c:166
 msgid "New Identity"
 msgstr "Identidad nueva"
 
-#: ../libbalsa/identity.c:345
+#: ../libbalsa/identity.c:346
 #, c-format
 msgid "Error executing signature generator %s"
 msgstr "Error al ejecutar el generador de firmas %s"
 
-#: ../libbalsa/identity.c:355
+#: ../libbalsa/identity.c:358
 #, c-format
 msgid "Cannot open signature file '%s' for reading"
 msgstr "No se pudo abrir el archivo de firma «%s» para lectura"
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../libbalsa/identity.c:361
+#: ../libbalsa/identity.c:364
 #, c-format
 msgid "Error reading signature from %s"
 msgstr "Ha ocurrido un error al cargar la firma de %s"
 
-#: ../libbalsa/identity.c:366
+#: ../libbalsa/identity.c:369
 #, c-format
 msgid "Signature in %s is not a UTF-8 text."
 msgstr "La firma en %s no es un texto UTF-8."
 
+# src/balsa-message.c:264 src/sendmsg-window.c:149 src/sendmsg-window.c:599
+# src/sendmsg-window.c:1404 src/sendmsg-window.c:1672
+# 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:488 ../libbalsa/libbalsa-gpgme-cb.c:159
+#: ../libbalsa/libbalsa-gpgme-cb.c:371 ../libbalsa/smtp-server.c:543
+#: ../src/ab-main.c:860 ../src/ab-window.c:133
+#: ../src/address-book-config.c:239 ../src/address-book-config.c:338
+#: ../src/balsa-app.c:90 ../src/balsa-index.c:2645 ../src/balsa-mblist.c:1878
+#: ../src/balsa-message.c:1791 ../src/balsa-mime-widget-callbacks.c:87
+#: ../src/filter-edit-callbacks.c:1241 ../src/filter-edit-dialog.c:404
+#: ../src/filter-edit-dialog.c:573 ../src/filter-export-dialog.c:81
+#: ../src/filter-run-dialog.c:313 ../src/folder-conf.c:306
+#: ../src/folder-conf.c:569 ../src/folder-conf.c:802 ../src/mailbox-conf.c:404
+#: ../src/mailbox-conf.c:425 ../src/mailbox-conf.c:441
+#: ../src/mailbox-conf.c:1125 ../src/pref-manager.c:508
+#: ../src/sendmsg-window.c:533 ../src/sendmsg-window.c:1542
+#: ../src/sendmsg-window.c:1994 ../src/sendmsg-window.c:3311
+#: ../src/sendmsg-window.c:4678 ../src/sendmsg-window.c:4975
+#: ../src/sendmsg-window.c:5132 ../src/spell-check.c:384
+#: ../src/store-address.c:210
+#, fuzzy
+#| msgid "Cancel"
+msgid "_Cancel"
+msgstr "Cancelar"
+
+#: ../libbalsa/identity.c:489 ../libbalsa/libbalsa-gpgme-cb.c:158
+#: ../libbalsa/libbalsa-gpgme-cb.c:370 ../libbalsa/smtp-server.c:542
+#: ../src/ab-window.c:132 ../src/balsa-app.c:89 ../src/balsa-message.c:1792
+#: ../src/balsa-mime-widget-callbacks.c:88 ../src/filter-edit-callbacks.c:1240
+#: ../src/filter-edit-dialog.c:572 ../src/filter-export-dialog.c:80
+#: ../src/filter-run-dialog.c:312 ../src/main-window.c:4038
+#: ../src/pref-manager.c:506 ../src/sendmsg-window.c:1541
+#: ../src/sendmsg-window.c:1995 ../src/sendmsg-window.c:3310
+#: ../src/sendmsg-window.c:4679 ../src/store-address.c:211
+msgid "_OK"
+msgstr ""
+
 # src/main-window.c:396
 # src/main-window.c:395
-#: ../libbalsa/identity.c:497
+#: ../libbalsa/identity.c:501
 msgid "Current"
 msgstr "Actual"
 
 # src/pref-manager.c:1333
 # src/pref-manager.c:1476
-#: ../libbalsa/identity.c:751 ../libbalsa/smtp-server.c:270
+#: ../libbalsa/identity.c:755 ../libbalsa/smtp-server.c:265
 msgid "Default"
 msgstr "Predeterminado"
 
 # src/mailbox-conf.c:890
 # src/mailbox-conf.c:965
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:950
+#: ../libbalsa/identity.c:957
 msgid "_Face Path"
 msgstr "Ruta de la _cara"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:956
+#: ../libbalsa/identity.c:963
 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:984
+#: ../libbalsa/identity.c:991
 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:986
+#: ../libbalsa/identity.c:993
 msgid "_Identity name:"
 msgstr "Nombre de la _identidad:"
 
 # src/store-address.c:50
 # src/store-address.c:52
-#: ../libbalsa/identity.c:988
+#: ../libbalsa/identity.c:995
 msgid "_Full name:"
 msgstr "Nombre _completo:"
 
 # src/store-address.c:52
 # src/store-address.c:54
-#: ../libbalsa/identity.c:990
+#: ../libbalsa/identity.c:997
 msgid "_Mailing address:"
 msgstr "_Dirección de correo:"
 
 # src/sendmsg-window.c:885
 # src/sendmsg-window.c:928
-#: ../libbalsa/identity.c:992
+#: ../libbalsa/identity.c:999
 msgid "Reply _to:"
 msgstr "_Responder a:"
 
 # src/filter-edit-dialog.c:454
 # src/filter-edit-dialog.c:404
-#: ../libbalsa/identity.c:994
+#: ../libbalsa/identity.c:1001
 msgid "_Domain:"
 msgstr "_Dominio:"
 
 # src/main-window.c:421
 # src/main-window.c:428
 #. create the "Messages" tab
-#: ../libbalsa/identity.c:998
+#: ../libbalsa/identity.c:1005
 msgid "Messages"
 msgstr "Mensajes"
 
 # src/sendmsg-window.c:228
 # src/sendmsg-window.c:232
-#: ../libbalsa/identity.c:1000
+#: ../libbalsa/identity.c:1007
 msgid "_Bcc:"
 msgstr "_Cco:"
 
 # src/pref-manager.c:1007
 # src/pref-manager.c:1137
-#: ../libbalsa/identity.c:1002
+#: ../libbalsa/identity.c:1009
 msgid "Reply _string:"
 msgstr "_Cadena de respuesta:"
 
 # src/message-window.c:120
 # src/message-window.c:114
-#: ../libbalsa/identity.c:1004
+#: ../libbalsa/identity.c:1011
 msgid "F_orward string:"
 msgstr "Cadena de r_eenvío:"
 
-#: ../libbalsa/identity.c:1007
+#: ../libbalsa/identity.c:1014
 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:1010
+#: ../libbalsa/identity.c:1017
+#, fuzzy
+#| msgid "request _Message Disposition Notification by default"
+msgid "request positive (successful) _Delivery Status Notification by default"
+msgstr "Solicitar notificación de entrega de _mensaje de forma predeterminada"
+
+# src/filter-edit-dialog.c:626
+# src/filter-edit-dialog.c:538
+#: ../libbalsa/identity.c:1021
 msgid "request _Message Disposition Notification by default"
 msgstr "Solicitar notificación de entrega de _mensaje de forma predeterminada"
 
 # libinit_balsa/balsa-druid-page-user.gob:91
 # libinit_balsa/balsa-druid-page-user.gob:91
-#: ../libbalsa/identity.c:1020
+#: ../libbalsa/identity.c:1031
 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:1025
+#: ../libbalsa/identity.c:1036
 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:1028
+#: ../libbalsa/identity.c:1039
 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:1031
+#: ../libbalsa/identity.c:1042
 msgid "_Execute signature"
 msgstr "_Ejecutar firma"
 
 # src/sendmsg-window.c:1434
 # src/sendmsg-window.c:1483
-#: ../libbalsa/identity.c:1034
+#: ../libbalsa/identity.c:1045
 msgid "Incl_ude signature"
 msgstr "Incl_uir firma"
 
-#: ../libbalsa/identity.c:1037
+#: ../libbalsa/identity.c:1048
 msgid "Include signature when for_warding"
 msgstr "Incluir firma cuando se _reenvíe"
 
-#: ../libbalsa/identity.c:1040
+#: ../libbalsa/identity.c:1051
 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:1043
+#: ../libbalsa/identity.c:1054
 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:1046
+#: ../libbalsa/identity.c:1057
 msgid "Prepend si_gnature"
 msgstr "An_teponer firma"
 
-#: ../libbalsa/identity.c:1052
+#: ../libbalsa/identity.c:1063
+#, fuzzy
+#| msgid ""
+#| "Signing and encrypting messages are possible\n"
+#| "only if Balsa is built with cryptographic support."
 msgid ""
-"Signing and encrypting messages are possible\n"
-"only if Balsa is built with cryptographic support."
+"Signing and encrypting messages are possible only if Balsa is built with "
+"cryptographic support."
 msgstr ""
 "Sólo es posible firmar y cifrar mensajes\n"
 "si Balsa se construye con soporte criptográfico."
 
-#: ../libbalsa/identity.c:1057
+#: ../libbalsa/identity.c:1068
 msgid "Security"
 msgstr "Seguridad"
 
-#: ../libbalsa/identity.c:1060
+#: ../libbalsa/identity.c:1071
 msgid "sign messages by default"
 msgstr "firmar mensajes por omisión"
 
-#: ../libbalsa/identity.c:1063
+#: ../libbalsa/identity.c:1074
 msgid "encrypt messages by default"
 msgstr "cifrar mensajes por omisión"
 
-#: ../libbalsa/identity.c:1066
+#: ../libbalsa/identity.c:1077
 msgid "default protocol"
 msgstr "protocolo predeterminado"
 
-#: ../libbalsa/identity.c:1069
+#: ../libbalsa/identity.c:1080
 msgid "always trust GnuPG keys when encrypting"
 msgstr "confiar siempre en las claves GnuPG al cifrar"
 
-#: ../libbalsa/identity.c:1072
+#: ../libbalsa/identity.c:1083
 msgid "remind me if messages can be encrypted"
 msgstr "recordarme si se pueden cifrar los mensajes"
 
-#: ../libbalsa/identity.c:1075
+#: ../libbalsa/identity.c:1086
 msgid ""
 "use secret key with this id for signing\n"
 "(leave empty for automatic selection)"
@@ -668,19 +769,19 @@ msgstr ""
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../libbalsa/identity.c:1209
+#: ../libbalsa/identity.c:1220
 #, 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:1219
+#: ../libbalsa/identity.c:1230
 #, 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:1229
+#: ../libbalsa/identity.c:1240
 #, c-format
 msgid "Face header file %s contains binary data."
 msgstr "El archivo de cabecera de la cara %s contiene datos binarios."
@@ -688,50 +789,75 @@ 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:1249 ../src/balsa-message.c:1576
+#: ../libbalsa/identity.c:1260 ../src/balsa-message.c:1616
 #, c-format
 msgid "Error loading Face: %s"
 msgstr "Ha ocurrido un error al cargar la cara: %s"
 
-#: ../libbalsa/identity.c:1428
+#: ../libbalsa/identity.c:1439
 msgid "Error: The identity does not have a name"
 msgstr "Error: La identidad no tiene un nombre"
 
-#: ../libbalsa/identity.c:1438
+#: ../libbalsa/identity.c:1449
 msgid "Error: An identity with that name already exists"
 msgstr "Error: Ya existe una identidad con ese nombre"
 
-#: ../libbalsa/identity.c:1637
+#: ../libbalsa/identity.c:1644
 msgid "Do you really want to delete the selected identity?"
-msgstr "¿Está seguro que quiere borrar la identidad seleccionada?"
+msgstr "¿Está seguro que quiere eliminar la identidad seleccionada?"
 
-#: ../libbalsa/identity.c:1674
+#: ../libbalsa/identity.c:1683
 #, 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:1720
+#: ../libbalsa/identity.c:1729
 msgid "Manage Identities"
 msgstr "Gestionar identidades"
 
-#: ../libbalsa/identity.c:2113
+#: ../libbalsa/identity.c:1733 ../libbalsa/smtp-server.c:544
+#: ../src/address-book-config.c:237 ../src/address-book-config.c:336
+#: ../src/filter-edit-callbacks.c:1242 ../src/filter-edit-dialog.c:574
+#: ../src/filter-export-dialog.c:82 ../src/filter-run-dialog.c:314
+#: ../src/folder-conf.c:307 ../src/folder-conf.c:570 ../src/folder-conf.c:803
+#: ../src/main-window.c:3944 ../src/pref-manager.c:509
+#: ../src/toolbar-prefs.c:143
+msgid "_Help"
+msgstr "Ay_uda"
+
+# src/main-window.c:191
+# src/main-window.c:196
+#. new button
+#: ../libbalsa/identity.c:1734 ../src/filter-edit-dialog.c:226
+#: ../src/mailbox-node.c:1080
+msgid "_New"
+msgstr "_Nuevo"
+
+# 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:1735 ../src/ab-main.c:855
+#: ../src/filter-edit-callbacks.c:1075 ../src/filter-edit-dialog.c:320
+msgid "_Remove"
+msgstr "_Quitar"
+
+#: ../libbalsa/identity.c:2127
 msgid "GnuPG MIME mode"
 msgstr "Modo MIME de GnuPG"
 
-#: ../libbalsa/identity.c:2115
+#: ../libbalsa/identity.c:2129
 msgid "GnuPG OpenPGP mode"
 msgstr "Modo OpenPGP de GnuPG"
 
-#: ../libbalsa/identity.c:2118
+#: ../libbalsa/identity.c:2132
 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:321
+#: ../libbalsa/imap-server.c:290
 #, c-format
 msgid ""
 "IMAP server %s alert:\n"
@@ -743,26 +869,41 @@ msgstr ""
 # src/pref-manager.c:240
 # src/pref-manager.c:246
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:325
+#: ../libbalsa/imap-server.c:294
 #, c-format
 msgid "IMAP server %s error: %s"
 msgstr "Error del servidor de correo IMAP %s: %s"
 
-# src/mailbox-conf.c:485
-# src/mailbox-conf.c:490
-#. IMAP host name + message
-#: ../libbalsa/imap-server.c:331
+# src/sendmsg-window.c:1694
+# src/sendmsg-window.c:1749
+#: ../libbalsa/imap-server.c:529 ../libbalsa/server.c:353
+#, fuzzy, c-format
+#| msgid "Error loading %s: %s\n"
+msgid "Error looking up password for %s@%s: %s\n"
+msgstr "Ha ocurrido un error al cargar %s: %s\n"
+
+#: ../libbalsa/imap-server.c:531 ../libbalsa/server.c:355
 #, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
+msgid "Falling back\n"
+msgstr ""
 
 # src/mailbox-conf.c:827 src/mailbox-conf.c:886
 # src/mailbox-conf.c:904 src/mailbox-conf.c:961
-#: ../libbalsa/imap-server.c:577 ../libbalsa/server.c:348
-#: ../libbalsa/server.c:392
+#: ../libbalsa/imap-server.c:541 ../libbalsa/imap-server.c:577
+#: ../libbalsa/server.c:364 ../libbalsa/server.c:398 ../libbalsa/server.c:443
+#: ../libbalsa/server.c:457
 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:373
+#: ../libbalsa/server.c:450
+#, fuzzy, c-format
+#| msgid "Error showing %s: %s\n"
+msgid "Error storing password for %s@%s: %s\n"
+msgstr "Error al mostrar %s:%s\n"
+
 # libmutt/imap/imap_ssl.c:229
 # libmutt/imap/imap_ssl.c:229
 #: ../libbalsa/imap-server.c:628
@@ -777,30 +918,247 @@ msgstr "No se puede conectar con %s"
 msgid "Cannot connect to the server: %s"
 msgstr "No se puede conectar con el servidor: %s"
 
-#: ../libbalsa/imap-server.c:786
+#: ../libbalsa/imap-server.c:787
 #, c-format
 msgid "Exceeded the number of connections per server %s"
 msgstr "Se sobrepasó el número de conexiones por servidor %s"
 
+#: ../libbalsa/libbalsa-gpgme-cb.c:137
+msgid "User ID"
+msgstr "ID del usuario"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:137
+msgid "Key ID"
+msgstr "ID de clave"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:137
+msgid "Length"
+msgstr "Longitud"
+
+# src/main-window.c:259
+# src/main-window.c:262
+#: ../libbalsa/libbalsa-gpgme-cb.c:137
+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:154
+msgid "Select key"
+msgstr "Seleccione clave"
+
+# src/sendmsg-window.c:166
+# src/sendmsg-window.c:172
+#: ../libbalsa/libbalsa-gpgme-cb.c:175
+#, c-format
+msgid "Select the private key for the signer %s"
+msgstr "Seleccione la clave privada para el firmante %s"
+
+# src/balsa-message.c:1316
+# src/balsa-message.c:1474
+#: ../libbalsa/libbalsa-gpgme-cb.c:180
+#, c-format
+msgid "Select the public key for the recipient %s"
+msgstr "Seleccione la clave pública para el destinatario %s"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:185
+#, c-format
+msgid ""
+"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 ""
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:326
+#, c-format
+msgid "Insufficient trust for recipient %s"
+msgstr "No hay suficiente confianza en el destinatario %s"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:330
+#, c-format
+msgid "The validity of the key with user ID \"%s\" is \"%s\"."
+msgstr "La validez de la clave con ID de usuario «%s» es «%s»."
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:341
+msgid "Use this key anyway?"
+msgstr "¿Quiere usar esta clave de todos modos?"
+
+#. FIXME: create dialog according to the Gnome HIG
+#: ../libbalsa/libbalsa-gpgme-cb.c:367
+#, fuzzy
+#| msgid "_Pass Phrase:"
+msgid "Enter Passphrase"
+msgstr "Frase de _paso:"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:395
+#, fuzzy, c-format
+#| msgid ""
+#| "The passphrase for this key was bad, please try again!\n"
+#| "\n"
+#| "Key: %s"
+msgid ""
+"%s\n"
+"The passphrase for this key was bad, please try again!\n"
+"\n"
+"Key: %s"
+msgstr ""
+"La frase de paso de esta clave era incorrecta. Inténtelo de nuevo.\n"
+"\n"
+"Clave: %s"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:400
+#, fuzzy, c-format
+#| msgid ""
+#| "Please enter the passphrase for the secret key!\n"
+#| "\n"
+#| "Key: %s"
+msgid ""
+"%s\n"
+"Please enter the passphrase for the secret key!\n"
+"\n"
+"Key: %s"
+msgstr ""
+"Introduzca la frase de paso para la clave secreta:\n"
+"\n"
+"Clave: %s"
+
+# src/balsa-message.c:1316
+# src/balsa-message.c:1474
+#: ../libbalsa/libbalsa-gpgme.c:240 ../libbalsa/libbalsa-gpgme.c:251
+#: ../libbalsa/libbalsa-gpgme.c:352 ../libbalsa/libbalsa-gpgme.c:474
+#: ../libbalsa/libbalsa-gpgme.c:566
+msgid "could not get data from stream"
+msgstr "no se pudo obtener datos del flujo"
+
+#: ../libbalsa/libbalsa-gpgme.c:264 ../libbalsa/rfc3156.c:390
+#: ../libbalsa/rfc3156.c:395 ../libbalsa/rfc3156.c:571
+#: ../libbalsa/rfc3156.c:577
+msgid "signature verification failed"
+msgstr "la verificación de la firma ha fallado"
+
+# src/balsa-message.c:1316
+# src/balsa-message.c:1474
+#: ../libbalsa/libbalsa-gpgme.c:360 ../libbalsa/libbalsa-gpgme.c:483
+#: ../libbalsa/libbalsa-gpgme.c:574
+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:369
+msgid "signing failed"
+msgstr "la firma ha fallado"
+
+#: ../libbalsa/libbalsa-gpgme.c:442
+#, 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:510
+msgid "signing and encryption failed"
+msgstr "han fallado la firma y el descifrado"
+
+#: ../libbalsa/libbalsa-gpgme.c:512
+msgid "encryption failed"
+msgstr "el cifrado ha fallado"
+
+#: ../libbalsa/libbalsa-gpgme.c:584 ../libbalsa/rfc3156.c:470
+#: ../libbalsa/rfc3156.c:475
+msgid "decryption failed"
+msgstr "falló el descifrado"
+
+# src/balsa-message.c:1316
+# src/balsa-message.c:1474
+#: ../libbalsa/libbalsa-gpgme.c:691
+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:695
+#, fuzzy, c-format
+#| msgid "Could not get a part: %s"
+msgid "could not set protocol '%s'"
+msgstr "No se pudo obtener una parte: %s"
+
+# src/balsa-message.c:301
+# src/balsa-message.c:331
+#: ../libbalsa/libbalsa-gpgme.c:758 ../libbalsa/libbalsa-gpgme.c:776
+#, c-format
+msgid "could not list keys for \"%s\""
+msgstr "no se pudo listar las claves para «%s»"
+
+#: ../libbalsa/libbalsa-gpgme.c:794
+#, c-format
+msgid ""
+"%s: a key for %s is present, but it is expired, disabled, revoked or invalid"
+msgstr ""
+"%s: hay presente una clave para %s, pero ha caducado, está desactivada, ha "
+"sido revocada o es inválida"
+
+# src/balsa-message.c:301
+# src/balsa-message.c:331
+#: ../libbalsa/libbalsa-gpgme.c:799
+#, c-format
+msgid "%s: could not find a key for %s"
+msgstr "%s: no pudo encontrar una clave para %s"
+
+#: ../libbalsa/libbalsa-gpgme.c:806
+#, c-format
+msgid ""
+"%s: a key with id %s is present, but it is expired, disabled, revoked or "
+"invalid"
+msgstr ""
+"%s: hay presente una clave con ID %s, pero ha caducado, está desactivada, ha "
+"sido revocada o es inválida"
+
+# src/balsa-message.c:301
+# src/balsa-message.c:331
+#: ../libbalsa/libbalsa-gpgme.c:811
+#, c-format
+msgid "%s: could not find a key with id %s"
+msgstr "%s: no se pudo encontrar una clave con ID %s"
+
+# src/balsa-message.c:301
+# src/balsa-message.c:331
+#: ../libbalsa/libbalsa-gpgme.c:829
+#, c-format
+msgid "%s: multiple keys for %s"
+msgstr "%s: claves múltiples para %s"
+
+#: ../libbalsa/libbalsa-gpgme.c:875
+#, c-format
+msgid "%s: insufficient validity for uid %s"
+msgstr "%s: validez insuficiente para el uid %s"
+
+# src/balsa-message.c:301
+# src/balsa-message.c:331
+#: ../libbalsa/libbalsa-gpgme.c:896 ../libbalsa/libbalsa-gpgme.c:910
+#, fuzzy, c-format
+#| msgid "could not list keys for \"%s\""
+msgid "could not list keys"
+msgstr "no se pudo listar las claves para «%s»"
+
 #: ../libbalsa/libbalsa-conf.c:143
 msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
 msgstr "Su configuración de Balsa ahora se guarda en «~/.balsa/config»."
 
 # libmutt/mx.c:459 libmutt/mx.c:605
 # libmutt/mx.c:459 libmutt/mx.c:605
-#: ../libbalsa/libbalsa-vfs.c:558 ../src/sendmsg-window.c:5168
+#: ../libbalsa/libbalsa-vfs.c:556 ../src/sendmsg-window.c:4468
 #, c-format
 msgid "not a regular file"
 msgstr "no es un archivo regular"
 
-#: ../libbalsa/libbalsa-vfs.c:610
+#: ../libbalsa/libbalsa-vfs.c:608
 #, c-format
 msgid "Cannot launch, missing application"
 msgstr "No se puede lanzar, falta la aplicación"
 
 # src/balsa-message.c:701
 # src/balsa-message.c:812
-#: ../libbalsa/libbalsa-vfs.c:676
+#: ../libbalsa/libbalsa-vfs.c:674
 #, c-format
 msgid "Open with %s"
 msgstr "Abrir con %s"
@@ -808,25 +1166,25 @@ msgstr "Abrir con %s"
 # ¿con "part" se refiere a MIME part?
 # src/balsa-message.c:701
 # src/balsa-message.c:812
-#: ../libbalsa/libbalsa-vfs.c:729
+#: ../libbalsa/libbalsa-vfs.c:727
 #, c-format
 msgid "Open _part with %s"
 msgstr "Ver par_te con %s"
 
 # libmutt/imap/imap_ssl.c:297
 # libmutt/imap/imap_ssl.c:297
-#: ../libbalsa/libbalsa.c:382
+#: ../libbalsa/libbalsa.c:357
 msgid "Invalid date"
 msgstr "Fecha inválida"
 
 # libmutt/imap/imap_ssl.c:254
 # libmutt/imap/imap_ssl.c:254
-#: ../libbalsa/libbalsa.c:398 ../src/pref-manager.c:1408
-#: ../src/pref-manager.c:1504
+#: ../libbalsa/libbalsa.c:374 ../src/pref-manager.c:1383
+#: ../src/pref-manager.c:1479
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../libbalsa/libbalsa.c:544
+#: ../libbalsa/libbalsa.c:514
 #, c-format
 msgid ""
 "Authenticity of this certificate could not be verified.\n"
@@ -839,7 +1197,7 @@ msgstr ""
 
 # libmutt/imap/imap_ssl.c:462
 # libmutt/imap/imap_ssl.c:462
-#: ../libbalsa/libbalsa.c:556
+#: ../libbalsa/libbalsa.c:526
 msgid ""
 "\n"
 "<b>This certificate was issued by:</b>\n"
@@ -847,7 +1205,7 @@ msgstr ""
 "\n"
 "<b>Este certificado fue emitido por: </b>\n"
 
-#: ../libbalsa/libbalsa.c:567
+#: ../libbalsa/libbalsa.c:537
 #, c-format
 msgid ""
 "<b>This certificate is valid</b>\n"
@@ -860,81 +1218,81 @@ msgstr ""
 "a %s\n"
 "<b>Huella</b> %s"
 
-#: ../libbalsa/libbalsa.c:576
+#: ../libbalsa/libbalsa.c:556
 msgid "SSL/TLS certificate"
 msgstr "Certificado SSL/TLS"
 
-#: ../libbalsa/libbalsa.c:578
+#: ../libbalsa/libbalsa.c:560
 msgid "_Accept Once"
 msgstr "_Aceptar una vez"
 
-#: ../libbalsa/libbalsa.c:579
+#: ../libbalsa/libbalsa.c:561
 msgid "Accept&_Save"
 msgstr "Acepta_r y guardar"
 
 # src/sendmsg-window.c:224
 # src/sendmsg-window.c:228
-#: ../libbalsa/libbalsa.c:580
+#: ../libbalsa/libbalsa.c:562
 msgid "_Reject"
 msgstr "_Rechazar"
 
-#: ../libbalsa/libbalsa.c:626
+#: ../libbalsa/libbalsa.c:609
 #, c-format
 msgid "Connection to %s timed out. Abort?"
 msgstr "Se agotó el tiempo de conexión para %s. ¿Abortar?"
 
-#: ../libbalsa/libbalsa.c:872
+#: ../libbalsa/libbalsa.c:766
 #, 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:916
+#: ../libbalsa/libbalsa.c:800
 #, c-format
 msgid "Invalid input format"
 msgstr "Formato de entrada inválido"
 
-#: ../libbalsa/libbalsa.c:920
+#: ../libbalsa/libbalsa.c:804
 #, c-format
 msgid "Internal buffer overrun"
 msgstr "Sobrepasado el búfer interno"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/libbalsa.c:937
+#: ../libbalsa/libbalsa.c:821
 #, c-format
 msgid "Bad X-Face data"
 msgstr "Datos X-Face erróneos"
 
 # libbalsa/mailbox.c:262
 # libbalsa/mailbox.c:275
-#: ../libbalsa/mailbox.c:522
+#: ../libbalsa/mailbox.c:506
 #, c-format
 msgid "Cannot load mailbox %s"
 msgstr "No se puede cargar el buzón %s"
 
 # libbalsa/mailbox.c:268
 # libbalsa/mailbox.c:282
-#: ../libbalsa/mailbox.c:529
+#: ../libbalsa/mailbox.c:513
 #, c-format
 msgid "No such mailbox type: %s"
 msgstr "No existe ese tipo de buzón: %s"
 
 # libbalsa/mailbox.c:262
 # libbalsa/mailbox.c:275
-#: ../libbalsa/mailbox.c:546
+#: ../libbalsa/mailbox.c:530
 #, c-format
 msgid "Bad local mailbox path \"%s\""
 msgstr "Ruta errónea al buzón local «%s»"
 
 # libbalsa/mailbox.c:275
 # libbalsa/mailbox.c:290
-#: ../libbalsa/mailbox.c:551
+#: ../libbalsa/mailbox.c:535
 #, c-format
 msgid "Could not create a mailbox of type %s"
 msgstr "No se pudo crear un buzón del tipo %s"
 
-#: ../libbalsa/mailbox.c:874
+#: ../libbalsa/mailbox.c:864
 #, c-format
 msgid "Applying filter rules to %s"
 msgstr "Aplicando reglas de filtrado a: %s"
@@ -946,44 +1304,44 @@ msgstr "Aplicando reglas de filtrado a: %s"
 msgid "Copying from %s to %s"
 msgstr "Copiando de %s a %s"
 
-#: ../libbalsa/mailbox.c:1936
+#: ../libbalsa/mailbox.c:1959
 #, 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:2146
+#: ../libbalsa/mailbox.c:2164
 #, 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:3019
+#: ../libbalsa/mailbox.c:2991
 msgid "from unknown"
 msgstr "desde desconocido"
 
 # src/main-window.c:177
 # src/main-window.c:184
-#: ../libbalsa/mailbox.c:3021
+#: ../libbalsa/mailbox.c:2993
 msgid "Loading..."
 msgstr "Cargando…"
 
-#: ../libbalsa/mailbox.c:3991
+#: ../libbalsa/mailbox.c:3962
 #, 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:4081
+#: ../libbalsa/mailbox.c:4052
 msgid "Reconstructing message"
 msgstr "Reconstruyendo el mensaje"
 
 # src/main-window.c:403
 # src/main-window.c:406
-#: ../libbalsa/mailbox.c:4350
+#: ../libbalsa/mailbox.c:4312
 #, 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"
@@ -991,40 +1349,40 @@ msgstr "Ha fallado la búsqueda de mensajes duplicados en el buzón de origen"
 #. ImapIssue macro handles reconnecting. We might issue a
 #. LIBBALSA_INFORMATION_MESSAGE here but it would be overwritten by
 #. login information...
-#: ../libbalsa/mailbox_imap.c:619
+#: ../libbalsa/mailbox_imap.c:615
 msgid "IMAP connection has been severed. Reconnecting..."
 msgstr "La conexión IMAP se ha cortado. Re-conectando…"
 
-#: ../libbalsa/mailbox_imap.c:622
+#: ../libbalsa/mailbox_imap.c:618
 msgid "IMAP protocol error. Try enabling bug workarounds."
 msgstr ""
 "Error del protocolo IMAP. Intente activar las soluciones de errores "
 "alternativas."
 
-#: ../libbalsa/mailbox_imap.c:625
+#: ../libbalsa/mailbox_imap.c:621
 #, c-format
 msgid "IMAP server has shut the connection: %s Reconnecting..."
 msgstr "El servidor IMAP ha terminado la conexión: %s re-conectando…"
 
-#: ../libbalsa/mailbox_imap.c:637
+#: ../libbalsa/mailbox_imap.c:633
 #, c-format
 msgid "Async IMAP cmd %s could not be executed. Reconnecting..."
 msgstr "El comando IMAP asíncrono %s no se pudo ejecutar. Reconectando…"
 
 # libbalsa/mailbox_pop3.c:184
 # libbalsa/mailbox_pop3.c:198
-#: ../libbalsa/mailbox_imap.c:1126 ../libbalsa/mailbox_maildir.c:511
-#: ../libbalsa/mailbox_mbox.c:750 ../libbalsa/mailbox_mh.c:547
+#: ../libbalsa/mailbox_imap.c:1124 ../libbalsa/mailbox_maildir.c:505
+#: ../libbalsa/mailbox_mbox.c:739 ../libbalsa/mailbox_mh.c:541
 #, c-format
 msgid "%s: Opening %s Refcount: %d\n"
 msgstr "%s: Abriendo %s Conteo de ref: %d\n"
 
-#: ../libbalsa/mailbox_imap.c:1213
+#: ../libbalsa/mailbox_imap.c:1211
 #, c-format
 msgid "Downloading %ld kB"
 msgstr "Descargando %ld KiB"
 
-#: ../libbalsa/mailbox_imap.c:1612
+#: ../libbalsa/mailbox_imap.c:1610
 #, c-format
 msgid ""
 "IMAP SEARCH command failed for mailbox %s\n"
@@ -1033,125 +1391,121 @@ msgstr ""
 "El comando IMAP SEARCH falló para el buzón %s \n"
 "volviendo al método de búsqueda predeterminado"
 
-#: ../libbalsa/mailbox_imap.c:1672
+#: ../libbalsa/mailbox_imap.c:1670
 #, 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:1800 ../libbalsa/mailbox_imap.c:1841
+#: ../libbalsa/mailbox_imap.c:1798 ../libbalsa/mailbox_imap.c:1839
 #, c-format
 msgid "Cannot get IMAP handle"
 msgstr "No se encontró el manejador de IMAP"
 
-#: ../libbalsa/mailbox_imap.c:2445 ../libbalsa/mailbox_imap.c:2511
+#: ../libbalsa/mailbox_imap.c:2443 ../libbalsa/mailbox_imap.c:2509
 #, c-format
 msgid "Error fetching message from IMAP server: %s"
 msgstr "Error al bajar un mensaje del servidor IMAP: %s"
 
-#: ../libbalsa/mailbox_imap.c:2479
+#: ../libbalsa/mailbox_imap.c:2477
 #, c-format
 msgid "Downloading %u kB"
 msgstr "Descargando %u KiB"
 
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
-#: ../libbalsa/mailbox_imap.c:2523
+#: ../libbalsa/mailbox_imap.c:2521
 #, 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:2543
+#: ../libbalsa/mailbox_imap.c:2541
 #, c-format
 msgid "Cannot write to temporary file %s"
 msgstr "No se pudo escribir en el archivo temporal %s"
 
-#: ../libbalsa/mailbox_imap.c:2772
+#: ../libbalsa/mailbox_imap.c:2770 ../libbalsa/mailbox_imap.c:2889
 #, c-format
 msgid "Uploading %ld kB"
 msgstr "Subiendo %ld KiB"
 
-#: ../libbalsa/mailbox_imap.c:2891
-msgid "Uploading %"
-msgstr "Subiendo %"
-
-#: ../libbalsa/mailbox_imap.c:3194
+#: ../libbalsa/mailbox_imap.c:3192
 msgid "Server-side threading not supported."
 msgstr "Los hilos de conversación en el lado del servidor no están soportados."
 
 # libmutt/mbox.c:712
-#: ../libbalsa/mailbox_local.c:543
+#: ../libbalsa/mailbox_local.c:566
 #, c-format
 msgid "Failed to save cache file \"%s\": %s."
 msgstr "Falló al guardar el archivo de caché «%s»: %s."
 
-#: ../libbalsa/mailbox_local.c:575
+#: ../libbalsa/mailbox_local.c:600
 #, c-format
 msgid "Cache file for mailbox %s will be created"
 msgstr "El archivo de caché para el buzón %s será creado"
 
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
-#: ../libbalsa/mailbox_local.c:584
+#: ../libbalsa/mailbox_local.c:609
 #, c-format
 msgid "Failed to read cache file %s: %s"
 msgstr "Falló al leer el archivo de caché %s: %s"
 
-#: ../libbalsa/mailbox_local.c:602 ../libbalsa/mailbox_local.c:619
-#: ../libbalsa/mailbox_local.c:643
+#: ../libbalsa/mailbox_local.c:627 ../libbalsa/mailbox_local.c:646
+#: ../libbalsa/mailbox_local.c:670
 #, 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:1169
+#: ../libbalsa/mailbox_local.c:1243
 #, c-format
 msgid "Filtering %s"
 msgstr "Filtrando %s"
 
-#: ../libbalsa/mailbox_local.c:1257
+#: ../libbalsa/mailbox_local.c:1332
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: ../libbalsa/mailbox_local.c:2053
+#: ../libbalsa/mailbox_local.c:2129
 #, 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:2075
+#: ../libbalsa/mailbox_local.c:2151
 #, c-format
 msgid "Failed to sync mailbox \"%s\""
 msgstr "Falló al sincronizar buzón «%s»"
 
 # libinit_balsa/balsa-druid-page-directory.gob:101
 # libinit_balsa/balsa-druid-page-directory.gob:101
-#: ../libbalsa/mailbox_maildir.c:197
+#: ../libbalsa/mailbox_maildir.c:193
 #, c-format
 msgid "Mailbox %s does not appear to be a Maildir mailbox."
 msgstr "El buzón %s aparentemente no es un buzón Maildir válido."
 
 # libbalsa/mailbox.c:275
 # libbalsa/mailbox.c:290
-#: ../libbalsa/mailbox_maildir.c:206
+#: ../libbalsa/mailbox_maildir.c:202
 #, c-format
 msgid "Could not create a MailDir directory at %s (%s)"
 msgstr "No se pudo crear un directorio Maildir en %s (%s)"
 
 # libbalsa/mailbox.c:275
 # libbalsa/mailbox.c:290
-#: ../libbalsa/mailbox_maildir.c:214 ../libbalsa/mailbox_maildir.c:223
-#: ../libbalsa/mailbox_maildir.c:234
+#: ../libbalsa/mailbox_maildir.c:210 ../libbalsa/mailbox_maildir.c:219
+#: ../libbalsa/mailbox_maildir.c:230
 #, c-format
 msgid "Could not create a MailDir at %s (%s)"
 msgstr "No se pudo crear un Maildir en %s (%s)"
 
 # src/sendmsg-window.c:1403
 # src/sendmsg-window.c:1454
-#: ../libbalsa/mailbox_maildir.c:341 ../libbalsa/mailbox_mh.c:294
+#: ../libbalsa/mailbox_maildir.c:337 ../libbalsa/mailbox_mh.c:291
 #, c-format
 msgid ""
 "Could not remove contents of %s:\n"
@@ -1162,8 +1516,8 @@ msgstr ""
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../libbalsa/mailbox_maildir.c:347 ../libbalsa/mailbox_mbox.c:326
-#: ../libbalsa/mailbox_mh.c:300
+#: ../libbalsa/mailbox_maildir.c:343 ../libbalsa/mailbox_mbox.c:316
+#: ../libbalsa/mailbox_mh.c:297
 #, c-format
 msgid ""
 "Could not remove %s:\n"
@@ -1174,167 +1528,167 @@ msgstr ""
 
 # src/pref-manager.c:1087
 # src/pref-manager.c:1218
-#: ../libbalsa/mailbox_maildir.c:490 ../libbalsa/mailbox_mbox.c:694
-#: ../libbalsa/mailbox_mh.c:528
+#: ../libbalsa/mailbox_maildir.c:486 ../libbalsa/mailbox_mbox.c:686
+#: ../libbalsa/mailbox_mh.c:524
 #, c-format
 msgid "Mailbox does not exist."
 msgstr "El buzón no existe."
 
-#: ../libbalsa/mailbox_maildir.c:932 ../libbalsa/mailbox_mbox.c:2031
-#: ../libbalsa/mailbox_mh.c:1110
+#: ../libbalsa/mailbox_maildir.c:926 ../libbalsa/mailbox_mbox.c:1970
+#: ../libbalsa/mailbox_mh.c:1104
 #, c-format
 msgid "Data copy error"
 msgstr "Error al copiar datos"
 
 # libinit_balsa/balsa-druid-page-directory.gob:101
 # libinit_balsa/balsa-druid-page-directory.gob:101
-#: ../libbalsa/mailbox_mbox.c:211
+#: ../libbalsa/mailbox_mbox.c:201
 #, c-format
 msgid "Mailbox %s does not appear to be an Mbox mailbox."
 msgstr "El buzón %s aparentemente no es un buzón Mbox válido."
 
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
-#: ../libbalsa/mailbox_mbox.c:429
+#: ../libbalsa/mailbox_mbox.c:419
 #, c-format
 msgid "Could not write file %s: %s"
 msgstr "No se pudo crear escribir el archivo %s: %s"
 
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
-#: ../libbalsa/mailbox_mbox.c:441
+#: ../libbalsa/mailbox_mbox.c:431
 #, c-format
 msgid "Failed to create temporary file \"%s\": %s"
 msgstr "no se pudo crear el archivo temporal «%s»: %s"
 
-#: ../libbalsa/mailbox_mbox.c:453
+#: ../libbalsa/mailbox_mbox.c:443
 #, c-format
 msgid "Failed to save cache file \"%s\": %s.  New version saved as \"%s\""
 msgstr ""
-"Falló al guardar el archivo de caché «%s»: %s. La nueva versión guadada como «%"
-"s»"
+"Falló al guardar el archivo de caché «%s»: %s. La nueva versión guadada como "
+"«%s»"
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../libbalsa/mailbox_mbox.c:461
+#: ../libbalsa/mailbox_mbox.c:451
 #, c-format
 msgid "Could not unlink file %s: %s"
 msgstr "No se pudo desenlazar el archivo %s: %s"
 
 # libbalsa/mailbox.c:262
 # libbalsa/mailbox.c:275
-#: ../libbalsa/mailbox_mbox.c:702
+#: ../libbalsa/mailbox_mbox.c:694
 #, c-format
 msgid "Cannot open mailbox."
 msgstr "No se puede abrir el buzón."
 
 # src/pref-manager.c:1087
 # src/pref-manager.c:1218
-#: ../libbalsa/mailbox_mbox.c:714
+#: ../libbalsa/mailbox_mbox.c:706
 #, c-format
 msgid "Mailbox is not in mbox format."
 msgstr "El buzón no está en formato mbox."
 
 # libbalsa/mailbox.c:262
 # libbalsa/mailbox.c:275
-#: ../libbalsa/mailbox_mbox.c:722
+#: ../libbalsa/mailbox_mbox.c:714
 #, c-format
 msgid "Cannot lock mailbox."
 msgstr "No se puede bloquear el buzón."
 
 # src/sendmsg-window.c:1403
 # src/sendmsg-window.c:1454
-#: ../libbalsa/mailbox_mbox.c:1988
+#: ../libbalsa/mailbox_mbox.c:1926
 #, c-format
 msgid "%s: could not open %s."
 msgstr "%s: no se pudo abrir  %s."
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../libbalsa/mailbox_mbox.c:1999
+#: ../libbalsa/mailbox_mbox.c:1938
 #, c-format
 msgid "%s: could not get new mime stream."
 msgstr "%s: no se pudo obtener el flujo mime nuevo."
 
 # libmutt/mx.c:459 libmutt/mx.c:605
 # libmutt/mx.c:459 libmutt/mx.c:605
-#: ../libbalsa/mailbox_mbox.c:2007
+#: ../libbalsa/mailbox_mbox.c:1946
 #, c-format
 msgid "%s: %s is not in mbox format."
 msgstr "%s: %s no está en formato mbox."
 
 # libinit_balsa/balsa-druid-page-directory.gob:101
 # libinit_balsa/balsa-druid-page-directory.gob:101
-#: ../libbalsa/mailbox_mh.c:175
+#: ../libbalsa/mailbox_mh.c:172
 #, c-format
 msgid "Mailbox %s does not appear to be a Mh mailbox."
 msgstr "El buzón %s aparentemente no es un buzón Mh válido."
 
 # libbalsa/address-book.c:176
 # libbalsa/address-book.c:186
-#: ../libbalsa/mailbox_mh.c:185
+#: ../libbalsa/mailbox_mh.c:182
 #, c-format
 msgid "Could not create MH directory at %s (%s)"
 msgstr "No se pudo crear un directorio MH en %s (%s)"
 
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
-#: ../libbalsa/mailbox_mh.c:197
+#: ../libbalsa/mailbox_mh.c:194
 #, c-format
 msgid "Could not create MH structure at %s (%s)"
 msgstr "No se pudo crear una estructura MH en %s (%s)"
 
 # libmutt/mx.c:1375
 # libmutt/mx.c:1375
-#: ../libbalsa/mailbox_mh.c:1091
+#: ../libbalsa/mailbox_mh.c:1085
 #, c-format
 msgid "Cannot create message"
 msgstr "No se puede crear el mensaje"
 
 # src/main-window.c:421
 # src/main-window.c:428
-#: ../libbalsa/mailbox_mh.c:1135
+#: ../libbalsa/mailbox_mh.c:1129
 #, c-format
 msgid "Message rename error"
 msgstr "Error al renombrar el mensaje"
 
-#: ../libbalsa/mailbox_pop3.c:192
+#: ../libbalsa/mailbox_pop3.c:198
 #, c-format
 msgid "Error appending message %d from %s to %s: %s"
 msgstr "Ha ocurrido un error al añadir el mensaje %d de %s a %s: %s"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../libbalsa/mailbox_pop3.c:341
+#: ../libbalsa/mailbox_pop3.c:347
 #, c-format
 msgid "Saving POP message to %s failed"
 msgstr "Ha fallado al guardar el mensaje POP en %s"
 
 # src/pref-manager.c:192
 # src/pref-manager.c:191
-#: ../libbalsa/mailbox_pop3.c:348
+#: ../libbalsa/mailbox_pop3.c:354
 #, c-format
 msgid "Retrieving Message %d of %d"
 msgstr "Descargando mensaje %d de %d"
 
-#: ../libbalsa/mailbox_pop3.c:371
+#: ../libbalsa/mailbox_pop3.c:377
 #, c-format
 msgid "Received %ld kB of %ld"
 msgstr "Se han recibido %ld KiB de %ld"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../libbalsa/mailbox_pop3.c:385
+#: ../libbalsa/mailbox_pop3.c:391
 #, c-format
 msgid "Saving POP message to %s failed."
 msgstr "Ha fallado al guardar el mensaje POP a %s."
 
-#: ../libbalsa/mailbox_pop3.c:395
+#: ../libbalsa/mailbox_pop3.c:401
 #, c-format
 msgid "Transferring POP message to %s failed."
 msgstr "La transferencia del mensaje POP a %s falló."
 
-#: ../libbalsa/mailbox_pop3.c:477
+#: ../libbalsa/mailbox_pop3.c:483
 #, c-format
 msgid ""
 "POP3 mailbox %s temp file error:\n"
@@ -1343,29 +1697,29 @@ msgstr ""
 "Error en el archivo temporal del buzón POP3 %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_pop3.c:502
+#: ../libbalsa/mailbox_pop3.c:508
 #, c-format
 msgid "POP3 mailbox %s error: %s\n"
 msgstr "Error al acceder al buzón POP3 %s:%s\n"
 
-#: ../libbalsa/mailbox_pop3.c:540
+#: ../libbalsa/mailbox_pop3.c:546
 #, c-format
 msgid "POP3 message %d oversized: %d kB - skipped."
 msgstr "El mensaje POP3 %d sobrepasa el tamaño: %d KiB - se salta."
 
-#: ../libbalsa/mailbox_pop3.c:552
+#: ../libbalsa/mailbox_pop3.c:558
 #, c-format
 msgid "POP3 error: cannot open %s for writing."
 msgstr "Error POP3: no se puede abrir %s para escritura."
 
-#: ../libbalsa/mailbox_pop3.c:560
+#: ../libbalsa/mailbox_pop3.c:566
 #, c-format
 msgid "POP3 error: cannot close %s."
 msgstr "Error POP3: no se puede cerrar %s."
 
 # libmutt/imap/imap_ssl.c:481
 # libmutt/imap/imap_ssl.c:481
-#: ../libbalsa/mailbox_pop3.c:595
+#: ../libbalsa/mailbox_pop3.c:601
 #, c-format
 msgid "POP3 error: %s."
 msgstr "Error POP3: %s."
@@ -1376,124 +1730,124 @@ msgid "Mailbox (%s) is readonly: cannot change flags."
 msgstr ""
 "El buzón de origen (%s) es de sólo lectura. No se pueden cambiar las marcas."
 
-#: ../libbalsa/misc.c:598
+#: ../libbalsa/misc.c:596
 msgid "west european"
 msgstr "europeo occidental"
 
-#: ../libbalsa/misc.c:600 ../libbalsa/misc.c:634
+#: ../libbalsa/misc.c:598 ../libbalsa/misc.c:632
 msgid "east european"
 msgstr "europeo oriental"
 
-#: ../libbalsa/misc.c:602
+#: ../libbalsa/misc.c:600
 msgid "south european"
 msgstr "europeo del sur"
 
-#: ../libbalsa/misc.c:604
+#: ../libbalsa/misc.c:602
 msgid "north european"
 msgstr "europeo del norte"
 
-#: ../libbalsa/misc.c:606 ../libbalsa/misc.c:636
+#: ../libbalsa/misc.c:604 ../libbalsa/misc.c:634
 msgid "cyrillic"
 msgstr "cirílico"
 
-#: ../libbalsa/misc.c:608 ../libbalsa/misc.c:642
+#: ../libbalsa/misc.c:606 ../libbalsa/misc.c:640
 msgid "arabic"
 msgstr "árabe"
 
-#: ../libbalsa/misc.c:610 ../libbalsa/misc.c:638
+#: ../libbalsa/misc.c:608 ../libbalsa/misc.c:636
 msgid "greek"
 msgstr "griego"
 
-#: ../libbalsa/misc.c:612 ../libbalsa/misc.c:640
+#: ../libbalsa/misc.c:610 ../libbalsa/misc.c:638
 msgid "hebrew"
 msgstr "hebreo"
 
-#: ../libbalsa/misc.c:614
+#: ../libbalsa/misc.c:612
 msgid "turkish"
 msgstr "turco"
 
-#: ../libbalsa/misc.c:616
+#: ../libbalsa/misc.c:614
 msgid "nordic"
 msgstr "nórdico"
 
-#: ../libbalsa/misc.c:618
+#: ../libbalsa/misc.c:616
 msgid "thai"
 msgstr "tailandés"
 
-#: ../libbalsa/misc.c:620 ../libbalsa/misc.c:644
+#: ../libbalsa/misc.c:618 ../libbalsa/misc.c:642
 msgid "baltic"
 msgstr "báltico"
 
-#: ../libbalsa/misc.c:622
+#: ../libbalsa/misc.c:620
 msgid "celtic"
 msgstr "celta"
 
-#: ../libbalsa/misc.c:624
+#: ../libbalsa/misc.c:622
 msgid "west europe (euro)"
 msgstr "europeo occidental (euro)"
 
-#: ../libbalsa/misc.c:626
+#: ../libbalsa/misc.c:624
 msgid "russian"
 msgstr "ruso"
 
-#: ../libbalsa/misc.c:628
+#: ../libbalsa/misc.c:626
 msgid "ukrainian"
 msgstr "ucraniano"
 
-#: ../libbalsa/misc.c:630
+#: ../libbalsa/misc.c:628
 msgid "japanese"
 msgstr "japonés"
 
-#: ../libbalsa/misc.c:632
+#: ../libbalsa/misc.c:630
 msgid "korean"
 msgstr "coreano"
 
 # libmutt/mbox.c:1028
-#: ../libbalsa/misc.c:806
+#: ../libbalsa/misc.c:823
 #, c-format
 msgid "Cannot open %s: %s"
 msgstr "No se pudo abrir %s: %s"
 
-#: ../libbalsa/misc.c:815
+#: ../libbalsa/misc.c:832
 #, 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:942
+#: ../libbalsa/misc.c:959
 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:949
+#: ../libbalsa/misc.c:966
 #, 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:977
+#: ../libbalsa/misc.c:994
 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:984
+#: ../libbalsa/misc.c:1001
 #, c-format
 msgid "Waiting for flock attempt... %d"
 msgstr "Esperando para intentar el bloqueo flock… %d"
 
-#: ../libbalsa/misc.c:1265
+#: ../libbalsa/misc.c:1283
 #, c-format
 msgid "LDAP Directory for %s"
 msgstr "Directorio LDAP para %s"
 
 # libmutt/imap/imap_ssl.c:254
 # libmutt/imap/imap_ssl.c:254
-#: ../libbalsa/rfc2445.c:90 ../libbalsa/rfc2445.c:685
-#: ../libbalsa/rfc2445.c:704 ../libbalsa/rfc3156.c:1394
+#: ../libbalsa/rfc2445.c:90 ../libbalsa/rfc2445.c:699
+#: ../libbalsa/rfc2445.c:718 ../libbalsa/rfc3156.c:720
 msgid "unknown"
 msgstr "desconocido"
 
@@ -1533,127 +1887,59 @@ msgstr "en proceso"
 
 # src/filter-edit-dialog.c:626
 # src/filter-edit-dialog.c:538
-#: ../libbalsa/rfc2445.c:686
+#: ../libbalsa/rfc2445.c:700
 msgid "Event Notification"
 msgstr "Notificación de acontecimiento"
 
-#: ../libbalsa/rfc2445.c:687
+#: ../libbalsa/rfc2445.c:701
 msgid "Event Request"
 msgstr "Petición de acontecimiento"
 
-#: ../libbalsa/rfc2445.c:688
+#: ../libbalsa/rfc2445.c:702
 msgid "Reply to Event Request"
 msgstr "Responder a la petición de acontecimiento"
 
-#: ../libbalsa/rfc2445.c:689
+#: ../libbalsa/rfc2445.c:703
 msgid "Event Cancellation"
 msgstr "Cancelación de acontecimiento"
 
-#: ../libbalsa/rfc2445.c:705
+#: ../libbalsa/rfc2445.c:719
 msgid "chair"
 msgstr "presidencia"
 
-#: ../libbalsa/rfc2445.c:706
+#: ../libbalsa/rfc2445.c:720
 msgid "required participant"
 msgstr "participante necesario"
 
-#: ../libbalsa/rfc2445.c:707
+#: ../libbalsa/rfc2445.c:721
 msgid "optional participant"
 msgstr "participante opcional"
 
-#: ../libbalsa/rfc2445.c:708
+#: ../libbalsa/rfc2445.c:722
 msgid "non-participant, information only"
 msgstr "no participante, sólo para información"
 
-#: ../libbalsa/rfc3156.c:95
-#, c-format
-msgid "Gpgme has been compiled without support for protocol %s."
-msgstr "Gpgme ha sido compilado sin soporte para el protocolo %s."
-
-#: ../libbalsa/rfc3156.c:100
-#, c-format
-msgid "Crypto engine %s is not installed properly."
-msgstr "El motor criptográfico %s no está instalado apropiadamente."
-
-#: ../libbalsa/rfc3156.c:104
-#, c-format
-msgid " Hint: check the `gnupg2' (preferred) or `gnupg' package."
-msgstr " Consejo: comprobar el paquete «gnupg2» (preferido) o «gnupg»."
-
-#: ../libbalsa/rfc3156.c:107
-#, c-format
-msgid " Hint: check the `gpgsm' package."
-msgstr " Consejo: comprobar el paquete «gpgsm»."
-
-#: ../libbalsa/rfc3156.c:111
-#, c-format
-msgid ""
-"Crypto engine %s version %s is installed, but at least version %s is "
-"required."
-msgstr ""
-"El motor criptográfico %s versión %s está instalado, pero al menos se "
-"requiere la versión %s."
-
-#: ../libbalsa/rfc3156.c:118
-#, c-format
-msgid "Unknown problem with engine for protocol %s."
-msgstr "Problema desconocido con el motor para el protocolo %s."
-
-# src/balsa-message.c:301
-# src/balsa-message.c:331
-#: ../libbalsa/rfc3156.c:123
-#, c-format
-msgid "%s: could not retrieve crypto engine information: %s."
-msgstr "%s: no se pudo obtener la información del motor criptográfico: %s."
-
-#: ../libbalsa/rfc3156.c:127
-#, c-format
-msgid ""
-"\n"
-"Disable support for protocol %s."
-msgstr ""
-"\n"
-"Desactivar soporte para el protocolo %s."
-
-#: ../libbalsa/rfc3156.c:355 ../libbalsa/rfc3156.c:864
-msgid "Enter passphrase to unlock the secret key for signing"
-msgstr ""
-"Introduzca la frase de paso para desbloquear la clave secreta para firmar"
-
-# src/balsa-message.c:1316
-# src/balsa-message.c:1474
-#: ../libbalsa/rfc3156.c:603 ../libbalsa/rfc3156.c:608
-#: ../libbalsa/rfc3156.c:725 ../libbalsa/rfc3156.c:730
-#: ../libbalsa/rfc3156.c:940 ../libbalsa/rfc3156.c:945
-#: ../libbalsa/rfc3156.c:1034 ../libbalsa/rfc3156.c:1039
-msgid "creating a gpgme context failed"
-msgstr "la creación de un contexto gpgme ha fallado"
-
-#: ../libbalsa/rfc3156.c:744 ../libbalsa/rfc3156.c:1052
-msgid "Enter passphrase to decrypt message"
-msgstr "Introduzca la frase de paso para descifrar el mensaje"
-
-#: ../libbalsa/rfc3156.c:1061 ../libbalsa/rfc3156.c:1068
+#: ../libbalsa/rfc3156.c:626 ../libbalsa/rfc3156.c:633
 msgid "decryption and signature verification failed"
 msgstr "la verificación de la firma y el descifrado han fallado"
 
 # libmutt/imap/imap_ssl.c:472
 # libmutt/imap/imap_ssl.c:472
-#: ../libbalsa/rfc3156.c:1103
+#: ../libbalsa/rfc3156.c:659
 msgid "The signature is valid."
 msgstr "La firma es válida."
 
-#: ../libbalsa/rfc3156.c:1105
+#: ../libbalsa/rfc3156.c:661
 msgid "The signature is valid but expired."
 msgstr "La firma es válida pero caducó."
 
-#: ../libbalsa/rfc3156.c:1108
+#: ../libbalsa/rfc3156.c:664
 msgid ""
 "The signature is valid but the key used to verify the signature has expired."
 msgstr ""
 "La firma es válida pero la clave usada para verificar la firma ha caducado."
 
-#: ../libbalsa/rfc3156.c:1111
+#: ../libbalsa/rfc3156.c:667
 msgid ""
 "The signature is valid but the key used to verify the signature has been "
 "revoked."
@@ -1663,146 +1949,176 @@ msgstr ""
 
 # libmutt/imap/imap_ssl.c:472
 # libmutt/imap/imap_ssl.c:472
-#: ../libbalsa/rfc3156.c:1114
+#: ../libbalsa/rfc3156.c:670
 msgid "The signature is invalid."
 msgstr "La firma es inválida."
 
-#: ../libbalsa/rfc3156.c:1117
+#: ../libbalsa/rfc3156.c:673
 msgid "The signature could not be verified due to a missing key."
 msgstr "La firma no pudo ser verificada debido a una clave perdida."
 
-#: ../libbalsa/rfc3156.c:1119
+#: ../libbalsa/rfc3156.c:675
 msgid "This part is not a real PGP signature."
 msgstr "Esta parte no es una firma PGP real."
 
-#: ../libbalsa/rfc3156.c:1122
+#: ../libbalsa/rfc3156.c:678
 msgid "The signature could not be verified due to an invalid crypto engine."
 msgstr ""
 "La firma no pudo ser verificada debido a un motor criptográfico inválido."
 
-#: ../libbalsa/rfc3156.c:1125 ../libbalsa/rfc3156.c:1891
+#: ../libbalsa/rfc3156.c:681 ../libbalsa/rfc3156.c:1048
 msgid "GnuPG is rebuilding the trust database and is currently unavailable."
 msgstr ""
 "GnuPG está reconstruyendo la base de datos de confianza y actualmente no "
 "está disponible."
 
-#: ../libbalsa/rfc3156.c:1128
+#: ../libbalsa/rfc3156.c:687
 msgid "An error prevented the signature verification."
 msgstr "Un error impidió la verificación de la firma."
 
-#: ../libbalsa/rfc3156.c:1136
+#: ../libbalsa/rfc3156.c:698
 msgid "The user ID is of unknown validity."
 msgstr "El ID de usuario es de validez desconocida."
 
-#: ../libbalsa/rfc3156.c:1138
+#: ../libbalsa/rfc3156.c:700
 msgid "The validity of the user ID is undefined."
 msgstr "La validez del ID de usuario está indefinida."
 
-#: ../libbalsa/rfc3156.c:1140
+#: ../libbalsa/rfc3156.c:702
 msgid "The user ID is never valid."
 msgstr "El ID de usuario no es válido."
 
-#: ../libbalsa/rfc3156.c:1142
+#: ../libbalsa/rfc3156.c:704
 msgid "The user ID is marginally valid."
 msgstr "El ID de usuario es marginalmente válido."
 
-#: ../libbalsa/rfc3156.c:1144
+#: ../libbalsa/rfc3156.c:706
 msgid "The user ID is fully valid."
 msgstr "El ID de usuario es completamente válido."
 
-#: ../libbalsa/rfc3156.c:1146
+#: ../libbalsa/rfc3156.c:708
 msgid "The user ID is ultimately valid."
 msgstr "El ID de usuario es en todo caso válido."
 
-#: ../libbalsa/rfc3156.c:1148 ../libbalsa/rfc3156.c:1406
+#: ../libbalsa/rfc3156.c:710 ../libbalsa/rfc3156.c:732
 msgid "bad validity"
 msgstr "mala validez"
 
+#: ../libbalsa/rfc3156.c:722
+msgid "undefined"
+msgstr "indefinida"
+
+# src/pref-manager.c:194
+# src/pref-manager.c:193
+#: ../libbalsa/rfc3156.c:724 ../libbalsa/rfc3156.c:759
+#: ../src/address-book-config.c:197
+msgid "never"
+msgstr "nunca"
+
+#: ../libbalsa/rfc3156.c:726
+msgid "marginal"
+msgstr "marginal"
+
+#: ../libbalsa/rfc3156.c:728
+msgid "full"
+msgstr "total"
+
+#: ../libbalsa/rfc3156.c:730
+msgid "ultimate"
+msgstr "última"
+
 # src/pref-manager.c:237 src/pref-manager.c:949 src/pref-manager.c:1027
 # src/pref-manager.c:1838
-#: ../libbalsa/rfc3156.c:1156
+#: ../libbalsa/rfc3156.c:742
 msgid "PGP signature: "
 msgstr "Firma PGP: "
 
 # src/pref-manager.c:237 src/pref-manager.c:949 src/pref-manager.c:1027
 # src/pref-manager.c:1838
-#: ../libbalsa/rfc3156.c:1158
+#: ../libbalsa/rfc3156.c:744
 msgid "S/MIME signature: "
 msgstr "Firma S/MIME: "
 
-#: ../libbalsa/rfc3156.c:1160
+#: ../libbalsa/rfc3156.c:746
 msgid "(unknown protocol) "
 msgstr "(protocolo desconocido)"
 
-#: ../libbalsa/rfc3156.c:1187
-#, c-format
+#: ../libbalsa/rfc3156.c:776
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "User ID validity: %s"
 msgid ""
 "\n"
-"User ID: %s"
+"Signature validity: %s"
 msgstr ""
 "\n"
-"ID de usuario: %s"
+"Validez del ID de usuario: %s"
 
-#: ../libbalsa/rfc3156.c:1190
+#: ../libbalsa/rfc3156.c:779
 #, c-format
 msgid ""
 "\n"
-"Signed by: %s"
+"Signed on: %s"
 msgstr ""
 "\n"
-"Firmado por: %s"
+"Firmado el: %s"
 
-# libinit_balsa/balsa-druid-page-user.gob:87
-# libinit_balsa/balsa-druid-page-user.gob:87
-#: ../libbalsa/rfc3156.c:1194
+#: ../libbalsa/rfc3156.c:781
 #, c-format
 msgid ""
 "\n"
-"Mail address: %s"
+"Key owner trust: %s"
 msgstr ""
 "\n"
-"Dirección de correo: %s"
+"Confianza del propietario de la clave: %s"
 
-#: ../libbalsa/rfc3156.c:1196
+# libmutt/imap/imap_ssl.c:481
+# libmutt/imap/imap_ssl.c:481
+#: ../libbalsa/rfc3156.c:785
 #, c-format
 msgid ""
 "\n"
-"Signed on: %s"
+"Key fingerprint: %s"
 msgstr ""
 "\n"
-"Firmado el: %s"
+"Huella de la clave: %s"
 
-#: ../libbalsa/rfc3156.c:1197
-#, c-format
+#: ../libbalsa/rfc3156.c:799
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "User ID: %s"
 msgid ""
 "\n"
-"User ID validity: %s"
+"User ID's:"
 msgstr ""
 "\n"
-"Validez del ID de usuario: %s"
+"ID de usuario: %s"
 
-#: ../libbalsa/rfc3156.c:1201
-#, c-format
+#: ../libbalsa/rfc3156.c:802
+#, fuzzy
+#| msgid "User ID"
 msgid ""
 "\n"
-"Key owner trust: %s"
-msgstr ""
-"\n"
-"Confianza del propietario de la clave: %s"
+"User ID:"
+msgstr "ID del usuario"
 
-# libmutt/imap/imap_ssl.c:481
-# libmutt/imap/imap_ssl.c:481
-#: ../libbalsa/rfc3156.c:1205
-#, c-format
-msgid ""
-"\n"
-"Key fingerprint: %s"
-msgstr ""
-"\n"
-"Huella de la clave: %s"
+#: ../libbalsa/rfc3156.c:813
+#, fuzzy
+#| msgid " revoked"
+msgid " [Revoked]"
+msgstr "revocada"
 
-#. Subkey creation date
-#: ../libbalsa/rfc3156.c:1208
+# libmutt/imap/imap_ssl.c:297
+# libmutt/imap/imap_ssl.c:297
+#: ../libbalsa/rfc3156.c:815
+#, fuzzy
+#| msgid " invalid"
+msgid " [Invalid]"
+msgstr "inválida"
+
+#: ../libbalsa/rfc3156.c:842
 #, c-format
 msgid ""
 "\n"
@@ -1811,8 +2127,7 @@ msgstr ""
 "\n"
 "Subclave creada el: %s"
 
-#. Subkey expiration date
-#: ../libbalsa/rfc3156.c:1210
+#: ../libbalsa/rfc3156.c:844
 #, c-format
 msgid ""
 "\n"
@@ -1821,29 +2136,29 @@ msgstr ""
 "\n"
 "La subclave caduca el: %s"
 
-#: ../libbalsa/rfc3156.c:1218
+#: ../libbalsa/rfc3156.c:853
 msgid " revoked"
 msgstr "revocada"
 
 # src/main-window.c:448
 # src/main-window.c:455
-#: ../libbalsa/rfc3156.c:1223
+#: ../libbalsa/rfc3156.c:858
 msgid " expired"
 msgstr "caducada"
 
-#: ../libbalsa/rfc3156.c:1228
+#: ../libbalsa/rfc3156.c:863
 msgid " disabled"
 msgstr "desactivada"
 
 # libmutt/imap/imap_ssl.c:297
 # libmutt/imap/imap_ssl.c:297
-#: ../libbalsa/rfc3156.c:1233
+#: ../libbalsa/rfc3156.c:868
 msgid " invalid"
 msgstr "inválida"
 
-#. ngettext: string begins with a single space, so no space after
-#. * the colon is correct punctuation (in English).
-#: ../libbalsa/rfc3156.c:1237
+#. ngettext: string begins with a single space, so no space
+#. * after the colon is correct punctuation (in English).
+#: ../libbalsa/rfc3156.c:872
 #, c-format
 msgid ""
 "\n"
@@ -1860,7 +2175,7 @@ msgstr[1] ""
 
 # src/balsa-message.c:718
 # src/balsa-message.c:780
-#: ../libbalsa/rfc3156.c:1246
+#: ../libbalsa/rfc3156.c:884
 #, c-format
 msgid ""
 "\n"
@@ -1869,7 +2184,7 @@ msgstr ""
 "\n"
 "Nombre del emisor: %s"
 
-#: ../libbalsa/rfc3156.c:1250
+#: ../libbalsa/rfc3156.c:888
 #, c-format
 msgid ""
 "\n"
@@ -1878,7 +2193,7 @@ msgstr ""
 "\n"
 "Número de serie del emisor: %s"
 
-#: ../libbalsa/rfc3156.c:1253
+#: ../libbalsa/rfc3156.c:891
 #, c-format
 msgid ""
 "\n"
@@ -1889,12 +2204,12 @@ msgstr ""
 
 # libbalsa/send.c:788
 # libbalsa/send.c:794
-#: ../libbalsa/rfc3156.c:1310
+#: ../libbalsa/rfc3156.c:950
 #, c-format
 msgid "Could not launch %s to query the public key %s."
 msgstr "No se pudo lanzar %s para obtener la clave pública %s."
 
-#: ../libbalsa/rfc3156.c:1360
+#: ../libbalsa/rfc3156.c:1000
 #, c-format
 msgid ""
 "Running %s failed with return value %d:\n"
@@ -1903,7 +2218,7 @@ msgstr ""
 "La ejecución de %s falló con valor de retorno %d:\n"
 "%s"
 
-#: ../libbalsa/rfc3156.c:1367
+#: ../libbalsa/rfc3156.c:1007
 #, c-format
 msgid ""
 "Running %s successful:\n"
@@ -1912,96 +2227,21 @@ msgstr ""
 "Ejecución de %s exitosa:\n"
 "%s"
 
-#: ../libbalsa/rfc3156.c:1396
-msgid "undefined"
-msgstr "indefinida"
-
-# src/pref-manager.c:194
-# src/pref-manager.c:193
-#: ../libbalsa/rfc3156.c:1398 ../src/address-book-config.c:200
-msgid "never"
-msgstr "nunca"
-
-#: ../libbalsa/rfc3156.c:1400
-msgid "marginal"
-msgstr "marginal"
-
-#: ../libbalsa/rfc3156.c:1402
-msgid "full"
-msgstr "total"
-
-#: ../libbalsa/rfc3156.c:1404
-msgid "ultimate"
-msgstr "última"
-
-#: ../libbalsa/rfc3156.c:1467
-msgid "User ID"
-msgstr "ID del usuario"
-
-#: ../libbalsa/rfc3156.c:1467
-msgid "Key ID"
-msgstr "ID de clave"
-
-#: ../libbalsa/rfc3156.c:1467
-msgid "Length"
-msgstr "Longitud"
-
-# src/main-window.c:259
-# src/main-window.c:262
-#: ../libbalsa/rfc3156.c:1467
-msgid "Validity"
-msgstr "Validez"
-
-# src/sendmsg-window.c:191
-# src/sendmsg-window.c:196
-#. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/rfc3156.c:1511
-msgid "Select key"
-msgstr "Seleccione clave"
-
-# src/sendmsg-window.c:166
-# src/sendmsg-window.c:172
-#: ../libbalsa/rfc3156.c:1527
-#, c-format
-msgid "Select the private key for the signer %s"
-msgstr "Seleccione la clave privada para el firmante %s"
-
-# src/balsa-message.c:1316
-# src/balsa-message.c:1474
-#: ../libbalsa/rfc3156.c:1531
-#, c-format
-msgid "Select the public key for the recipient %s"
-msgstr "Seleccione la clave pública para el destinatario %s"
-
-#: ../libbalsa/rfc3156.c:1662
-#, c-format
-msgid "Insufficient trust for recipient %s"
-msgstr "No hay suficiente confianza en el destinatario %s"
-
-#: ../libbalsa/rfc3156.c:1664
-#, c-format
-msgid "The validity of the key with user ID \"%s\" is \"%s\"."
-msgstr "La validez de la clave con ID de usuario «%s» es «%s»."
-
-#: ../libbalsa/rfc3156.c:1675
-msgid "Use this key anyway?"
-msgstr "¿Desea usar esta clave de todos modos?"
-
-#: ../libbalsa/rfc3156.c:1892
+#: ../libbalsa/rfc3156.c:1049
 msgid "Try again later."
 msgstr "Inténtelo más tarde."
 
 # src/pref-manager.c:971
 # src/pref-manager.c:1099
-#: ../libbalsa/send.c:253 ../libbalsa/send.c:260
+#: ../libbalsa/send.c:248 ../libbalsa/send.c:255
 msgid "Sending Mail..."
 msgstr "Enviando correo…"
 
-#: ../libbalsa/send.c:256 ../src/main-window.c:2823
+#: ../libbalsa/send.c:252 ../src/main-window.c:3257
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../libbalsa/send.c:951
+#: ../libbalsa/send.c:961
 #, c-format
 msgid ""
 "Could not send the message to %s:\n"
@@ -2014,12 +2254,12 @@ msgstr ""
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../libbalsa/send.c:997
+#: ../libbalsa/send.c:1007
 #, c-format
 msgid "Saving sent message to %s failed: %s"
 msgstr "Ha fallado al guardar el mensaje %s: %s"
 
-#: ../libbalsa/send.c:1027 ../libbalsa/send.c:1039
+#: ../libbalsa/send.c:1037 ../libbalsa/send.c:1049
 #, c-format
 msgid ""
 "Relaying refused:\n"
@@ -2030,7 +2270,7 @@ msgstr ""
 "%d: %s\n"
 "El mensaje se ha dejado en la bandeja de salida.\n"
 
-#: ../libbalsa/send.c:1046
+#: ../libbalsa/send.c:1056
 msgid ""
 "Message submission problem, placing it into your outbox.\n"
 "System will attempt to resubmit the message until you delete it."
@@ -2040,12 +2280,12 @@ msgstr ""
 
 # libmutt/imap/imap_ssl.c:229
 # libmutt/imap/imap_ssl.c:229
-#: ../libbalsa/send.c:1076
+#: ../libbalsa/send.c:1085
 msgid "Connected to MTA"
 msgstr "Conectado a MTA"
 
 #. status code, mailbox
-#: ../libbalsa/send.c:1085
+#: ../libbalsa/send.c:1094
 #, c-format
 msgid "From: %d <%s>"
 msgstr "De: %d <%s>"
@@ -2053,13 +2293,13 @@ msgstr "De: %d <%s>"
 # src/mailbox-conf.c:485
 # src/mailbox-conf.c:490
 #. mailbox, status code, status text
-#: ../libbalsa/send.c:1089
+#: ../libbalsa/send.c:1098
 #, c-format
 msgid "From %s: %d %s"
 msgstr "De %s: %d %s"
 
 #. status code, mailbox
-#: ../libbalsa/send.c:1100
+#: ../libbalsa/send.c:1109
 #, c-format
 msgid "To: %d <%s>"
 msgstr "Para: %d <%s>"
@@ -2067,16 +2307,16 @@ msgstr "Para: %d <%s>"
 # src/mailbox-conf.c:485
 # src/mailbox-conf.c:490
 #. mailbox, status code, status text
-#: ../libbalsa/send.c:1104
+#: ../libbalsa/send.c:1113
 #, c-format
 msgid "To %s: %d %s"
 msgstr "Para: %s: %d %s"
 
-#: ../libbalsa/send.c:1142
+#: ../libbalsa/send.c:1151
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../libbalsa/send.c:1424
+#: ../libbalsa/send.c:1382
 msgid ""
 "SMTP server refused connection.\n"
 "Check your internet connection."
@@ -2084,7 +2324,7 @@ msgstr ""
 "El servidor SMTP rechazó la conexión.\n"
 "Compruebe su conexión a Internet."
 
-#: ../libbalsa/send.c:1429
+#: ../libbalsa/send.c:1387
 msgid ""
 "SMTP server cannot be reached.\n"
 "Check your internet connection."
@@ -2092,11 +2332,11 @@ msgstr ""
 "El servidor SMTP no se ha podido alcanzar.\n"
 "Compruebe su conexión de Internet."
 
-#: ../libbalsa/send.c:1438
+#: ../libbalsa/send.c:1396
 msgid "Message left in Outbox (try again later)"
 msgstr "El mensaje se dejó en la bandeja de salida (intente más tarde)"
 
-#: ../libbalsa/send.c:1442
+#: ../libbalsa/send.c:1400
 #, c-format
 msgid ""
 "SMTP server problem (%d): %s\n"
@@ -2107,57 +2347,57 @@ msgstr ""
 
 # libmutt/mx.c:1375
 # libmutt/mx.c:1375
-#: ../libbalsa/send.c:1756 ../libbalsa/send.c:1825
+#: ../libbalsa/send.c:1706 ../libbalsa/send.c:1775
 #, 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:1759 ../libbalsa/send.c:1828
+#: ../libbalsa/send.c:1709 ../libbalsa/send.c:1778
 #, c-format
 msgid "Cannot read %s"
 msgstr "No se puede leer %s"
 
-#: ../libbalsa/send.c:1789
+#: ../libbalsa/send.c:1739
 #, c-format
 msgid "Cannot determine charset for text file `%s'; sending as mime type `%s'"
 msgstr ""
 "No puedo determinar el conjunto de caracteres para el archivo de texto «%s»; "
 "enviando como tipo mime «%s»"
 
-#: ../libbalsa/send.c:2141
+#: ../libbalsa/send.c:2114
 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:"
 
-#: ../libbalsa/send.c:2229
+#: ../libbalsa/send.c:2202
 msgid "This message will not be encrypted for the BCC: recipient(s)."
 msgstr "Este mensaje no será cifrado para los destinatarios Cco:"
 
 #. host, authentication method
-#: ../libbalsa/server.c:431
+#: ../libbalsa/server.c:496
 #, c-format
 msgid "Logging in to %s using %s"
 msgstr "Iniciando sesión en %s usando %s"
 
 # src/pref-manager.c:194
 # src/pref-manager.c:193
-#: ../libbalsa/smtp-server.c:388 ../src/mailbox-conf.c:205
-#: ../src/mailbox-conf.c:1494 ../src/pref-manager.c:404
-#: ../src/pref-manager.c:3426
+#: ../libbalsa/smtp-server.c:383 ../src/mailbox-conf.c:205
+#: ../src/mailbox-conf.c:1439 ../src/pref-manager.c:391
+#: ../src/pref-manager.c:3334
 msgid "Never"
 msgstr "Nunca"
 
-#: ../libbalsa/smtp-server.c:389 ../src/mailbox-conf.c:206
-#: ../src/mailbox-conf.c:1495
+#: ../libbalsa/smtp-server.c:385 ../src/mailbox-conf.c:206
+#: ../src/mailbox-conf.c:1440
 msgid "If Possible"
 msgstr "Si es posible"
 
 # src/main-window.c:448
 # src/main-window.c:455
-#: ../libbalsa/smtp-server.c:390 ../src/mailbox-conf.c:207
+#: ../libbalsa/smtp-server.c:387 ../src/mailbox-conf.c:207
 msgid "Required"
 msgstr "Requerido"
 
@@ -2172,7 +2412,7 @@ msgstr "Error al mostrar la ayuda del servidor: %s\n"
 msgid "SMTP Server"
 msgstr "Servidor SMTP"
 
-#: ../libbalsa/smtp-server.c:565
+#: ../libbalsa/smtp-server.c:566
 msgid "_Descriptive Name:"
 msgstr "Nombre _descriptivo:"
 
@@ -2180,126 +2420,62 @@ msgstr "Nombre _descriptivo:"
 # src/mailbox-conf.c:891 src/mailbox-conf.c:949
 #. pop server
 #. imap server
-#: ../libbalsa/smtp-server.c:572 ../src/folder-conf.c:377
-#: ../src/mailbox-conf.c:1226 ../src/mailbox-conf.c:1339
+#: ../libbalsa/smtp-server.c:573 ../src/folder-conf.c:380
+#: ../src/mailbox-conf.c:1188 ../src/mailbox-conf.c:1303
 msgid "_Server:"
 msgstr "_Servidor:"
 
 # src/mailbox-conf.c:822 src/mailbox-conf.c:882
 # src/mailbox-conf.c:899 src/mailbox-conf.c:957
-#: ../libbalsa/smtp-server.c:579
+#: ../libbalsa/smtp-server.c:580
 msgid "_User Name:"
 msgstr " _Usuario:"
 
-#: ../libbalsa/smtp-server.c:586
+#: ../libbalsa/smtp-server.c:587
 msgid "_Pass Phrase:"
 msgstr "Frase de _paso:"
 
-#: ../libbalsa/smtp-server.c:595 ../src/mailbox-conf.c:237
+#: ../libbalsa/smtp-server.c:596 ../src/mailbox-conf.c:227
 msgid "Use _TLS:"
 msgstr "Usar _TLS:"
 
 # libmutt/imap/imap_ssl.c:523
 # libmutt/imap/imap_ssl.c:523
-#: ../libbalsa/smtp-server.c:600
+#: ../libbalsa/smtp-server.c:601
 msgid "C_ertificate Pass Phrase:"
 msgstr "Frase de paso del _certificado:"
 
-#: ../libbalsa/smtp-server.c:612
+#: ../libbalsa/smtp-server.c:613
 msgid "Sp_lit message larger than"
 msgstr "_Partir el mensaje si es mayor de"
 
-#: ../libbalsa/smtp-server.c:618 ../src/pref-manager.c:1918
+#: ../libbalsa/smtp-server.c:618 ../src/pref-manager.c:1897
 msgid "MB"
 msgstr "MiB"
 
-# src/main-window.c:259
-# src/main-window.c:262
-#. Top level
-#. Menus
-#: ../libbalsa/source-viewer.c:46 ../src/ab-main.c:553
-#: ../src/main-window.c:344 ../src/message-window.c:239
-#: ../src/sendmsg-window.c:319
-msgid "_File"
-msgstr "_Archivo"
-
-# src/main-window.c:389
-# src/main-window.c:386
-#: ../libbalsa/source-viewer.c:47 ../src/filter-edit-dialog.c:321
-#: ../src/main-window.c:345 ../src/message-window.c:240
-#: ../src/sendmsg-window.c:320
-msgid "_Edit"
-msgstr "_Editar"
-
-# src/main-window.c:191
-# src/main-window.c:196
-#: ../libbalsa/source-viewer.c:48 ../src/main-window.c:346
-#: ../src/message-window.c:241
-msgid "_View"
-msgstr "_Ver"
-
-# src/main-window.c:399
-# src/main-window.c:401
-#. Items
-#: ../libbalsa/source-viewer.c:50 ../src/mailbox-node.c:1096
-#: ../src/main-window.c:498 ../src/message-window.c:248
-#: ../src/sendmsg-window.c:349
-msgid "_Close"
-msgstr "_Cerrar"
-
-#: ../libbalsa/source-viewer.c:51
-msgid "Close the window"
-msgstr "Cerrar la ventana"
-
-# src/filter-edit-dialog.c:313
-# src/filter-edit-dialog.c:296
-#. Edit menu items
-#: ../libbalsa/source-viewer.c:52 ../src/main-window.c:418
-#: ../src/main-window.c:564 ../src/message-window.c:251
-#: ../src/sendmsg-window.c:357
-msgid "_Copy"
-msgstr "_Copiar"
-
-# src/filter-edit-dialog.c:652
-# src/filter-edit-dialog.c:559
-#: ../libbalsa/source-viewer.c:53
-msgid "Copy text"
-msgstr "Copiar el texto"
-
-# src/sendmsg-window.c:191
-# src/sendmsg-window.c:196
-#: ../libbalsa/source-viewer.c:54 ../src/main-window.c:566
-msgid "_Select Text"
-msgstr "_Seleccionar texto"
-
-# src/pref-manager.c:961
-# src/pref-manager.c:1088
-#: ../libbalsa/source-viewer.c:55 ../src/main-window.c:567
-msgid "Select entire mail"
-msgstr "Selecciona el correo completo"
-
-#: ../libbalsa/source-viewer.c:60
-msgid "_Escape Special Characters"
-msgstr "_Caracteres especiales de escape"
-
-#: ../libbalsa/source-viewer.c:61
-msgid "Escape special and non-ASCII characters"
-msgstr "Escapar caracteres especiales y no ASCII"
-
 # src/pref-manager.c:1087
 # src/pref-manager.c:1218
-#: ../libbalsa/source-viewer.c:159
+#: ../libbalsa/source-viewer.c:130
 msgid "Mailbox closed"
 msgstr "Buzón cerrado"
 
 # src/main-window.c:421
 # src/main-window.c:428
-#: ../libbalsa/source-viewer.c:280
+#: ../libbalsa/source-viewer.c:235
 msgid "Message Source"
 msgstr "Fuente del mensaje"
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
+#: ../libbalsa/source-viewer.c:247 ../src/main-window.c:2062
+#: ../src/message-window.c:847
+#, fuzzy, c-format
+#| msgid "Error loading %s: %s\n"
+msgid "Error adding from %s: %s\n"
+msgstr "Ha ocurrido un error al cargar %s: %s\n"
+
+# src/sendmsg-window.c:1694
+# src/sendmsg-window.c:1749
 #: ../libinit_balsa/assistant_helper.c:68
 #, c-format
 msgid "Error loading %s: %s\n"
@@ -2307,7 +2483,7 @@ msgstr "Ha ocurrido un error al cargar %s: %s\n"
 
 # libinit_balsa/helper.c:142
 # libinit_balsa/helper.c:142
-#: ../libinit_balsa/assistant_helper.c:209
+#: ../libinit_balsa/assistant_helper.c:203
 #, c-format
 msgid "The path %s must be relative to the filesystem root (start with /)."
 msgstr ""
@@ -2316,26 +2492,26 @@ msgstr ""
 
 # libinit_balsa/helper.c:152 libinit_balsa/helper.c:170
 # libinit_balsa/helper.c:152 libinit_balsa/helper.c:170
-#: ../libinit_balsa/assistant_helper.c:221
+#: ../libinit_balsa/assistant_helper.c:215
 #, c-format
 msgid ""
 "Couldn't create a directory: mkdir() failed on pathname \"%s\", with error "
 "\"%s\"."
 msgstr ""
-"No se pudo crear un directorio: mkdir() falló en la ruta «%s», con el error «%"
-"s»."
+"No se pudo crear un directorio: mkdir() falló en la ruta «%s», con el error "
+"«%s»."
 
 # libinit_balsa/helper.c:159 libinit_balsa/helper.c:176
 # libinit_balsa/helper.c:159 libinit_balsa/helper.c:176
-#: ../libinit_balsa/assistant_helper.c:233
-#: ../libinit_balsa/assistant_helper.c:256
+#: ../libinit_balsa/assistant_helper.c:227
+#: ../libinit_balsa/assistant_helper.c:250
 #, c-format
 msgid "The file with pathname \"%s\" is not a directory."
 msgstr "El archivo con la ruta «%s» no es un directorio."
 
 # libinit_balsa/helper.c:152 libinit_balsa/helper.c:170
 # libinit_balsa/helper.c:152 libinit_balsa/helper.c:170
-#: ../libinit_balsa/assistant_helper.c:247
+#: ../libinit_balsa/assistant_helper.c:241
 #, c-format
 msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
 msgstr "No se ha podido crear un directorio: mkdir() falló en la ruta «%s»."
@@ -2348,80 +2524,82 @@ msgid ""
 "Do you really want to do this?"
 msgstr ""
 "Esto le hará salir de Balsa.\n"
-"¿Realmente desea hacer esto?"
+"¿Realmente quiere hacer esto?"
 
 # src/address-book.c:369
 # libinit_balsa/balsa-initdruid.gob:119
-#: ../libinit_balsa/assistant_init.c:74
+#: ../libinit_balsa/assistant_init.c:71
 msgid "GnomeCard Address Book"
 msgstr "Libreta de direcciones GnomeCard"
 
 # src/address-book.c:369
 # src/address-book.c:394
-#: ../libinit_balsa/assistant_init.c:81 ../libinit_balsa/assistant_init.c:89
-#: ../src/ab-window.c:231
+#: ../libinit_balsa/assistant_init.c:78 ../libinit_balsa/assistant_init.c:86
+#: ../src/ab-window.c:235
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
 # libinit_balsa/init_balsa.c:36
 # libinit_balsa/init_balsa.c:36
-#: ../libinit_balsa/assistant_init.c:148
+#: ../libinit_balsa/assistant_init.c:139
 msgid "Configure Balsa"
 msgstr "Configurar Balsa"
 
-#: ../libinit_balsa/assistant_page_defclient.c:59
-msgid "Use balsa as default email client?"
+#: ../libinit_balsa/assistant_page_defclient.c:56
+#, fuzzy
+#| msgid "Use balsa as default email client?"
+msgid "Use Balsa as default email client?"
 msgstr "¿Quiere usar balsa como cliente de correo predeterminado?"
 
-#: ../libinit_balsa/assistant_page_defclient.c:63
+#: ../libinit_balsa/assistant_page_defclient.c:60
 msgid "_Yes"
 msgstr "_Sí"
 
 # src/sendmsg-window.c:222
 # src/sendmsg-window.c:226
-#: ../libinit_balsa/assistant_page_defclient.c:65
+#: ../libinit_balsa/assistant_page_defclient.c:62
 msgid "_No"
 msgstr "_No"
 
 # src/pref-manager.c:1333
 # src/pref-manager.c:1476
-#: ../libinit_balsa/assistant_page_defclient.c:102
+#: ../libinit_balsa/assistant_page_defclient.c:96
 msgid "Default Client"
 msgstr "Cliente predeterminado"
 
 # libinit_balsa/balsa-druid-page-directory.gob:60
 # libinit_balsa/balsa-druid-page-directory.gob:60
-#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/assistant_page_directory.c:50
 msgid "_Inbox:"
 msgstr "_Bandeja de entrada:"
 
 # libinit_balsa/balsa-druid-page-directory.gob:60
 # libinit_balsa/balsa-druid-page-directory.gob:60
-#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/assistant_page_directory.c:50
 msgid "_Outbox:"
 msgstr "Bandeja de _salida:"
 
 # libinit_balsa/balsa-druid-page-directory.gob:60
 # libinit_balsa/balsa-druid-page-directory.gob:60
-#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/assistant_page_directory.c:50
 msgid "_Sentbox:"
 msgstr "_Correo enviado:"
 
 # libinit_balsa/balsa-druid-page-directory.gob:60
 # libinit_balsa/balsa-druid-page-directory.gob:60
-#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/assistant_page_directory.c:50
 msgid "_Draftbox:"
 msgstr "_Borradores:"
 
 # libinit_balsa/balsa-druid-page-directory.gob:60
 # libinit_balsa/balsa-druid-page-directory.gob:60
-#: ../libinit_balsa/assistant_page_directory.c:61
+#: ../libinit_balsa/assistant_page_directory.c:51
 msgid "_Trash:"
 msgstr "_Papelera:"
 
 # libinit_balsa/balsa-druid-page-directory.gob:78
 # libinit_balsa/balsa-druid-page-directory.gob:78
-#: ../libinit_balsa/assistant_page_directory.c:95
+#: ../libinit_balsa/assistant_page_directory.c:85
 #, c-format
 msgid ""
 "The pathname \"%s\" must be specified canonically -- it must start with a "
@@ -2430,41 +2608,61 @@ msgstr ""
 "La ruta «%s» debe ser especificada de modo absoluto -- debe comenzar con un "
 "«/»."
 
+# libbalsa/mailbox.c:275
+# libbalsa/mailbox.c:290
+#: ../libinit_balsa/assistant_page_directory.c:125
+#, fuzzy, c-format
+#| msgid "Could not create a mailbox of type %s"
+msgid "Could not create mailbox at path \"%s\"\n"
+msgstr "No se pudo crear un buzón del tipo %s"
+
 # libinit_balsa/balsa-druid-page-directory.gob:101
 # libinit_balsa/balsa-druid-page-directory.gob:101
-#: ../libinit_balsa/assistant_page_directory.c:161
+#: ../libinit_balsa/assistant_page_directory.c:157
 #, c-format
 msgid "The mailbox \"%s\" does not appear to be valid."
 msgstr "El buzón «%s» aparentemente no es válido."
 
+# libinit_balsa/balsa-druid-page-directory.gob:267
+# libinit_balsa/balsa-druid-page-directory.gob:267
+#: ../libinit_balsa/assistant_page_directory.c:191
+#, fuzzy, c-format
+#| msgid ""
+#| "Problem Creating Mailboxes\n"
+#| "%s"
+msgid ""
+"Problem verifying path \"%s\":\n"
+"%s"
+msgstr ""
+"Problema al crear los buzones\n"
+"%s"
+
+#: ../libinit_balsa/assistant_page_directory.c:224
+#, fuzzy
+#| msgid "Other options"
+msgid "_Verify locations"
+msgstr "Otras opciones"
+
 # libinit_balsa/balsa-druid-page-directory.gob:151
 # libinit_balsa/balsa-druid-page-directory.gob:151
-#: ../libinit_balsa/assistant_page_directory.c:204
+#: ../libinit_balsa/assistant_page_directory.c:258
+#, fuzzy
+#| msgid ""
+#| "Please verify the locations of your default mail files.\n"
+#| "These will be created if necessary."
 msgid ""
-"Please verify the locations of your default mail files.\n"
-"These will be created if necessary."
+"Please verify the locations of your default mail files. These will be "
+"created if necessary."
 msgstr ""
 "Verifique la ubicación predeterminada de sus archivos de correo.\n"
 "Éstos serán creados si es necesario."
 
 # libinit_balsa/balsa-druid-page-directory.gob:194
 # libinit_balsa/balsa-druid-page-directory.gob:194
-#: ../libinit_balsa/assistant_page_directory.c:266
+#: ../libinit_balsa/assistant_page_directory.c:322
 msgid "Mail Files"
 msgstr "Archivos de correo"
 
-# libinit_balsa/balsa-druid-page-directory.gob:267
-# libinit_balsa/balsa-druid-page-directory.gob:267
-#: ../libinit_balsa/assistant_page_directory.c:362
-#: ../libinit_balsa/assistant_page_directory.c:396
-#, c-format
-msgid ""
-"Problem Creating Mailboxes\n"
-"%s"
-msgstr ""
-"Problema al crear los buzones\n"
-"%s"
-
 # libinit_balsa/balsa-druid-page-finish.gob:45
 # libinit_balsa/balsa-druid-page-finish.gob:45
 #: ../libinit_balsa/assistant_page_finish.c:44
@@ -2482,10 +2680,15 @@ msgid "All Done!"
 msgstr "Ya está todo hecho."
 
 #: ../libinit_balsa/assistant_page_user.c:57
+#, fuzzy
+#| msgid ""
+#| "The following settings are also needed (and you can find them later, if "
+#| "need be, in the Email application in the 'Preferences' and 'Identities' "
+#| "commands on the 'Tools' menu)"
 msgid ""
 "The following settings are also needed (and you can find them later, if need "
-"be, in the Email application in the 'Preferences' and 'Identities' commands "
-"on the 'Tools' menu)"
+"be, in the Email application in the 'Preferences' and 'Identities' menu "
+"items)"
 msgstr ""
 "La siguiente configuración también se necesita ( y puede encontrarla más "
 "tarde, si la necesita, en la aplicación de correo electrónico en los "
@@ -2552,25 +2755,25 @@ msgstr "_Recordar  su contraseña:"
 
 # libinit_balsa/balsa-druid-page-user.gob:94
 # libinit_balsa/balsa-druid-page-user.gob:94
-#: ../libinit_balsa/assistant_page_user.c:148
+#: ../libinit_balsa/assistant_page_user.c:147
 msgid "_Local mail directory:"
 msgstr "Directorio de correo _local:"
 
 # libinit_balsa/balsa-druid-page-user.gob:104
 # libinit_balsa/balsa-druid-page-user.gob:104
-#: ../libinit_balsa/assistant_page_user.c:168
+#: ../libinit_balsa/assistant_page_user.c:165
 msgid "User Settings"
 msgstr "Configuración del usuario"
 
 # src/pref-manager.c:234 src/pref-manager.c:867
 # src/pref-manager.c:236 src/pref-manager.c:992
-#: ../libinit_balsa/assistant_page_user.c:290
+#: ../libinit_balsa/assistant_page_user.c:286
 msgid "Default Identity"
 msgstr "Identidad predeterminada"
 
 # libinit_balsa/balsa-druid-page-user.gob:155
 # libinit_balsa/balsa-druid-page-user.gob:156
-#: ../libinit_balsa/assistant_page_user.c:335
+#: ../libinit_balsa/assistant_page_user.c:326
 #, c-format
 msgid ""
 "Local Mail Problem\n"
@@ -2610,213 +2813,108 @@ msgid "Balsa E-mail reader"
 msgstr "Lector de correo Balsa"
 
 #: ../sounds/balsa.soundlist.in.h:2
-msgid "New mail notification"
-msgstr "Llegada de un nuevo mensaje"
-
-#: ../sounds/balsa.soundlist.in.h:3
 msgid "Program startup"
 msgstr "Inicio del programa"
 
+#: ../sounds/balsa.soundlist.in.h:3
+msgid "New mail notification"
+msgstr "Llegada de un nuevo mensaje"
+
 # src/address-book.c:369
 # src/address-book.c:394
-#: ../src/ab-main.c:228 ../src/ab-window.c:691
+#: ../src/ab-main.c:214 ../src/ab-window.c:694
 msgid " address book: "
 msgstr " libreta de direcciones: "
 
-#: ../src/ab-main.c:554
-msgid "_Entry"
-msgstr "_Entrada"
-
-#: ../src/ab-main.c:555 ../src/main-window.c:350
-msgid "_Help"
-msgstr "Ay_uda"
-
-# src/main-window.c:191
-# src/main-window.c:196
-#. new button
-#: ../src/ab-main.c:556 ../src/filter-edit-dialog.c:226
-#: ../src/mailbox-node.c:1061 ../src/main-window.c:352
-#: ../src/main-window.c:586 ../src/main-window.c:595
-msgid "_New"
-msgstr "_Nuevo"
-
-# src/address-book-config.c:240
-# src/address-book-config.c:265
-#: ../src/ab-main.c:557 ../src/address-book-config.c:871
-msgid "VCard Address Book (GnomeCard)"
-msgstr "Libreta de direcciones VCard (GnomeCard)"
-
-#: ../src/ab-main.c:559 ../src/address-book-config.c:877
-msgid "External query (a program)"
-msgstr "Petición externa (un programa)"
-
-# src/address-book-config.c:256
-# src/address-book-config.c:283
-#: ../src/ab-main.c:561 ../src/address-book-config.c:882
-msgid "LDIF Address Book"
-msgstr "Libreta de direcciones LDIF"
-
-# src/address-book-config.c:256
-# src/address-book-config.c:283
-#: ../src/ab-main.c:564 ../src/address-book-config.c:888
-msgid "LDAP Address Book"
-msgstr "Libreta de direcciones LDAP"
-
-# src/address-book.c:369
-# src/address-book.c:394
-#: ../src/ab-main.c:568 ../src/address-book-config.c:510
-#: ../src/address-book-config.c:895
-msgid "GPE Address Book"
-msgstr "Libreta de direcciones GPE"
-
-# src/address-book.c:369
-# src/address-book.c:394
-#: ../src/ab-main.c:572
-msgid "Rubrica Address Book"
-msgstr "Libreta de direcciones de Rubrica"
-
-# src/mblist-window.c:450
-# src/mblist-window.c:473
-#: ../src/ab-main.c:575
-msgid "_Properties"
-msgstr "_Propiedades"
-
-# src/address-book.c:369
-# src/address-book.c:394
-#: ../src/ab-main.c:576
-msgid "Edit address book properties"
-msgstr "Editar las propiedades de la libreta de direcciones"
-
-# src/main-window.c:338
-# src/main-window.c:341
-#: ../src/ab-main.c:577 ../src/balsa-index.c:1911
-#: ../src/filter-edit-dialog.c:232 ../src/mailbox-node.c:1088
-#: ../src/mailbox-node.c:1104 ../src/pref-manager.c:1716
-#: ../src/pref-manager.c:1791 ../src/pref-manager.c:2968
-msgid "_Delete"
-msgstr "_Borrar"
-
-# libbalsa/address-book.c:163
-# libbalsa/address-book.c:170
-#: ../src/ab-main.c:578
-msgid "Delete address book"
-msgstr "Borrar la libreta de direcciones"
-
-#: ../src/ab-main.c:579 ../src/main-window.c:386
-msgid "_Quit"
-msgstr "_Salir"
-
-#: ../src/ab-main.c:579
-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
-#: ../src/ab-main.c:581
-msgid "_New Entry"
-msgstr "Entrada _nueva"
-
-#: ../src/ab-main.c:582
-msgid "Add new entry"
-msgstr "Añadir una nueva entrada"
-
-# src/main-window.c:338
-# src/main-window.c:341
-#: ../src/ab-main.c:583
-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
-#: ../src/ab-main.c:584
-msgid "Delete entry"
-msgstr "Borrar entrada"
-
-#: ../src/ab-main.c:585 ../src/main-window.c:458
-msgid "_About"
-msgstr "Acerca _de"
-
 # src/address-book.c:362 src/filter-edit-dialog.c:135
 # src/address-book.c:387 src/filter-edit-dialog.c:130
-#: ../src/ab-main.c:817
+#: ../src/ab-main.c:746
 msgid "_Name"
 msgstr "_Nombre"
 
 # src/address-book.c:369
 # src/address-book.c:394
-#: ../src/ab-main.c:833
+#: ../src/ab-main.c:762
 msgid "_Address"
 msgstr "_Dirección"
 
+#: ../src/ab-main.c:850 ../src/address-book-config.c:226
+#: ../src/address-book-config.c:327 ../src/filter-edit-dialog.c:500
+#: ../src/main-window.c:4002 ../src/pref-manager.c:507
+msgid "_Apply"
+msgstr ""
+
 # src/main-window.c:259
 # src/main-window.c:262
-#: ../src/ab-main.c:959
+#: ../src/ab-main.c:888
 msgid "F_ilter:"
 msgstr "F_iltro:"
 
 # 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:172 ../src/filter-edit-dialog.c:209
-#: ../src/filter-export-dialog.c:92 ../src/filter-run-dialog.c:223
-#: ../src/filter-run-dialog.c:297
+#: ../src/ab-window.c:176 ../src/filter-edit-dialog.c:209
+#: ../src/filter-export-dialog.c:93 ../src/filter-run-dialog.c:226
+#: ../src/filter-run-dialog.c:331
 msgid "Name"
 msgstr "Nombre"
 
 # src/address-book.c:362
 # src/address-book.c:387
-#: ../src/ab-window.c:180
+#: ../src/ab-window.c:184
 msgid "E-Mail Address"
 msgstr "Correo electrónico"
 
 # src/filter-edit-dialog.c:570
 # src/filter-edit-dialog.c:491
-#. -- table column 1 --
+#. -- grid column 1 --
 #. Entry widget for finding an address
-#: ../src/ab-window.c:281
+#: ../src/ab-window.c:285
 msgid "_Search for Name:"
 msgstr "_Buscar por nombre:"
 
-#: ../src/ab-window.c:316
-msgid "Run Editor"
+#: ../src/ab-window.c:318
+#, fuzzy
+#| msgid "Run Editor"
+msgid "Run _Editor"
 msgstr "Ejecutar editor"
 
 # src/address-book.c:499
 # src/address-book.c:558
-#: ../src/ab-window.c:323
+#: ../src/ab-window.c:324
 msgid "_Re-Import"
 msgstr "_Reimportar"
 
 # src/address-book.c:477
 # src/address-book.c:523
-#. -- table column 3 --
+#. -- grid column 3 --
 #. label for selected addresses in compose mode
-#: ../src/ab-window.c:355
+#: ../src/ab-window.c:358
 msgid "Send-To"
 msgstr "Enviar a"
 
 #. mode switching stuff
-#: ../src/ab-window.c:370
+#: ../src/ab-window.c:372
 msgid "Treat multiple addresses as:"
 msgstr "Tratar múltiples direcciones como:"
 
-#: ../src/ab-window.c:374
+#: ../src/ab-window.c:376
 msgid "alternative addresses for the same person"
 msgstr "direcciones alternativas para la misma persona"
 
-#: ../src/ab-window.c:379
+#: ../src/ab-window.c:381
 msgid "a distribution list"
 msgstr "una lista de distribución"
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../src/ab-window.c:422
+#: ../src/ab-window.c:425
 #, c-format
 msgid "Could not launch %s: %s"
 msgstr "No se pudo lanzar %s: %s"
 
 # libbalsa/send.c:788
 # libbalsa/send.c:794
-#: ../src/ab-window.c:719
+#: ../src/ab-window.c:722
 #, c-format
 msgid ""
 "Error opening address book '%s':\n"
@@ -2829,115 +2927,161 @@ msgstr ""
 msgid "Suggest complete addresses:"
 msgstr "Sugerir completar direcciones:"
 
-#: ../src/address-book-config.c:183
+#: ../src/address-book-config.c:182
 msgid "as I type"
 msgstr "mientras tecleo"
 
-#: ../src/address-book-config.c:192
+#: ../src/address-book-config.c:190
 msgid "when I hit the Escape key"
 msgstr "cuando pulso la tecla Esc"
 
 # src/address-book.c:369
 # src/address-book.c:394
-#: ../src/address-book-config.c:229 ../src/address-book-config.c:331
+#: ../src/address-book-config.c:225 ../src/address-book-config.c:326
 #, c-format
 msgid "Modify %s Address Book"
 msgstr "Modificar la libreta de direcciones %s"
 
 # src/address-book.c:369
 # src/address-book.c:394
-#: ../src/address-book-config.c:233 ../src/address-book-config.c:335
+#: ../src/address-book-config.c:229 ../src/address-book-config.c:329
 #, c-format
 msgid "Add %s Address Book"
 msgstr "Añadir %s libreta de direcciones"
 
+# src/address-book-config.c:427 src/filter-edit-dialog.c:414
+# src/mailbox-conf.c:292 src/mailbox-conf.c:931 src/pref-manager.c:1099
+# src/pref-manager.c:2015
+# 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
+#: ../src/address-book-config.c:230 ../src/address-book-config.c:330
+#: ../src/mailbox-conf.c:554 ../src/pref-manager.c:1698
+#: ../src/pref-manager.c:1771 ../src/pref-manager.c:2871
+msgid "_Add"
+msgstr "_Añadir"
+
 # src/pref-manager.c:1999
 # src/pref-manager.c:2225
 #. mailbox name
 #. may be NULL
 #. mailbox name
-#: ../src/address-book-config.c:253 ../src/address-book-config.c:375
-#: ../src/address-book-config.c:441 ../src/address-book-config.c:508
+#: ../src/address-book-config.c:249 ../src/address-book-config.c:368
+#: ../src/address-book-config.c:434 ../src/address-book-config.c:501
 msgid "A_ddress Book Name:"
 msgstr "Nombre de la libreta de _direcciones:"
 
-#: ../src/address-book-config.c:380
+#: ../src/address-book-config.c:373
 msgid "Load program location:"
 msgstr "Ubicación del programa de carga:"
 
 # libbalsa/address-book.c:163
 # libbalsa/address-book.c:170
-#: ../src/address-book-config.c:386
+#: ../src/address-book-config.c:378
 msgid "Select load program for address book"
 msgstr "Seleccione programa de carga para la libreta de direcciones"
 
-#: ../src/address-book-config.c:393
+#: ../src/address-book-config.c:386
 msgid "Save program location:"
 msgstr "Ubicación del programa de guardado:"
 
-#: ../src/address-book-config.c:399
+#: ../src/address-book-config.c:391
 msgid "Select save program for address book"
 msgstr "Seleccione programa de guardado para la libreta de direcciones"
 
 # src/address-book-config.c:351
 # src/address-book-config.c:381
-#: ../src/address-book-config.c:446
+#: ../src/address-book-config.c:439
 msgid "_Host Name"
 msgstr "Nombre del _anfitrión"
 
 # src/address-book-config.c:364
 # src/address-book-config.c:392
-#: ../src/address-book-config.c:451
+#: ../src/address-book-config.c:444
 msgid "Base Domain _Name"
 msgstr "_Nombre del dominio base"
 
-#: ../src/address-book-config.c:456
+#: ../src/address-book-config.c:449
 msgid "_User Name (Bind DN)"
 msgstr "Nombre de _usuario (Vinculado al ND)"
 
 # src/mailbox-conf.c:827 src/mailbox-conf.c:886
 # src/mailbox-conf.c:904 src/mailbox-conf.c:961
-#: ../src/address-book-config.c:461
+#: ../src/address-book-config.c:454
 msgid "_Password"
 msgstr "_Contraseña"
 
 # src/address-book.c:369
 # src/address-book.c:394
-#: ../src/address-book-config.c:467
+#: ../src/address-book-config.c:460
 msgid "_User Address Book DN"
 msgstr "ND de la libreta de direcciones del _usuario"
 
-#: ../src/address-book-config.c:473
+#: ../src/address-book-config.c:466
 msgid "Enable _TLS"
 msgstr "Activar _TLS"
 
-#: ../src/address-book-config.c:541 ../src/main-window.c:2666
-#: ../src/main-window.c:4426
+# src/address-book.c:369
+# src/address-book.c:394
+#: ../src/address-book-config.c:503 ../src/address-book-config.c:890
+msgid "GPE Address Book"
+msgstr "Libreta de direcciones GPE"
+
+#: ../src/address-book-config.c:536 ../src/main-window.c:940
+#: ../src/main-window.c:4109
 #, c-format
 msgid "Error displaying help: %s\n"
 msgstr "Error al mostrar la ayuda: %s\n"
 
-#: ../src/address-book-config.c:618
+#: ../src/address-book-config.c:613
 msgid "No path found.  Do you want to give one?"
 msgstr "No se ha encontrado una ruta.  ¿Quiere especificar una?"
 
+# src/address-book-config.c:240
+# src/address-book-config.c:265
+#: ../src/address-book-config.c:866
+msgid "VCard Address Book (GnomeCard)"
+msgstr "Libreta de direcciones VCard (GnomeCard)"
+
+#: ../src/address-book-config.c:872
+msgid "External query (a program)"
+msgstr "Petición externa (un programa)"
+
+# src/address-book-config.c:256
+# src/address-book-config.c:283
+#: ../src/address-book-config.c:877
+msgid "LDIF Address Book"
+msgstr "Libreta de direcciones LDIF"
+
+# src/address-book-config.c:256
+# src/address-book-config.c:283
+#: ../src/address-book-config.c:883
+msgid "LDAP Address Book"
+msgstr "Libreta de direcciones LDAP"
+
 # src/address-book.c:369
 # src/address-book.c:394
-#: ../src/address-book-config.c:902
+#: ../src/address-book-config.c:897
 msgid "Rubrica2 Address Book"
 msgstr "Libreta de direcciones de Rubrica2"
 
-#: ../src/balsa-app.c:79 ../src/folder-conf.c:276 ../src/mailbox-conf.c:1320
+#: ../src/balsa-app.c:65 ../src/folder-conf.c:276 ../src/mailbox-conf.c:1281
+#, fuzzy
+#| msgid "_Remember password in keyring"
+msgid "_Remember password in Secret Service"
+msgstr "_Recordar la contraseña en el depósito de claves"
+
+#: ../src/balsa-app.c:68 ../src/folder-conf.c:279 ../src/mailbox-conf.c:1284
 msgid "_Remember password in keyring"
 msgstr "_Recordar la contraseña en el depósito de claves"
 
-#: ../src/balsa-app.c:82 ../src/folder-conf.c:279 ../src/mailbox-conf.c:1323
+#: ../src/balsa-app.c:71 ../src/folder-conf.c:282 ../src/mailbox-conf.c:1287
 msgid "_Remember password"
 msgstr "_Recordar  contraseña"
 
 # src/balsa-app.c:68
 # src/balsa-app.c:72
-#: ../src/balsa-app.c:88
+#: ../src/balsa-app.c:77
 #, c-format
 msgid ""
 "Opening remote mailbox %s.\n"
@@ -2948,145 +3092,131 @@ msgstr ""
 
 # src/balsa-app.c:71
 # src/balsa-app.c:76
-#: ../src/balsa-app.c:93
+#: ../src/balsa-app.c:82
 #, 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:96
+#: ../src/balsa-app.c:85
 msgid "Password needed"
 msgstr "Se necesita contraseña"
 
 # libmutt/mbox.c:1028
-#: ../src/balsa-app.c:551
+#: ../src/balsa-app.c:531
 #, c-format
 msgid "Couldn't open mailbox \"%s\""
 msgstr "No se pudo abrir el buzón «%s»"
 
-# src/balsa-index.c:303
-# src/balsa-index.c:296
-#: ../src/balsa-index.c:359
-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
-#: ../src/balsa-index.c:375 ../src/pref-manager.c:418
-msgid "Subject"
-msgstr "Asunto"
-
 # src/balsa-index.c:305
 # src/balsa-index.c:298
-#: ../src/balsa-index.c:392 ../src/pref-manager.c:419
+#: ../src/balsa-index.c:386 ../src/pref-manager.c:398
 msgid "Date"
 msgstr "Fecha"
 
 # src/filter-edit-dialog.c:45
 # src/filter-edit-dialog.c:44
-#: ../src/balsa-index.c:407 ../src/pref-manager.c:420
-#: ../src/sendmsg-window.c:2996
+#: ../src/balsa-index.c:401 ../src/pref-manager.c:399
+#: ../src/sendmsg-window.c:2674
 msgid "Size"
 msgstr "Tamaño"
 
-# src/balsa-index.c:428
-# src/balsa-index.c:417
-#. FIXME: this is hack!
-#: ../src/balsa-index.c:1055
-msgid "To"
-msgstr "Para"
-
 # src/balsa-index-page.c:495
 # src/balsa-index-page.c:546
-#: ../src/balsa-index.c:1726
+#: ../src/balsa-index.c:1655
 #, 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
-#. Message menu items
-#: ../src/balsa-index.c:1884 ../src/main-window.c:514
-#: ../src/message-window.c:268
+#: ../src/balsa-index.c:1813
 msgid "_Reply..."
 msgstr "_Responder…"
 
 # src/main-window.c:302 src/message-window.c:113
 # src/main-window.c:308
-#: ../src/balsa-index.c:1886
+#: ../src/balsa-index.c:1815
 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:1888
+#: ../src/balsa-index.c:1817
 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:1890
+#: ../src/balsa-index.c:1819
 msgid "_Forward Attached..."
 msgstr "_Reenviar adjunto…"
 
 # src/balsa-index-page.c:486
 # src/balsa-index-page.c:534
-#: ../src/balsa-index.c:1892
+#: ../src/balsa-index.c:1821
 msgid "Forward _Inline..."
 msgstr "Reenviar _en línea…"
 
-#: ../src/balsa-index.c:1894 ../src/main-window.c:541
+#: ../src/balsa-index.c:1823
 msgid "_Pipe through..."
 msgstr "_Filtrar a través de…"
 
 # src/main-window.c:360
 # src/main-window.c:360
-#: ../src/balsa-index.c:1896 ../src/main-window.c:521
+#: ../src/balsa-index.c:1825
 msgid "_Store Address..."
 msgstr "_Almacenar dirección…"
 
+# src/main-window.c:338
+# src/main-window.c:341
+#: ../src/balsa-index.c:1839 ../src/mailbox-node.c:1107
+#: ../src/mailbox-node.c:1123 ../src/pref-manager.c:1703
+#: ../src/pref-manager.c:1778 ../src/pref-manager.c:2878
+msgid "_Delete"
+msgstr "_Eliminar"
+
 # src/main-window.c:345
 # src/main-window.c:347
-#: ../src/balsa-index.c:1916
+#: ../src/balsa-index.c:1843
 msgid "_Undelete"
 msgstr "Rec_uperar"
 
 # src/balsa-index-page.c:495
 # src/balsa-index-page.c:546
-#: ../src/balsa-index.c:1921
+#: ../src/balsa-index.c:1847
 msgid "Move To _Trash"
 msgstr "Mover a la _papelera"
 
-#: ../src/balsa-index.c:1925
+#: ../src/balsa-index.c:1851
 msgid "T_oggle"
 msgstr "_Conmutar"
 
 # src/main-window.c:352
 # src/main-window.c:353
-#. Message:toggle-flag submenu items
-#: ../src/balsa-index.c:1929 ../src/main-window.c:591 ../src/main-window.c:636
+#: ../src/balsa-index.c:1854
 msgid "_Flagged"
 msgstr "_Marcado"
 
 # src/balsa-mblist.c:218
 # src/balsa-mblist.c:218
-#: ../src/balsa-index.c:1932
+#: ../src/balsa-index.c:1857
 msgid "_Unread"
 msgstr "_No leído"
 
 # src/filter-edit-dialog.c:53
 # src/filter-edit-dialog.c:51
-#: ../src/balsa-index.c:1940
+#: ../src/balsa-index.c:1865
 msgid "_Move to"
 msgstr "_Mover a"
 
-#: ../src/balsa-index.c:1948
+#: ../src/balsa-index.c:1872
 msgid "_View Source"
 msgstr "_Ver fuente"
 
 # libmutt/mbox.c:712
-#: ../src/balsa-index.c:2193
+#: ../src/balsa-index.c:2107
 #, c-format
 msgid "Failed to copy %d message to mailbox \"%s\": %s"
 msgid_plural "Failed to copy %d messages to mailbox \"%s\": %s"
@@ -3095,14 +3225,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:2205
+#: ../src/balsa-index.c:2119
 #, 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:2206
+#: ../src/balsa-index.c:2120
 #, c-format
 msgid "Moved to \"%s\"."
 msgstr "Movido a «%s»."
@@ -3111,261 +3241,261 @@ 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:2308
+#: ../src/balsa-index.c:2224
 #, 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:2406
+#: ../src/balsa-index.c:2322
 #, c-format
 msgid "Cannot process the message: %s"
 msgstr "No se puede procesar el mensaje: %s"
 
 # libmutt/mbox.c:712
-#: ../src/balsa-index.c:2529
+#: ../src/balsa-index.c:2446
 #, 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:2556
+#: ../src/balsa-index.c:2473
 #, 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:2720
+#: ../src/balsa-index.c:2640
 msgid "Pipe message through a program"
 msgstr "Filtrar mensajes a través de un programa"
 
-#: ../src/balsa-index.c:2723
+#: ../src/balsa-index.c:2644
 msgid "_Run"
 msgstr "_Ejecutar"
 
-#: ../src/balsa-index.c:2735
+#: ../src/balsa-index.c:2656
 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:357
+#: ../src/balsa-mblist.c:355
 msgid "Mailbox"
 msgstr "Buzón"
 
 # libmutt/mbox.c:712
-#: ../src/balsa-mblist.c:1132 ../src/balsa-mblist.c:1182
+#: ../src/balsa-mblist.c:1136 ../src/balsa-mblist.c:1186
 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:1768
+#: ../src/balsa-mblist.c:1764
 msgid "_Other..."
 msgstr "_Otros…"
 
 # src/filter-edit-dialog.c:53
 # src/filter-edit-dialog.c:51
-#: ../src/balsa-mblist.c:1836
+#: ../src/balsa-mblist.c:1874
 msgid "Choose destination folder"
 msgstr "Elegir carpeta de destino"
 
 # src/main-window.c:259
 # src/main-window.c:262
-#: ../src/balsa-mblist.c:2049
+#: ../src/balsa-mblist.c:2068
 msgid "Other..."
 msgstr "Otros…"
 
 # src/pref-manager.c:237 src/pref-manager.c:949 src/pref-manager.c:1027
 # src/pref-manager.c:1838
-#: ../src/balsa-message.c:303
+#: ../src/balsa-message.c:283
 msgid "Check cryptographic signature"
 msgstr "Comprobar firma criptográfica"
 
-#: ../src/balsa-message.c:324
+#: ../src/balsa-message.c:300
 msgid "Select message part to display"
 msgstr "Seleccionar parte del mensaje a mostrar"
 
-#: ../src/balsa-message.c:411
+#: ../src/balsa-message.c:375
 msgid "Wrapped"
 msgstr "Ajustado"
 
 # src/pref-manager.c:237 src/pref-manager.c:949 src/pref-manager.c:1027
 # src/pref-manager.c:1838
-#: ../src/balsa-message.c:415
+#: ../src/balsa-message.c:379
 msgid "Not found"
 msgstr "No se encontró"
 
-#: ../src/balsa-message.c:604
+#: ../src/balsa-message.c:608
 msgid "Find:"
 msgstr "Buscar:"
 
-#: ../src/balsa-message.c:617 ../src/toolbar-factory.c:142
+#: ../src/balsa-message.c:620 ../src/toolbar-factory.c:151
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../src/balsa-message.c:625 ../src/toolbar-factory.c:143
+#: ../src/balsa-message.c:627 ../src/toolbar-factory.c:152
 msgid "Next"
 msgstr "Siguiente"
 
 # src/main-window.c:444
 # src/main-window.c:451
-#: ../src/balsa-message.c:716
+#: ../src/balsa-message.c:721 ../src/balsa-message.c:724
 msgid "Content"
 msgstr "Contenido"
 
 # src/main-window.c:421
 # src/main-window.c:428
-#: ../src/balsa-message.c:807
+#: ../src/balsa-message.c:817 ../src/balsa-message.c:820
 msgid "Message parts"
 msgstr "Partes del mensaje"
 
 # src/main-window.c:392
 # src/main-window.c:389
-#: ../src/balsa-message.c:986
+#: ../src/balsa-message.c:1013
 msgid "Save selected as..."
 msgstr "Guardar seleccionados como…"
 
 # src/main-window.c:392
 # src/main-window.c:389
-#: ../src/balsa-message.c:993
+#: ../src/balsa-message.c:1020
 msgid "Save selected to folder..."
 msgstr "Guardar seleccionados a carpeta…"
 
 # src/main-window.c:267 src/message-window.c:61
 # src/main-window.c:269
-#: ../src/balsa-message.c:1086
+#: ../src/balsa-message.c:1113
 msgid "(No sender)"
 msgstr "(sin remitente)"
 
 # libmutt/mbox.c:712
-#: ../src/balsa-message.c:1140 ../src/balsa-message.c:1152
+#: ../src/balsa-message.c:1171 ../src/balsa-message.c:1183
 #, c-format
 msgid "Could not access message %u in mailbox \"%s\"."
 msgstr "No se pudo acceder al mensaje %u en el buzón «%s»."
 
 # src/balsa-message.c:725
 # src/balsa-message.c:788
-#: ../src/balsa-message.c:1326
+#: ../src/balsa-message.c:1355
 msgid "mixed parts"
 msgstr "partes mezcladas"
 
 # src/balsa-message.c:725
 # src/balsa-message.c:788
-#: ../src/balsa-message.c:1328
+#: ../src/balsa-message.c:1357
 msgid "alternative parts"
 msgstr "partes alternativas"
 
-#: ../src/balsa-message.c:1330
+#: ../src/balsa-message.c:1359
 msgid "signed parts"
 msgstr "partes firmadas"
 
-#: ../src/balsa-message.c:1332
+#: ../src/balsa-message.c:1361
 msgid "encrypted parts"
 msgstr "partes cifradas"
 
 # src/print.c:471
 # src/print.c:503
-#: ../src/balsa-message.c:1334
+#: ../src/balsa-message.c:1363
 msgid "rfc822 message"
 msgstr "mensaje rfc822"
 
-#: ../src/balsa-message.c:1336
+#: ../src/balsa-message.c:1365
 #, c-format
 msgid "\"%s\" parts"
 msgstr "«%s» partes"
 
-#: ../src/balsa-message.c:1384
+#: ../src/balsa-message.c:1421
 msgid "force inline for all parts"
 msgstr "forzar en línea para todas las partes"
 
-#: ../src/balsa-message.c:1427
+#: ../src/balsa-message.c:1464
 #, c-format
 msgid "rfc822 message (from %s, subject \"%s\")"
 msgstr "mensaje rfc822 (desde %s, asunto «%s»)"
 
 # src/balsa-message.c:651
 # src/balsa-message.c:713
-#: ../src/balsa-message.c:1439
+#: ../src/balsa-message.c:1476
 msgid "complete message"
 msgstr "completar un mensaje"
 
-#: ../src/balsa-message.c:1456
+#: ../src/balsa-message.c:1493
 #, c-format
 msgid "part %s: %s (file %s)"
 msgstr "la parte %s: %s (archivo %s)"
 
 # src/mailbox-conf.c:485
 # src/mailbox-conf.c:490
-#: ../src/balsa-message.c:1467
+#: ../src/balsa-message.c:1504
 #, c-format
 msgid "part %s: %s"
 msgstr "parte %s: %s"
 
-#: ../src/balsa-message.c:1482
+#: ../src/balsa-message.c:1519
 msgid "encrypted: "
 msgstr "cifrado: "
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../src/balsa-message.c:1619
+#: ../src/balsa-message.c:1659
 #, c-format
 msgid "Reading embedded message failed: %s"
 msgstr "Falló al leer el mensaje empotrado: %s"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../src/balsa-message.c:1627
+#: ../src/balsa-message.c:1667
 #, c-format
 msgid "Appending message to %s failed: %s"
 msgstr "Falló al añadir el mensaje a %s: %s"
 
 # src/balsa-message.c:1247
 # src/balsa-message.c:1417
-#: ../src/balsa-message.c:1656
+#: ../src/balsa-message.c:1696
 msgid "_Save..."
 msgstr "_Guardar…"
 
 # src/filter-edit-dialog.c:52
 # src/filter-edit-dialog.c:50
-#: ../src/balsa-message.c:1665 ../src/balsa-mime-widget-message.c:458
+#: ../src/balsa-message.c:1705 ../src/balsa-mime-widget-message.c:443
 msgid "_Copy to folder..."
 msgstr "_Copiar a la carpeta…"
 
-#: ../src/balsa-message.c:1748
+#: ../src/balsa-message.c:1788
 msgid "Select folder for saving selected parts"
 msgstr "Seleccione la carpeta para guardar las partes seleccionadas"
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../src/balsa-message.c:1772
+#: ../src/balsa-message.c:1813
 #, c-format
 msgid "Could not create URI for %s"
 msgstr "No se pudo crear el URI para %s"
 
 # src/main-window.c:421
 # src/main-window.c:428
-#: ../src/balsa-message.c:1797
+#: ../src/balsa-message.c:1838
 #, c-format
 msgid "%s message part"
 msgstr "partes del mensaje %s"
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../src/balsa-message.c:1830 ../src/balsa-mime-widget-callbacks.c:165
+#: ../src/balsa-message.c:1871 ../src/balsa-mime-widget-callbacks.c:166
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "No se pudo guardar %s: %s"
 
 # src/filter-edit-dialog.c:626
 # src/filter-edit-dialog.c:538
-#: ../src/balsa-message.c:2481 ../src/balsa-message.c:2625
+#: ../src/balsa-message.c:2514 ../src/balsa-message.c:2663
 #, c-format
 msgid "Sending the disposition notification failed: %s"
 msgstr "El envío de la notificación de entrega ha fallado: %s"
 
-#: ../src/balsa-message.c:2578
+#: ../src/balsa-message.c:2611
 #, c-format
 msgid ""
 "The sender of this mail, %s, requested \n"
@@ -3377,11 +3507,11 @@ msgstr ""
 
 # src/sendmsg-window.c:1129
 # src/sendmsg-window.c:1180
-#: ../src/balsa-message.c:2588
+#: ../src/balsa-message.c:2621
 msgid "Reply to MDN?"
 msgstr "¿Quiere enviar un MDN?"
 
-#: ../src/balsa-message.c:2799
+#: ../src/balsa-message.c:2839
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once.\n"
@@ -3392,36 +3522,36 @@ msgstr ""
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../src/balsa-message.c:2820 ../src/balsa-message.c:2905
-#: ../src/balsa-message.c:3027
+#: ../src/balsa-message.c:2860 ../src/balsa-message.c:2945
+#: ../src/balsa-message.c:3067
 #, c-format
 msgid "Parsing a message part failed: %s"
 msgstr "Ha fallado al analizar una parte del mensaje: %s"
 
-#: ../src/balsa-message.c:2821 ../src/balsa-message.c:2906
-#: ../src/balsa-message.c:3028
+#: ../src/balsa-message.c:2861 ../src/balsa-message.c:2946
+#: ../src/balsa-message.c:3068
 msgid "Possible disk space problem."
 msgstr "Posible problema de espacio en el disco."
 
-#: ../src/balsa-message.c:2835
+#: ../src/balsa-message.c:2875
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains an encrypted part, but "
 "it's structure is invalid."
 msgstr ""
-"El mensaje enviado por %s con el asunto «%s» contiene una parte cifrada, pero "
-"la estructura es inválida."
+"El mensaje enviado por %s con el asunto «%s» contiene una parte cifrada, "
+"pero la estructura es inválida."
 
-#: ../src/balsa-message.c:2843
+#: ../src/balsa-message.c:2883
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a PGP encrypted part, "
 "but this crypto protocol is not available."
 msgstr ""
-"El mensaje enviado por %s con el asunto «%s» contiene una parte cifrada, pero "
-"este protocolo criptográfico no está disponible."
+"El mensaje enviado por %s con el asunto «%s» contiene una parte cifrada, "
+"pero este protocolo criptográfico no está disponible."
 
-#: ../src/balsa-message.c:2856
+#: ../src/balsa-message.c:2896
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a S/MIME encrypted part, "
@@ -3430,53 +3560,52 @@ msgstr ""
 "El mensaje enviado por %s con el asunto «%s» contiene una parte cifrada S/"
 "MIME, pero este protocolo criptográfico no está disponible."
 
-#: ../src/balsa-message.c:2923
+#: ../src/balsa-message.c:2963
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a signed part, but its "
 "structure is invalid. The signature, if there is any, cannot be checked."
 msgstr ""
-"El mensaje enviado por %s con el asunto «%s» contiene una parte firmada, pero "
-"su estructura es inválida. La firma, si es que hay alguna, no se puede "
+"El mensaje enviado por %s con el asunto «%s» contiene una parte firmada, "
+"pero su estructura es inválida. La firma, si es que hay alguna, no se puede "
 "comprobar."
 
-#: ../src/balsa-message.c:2936
+#: ../src/balsa-message.c:2976
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a %s signed part, but "
 "this crypto protocol is not available."
 msgstr ""
-"El mensaje enviado por %s con el asunto «%s» contiene una parte %s, pero este "
-"protocolo criptográfico no está disponible."
+"El mensaje enviado por %s con el asunto «%s» contiene una parte %s, pero "
+"este protocolo criptográfico no está disponible."
 
-#: ../src/balsa-message.c:2939
+#: ../src/balsa-message.c:2979
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/balsa-message.c:2939 ../src/balsa-mime-widget-crypto.c:74
-#: ../src/print-gtk.c:194
+#: ../src/balsa-message.c:2979 ../src/print-gtk.c:201
 msgid "S/MIME"
 msgstr "S/MIME"
 
 # src/pref-manager.c:237 src/pref-manager.c:949 src/pref-manager.c:1027
 # src/pref-manager.c:1838
-#: ../src/balsa-message.c:2963 ../src/balsa-message.c:3090
+#: ../src/balsa-message.c:3003 ../src/balsa-message.c:3130
 msgid "Detected a good signature"
 msgstr "Se detectó una firma buena"
 
 # src/pref-manager.c:237 src/pref-manager.c:949 src/pref-manager.c:1027
 # src/pref-manager.c:1838
-#: ../src/balsa-message.c:2969
+#: ../src/balsa-message.c:3009
 msgid "Detected a good signature with insufficient validity"
 msgstr "Se detectó una firma buena con validez insuficiente"
 
 # src/pref-manager.c:237 src/pref-manager.c:949 src/pref-manager.c:1027
 # src/pref-manager.c:1838
-#: ../src/balsa-message.c:2974 ../src/balsa-message.c:3094
+#: ../src/balsa-message.c:3014 ../src/balsa-message.c:3134
 msgid "Detected a good signature with insufficient validity/trust"
 msgstr "Se detectó una firma buena con validez/confianza insuficiente"
 
-#: ../src/balsa-message.c:2981 ../src/balsa-message.c:3100
+#: ../src/balsa-message.c:3021 ../src/balsa-message.c:3140
 #, c-format
 msgid ""
 "Checking the signature of the message sent by %s with subject \"%s\" "
@@ -3487,7 +3616,7 @@ msgstr ""
 "devolvió:\n"
 "%s"
 
-#: ../src/balsa-message.c:2993
+#: ../src/balsa-message.c:3033
 #, c-format
 msgid ""
 "Checking the signature of the message sent by %s with subject \"%s\" failed "
@@ -3496,14 +3625,14 @@ msgstr ""
 "La comprobación de la firma del mensaje enviado por %s con el asunto «%s» "
 "falló con un error."
 
-#: ../src/balsa-message.c:3052
+#: ../src/balsa-message.c:3092
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once."
 msgstr ""
 "No se puede descifrar porque este mensaje se está mostrando más de una vez."
 
-#: ../src/balsa-message.c:3054
+#: ../src/balsa-message.c:3094
 msgid ""
 "The signature check and removal of the OpenPGP armor cannot be performed "
 "because this message is displayed more than once."
@@ -3511,13 +3640,13 @@ msgstr ""
 "No se comprobar la firma y eliminar la armadura de OpenPGP porque este "
 "mensaje se está mostrando más de una vez."
 
-#: ../src/balsa-message.c:3057
+#: ../src/balsa-message.c:3097
 msgid "Please close the other instances of this message and try again."
 msgstr "Cierre las otras instancias de este mensaje e inténtelo de nuevo."
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../src/balsa-mime-widget-callbacks.c:54 ../src/sendmsg-window.c:1799
+#: ../src/balsa-mime-widget-callbacks.c:54 ../src/sendmsg-window.c:1449
 #, c-format
 msgid "Could not launch application: %s"
 msgstr "No se pudo lanzar la aplicación: %s"
@@ -3530,173 +3659,163 @@ msgid "Save %s MIME Part"
 msgstr "Guardar parte MIME %s"
 
 # libmutt/mbox.c:1028
-#: ../src/balsa-mime-widget-callbacks.c:123
-#, c-format
-msgid "Could not construct uri from %s"
+#: ../src/balsa-mime-widget-callbacks.c:124
+#, fuzzy, c-format
+#| msgid "Could not construct uri from %s"
+msgid "Could not construct URI from %s"
 msgstr "No se pudo construir la forma URI %s"
 
-#: ../src/balsa-mime-widget-callbacks.c:142
+#: ../src/balsa-mime-widget-callbacks.c:143
 msgid "File already exists. Overwrite?"
 msgstr "El archivo ya existe. ¿Sobreescribir?"
 
 # src/mailbox-conf.c:485
 # src/mailbox-conf.c:490
-#: ../src/balsa-mime-widget-callbacks.c:152
+#: ../src/balsa-mime-widget-callbacks.c:153
 #, c-format
 msgid "Unlink %s: %s"
 msgstr "Desenlazar %s: %s"
 
-#: ../src/balsa-mime-widget-crypto.c:72
-#, c-format
-msgid ""
-"This is an inline %s signed %s message part:\n"
-"%s"
-msgstr ""
-"Esta es una parte del mensaje %s firmada %s:\n"
-"%s"
-
-# src/mblist-window.c:446
-# src/mblist-window.c:469
-#: ../src/balsa-mime-widget-crypto.c:74 ../src/print-gtk.c:194
-msgid "OpenPGP"
-msgstr "OpenPGP"
-
-#: ../src/balsa-mime-widget-crypto.c:92
+#: ../src/balsa-mime-widget-crypto.c:89
 msgid "_Run GnuPG to import this key"
 msgstr "_Ejecutar GnuPG para importar esta clave"
 
-#: ../src/balsa-mime-widget-crypto.c:96
+#: ../src/balsa-mime-widget-crypto.c:93
 msgid "_Run GnuPG to check for an update of this key"
 msgstr "_Ejecutar GnuPG para comprobar actualizaciones sobre esta clave"
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../src/balsa-mime-widget-image.c:54 ../src/balsa-mime-widget-image.c:178
+#: ../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"
 
+# src/main-window.c:421
+# src/main-window.c:428
+#: ../src/balsa-mime-widget-message.c:146 ../src/balsa-print-object.c:113
+#, fuzzy
+#| msgid "Message parts"
+msgid "message headers"
+msgstr "Partes del mensaje"
+
 # src/balsa-message.c:713
 # src/balsa-message.c:775
-#: ../src/balsa-mime-widget-message.c:161
-#: ../src/balsa-mime-widget-message.c:173
-#: ../src/balsa-mime-widget-message.c:201
-#: ../src/balsa-mime-widget-message.c:254
+#: ../src/balsa-mime-widget-message.c:176
+#: ../src/balsa-mime-widget-message.c:188
+#: ../src/balsa-mime-widget-message.c:216
+#: ../src/balsa-mime-widget-message.c:269
 msgid "Content Type: external-body\n"
 msgstr "Tipo de contenido: external-body\n"
 
-#: ../src/balsa-mime-widget-message.c:162
+#: ../src/balsa-mime-widget-message.c:177
 #, c-format
 msgid "Access type: local-file\n"
 msgstr "Tipo de acceso: archivo local\n"
 
 # src/balsa-message.c:718
 # src/balsa-message.c:780
-#: ../src/balsa-mime-widget-message.c:163
-#: ../src/balsa-mime-widget-message.c:209 ../src/balsa-mime-widget.c:233
+#: ../src/balsa-mime-widget-message.c:178
+#: ../src/balsa-mime-widget-message.c:224 ../src/balsa-mime-widget.c:242
 #, c-format
 msgid "File name: %s"
 msgstr "Nombre del archivo: %s"
 
-#: ../src/balsa-mime-widget-message.c:174
+#: ../src/balsa-mime-widget-message.c:189
 #, c-format
 msgid "Access type: URL\n"
 msgstr "Tipo de acceso: URL\n"
 
-#: ../src/balsa-mime-widget-message.c:175
+#: ../src/balsa-mime-widget-message.c:190
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../src/balsa-mime-widget-message.c:202
+#: ../src/balsa-mime-widget-message.c:217
 #, c-format
 msgid "Access type: %s\n"
 msgstr "Tipo de acceso: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:206
+#: ../src/balsa-mime-widget-message.c:221
 #, c-format
 msgid "FTP site: %s\n"
 msgstr "Sitio FTP: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:208
+#: ../src/balsa-mime-widget-message.c:223
 #, c-format
 msgid "Directory: %s\n"
 msgstr "Directorio: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:255
+#: ../src/balsa-mime-widget-message.c:270
 msgid "Access type: mail-server\n"
 msgstr "Tipo de acceso: servidor de correo\n"
 
 # src/pref-manager.c:240
 # src/pref-manager.c:246
-#: ../src/balsa-mime-widget-message.c:256
+#: ../src/balsa-mime-widget-message.c:271
 #, c-format
 msgid "Mail server: %s\n"
 msgstr "Servidor de correo: %s\n"
 
 # 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:258
+#: ../src/balsa-mime-widget-message.c:273
 #, c-format
 msgid "Subject: %s\n"
 msgstr "Asunto: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:275
+#: ../src/balsa-mime-widget-message.c:290
 msgid "Se_nd message to obtain this part"
 msgstr "_Enviar mensaje para obtener esta parte"
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../src/balsa-mime-widget-message.c:296 ../src/balsa-mime-widget-text.c:804
-#: ../src/main-window.c:2684 ../src/sendmsg-window.c:1820
+#: ../src/balsa-mime-widget-message.c:313 ../src/balsa-mime-widget-text.c:802
+#: ../src/sendmsg-window.c:1472
 #, c-format
 msgid "Error showing %s: %s\n"
 msgstr "Error al mostrar %s:%s\n"
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../src/balsa-mime-widget-message.c:331
+#: ../src/balsa-mime-widget-message.c:348
 #, c-format
 msgid "Could not get a part: %s"
 msgstr "No se pudo obtener una parte: %s"
 
-#: ../src/balsa-mime-widget-message.c:363
+#: ../src/balsa-mime-widget-message.c:382
 #, c-format
 msgid "Sending the external body request failed: %s"
 msgstr "El envío del cuerpo externo requerido ha fallado: %s"
 
 # src/main-window.c:295 src/message-window.c:107
 # src/main-window.c:301 src/message-window.c:103
-#: ../src/balsa-mime-widget-message.c:450
+#: ../src/balsa-mime-widget-message.c:435
 msgid "Reply..."
 msgstr "Responder…"
 
-#: ../src/balsa-mime-widget-message.c:555
-msgid "... [truncated]"
-msgstr "... [truncado]"
-
 #. Gmail sometimes fails to do that.
-#: ../src/balsa-mime-widget-message.c:705
+#: ../src/balsa-mime-widget-message.c:714
 msgid "Error:"
 msgstr "Error:"
 
-#: ../src/balsa-mime-widget-message.c:706
+#: ../src/balsa-mime-widget-message.c:715
 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:718
-#: ../src/balsa-print-object-header.c:155 ../src/sendmsg-window.c:1138
-#: ../src/sendmsg-window.c:1140 ../src/sendmsg-window.c:1231
-#: ../src/sendmsg-window.c:3795 ../src/sendmsg-window.c:5702
+#: ../src/balsa-mime-widget-message.c:728
+#: ../src/balsa-print-object-header.c:156 ../src/sendmsg-window.c:748
+#: ../src/sendmsg-window.c:750 ../src/sendmsg-window.c:842
+#: ../src/sendmsg-window.c:3489 ../src/sendmsg-window.c:5010
 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:722
-#: ../src/balsa-print-object-header.c:163 ../src/sendmsg-window.c:3791
+#: ../src/balsa-mime-widget-message.c:733
+#: ../src/balsa-print-object-header.c:164 ../src/sendmsg-window.c:3485
 msgid "Date:"
 msgstr "Fecha:"
 
@@ -3705,117 +3824,158 @@ 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:728
-#: ../src/balsa-print-object-header.c:168 ../src/sendmsg-window.c:3802
-#: ../src/store-address.c:331
+#: ../src/balsa-mime-widget-message.c:739
+#: ../src/balsa-print-object-header.c:169 ../src/sendmsg-window.c:3496
 msgid "From:"
 msgstr "De:"
 
 # src/sendmsg-window.c:885
 # src/sendmsg-window.c:928
-#: ../src/balsa-mime-widget-message.c:735
+#: ../src/balsa-mime-widget-message.c:746
 msgid "Reply-To:"
 msgstr "Responder a:"
 
 # src/balsa-message.c:578
 # src/balsa-message.c:642
-#: ../src/balsa-mime-widget-message.c:744
-#: ../src/balsa-print-object-header.c:176
+#: ../src/balsa-mime-widget-message.c:759
+#: ../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:751
-#: ../src/balsa-print-object-header.c:179
+#: ../src/balsa-mime-widget-message.c:767
+#: ../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:171
+#: ../src/balsa-mime-widget-text.c:158
 #, 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:515
+#: ../src/balsa-mime-widget-text.c:509
 msgid "Copy link"
 msgstr "Copiar enlace"
 
-#: ../src/balsa-mime-widget-text.c:520
+#: ../src/balsa-mime-widget-text.c:514
 msgid "Open link"
 msgstr "Abrir enlace"
 
 # src/pref-manager.c:971
 # src/pref-manager.c:1099
-#: ../src/balsa-mime-widget-text.c:525
+#: ../src/balsa-mime-widget-text.c:519
 msgid "Send link..."
 msgstr "Enviar enlace…"
 
 # src/balsa-message.c:1247
 # src/balsa-message.c:1417
-#: ../src/balsa-mime-widget-text.c:554 ../src/balsa-mime-widget-text.c:1046
+#: ../src/balsa-mime-widget-text.c:550 ../src/balsa-mime-widget-text.c:1080
 msgid "Save..."
 msgstr "Guardar…"
 
-#: ../src/balsa-mime-widget-text.c:564
+#: ../src/balsa-mime-widget-text.c:560
 msgid "Highlight structured phrases"
 msgstr "Resaltar frases estructuradas"
 
 # libmutt/mx.c:630
 # libmutt/mx.c:630
-#: ../src/balsa-mime-widget-text.c:791
+#: ../src/balsa-mime-widget-text.c:787
 #, c-format
 msgid "Calling URL %s..."
 msgstr "Llamando la URL %s…"
 
-# src/address-book.c:369
-# src/address-book.c:394
-#: ../src/balsa-mime-widget-text.c:1160
-msgid "Address"
-msgstr "Dirección"
+#: ../src/balsa-mime-widget-text.c:1047
+#, fuzzy
+#| msgid "Zoom _In"
+msgid "Zoom In"
+msgstr "A_cercar"
+
+#: ../src/balsa-mime-widget-text.c:1052
+#, fuzzy
+#| msgid "Zoom _Out"
+msgid "Zoom Out"
+msgstr "A_lejar"
 
-#: ../src/balsa-mime-widget-text.c:1163
-msgid "S_tore"
-msgstr "Al_macenar"
+#: ../src/balsa-mime-widget-text.c:1057
+#, fuzzy
+#| msgid "Zoom _100%"
+msgid "Zoom 100%"
+msgstr "Aumento al _100%"
+
+# src/sendmsg-window.c:191
+# src/sendmsg-window.c:196
+#: ../src/balsa-mime-widget-text.c:1066
+msgid "Select _All"
+msgstr "Seleccionar _todo"
+
+# src/mblist-window.c:450
+# src/mblist-window.c:473
+#: ../src/balsa-mime-widget-text.c:1089
+#, fuzzy
+#| msgid "_Print..."
+msgid "Print..."
+msgstr "_Imprimir…"
+
+# src/main-window.c:360
+# src/main-window.c:360
+#: ../src/balsa-mime-widget-text.c:1212
+#, fuzzy
+#| msgid "Store Address"
+msgid "S_tore Address"
+msgstr "Almacenar dirección"
 
 # src/store-address.c:50
 # src/store-address.c:52
-#: ../src/balsa-mime-widget-text.c:1171 ../src/balsa-print-object-text.c:508
-msgid "Full Name"
+#: ../src/balsa-mime-widget-text.c:1219
+#, fuzzy
+#| msgid "Full Name"
+msgid "Full Name:"
 msgstr "Nombre completo"
 
 # libinit_balsa/balsa-druid-page-user.gob:83 src/address-book.c:225
 # 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:1172 ../src/balsa-print-object-text.c:510
-msgid "Nick Name"
+#: ../src/balsa-mime-widget-text.c:1220
+#, fuzzy
+#| msgid "Nick Name"
+msgid "Nick Name:"
 msgstr "Apodo"
 
 # src/filter-edit-dialog.c:490
 # src/address-book-config.c:321
-#: ../src/balsa-mime-widget-text.c:1173 ../src/balsa-print-object-text.c:512
-msgid "First Name"
-msgstr "Nombre"
+#: ../src/balsa-mime-widget-text.c:1221
+#, fuzzy
+#| msgid "_First Name:"
+msgid "First Name:"
+msgstr "_Nombre:"
 
 # src/address-book-config.c:351
 # src/address-book-config.c:381
-#: ../src/balsa-mime-widget-text.c:1174 ../src/balsa-print-object-text.c:514
-msgid "Last Name"
-msgstr "Apellidos"
+#: ../src/balsa-mime-widget-text.c:1222
+#, fuzzy
+#| msgid "_Last Name:"
+msgid "Last Name:"
+msgstr "Ape_llidos:"
 
-#: ../src/balsa-mime-widget-text.c:1175 ../src/balsa-print-object-text.c:516
-msgid "Organization"
-msgstr "Organización"
+#: ../src/balsa-mime-widget-text.c:1223
+#, fuzzy
+#| msgid "O_rganization:"
+msgid "Organization:"
+msgstr "O_rganización:"
 
 # src/store-address.c:52
 # src/store-address.c:54
-#: ../src/balsa-mime-widget-text.c:1177 ../src/balsa-print-object-text.c:519
-msgid "Email Address"
-msgstr "Correo electrónico"
+#: ../src/balsa-mime-widget-text.c:1225
+#, fuzzy
+#| msgid "_Email Address:"
+msgid "Email Address:"
+msgstr "_Correo electrónico:"
 
-#: ../src/balsa-mime-widget-text.c:1206
+#: ../src/balsa-mime-widget-text.c:1253
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains 8-bit characters, but no "
@@ -3830,148 +3990,220 @@ msgstr ""
 msgid "This is an iTIP calendar \"%s\" message."
 msgstr "Este es un mensaje «%s» de calendario iTIP"
 
-#: ../src/balsa-mime-widget-vcalendar.c:169
-#: ../src/balsa-print-object-text.c:665
-msgid "Summary"
+#: ../src/balsa-mime-widget-vcalendar.c:173
+#, fuzzy
+#| msgid "Summary"
+msgid "Summary:"
 msgstr "Resumen"
 
-#: ../src/balsa-mime-widget-vcalendar.c:170
-#: ../src/balsa-print-object-text.c:667
-msgid "Organizer"
+#: ../src/balsa-mime-widget-vcalendar.c:174
+#, fuzzy
+#| msgid "Organizer"
+msgid "Organizer:"
 msgstr "Organizador"
 
-#: ../src/balsa-mime-widget-vcalendar.c:171
-#: ../src/balsa-print-object-text.c:669
-msgid "Start"
+#: ../src/balsa-mime-widget-vcalendar.c:175
+#, fuzzy
+#| msgid "Start"
+msgid "Start:"
 msgstr "Inicio"
 
-#: ../src/balsa-mime-widget-vcalendar.c:172
-#: ../src/balsa-print-object-text.c:671
-msgid "End"
-msgstr "Final"
+#: ../src/balsa-mime-widget-vcalendar.c:176
+msgid "End:"
+msgstr ""
 
 # src/filter-edit-dialog.c:741
 # src/filter-edit-dialog.c:653
-#: ../src/balsa-mime-widget-vcalendar.c:173
-#: ../src/balsa-print-object-text.c:673
-msgid "Location"
+#: ../src/balsa-mime-widget-vcalendar.c:177
+#, fuzzy
+#| msgid "Location"
+msgid "Location:"
 msgstr "Ubicación"
 
-#: ../src/balsa-mime-widget-vcalendar.c:205
-#: ../src/balsa-print-object-text.c:682
-msgid "Attendees"
-msgstr "Participantes"
-
-#: ../src/balsa-mime-widget-vcalendar.c:205
-#: ../src/balsa-print-object-text.c:682
-msgid "Attendee"
-msgstr "Participante"
-
-#: ../src/balsa-mime-widget-vcalendar.c:208
-#: ../src/balsa-print-object-text.c:696 ../src/sendmsg-window.c:3008
-msgid "Description"
+#: ../src/balsa-mime-widget-vcalendar.c:209
+#, fuzzy
+#| msgid "Attendee"
+msgid "Attendee:"
+msgid_plural "Attendees:"
+msgstr[0] "Participante"
+msgstr[1] "Participante"
+
+#: ../src/balsa-mime-widget-vcalendar.c:213
+#, fuzzy
+#| msgid "Description"
+msgid "Description:"
 msgstr "Descripción"
 
-#: ../src/balsa-mime-widget-vcalendar.c:229
+#: ../src/balsa-mime-widget-vcalendar.c:234
 msgid "The sender asks you for a reply to this request:"
 msgstr "El remitente le solicita una respuesta para esta petición:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:236
+#: ../src/balsa-mime-widget-vcalendar.c:241
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../src/balsa-mime-widget-vcalendar.c:245
+#: ../src/balsa-mime-widget-vcalendar.c:250
 msgid "Accept tentatively"
 msgstr "Aceptar con indecisión"
 
-#: ../src/balsa-mime-widget-vcalendar.c:253
+#: ../src/balsa-mime-widget-vcalendar.c:258
 msgid "Decline"
 msgstr "Rechazar"
 
-#: ../src/balsa-mime-widget-vcalendar.c:300
+#: ../src/balsa-mime-widget-vcalendar.c:305
 msgid "iTip Calendar Request"
 msgstr "Petición de calendario iTIP"
 
-#: ../src/balsa-mime-widget-vcalendar.c:334
+#: ../src/balsa-mime-widget-vcalendar.c:343
 #, c-format
 msgid "Sending the iTip calendar reply failed: %s"
 msgstr "Falló al enviar la respuesta al calendario iTIP: %s"
 
 # src/message-window.c:120
 # src/message-window.c:114
-#: ../src/balsa-mime-widget.c:252
+#: ../src/balsa-mime-widget.c:259
 #, 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:276
+#: ../src/balsa-mime-widget.c:286
 #, 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:280
+#: ../src/balsa-mime-widget.c:290
 #, 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:293
+#: ../src/balsa-mime-widget.c:304
 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:298
+#: ../src/balsa-mime-widget.c:309
 msgid "S_ave part"
 msgstr "_Guardar parte"
 
-#: ../src/balsa-print-object-default.c:153
-#: ../src/balsa-print-object-default.c:155
-#: ../src/balsa-print-object-default.c:158
+#: ../src/balsa-print-object-default.c:154
+#: ../src/balsa-print-object-default.c:156
+#: ../src/balsa-print-object-default.c:159
 msgid "Type:"
 msgstr "Tipo:"
 
 # src/filter-edit-dialog.c:490
 # src/filter-edit-dialog.c:436
-#: ../src/balsa-print-object-default.c:163
-#: ../src/balsa-print-object-default.c:167
+#: ../src/balsa-print-object-default.c:164
+#: ../src/balsa-print-object-default.c:168
 msgid "File name:"
 msgstr "Nombre del archivo:"
 
-#: ../src/filter-edit-callbacks.c:337
+# src/store-address.c:50
+# src/store-address.c:52
+#: ../src/balsa-print-object-text.c:493
+msgid "Full Name"
+msgstr "Nombre completo"
+
+# libinit_balsa/balsa-druid-page-user.gob:83 src/address-book.c:225
+# 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-print-object-text.c:495
+msgid "Nick Name"
+msgstr "Apodo"
+
+# src/filter-edit-dialog.c:490
+# src/address-book-config.c:321
+#: ../src/balsa-print-object-text.c:497
+msgid "First Name"
+msgstr "Nombre"
+
+# src/address-book-config.c:351
+# src/address-book-config.c:381
+#: ../src/balsa-print-object-text.c:499
+msgid "Last Name"
+msgstr "Apellidos"
+
+#: ../src/balsa-print-object-text.c:501
+msgid "Organization"
+msgstr "Organización"
+
+# src/store-address.c:52
+# src/store-address.c:54
+#: ../src/balsa-print-object-text.c:504
+msgid "Email Address"
+msgstr "Correo electrónico"
+
+#: ../src/balsa-print-object-text.c:651
+msgid "Summary"
+msgstr "Resumen"
+
+#: ../src/balsa-print-object-text.c:653
+msgid "Organizer"
+msgstr "Organizador"
+
+#: ../src/balsa-print-object-text.c:655
+msgid "Start"
+msgstr "Inicio"
+
+#: ../src/balsa-print-object-text.c:657
+msgid "End"
+msgstr "Final"
+
+# src/filter-edit-dialog.c:741
+# src/filter-edit-dialog.c:653
+#: ../src/balsa-print-object-text.c:659
+msgid "Location"
+msgstr "Ubicación"
+
+#: ../src/balsa-print-object-text.c:668
+msgid "Attendees"
+msgstr "Participantes"
+
+#: ../src/balsa-print-object-text.c:668
+msgid "Attendee"
+msgstr "Participante"
+
+#: ../src/balsa-print-object-text.c:682 ../src/sendmsg-window.c:2686
+msgid "Description"
+msgstr "Descripción"
+
+#: ../src/filter-edit-callbacks.c:332
 msgid "One of the specified fields contains:"
 msgstr "Uno de los campos especificados contiene:"
 
-#: ../src/filter-edit-callbacks.c:338
+#: ../src/filter-edit-callbacks.c:333
 msgid "None of the specified fields contains:"
 msgstr "Ninguno de los campos especificados contiene:"
 
-#: ../src/filter-edit-callbacks.c:340
+#: ../src/filter-edit-callbacks.c:335
 msgid "One of the regular expressions matches"
 msgstr "Coincide una de las expresiones regulares"
 
 # src/pref-manager.c:1264
 # src/pref-manager.c:1407
-#: ../src/filter-edit-callbacks.c:341
+#: ../src/filter-edit-callbacks.c:336
 msgid "None of the regular expressions matches"
 msgstr "Ninguna de las expresiones regulares coincide"
 
-#: ../src/filter-edit-callbacks.c:343
+#: ../src/filter-edit-callbacks.c:338
 msgid "Match when date is in the interval:"
 msgstr "Coincide cuando la fecha está en el intervalo:"
 
-#: ../src/filter-edit-callbacks.c:344
+#: ../src/filter-edit-callbacks.c:339
 msgid "Match when date is outside the interval:"
 msgstr "Coincidir cuando la fecha esté fuera del intervalo:"
 
-#: ../src/filter-edit-callbacks.c:346 ../src/filter-edit-callbacks.c:1134
+#: ../src/filter-edit-callbacks.c:341 ../src/filter-edit-callbacks.c:1136
 msgid "Match when one of these flags is set:"
 msgstr "Coincide cuando tiene una de estas marcas:"
 
-#: ../src/filter-edit-callbacks.c:347
+#: ../src/filter-edit-callbacks.c:342
 msgid "Match when none of these flags is set:"
 msgstr "Coincide cuando no tiene ninguna de estas marcas:"
 
@@ -4004,36 +4236,36 @@ msgstr "La fecha final es incorrecta"
 msgid "Low date is greater than high date"
 msgstr "La fecha inicial es mayor que la fecha final"
 
-#: ../src/filter-edit-callbacks.c:896
+#: ../src/filter-edit-callbacks.c:902
 #, c-format
 msgid "Error displaying condition help: %s\n"
 msgstr "Error al mostrar la ayuda condicional: %s\n"
 
 # libinit_balsa/balsa-druid-page-directory.gob:194
 # libinit_balsa/balsa-druid-page-directory.gob:194
-#: ../src/filter-edit-callbacks.c:937
+#: ../src/filter-edit-callbacks.c:940
 msgid "Match Fields"
 msgstr "Coincide con los campos"
 
 # src/filter-edit-dialog.c:289
 # src/filter-edit-dialog.c:276
-#: ../src/filter-edit-callbacks.c:947
+#: ../src/filter-edit-callbacks.c:954
 msgid "_All"
 msgstr "_Todos"
 
-#: ../src/filter-edit-callbacks.c:948
+#: ../src/filter-edit-callbacks.c:955
 msgid "C_lear"
 msgstr "_Limpiar"
 
 # src/filter-edit-dialog.c:313
 # src/filter-edit-dialog.c:296
-#: ../src/filter-edit-callbacks.c:950 ../src/main-window.c:4302
+#: ../src/filter-edit-callbacks.c:957 ../src/main-window.c:3986
 msgid "_Body"
 msgstr "_Cuerpo"
 
 # src/sendmsg-window.c:222
 # src/sendmsg-window.c:226
-#: ../src/filter-edit-callbacks.c:951 ../src/main-window.c:4303
+#: ../src/filter-edit-callbacks.c:958 ../src/main-window.c:3987
 msgid "_To:"
 msgstr "_A:"
 
@@ -4041,157 +4273,125 @@ 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:952 ../src/main-window.c:4304
+#: ../src/filter-edit-callbacks.c:959 ../src/main-window.c:3988
 msgid "_From:"
 msgstr "_De:"
 
 # src/sendmsg-window.c:224
 # src/sendmsg-window.c:228
-#: ../src/filter-edit-callbacks.c:953
+#: ../src/filter-edit-callbacks.c:960
 msgid "_Subject"
 msgstr "A_sunto"
 
 # src/sendmsg-window.c:226
 # src/sendmsg-window.c:230
-#: ../src/filter-edit-callbacks.c:954 ../src/main-window.c:4306
+#: ../src/filter-edit-callbacks.c:961 ../src/main-window.c:3990
 msgid "_Cc:"
 msgstr "_Cc:"
 
 # src/mailbox-conf.c:822 src/mailbox-conf.c:882
 # src/mailbox-conf.c:899 src/mailbox-conf.c:957
-#: ../src/filter-edit-callbacks.c:956
+#: ../src/filter-edit-callbacks.c:963
 msgid "_User header:"
 msgstr "Cabecera de _usuario:"
 
 # src/balsa-mblist.c:218
 # src/balsa-mblist.c:218
-#: ../src/filter-edit-callbacks.c:990
+#: ../src/filter-edit-callbacks.c:994
 msgid "Unread"
 msgstr "No leído"
 
-# 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
-#: ../src/filter-edit-callbacks.c:990
-msgid "Deleted"
-msgstr "Borrado"
-
-# src/main-window.c:448
-# src/main-window.c:455
-#: ../src/filter-edit-callbacks.c:990
-msgid "Replied"
-msgstr "Respondido"
-
-# HE DECIDIDO QUEDARME CON ESTA TRADUCCIÓN. SE ADMITEN SUGERENCIAS
-# 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/filter-edit-callbacks.c:990
-msgid "Flagged"
-msgstr "Marcado"
-
-#: ../src/filter-edit-callbacks.c:1005
+#: ../src/filter-edit-callbacks.c:1013
 msgid "One of the specified f_ields contains"
 msgstr "Uno de los campos especif_icados contiene"
 
-#: ../src/filter-edit-callbacks.c:1020
+#: ../src/filter-edit-callbacks.c:1024
 msgid "Contain/Does _Not Contain"
 msgstr "Contiene/_No contiene"
 
-#: ../src/filter-edit-callbacks.c:1040
+#: ../src/filter-edit-callbacks.c:1043
 msgid "_One of the regular expressions matches"
 msgstr "_Una de las expresiones regulares coincide"
 
-# src/filter-edit-dialog.c:425 src/sendmsg-window.c:514
-# src/filter-edit-dialog.c:384 src/sendmsg-window.c:543
-#. Left/Remove button
-#: ../src/filter-edit-callbacks.c:1071 ../src/filter-edit-dialog.c:330
-#: ../src/filter-run-dialog.c:334
-msgid "_Remove"
-msgstr "_Quitar"
-
-#: ../src/filter-edit-callbacks.c:1075
+#: ../src/filter-edit-callbacks.c:1079
 msgid "One _Matches/None Matches"
 msgstr "Una _coincide/ninguna coincide"
 
 # src/filter-edit-dialog.c:46
 # src/filter-edit-dialog.c:45
-#: ../src/filter-edit-callbacks.c:1086
+#: ../src/filter-edit-callbacks.c:1090
 msgid "Filtering using regular expressions is not yet implemented."
 msgstr "El filtrado usando expresiones regulares aún no está implementado."
 
-#: ../src/filter-edit-callbacks.c:1096
+#: ../src/filter-edit-callbacks.c:1105
 msgid "Match when message date is in the interval:"
 msgstr "Coincide cuando la fecha está en el intervalo:"
 
-#: ../src/filter-edit-callbacks.c:1116
+#: ../src/filter-edit-callbacks.c:1118
 msgid "Inside/outside the date interval"
 msgstr "Dentro/fuera del intervalo de fechas"
 
-#: ../src/filter-edit-callbacks.c:1163
+#: ../src/filter-edit-callbacks.c:1159
 msgid "Match when one flag is set/when no flag is set"
 msgstr ""
 "Coincide cuando tiene una marca puesta/cuando no tiene una marca puesta"
 
 # src/filter-edit-dialog.c:570
 # src/filter-edit-dialog.c:491
-#: ../src/filter-edit-callbacks.c:1182
+#: ../src/filter-edit-callbacks.c:1178
 msgid "Search T_ype:"
 msgstr "T_ipo de búsqueda:"
 
-#: ../src/filter-edit-callbacks.c:1259
+#: ../src/filter-edit-callbacks.c:1256
 msgid "Edit condition for filter: "
 msgstr "Editar condición para filtro: "
 
-#: ../src/filter-edit-callbacks.c:1477 ../src/save-restore.c:1961
+#: ../src/filter-edit-callbacks.c:1475 ../src/save-restore.c:1893
 msgid "Filter with no condition was omitted"
 msgstr "El filtro sin condiciones fue ignorado"
 
-#: ../src/filter-edit-callbacks.c:1503
+#: ../src/filter-edit-callbacks.c:1502
 #, c-format
 msgid "Error displaying filter help: %s\n"
 msgstr "Error al mostrar la ayuda de filtros: %s\n"
 
 # src/main-window.c:259
 # src/main-window.c:262
-#: ../src/filter-edit-callbacks.c:1702
+#: ../src/filter-edit-callbacks.c:1701
 msgid "New filter"
 msgstr "Nuevo filtro"
 
-#: ../src/filter-edit-callbacks.c:1831
+#: ../src/filter-edit-callbacks.c:1830
 msgid "No filter name specified."
 msgstr "No ha especificado un nombre para el filtro."
 
-#: ../src/filter-edit-callbacks.c:1836
+#: ../src/filter-edit-callbacks.c:1835
 #, c-format
 msgid "Filter \"%s\" already exists."
 msgstr "El filtro «%s» ya existe."
 
-#: ../src/filter-edit-callbacks.c:1846
+#: ../src/filter-edit-callbacks.c:1845
 msgid "Filter must have conditions."
 msgstr "El filtro debe tener condiciones."
 
 # src/filter-edit-dialog.c:490
 # src/filter-edit-dialog.c:436
-#: ../src/filter-edit-callbacks.c:1932
+#: ../src/filter-edit-callbacks.c:1931
 msgid "Filter has matched"
 msgstr "El filtro ha coincidido"
 
-#: ../src/filter-edit-callbacks.c:1952
+#: ../src/filter-edit-callbacks.c:1951
 msgid "You must provide a sound to play"
 msgstr "Debe proporciona un sonido a reproducir"
 
-#: ../src/filter-edit-callbacks.c:2130
+#: ../src/filter-edit-callbacks.c:2133
 #, c-format
 msgid "(Example: write December 31, 2000, as %s)"
 msgstr "(Ejemplo: escriba 31 de Diciembre de 2000 como %s)"
 
 # src/filter-edit-dialog.c:45
 # src/filter-edit-dialog.c:44
-#: ../src/filter-edit-dialog.c:97 ../src/pref-manager.c:426
+#: ../src/filter-edit-dialog.c:97 ../src/pref-manager.c:405
 msgid "Simple"
 msgstr "Simple"
 
@@ -4256,93 +4456,113 @@ msgstr "Y"
 # 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:260
 msgid "_Filter name:"
 msgstr "Nombre del _filtro:"
 
 #. The filter op-code : "OR" or "AND" all the conditions
-#: ../src/filter-edit-dialog.c:276
-msgid "Operation between conditions"
+#: ../src/filter-edit-dialog.c:274
+#, fuzzy
+#| msgid "Operation between conditions"
+msgid "Operation between conditions:"
 msgstr "Operación entre condiciones"
 
+# src/main-window.c:389
+# src/main-window.c:386
+#: ../src/filter-edit-dialog.c:311
+msgid "_Edit"
+msgstr "_Editar"
+
 # src/filter-edit-dialog.c:222
 # src/filter-edit-dialog.c:218
-#: ../src/filter-edit-dialog.c:326
+#: ../src/filter-edit-dialog.c:316
 msgid "Ne_w"
 msgstr "N_uevo"
 
-#: ../src/filter-edit-dialog.c:354
+#: ../src/filter-edit-dialog.c:348
 msgid "Foreground"
 msgstr "Primer plano"
 
-#: ../src/filter-edit-dialog.c:365
+#: ../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:390
+#: ../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:400
+#: ../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:406
+#: ../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:405 ../src/mailbox-node.c:1113
+msgid "_Open"
+msgstr "_Abrir"
+
 # src/filter-edit-dialog.c:652
 # src/filter-edit-dialog.c:559
-#: ../src/filter-edit-dialog.c:427
+#: ../src/filter-edit-dialog.c:420
 msgid "Popup text:"
 msgstr "Texto emergente:"
 
 # src/filter-edit-dialog.c:671
 # src/filter-edit-dialog.c:574
 #. The action area
-#: ../src/filter-edit-dialog.c:448
+#: ../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:501
+#: ../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:504
+#: ../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:516
-msgid "Revert"
+#: ../src/filter-edit-dialog.c:505
+#, fuzzy
+#| msgid "Revert"
+msgid "Re_vert"
 msgstr "Revertir"
 
-#: ../src/filter-edit-dialog.c:567
-msgid "A filter run dialog is open.Close it before you can modify filters."
+#: ../src/filter-edit-dialog.c:556
+#, fuzzy
+#| msgid "A filter run dialog is open.Close it before you can modify filters."
+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\n"
 "poder modificar los filtros."
 
-# src/filter-edit-dialog.c:783
-# src/filter-edit-dialog.c:693
-#: ../src/filter-edit-dialog.c:580
-msgid "Balsa Filters"
-msgstr "Filtros de Balsa"
+# src/main-window.c:259
+# src/main-window.c:262
+#: ../src/filter-edit-dialog.c:569
+#, fuzzy
+#| msgid "_Filters"
+msgid "Filters"
+msgstr "_Filtros"
 
-#: ../src/filter-edit-dialog.c:649
+#: ../src/filter-edit-dialog.c:637
 #, c-format
 msgid "Filter \"%s\" has no condition."
 msgstr "El filtro «%s» no tiene condiciones."
@@ -4360,29 +4580,29 @@ msgstr ""
 "Hay abiertos diálogos de filtrado en ejecución, ciérrelos antes de poder "
 "modificar filtros."
 
-# src/filter-edit-dialog.c:783
-# src/filter-edit-dialog.c:693
 #: ../src/filter-export-dialog.c:77
-msgid "Balsa Filters Export"
-msgstr "Exportar filtros de Balsa"
+#, fuzzy
+#| msgid "_Export Filters..."
+msgid "Export Filters"
+msgstr "_Exportar filtros…"
 
-#: ../src/filter-run-callbacks.c:184
+#: ../src/filter-run-callbacks.c:186
 #, c-format
 msgid "Error displaying run filters help: %s\n"
 msgstr "Error al mostrar la ayuda de ejecución de filtros: %s\n"
 
-#: ../src/filter-run-callbacks.c:234 ../src/filter-run-callbacks.c:256
+#: ../src/filter-run-callbacks.c:236 ../src/filter-run-callbacks.c:258
 msgid "Error when applying filters"
 msgstr "Error al aplicar filtros"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../src/filter-run-callbacks.c:237 ../src/filter-run-callbacks.c:259
+#: ../src/filter-run-callbacks.c:239 ../src/filter-run-callbacks.c:261
 #, c-format
 msgid "Filter applied to \"%s\"."
 msgstr "Filtro aplicado a «%s»."
 
-#: ../src/filter-run-callbacks.c:298
+#: ../src/filter-run-callbacks.c:300
 #, c-format
 msgid ""
 "The destination mailbox of the filter \"%s\" is \"%s\".\n"
@@ -4391,7 +4611,7 @@ msgstr ""
 "El buzón de destino del filtro «%s» es «%s».\n"
 "No se puede asociar con el mismo buzón (porque causa recursividad)."
 
-#: ../src/filter-run-callbacks.c:306
+#: ../src/filter-run-callbacks.c:308
 #, c-format
 msgid ""
 "The filter \"%s\" is not compatible with the mailbox type of \"%s\".\n"
@@ -4405,45 +4625,65 @@ msgstr ""
 
 # src/filter-edit-dialog.c:783
 # src/filter-edit-dialog.c:693
-#: ../src/filter-run-dialog.c:191
-msgid "Balsa Filters of Mailbox: "
+#: ../src/filter-run-dialog.c:194
+#, fuzzy
+#| msgid "Balsa Filters of Mailbox: "
+msgid "Filters of Mailbox: "
 msgstr "Filtros Balsa del buzón: "
 
 # src/pref-manager.c:1931
 # src/pref-manager.c:2155
-#: ../src/filter-run-dialog.c:232
+#: ../src/filter-run-dialog.c:235
 msgid "On reception"
 msgstr "Al recibir"
 
-#: ../src/filter-run-dialog.c:244
+#: ../src/filter-run-dialog.c:247
 msgid "On exit"
 msgstr "Al salir"
 
-#: ../src/filter-run-dialog.c:318
-msgid "Apply Selected"
+#: ../src/filter-run-dialog.c:356
+#, fuzzy
+#| msgid "Apply Selected"
+msgid "_Apply Selected"
 msgstr "Aplicar seleccionados"
 
-# src/filter-edit-dialog.c:199
-# src/filter-edit-dialog.c:194
-#. up button
-#: ../src/filter-run-dialog.c:366
-msgid "_Up"
-msgstr "_Subir"
+#: ../src/filter-run-dialog.c:372
+#, fuzzy
+#| msgid "Edit the selected mailbox"
+msgid "Add selected filter to mailbox"
+msgstr "Editar el buzón seleccionado"
 
-# src/filter-edit-dialog.c:205
-# src/filter-edit-dialog.c:200
-#. down button
-#: ../src/filter-run-dialog.c:371
-msgid "Do_wn"
-msgstr "_Bajar"
+# src/main-window.c:403
+# src/main-window.c:406
+#: ../src/filter-run-dialog.c:382
+#, fuzzy
+#| msgid "Remove duplicated messages from the current mailbox"
+msgid "Remove selected filter from mailbox"
+msgstr "Eliminar los mensajes duplicados del buzón actual"
+
+# src/main-window.c:392
+# src/main-window.c:389
+#: ../src/filter-run-dialog.c:424
+#, fuzzy
+#| msgid "Save selected to folder..."
+msgid "Move selected filter up"
+msgstr "Guardar seleccionados a carpeta…"
+
+# src/main-window.c:392
+# src/main-window.c:389
+#: ../src/filter-run-dialog.c:434
+#, fuzzy
+#| msgid "Save selected to folder..."
+msgid "Move selected filter down"
+msgstr "Guardar seleccionados a carpeta…"
 
 # src/sendmsg-window.c:885
 # src/sendmsg-window.c:928
-#: ../src/filter-run-dialog.c:377
+#: ../src/filter-run-dialog.c:440
 msgid "A_pply Now!"
 msgstr "_Aplicar ya"
 
-#: ../src/filter-run-dialog.c:421
+#: ../src/filter-run-dialog.c:486
 msgid ""
 "The filters dialog is opened, close it before you can run filters on any "
 "mailbox"
@@ -4452,53 +4692,52 @@ msgstr ""
 "el \n"
 "filtrado en cualquier buzón"
 
-#: ../src/folder-conf.c:110
+#: ../src/folder-conf.c:112
 #, c-format
 msgid "Error displaying config help: %s\n"
 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:298
+#: ../src/folder-conf.c:301
 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
-#. must NOT be modal
-#: ../src/folder-conf.c:301 ../src/folder-conf.c:789 ../src/mailbox-conf.c:564
+#: ../src/folder-conf.c:305 ../src/folder-conf.c:801 ../src/mailbox-conf.c:550
 msgid "_Update"
 msgstr "Act_ualizar"
 
-#: ../src/folder-conf.c:301
+#: ../src/folder-conf.c:305
 msgid "C_reate"
 msgstr "_Crear"
 
 # src/sendmsg-window.c:228
 # src/sendmsg-window.c:232
-#: ../src/folder-conf.c:327 ../src/mailbox-conf.c:1218
-#: ../src/mailbox-conf.c:1330
+#: ../src/folder-conf.c:332 ../src/mailbox-conf.c:1180
+#: ../src/mailbox-conf.c:1294
 msgid "_Basic"
 msgstr "_Básico"
 
-#: ../src/folder-conf.c:332
+#: ../src/folder-conf.c:337
 msgid "_Max number of connections:"
 msgstr "Número _máximo de conexiones:"
 
-#: ../src/folder-conf.c:339 ../src/mailbox-conf.c:1393
+#: ../src/folder-conf.c:343 ../src/mailbox-conf.c:1354
 msgid "Enable _persistent cache"
 msgstr "Activar caché _persistente"
 
-#: ../src/folder-conf.c:347
+#: ../src/folder-conf.c:350
 msgid "Use IDLE command"
 msgstr "Usar el comando IDLE"
 
-#: ../src/folder-conf.c:354 ../src/mailbox-conf.c:1397
+#: ../src/folder-conf.c:357 ../src/mailbox-conf.c:1357
 msgid "Enable _bug workarounds"
 msgstr "Activar arreglos de _bugs"
 
-#: ../src/folder-conf.c:361
+#: ../src/folder-conf.c:364
 msgid "Use STATUS for mailbox checking"
 msgstr "Usar STATUS para la comprobación de buzones"
 
@@ -4508,52 +4747,52 @@ msgstr "Usar STATUS para la comprobación de buzones"
 # 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
-#: ../src/folder-conf.c:367 ../src/mailbox-conf.c:1272
-#: ../src/mailbox-conf.c:1399
+#: ../src/folder-conf.c:370 ../src/mailbox-conf.c:1233
+#: ../src/mailbox-conf.c:1359
 msgid "_Advanced"
 msgstr "_Avanzado"
 
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:370
+#: ../src/folder-conf.c:373
 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:385 ../src/mailbox-conf.c:1234
+#: ../src/folder-conf.c:388 ../src/mailbox-conf.c:1196
 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:391
+#: ../src/folder-conf.c:394
 msgid "_Password:"
 msgstr "_Contraseña:"
 
-#: ../src/folder-conf.c:396 ../src/mailbox-conf.c:1355
+#: ../src/folder-conf.c:401 ../src/mailbox-conf.c:1317
 msgid "_Anonymous access"
 msgstr "Acceso _anónimo"
 
-#: ../src/folder-conf.c:405
+#: ../src/folder-conf.c:412
 msgid "Subscribed _folders only"
 msgstr "Sólo carpetas _suscritas"
 
-#: ../src/folder-conf.c:407
+#: ../src/folder-conf.c:415
 msgid "Always show _INBOX"
 msgstr "Siempre mostrar _bandeja de entrada"
 
-#: ../src/folder-conf.c:410
+#: ../src/folder-conf.c:418
 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:556
+#: ../src/folder-conf.c:565
 msgid "Select parent folder"
 msgstr "Seleccione carpeta madre"
 
-#: ../src/folder-conf.c:634
+#: ../src/folder-conf.c:644
 #, c-format
 msgid ""
 "Renaming INBOX is special!\n"
@@ -4568,11 +4807,11 @@ msgstr ""
 "La bandeja de entrada y sus subcarpetas se conservarán.\n"
 "¿Qué quiere hacer?"
 
-#: ../src/folder-conf.c:640
+#: ../src/folder-conf.c:651
 msgid "Question"
 msgstr "Pregunta"
 
-#: ../src/folder-conf.c:645
+#: ../src/folder-conf.c:655
 msgid "Rename INBOX"
 msgstr "Renombrar la bandeja de entrada"
 
@@ -4581,21 +4820,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:647
+#: ../src/folder-conf.c:657
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/folder-conf.c:672
+#: ../src/folder-conf.c:682
 #, c-format
 msgid "Folder rename failed. Reason: %s"
 msgstr "Hubo un fallo al renombrar la carpeta con motivo: %s"
 
-#: ../src/folder-conf.c:724
+#: ../src/folder-conf.c:734
 #, c-format
 msgid "Folder creation failed. Reason: %s"
 msgstr "Hubo un fallo al crear la carpeta con motivo: %s"
 
-#: ../src/folder-conf.c:771
+#: ../src/folder-conf.c:781
 msgid ""
 "An IMAP folder that is not a mailbox\n"
 "has no properties that can be changed."
@@ -4604,56 +4843,56 @@ msgstr ""
 "no tiene propiedades que puedan ser cambiadas."
 
 # libmutt/mbox.c:1066
-#: ../src/folder-conf.c:786
+#: ../src/folder-conf.c:797
 msgid "Remote IMAP subfolder"
 msgstr "Subcarpeta IMAP remota"
 
-#: ../src/folder-conf.c:789
+#: ../src/folder-conf.c:801
 msgid "_Create"
 msgstr "_Crear"
 
-#: ../src/folder-conf.c:820
+#: ../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:828
+#: ../src/folder-conf.c:840
 msgid "_Folder name:"
 msgstr "_Nombre de la carpeta:"
 
-#: ../src/folder-conf.c:834
+#: ../src/folder-conf.c:846
 msgid "Host:"
 msgstr "Anfitrión:"
 
-#: ../src/folder-conf.c:843
+#: ../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:848
+#: ../src/folder-conf.c:860
 msgid "_Browse..."
 msgstr "_Buscar…"
 
-#: ../src/folder-conf.c:862
+#: ../src/folder-conf.c:874
 msgid "read-only"
 msgstr "sólo lectura"
 
-#: ../src/folder-conf.c:863
+#: ../src/folder-conf.c:875
 msgid "read-write"
 msgstr "lectura y escritura"
 
-#: ../src/folder-conf.c:864
+#: ../src/folder-conf.c:876
 msgid "admin"
 msgstr "administrador"
 
-#: ../src/folder-conf.c:865
+#: ../src/folder-conf.c:877
 msgid "post"
 msgstr "publicar"
 
-#: ../src/folder-conf.c:866
+#: ../src/folder-conf.c:878
 msgid "append"
 msgstr "añadir"
 
@@ -4663,19 +4902,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:867
+#: ../src/folder-conf.c:879
 msgid "delete"
 msgstr "eliminar"
 
-#: ../src/folder-conf.c:868
+#: ../src/folder-conf.c:880
 msgid "special"
 msgstr "especial"
 
-#: ../src/folder-conf.c:874
+#: ../src/folder-conf.c:886
 msgid "Permissions:"
 msgstr "Permisos:"
 
-#: ../src/folder-conf.c:881
+#: ../src/folder-conf.c:893
 msgid ""
 "\n"
 "detailed permissions are available only for open folders"
@@ -4683,7 +4922,7 @@ msgstr ""
 "\n"
 "los permisos detallados sólo están disponibles para carpetas abiertas"
 
-#: ../src/folder-conf.c:888
+#: ../src/folder-conf.c:900
 msgid ""
 "\n"
 "the server does not support ACL's"
@@ -4693,32 +4932,32 @@ msgstr ""
 
 # src/pref-manager.c:1235
 # src/pref-manager.c:1376
-#: ../src/folder-conf.c:897
+#: ../src/folder-conf.c:909
 msgid "mine: "
 msgstr "mios: "
 
-#: ../src/folder-conf.c:936
+#: ../src/folder-conf.c:947
 msgid "Quota:"
 msgstr "Cuota:"
 
-#: ../src/folder-conf.c:940
+#: ../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:945
+#: ../src/folder-conf.c:956
 msgid "the server does not support quotas"
 msgstr "el servidor no soporta cuotas"
 
-#: ../src/folder-conf.c:947
+#: ../src/folder-conf.c:958
 msgid "no limits"
 msgstr "sin límites"
 
-#: ../src/folder-conf.c:952
+#: ../src/folder-conf.c:963
 #, c-format
 msgid "%s of %s (%.1f%%) used"
 msgstr "%s de %s (%.1f%%) usado"
 
-#: ../src/folder-conf.c:989
+#: ../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."
@@ -4728,50 +4967,52 @@ msgstr ""
 
 # src/mailbox-conf.c:157
 # src/mailbox-conf.c:157
-#: ../src/folder-conf.c:998
+#: ../src/folder-conf.c:1009
 #, c-format
 msgid ""
 "This will remove the folder \"%s\" from the list.\n"
 "You may use \"New IMAP Folder\" later to add this folder again.\n"
 msgstr ""
-"Esto borrará la carpeta «%s» de la lista.\n"
+"Esto eliminará la carpeta «%s» de la lista.\n"
 "Podrá usar más tarde «Carpeta IMAP nueva» para agregar esta carpeta "
 "nuevamente.\n"
 
-#: ../src/folder-conf.c:1006
+#: ../src/folder-conf.c:1017
 msgid "Confirm"
 msgstr "Confirmar"
 
 # src/pref-manager.c:1459
 # src/pref-manager.c:1608
-#: ../src/information-dialog.c:232
+#: ../src/information-dialog.c:233
 msgid "Information - Balsa"
 msgstr "Información - Balsa"
 
-#: ../src/information-dialog.c:359
+#: ../src/information-dialog.c:237 ../src/main-window.c:4007
+#, fuzzy
+#| msgid "C_lear"
+msgid "_Clear"
+msgstr "_Limpiar"
+
+#: ../src/information-dialog.c:238
+msgid "Cl_ose"
+msgstr ""
+
+#: ../src/information-dialog.c:361
 #, c-format
 msgid "WARNING: "
 msgstr "ATENCIÓN: "
 
-#: ../src/information-dialog.c:362
+#: ../src/information-dialog.c:364
 #, c-format
 msgid "ERROR: "
 msgstr "ERROR: "
 
-#: ../src/information-dialog.c:365
+#: ../src/information-dialog.c:367
 #, c-format
 msgid "FATAL: "
 msgstr "FATAL: "
 
-#: ../src/mailbox-conf.c:218
-msgid ""
-"Balsa was built without SSL support.\n"
-"Neither SSL nor TLS can be used."
-msgstr ""
-"Balsa se construyó sin soporte SSL.\n"
-"No se puede usar ni SSL ni TLS."
-
-#: ../src/mailbox-conf.c:230
+#: ../src/mailbox-conf.c:222
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
@@ -4779,11 +5020,11 @@ msgstr "Usar _SSL"
 # 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/mailbox-conf.c:365
+#: ../src/mailbox-conf.c:350
 msgid "No mailbox selected."
 msgstr "Ningún buzón seleccionado."
 
-#: ../src/mailbox-conf.c:395
+#: ../src/mailbox-conf.c:380
 #, c-format
 msgid ""
 "Mailbox \"%s\" is used by Balsa and I cannot remove it.\n"
@@ -4795,7 +5036,7 @@ msgstr ""
 
 # src/mailbox-conf.c:157
 # src/mailbox-conf.c:157
-#: ../src/mailbox-conf.c:405
+#: ../src/mailbox-conf.c:390
 #, c-format
 msgid ""
 "This will remove the mailbox \"%s\" from the list of mailboxes.  You may "
@@ -4804,24 +5045,24 @@ msgid ""
 "mailbox again.\n"
 "What would you like to do?"
 msgstr ""
-"Esto borrará el buzón %s de la lista de buzones.\n"
+"Esto quitará el buzón %s de la lista de buzones.\n"
 "También puede eliminar del disco el archivo o archivos asociados con este "
 "buzón.\n"
 "Si no elimina el archivo del disco podrá usar «Añadir buzón» para acceder a "
 "este buzón de nuevo.\n"
-"¿Qué desea hacer?"
+"¿Qué quiere hacer?"
 
 # src/pref-manager.c:1058
 # src/pref-manager.c:1188
-#: ../src/mailbox-conf.c:417
+#: ../src/mailbox-conf.c:402
 msgid "Remove from _list"
 msgstr "Quitar de la _lista"
 
-#: ../src/mailbox-conf.c:418
+#: ../src/mailbox-conf.c:403
 msgid "Remove from list and _disk"
-msgstr "Borrar el buzón de la lista y el _disco"
+msgstr "Eliminar el buzón de la lista y el _disco"
 
-#: ../src/mailbox-conf.c:426
+#: ../src/mailbox-conf.c:411
 #, c-format
 msgid ""
 "This will remove the mailbox \"%s\" and all its messages from your IMAP "
@@ -4830,7 +5071,7 @@ msgid ""
 "You may use \"New IMAP subfolder\" later to add a mailbox with this name.\n"
 "What would you like to do?"
 msgstr ""
-"Esto borrará el buzón %s y todos sus mensajes del servidor IMAP.  Si %s "
+"Esto quitará el buzón %s y todos sus mensajes del servidor IMAP.  Si %s "
 "tiene subcarpetas, aparecerán como un nodo en el árbol de carpetas.\n"
 "Puede usar  «Nueva subcarpeta IMAP» más tarde para añadir un buzón con este "
 "nombre.\n"
@@ -4838,54 +5079,43 @@ msgstr ""
 
 # src/pref-manager.c:1058
 # src/pref-manager.c:1188
-#: ../src/mailbox-conf.c:439
+#: ../src/mailbox-conf.c:424
 msgid "_Remove from server"
 msgstr "_Eliminar del servidor"
 
 # src/mailbox-conf.c:157
 # src/mailbox-conf.c:157
-#: ../src/mailbox-conf.c:446
+#: ../src/mailbox-conf.c:431
 #, c-format
 msgid ""
 "This will remove the mailbox \"%s\" from the list of mailboxes.\n"
 "You may use \"Add Mailbox\" later to access this mailbox again.\n"
 "What would you like to do?"
 msgstr ""
-"Esto borrará el buzón «%s» de la lista de buzones\n"
+"Esto eliminará el buzón «%s» de la lista de buzones\n"
 "Podrá usar más tarde «Añadir buzón» para acceder a este buzón nuevamente\n"
-"¿Qué desea hacer?"
+"¿Qué quiere hacer?"
 
 # src/pref-manager.c:1058
 # src/pref-manager.c:1188
-#: ../src/mailbox-conf.c:455
+#: ../src/mailbox-conf.c:440
 msgid "_Remove from list"
 msgstr "_Eliminar de la lista"
 
-#: ../src/mailbox-conf.c:499
+#: ../src/mailbox-conf.c:484
 #, c-format
 msgid "Folder deletion failed. Reason: %s"
-msgstr "Hubo un fallo al borrar la carpeta debido a: %s"
-
-# src/address-book-config.c:427 src/filter-edit-dialog.c:414
-# src/mailbox-conf.c:292 src/mailbox-conf.c:931 src/pref-manager.c:1099
-# src/pref-manager.c:2015
-# 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
-#: ../src/mailbox-conf.c:568 ../src/pref-manager.c:1712
-#: ../src/pref-manager.c:1784 ../src/pref-manager.c:2962
-msgid "_Add"
-msgstr "_Añadir"
+msgstr "Hubo un fallo al eliminar la carpeta debido a: %s"
 
 # src/mailbox-conf.c:485
 # src/mailbox-conf.c:490
-#: ../src/mailbox-conf.c:791
+#: ../src/mailbox-conf.c:780
 #, c-format
 msgid "%s on %s"
 msgstr "%s en %s"
 
 # src/mailbox-conf.c:581
-#: ../src/mailbox-conf.c:933
+#: ../src/mailbox-conf.c:920
 #, c-format
 msgid ""
 "Rename of %s to %s failed:\n"
@@ -4896,96 +5126,92 @@ msgstr ""
 
 # 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
-#: ../src/mailbox-conf.c:1144
+#: ../src/mailbox-conf.c:1105
 msgid "_Mailbox Name:"
 msgstr "_Nombre del buzón:"
 
 # libinit_balsa/balsa-druid-page-user.gob:155
 # libinit_balsa/balsa-druid-page-user.gob:156
-#: ../src/mailbox-conf.c:1153
+#: ../src/mailbox-conf.c:1114
 #, c-format
-#| msgid ""
-#| "Local Mail Problem\n"
-#| "%s"
 msgid "Local %s Mailbox Properties"
 msgstr "Propiedades del buzón %s local"
 
 # src/mailbox-conf.c:718
 # src/mailbox-conf.c:793
-#: ../src/mailbox-conf.c:1154
+#: ../src/mailbox-conf.c:1115
 #, c-format
-#| msgid "Local MH mailbox..."
 msgid "New Local %s Mailbox"
 msgstr "Buzón local %s nuevo"
 
 # src/mailbox-conf.c:239
 # src/mailbox-conf.c:233
-#: ../src/mailbox-conf.c:1196
+#: ../src/mailbox-conf.c:1157
 msgid "Remote Mailbox Configurator"
 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:1221 ../src/mailbox-conf.c:1333
+#: ../src/mailbox-conf.c:1183 ../src/mailbox-conf.c:1297
 msgid "Mailbox _name:"
 msgstr "_Nombre del buzón:"
 
 # 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:1240 ../src/mailbox-conf.c:1367
+#: ../src/mailbox-conf.c:1202 ../src/mailbox-conf.c:1329
 msgid "Pass_word:"
 msgstr "_Contraseña:"
 
 # src/main-window.c:403
 # src/main-window.c:406
-#: ../src/mailbox-conf.c:1248
+#: ../src/mailbox-conf.c:1209
 msgid "_Delete messages from server after download"
-msgstr "_Borrar los mensajes del servidor después de descargarlos"
+msgstr "_Eliminar los mensajes del servidor después de descargarlos"
 
-#: ../src/mailbox-conf.c:1253
+#: ../src/mailbox-conf.c:1215
 msgid "_Enable check for new mail"
 msgstr "_Activar búsqueda de correo nuevo "
 
-#: ../src/mailbox-conf.c:1258
+#: ../src/mailbox-conf.c:1220
 msgid "_Filter messages through procmail"
 msgstr "_Filtrar mensajes a través de procmail"
 
 # src/filter-edit-dialog.c:490
 # src/filter-edit-dialog.c:436
-#: ../src/mailbox-conf.c:1262
+#: ../src/mailbox-conf.c:1224
 msgid "Fi_lter Command:"
 msgstr "Comando del fi_ltro:"
 
-#: ../src/mailbox-conf.c:1276
+#: ../src/mailbox-conf.c:1237
 msgid "Disable _APOP"
 msgstr "Desactivar _APOP"
 
 # 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:1347
+#: ../src/mailbox-conf.c:1310
 msgid "_Username:"
 msgstr "Nombre de _usuario:"
 
 # src/mailbox-conf.c:890
 # src/mailbox-conf.c:965
-#: ../src/mailbox-conf.c:1372
+#: ../src/mailbox-conf.c:1334
 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:1462
+#: ../src/mailbox-conf.c:1418
 msgid "_Identity:"
 msgstr "_Identidad:"
 
-#: ../src/mailbox-conf.c:1496 ../src/pref-manager.c:3428
+#: ../src/mailbox-conf.c:1441 ../src/pref-manager.c:3336
 msgid "Always"
 msgstr "Siempre"
 
-#: ../src/mailbox-conf.c:1500
+#: ../src/mailbox-conf.c:1445
 msgid ""
 "_Decrypt and check\n"
 "signatures automatically:"
@@ -4993,25 +5219,25 @@ msgstr ""
 "_Descifrar y comprobar\n"
 "firmas automáticamente:"
 
-#: ../src/mailbox-conf.c:1527
+#: ../src/mailbox-conf.c:1472
 msgid "Show _Recipient column instead of Sender"
 msgstr "Mostrar columna del _destinatario en vez del remitente"
 
-#: ../src/mailbox-conf.c:1540
+#: ../src/mailbox-conf.c:1486
 msgid "_Subscribe for new mail check"
 msgstr "_Suscribirse para comprobación de correo"
 
-#: ../src/mailbox-node.c:316
+#: ../src/mailbox-node.c:319
 msgid "The folder edition to be written."
 msgstr "La edición de la carpeta a ser escrita."
 
-#: ../src/mailbox-node.c:491
+#: ../src/mailbox-node.c:499
 #, c-format
 msgid "Scanning %s. Please wait..."
 msgstr "Escrutando %s. Espere por favor…"
 
 # src/mailbox-conf.c:581
-#: ../src/mailbox-node.c:507
+#: ../src/mailbox-node.c:515
 #, c-format
 msgid ""
 "Scanning of %s failed: %s\n"
@@ -5021,996 +5247,115 @@ msgstr ""
 "Compruebe la conexión de red."
 
 # src/mailbox-conf.c:581
-#: ../src/mailbox-node.c:509
+#: ../src/mailbox-node.c:517
 #, c-format
 msgid "Scanning of %s failed: %s"
 msgstr "Falló el escrutinio de %s: %s"
 
 # src/mailbox-conf.c:718
 # src/mailbox-conf.c:793
-#: ../src/mailbox-node.c:1046
+#: ../src/mailbox-node.c:1065
 msgid "Local _mbox mailbox..."
 msgstr "Buzón _mbox local…"
 
 # src/mailbox-conf.c:718
 # src/mailbox-conf.c:793
-#: ../src/mailbox-node.c:1048
+#: ../src/mailbox-node.c:1067
 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:1050
+#: ../src/mailbox-node.c:1069
 msgid "Local M_H mailbox..."
 msgstr "Buzón M_H local…"
 
 # libmutt/mbox.c:1066
-#: ../src/mailbox-node.c:1052
+#: ../src/mailbox-node.c:1071
 msgid "Remote _IMAP mailbox..."
 msgstr "Buzón _IMAP remoto…"
 
 # libmutt/mbox.c:1066
-#: ../src/mailbox-node.c:1055
+#: ../src/mailbox-node.c:1074
 msgid "Remote IMAP _folder..."
 msgstr "_Carpeta IMAP remota…"
 
 # libmutt/mbox.c:1066
-#: ../src/mailbox-node.c:1057
+#: ../src/mailbox-node.c:1076
 msgid "Remote IMAP _subfolder..."
 msgstr "_Subcarpeta IMAP remota…"
 
 #. clicked on the empty space
-#: ../src/mailbox-node.c:1068 ../src/mailbox-node.c:1084
+#: ../src/mailbox-node.c:1087 ../src/mailbox-node.c:1103
 msgid "_Rescan"
 msgstr "_Revisar"
 
 # src/mblist-window.c:450
 # src/mblist-window.c:473
-#: ../src/mailbox-node.c:1078 ../src/main-window.c:485
+#: ../src/mailbox-node.c:1097
 msgid "_Properties..."
 msgstr "_Propiedades…"
 
-# src/mblist-window.c:446
-# src/mblist-window.c:469
-#: ../src/mailbox-node.c:1094
-msgid "_Open"
-msgstr "_Abrir"
-
-#: ../src/mailbox-node.c:1108
+#: ../src/mailbox-node.c:1127
 msgid "_Subscribe"
 msgstr "_Suscribir"
 
-#: ../src/mailbox-node.c:1110
+#: ../src/mailbox-node.c:1129
 msgid "_Unsubscribe"
 msgstr "_Desuscribir"
 
 # src/mblist-window.c:456
 # src/mblist-window.c:479
-#: ../src/mailbox-node.c:1116
+#: ../src/mailbox-node.c:1135
 msgid "Mark as _Inbox"
 msgstr "Marcar como bandeja de _entrada"
 
 # src/mblist-window.c:457
 # src/mblist-window.c:480
-#: ../src/mailbox-node.c:1118
+#: ../src/mailbox-node.c:1137
 msgid "_Mark as Sentbox"
 msgstr "Marcar como bandeja de _salida"
 
 # src/mblist-window.c:458
 # src/mblist-window.c:481
-#: ../src/mailbox-node.c:1120
+#: ../src/mailbox-node.c:1139
 msgid "Mark as _Trash"
 msgstr "Marcar como _papelera"
 
 # src/mblist-window.c:459
 # src/mblist-window.c:482
-#: ../src/mailbox-node.c:1122
+#: ../src/mailbox-node.c:1141
 msgid "Mark as D_raftbox"
 msgstr "Marcar como bandeja de _borradores"
 
-#: ../src/mailbox-node.c:1125
+#: ../src/mailbox-node.c:1144
 msgid "_Empty trash"
 msgstr "_Vaciar la papelera"
 
-#: ../src/mailbox-node.c:1130
+#: ../src/mailbox-node.c:1149
 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:1218
+#: ../src/mailbox-node.c:1236
 #, 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:1231
+#: ../src/mailbox-node.c:1249
 #, 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:1262
+#: ../src/mailbox-node.c:1280
 #, c-format
 msgid "Local folder %s\n"
 msgstr "Carpeta local %s\n"
 
-#: ../src/main-window.c:322
-msgid "Balsa closes files and connections. Please wait..."
-msgstr "Balsa cierra los archivos y conexiones. Espere…"
-
-# src/balsa-mblist.c:218 src/mailbox-conf.c:950
-# src/balsa-mblist.c:218 src/mailbox-conf.c:1023
-#: ../src/main-window.c:347
-msgid "Mail_box"
-msgstr "_Buzón"
-
-# src/main-window.c:421
-# src/main-window.c:428
-#: ../src/main-window.c:348 ../src/message-window.c:243
-msgid "_Message"
-msgstr "_Mensaje"
-
-# libinit_balsa/balsa-druid-page-user.gob:104
-# libinit_balsa/balsa-druid-page-user.gob:104
-#: ../src/main-window.c:349
-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
-#: ../src/main-window.c:354
-msgid "Mail_boxes"
-msgstr "_Buzones"
-
-#. Less frequently used entries of the 'View' menu
-#. Less frequently used entries of the 'Message' menu
-#. Less frequently used entries of the 'File' menu
-#. Less frequently used entries of the 'Edit' menu
-#. Less frequently used entries of the 'Tools' menu
-#: ../src/main-window.c:356 ../src/main-window.c:361
-#: ../src/sendmsg-window.c:327 ../src/sendmsg-window.c:329
-#: ../src/sendmsg-window.c:331
-msgid "_More"
-msgstr "_Más"
-
-# src/main-window.c:267 src/message-window.c:61
-# src/main-window.c:269
-#: ../src/main-window.c:357
-msgid "_Headers"
-msgstr "_Cabeceras"
-
-# src/pref-manager.c:1087
-# src/pref-manager.c:1218
-#: ../src/main-window.c:358
-msgid "_Sort Mailbox"
-msgstr "_Ordenar buzón"
-
-# libmutt/mx.c:1065
-# libmutt/mx.c:1065
-#: ../src/main-window.c:359
-msgid "H_ide messages"
-msgstr "_Ocultar mensajes"
-
-#: ../src/main-window.c:362 ../src/sendmsg-window.c:325
-msgid "_Tools"
-msgstr "_Herramientas"
-
-# src/main-window.c:259
-# src/main-window.c:262
-#: ../src/main-window.c:363
-msgid "_Filters"
-msgstr "_Filtros"
-
-# src/main-window.c:259
-# src/main-window.c:262
-#: ../src/main-window.c:364
-msgid "F_ilters"
-msgstr "F_iltros"
-
-# src/main-window.c:259
-# src/main-window.c:262
-#: ../src/main-window.c:365 ../src/main-window.c:421
-msgid "Manage filters"
-msgstr "Administrar filtros"
-
-# libmutt/imap/util.c:43
-# libmutt/imap/util.c:43
-#. File menu items
-#. Not in the touchpad menu, but still available as a toolbar
-#. * button:
-#: ../src/main-window.c:370
-msgid "_Continue"
-msgstr "_Continuar"
-
-#: ../src/main-window.c:371
-msgid "Continue editing current message"
-msgstr "Continuar la edición del mensaje actual"
-
-#: ../src/main-window.c:373
-msgid "_Get New Mail"
-msgstr "_Obtener correo nuevo"
-
-#: ../src/main-window.c:374
-msgid "Fetch new incoming mail"
-msgstr "Bajar el correo nuevo entrante"
-
-#: ../src/main-window.c:375
-msgid "_Send Queued Mail"
-msgstr "_Enviar correo en cola"
-
-#: ../src/main-window.c:376
-msgid "Send messages from the outbox"
-msgstr "Enviar mensaje desde la bandeja de salida"
-
-#: ../src/main-window.c:379
-msgid "Send and _Receive Mail"
-msgstr "Enviar y _recibir correo"
-
-# libmutt/mx.c:1065
-# libmutt/mx.c:1065
-#: ../src/main-window.c:380
-msgid "Send and Receive messages"
-msgstr "Envía y recibe mensajes"
-
-#: ../src/main-window.c:382 ../src/message-window.c:244
-#: ../src/sendmsg-window.c:344
-msgid "Page _Setup"
-msgstr "Configuración de _página"
-
-#: ../src/main-window.c:383 ../src/message-window.c:245
-#: ../src/sendmsg-window.c:345
-msgid "Set up page for printing"
-msgstr "Configurar la página para impresión"
-
-# src/address-book.c:369
-# src/address-book.c:394
-#: ../src/main-window.c:384
-msgid "_Address Book..."
-msgstr "Libreta de _direcciones…"
-
-# libbalsa/address-book.c:163
-# libbalsa/address-book.c:170
-#: ../src/main-window.c:385
-msgid "Open the address book"
-msgstr "Abrir la libreta de direcciones"
-
-# src/filter-edit-dialog.c:783
-# src/filter-edit-dialog.c:693
-#: ../src/main-window.c:386
-msgid "Quit Balsa"
-msgstr "Salir de Balsa"
-
-# src/main-window.c:177
-# src/main-window.c:184
-#. File:New submenu items
-#: ../src/main-window.c:389
-msgid "_Message..."
-msgstr "_Mensaje…"
-
-# src/balsa-message.c:651
-# src/balsa-message.c:713
-#: ../src/main-window.c:390
-msgid "Compose a new message"
-msgstr "Redactar un mensaje nuevo"
-
-# src/mailbox-conf.c:718
-# src/mailbox-conf.c:793
-#: ../src/main-window.c:392
-msgid "Local mbox mailbox..."
-msgstr "Buzón mbox local…"
-
-#: ../src/main-window.c:393 ../src/main-window.c:402
-msgid "Add a new mbox style mailbox"
-msgstr "Añadir un buzón de estilo mbox"
-
-# src/mailbox-conf.c:718
-# src/mailbox-conf.c:793
-#: ../src/main-window.c:395
-msgid "Local Maildir mailbox..."
-msgstr "Buzón Maildir local…"
-
-# src/mailbox-conf.c:718
-# src/mailbox-conf.c:793
-#: ../src/main-window.c:396 ../src/main-window.c:405
-msgid "Add a new Maildir style mailbox"
-msgstr "Añadir un buzón tipo Maildir nuevo"
-
-# src/mailbox-conf.c:718
-# src/mailbox-conf.c:793
-#: ../src/main-window.c:398
-msgid "Local MH mailbox..."
-msgstr "Buzón MH local…"
-
-#: ../src/main-window.c:399 ../src/main-window.c:408
-msgid "Add a new MH style mailbox"
-msgstr "Añadir un buzón de estilo MH"
-
-# libmutt/mbox.c:1066
-#: ../src/main-window.c:401
-msgid "New mailbox..."
-msgstr "Buzón nuevo…"
-
-# src/mailbox-conf.c:718
-# src/mailbox-conf.c:793
-#: ../src/main-window.c:404
-msgid "New \"Maildir\" mailbox..."
-msgstr "Buzón «Maildir» nuevo…"
-
-# src/mailbox-conf.c:718
-# src/mailbox-conf.c:793
-#: ../src/main-window.c:407
-msgid "New \"MH\" mailbox..."
-msgstr "Buzón «MH» nuevo…"
-
-# libmutt/mbox.c:1066
-#: ../src/main-window.c:410 ../src/pref-manager.c:3281
-msgid "Remote IMAP mailbox..."
-msgstr "Buzón IMAP remoto…"
-
-# libmutt/mbox.c:1066
-#: ../src/main-window.c:411
-msgid "Add a new IMAP mailbox"
-msgstr "Añadir un buzón IMAP nuevo"
-
-# libmutt/mbox.c:1066
-#: ../src/main-window.c:412 ../src/pref-manager.c:3286
-msgid "Remote IMAP folder..."
-msgstr "Carpeta IMAP remota…"
-
-# src/pref-manager.c:1162
-# src/pref-manager.c:1298
-#: ../src/main-window.c:413
-msgid "Add a new IMAP folder"
-msgstr "Añadir una carpeta IMAP remota"
-
-# libmutt/mbox.c:1066
-#: ../src/main-window.c:414
-msgid "Remote IMAP subfolder..."
-msgstr "Subcarpeta IMAP remota…"
-
-# libmutt/mbox.c:1066
-#: ../src/main-window.c:415
-msgid "Add a new IMAP subfolder"
-msgstr "Añadir una subcarpeta IMAP"
-
-# src/main-window.c:259
-# src/main-window.c:262
-#: ../src/main-window.c:420
-msgid "F_ilters..."
-msgstr "F_iltros…"
-
-#. Export selected filters to a text file.
-#: ../src/main-window.c:423
-msgid "_Export Filters..."
-msgstr "_Exportar filtros…"
-
-#: ../src/main-window.c:424
-msgid "Export filters as Sieve scripts"
-msgstr "Exportar filtros como scripts Sieve"
-
-#: ../src/main-window.c:425
-msgid "Prefere_nces"
-msgstr "Prefere_ncias"
-
-#. View menu items
-#: ../src/main-window.c:428
-msgid "E_xpand All"
-msgstr "E_xpandir todo"
-
-#: ../src/main-window.c:429
-msgid "Expand all threads"
-msgstr "Expandir todos los hilos"
-
-#: ../src/main-window.c:430
-msgid "_Collapse All"
-msgstr "_Contraer todo"
-
-#: ../src/main-window.c:431
-msgid "Collapse all expanded threads"
-msgstr "Contraer todos los hilos expandidos"
-
-#: ../src/main-window.c:433 ../src/message-window.c:259
-msgid "Zoom _In"
-msgstr "A_cercar"
-
-#: ../src/main-window.c:434 ../src/message-window.c:260
-msgid "Increase magnification"
-msgstr "Incrementar el aumento"
-
-#: ../src/main-window.c:435 ../src/message-window.c:261
-msgid "Zoom _Out"
-msgstr "A_lejar"
-
-#: ../src/main-window.c:436 ../src/message-window.c:262
-msgid "Decrease magnification"
-msgstr "Decrementar el aumento"
-
-#. To warn msgfmt that the % sign isn't a format specifier:
-#: ../src/main-window.c:439 ../src/message-window.c:265
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Aumento al _100%"
-
-# src/filter-edit-dialog.c:626
-# src/filter-edit-dialog.c:538
-#: ../src/main-window.c:440 ../src/message-window.c:266
-msgid "No magnification"
-msgstr "Sin aumento"
-
-#. Mailbox menu item that does not require a mailbox
-#: ../src/main-window.c:443 ../src/main-window.c:444
-#: ../src/message-window.c:300 ../src/message-window.c:301
-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
-#: ../src/main-window.c:446
-msgid "Empty _Trash"
-msgstr "Vaciar _papelera"
-
-# src/main-window.c:403
-# src/main-window.c:406
-#: ../src/main-window.c:447
-msgid "Delete messages from the Trash mailbox"
-msgstr "Borrar los mensajes de la papelera"
-
-#. Settings menu items
-#: ../src/main-window.c:450
-msgid "_Toolbars..."
-msgstr "_Barras de herramientas…"
-
-#: ../src/main-window.c:451
-msgid "Customize toolbars"
-msgstr "Personalizar barras de herramientas"
-
-# src/main-window.c:259
-# src/main-window.c:262
-#: ../src/main-window.c:452
-msgid "_Identities..."
-msgstr "_Identidades…"
-
-#: ../src/main-window.c:453
-msgid "Create and set current identities"
-msgstr "Crear y establecer identidades actuales"
-
-# src/main-window.c:444
-# src/main-window.c:451
-#. Help menu items
-#: ../src/main-window.c:456
-msgid "_Contents"
-msgstr "Índ_ice"
-
-#: ../src/main-window.c:457
-msgid "Table of Contents"
-msgstr "Tabla de contenidos"
-
-# src/filter-edit-dialog.c:783
-# src/filter-edit-dialog.c:693
-#. license ?
-#: ../src/main-window.c:458 ../src/main-window.c:2723
-msgid "About Balsa"
-msgstr "Acerca de Balsa"
-
-# src/sendmsg-window.c:191
-# src/sendmsg-window.c:196
-#. Edit menu items
-#: ../src/main-window.c:465 ../src/message-window.c:253
-#: ../src/sendmsg-window.c:361
-msgid "Select _All"
-msgstr "Seleccionar _todo"
-
-#: ../src/main-window.c:467
-msgid "_Find"
-msgstr "_Buscar"
-
-#: ../src/main-window.c:469
-msgid "Find Ne_xt"
-msgstr "Buscar _siguiente"
-
-#. Mailbox menu items
-#: ../src/main-window.c:472 ../src/main-window.c:473
-#: ../src/message-window.c:298 ../src/message-window.c:299
-msgid "Next Message"
-msgstr "Mensaje siguiente"
-
-#: ../src/main-window.c:474 ../src/main-window.c:475
-#: ../src/message-window.c:303 ../src/message-window.c:304
-msgid "Previous Message"
-msgstr "Mensaje anterior"
-
-#: ../src/main-window.c:476 ../src/main-window.c:477
-#: ../src/message-window.c:305 ../src/message-window.c:306
-msgid "Next Flagged Message"
-msgstr "Siguiente mensaje marcado"
-
-# libmutt/mx.c:1065
-# libmutt/mx.c:1065
-#: ../src/main-window.c:479
-msgid "_Hide Messages"
-msgstr "_Ocultar mensajes"
-
-# src/filter-edit-dialog.c:783
-# src/filter-edit-dialog.c:693
-#: ../src/main-window.c:480
-msgid "_Reset Filter"
-msgstr "Restablecer _filtro"
-
-# src/filter-edit-dialog.c:783
-# src/filter-edit-dialog.c:693
-#: ../src/main-window.c:481
-msgid "Reset mailbox filter"
-msgstr "Restablecer filtro del buzón"
-
-# src/sendmsg-window.c:191
-# src/sendmsg-window.c:196
-#: ../src/main-window.c:482
-msgid "_Select All"
-msgstr "Seleccionar _todo"
-
-#: ../src/main-window.c:483
-msgid "Select all messages in current mailbox"
-msgstr "Seleccionar todos los mensajes en el buzón actual"
-
-#: ../src/main-window.c:486
-msgid "Edit the selected mailbox"
-msgstr "Editar el buzón seleccionado"
-
-# src/main-window.c:338
-# src/main-window.c:341
-#: ../src/main-window.c:487
-msgid "_Delete..."
-msgstr "_Borrar…"
-
-# libmutt/mbox.c:712
-#: ../src/main-window.c:488
-msgid "Delete the selected mailbox"
-msgstr "Borrar el buzón seleccionado"
-
-# libmutt/mx.c:1065
-# libmutt/mx.c:1065
-#: ../src/main-window.c:491 ../src/main-window.c:494
-msgid "E_xpunge Deleted Messages"
-msgstr "_Purgar los mensajes borrados"
-
-#: ../src/main-window.c:492 ../src/main-window.c:495
-msgid "Expunge messages marked as deleted in the current mailbox"
-msgstr "Purgar los mensajes marcados como borrados en el buzón actual"
-
-# src/main-window.c:399
-# src/main-window.c:401
-#: ../src/main-window.c:498
-msgid "Close mailbox"
-msgstr "Cerrar buzón"
-
-# src/filter-edit-dialog.c:783
-# src/filter-edit-dialog.c:693
-#: ../src/main-window.c:500
-msgid "Select _Filters"
-msgstr "Seleccionar _filtros"
-
-#: ../src/main-window.c:501
-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
-#: ../src/main-window.c:504
-msgid "_Remove Duplicates"
-msgstr "_Eliminar duplicados"
-
-# src/main-window.c:403
-# src/main-window.c:406
-#: ../src/main-window.c:505
-msgid "Remove duplicated messages from the current mailbox"
-msgstr "Eliminar los mensajes duplicados del buzón actual"
-
-#: ../src/main-window.c:515 ../src/message-window.c:269
-msgid "Reply to the current message"
-msgstr "Responder al mensaje actual"
-
-# src/main-window.c:302 src/message-window.c:113
-# src/main-window.c:308
-#: ../src/main-window.c:516 ../src/message-window.c:270
-msgid "Reply to _All..."
-msgstr "Responder a _todos…"
-
-#: ../src/main-window.c:517 ../src/message-window.c:271
-msgid "Reply to all recipients of the current message"
-msgstr "Responder a todos los destinatarios del mensaje actual"
-
-# src/main-window.c:302 src/message-window.c:113
-# src/main-window.c:308
-#: ../src/main-window.c:519 ../src/message-window.c:273
-msgid "Reply to _Group..."
-msgstr "Responder al _grupo…"
-
-#: ../src/main-window.c:520 ../src/message-window.c:274
-msgid "Reply to mailing list"
-msgstr "Responder a la lista de correo"
-
-#: ../src/main-window.c:522
-msgid "Store address of sender in addressbook"
-msgstr "Almacenar dirección del remitente en el libreta de direcciones"
-
-#: ../src/main-window.c:524 ../src/message-window.c:278
-msgid "_View Source..."
-msgstr "_Ver fuente…"
-
-#: ../src/main-window.c:525 ../src/message-window.c:279
-msgid "View source form of the message"
-msgstr "Ver el código fuente del mensaje"
-
-# src/message-window.c:120
-# src/message-window.c:114
-#. All three "Forward" actions and the "Pipe" action have the same
-#. * stock_id; the first in this list defines the action tied to the
-#. * toolbar's Forward button, so "ForwardDefault" must come before
-#. * the others.
-#: ../src/main-window.c:531
-msgid "_Forward..."
-msgstr "_Reenviar…"
-
-#: ../src/main-window.c:532 ../src/message-window.c:285
-msgid "Forward the current message"
-msgstr "Reenviar el mensaje actual"
-
-# src/main-window.c:310 src/message-window.c:120
-# src/main-window.c:315 src/message-window.c:114
-#: ../src/main-window.c:535 ../src/message-window.c:287
-msgid "_Forward attached..."
-msgstr "_Reenviar adjunto…"
-
-#: ../src/main-window.c:536 ../src/message-window.c:288
-msgid "Forward the current message as attachment"
-msgstr "Reenviar el mensaje actual como un adjunto"
-
-# src/balsa-index-page.c:486
-# src/balsa-index-page.c:534
-#: ../src/main-window.c:538 ../src/message-window.c:290
-msgid "Forward _inline..."
-msgstr "Reenviar _en línea…"
-
-#: ../src/main-window.c:539 ../src/message-window.c:291
-msgid "Forward the current message inline"
-msgstr "Reenviar el mensaje actual en línea"
-
-#: ../src/main-window.c:542
-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
-#: ../src/main-window.c:544
-msgid "Select _Thread"
-msgstr "Seleccionar con_versación"
-
-#: ../src/main-window.c:545
-msgid "Select all messages in current thread"
-msgstr "Seleccionar todos los mensajes en la conversación actual"
-
-# src/mblist-window.c:450
-# src/mblist-window.c:473
-#. File menu item
-#: ../src/main-window.c:553 ../src/message-window.c:246
-#: ../src/sendmsg-window.c:347
-msgid "_Print..."
-msgstr "_Imprimir…"
-
-# libmutt/mx.c:1375
-# libmutt/mx.c:1375
-#: ../src/main-window.c:554 ../src/message-window.c:247
-msgid "Print current message"
-msgstr "Imprimir el mensaje actual"
-
-#: ../src/main-window.c:555 ../src/message-window.c:275
-msgid "Save Current Part..."
-msgstr "Guardar parte actual…"
-
-#: ../src/main-window.c:556 ../src/message-window.c:276
-msgid "Save currently displayed part of message"
-msgstr "Guarda la parte mostrada actualmente del mensaje"
-
-#: ../src/main-window.c:559 ../src/message-window.c:293
-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
-#: ../src/main-window.c:560 ../src/message-window.c:294
-msgid "Next part in message"
-msgstr "Siguiente parte en el mensaje"
-
-#: ../src/main-window.c:561 ../src/message-window.c:295
-msgid "_Previous Part"
-msgstr "_Anterior parte"
-
-#: ../src/main-window.c:562 ../src/message-window.c:296
-msgid "Previous part in message"
-msgstr "Parte anterior en el mensaje"
-
-# src/balsa-message.c:651
-# src/balsa-message.c:713
-#: ../src/main-window.c:565
-msgid "Copy message"
-msgstr "Copiar mensaje"
-
-# libmutt/mx.c:1065
-# libmutt/mx.c:1065
-#: ../src/main-window.c:568
-msgid "Find in _Message"
-msgstr "Buscar en el _mensaje"
-
-# libmutt/imap/browse.c:93
-# libmutt/imap/browse.c:93
-#: ../src/main-window.c:569 ../src/message-window.c:256
-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
-#: ../src/main-window.c:579 ../src/message-window.c:308
-msgid "_Move to Trash"
-msgstr "_Mover a la papelera"
-
-#: ../src/main-window.c:580 ../src/main-window.c:584
-msgid "Move the current message to Trash mailbox"
-msgstr "Mueve el mensaje actual a la papelera"
-
-# src/balsa-index-page.c:495
-# src/balsa-index-page.c:546
-#: ../src/main-window.c:583
-msgid "_Delete to Trash"
-msgstr "_Borrar a la papelera"
-
-#: ../src/main-window.c:587 ../src/main-window.c:596
-msgid "Toggle New"
-msgstr "Conmutar nuevo"
-
-#: ../src/main-window.c:589
-msgid "_Toggle Flag"
-msgstr "_Conmutar marca"
-
-#: ../src/main-window.c:592
-msgid "Toggle flagged"
-msgstr "Conmutar marcados"
-
-# src/main-window.c:338
-# src/main-window.c:341
-#. Hide messages menu items
-#: ../src/main-window.c:593 ../src/main-window.c:628
-msgid "_Deleted"
-msgstr "_Borrado"
-
-#: ../src/main-window.c:594
-msgid "Toggle deleted flag"
-msgstr "Conmutar marca de borrado"
-
-# src/balsa-mblist.c:218
-# src/balsa-mblist.c:218
-#: ../src/main-window.c:597 ../src/main-window.c:640
-msgid "_Answered"
-msgstr "_Respondido"
-
-#: ../src/main-window.c:598
-msgid "Toggle Answered"
-msgstr "Conmutar respondido"
-
-# src/pref-manager.c:1087
-# src/pref-manager.c:1218
-#: ../src/main-window.c:605
-msgid "_Show Mailbox Tree"
-msgstr "Mo_strar árbol de buzones"
-
-#: ../src/main-window.c:606
-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
-#: ../src/main-window.c:608
-msgid "Show Mailbox _Tabs"
-msgstr "Mostrar _solapas del buzón"
-
-#: ../src/main-window.c:609
-msgid "Toggle display of mailbox notebook tabs"
-msgstr "Conmutar la muestra de solapas del buzón"
-
-#: ../src/main-window.c:611 ../src/message-window.c:315
-msgid "Show Too_lbar"
-msgstr "Mostrar barra de _herramientas"
-
-#: ../src/main-window.c:613
-msgid "Show St_atus Bar"
-msgstr "Mostrar barra de _estado"
-
-#: ../src/main-window.c:615
-msgid "Show _Index Filter"
-msgstr "Mostrar filtro índ_ice"
-
-#: ../src/main-window.c:618
-msgid "_Descending"
-msgstr "_Descendente"
-
-#: ../src/main-window.c:619
-msgid "Sort in a descending order"
-msgstr "Ordenar en orden descendente"
-
-# src/main-window.c:259
-# src/main-window.c:262
-#: ../src/main-window.c:621
-msgid "_View filter"
-msgstr "Filtro de _vista"
-
-#: ../src/main-window.c:622
-msgid "Enable quick message index filter"
-msgstr "Activar el filtro rápido de indexado de mensajes"
-
-#: ../src/main-window.c:625 ../src/message-window.c:317
-msgid "_Wrap"
-msgstr "_Auto-ajuste"
-
-#: ../src/main-window.c:625 ../src/message-window.c:317
-#: ../src/sendmsg-window.c:364
-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
-#: ../src/main-window.c:630
-msgid "Un_Deleted"
-msgstr "_Recuperado"
-
-#: ../src/main-window.c:632
-msgid "_Read"
-msgstr "_Leído"
-
-# src/balsa-mblist.c:218
-# src/balsa-mblist.c:218
-#: ../src/main-window.c:634
-msgid "Un_read"
-msgstr "_No leído"
-
-# src/main-window.c:352
-# src/main-window.c:353
-#: ../src/main-window.c:638
-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
-#: ../src/main-window.c:642
-msgid "Un_answered"
-msgstr "_No contestado"
-
-#. Toolbar items not on any menu
-#: ../src/main-window.c:645 ../src/toolbar-factory.c:161
-msgid ""
-"All\n"
-"headers"
-msgstr ""
-"Todas\n"
-"las cabeceras"
-
-# src/store-address.c:137
-# src/store-address.c:149
-#: ../src/main-window.c:646 ../src/message-window.c:320
-msgid "Show all headers"
-msgstr "Mostrar todas las cabeceras"
-
-#: ../src/main-window.c:648 ../src/toolbar-factory.c:163
-msgid "Msg Preview"
-msgstr "Vista previa del mensaje"
-
-#: ../src/main-window.c:649
-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
-#: ../src/main-window.c:655 ../src/message-window.c:326
-msgid "_No Headers"
-msgstr "_Sin cabeceras"
-
-#: ../src/main-window.c:656 ../src/message-window.c:327
-msgid "Display no headers"
-msgstr "No mostrar cabeceras"
-
-#: ../src/main-window.c:657
-msgid "S_elected Headers"
-msgstr "Cabeceras s_eleccionadas"
-
-#: ../src/main-window.c:658 ../src/message-window.c:329
-msgid "Display selected headers"
-msgstr "Mostrar las cabeceras seleccionadas"
-
-#: ../src/main-window.c:659 ../src/message-window.c:330
-msgid "All _Headers"
-msgstr "Todas las _cabeceras"
-
-#: ../src/main-window.c:660 ../src/message-window.c:331
-msgid "Display all headers"
-msgstr "Muestra todas las cabeceras"
-
-#: ../src/main-window.c:664
-msgid "_Flat index"
-msgstr "Índice _plano"
-
-#: ../src/main-window.c:665
-msgid "No threading at all"
-msgstr "Sin hilos"
-
-#: ../src/main-window.c:666
-msgid "Si_mple threading"
-msgstr "Conversaciones si_mples"
-
-#: ../src/main-window.c:667
-msgid "Simple threading algorithm"
-msgstr "Algoritmo de hilos simples"
-
-#: ../src/main-window.c:668
-msgid "_JWZ threading"
-msgstr "Conversaciones _JWZ"
-
-#: ../src/main-window.c:669
-msgid "Elaborate JWZ threading"
-msgstr "Elaborar conversaciones JWZ"
-
-#: ../src/main-window.c:674
-msgid "By _Arrival"
-msgstr "Por _llegada"
-
-#: ../src/main-window.c:675
-msgid "Arrival order"
-msgstr "Orden de llegada"
-
-# src/address-book.c:477
-# src/address-book.c:523
-#: ../src/main-window.c:676
-msgid "By _Sender"
-msgstr "Por _remitente"
-
-#: ../src/main-window.c:677
-msgid "Sender order"
-msgstr "Orden por remitente"
-
-# 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:678
-msgid "By S_ubject"
-msgstr "Por _asunto"
-
-# 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:679
-msgid "Subject order"
-msgstr "Orden por asunto"
-
-# src/filter-edit-dialog.c:45
-# src/filter-edit-dialog.c:44
-#: ../src/main-window.c:680
-msgid "By Si_ze"
-msgstr "Por _tamaño"
-
-#: ../src/main-window.c:681
-msgid "By message size"
-msgstr "Por tamaño del mensaje"
-
-#: ../src/main-window.c:682
-msgid "_Threaded"
-msgstr "_Conversaciones"
-
-#: ../src/main-window.c:683
-msgid "Use message threading"
-msgstr "Usar hilado en conversaciones"
-
-#: ../src/main-window.c:1032
+#: ../src/main-window.c:275
 msgid ""
 "Balsa is sending a mail now.\n"
 "Abort sending?"
@@ -6018,39 +5363,82 @@ msgstr ""
 "Balsa está enviando un correo ahora.\n"
 "¿Abortar el envío?"
 
-#: ../src/main-window.c:1202
+#: ../src/main-window.c:444
 msgid "Subject or Sender Contains:"
 msgstr "El asunto o el remitente contiene:"
 
-#: ../src/main-window.c:1203
+#: ../src/main-window.c:445
 msgid "Subject or Recipient Contains:"
 msgstr "El asunto o el receptor contiene:"
 
-#: ../src/main-window.c:1204
+#: ../src/main-window.c:446
 msgid "Subject Contains:"
 msgstr "El asunto contiene:"
 
-#: ../src/main-window.c:1205
+#: ../src/main-window.c:447
 msgid "Body Contains:"
 msgstr "El cuerpo contiene:"
 
-#: ../src/main-window.c:1206
+#: ../src/main-window.c:448
 msgid "Older than (days):"
 msgstr "Más antiguo que (días):"
 
-#: ../src/main-window.c:1207
+#: ../src/main-window.c:449
 msgid "Old at most (days):"
 msgstr "Como mucho más antiguo que (días):"
 
-# src/balsa-message.c:701
-# src/balsa-message.c:812
-#: ../src/main-window.c:2316
+#: ../src/main-window.c:965
+msgid "translator-credits"
+msgstr ""
+"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:976
+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:981
+msgid "About Balsa"
+msgstr "Acerca de Balsa"
+
+#: ../src/main-window.c:1003
+#, fuzzy
+#| msgid "Balsa closes files and connections. Please wait..."
+msgid "Balsa closes files and connections.Please wait..."
+msgstr "Balsa cierra los archivos y conexiones. Espere…"
+
+#: ../src/main-window.c:1396
+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:1416
 #, c-format
-msgid "Opening %s"
-msgstr "Abriendo %s"
+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:1422
+#, c-format
+msgid "Removed %d duplicate"
+msgid_plural "Removed %d duplicates"
+msgstr[0] "%d duplicado eliminado"
+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:1427
+msgid "No duplicates found"
+msgstr "No se encontraron duplicados"
 
 # libmutt/mbox.c:712
-#: ../src/main-window.c:2333
+#: ../src/main-window.c:2915
 #, c-format
 msgid ""
 "Unable to Open Mailbox!\n"
@@ -6059,95 +5447,68 @@ msgstr ""
 "No se pudo abrir el buzón\n"
 "%s."
 
-#: ../src/main-window.c:2706
-msgid "translator-credits"
-msgstr ""
-"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:2718
-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/balsa-message.c:701
+# src/balsa-message.c:812
+#: ../src/main-window.c:2950
+#, c-format
+msgid "Opening %s"
+msgstr "Abriendo %s"
 
 # src/pref-manager.c:971
 # src/pref-manager.c:1099
-#: ../src/main-window.c:2820 ../src/main-window.c:2838
+#: ../src/main-window.c:3253 ../src/main-window.c:3272
 msgid "Checking Mail..."
 msgstr "Comprobando correo…"
 
 # src/mailbox-conf.c:718
 # src/mailbox-conf.c:793
-#: ../src/main-window.c:3041
+#: ../src/main-window.c:3412
 #, 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:3045
+#: ../src/main-window.c:3416
 #, c-format
 msgid "Local mailbox: %s"
 msgstr "Buzón local: %s"
 
-#: ../src/main-window.c:3198
+#: ../src/main-window.c:3580
 msgid "Finished Checking."
 msgstr "La comprobación ha terminado."
 
 # libmutt/imap/imap_ssl.c:481
 # libmutt/imap/imap_ssl.c:481
-#: ../src/main-window.c:3263
+#: ../src/main-window.c:3645
 #, c-format
 msgid "Sending error: %s"
 msgstr "Enviando error: %s"
 
-#: ../src/main-window.c:3328
+#: ../src/main-window.c:3709
 #, 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:3331
+#: ../src/main-window.c:3712
 msgid "You have new mail."
 msgstr "Tiene correo nuevo."
 
-#: ../src/main-window.c:3372
-#, c-format
-msgid "Balsa: you have received %d new message."
-msgid_plural "Balsa: you have received %d new messages."
-msgstr[0] "Balsa: ha recibido %d mensaje nuevo."
-msgstr[1] "Balsa: ha recibido %d mensajes nuevos."
-
-#: ../src/main-window.c:3376
-msgid "Balsa: you have new mail."
-msgstr "Balsa: tiene correo nuevo."
-
-#: ../src/main-window.c:3431
+#: ../src/main-window.c:3780 ../src/main-window.c:3816
 msgid "Balsa: New mail"
 msgstr "Balsa: Correo nuevo"
 
-# libmutt/mx.c:1375
-# libmutt/mx.c:1375
-#: ../src/main-window.c:3720
-#, c-format
-msgid "The next unread message is in %s"
-msgstr "El siguiente mensaje no leído está en %s"
-
-#: ../src/main-window.c:3727
-#, c-format
-msgid "Do you want to select %s?"
-msgstr "¿Quiere seleccionar %s?"
-
 # src/main-window.c:399
 # src/main-window.c:401
-#: ../src/main-window.c:4261
+#: ../src/main-window.c:3940
 msgid "Search mailbox"
 msgstr "Buscar buzón"
 
 # src/filter-edit-dialog.c:570
 # src/filter-edit-dialog.c:491
-#: ../src/main-window.c:4281
+#: ../src/main-window.c:3964
 msgid "_Search for:"
 msgstr "_Buscar:"
 
@@ -6155,82 +5516,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:4294
+#: ../src/main-window.c:3977
 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:4305
+#: ../src/main-window.c:3989
 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:4310
+#: ../src/main-window.c:3994
 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:4331
+#: ../src/main-window.c:4015
 msgid "Open next matching message"
 msgstr "Abrir el siguiente mensaje coincidente"
 
-#: ../src/main-window.c:4342
+#: ../src/main-window.c:4027
 msgid "_Reverse search"
 msgstr "Búsqueda _invertida"
 
 # src/filter-edit-dialog.c:313
 # src/filter-edit-dialog.c:296
-#: ../src/main-window.c:4347
+#: ../src/main-window.c:4032
 msgid "_Wrap around"
 msgstr "_Ajustar cuerpo"
 
-#: ../src/main-window.c:4522
-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:4537
-#, 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:4543
-#, c-format
-msgid "Removed %d duplicate"
-msgid_plural "Removed %d duplicates"
-msgstr[0] "%d duplicado eliminado"
-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:4548
-msgid "No duplicates found"
-msgstr "No se encontraron duplicados"
-
 # libmutt/mbox.c:1028
-#: ../src/main-window.c:4777
+#: ../src/main-window.c:4250
 #, 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:4925
+#: ../src/main-window.c:4385
 #, c-format
 msgid "Balsa: %s (readonly)"
 msgstr "Balsa: %s (sólo lectura)"
 
 # src/filter-edit-dialog.c:783
 # src/filter-edit-dialog.c:693
-#: ../src/main-window.c:4927
+#: ../src/main-window.c:4387
 #, c-format
 msgid "Balsa: %s"
 msgstr "Balsa: %s"
@@ -6239,441 +5574,409 @@ 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:5496
+#: ../src/main-window.c:4884
 #, c-format
 msgid "Shown mailbox: %s "
 msgstr "Buzón mostrado: %s "
 
 # libmutt/mx.c:1375
 # libmutt/mx.c:1375
-#: ../src/main-window.c:5501
+#: ../src/main-window.c:4889
 #, 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:5508
+#: ../src/main-window.c:4896
 #, c-format
 msgid ", %d new"
 msgid_plural ", %d new"
 msgstr[0] ", %d nuevo"
 msgstr[1] ", %d nuevos"
 
-#: ../src/main-window.c:5515
+#: ../src/main-window.c:4903
 #, c-format
 msgid ", %d hidden"
 msgid_plural ", %d hidden"
 msgstr[0] ", %d oculto"
 msgstr[1] ", %d ocultos"
 
-# src/balsa-message.c:1316
-# src/balsa-message.c:1474
-#: ../src/main.c:208
-#, c-format
-msgid "Could not write to %s: %s"
-msgstr "No se pudo escribir en %s: %s"
-
-#: ../src/main.c:446 ../src/main.c:495
-msgid "Get new mail on startup"
-msgstr "Obtener el correo nuevo al iniciar"
-
-#: ../src/main.c:448 ../src/main.c:497
-msgid "Compose a new email to EMAIL@ADDRESS"
-msgstr "Redactar un correo-e nuevo a CORREO@DIRECCIÓN"
-
-#: ../src/main.c:450
-msgid "Attach file at PATH"
-msgstr "Adjuntar fichero en la ruta"
-
-#: ../src/main.c:452 ../src/main.c:502
-msgid "Opens MAILBOXNAME"
-msgstr "Abre NOMBREBUZÓN"
-
-#: ../src/main.c:452 ../src/main.c:502
-msgid "MAILBOXNAME"
-msgstr "NOMBREBUZÓN"
-
-# libmutt/mx.c:459 libmutt/mx.c:605
-# libmutt/mx.c:459 libmutt/mx.c:605
-#: ../src/main.c:455 ../src/main.c:505
-msgid "Opens first unread mailbox"
-msgstr "Abre el primer buzón no leído"
-
-#: ../src/main.c:458 ../src/main.c:508
-msgid "Opens default Inbox on startup"
-msgstr "Abre la bandeja de entrada predeterminado al inicio"
-
 # libmutt/mx.c:1375
 # libmutt/mx.c:1375
-#: ../src/main.c:461 ../src/main.c:511
-msgid "Prints number unread and unsent messages"
-msgstr "Imprimir el número de mensajes no leídos y no enviados"
-
-#: ../src/main.c:463 ../src/main.c:513
-msgid "Debug POP3 connection"
-msgstr "Depurar la conexión POP3"
-
-#: ../src/main.c:465 ../src/main.c:515
-msgid "Debug IMAP connection"
-msgstr "Depurar la conexión IMAP"
-
-#: ../src/main.c:487
-msgid "The Balsa E-Mail Client"
-msgstr "El cliente de correo-e Balsa"
-
-#: ../src/main.c:499
-msgid "Attach file at URI"
-msgstr "Adjuntar archivo al URI"
+#: ../src/main-window.c:4948
+#, c-format
+msgid "The next unread message is in %s"
+msgstr "El siguiente mensaje no leído está en %s"
 
-#: ../src/main.c:540
+#: ../src/main-window.c:4955
 #, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Ejecute «%s --help» para ver una lista completa de las opciones de línea de "
-"comandos disponibles.\n"
+msgid "Do you want to select %s?"
+msgstr "¿Quiere seleccionar %s?"
 
-#: ../src/main.c:587 ../src/main.c:592 ../src/main.c:598 ../src/main.c:604
-#: ../src/main.c:610
+#: ../src/main.c:126 ../src/main.c:131 ../src/main.c:137 ../src/main.c:143
+#: ../src/main.c:149
 #, c-format
 msgid "Balsa cannot open your \"%s\" mailbox."
 msgstr "Balsa no puede abrir su buzón «%s»."
 
 # libinit_balsa/balsa-druid-page-directory.gob:60
 # libinit_balsa/balsa-druid-page-directory.gob:60
-#: ../src/main.c:587
+#: ../src/main.c:126
 msgid "Inbox"
 msgstr "Bandeja de entrada"
 
 # libinit_balsa/balsa-druid-page-directory.gob:60
 # libinit_balsa/balsa-druid-page-directory.gob:60
-#: ../src/main.c:593
+#: ../src/main.c:132
 msgid "Outbox"
 msgstr "Bandeja de salida"
 
 # libinit_balsa/balsa-druid-page-directory.gob:60
 # libinit_balsa/balsa-druid-page-directory.gob:60
-#: ../src/main.c:599
+#: ../src/main.c:138
 msgid "Sentbox"
 msgstr "Correo enviado"
 
 # libinit_balsa/balsa-druid-page-directory.gob:60
 # libinit_balsa/balsa-druid-page-directory.gob:60
-#: ../src/main.c:605
+#: ../src/main.c:144
 msgid "Draftbox"
 msgstr "Borradores"
 
 # libinit_balsa/balsa-druid-page-directory.gob:60
 # libinit_balsa/balsa-druid-page-directory.gob:60
-#: ../src/main.c:610
+#: ../src/main.c:149
 msgid "Trash"
 msgstr "Papelera"
 
 # libmutt/mbox.c:1066
-#: ../src/main.c:832
+#: ../src/main.c:403
 msgid "Compressing mail folders..."
 msgstr "Comprimiendo las carpetas de correo…"
 
-# 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:242
-msgid "M_ove"
-msgstr "M_over"
+#: ../src/main.c:657
+msgid "Get new mail on startup"
+msgstr "Obtener el correo nuevo al iniciar"
 
-#: ../src/message-window.c:249
-msgid "Close the message window"
-msgstr "Cerrar la ventana del mensaje"
+#: ../src/main.c:659
+msgid "Compose a new email to EMAIL@ADDRESS"
+msgstr "Redactar un correo-e nuevo a CORREO@DIRECCIÓN"
 
-# libmutt/mx.c:1065
-# libmutt/mx.c:1065
-#: ../src/message-window.c:255
-msgid "_Find in message"
-msgstr "_Buscar en el mensaje"
+#: ../src/main.c:661
+msgid "Attach file at URI"
+msgstr "Adjuntar archivo al URI"
 
-#: ../src/message-window.c:309
-msgid "Move the message to Trash mailbox"
-msgstr "Mueve el mensaje actual a la papelera"
+#: ../src/main.c:664
+msgid "Opens MAILBOXNAME"
+msgstr "Abre NOMBREBUZÓN"
 
-#: ../src/message-window.c:316
-msgid "Show toolbar"
-msgstr "Mostrar barra de herramientas"
+#: ../src/main.c:664
+msgid "MAILBOXNAME"
+msgstr "NOMBREBUZÓN"
 
-# src/sendmsg-window.c:191
-# src/sendmsg-window.c:196
-#: ../src/message-window.c:328
-msgid "_Selected Headers"
-msgstr "Cabeceras _seleccionadas"
+# libmutt/mx.c:459 libmutt/mx.c:605
+# libmutt/mx.c:459 libmutt/mx.c:605
+#: ../src/main.c:667
+msgid "Opens first unread mailbox"
+msgstr "Abre el primer buzón no leído"
+
+#: ../src/main.c:670
+msgid "Opens default Inbox on startup"
+msgstr "Abre la bandeja de entrada predeterminado al inicio"
+
+# libmutt/mx.c:1375
+# libmutt/mx.c:1375
+#: ../src/main.c:673
+msgid "Prints number unread and unsent messages"
+msgstr "Imprimir el número de mensajes no leídos y no enviados"
+
+#: ../src/main.c:675
+msgid "Debug POP3 connection"
+msgstr "Depurar la conexión POP3"
+
+#: ../src/main.c:677
+msgid "Debug IMAP connection"
+msgstr "Depurar la conexión IMAP"
+
+#: ../src/main.c:678
+#, fuzzy
+#| msgid "Other options"
+msgid "Show help options"
+msgstr "Otras opciones"
+
+#: ../src/main.c:679
+#, fuzzy
+#| msgid "Show icon"
+msgid "Show version"
+msgstr "Mostrar icono"
+
+# 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:305
+msgid "M_ove"
+msgstr "M_over"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../src/message-window.c:1050
+#: ../src/message-window.c:747
 #, c-format
 msgid "Message from %s: %s"
 msgstr "Mensaje de %s: %s"
 
 # src/pref-manager.c:192
 # src/pref-manager.c:191
-#: ../src/pref-manager.c:402
+#: ../src/pref-manager.c:389
 msgid "While retrieving messages"
 msgstr "Al obtener mensajes"
 
 # src/pref-manager.c:1087
 # src/pref-manager.c:1218
-#: ../src/pref-manager.c:403
+#: ../src/pref-manager.c:390
 msgid "Until closed"
 msgstr "Hasta que se cierre"
 
-#: ../src/pref-manager.c:409
-msgid "Fast"
-msgstr "Rápido"
-
-#: ../src/pref-manager.c:410
-msgid "Normal"
-msgstr "Normal"
-
-#: ../src/pref-manager.c:411
-msgid "Bad spellers"
-msgstr "Ortografía incorrecta"
-
 # src/main-window.c:421
 # src/main-window.c:428
-#: ../src/pref-manager.c:417
+#: ../src/pref-manager.c:396
 msgid "Message number"
 msgstr "Número del mensaje"
 
 # src/address-book.c:477
 # src/address-book.c:523
-#: ../src/pref-manager.c:421
+#: ../src/pref-manager.c:400
 msgid "Sender"
 msgstr "Remitente"
 
-#: ../src/pref-manager.c:425
+#: ../src/pref-manager.c:404
 msgid "Flat"
 msgstr "Plano"
 
-#: ../src/pref-manager.c:427
+#: ../src/pref-manager.c:406
 msgid "JWZ"
 msgstr "JWZ"
 
 # src/filter-edit-dialog.c:783
 # src/filter-edit-dialog.c:693
 #. must NOT be modal
-#: ../src/pref-manager.c:523
+#: ../src/pref-manager.c:502
 msgid "Balsa Preferences"
 msgstr "Preferencias de Balsa"
 
 # libinit_balsa/balsa-druid-page-directory.gob:194
 # libinit_balsa/balsa-druid-page-directory.gob:194
-#: ../src/pref-manager.c:577
+#: ../src/pref-manager.c:555
 msgid "Mail options"
 msgstr "Opciones de correo"
 
 # libinit_balsa/balsa-druid-page-directory.gob:194
 # libinit_balsa/balsa-druid-page-directory.gob:194
-#: ../src/pref-manager.c:579
+#: ../src/pref-manager.c:557
 msgid "Display options"
 msgstr "Opciones de visualización"
 
 # src/address-book.c:369
 # src/address-book.c:394
-#: ../src/pref-manager.c:581 ../src/pref-manager.c:2909
+#: ../src/pref-manager.c:559 ../src/pref-manager.c:2811
 msgid "Address books"
 msgstr "Libretas de direcciones"
 
-#: ../src/pref-manager.c:585 ../src/toolbar-factory.c:157
+#: ../src/pref-manager.c:563 ../src/toolbar-factory.c:166
 msgid "Spelling"
 msgstr "Ortografía"
 
-#: ../src/pref-manager.c:589
+#: ../src/pref-manager.c:567
 msgid "Startup"
 msgstr "Inicio"
 
-#: ../src/pref-manager.c:591 ../src/pref-manager.c:2697
+#: ../src/pref-manager.c:569 ../src/pref-manager.c:2601
 msgid "Miscellaneous"
 msgstr "Varios"
 
 # src/pref-manager.c:1333
 # src/pref-manager.c:1476
-#: ../src/pref-manager.c:1411
+#: ../src/pref-manager.c:1386
 #, c-format
 msgid "%s (default)"
 msgstr "%s (predeterminado)"
 
 # src/pref-manager.c:1058
 # src/pref-manager.c:1188
-#: ../src/pref-manager.c:1671
+#: ../src/pref-manager.c:1652
 msgid "Remote mailbox servers"
 msgstr "Servidores de buzones remotos"
 
-#: ../src/pref-manager.c:1692 ../src/pref-manager.c:2930
-#: ../src/sendmsg-window.c:2978
+#: ../src/pref-manager.c:1673 ../src/pref-manager.c:2832
+#: ../src/sendmsg-window.c:2656
 msgid "Type"
 msgstr "Tipo"
 
 # 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
-#: ../src/pref-manager.c:1700
+#: ../src/pref-manager.c:1681
 msgid "Mailbox name"
 msgstr "Nombre del buzón"
 
 # src/filter-edit-dialog.c:313
 # src/filter-edit-dialog.c:296
-#: ../src/pref-manager.c:1714 ../src/pref-manager.c:1787
-#: ../src/pref-manager.c:2965
+#: ../src/pref-manager.c:1701 ../src/pref-manager.c:1774
+#: ../src/pref-manager.c:2875
 msgid "_Modify"
 msgstr "_Modificar"
 
 # libinit_balsa/balsa-druid-page-user.gob:94
 # libinit_balsa/balsa-druid-page-user.gob:94
-#: ../src/pref-manager.c:1728
+#: ../src/pref-manager.c:1715
 msgid "Local mail directory"
 msgstr "Directorio de correo _local:"
 
 # libinit_balsa/balsa-druid-page-user.gob:94
 # libinit_balsa/balsa-druid-page-user.gob:94
-#: ../src/pref-manager.c:1730
+#: ../src/pref-manager.c:1717
 msgid "Select your local mail directory"
 msgstr "Seleccione su directorio de correo local"
 
-#: ../src/pref-manager.c:1751
+#: ../src/pref-manager.c:1738
 msgid "Outgoing mail servers"
 msgstr "Servidores de correo saliente"
 
 # src/filter-edit-dialog.c:570
 # src/filter-edit-dialog.c:491
-#: ../src/pref-manager.c:1773
+#: ../src/pref-manager.c:1760
 msgid "Server name"
 msgstr "Nombre del servidor"
 
 # src/pref-manager.c:240
 # src/pref-manager.c:246
-#: ../src/pref-manager.c:1813
+#: ../src/pref-manager.c:1800
 msgid "Mail servers"
 msgstr "Servidores de correo"
 
-#: ../src/pref-manager.c:1815
+#: ../src/pref-manager.c:1802
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../src/pref-manager.c:1817
+#: ../src/pref-manager.c:1804
 msgid "Outgoing"
 msgstr "Saliente"
 
-#: ../src/pref-manager.c:1844
+#: ../src/pref-manager.c:1831
 msgid "Checking"
 msgstr "Comprobar"
 
-#: ../src/pref-manager.c:1850
+#: ../src/pref-manager.c:1837
 msgid "_Check mail automatically every"
 msgstr "_Comprobar el correo automáticamente cada"
 
 # src/pref-manager.c:1235
 # src/pref-manager.c:1376
-#: ../src/pref-manager.c:1861 ../src/pref-manager.c:2720
-#: ../src/pref-manager.c:2780
+#: ../src/pref-manager.c:1846 ../src/pref-manager.c:2624
+#: ../src/pref-manager.c:2683
 msgid "minutes"
 msgstr "minutos"
 
 # libmutt/mbox.c:1066
-#: ../src/pref-manager.c:1868
+#: ../src/pref-manager.c:1852
 msgid "Check _IMAP mailboxes"
 msgstr "Comprobar buzones _IMAP"
 
-#: ../src/pref-manager.c:1874
+#: ../src/pref-manager.c:1857
 msgid "Check INBOX _only"
 msgstr "Comprobar bandeja de entrada _sólo"
 
-#: ../src/pref-manager.c:1881
+#: ../src/pref-manager.c:1863
 msgid "When mail arrives:"
 msgstr "Cuando llega correo:"
 
 # src/balsa-message.c:651
 # src/balsa-message.c:713
-#: ../src/pref-manager.c:1886
+#: ../src/pref-manager.c:1868
 msgid "Display message"
 msgstr "Mostrar mensaje"
 
 # src/filter-edit-dialog.c:635
 # src/filter-edit-dialog.c:547
-#: ../src/pref-manager.c:1891
+#: ../src/pref-manager.c:1873
 msgid "Play sound"
 msgstr "Reproducir sonido"
 
-#: ../src/pref-manager.c:1896
+#: ../src/pref-manager.c:1878
 msgid "Show icon"
 msgstr "Mostrar icono"
 
-#: ../src/pref-manager.c:1905
+#: ../src/pref-manager.c:1886
 msgid "Do background check quietly (no messages in status bar)"
 msgstr ""
 "Hacer la verificación en segundo plano silenciosamente (sin mensajes en la "
 "barra de estado)"
 
-#: ../src/pref-manager.c:1910
+#: ../src/pref-manager.c:1890
 msgid "_POP message size limit:"
 msgstr "Límite del tamaño del mensaje _POP:"
 
 #. Quoted text regular expression
 #. and RFC2646-style flowed text
-#: ../src/pref-manager.c:1938
+#: ../src/pref-manager.c:1916
 msgid "Quoted and flowed text"
 msgstr "Texto citado y volado"
 
 # src/sendmsg-window.c:891
 # src/sendmsg-window.c:934
-#: ../src/pref-manager.c:1943
+#: ../src/pref-manager.c:1921
 msgid "Mark quoted text"
 msgstr "Marcar el texto citado"
 
 # src/filter-edit-dialog.c:46
 # src/filter-edit-dialog.c:45
-#: ../src/pref-manager.c:1948
-msgid ""
-"Quoted text\n"
-"regular expression:"
+#: ../src/pref-manager.c:1925
+#, fuzzy
+#| msgid ""
+#| "Quoted text\n"
+#| "regular expression:"
+msgid "Quoted text regular expression:"
 msgstr ""
 "Expresión regular\n"
 "de texto citado:"
 
-#: ../src/pref-manager.c:1957
+#: ../src/pref-manager.c:1933
 msgid "Wrap text at"
 msgstr "Ajustar el texto en"
 
-#: ../src/pref-manager.c:1968 ../src/pref-manager.c:2135
+#: ../src/pref-manager.c:1941 ../src/pref-manager.c:2094
 msgid "characters"
 msgstr "caracteres"
 
 #. handling of multipart/alternative
-#: ../src/pref-manager.c:1983
+#: ../src/pref-manager.c:1956
 msgid "Display of multipart/alternative parts"
 msgstr "Mostrar partes Multipart/Alternative"
 
-#: ../src/pref-manager.c:1986
+#: ../src/pref-manager.c:1959
 msgid "Prefer text/plain over html"
 msgstr "Preferir text/plain antes que html"
 
-#: ../src/pref-manager.c:2002
+#: ../src/pref-manager.c:1975
 msgid "National (8-bit) characters in broken messages without codeset header"
 msgstr ""
 "Caracteres nacionales (8 bits) en mensajes rotos sin cabecera de conjunto de "
 "códigos"
 
-#: ../src/pref-manager.c:2009
+#: ../src/pref-manager.c:1982
 msgid "display as \"?\""
 msgstr "mostrar como «?»"
 
-#: ../src/pref-manager.c:2018
+#: ../src/pref-manager.c:1990
 msgid "display in codeset"
 msgstr "mostrar en el conjunto de códigos"
 
 # src/filter-edit-dialog.c:626
 # src/filter-edit-dialog.c:538
 #. How to handle received MDN requests
-#: ../src/pref-manager.c:2048
+#: ../src/pref-manager.c:2017
 msgid "Message disposition notification requests"
 msgstr "Solicitudes de notificación de entrega de mensaje"
 
-#: ../src/pref-manager.c:2050
+#: ../src/pref-manager.c:2019
 msgid ""
 "When I receive a message whose sender requested a Message Disposition "
 "Notification (MDN), send it if:"
@@ -6681,288 +5984,273 @@ msgstr ""
 "Cuando reciba un mensaje y su remitente solicite que devuelva una "
 "Notificación de Entrega de Mensaje (MDN), enviarla en los casos siguientes:"
 
-#: ../src/pref-manager.c:2062
+#: ../src/pref-manager.c:2031
+#, fuzzy
+#| msgid ""
+#| "The message header looks clean\n"
+#| "(the notify-to address is the return path,\n"
+#| "and I am in the \"To:\" or \"Cc:\" list)."
 msgid ""
-"The message header looks clean\n"
-"(the notify-to address is the return path,\n"
+"The message header looks clean (the notify-to address is the return path, "
 "and I am in the \"To:\" or \"Cc:\" list)."
 msgstr ""
 "La cabecera del mensaje parece limpia\n"
 "(la dirección de notificación es igual a la ruta de retorno,\n"
 "y yo estoy en la lista «Para:» o «Cc:»)."
 
-#: ../src/pref-manager.c:2079
+#: ../src/pref-manager.c:2045
 msgid "The message header looks suspicious."
 msgstr "La cabecera del mensaje parece sospechosa."
 
-#: ../src/pref-manager.c:2116
+#: ../src/pref-manager.c:2079
 msgid "Word wrap"
 msgstr "Ajuste de palabra"
 
-#: ../src/pref-manager.c:2121
+#: ../src/pref-manager.c:2084
 msgid "Wrap outgoing text at"
 msgstr "Ajustar el texto saliente en"
 
-#: ../src/pref-manager.c:2149
+#: ../src/pref-manager.c:2107
 msgid "Other options"
 msgstr "Otras opciones"
 
 # src/pref-manager.c:1007
 # src/pref-manager.c:1137
-#: ../src/pref-manager.c:2154
+#: ../src/pref-manager.c:2112
 msgid "Reply prefix:"
 msgstr "Prefijo de respuesta:"
 
-#: ../src/pref-manager.c:2157
+#: ../src/pref-manager.c:2115
 msgid "Automatically quote original when replying"
 msgstr "Citar automáticamente el original al responder"
 
-#: ../src/pref-manager.c:2160
+#: ../src/pref-manager.c:2118
 msgid "Forward a mail as attachment instead of quoting it"
 msgstr "Reenviar un correo como adjunto en vez de citarlo"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../src/pref-manager.c:2163
+#: ../src/pref-manager.c:2121
 msgid "Copy outgoing messages to sentbox"
 msgstr "Copiar mensajes salientes a bandeja de enviados"
 
-#: ../src/pref-manager.c:2165
+#: ../src/pref-manager.c:2123
 msgid "Send button always queues outgoing mail in outbox"
 msgstr "El botón de envío siempre encola el correo en la bandeja de salida"
 
-#: ../src/pref-manager.c:2168
+#: ../src/pref-manager.c:2126
 msgid "Edit headers in external editor"
 msgstr "Editar cabeceras en un editor externo"
 
-#: ../src/pref-manager.c:2170
+#: ../src/pref-manager.c:2128
 msgid "Include HTML parts as text when replying or forwarding"
 msgstr "Incluir partes HTML como texto al responder o reenviar correo"
 
-#: ../src/pref-manager.c:2187
+#: ../src/pref-manager.c:2145
 msgid "Layout"
 msgstr "Disposición"
 
-#: ../src/pref-manager.c:2189
+#: ../src/pref-manager.c:2147
 msgid "Sort and thread"
 msgstr "Ordenar y separar en conversaciones"
 
 # src/main-window.c:421
 # src/main-window.c:428
-#: ../src/pref-manager.c:2191 ../src/print-gtk.c:489
+#: ../src/pref-manager.c:2149 ../src/print-gtk.c:499
 msgid "Message"
 msgstr "Mensaje"
 
 # src/main-window.c:399
 # src/main-window.c:401
-#: ../src/pref-manager.c:2193
+#: ../src/pref-manager.c:2151
 msgid "Colors"
 msgstr "Colores"
 
-#: ../src/pref-manager.c:2195 ../src/pref-manager.c:2286
+#: ../src/pref-manager.c:2153 ../src/pref-manager.c:2240
 msgid "Format"
 msgstr "Formato"
 
-#: ../src/pref-manager.c:2197
+#: ../src/pref-manager.c:2155
 msgid "Status messages"
 msgstr "Mensajes de estado"
 
-#: ../src/pref-manager.c:2222 ../src/toolbar-prefs.c:168
+#: ../src/pref-manager.c:2180 ../src/toolbar-prefs.c:173
 msgid "Main window"
 msgstr "Ventana principal"
 
-#: ../src/pref-manager.c:2225
+#: ../src/pref-manager.c:2183
 msgid "Use preview pane"
 msgstr "Usar panel de vista previa"
 
-#: ../src/pref-manager.c:2227
+#: ../src/pref-manager.c:2185
 msgid "Show mailbox statistics in left pane"
 msgstr "Mostrar estadísticas de buzón en el panel izquierdo"
 
-#: ../src/pref-manager.c:2231
+#: ../src/pref-manager.c:2189
 msgid "Automatically view message when mailbox opened"
 msgstr "Ver mensaje automáticamente al abrir un buzón"
 
-#: ../src/pref-manager.c:2234
+#: ../src/pref-manager.c:2192
 msgid "Ask me before selecting a different mailbox to show an unread message"
 msgstr ""
 "Preguntarme antes de seleccionar un buzón diferente de correo para mostrar "
 "un mensaje sin leer"
 
-#: ../src/pref-manager.c:2240
+#: ../src/pref-manager.c:2198
 msgid "PageUp/PageDown keys scroll text by"
 msgstr "RePág/AvPág desplazan el texto"
 
-#: ../src/pref-manager.c:2251
+#: ../src/pref-manager.c:2206
 msgid "percent"
 msgstr "por ciento"
 
-#: ../src/pref-manager.c:2266
+#: ../src/pref-manager.c:2220
 msgid "Display progress dialog"
 msgstr "Mostrar diálogo de progreso"
 
-#: ../src/pref-manager.c:2291
+#: ../src/pref-manager.c:2245
 msgid "Date encoding (for strftime):"
 msgstr "Codificación de la fecha (para strtime):"
 
 # src/mailbox-conf.c:822 src/mailbox-conf.c:882
 # src/mailbox-conf.c:899 src/mailbox-conf.c:957
-#: ../src/pref-manager.c:2293
+#: ../src/pref-manager.c:2247
 msgid "Selected headers:"
 msgstr "Cabeceras seleccionadas:"
 
 # src/pref-manager.c:1459
 # src/pref-manager.c:1608
-#: ../src/pref-manager.c:2315
+#: ../src/pref-manager.c:2269
 msgid "Information messages"
 msgstr "Mensajes de información"
 
 # src/pref-manager.c:1459
 # src/pref-manager.c:1608
-#: ../src/pref-manager.c:2320
+#: ../src/pref-manager.c:2274
 msgid "Information messages:"
 msgstr "Mensajes de información:"
 
 # src/pref-manager.c:1491
 # src/pref-manager.c:1644
-#: ../src/pref-manager.c:2324
+#: ../src/pref-manager.c:2278
 msgid "Warning messages:"
 msgstr "Mensajes de advertencia:"
 
 # src/pref-manager.c:1491
 # src/pref-manager.c:1644
-#: ../src/pref-manager.c:2328
+#: ../src/pref-manager.c:2282
 msgid "Error messages:"
 msgstr "Mensajes de error:"
 
 # src/pref-manager.c:1491
 # src/pref-manager.c:1644
-#: ../src/pref-manager.c:2332
+#: ../src/pref-manager.c:2286
 msgid "Fatal error messages:"
 msgstr "Mensajes de error fatal:"
 
-#: ../src/pref-manager.c:2336
+#: ../src/pref-manager.c:2290
 msgid "Debug messages:"
 msgstr "Mensajes de depuración:"
 
 # src/main-window.c:421
 # src/main-window.c:428
-#: ../src/pref-manager.c:2362
+#: ../src/pref-manager.c:2315
 msgid "Message colors"
 msgstr "Colores del mensaje"
 
-#: ../src/pref-manager.c:2367
+#: ../src/pref-manager.c:2321
 #, c-format
 msgid "Quote level %d color"
 msgstr "Color del nivel de cita %d"
 
-#: ../src/pref-manager.c:2380
+#: ../src/pref-manager.c:2334
 msgid "Link color"
 msgstr "Color del enlace"
 
-#: ../src/pref-manager.c:2382
+#: ../src/pref-manager.c:2336
 msgid "Hyperlink color"
 msgstr "Color del hiperenlace"
 
-#: ../src/pref-manager.c:2393
-msgid "Composition window"
-msgstr "Ventana de redacción"
-
-#: ../src/pref-manager.c:2397
-msgid "Invalid or incomplete address label color"
-msgstr "Color de etiqueta de dirección errónea o incompleta"
-
-#: ../src/pref-manager.c:2483 ../src/print-gtk.c:498
+#: ../src/pref-manager.c:2422 ../src/print-gtk.c:508
 msgid "Fonts"
 msgstr "Tipografías"
 
 # src/main-window.c:421
 # src/main-window.c:428
-#: ../src/pref-manager.c:2487
+#: ../src/pref-manager.c:2428
+#, fuzzy
+#| msgid "Message font:"
+msgid "Use system fonts"
+msgstr "Tipografía del mensaje:"
+
+# src/main-window.c:421
+# src/main-window.c:428
+#: ../src/pref-manager.c:2436
 msgid "Message font:"
 msgstr "Tipografía del mensaje:"
 
-#: ../src/pref-manager.c:2492
+#: ../src/pref-manager.c:2443
 msgid "Subject font:"
 msgstr "Tipografía del asunto:"
 
-#: ../src/pref-manager.c:2498
+#: ../src/pref-manager.c:2451
 msgid "Use default font size"
 msgstr "Usar tamaño de tipografía predeterminado"
 
-#: ../src/pref-manager.c:2546
+#: ../src/pref-manager.c:2507
 msgid "Sorting and threading"
 msgstr "Ordenar y conversaciones"
 
-#: ../src/pref-manager.c:2550
+#: ../src/pref-manager.c:2511
 msgid "Default sort column:"
 msgstr "Columna de ordenación predeterminada:"
 
-#: ../src/pref-manager.c:2554
+#: ../src/pref-manager.c:2515
 msgid "Default threading style:"
 msgstr "Estilo de conversación predeterminado:"
 
 # src/pref-manager.c:1087
 # src/pref-manager.c:1218
-#: ../src/pref-manager.c:2559
+#: ../src/pref-manager.c:2520
 msgid "Expand threads on open"
 msgstr "Expandir conversaciones al abrir"
 
-# libinit_balsa/balsa-druid-page-user.gob:104
-# libinit_balsa/balsa-druid-page-user.gob:104
-#: ../src/pref-manager.c:2634
-msgid "Pspell settings"
-msgstr "Configuración de Pspell"
-
-#: ../src/pref-manager.c:2640
-msgid "Spell check module"
-msgstr "Módulo de comprobación ortográfica"
-
-#: ../src/pref-manager.c:2646
-msgid "Suggestion level"
-msgstr "Nivel de sugerencia"
-
-#. do the ignore length
-#: ../src/pref-manager.c:2651
-msgid "Ignore words shorter than"
-msgstr "Ignorar palabras más cortas que"
-
-#: ../src/pref-manager.c:2669
+#: ../src/pref-manager.c:2573
 msgid "Miscellaneous spelling settings"
 msgstr "Ajustes de ortografía varios"
 
 # src/pref-manager.c:237 src/pref-manager.c:949 src/pref-manager.c:1027
 # src/pref-manager.c:1838
-#: ../src/pref-manager.c:2671
+#: ../src/pref-manager.c:2575
 msgid "Check signature"
 msgstr "Comprobar firma"
 
-#: ../src/pref-manager.c:2672
+#: ../src/pref-manager.c:2576
 msgid "Check quoted"
 msgstr "Comprobar citado"
 
-#: ../src/pref-manager.c:2699
+#: ../src/pref-manager.c:2603
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../src/pref-manager.c:2700
+#: ../src/pref-manager.c:2604
 msgid "Empty trash on exit"
 msgstr "Vaciar la papelera al salir"
 
-#: ../src/pref-manager.c:2707
+#: ../src/pref-manager.c:2611
 msgid "Close mailbox if unused more than"
 msgstr "Cerrar buzón si no se usa más de"
 
 # libmutt/imap/browse.c:93
 # libmutt/imap/browse.c:93
-#: ../src/pref-manager.c:2735
+#: ../src/pref-manager.c:2639
 msgid "Deleting messages"
-msgstr "Borrado de mensajes"
+msgstr "Eliminación de mensajes"
 
 #. Translators: this used to be "using Mailbox -> Hide messages";
 #. * the UTF-8 string for the right-arrow symbol is broken out to
 #. * avoid msgconv problems.
-#: ../src/pref-manager.c:2740
+#: ../src/pref-manager.c:2644
 #, c-format
 msgid ""
 "The following setting is global, but may be overridden for the selected "
@@ -6973,53 +6261,53 @@ msgstr ""
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../src/pref-manager.c:2752
+#: ../src/pref-manager.c:2656
 msgid "Hide messages marked as deleted"
 msgstr "Ocultar mensajes marcados como borrados"
 
-#: ../src/pref-manager.c:2754
+#: ../src/pref-manager.c:2658
 msgid "The following settings are global:"
 msgstr "Los siguientes ajustes son globales:"
 
-#: ../src/pref-manager.c:2760
+#: ../src/pref-manager.c:2664
 msgid "Expunge deleted messages when mailbox is closed"
 msgstr "Purgar los mensajes borrados cuando se cierra un buzón"
 
-#: ../src/pref-manager.c:2767
+#: ../src/pref-manager.c:2671
 msgid "...and if unused more than"
 msgstr "… y si el buzón no se usa más de"
 
 # src/main-window.c:421
 # src/main-window.c:428
-#: ../src/pref-manager.c:2792 ../src/toolbar-prefs.c:182
+#: ../src/pref-manager.c:2695 ../src/toolbar-prefs.c:195
 msgid "Message window"
 msgstr "Ventana del mensaje"
 
-#: ../src/pref-manager.c:2797
+#: ../src/pref-manager.c:2700
 msgid "After moving a message:"
 msgstr "Después de mover un mensaje:"
 
-#: ../src/pref-manager.c:2826
+#: ../src/pref-manager.c:2726
 msgid "Startup options"
 msgstr "Opciones de inicio"
 
-#: ../src/pref-manager.c:2829
+#: ../src/pref-manager.c:2729
 msgid "Open Inbox upon startup"
 msgstr "Abrir bandeja de entrada al inicio"
 
-#: ../src/pref-manager.c:2831
+#: ../src/pref-manager.c:2731
 msgid "Check mail upon startup"
 msgstr "Comprobar correo al inicio"
 
-#: ../src/pref-manager.c:2833
+#: ../src/pref-manager.c:2733
 msgid "Remember open mailboxes between sessions"
 msgstr "Recordar buzones abiertos entre sesiones"
 
-#: ../src/pref-manager.c:2847
+#: ../src/pref-manager.c:2747
 msgid "Folder scanning"
 msgstr "Escrutinio de carpetas"
 
-#: ../src/pref-manager.c:2849
+#: ../src/pref-manager.c:2749
 msgid ""
 "Choose depth 1 for fast startup; this defers scanning some folders.  To see "
 "more of the tree at startup, choose a greater depth."
@@ -7028,118 +6316,144 @@ msgstr ""
 "algunas carpetas. Para ver más del árbol al inicio, elija una profundidad "
 "mayor."
 
-#: ../src/pref-manager.c:2860
+#: ../src/pref-manager.c:2760
 msgid "Scan local folders to depth"
 msgstr "Inspeccionar las carpetas locales hasta la profundidad"
 
-#: ../src/pref-manager.c:2873
+#: ../src/pref-manager.c:2772
 msgid "Scan IMAP folders to depth"
 msgstr "Inspeccionar las carpetas IMAP hasta la profundidad"
 
 # src/pref-manager.c:1999
 # src/pref-manager.c:2225
-#: ../src/pref-manager.c:2938
+#: ../src/pref-manager.c:2840
 msgid "Address book name"
 msgstr "Nombre de la libreta de direcciones"
 
-#: ../src/pref-manager.c:2946
+#: ../src/pref-manager.c:2848
 msgid "Auto-complete"
 msgstr "Auto-completado"
 
-#: ../src/pref-manager.c:2971
+#: ../src/pref-manager.c:2881
 msgid "_Set as default"
 msgstr "_Establecer como predeterminado"
 
 # libmutt/mbox.c:1066
-#: ../src/pref-manager.c:3276
+#: ../src/pref-manager.c:3188
 msgid "Remote POP3 mailbox..."
 msgstr "Buzón POP3 remoto…"
 
-#: ../src/pref-manager.c:3408
+# libmutt/mbox.c:1066
+#: ../src/pref-manager.c:3192
+msgid "Remote IMAP mailbox..."
+msgstr "Buzón IMAP remoto…"
+
+# libmutt/mbox.c:1066
+#: ../src/pref-manager.c:3196
+msgid "Remote IMAP folder..."
+msgstr "Carpeta IMAP remota…"
+
+#: ../src/pref-manager.c:3315
 msgid "Show nothing"
 msgstr "No mostrar nada"
 
-#: ../src/pref-manager.c:3410
+#: ../src/pref-manager.c:3317
 msgid "Show dialog"
 msgstr "Mostrar diálogo"
 
-#: ../src/pref-manager.c:3412
+#: ../src/pref-manager.c:3319
 msgid "Show in list"
 msgstr "Mostrar en lista"
 
-#: ../src/pref-manager.c:3414
+#: ../src/pref-manager.c:3321
 msgid "Show in status bar"
 msgstr "Mostrar en la barra de estado"
 
 # src/filter-edit-dialog.c:54
 # src/filter-edit-dialog.c:52
-#: ../src/pref-manager.c:3416
+#: ../src/pref-manager.c:3323
 msgid "Print to console"
 msgstr "Imprimir en la consola"
 
-#: ../src/pref-manager.c:3427
+#: ../src/pref-manager.c:3335
 msgid "Ask me"
 msgstr "Preguntarme"
 
 # src/pref-manager.c:1333
 # src/pref-manager.c:1476
-#: ../src/pref-manager.c:3543
+#: ../src/pref-manager.c:3467
 msgid "Default layout"
 msgstr "Distribución predeterminada"
 
 # libmutt/mx.c:1065
 # libmutt/mx.c:1065
-#: ../src/pref-manager.c:3544
+#: ../src/pref-manager.c:3468
 msgid "Wide message layout"
 msgstr "Distribución de mensaje ancho"
 
-#: ../src/pref-manager.c:3545
+#: ../src/pref-manager.c:3469
 msgid "Wide screen layout"
 msgstr "Distribución de pantalla ancha"
 
 # libmutt/mx.c:1375
 # libmutt/mx.c:1375
-#: ../src/pref-manager.c:3553
+#: ../src/pref-manager.c:3477
 msgid "Show next unread message"
 msgstr "Muestra el siguiente mensaje no leído"
 
-#: ../src/pref-manager.c:3554
+#: ../src/pref-manager.c:3478
 msgid "Show next message"
 msgstr "Mostrar mensaje siguiente"
 
-#: ../src/pref-manager.c:3555
+#: ../src/pref-manager.c:3479
 msgid "Close message window"
 msgstr "Cerrar la ventana del mensaje"
 
-#: ../src/pref-manager.c:3596
+#: ../src/pref-manager.c:3532
 #, c-format
-msgid "Error displaying link_id %s: %s\n"
-msgstr "Error mostrando id_link %s: %s\n"
+msgid "Error displaying %s: %s\n"
+msgstr "Error mostrando %s: %s\n"
 
-#: ../src/print-gtk.c:91 ../src/print-gtk.c:242
+#: ../src/print-gtk.c:91 ../src/print-gtk.c:250
 #, c-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: ../src/print-gtk.c:145 ../src/print-gtk.c:164
+#: ../src/print-gtk.c:145 ../src/print-gtk.c:171
 msgid "Signed and encrypted matter"
 msgstr "Impreso firmado y cifrado"
 
 # libmutt/imap/auth.c:373
 # libmutt/imap/auth.c:373
-#: ../src/print-gtk.c:149 ../src/print-gtk.c:168
+#: ../src/print-gtk.c:149 ../src/print-gtk.c:175
 msgid "Signed matter"
 msgstr "Impreso firmado"
 
-#: ../src/print-gtk.c:192
+#: ../src/print-gtk.c:156
+#, fuzzy
+#| msgid "encrypted parts"
+msgid "Encrypted matter"
+msgstr "partes cifradas"
+
+#: ../src/print-gtk.c:199
 #, c-format
 msgid "This is an inline %s signed %s message part:"
 msgstr "Esta es una parte del mensaje %s firmada %s con:"
 
-#: ../src/print-gtk.c:346
-#, c-format
-msgid "Cannot print page %d because the document has only %d pages."
-msgstr ""
+# src/mblist-window.c:446
+# src/mblist-window.c:469
+#: ../src/print-gtk.c:201
+msgid "OpenPGP"
+msgstr "OpenPGP"
+
+#: ../src/print-gtk.c:354
+#, fuzzy, c-format
+#| msgid "Cannot print page %d because the document has only %d pages."
+msgid "Cannot print page %d because the document has only %d page."
+msgid_plural "Cannot print page %d because the document has only %d pages."
+msgstr[0] ""
+"No se puede imprimir la página %d porque el documento sólo tiene %d páginas."
+msgstr[1] ""
 "No se puede imprimir la página %d porque el documento sólo tiene %d páginas."
 
 # src/pref-manager.c:1333
@@ -7150,76 +6464,76 @@ msgstr ""
 #. * Do *not* translate it to "predefinito:mm", if it
 #. * it isn't default:mm or default:inch it will not work
 #.
-#: ../src/print-gtk.c:380
+#: ../src/print-gtk.c:392
 msgid "default:mm"
 msgstr "default:mm"
 
-#: ../src/print-gtk.c:437
+#: ../src/print-gtk.c:448
 msgid "inch"
 msgstr "pulgadas"
 
-#: ../src/print-gtk.c:444
+#: ../src/print-gtk.c:455
 msgid "mm"
 msgstr "mm"
 
-#: ../src/print-gtk.c:519
+#: ../src/print-gtk.c:529
 msgid "_Header Font:"
 msgstr "Tipografía de _cabecera:"
 
-#: ../src/print-gtk.c:522
+#: ../src/print-gtk.c:532
 msgid "B_ody Font:"
 msgstr "Tipografía del c_uerpo:"
 
-#: ../src/print-gtk.c:525
+#: ../src/print-gtk.c:535
 msgid "_Footer Font:"
 msgstr "Tipografía del _pie de página:"
 
-#: ../src/print-gtk.c:532
+#: ../src/print-gtk.c:542
 msgid "Highlighting"
 msgstr "Resaltado"
 
-#: ../src/print-gtk.c:547
+#: ../src/print-gtk.c:557
 msgid "Highlight _cited text"
 msgstr "Texto resaltado _citado"
 
-#: ../src/print-gtk.c:556
+#: ../src/print-gtk.c:566
 msgid "Highlight _structured phrases"
 msgstr "Resaltar frases _estructuradas"
 
-#: ../src/print-gtk.c:567
+#: ../src/print-gtk.c:577
 msgid "Margins"
 msgstr "Márgenes"
 
 # src/sendmsg-window.c:222
 # src/sendmsg-window.c:226
-#: ../src/print-gtk.c:589
+#: ../src/print-gtk.c:599
 msgid "_Top"
 msgstr "_Arriba"
 
-#: ../src/print-gtk.c:595
+#: ../src/print-gtk.c:605
 msgid "_Bottom"
 msgstr "A_bajo"
 
-#: ../src/print-gtk.c:607
+#: ../src/print-gtk.c:617
 msgid "_Left"
 msgstr "_Izquierda"
 
-#: ../src/print-gtk.c:613
+#: ../src/print-gtk.c:623
 msgid "_Right"
 msgstr "_Derecha"
 
 # src/message-window.c:120
 # src/message-window.c:114
-#: ../src/print-gtk.c:739
+#: ../src/print-gtk.c:749
 #, c-format
 msgid "Error printing message: %s"
 msgstr "Error al imprimir el mensaje: %s"
 
-#: ../src/save-restore.c:601
+#: ../src/save-restore.c:594
 msgid "Error during filters loading: "
 msgstr "Error durante la carga de filtros: "
 
-#: ../src/save-restore.c:603
+#: ../src/save-restore.c:596
 #, c-format
 msgid ""
 "Error during filters loading: %s\n"
@@ -7228,11 +6542,11 @@ msgstr ""
 "Error durante la carga de filtros: %s\n"
 "Los filtros pueden tener errores."
 
-#: ../src/save-restore.c:727
+#: ../src/save-restore.c:717
 msgid "The option not to recognize \"format=flowed\" text has been removed."
 msgstr "La opción para reconocer «format=flowed» ha sido eliminada."
 
-#: ../src/save-restore.c:1008
+#: ../src/save-restore.c:996
 msgid ""
 "The option not to send \"format=flowed\" text is now on the Options menu of "
 "the compose window."
@@ -7240,14 +6554,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:1040
+#: ../src/save-restore.c:1028
 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:1122
+#: ../src/save-restore.c:1105
 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."
@@ -7255,488 +6569,194 @@ msgstr ""
 "Esta versión de Balsa usa una nueva interfaz; si ha cambiado las teclas "
 "rápidas de Balsa, deberá ajustarlas de nuevo."
 
-# libmutt/mbox.c:1066
-#: ../src/save-restore.c:2154
-msgid "Error opening GConf database\n"
-msgstr "Error al abrir la base de datos GConf\n"
-
-#: ../src/save-restore.c:2162 ../src/save-restore.c:2173
-#, c-format
-msgid "Error setting GConf field: %s\n"
-msgstr "Error al establecer el campo GConf: %s\n"
-
 #. Translators: please use the initial letter of each language as
 #. * its accelerator; this is a long list, and unique accelerators
 #. * cannot be found.
-#: ../src/sendmsg-window.c:257
+#: ../src/sendmsg-window.c:184
 msgid "_Brazilian Portuguese"
 msgstr "_Portugués brasileño"
 
-#: ../src/sendmsg-window.c:258
+#: ../src/sendmsg-window.c:185
 msgid "_Catalan"
 msgstr "_Catalán"
 
-#: ../src/sendmsg-window.c:259
+#: ../src/sendmsg-window.c:186
 msgid "_Chinese Simplified"
 msgstr "_Chino simplificado"
 
-#: ../src/sendmsg-window.c:260
+#: ../src/sendmsg-window.c:187
 msgid "_Chinese Traditional"
 msgstr "_Chino tradicional"
 
 # src/sendmsg-window.c:226
 # src/sendmsg-window.c:230
-#: ../src/sendmsg-window.c:261
+#: ../src/sendmsg-window.c:188
 msgid "_Czech"
 msgstr "_Checo"
 
-#: ../src/sendmsg-window.c:262
+#: ../src/sendmsg-window.c:189
 msgid "_Danish"
 msgstr "_Danés"
 
-#: ../src/sendmsg-window.c:263
+#: ../src/sendmsg-window.c:190
 msgid "_Dutch"
 msgstr "_Holandés"
 
-#: ../src/sendmsg-window.c:264
+#: ../src/sendmsg-window.c:191
 msgid "_English (American)"
 msgstr "_Inglés (americano)"
 
-#: ../src/sendmsg-window.c:265
+#: ../src/sendmsg-window.c:192
 msgid "_English (British)"
 msgstr "_Inglés (británico)"
 
-#: ../src/sendmsg-window.c:266
+#: ../src/sendmsg-window.c:193
 msgid "_Esperanto"
 msgstr "_Esperanto"
 
-#: ../src/sendmsg-window.c:267
+#: ../src/sendmsg-window.c:194
 msgid "_Estonian"
 msgstr "_Estonio"
 
-#: ../src/sendmsg-window.c:268
+#: ../src/sendmsg-window.c:195
 msgid "_Finnish"
 msgstr "_Finlandés"
 
-#: ../src/sendmsg-window.c:269
+#: ../src/sendmsg-window.c:196
 msgid "_French"
 msgstr "_Francés"
 
-#: ../src/sendmsg-window.c:270
+#: ../src/sendmsg-window.c:197
 msgid "_German"
 msgstr "_Alemán"
 
-#: ../src/sendmsg-window.c:271
+#: ../src/sendmsg-window.c:198
 msgid "_German (Austrian)"
 msgstr "_Alemán (Austríaco)"
 
-#: ../src/sendmsg-window.c:272
+#: ../src/sendmsg-window.c:199
 msgid "_German (Swiss)"
 msgstr "_Alemán (Suizo)"
 
-#: ../src/sendmsg-window.c:273
+#: ../src/sendmsg-window.c:200
 msgid "_Greek"
 msgstr "_Griego"
 
-#: ../src/sendmsg-window.c:274
+#: ../src/sendmsg-window.c:201
 msgid "_Hebrew"
 msgstr "_Hebreo"
 
-#: ../src/sendmsg-window.c:275
+#: ../src/sendmsg-window.c:202
 msgid "_Hungarian"
 msgstr "_Húngaro"
 
-#: ../src/sendmsg-window.c:276
+#: ../src/sendmsg-window.c:203
 msgid "_Italian"
 msgstr "_Italiano"
 
-#: ../src/sendmsg-window.c:277
+#: ../src/sendmsg-window.c:204
 msgid "_Japanese (JIS)"
 msgstr "_Japonés (JIS)"
 
-#: ../src/sendmsg-window.c:278
+#: ../src/sendmsg-window.c:205
 msgid "_Kazakh"
 msgstr "_Kazajo"
 
-#: ../src/sendmsg-window.c:279
+#: ../src/sendmsg-window.c:206
 msgid "_Korean"
 msgstr "_Coreano"
 
-#: ../src/sendmsg-window.c:280
+#: ../src/sendmsg-window.c:207
 msgid "_Latvian"
 msgstr "_Letón"
 
-#: ../src/sendmsg-window.c:281
+#: ../src/sendmsg-window.c:208
 msgid "_Lithuanian"
 msgstr "_Lituano"
 
-#: ../src/sendmsg-window.c:282
+#: ../src/sendmsg-window.c:209
 msgid "_Norwegian"
 msgstr "_Noruego"
 
-#: ../src/sendmsg-window.c:283
+#: ../src/sendmsg-window.c:210
 msgid "_Polish"
 msgstr "_Polaco"
 
-#: ../src/sendmsg-window.c:284
-msgid "_Portugese"
+#: ../src/sendmsg-window.c:211
+#, fuzzy
+#| msgid "_Portugese"
+msgid "_Portuguese"
 msgstr "_Portugués"
 
 # src/filter-edit-dialog.c:454
 # src/filter-edit-dialog.c:404
-#: ../src/sendmsg-window.c:285
+#: ../src/sendmsg-window.c:212
 msgid "_Romanian"
 msgstr "_Rumano"
 
-#: ../src/sendmsg-window.c:286
+#: ../src/sendmsg-window.c:213
 msgid "_Russian"
 msgstr "_Ruso"
 
-#: ../src/sendmsg-window.c:287
+#: ../src/sendmsg-window.c:214
 msgid "_Serbian"
 msgstr "_Servio"
 
-#: ../src/sendmsg-window.c:288
+#: ../src/sendmsg-window.c:215
 msgid "_Serbian (Latin)"
 msgstr "_Servio (Latino)"
 
-#: ../src/sendmsg-window.c:289
+#: ../src/sendmsg-window.c:216
 msgid "_Slovak"
 msgstr "_Eslovaco"
 
-#: ../src/sendmsg-window.c:290
+#: ../src/sendmsg-window.c:217
 msgid "_Spanish"
 msgstr "_Español"
 
-#: ../src/sendmsg-window.c:291
+#: ../src/sendmsg-window.c:218
 msgid "_Swedish"
 msgstr "_Sueco"
 
-#: ../src/sendmsg-window.c:292
+#: ../src/sendmsg-window.c:219
 msgid "_Tatar"
 msgstr "_Tártaro"
 
 # libinit_balsa/balsa-druid-page-directory.gob:60
 # libinit_balsa/balsa-druid-page-directory.gob:60
-#: ../src/sendmsg-window.c:293
+#: ../src/sendmsg-window.c:220
 msgid "_Turkish"
 msgstr "_Turco"
 
-#: ../src/sendmsg-window.c:294
+#: ../src/sendmsg-window.c:221
 msgid "_Ukrainian"
 msgstr "_Ucraniano"
 
-#: ../src/sendmsg-window.c:295
+#: ../src/sendmsg-window.c:222
 msgid "_Generic UTF-8"
 msgstr "_Genérico UTF-8"
 
-#: ../src/sendmsg-window.c:321
-msgid "_Show"
-msgstr "_Mostrar"
-
-#: ../src/sendmsg-window.c:322
-msgid "_Language"
-msgstr "_Idioma"
-
-# src/mblist-window.c:446
-# src/mblist-window.c:469
-#: ../src/sendmsg-window.c:323
-msgid "_Options"
-msgstr "_Opciones"
-
-#: ../src/sendmsg-window.c:333
-msgid "_Include File..."
-msgstr "_Incluir archivo…"
-
-# src/sendmsg-window.c:1434
-# src/sendmsg-window.c:1483
-#: ../src/sendmsg-window.c:334
-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
-#: ../src/sendmsg-window.c:335
-msgid "_Attach File..."
-msgstr "_Adjuntar archivo…"
-
-#: ../src/sendmsg-window.c:336
-msgid "Attach a file"
-msgstr "Adjuntar un archivo"
-
-#: ../src/sendmsg-window.c:337
-msgid "I_nclude Message(s)"
-msgstr "I_ncluir mensaje(s)"
-
-#: ../src/sendmsg-window.c:338
-msgid "Include selected message(s)"
-msgstr "Incluir los mensajes seleccionados"
-
-#: ../src/sendmsg-window.c:339
-msgid "Attach _Message(s)"
-msgstr "Adjuntar _mensaje(s)"
-
-#: ../src/sendmsg-window.c:340
-msgid "Attach selected message(s)"
-msgstr "Adjuntar los mensajes seleccionados"
-
-# src/balsa-message.c:1247
-# src/balsa-message.c:1417
-#: ../src/sendmsg-window.c:341
-msgid "_Save"
-msgstr "_Guardar"
-
-# libmutt/imap/browse.c:93
-# libmutt/imap/browse.c:93
-#: ../src/sendmsg-window.c:342
-msgid "Save this message"
-msgstr "Guardar este mensaje"
-
-# libmutt/mx.c:1065
-# libmutt/mx.c:1065
-#: ../src/sendmsg-window.c:348
-msgid "Print the edited message"
-msgstr "Imprime el mensaje editado"
-
-# src/balsa-mblist.c:218
-# src/balsa-mblist.c:218
-#: ../src/sendmsg-window.c:351
-msgid "_Undo"
-msgstr "_Deshacer"
-
-#: ../src/sendmsg-window.c:352
-msgid "Undo most recent change"
-msgstr "Deshacer el cambio más reciente"
-
-#: ../src/sendmsg-window.c:353
-msgid "_Redo"
-msgstr "_Rehacer"
-
-#: ../src/sendmsg-window.c:354
-msgid "Redo most recent change"
-msgstr "Rehacer el cambio más reciente"
-
-#: ../src/sendmsg-window.c:355
-msgid "Cu_t"
-msgstr "Cor_tar"
-
-#: ../src/sendmsg-window.c:356
-msgid "Cut the selected text"
-msgstr "Cortar el texto seleccionado"
-
-#: ../src/sendmsg-window.c:358
-msgid "Copy to the clipboard"
-msgstr "Copiar al portapapeles"
-
-#: ../src/sendmsg-window.c:359
-msgid "_Paste"
-msgstr "_Pegar"
-
-#: ../src/sendmsg-window.c:360
-msgid "Paste from the clipboard"
-msgstr "Pegar desde el portapapeles"
-
-# src/filter-edit-dialog.c:313
-# src/filter-edit-dialog.c:296
-#: ../src/sendmsg-window.c:363
-msgid "_Wrap Body"
-msgstr "_Ajustar cuerpo"
-
-# src/sendmsg-window.c:191
-# src/sendmsg-window.c:196
-#: ../src/sendmsg-window.c:365
-msgid "_Reflow Selected Text"
-msgstr "_Refluir texto seleccionado"
-
-# src/sendmsg-window.c:1434
-# src/sendmsg-window.c:1483
-#: ../src/sendmsg-window.c:367
-msgid "Insert Si_gnature"
-msgstr "Incl_uir firma"
-
-#: ../src/sendmsg-window.c:369
-msgid "_Quote Message(s)"
-msgstr "_Citar mensaje(s)"
-
-#: ../src/sendmsg-window.c:372 ../src/sendmsg-window.c:414
-msgid "C_heck Spelling"
-msgstr "Comprobar _ortografía"
-
-#: ../src/sendmsg-window.c:373 ../src/sendmsg-window.c:415
-msgid "Check the spelling of the message"
-msgstr "Comprueba la ortografía del mensaje"
-
-# src/pref-manager.c:234 src/pref-manager.c:867
-# src/pref-manager.c:236 src/pref-manager.c:992
-#: ../src/sendmsg-window.c:376
-msgid "Select _Identity..."
-msgstr "Seleccionar la _identidad…"
-
-# src/sendmsg-window.c:166
-# src/sendmsg-window.c:172
-#: ../src/sendmsg-window.c:377
-msgid "Select the Identity to use for the message"
-msgstr "Selecciona la identidad para usar en el mensaje"
-
-#: ../src/sendmsg-window.c:380
-msgid "_Edit with Gnome-Editor"
-msgstr "_Editar con Gnome-Editor"
-
-#: ../src/sendmsg-window.c:381
-msgid "Edit the current message with the default Gnome editor"
-msgstr "Edita el mensaje actual con el editor predeterminado de GNOME"
-
-# src/address-book.c:477
-# src/address-book.c:523
-#. All three "Send" and "Queue" actions have the same
-#. * stock_id; the first in this list defines the action tied to the
-#. * toolbar's "Send" button, so "ToolbarSend" must come before
-#. * the others.
-#: ../src/sendmsg-window.c:392 ../src/sendmsg-window.c:394
-msgid "Sen_d"
-msgstr "_Enviar"
-
-# libmutt/imap/browse.c:93
-# libmutt/imap/browse.c:93
-#: ../src/sendmsg-window.c:393 ../src/sendmsg-window.c:395
-msgid "Send this message"
-msgstr "Enviar este mensaje"
-
-#: ../src/sendmsg-window.c:397
-msgid "_Queue"
-msgstr "_Encolar"
-
-#: ../src/sendmsg-window.c:398 ../src/sendmsg-window.c:404
-msgid "Queue this message in Outbox for sending"
-msgstr "Encolar este mensaje en la bandeja de salida para enviarlo"
-
-#: ../src/sendmsg-window.c:400
-msgid "_Postpone"
-msgstr "_Posponer"
-
-# libmutt/imap/browse.c:93
-# libmutt/imap/browse.c:93
-#: ../src/sendmsg-window.c:401
-msgid "Save this message and close"
-msgstr "Guardar este mensaje y cerrar"
-
-# libmutt/imap/auth.c:373
-# libmutt/imap/auth.c:373
-#: ../src/sendmsg-window.c:403
-msgid "Send _Later"
-msgstr "Enviar _más tarde"
-
-#: ../src/sendmsg-window.c:406
-msgid "Sa_ve and Close"
-msgstr "_Guardar y cerrar"
-
-#: ../src/sendmsg-window.c:418
-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
-#: ../src/sendmsg-window.c:420
-msgid "F_rom"
-msgstr "_De:"
-
-#: ../src/sendmsg-window.c:422
-msgid "Rec_ipients"
-msgstr "Dest_inatarios"
-
-# src/sendmsg-window.c:885
-# src/sendmsg-window.c:928
-#: ../src/sendmsg-window.c:425
-msgid "R_eply To"
-msgstr "R_esponder a"
-
-# src/balsa-message.c:578
-# src/balsa-message.c:642
-#: ../src/sendmsg-window.c:428
-msgid "F_cc"
-msgstr "R_cc"
-
-# src/filter-edit-dialog.c:626
-# src/filter-edit-dialog.c:538
-#: ../src/sendmsg-window.c:431
-msgid "_Request Disposition Notification"
-msgstr "_Solicitar notificación de entrega"
-
-# src/filter-edit-dialog.c:626
-# src/filter-edit-dialog.c:538
-#: ../src/sendmsg-window.c:432
-msgid "Request Message Disposition Notification"
-msgstr "Solicitar notificación de entrega"
-
-#: ../src/sendmsg-window.c:434
-msgid "_Format = Flowed"
-msgstr "_Format = Flowed"
-
-#. Send as message/alternative with text/plain and text/html parts
-#: ../src/sendmsg-window.c:437
-msgid "Send as plain text and _HTML"
-msgstr "Enviar como texto plano y _HTML"
-
-#: ../src/sendmsg-window.c:441 ../src/sendmsg-window.c:447
-msgid "_Sign Message"
-msgstr "_Firmar mensaje"
-
-#: ../src/sendmsg-window.c:442
-msgid "Sign message using GPG"
-msgstr "Firma el mensaje usando GPG"
-
-#: ../src/sendmsg-window.c:443 ../src/sendmsg-window.c:450
-msgid "_Encrypt Message"
-msgstr "_Cifrar mensaje"
-
-#: ../src/sendmsg-window.c:444
-msgid "Encrypt message using GPG"
-msgstr "Cifrar el mensaje usando GPG"
-
-#: ../src/sendmsg-window.c:448
-msgid "signs the message using GnuPG"
-msgstr "firma el mensaje usando GnuPG"
-
-#: ../src/sendmsg-window.c:452
-msgid "signs the message using GnuPG for all To: and CC: recipients"
-msgstr ""
-"firma el mensaje usando GNUPG para todos los destinatarios en Para: y Cc:"
-
-#: ../src/sendmsg-window.c:462
-msgid "_GnuPG uses MIME mode"
-msgstr "_GnuPG usa el modo MIME"
-
-#: ../src/sendmsg-window.c:464
-msgid "_GnuPG uses old OpenPGP mode"
-msgstr "_GnuPG usa el modo antiguo OpenPGP"
-
-#: ../src/sendmsg-window.c:467
-msgid "_S/MIME mode (GpgSM)"
-msgstr "Modo _S/MIME (GpgSM)"
-
 # src/sendmsg-window.c:891
 # src/sendmsg-window.c:934
-#: ../src/sendmsg-window.c:679
+#: ../src/sendmsg-window.c:270
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: ../src/sendmsg-window.c:679
+#: ../src/sendmsg-window.c:270
 msgid "Inline"
 msgstr "En línea"
 
-#: ../src/sendmsg-window.c:679
+#: ../src/sendmsg-window.c:270
 msgid "Reference"
 msgstr "Referencia"
 
 # src/main-window.c:267 src/message-window.c:61
 # src/main-window.c:269
-#: ../src/sendmsg-window.c:920
+#: ../src/sendmsg-window.c:518
 msgid "(No name)"
 msgstr "(sin nombre)"
 
-#: ../src/sendmsg-window.c:926
+#: ../src/sendmsg-window.c:524
 #, c-format
 msgid ""
 "The message to '%s' is modified.\n"
@@ -7745,17 +6765,17 @@ msgstr ""
 "El mensaje a «%s» está modificado.\n"
 "¿Guardar mensaje en borradores?"
 
-#: ../src/sendmsg-window.c:1220
+#: ../src/sendmsg-window.c:819
 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:1276
+#: ../src/sendmsg-window.c:892
 msgid "Select Identity"
 msgstr "Seleccionar la identidad"
 
-#: ../src/sendmsg-window.c:1753
+#: ../src/sendmsg-window.c:1403
 #, c-format
 msgid ""
 "Saying yes will not send the file `%s' itself, but just a MIME message/"
@@ -7764,22 +6784,22 @@ msgid ""
 "\n"
 "Do you really want to attach this file as reference?"
 msgstr ""
-"Decir «sí» no enviará el archivo «%s» ,sino sólo una referencia MIME message/"
+"Decir «sí» no enviará el archivo «%s», sino sólo una referencia MIME message/"
 "external-body. \n"
-"Nótese que el destinatario debe tener los permisos apropiados para ver el "
-"archivo «real».\n"
+"Tenga en cuenta que el destinatario debe tener los permisos apropiados para "
+"ver el archivo «real».\n"
 "\n"
-"¿Desea realmente adjuntar este archivo como referencia?"
+"¿Quiere realmente adjuntar este archivo como referencia?"
 
-#: ../src/sendmsg-window.c:1766
+#: ../src/sendmsg-window.c:1416
 msgid "Attach as Reference?"
 msgstr "¿Adjuntar como referencia?"
 
-#: ../src/sendmsg-window.c:1859
+#: ../src/sendmsg-window.c:1537
 msgid "Choose charset"
 msgstr "Elegir conjunto de caracteres"
 
-#: ../src/sendmsg-window.c:1866
+#: ../src/sendmsg-window.c:1545
 #, c-format
 msgid ""
 "File\n"
@@ -7792,63 +6812,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:1886
+#: ../src/sendmsg-window.c:1565
 msgid "Attach as MIME type:"
 msgstr "Adjuntar como tipo MIME:"
 
-#: ../src/sendmsg-window.c:1942
+#: ../src/sendmsg-window.c:1626
 #, 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:1985 ../src/sendmsg-window.c:5706
+#: ../src/sendmsg-window.c:1669 ../src/sendmsg-window.c:5014
 msgid "(no subject)"
 msgstr "(Sin asunto)"
 
-#: ../src/sendmsg-window.c:2023
+#: ../src/sendmsg-window.c:1707
 #, 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:2031
+#: ../src/sendmsg-window.c:1715
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: ../src/sendmsg-window.c:2078
+#: ../src/sendmsg-window.c:1755
 msgid "forwarded message"
 msgstr "mensaje reenviado"
 
-#: ../src/sendmsg-window.c:2083
+#: ../src/sendmsg-window.c:1760
 #, 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:2159 ../src/sendmsg-window.c:2232
+#: ../src/sendmsg-window.c:1838 ../src/sendmsg-window.c:1911
 msgid "Remove"
 msgstr "Eliminar"
 
 # src/main-window.c:259
 # src/main-window.c:262
-#: ../src/sendmsg-window.c:2244
+#: ../src/sendmsg-window.c:1923
 msgid "Open..."
 msgstr "Abrir…"
 
-#: ../src/sendmsg-window.c:2256
+#: ../src/sendmsg-window.c:1935
 msgid "(URL)"
 msgstr "(URL)"
 
-#: ../src/sendmsg-window.c:2314
+#: ../src/sendmsg-window.c:1991
 msgid "Attach file"
 msgstr "Adjuntar archivo"
 
-#: ../src/sendmsg-window.c:2415 ../src/sendmsg-window.c:2525
-#: ../src/sendmsg-window.c:4965
+#: ../src/sendmsg-window.c:2104 ../src/sendmsg-window.c:2207
+#: ../src/sendmsg-window.c:6855
 msgid ""
 "Attaching message failed.\n"
 "Possible reason: not enough temporary space"
@@ -7860,177 +6880,176 @@ 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:2758
+#: ../src/sendmsg-window.c:2428
 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:2896
+#: ../src/sendmsg-window.c:2565
 msgid "S_ubject:"
 msgstr "As_unto:"
 
 # src/balsa-message.c:578
 # src/balsa-message.c:642
-#. fcc: mailbox folder where the message copy will be written to
-#: ../src/sendmsg-window.c:2907
+#: ../src/sendmsg-window.c:2592
 msgid "F_cc:"
 msgstr "F_cc:"
 
 # src/sendmsg-window.c:891
 # src/sendmsg-window.c:934
 #. Attachment list
-#: ../src/sendmsg-window.c:2936
+#: ../src/sendmsg-window.c:2618
 msgid "_Attachments:"
 msgstr "_Adjuntos:"
 
-#: ../src/sendmsg-window.c:2985
+#: ../src/sendmsg-window.c:2663
 msgid "Mode"
 msgstr "Modo"
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../src/sendmsg-window.c:3330
+#: ../src/sendmsg-window.c:3010
 #, 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:3354
+#: ../src/sendmsg-window.c:3034
 msgid "No subject"
 msgstr "Sin asunto"
 
-#: ../src/sendmsg-window.c:3387
+#: ../src/sendmsg-window.c:3068
 #, c-format
 msgid "inlined file \"%s\" (%s)"
 msgstr "archivo incluido en línea «%s» (%s)"
 
-#: ../src/sendmsg-window.c:3390
+#: ../src/sendmsg-window.c:3071
 #, c-format
 msgid "attached file \"%s\" (%s)"
 msgstr "archivo adjunto «%s» (%s)"
 
-#: ../src/sendmsg-window.c:3394
+#: ../src/sendmsg-window.c:3075
 #, c-format
 msgid "inlined %s part"
 msgstr "%s partes incluidas en línea"
 
-#: ../src/sendmsg-window.c:3396
+#: ../src/sendmsg-window.c:3077
 #, c-format
 msgid "attached %s part"
 msgstr "parte %s adjuntada"
 
-#: ../src/sendmsg-window.c:3464
+#: ../src/sendmsg-window.c:3145
 #, c-format
 msgid "message from %s, subject \"%s\""
 msgstr "mensaje de %s, asunto: «%s»"
 
-#: ../src/sendmsg-window.c:3591
+#: ../src/sendmsg-window.c:3272
 msgid "quoted"
 msgstr "citado"
 
 # src/sendmsg-window.c:891
 # src/sendmsg-window.c:934
-#: ../src/sendmsg-window.c:3596 ../src/sendmsg-window.c:3599
+#: ../src/sendmsg-window.c:3277 ../src/sendmsg-window.c:3280
 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:3625
+#: ../src/sendmsg-window.c:3306
 msgid "Select parts for quotation"
 msgstr "Seleccione partes para citarlas"
 
-#: ../src/sendmsg-window.c:3634
+#: ../src/sendmsg-window.c:3317
 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:3776
+#: ../src/sendmsg-window.c:3470
 msgid "you"
 msgstr "usted"
 
-#: ../src/sendmsg-window.c:3785
+#: ../src/sendmsg-window.c:3479
 #, 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:3822
+#: ../src/sendmsg-window.c:3516
 #, c-format
 msgid "Message-ID: %s\n"
 msgstr "Message-ID: %s\n"
 
-#: ../src/sendmsg-window.c:3828
+#: ../src/sendmsg-window.c:3522
 msgid "References:"
 msgstr "Referencias:"
 
-#: ../src/sendmsg-window.c:3839
+#: ../src/sendmsg-window.c:3533
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "El %s, %s escribió:\n"
 
-#: ../src/sendmsg-window.c:3841
+#: ../src/sendmsg-window.c:3535
 #, 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:3951
+#: ../src/sendmsg-window.c:3648
 msgid "No signature found!"
 msgstr "No se ha encontrado la firma."
 
 # src/balsa-message.c:651
 # src/balsa-message.c:713
-#: ../src/sendmsg-window.c:4139
+#: ../src/sendmsg-window.c:3789
 msgid "Could not save message."
 msgstr "No se pudo guardar el mensaje."
 
 # libmutt/mbox.c:1028
-#: ../src/sendmsg-window.c:4146
+#: ../src/sendmsg-window.c:3796
 #, 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:4171
+#: ../src/sendmsg-window.c:3821
 msgid "Message saved."
 msgstr "Mensaje guardado."
 
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
-#: ../src/sendmsg-window.c:5145 ../src/sendmsg-window.c:5153
-#: ../src/sendmsg-window.c:5160 ../src/sendmsg-window.c:5167
-#: ../src/sendmsg-window.c:5191
+#: ../src/sendmsg-window.c:4445 ../src/sendmsg-window.c:4453
+#: ../src/sendmsg-window.c:4460 ../src/sendmsg-window.c:4467
+#: ../src/sendmsg-window.c:4491
 #, c-format
 msgid "Could not attach the file %s: %s."
 msgstr "No se pudo adjuntar el archivo %s: %s"
 
-#: ../src/sendmsg-window.c:5146
+#: ../src/sendmsg-window.c:4446
 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:5154
+#: ../src/sendmsg-window.c:4454
 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:5161
+#: ../src/sendmsg-window.c:4461
 msgid "does not exist"
 msgstr "no existe"
 
-#: ../src/sendmsg-window.c:5192
+#: ../src/sendmsg-window.c:4492
 msgid "not in current directory"
 msgstr "no está en el directorio actual"
 
-#: ../src/sendmsg-window.c:5242
+#: ../src/sendmsg-window.c:4542
 msgid ""
 "The link that you selected created\n"
 "a \"Blind copy\" (Bcc) address.\n"
@@ -8043,21 +7062,21 @@ msgstr ""
 
 # src/sendmsg-window.c:1403
 # src/sendmsg-window.c:1454
-#: ../src/sendmsg-window.c:5326
+#: ../src/sendmsg-window.c:4624
 #, c-format
 msgid "Could not open the file %s.\n"
 msgstr "No se pudo abrir el archivo %s\n"
 
 # src/sendmsg-window.c:1434
 # src/sendmsg-window.c:1483
-#: ../src/sendmsg-window.c:5374
+#: ../src/sendmsg-window.c:4675
 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:5560
+#: ../src/sendmsg-window.c:4860
 #, 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"
@@ -8065,49 +7084,57 @@ 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:5563
+#: ../src/sendmsg-window.c:4863
 #, 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/sendmsg-window.c:5690
-msgid "You did not specify a subject for this message"
-msgstr "No especificó un asunto para este mensaje"
-
-#: ../src/sendmsg-window.c:5691
-msgid "If you would like to provide one, enter it below."
-msgstr "Si quiere proporcionar uno, introdúzcalo abajo."
+# 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:4971
+#, fuzzy
+#| msgid "No subject"
+msgid "No Subject"
+msgstr "Sin asunto"
 
 # src/address-book.c:477
 # src/address-book.c:523
-#: ../src/sendmsg-window.c:5741
+#: ../src/sendmsg-window.c:4976
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../src/sendmsg-window.c:5824
+#: ../src/sendmsg-window.c:4997
+msgid "You did not specify a subject for this message"
+msgstr "No especificó un asunto para este mensaje"
+
+#: ../src/sendmsg-window.c:4998
+msgid "If you would like to provide one, enter it below."
+msgstr "Si quiere proporcionar uno, introdúzcalo abajo."
+
+#: ../src/sendmsg-window.c:5091
 #, c-format
 msgid ""
 "You did not select encryption for this message, although %s public keys are "
 "available for all recipients. In order to protect your privacy, the message "
 "could be %s encrypted."
 msgstr ""
-"No seleccionó ningún cifrado para este mensaje, aunque las claves públicas %"
-"s están disponibles para todos los destinatarios. Para proteger su "
+"No seleccionó ningún cifrado para este mensaje, aunque las claves públicas "
+"%s están disponibles para todos los destinatarios. Para proteger su "
 "privacidad el mensaje se podría cifrar con %s."
 
-#: ../src/sendmsg-window.c:5851
+#: ../src/sendmsg-window.c:5113
 msgid "Send _encrypted"
 msgstr "Enviar ci_frado"
 
-#: ../src/sendmsg-window.c:5869
+#: ../src/sendmsg-window.c:5128
 msgid "Send _unencrypted"
 msgstr "Enviar _sin cifrado"
 
-#: ../src/sendmsg-window.c:5932
+#: ../src/sendmsg-window.c:5188
 msgid "You selected OpenPGP security for this message.\n"
 msgstr "Seleccionó seguridad OpenPGP para este mensaje.\n"
 
-#: ../src/sendmsg-window.c:5937
+#: ../src/sendmsg-window.c:5193
 msgid ""
 "The message text will be sent as plain text and as HTML, but only the plain "
 "part can be signed.\n"
@@ -8115,12 +7142,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:5942
+#: ../src/sendmsg-window.c:5198
 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:5946
+#: ../src/sendmsg-window.c:5202
 msgid ""
 "You should select MIME mode if the complete message shall be protected. Do "
 "you really want to proceed?"
@@ -8128,42 +7155,42 @@ msgstr ""
 "Debería seleccionar el modo MIME si se debe proteger el mensaje completo. "
 "¿Realmente quiere seguir adelante?"
 
-#: ../src/sendmsg-window.c:5971
+#: ../src/sendmsg-window.c:5227
 #, c-format
 msgid "sending message with gpg mode %d"
 msgstr "enviando mensaje con modo gpg %d"
 
-#: ../src/sendmsg-window.c:6008
+#: ../src/sendmsg-window.c:5266
 msgid "Message could not be created"
 msgstr "El mensaje no se pudo crear"
 
-#: ../src/sendmsg-window.c:6010
+#: ../src/sendmsg-window.c:5268
 msgid "Message could not be queued in outbox"
 msgstr "El mensaje no se pudo poner en la cola de salida"
 
-#: ../src/sendmsg-window.c:6012
+#: ../src/sendmsg-window.c:5270
 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:6014
+#: ../src/sendmsg-window.c:5272
 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:6017
+#: ../src/sendmsg-window.c:5275
 msgid "Message could not be signed"
 msgstr "El mensaje no se pudo firmar"
 
-#: ../src/sendmsg-window.c:6019
+#: ../src/sendmsg-window.c:5277
 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:6025
+#: ../src/sendmsg-window.c:5283
 #, c-format
 msgid ""
 "Send failed: %s\n"
@@ -8174,250 +7201,240 @@ msgstr ""
 
 # libmutt/imap/auth.c:373
 # libmutt/imap/auth.c:373
-#: ../src/sendmsg-window.c:6030
+#: ../src/sendmsg-window.c:5288
 #, 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:6121
+#: ../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:6138
+#: ../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:6143
+#: ../src/sendmsg-window.c:5413
 msgid "Could not postpone message."
 msgstr "No se pudo posponer el mensaje."
 
-#: ../src/sendmsg-window.c:6296
+#: ../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:1403
-# src/sendmsg-window.c:1454
-#: ../src/sendmsg-window.c:6463
-#, c-format
-msgid "Could not compile %s"
-msgstr "No se pudo compilar %s"
-
-# src/filter-edit-dialog.c:46
-# src/filter-edit-dialog.c:45
-#: ../src/sendmsg-window.c:6464
-msgid "Quoted Text Regular Expression"
-msgstr "Expresión regular de texto citado"
-
 # src/sendmsg-window.c:1129
 # src/sendmsg-window.c:1180
-#: ../src/sendmsg-window.c:6971
+#: ../src/sendmsg-window.c:6376
 #, c-format
 msgid "Reply to %s: %s"
 msgstr "Responder a %s: %s"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../src/sendmsg-window.c:6976
+#: ../src/sendmsg-window.c:6381
 #, 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:6980
+#: ../src/sendmsg-window.c:6385
 #, c-format
 msgid "New message to %s: %s"
 msgstr "Mensaje nuevo a %s: %s"
 
+#: ../src/sendmsg-window.c:6555
+msgid "_Language"
+msgstr "_Idioma"
+
+#: ../src/spell-check.c:213
+msgid "Spell check"
+msgstr "Ortografía"
+
 # src/main-window.c:177
 # src/main-window.c:184
-#: ../src/spell-check.c:513
-msgid "_Change"
+#: ../src/spell-check.c:341
+#, fuzzy
+#| msgid "_Change"
+msgid "C_hange"
 msgstr "_Cambiar"
 
-#: ../src/spell-check.c:515
+#: ../src/spell-check.c:343
 msgid "Replace the current word with the selected suggestion"
 msgstr "Reemplazar la palabra actual con la sugerencia seleccionada"
 
 # src/main-window.c:177
 # src/main-window.c:184
-#: ../src/spell-check.c:520
+#: ../src/spell-check.c:349
 msgid "Change _All"
 msgstr "Cerrar todo"
 
-#: ../src/spell-check.c:522
+#: ../src/spell-check.c:351
 msgid ""
 "Replace all occurrences of the current word with the selected suggestion"
 msgstr ""
 "Reemplazar todas las apariciones de la palabra actual con la sugerencia "
 "seleccionada"
 
-#: ../src/spell-check.c:531
+#: ../src/spell-check.c:357
 msgid "_Ignore"
 msgstr "_Ignorar"
 
-#: ../src/spell-check.c:534
+#: ../src/spell-check.c:359
 msgid "Skip the current word"
 msgstr "Omitir la palabra actual"
 
-#: ../src/spell-check.c:538
-msgid "Ignore A_ll"
+#: ../src/spell-check.c:364
+#, fuzzy
+#| msgid "Ignore A_ll"
+msgid "I_gnore All"
 msgstr "Guardar _todo"
 
-#: ../src/spell-check.c:540
+#: ../src/spell-check.c:366
 msgid "Skip all occurrences of the current word"
 msgstr "Omitir todas las apariciones de la palabra actual"
 
-#: ../src/spell-check.c:546
+#: ../src/spell-check.c:371
 msgid "_Learn"
 msgstr "Apre_nder"
 
-#: ../src/spell-check.c:548
+#: ../src/spell-check.c:373
 msgid "Add the current word to your personal dictionary"
 msgstr "Añadir la palabra actual al diccionario personal"
 
 # src/filter-edit-dialog.c:205
 # src/filter-edit-dialog.c:200
-#: ../src/spell-check.c:553
+#: ../src/spell-check.c:378
 msgid "_Done"
 msgstr "_Hecho"
 
-#: ../src/spell-check.c:554
+#: ../src/spell-check.c:379
 msgid "Finish spell checking"
 msgstr "Terminar la comprobación ortográfica"
 
-#: ../src/spell-check.c:559
+#: ../src/spell-check.c:386
 msgid "Revert all changes and finish spell checking"
 msgstr "Revertir todos los cambios y terminar la comprobación ortográfica"
 
-#: ../src/spell-check.c:588
-msgid "Spell check"
-msgstr "Ortografía"
-
-#: ../src/spell-check.c:866
-msgid "BalsaSpellCheck: Quoted text regular expression compilation failed\n"
-msgstr ""
-"ComprobaciónDeEscrituraDeBalsa: falló la compilación de la expresión regular "
-"de texto citado\n"
-
-#: ../src/spell-check.c:990
-#, c-format
-msgid ""
-"BalsaSpellCheck: Learn operation failed;\n"
-"%s\n"
-msgstr ""
-"ComprobaciónDeEscrituraDeBalsa: falló la operación de aprendizaje;\n"
-"%s\n"
-
-#: ../src/spell-check.c:996
-msgid "BalsaSpellCheck: Learn operation failed.\n"
-msgstr "ComprobaciónDeEscrituraDeBalsa: falló la operación de aprendizaje.\n"
-
-#: ../src/spell-check.c:1195
-#, c-format
-msgid "BalsaSpellCheck: Suggest %s (%s)\n"
-msgstr "ComprobaciónDeEscrituraDeBalsa: sugiere %s (%s)\n"
-
-#: ../src/spell-check.c:1297
-#, c-format
-msgid "BalsaSpellCheck: Pspell Error: %s\n"
+#: ../src/spell-check.c:1030
+#, fuzzy, c-format
+#| msgid "BalsaSpellCheck: Pspell Error: %s\n"
+msgid "BalsaSpellCheck: Enchant Error: %s\n"
 msgstr "ComprobaciónDeEscrituraDeBalsa: error de pspell: %s\n"
 
-#: ../src/store-address.c:109
+#: ../src/store-address.c:106
 msgid "Store address: no addresses"
 msgstr "Almacén de dirección: sin dirección"
 
 # src/main-window.c:360
 # src/main-window.c:360
-#: ../src/store-address.c:204
+#: ../src/store-address.c:206
 msgid "Store Address"
 msgstr "Almacenar dirección"
 
-#: ../src/store-address.c:225
-msgid "Save this address and close the dialog?"
-msgstr "¿Guardar esta dirección y cerrar el diálogo?"
-
 # src/mblist-window.c:478 src/mblist-window.c:494 src/mblist-window.c:513
 # 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/store-address.c:243
+#: ../src/store-address.c:248
 msgid "No address book selected...."
 msgstr "No hay una libreta de direcciones seleccionada…"
 
 # libbalsa/address-book.c:163
 # libbalsa/address-book.c:170
-#: ../src/store-address.c:256
+#: ../src/store-address.c:261
 msgid "Address could not be written to this address book."
 msgstr "No se pudo escribir la dirección al libreta de direcciones."
 
-#: ../src/store-address.c:259
+#: ../src/store-address.c:264
 msgid "Address book could not be accessed."
 msgstr "No se pudo acceder al libreta de direcciones."
 
-#: ../src/store-address.c:261
+#: ../src/store-address.c:266
 msgid "This mail address is already in this address book."
 msgstr "Esta dirección de correo ya está en el libreta de direcciones."
 
-#: ../src/store-address.c:264
+#: ../src/store-address.c:269
 msgid "Unexpected address book error. Report it."
 msgstr "Error inesperado en el libreta de direcciones. Informe de él."
 
 # src/address-book.c:369
 # src/address-book.c:394
-#: ../src/store-address.c:280
-msgid "Choose Address Book"
-msgstr "Elegir libreta de direcciones"
+#: ../src/store-address.c:292
+#, fuzzy
+#| msgid "Address Book"
+msgid "Address Book:"
+msgstr "Libreta de direcciones"
 
-# src/store-address.c:137
-# src/store-address.c:149
-#: ../src/store-address.c:319
-msgid "Choose Address"
-msgstr "Elegir dirección"
+# 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
+#: ../src/store-address.c:338
+#, fuzzy
+#| msgid "From:"
+msgid "From: "
+msgstr "De:"
+
+#: ../src/store-address.c:339
+msgid "To: "
+msgstr ""
+
+#: ../src/store-address.c:340
+msgid "Cc: "
+msgstr ""
+
+# src/balsa-message.c:575
+# src/balsa-message.c:639
+#: ../src/store-address.c:341
+#, fuzzy
+#| msgid "Bcc:"
+msgid "Bcc: "
+msgstr "Cco:"
 
 # src/balsa-message.c:725
 # src/balsa-message.c:788
-#: ../src/toolbar-factory.c:133
+#: ../src/toolbar-factory.c:142
 msgid "Separator"
 msgstr "Separador"
 
-#: ../src/toolbar-factory.c:134
+#: ../src/toolbar-factory.c:143
 msgid "Quit"
 msgstr "Salir"
 
-#: ../src/toolbar-factory.c:135
+#: ../src/toolbar-factory.c:144
 msgid "Check"
 msgstr "Comprobar"
 
 # src/main-window.c:399
 # src/main-window.c:401
-#: ../src/toolbar-factory.c:136
+#: ../src/toolbar-factory.c:145
 msgid "Compose"
 msgstr "Redactar"
 
 # libmutt/imap/util.c:43
 # libmutt/imap/util.c:43
-#: ../src/toolbar-factory.c:137
+#: ../src/toolbar-factory.c:146
 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:138
+#: ../src/toolbar-factory.c:147
 msgid "Reply"
 msgstr "Responder"
 
 # src/main-window.c:302 src/message-window.c:113
 # src/main-window.c:308
-#: ../src/toolbar-factory.c:139
+#: ../src/toolbar-factory.c:148
 msgid ""
 "Reply\n"
 "to all"
@@ -8427,7 +7444,7 @@ msgstr ""
 
 # src/main-window.c:302 src/message-window.c:113
 # src/main-window.c:308
-#: ../src/toolbar-factory.c:140
+#: ../src/toolbar-factory.c:149
 msgid ""
 "Reply\n"
 "to group"
@@ -8437,11 +7454,11 @@ msgstr ""
 
 # src/message-window.c:120
 # src/message-window.c:114
-#: ../src/toolbar-factory.c:141
+#: ../src/toolbar-factory.c:150
 msgid "Forward"
 msgstr "Reenviar"
 
-#: ../src/toolbar-factory.c:144
+#: ../src/toolbar-factory.c:153
 msgid ""
 "Next\n"
 "unread"
@@ -8453,7 +7470,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:145
+#: ../src/toolbar-factory.c:154
 msgid ""
 "Next\n"
 "flagged"
@@ -8461,7 +7478,7 @@ msgstr ""
 "Siguiente\n"
 "marcado"
 
-#: ../src/toolbar-factory.c:146
+#: ../src/toolbar-factory.c:155
 msgid ""
 "Previous\n"
 "part"
@@ -8469,7 +7486,7 @@ msgstr ""
 "Parte\n"
 "anterior"
 
-#: ../src/toolbar-factory.c:147
+#: ../src/toolbar-factory.c:156
 msgid ""
 "Next\n"
 "part"
@@ -8477,7 +7494,7 @@ msgstr ""
 "Siguiente\n"
 "parte"
 
-#: ../src/toolbar-factory.c:148
+#: ../src/toolbar-factory.c:157
 msgid ""
 "Trash /\n"
 "Delete"
@@ -8485,15 +7502,15 @@ msgstr ""
 "Papelera/\n"
 "Borrar"
 
-#: ../src/toolbar-factory.c:149
+#: ../src/toolbar-factory.c:158
 msgid "Postpone"
 msgstr "Posponer"
 
-#: ../src/toolbar-factory.c:150
+#: ../src/toolbar-factory.c:159
 msgid "Print"
 msgstr "Imprimir"
 
-#: ../src/toolbar-factory.c:151
+#: ../src/toolbar-factory.c:160
 msgid ""
 "Request\n"
 "MDN"
@@ -8503,37 +7520,37 @@ msgstr ""
 
 # src/address-book.c:477
 # src/address-book.c:523
-#: ../src/toolbar-factory.c:152
+#: ../src/toolbar-factory.c:161
 msgid "Send"
 msgstr "Enviar"
 
-#: ../src/toolbar-factory.c:153
+#: ../src/toolbar-factory.c:162
 msgid "Exchange"
 msgstr "Intercambiar"
 
-#: ../src/toolbar-factory.c:154
+#: ../src/toolbar-factory.c:163
 msgid "Attach"
 msgstr "Adjuntar"
 
 # src/balsa-message.c:1247
 # src/balsa-message.c:1417
-#: ../src/toolbar-factory.c:155
+#: ../src/toolbar-factory.c:164
 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:156
+#: ../src/toolbar-factory.c:165
 msgid "Identity"
 msgstr "Identidad"
 
 # src/main-window.c:399
 # src/main-window.c:401
-#: ../src/toolbar-factory.c:158
+#: ../src/toolbar-factory.c:167
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../src/toolbar-factory.c:159
+#: ../src/toolbar-factory.c:168
 msgid ""
 "Toggle\n"
 "new"
@@ -8541,13 +7558,21 @@ msgstr ""
 "Activar\n"
 "nuevo"
 
-#: ../src/toolbar-factory.c:160
+#: ../src/toolbar-factory.c:169
 msgid "Mark all"
 msgstr "Marcar todos"
 
+#: ../src/toolbar-factory.c:170
+msgid ""
+"All\n"
+"headers"
+msgstr ""
+"Todas\n"
+"las cabeceras"
+
 # src/filter-edit-dialog.c:783
 # src/filter-edit-dialog.c:693
-#: ../src/toolbar-factory.c:162
+#: ../src/toolbar-factory.c:171
 msgid ""
 "Reset\n"
 "Filter"
@@ -8555,29 +7580,33 @@ msgstr ""
 "Restablecer\n"
 "filtro"
 
-#: ../src/toolbar-factory.c:165
+#: ../src/toolbar-factory.c:172
+msgid "Msg Preview"
+msgstr "Vista previa del mensaje"
+
+#: ../src/toolbar-factory.c:174
 msgid "Sign"
 msgstr "Firmar"
 
-#: ../src/toolbar-factory.c:166
+#: ../src/toolbar-factory.c:175
 msgid "Encrypt"
 msgstr "Cifrar"
 
 # src/balsa-mblist.c:218
 # src/balsa-mblist.c:218
-#: ../src/toolbar-factory.c:168
+#: ../src/toolbar-factory.c:177
 msgid "Undo"
 msgstr "Deshacer"
 
-#: ../src/toolbar-factory.c:169
+#: ../src/toolbar-factory.c:178
 msgid "Redo"
 msgstr "Rehacer"
 
-#: ../src/toolbar-factory.c:170
+#: ../src/toolbar-factory.c:179
 msgid "Expunge"
 msgstr "Purgar"
 
-#: ../src/toolbar-factory.c:171
+#: ../src/toolbar-factory.c:180
 msgid ""
 "Empty\n"
 "Trash"
@@ -8587,45 +7616,45 @@ msgstr ""
 
 # src/main-window.c:389
 # src/main-window.c:386
-#: ../src/toolbar-factory.c:172
+#: ../src/toolbar-factory.c:181
 msgid "Edit"
 msgstr "Editar"
 
-#: ../src/toolbar-factory.c:185
+#: ../src/toolbar-factory.c:194
 msgid "Queue"
 msgstr "Encolar"
 
-#: ../src/toolbar-factory.c:390
+#: ../src/toolbar-factory.c:407
 #, c-format
 msgid "Unknown toolbar icon \"%s\""
 msgstr "Icono de barra de herramientas «%s» desconocido"
 
-#: ../src/toolbar-factory.c:461
+#: ../src/toolbar-factory.c:484
 msgid "Queue this message for sending"
 msgstr "Encolar este mensaje para enviarlo"
 
-#: ../src/toolbar-factory.c:519
+#: ../src/toolbar-factory.c:496
 msgid "Text Be_low Icons"
 msgstr "Texto _debajo de los iconos"
 
-#: ../src/toolbar-factory.c:520
+#: ../src/toolbar-factory.c:497
 msgid "Priority Text Be_side Icons"
 msgstr "Prioridad de texto j_unto a los iconos"
 
-#: ../src/toolbar-factory.c:522
+#: ../src/toolbar-factory.c:499
 msgid "_Icons Only"
 msgstr "Sólo _iconos"
 
-#: ../src/toolbar-factory.c:523
+#: ../src/toolbar-factory.c:500
 msgid "_Text Only"
 msgstr "Sólo _texto"
 
-#: ../src/toolbar-factory.c:746
+#: ../src/toolbar-factory.c:758
 #, c-format
 msgid "Use Desktop _Default (%s)"
 msgstr "Usar los pre_determinados del escritorio (%s)"
 
-#: ../src/toolbar-factory.c:776
+#: ../src/toolbar-factory.c:784
 msgid "_Customize Toolbars..."
 msgstr "_Personalizar barras de herramientas..."
 
@@ -8633,58 +7662,1228 @@ msgstr "_Personalizar barras de herramientas..."
 msgid "Customize Toolbars"
 msgstr "Personalizar barras de herramientas"
 
-#: ../src/toolbar-prefs.c:175
+#: ../src/toolbar-prefs.c:184
 msgid "Compose window"
 msgstr "Ventana de redacción"
 
-#: ../src/toolbar-prefs.c:184
+#: ../src/toolbar-prefs.c:197
 msgid "Toolbar options"
 msgstr "Opciones de barra de herramientas"
 
-#: ../src/toolbar-prefs.c:193
+#: ../src/toolbar-prefs.c:206
 msgid "_Wrap button labels"
 msgstr "_Auto-ajuste de etiquetas de botones"
 
-#: ../src/toolbar-prefs.c:408
+#: ../src/toolbar-prefs.c:382
 #, c-format
 msgid "Error displaying toolbar help: %s\n"
 msgstr "Error al mostrar la ayuda de la barra de herramientas: %s\n"
 
 #. Preview display
-#: ../src/toolbar-prefs.c:444
+#: ../src/toolbar-prefs.c:418
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: ../src/toolbar-prefs.c:481
+#: ../src/toolbar-prefs.c:453
 msgid "_Restore toolbar to standard buttons"
 msgstr "_Restaurar barra de herramientas a los botones estándar"
 
 #. Style button
-#: ../src/toolbar-prefs.c:485
+#: ../src/toolbar-prefs.c:457
 msgid "Toolbar _style..."
 msgstr "E_stilo de la barra de herramientas…"
 
-#: ../src/toolbar-prefs.c:502
+#: ../src/toolbar-prefs.c:474
 msgid "Available buttons"
 msgstr "Botones disponibles"
 
 # src/main-window.c:396
 # src/main-window.c:395
-#: ../src/toolbar-prefs.c:518
+#: ../src/toolbar-prefs.c:490
 msgid "Current toolbar"
 msgstr "Barra de herramientas actual"
 
+#: ../src/toolbar-prefs.c:511
+#, fuzzy
+#| msgid "Cut the selected text"
+msgid "Move selected item up"
+msgstr "Cortar el texto seleccionado"
+
+# src/main-window.c:392
+# src/main-window.c:389
+#: ../src/toolbar-prefs.c:521
+#, fuzzy
+#| msgid "Save selected to folder..."
+msgid "Remove selected item from toolbar"
+msgstr "Guardar seleccionados a carpeta…"
+
+#: ../src/toolbar-prefs.c:529
+msgid "Add selected item to toolbar"
+msgstr ""
+
+# src/main-window.c:392
+# src/main-window.c:389
+#: ../src/toolbar-prefs.c:536
+#, fuzzy
+#| msgid "Save selected to folder..."
+msgid "Move selected item down"
+msgstr "Guardar seleccionados a carpeta…"
+
+#~ msgid "the crypto engine for protocol OpenPGP is not available"
+#~ msgstr "el motor de cifrado para el protocolo OpenPGP no está disponible"
+
+#~ msgid "the crypto engine for protocol CMS is not available"
+#~ msgstr "el motor de cifrado para el protocolo CMS no está disponible"
+
+#~ msgid "invalid crypto engine %d"
+#~ msgstr "motor de cifrado inválido %d"
+
+# src/mailbox-conf.c:485
+# src/mailbox-conf.c:490
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
+#~ msgid "Uploading %"
+#~ msgstr "Subiendo %"
+
+#~ msgid "Gpgme has been compiled without support for protocol %s."
+#~ msgstr "Gpgme ha sido compilado sin soporte para el protocolo %s."
+
+#~ msgid "Crypto engine %s is not installed properly."
+#~ msgstr "El motor criptográfico %s no está instalado apropiadamente."
+
+#~ msgid " Hint: check the `gnupg2' (preferred) or `gnupg' package."
+#~ msgstr " Consejo: comprobar el paquete «gnupg2» (preferido) o «gnupg»."
+
+#~ msgid " Hint: check the `gpgsm' package."
+#~ msgstr " Consejo: comprobar el paquete «gpgsm»."
+
+#~ msgid ""
+#~ "Crypto engine %s version %s is installed, but at least version %s is "
+#~ "required."
+#~ msgstr ""
+#~ "El motor criptográfico %s versión %s está instalado, pero al menos se "
+#~ "requiere la versión %s."
+
+#~ msgid "Unknown problem with engine for protocol %s."
+#~ msgstr "Problema desconocido con el motor para el protocolo %s."
+
+# src/balsa-message.c:301
+# src/balsa-message.c:331
+#~ msgid "%s: could not retrieve crypto engine information: %s."
+#~ msgstr "%s: no se pudo obtener la información del motor criptográfico: %s."
+
+#~ msgid "Enter passphrase to unlock the secret key for signing"
+#~ msgstr ""
+#~ "Introduzca la frase de paso para desbloquear la clave secreta para firmar"
+
+# src/balsa-message.c:1316
+# src/balsa-message.c:1474
+#~ msgid "creating a gpgme context failed"
+#~ msgstr "la creación de un contexto gpgme ha fallado"
+
+#~ msgid "Enter passphrase to decrypt message"
+#~ msgstr "Introduzca la frase de paso para descifrar el mensaje"
+
+#~ msgid ""
+#~ "\n"
+#~ "Signed by: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Firmado por: %s"
+
+# libinit_balsa/balsa-druid-page-user.gob:87
+# libinit_balsa/balsa-druid-page-user.gob:87
+#~ msgid ""
+#~ "\n"
+#~ "Mail address: %s"
+#~ msgstr ""
+#~ "\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/mblist-window.c:450
+# src/mblist-window.c:473
+#~ msgid "_Properties"
+#~ msgstr "_Propiedades"
+
+# src/address-book.c:369
+# src/address-book.c:394
+#~ msgid "Edit address book properties"
+#~ msgstr "Editar las propiedades de la libreta de direcciones"
+
+# libbalsa/address-book.c:163
+# libbalsa/address-book.c:170
+#~ 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"
+#~ msgstr ""
+#~ "Esta es una parte del mensaje %s firmada %s:\n"
+#~ "%s"
+
+#~ msgid "... [truncated]"
+#~ msgstr "... [truncado]"
+
+# src/address-book.c:369
+# src/address-book.c:394
+#~ msgid "Address"
+#~ msgstr "Dirección"
+
+#~ msgid "S_tore"
+#~ msgstr "Al_macenar"
+
+# src/filter-edit-dialog.c:783
+# src/filter-edit-dialog.c:693
+#~ msgid "Balsa Filters"
+#~ msgstr "Filtros de Balsa"
+
+# src/filter-edit-dialog.c:783
+# src/filter-edit-dialog.c:693
+#~ msgid "Balsa Filters Export"
+#~ msgstr "Exportar filtros de Balsa"
+
+# src/filter-edit-dialog.c:199
+# src/filter-edit-dialog.c:194
+#~ msgid "_Up"
+#~ msgstr "_Subir"
+
+# src/filter-edit-dialog.c:205
+# src/filter-edit-dialog.c:200
+#~ msgid "Do_wn"
+#~ msgstr "_Bajar"
+
+#~ msgid ""
+#~ "Balsa was built without SSL support.\n"
+#~ "Neither SSL nor TLS can be used."
+#~ msgstr ""
+#~ "Balsa se construyó sin soporte SSL.\n"
+#~ "No se puede usar ni SSL ni TLS."
+
+# 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"
+
+#~ msgid "_More"
+#~ msgstr "_Más"
+
+# src/pref-manager.c:1087
+# src/pref-manager.c:1218
+#~ msgid "_Sort Mailbox"
+#~ msgstr "_Ordenar buzón"
+
+# libmutt/mx.c:1065
+# libmutt/mx.c:1065
+#~ msgid "H_ide messages"
+#~ msgstr "_Ocultar mensajes"
+
+#~ msgid "_Tools"
+#~ msgstr "_Herramientas"
+
+# 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 Queued Mail"
+#~ msgstr "_Enviar correo en cola"
+
+#~ 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"
+
+# src/address-book.c:369
+# src/address-book.c:394
+#~ msgid "_Address Book..."
+#~ msgstr "Libreta de _direcciones…"
+
+# libbalsa/address-book.c:163
+# libbalsa/address-book.c:170
+#~ msgid "Open the address book"
+#~ msgstr "Abrir la libreta de direcciones"
+
+# src/filter-edit-dialog.c:783
+# src/filter-edit-dialog.c:693
+#~ msgid "Quit Balsa"
+#~ msgstr "Salir de Balsa"
+
+# src/main-window.c:177
+# src/main-window.c:184
+#~ msgid "_Message..."
+#~ msgstr "_Mensaje…"
+
+# src/balsa-message.c:651
+# src/balsa-message.c:713
+#~ msgid "Compose a new message"
+#~ msgstr "Redactar un mensaje nuevo"
+
+# src/mailbox-conf.c:718
+# src/mailbox-conf.c:793
+#~ msgid "Local mbox mailbox..."
+#~ msgstr "Buzón mbox local…"
+
+#~ msgid "Add a new mbox style mailbox"
+#~ msgstr "Añadir un buzón de estilo mbox"
+
+# src/mailbox-conf.c:718
+# src/mailbox-conf.c:793
+#~ msgid "Local Maildir mailbox..."
+#~ msgstr "Buzón Maildir local…"
+
+# src/mailbox-conf.c:718
+# src/mailbox-conf.c:793
+#~ msgid "Add a new Maildir style mailbox"
+#~ msgstr "Añadir un buzón tipo Maildir nuevo"
+
+# src/mailbox-conf.c:718
+# src/mailbox-conf.c:793
+#~ msgid "Local MH mailbox..."
+#~ msgstr "Buzón MH local…"
+
+#~ msgid "Add a new MH style mailbox"
+#~ msgstr "Añadir un buzón de estilo MH"
+
+# libmutt/mbox.c:1066
+#~ msgid "New mailbox..."
+#~ msgstr "Buzón nuevo…"
+
+# src/mailbox-conf.c:718
+# src/mailbox-conf.c:793
+#~ msgid "New \"Maildir\" mailbox..."
+#~ msgstr "Buzón «Maildir» nuevo…"
+
+# src/mailbox-conf.c:718
+# src/mailbox-conf.c:793
+#~ msgid "New \"MH\" mailbox..."
+#~ msgstr "Buzón «MH» nuevo…"
+
+# libmutt/mbox.c:1066
+#~ msgid "Add a new IMAP mailbox"
+#~ msgstr "Añadir un buzón IMAP nuevo"
+
+# src/pref-manager.c:1162
+# src/pref-manager.c:1298
+#~ msgid "Add a new IMAP folder"
+#~ msgstr "Añadir una carpeta IMAP remota"
+
+# libmutt/mbox.c:1066
+#~ msgid "Remote IMAP subfolder..."
+#~ msgstr "Subcarpeta IMAP remota…"
+
+# libmutt/mbox.c:1066
+#~ msgid "Add a new IMAP subfolder"
+#~ msgstr "Añadir una subcarpeta IMAP"
+
+# src/main-window.c:259
+# src/main-window.c:262
+#~ msgid "F_ilters..."
+#~ msgstr "F_iltros…"
+
+#~ 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"
+
+#~ msgid "Increase magnification"
+#~ msgstr "Incrementar el aumento"
+
+#~ msgid "Decrease magnification"
+#~ msgstr "Decrementar el aumento"
+
+# src/filter-edit-dialog.c:626
+# src/filter-edit-dialog.c:538
+#~ 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"
+#~ msgstr "Borrar los mensajes de la papelera"
+
+#~ msgid "_Toolbars..."
+#~ msgstr "_Barras de herramientas…"
+
+#~ 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"
+
+# src/main-window.c:444
+# src/main-window.c:451
+#~ msgid "_Contents"
+#~ msgstr "Índ_ice"
+
+#~ 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"
+#~ msgstr "Restablecer filtro del buzón"
+
+# src/sendmsg-window.c:191
+# src/sendmsg-window.c:196
+#~ msgid "_Select All"
+#~ msgstr "Seleccionar _todo"
+
+#~ msgid "Select all messages in current mailbox"
+#~ msgstr "Seleccionar todos los mensajes en el buzón actual"
+
+# src/main-window.c:338
+# src/main-window.c:341
+#~ msgid "_Delete..."
+#~ msgstr "_Borrar…"
+
+# libmutt/mbox.c:712
+#~ 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"
+
+# src/main-window.c:399
+# src/main-window.c:401
+#~ 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"
+
+# src/main-window.c:302 src/message-window.c:113
+# src/main-window.c:308
+#~ msgid "Reply to _All..."
+#~ msgstr "Responder a _todos…"
+
+#~ msgid "Reply to all recipients of the current message"
+#~ msgstr "Responder a todos los destinatarios del mensaje actual"
+
+# src/main-window.c:302 src/message-window.c:113
+# src/main-window.c:308
+#~ msgid "Reply to _Group..."
+#~ msgstr "Responder al _grupo…"
+
+#~ msgid "Reply to mailing list"
+#~ msgstr "Responder a la lista de correo"
+
+#~ msgid "Store address of sender in addressbook"
+#~ msgstr "Almacenar dirección del remitente en el libreta de direcciones"
+
+#~ msgid "_View Source..."
+#~ msgstr "_Ver fuente…"
+
+#~ msgid "View source form of the message"
+#~ msgstr "Ver el código fuente del mensaje"
+
+# src/message-window.c:120
+# src/message-window.c:114
+#~ msgid "_Forward..."
+#~ msgstr "_Reenviar…"
+
+#~ msgid "Forward the current message"
+#~ msgstr "Reenviar el mensaje actual"
+
+# src/main-window.c:310 src/message-window.c:120
+# src/main-window.c:315 src/message-window.c:114
+#~ msgid "_Forward attached..."
+#~ msgstr "_Reenviar adjunto…"
+
+#~ msgid "Forward the current message as attachment"
+#~ msgstr "Reenviar el mensaje actual como un adjunto"
+
+# src/balsa-index-page.c:486
+# src/balsa-index-page.c:534
+#~ msgid "Forward _inline..."
+#~ msgstr "Reenviar _en línea…"
+
+#~ msgid "Forward the current message inline"
+#~ msgstr "Reenviar el mensaje actual en línea"
+
+#~ 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"
+
+# libmutt/mx.c:1375
+# libmutt/mx.c:1375
+#~ 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"
+
+# src/balsa-message.c:651
+# src/balsa-message.c:713
+#~ 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"
+
+# src/balsa-index-page.c:495
+# src/balsa-index-page.c:546
+#~ msgid "_Delete to Trash"
+#~ msgstr "_Borrar a la papelera"
+
+#~ 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"
+
+#~ msgid "Sort in a descending order"
+#~ msgstr "Ordenar en orden descendente"
+
+# src/main-window.c:259
+# src/main-window.c:262
+#~ msgid "_View filter"
+#~ msgstr "Filtro de _vista"
+
+#~ 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"
+#~ msgstr "Mostrar todas las cabeceras"
+
+#~ 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"
+
+#~ msgid "By _Arrival"
+#~ msgstr "Por _llegada"
+
+#~ msgid "Arrival order"
+#~ msgstr "Orden de llegada"
+
+# src/address-book.c:477
+# src/address-book.c:523
+#~ msgid "By _Sender"
+#~ msgstr "Por _remitente"
+
+#~ msgid "Sender order"
+#~ msgstr "Orden por remitente"
+
+# src/balsa-index.c:304 src/filter-edit-dialog.c:349
+# src/balsa-index.c:297 src/filter-edit-dialog.c:326
+#~ msgid "By S_ubject"
+#~ msgstr "Por _asunto"
+
+# src/balsa-index.c:304 src/filter-edit-dialog.c:349
+# src/balsa-index.c:297 src/filter-edit-dialog.c:326
+#~ msgid "Subject order"
+#~ msgstr "Orden por asunto"
+
+# src/filter-edit-dialog.c:45
+# src/filter-edit-dialog.c:44
+#~ msgid "By Si_ze"
+#~ msgstr "Por _tamaño"
+
+#~ msgid "By message size"
+#~ msgstr "Por tamaño del mensaje"
+
+#~ msgid "_Threaded"
+#~ msgstr "_Conversaciones"
+
+#~ msgid "Use message threading"
+#~ msgstr "Usar hilado en conversaciones"
+
+#~ msgid "Balsa: you have received %d new message."
+#~ msgid_plural "Balsa: you have received %d new messages."
+#~ msgstr[0] "Balsa: ha recibido %d mensaje nuevo."
+#~ msgstr[1] "Balsa: ha recibido %d mensajes nuevos."
+
+#~ msgid "Balsa: you have new mail."
+#~ msgstr "Balsa: tiene correo nuevo."
+
+# src/balsa-message.c:1316
+# src/balsa-message.c:1474
+#~ msgid "Could not write to %s: %s"
+#~ msgstr "No se pudo escribir en %s: %s"
+
+#~ msgid "Attach file at PATH"
+#~ msgstr "Adjuntar fichero en la ruta"
+
+#~ msgid ""
+#~ "Run '%s --help' to see a full list of available command line options.\n"
+#~ msgstr ""
+#~ "Ejecute «%s --help» para ver una lista completa de las opciones de línea "
+#~ "de comandos disponibles.\n"
+
+#~ msgid "Close the message window"
+#~ msgstr "Cerrar la ventana del mensaje"
+
+# libmutt/mx.c:1065
+# libmutt/mx.c:1065
+#~ msgid "_Find in message"
+#~ msgstr "_Buscar en el mensaje"
+
+#~ msgid "Move the message to Trash mailbox"
+#~ msgstr "Mueve el mensaje actual a la papelera"
+
+#~ msgid "Show toolbar"
+#~ msgstr "Mostrar barra de herramientas"
+
+# src/sendmsg-window.c:191
+# src/sendmsg-window.c:196
+#~ msgid "_Selected Headers"
+#~ msgstr "Cabeceras _seleccionadas"
+
+#~ msgid "Fast"
+#~ msgstr "Rápido"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Bad spellers"
+#~ msgstr "Ortografía incorrecta"
+
+#~ msgid "Composition window"
+#~ msgstr "Ventana de redacción"
+
+#~ msgid "Invalid or incomplete address label color"
+#~ msgstr "Color de etiqueta de dirección errónea o incompleta"
+
+# libinit_balsa/balsa-druid-page-user.gob:104
+# libinit_balsa/balsa-druid-page-user.gob:104
+#~ msgid "Pspell settings"
+#~ msgstr "Configuración de Pspell"
+
+#~ msgid "Spell check module"
+#~ msgstr "Módulo de comprobación ortográfica"
+
+#~ msgid "Suggestion level"
+#~ msgstr "Nivel de sugerencia"
+
+#~ msgid "Ignore words shorter than"
+#~ msgstr "Ignorar palabras más cortas que"
+
+#~ msgid "Error displaying link_id %s: %s\n"
+#~ msgstr "Error mostrando id_link %s: %s\n"
+
+# libmutt/mbox.c:1066
+#~ msgid "Error opening GConf database\n"
+#~ msgstr "Error al abrir la base de datos GConf\n"
+
+#~ 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"
+
+# src/balsa-message.c:1247
+# src/balsa-message.c:1417
+#~ msgid "_Save"
+#~ msgstr "_Guardar"
+
+# libmutt/imap/browse.c:93
+# libmutt/imap/browse.c:93
+#~ msgid "Save this message"
+#~ msgstr "Guardar este mensaje"
+
+# libmutt/mx.c:1065
+# libmutt/mx.c:1065
+#~ msgid "Print the edited message"
+#~ msgstr "Imprime el mensaje editado"
+
+# src/balsa-mblist.c:218
+# src/balsa-mblist.c:218
+#~ msgid "_Undo"
+#~ msgstr "_Deshacer"
+
+#~ msgid "Undo most recent change"
+#~ msgstr "Deshacer el cambio más reciente"
+
+#~ msgid "_Redo"
+#~ msgstr "_Rehacer"
+
+#~ 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"
+
+# src/pref-manager.c:234 src/pref-manager.c:867
+# src/pref-manager.c:236 src/pref-manager.c:992
+#~ msgid "Select _Identity..."
+#~ msgstr "Seleccionar la _identidad…"
+
+# src/sendmsg-window.c:166
+# src/sendmsg-window.c:172
+#~ 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"
+
+# src/address-book.c:477
+# src/address-book.c:523
+#~ msgid "Sen_d"
+#~ msgstr "_Enviar"
+
+# libmutt/imap/browse.c:93
+# libmutt/imap/browse.c:93
+#~ msgid "Send this message"
+#~ msgstr "Enviar este mensaje"
+
+#~ msgid "_Queue"
+#~ msgstr "_Encolar"
+
+#~ msgid "Queue this message in Outbox for sending"
+#~ msgstr "Encolar este mensaje en la bandeja de salida para enviarlo"
+
+#~ msgid "_Postpone"
+#~ msgstr "_Posponer"
+
+# libmutt/imap/browse.c:93
+# libmutt/imap/browse.c:93
+#~ msgid "Save this message and close"
+#~ msgstr "Guardar este mensaje y cerrar"
+
+# libmutt/imap/auth.c:373
+# libmutt/imap/auth.c:373
+#~ msgid "Send _Later"
+#~ msgstr "Enviar _más tarde"
+
+#~ msgid "Sa_ve and Close"
+#~ msgstr "_Guardar y cerrar"
+
+#~ 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"
+
+#~ msgid "signs the message using GnuPG"
+#~ msgstr "firma el mensaje usando GnuPG"
+
+#~ msgid "signs the message using GnuPG for all To: and CC: recipients"
+#~ 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"
+#~ msgstr "No se pudo compilar %s"
+
+# src/filter-edit-dialog.c:46
+# src/filter-edit-dialog.c:45
+#~ msgid "Quoted Text Regular Expression"
+#~ msgstr "Expresión regular de texto citado"
+
+#~ msgid "BalsaSpellCheck: Quoted text regular expression compilation failed\n"
+#~ msgstr ""
+#~ "ComprobaciónDeEscrituraDeBalsa: falló la compilación de la expresión "
+#~ "regular de texto citado\n"
+
+#~ msgid ""
+#~ "BalsaSpellCheck: Learn operation failed;\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "ComprobaciónDeEscrituraDeBalsa: falló la operación de aprendizaje;\n"
+#~ "%s\n"
+
+#~ msgid "BalsaSpellCheck: Learn operation failed.\n"
+#~ msgstr ""
+#~ "ComprobaciónDeEscrituraDeBalsa: falló la operación de aprendizaje.\n"
+
+#~ msgid "BalsaSpellCheck: Suggest %s (%s)\n"
+#~ msgstr "ComprobaciónDeEscrituraDeBalsa: sugiere %s (%s)\n"
+
+#~ msgid "Save this address and close the dialog?"
+#~ msgstr "¿Guardar esta dirección y cerrar el diálogo?"
+
+# src/address-book.c:369
+# src/address-book.c:394
+#~ msgid "Choose Address Book"
+#~ msgstr "Elegir libreta de direcciones"
+
+# src/store-address.c:137
+# src/store-address.c:149
+#~ msgid "Choose Address"
+#~ msgstr "Elegir dirección"
+
 # src/filter-edit-dialog.c:199
 # src/filter-edit-dialog.c:194
-#: ../src/toolbar-prefs.c:535
-msgid "Up"
-msgstr "Subir"
+#~ msgid "Up"
+#~ msgstr "Subir"
 
 # src/filter-edit-dialog.c:205
 # src/filter-edit-dialog.c:200
-#: ../src/toolbar-prefs.c:551
-msgid "Down"
-msgstr "Bajar"
+#~ msgid "Down"
+#~ msgstr "Bajar"
 
 # src/mailbox-conf.c:239
 # src/mailbox-conf.c:233
@@ -8793,7 +8992,8 @@ msgstr "Bajar"
 #~ "Use the \"Fonts\" page on the \"Print message\" dialog to change it."
 #~ msgstr ""
 #~ "Balsa no pudo encontrar tipografía «%s».\n"
-#~ "Usa la página «Tipografías» en el diálogo «Imprimir mensaje» para cambiarlo."
+#~ "Usa la página «Tipografías» en el diálogo «Imprimir mensaje» para "
+#~ "cambiarlo."
 
 #~ msgid "Balsa: message print preview"
 #~ msgstr "Balsa: vista previa de impresión del mensaje"
@@ -8851,6 +9051,3 @@ msgstr "Bajar"
 # src/main-window.c:428
 #~ msgid "Message Window"
 #~ msgstr "Ventana del mensaje"
-
-#~ msgid "Error displaying %s: %s\n"
-#~ msgstr "Error mostrando %s: %s\n"


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