[balsa] Update Spanish translation



commit 3269edac77db4831ababa15b03356294a8ccbb2e
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Mon Jun 19 12:41:23 2017 +0000

    Update Spanish translation

 po/es.po | 4029 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 2047 insertions(+), 1982 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index e3068b8..ea5afa7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,15 +8,15 @@
 # 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.
+# Daniel Mustieles <daniel mustieles gmail com>, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: balsa.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
 "product=balsa&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-11-27 16:45+0000\n"
-"PO-Revision-Date: 2016-12-22 16:21+0100\n"
+"POT-Creation-Date: 2017-06-19 00:23+0000\n"
+"PO-Revision-Date: 2017-06-19 14:38+0200\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: es <gnome-es-list gnome org>\n"
 "Language: es\n"
@@ -33,7 +33,6 @@ msgid "Balsa"
 msgstr "Balsa"
 
 #: ../balsa.desktop.in.in.h:2 ../balsa-mailto-handler.desktop.in.in.h:2
-#| msgid "E-Mail utility"
 msgid "Email utility"
 msgstr "Utilidad de correo-e"
 
@@ -47,46 +46,6 @@ msgstr "Cliente de correo-e"
 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:209 ../libbalsa/address-book-ldif.c:330
-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:214 ../libbalsa/address-book-extern.c:372
-#: ../libbalsa/address-book-ldap.c:497 ../libbalsa/address-book-ldif.c:309
-#: ../libbalsa/address-book-ldif.c:333 ../libbalsa/address-book-ldif.c:352
-#: ../libbalsa/address-book-ldif.c:356 ../libbalsa/address-book-vcard.c:158
-#: ../libbalsa/address-book-vcard.c:256 ../libbalsa/address.c:404
-#: ../libbalsa/rfc6350.c:112
-msgid "No-Name"
-msgstr "Sin nombre"
-
-#: ../libbalsa/address-book-ldap.c:280
-msgid "SASL Interaction\n"
-msgstr "Interacción con SASL\n"
-
-#: ../libbalsa/address-book-ldap.c:327
-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:606
-msgid "Undefined location of user address book"
-msgstr "Ubicación indefinida de la libreta de direcciones del usuario"
-
-# libmutt/imap/auth.c:373
-# libmutt/imap/auth.c:373
-#: ../libbalsa/address-book-osmo.c:146
-#, c-format
-#| msgid "Removing duplicates failed: %s"
-msgid "Reading Osmo contacts failed: %s"
-msgstr "Falló al leer los contactos de Osmo: %s"
-
 #: ../libbalsa/address-book.c:312 ../libbalsa/filter-error.c:45
 msgid "No error"
 msgstr "Sin errores"
@@ -127,40 +86,49 @@ msgstr "No se puede encontrar la dirección en la libreta"
 
 # libmutt/imap/imap_ssl.c:254
 # libmutt/imap/imap_ssl.c:254
-#: ../libbalsa/address-book.c:321 ../src/main-window.c:2916
-#: ../src/main-window.c:4249 ../src/sendmsg-window.c:3808
+#: ../libbalsa/address-book.c:321 ../src/main-window.c:2921
+#: ../src/main-window.c:4221 ../src/sendmsg-window.c:3821
 msgid "Unknown error"
 msgstr "Se ha producido un error desconocido"
 
-# src/balsa-message.c:573 src/filter-edit-dialog.c:325 src/print.c:341
-# src/sendmsg-window.c:837
-# src/balsa-message.c:637 src/filter-edit-dialog.c:306 src/print.c:353
-# src/sendmsg-window.c:870
-#: ../libbalsa/address-view.c:160 ../src/balsa-mime-widget-message.c:747
-#: ../src/balsa-print-object-header.c:171 ../src/sendmsg-window.c:718
-#: ../src/sendmsg-window.c:3515
-msgid "To:"
-msgstr "Para:"
+# 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:209 ../libbalsa/address-book-ldif.c:233
+msgid "No-Id"
+msgstr "Sin Id"
 
-# src/balsa-message.c:574
-# src/balsa-message.c:638
-#: ../libbalsa/address-view.c:161 ../src/balsa-mime-widget-message.c:749
-#: ../src/balsa-print-object-header.c:173 ../src/sendmsg-window.c:718
-#: ../src/sendmsg-window.c:3523
-#| msgid "Cc:"
-msgid "CC:"
-msgstr "Cc:"
+# 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:214 ../libbalsa/address-book-extern.c:372
+#: ../libbalsa/address-book-ldap.c:497 ../libbalsa/address-book-ldif.c:212
+#: ../libbalsa/address-book-ldif.c:236 ../libbalsa/address-book-ldif.c:255
+#: ../libbalsa/address-book-ldif.c:259 ../libbalsa/address-book-vcard.c:158
+#: ../libbalsa/address-book-vcard.c:256 ../libbalsa/address.c:404
+#: ../libbalsa/rfc6350.c:112
+msgid "No-Name"
+msgstr "Sin nombre"
 
-#: ../libbalsa/address-view.c:162 ../src/balsa-mime-widget-message.c:751
-#: ../src/balsa-print-object-header.c:175 ../src/sendmsg-window.c:718
-msgid "BCC:"
-msgstr "Cco:"
+#: ../libbalsa/address-book-ldap.c:280
+msgid "SASL Interaction\n"
+msgstr "Interacción con SASL\n"
 
-# src/sendmsg-window.c:885
-# src/sendmsg-window.c:928
-#: ../libbalsa/address-view.c:163
-msgid "Reply To:"
-msgstr "Responder a:"
+#: ../libbalsa/address-book-ldap.c:327
+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:606
+msgid "Undefined location of user address book"
+msgstr "Ubicación indefinida de la libreta de direcciones del usuario"
+
+# libmutt/imap/auth.c:373
+# libmutt/imap/auth.c:373
+#: ../libbalsa/address-book-osmo.c:146
+#, c-format
+msgid "Reading Osmo contacts failed: %s"
+msgstr "Falló al leer los contactos de Osmo: %s"
 
 # src/filter-edit-dialog.c:490
 # src/address-book-config.c:321
@@ -204,13 +172,42 @@ 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
-#: ../libbalsa/address.c:976 ../src/filter-edit-callbacks.c:1069
+#: ../libbalsa/address.c:976 ../src/filter-edit-callbacks.c:1077
 msgid "A_dd"
 msgstr "A_ñadir"
 
+# src/balsa-message.c:573 src/filter-edit-dialog.c:325 src/print.c:341
+# src/sendmsg-window.c:837
+# src/balsa-message.c:637 src/filter-edit-dialog.c:306 src/print.c:353
+# src/sendmsg-window.c:870
+#: ../libbalsa/address-view.c:160 ../src/balsa-mime-widget-message.c:746
+#: ../src/balsa-print-object-header.c:171 ../src/sendmsg-window.c:717
+#: ../src/sendmsg-window.c:3528
+msgid "To:"
+msgstr "Para:"
+
+# src/balsa-message.c:574
+# src/balsa-message.c:638
+#: ../libbalsa/address-view.c:161 ../src/balsa-mime-widget-message.c:748
+#: ../src/balsa-print-object-header.c:173 ../src/sendmsg-window.c:717
+#: ../src/sendmsg-window.c:3536
+msgid "CC:"
+msgstr "Cc:"
+
+#: ../libbalsa/address-view.c:162 ../src/balsa-mime-widget-message.c:750
+#: ../src/balsa-print-object-header.c:175 ../src/sendmsg-window.c:717
+msgid "BCC:"
+msgstr "Cco:"
+
+# src/sendmsg-window.c:885
+# src/sendmsg-window.c:928
+#: ../libbalsa/address-view.c:163
+msgid "Reply To:"
+msgstr "Responder a:"
+
 # src/balsa-index.c:304 src/filter-edit-dialog.c:349
 # src/balsa-index.c:297 src/filter-edit-dialog.c:326
-#: ../libbalsa/body.c:121 ../libbalsa/mailbox_local.c:1839
+#: ../libbalsa/body.c:121 ../libbalsa/mailbox_local.c:1841
 #: ../libbalsa/message.c:843
 msgid "(No subject)"
 msgstr "(Sin asunto)"
@@ -229,6 +226,43 @@ msgstr "No se pudo crear el flujo de salida"
 msgid "Could not read embedded message"
 msgstr "No se pudo leer el mensaje empotrado"
 
+#: ../libbalsa/filter.c:125 ../libbalsa/mailbox_local.c:869
+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:232
+#, c-format
+msgid "Invalid filter: %s"
+msgstr "Filtro no válido %s"
+
+#: ../libbalsa/filter.c:280 ../libbalsa/filter.c:303
+#, 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:284
+#, 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:294
+#, 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:307
+#, c-format
+msgid "Error when moving messages: %s"
+msgstr "Ha ocurrido un error durante el movimiento de mensajes: %s"
+
 #: ../libbalsa/filter-error.c:46
 msgid "Syntax error in the filter configuration file"
 msgstr "Hay un error de sintaxis en el archivo de configuración del filtro"
@@ -248,6 +282,11 @@ 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:133
+#, c-format
+msgid "Invalid filters %s for mailbox %s"
+msgstr "Filtros inválidos %s para el buzón %s"
+
 # src/balsa-index.c:428
 # src/balsa-index.c:417
 #. FIXME: this is hack!
@@ -264,7 +303,7 @@ msgstr "De"
 # src/balsa-index.c:304 src/filter-edit-dialog.c:349
 # src/balsa-index.c:297 src/filter-edit-dialog.c:326
 #: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:367
-#: ../src/pref-manager.c:394
+#: ../src/pref-manager.c:218
 msgid "Subject"
 msgstr "Asunto"
 
@@ -275,7 +314,6 @@ msgstr "Cc"
 # src/filter-edit-dialog.c:313
 # src/filter-edit-dialog.c:296
 #: ../libbalsa/filter-funcs.c:385
-#| msgid "_Body"
 msgid "Body"
 msgstr "Cuerpo"
 
@@ -283,14 +321,12 @@ msgstr "Cuerpo"
 # src/main-window.c:269
 #: ../libbalsa/filter-funcs.c:390
 #, c-format
-#| msgid "_Headers"
 msgid "Header:%s"
 msgstr "Cabecera:%s"
 
 # src/main-window.c:191
 # src/main-window.c:196
 #: ../libbalsa/filter-funcs.c:412
-#| msgid "_New"
 msgid "New"
 msgstr "Nuevo"
 
@@ -300,13 +336,13 @@ msgstr "Nuevo"
 # 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:413 ../src/filter-edit-callbacks.c:992
+#: ../libbalsa/filter-funcs.c:413 ../src/filter-edit-callbacks.c:1000
 msgid "Deleted"
 msgstr "Eliminado"
 
 # src/main-window.c:448
 # src/main-window.c:455
-#: ../libbalsa/filter-funcs.c:414 ../src/filter-edit-callbacks.c:992
+#: ../libbalsa/filter-funcs.c:414 ../src/filter-edit-callbacks.c:1000
 msgid "Replied"
 msgstr "Respondido"
 
@@ -314,14 +350,13 @@ msgstr "Respondido"
 # 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:415 ../src/filter-edit-callbacks.c:992
+#: ../libbalsa/filter-funcs.c:415 ../src/filter-edit-callbacks.c:1000
 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:439
-#| msgid "Not found"
 msgid "Not "
 msgstr "No"
 
@@ -334,7 +369,6 @@ msgid "To %Y-%m-%d"
 msgstr "A %d/%m/%Y"
 
 #: ../libbalsa/filter-funcs.c:469
-#| msgid "End"
 msgid "And"
 msgstr "Y"
 
@@ -342,48 +376,6 @@ msgstr "Y"
 msgid "Or"
 msgstr "O"
 
-#: ../libbalsa/filter-file.c:133
-#, c-format
-msgid "Invalid filters %s for mailbox %s"
-msgstr "Filtros inválidos %s para el buzón %s"
-
-#: ../libbalsa/filter.c:125 ../libbalsa/mailbox_local.c:864
-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:232
-#, c-format
-msgid "Invalid filter: %s"
-msgstr "Filtro no válido %s"
-
-#: ../libbalsa/filter.c:280 ../libbalsa/filter.c:303
-#, 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:284
-#, 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:294
-#, 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:307
-#, c-format
-msgid "Error when moving messages: %s"
-msgstr "Ha ocurrido un error durante el movimiento de mensajes: %s"
-
 #: ../libbalsa/gmime-application-pkcs7.c:123
 #, c-format
 msgid "Failed to decrypt MIME part: parse error"
@@ -397,9 +389,6 @@ msgstr ""
 
 #: ../libbalsa/gmime-multipart-crypt.c:246
 #, c-format
-#| msgid ""
-#| "\n"
-#| "Disable support for protocol %s."
 msgid "unsupported protocol “%s”"
 msgstr "Protocolo «%s» no soportado"
 
@@ -456,15 +445,10 @@ msgstr "No se pudo obtener una parte HTML: %s"
 # src/balsa-message.c:331
 #: ../libbalsa/html.c:119
 #, c-format
-#| msgid "Could not get an HTML part: %s"
 msgid "Could not convert HTML part to text: %s"
 msgstr "No se pudo convertir una parte HTML a texto: %s"
 
 #: ../libbalsa/html.c:400
-#| 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"
@@ -490,50 +474,43 @@ msgstr "_Descargar imágenes"
 
 # src/main-window.c:399
 # src/main-window.c:401
-#: ../libbalsa/html.c:419 ../libbalsa/html.c:1089 ../libbalsa/identity.c:1734
-#: ../src/ab-window.c:148 ../src/mailbox-conf.c:1160
-#: ../src/mailbox-node.c:1113 ../src/main-window.c:3942
+#: ../libbalsa/html.c:419 ../libbalsa/html.c:1089 ../libbalsa/identity.c:1702
+#: ../src/ab-window.c:148 ../src/mailbox-node.c:1113 ../src/main-window.c:3906
 #: ../src/toolbar-prefs.c:140
 msgid "_Close"
 msgstr "_Cerrar"
 
 #. should "re" be localized ?
-#: ../libbalsa/identity.c:101 ../libbalsa/mailbox_local.c:1962
-#: ../libbalsa/mailbox_local.c:1964 ../src/sendmsg-window.c:3756
-#: ../src/sendmsg-window.c:3758
+#: ../libbalsa/identity.c:99 ../libbalsa/mailbox_local.c:1964
+#: ../libbalsa/mailbox_local.c:1966 ../src/sendmsg-window.c:3769
+#: ../src/sendmsg-window.c:3771
 msgid "Re:"
 msgstr "Re:"
 
-#: ../libbalsa/identity.c:102 ../src/sendmsg-window.c:3696
-#: ../src/sendmsg-window.c:3697 ../src/sendmsg-window.c:3698
+#: ../libbalsa/identity.c:100 ../src/sendmsg-window.c:3709
+#: ../src/sendmsg-window.c:3710 ../src/sendmsg-window.c:3711
 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:164
+#: ../libbalsa/identity.c:160
 msgid "New Identity"
 msgstr "Identidad nueva"
 
-#: ../libbalsa/identity.c:344
+#: ../libbalsa/identity.c:337
 #, c-format
-msgid "Error executing signature generator %s"
-msgstr "Error al ejecutar el generador de firmas %s"
+#| msgid "Error executing signature generator %s"
+msgid "Error executing signature generator “%s”: %s"
+msgstr "Error al ejecutar el generador de firmas «%s»: %s"
 
-#: ../libbalsa/identity.c:356
+#: ../libbalsa/identity.c:346
 #, fuzzy, c-format
 #| msgid "Cannot open signature file '%s' for reading"
-msgid "Cannot open signature file “%s” for reading"
+msgid "Cannot read signature file “%s”: %s"
 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:362
-#, c-format
-msgid "Error reading signature from %s"
-msgstr "Ha ocurrido un error al cargar la firma de %s"
-
-#: ../libbalsa/identity.c:367
+#: ../libbalsa/identity.c:357
 #, c-format
 msgid "Signature in %s is not a UTF-8 text."
 msgstr "La firma en %s no es un texto UTF-8."
@@ -543,131 +520,130 @@ msgstr "La firma en %s no es un texto UTF-8."
 # src/sendmsg-window.c:1695
 # src/balsa-message.c:288 src/sendmsg-window.c:155 src/sendmsg-window.c:634
 # src/sendmsg-window.c:1728 src/sendmsg-window.c:1751
-#: ../libbalsa/identity.c:486 ../libbalsa/libbalsa-gpgme-cb.c:157
-#: ../libbalsa/libbalsa-gpgme-cb.c:369 ../libbalsa/smtp-server.c:541
+#: ../libbalsa/identity.c:468 ../libbalsa/libbalsa-gpgme-cb.c:157
+#: ../libbalsa/libbalsa-gpgme-cb.c:369 ../libbalsa/smtp-server.c:472
 #: ../src/ab-main.c:858 ../src/ab-window.c:141
-#: ../src/address-book-config.c:239 ../src/address-book-config.c:342
-#: ../src/address-book-config.c:388 ../src/balsa-app.c:88
+#: ../src/address-book-config.c:237 ../src/address-book-config.c:342
+#: ../src/address-book-config.c:388 ../src/balsa-app.c:89
 #: ../src/balsa-index.c:2654 ../src/balsa-mblist.c:1896
-#: ../src/balsa-message.c:1764 ../src/balsa-mime-widget-callbacks.c:85
-#: ../src/filter-edit-callbacks.c:1239 ../src/filter-edit-dialog.c:402
+#: ../src/balsa-message.c:1766 ../src/balsa-mime-widget-callbacks.c:85
+#: ../src/filter-edit-callbacks.c:1247 ../src/filter-edit-dialog.c:402
 #: ../src/filter-edit-dialog.c:571 ../src/filter-export-dialog.c:79
-#: ../src/filter-run-dialog.c:311 ../src/folder-conf.c:304
-#: ../src/folder-conf.c:566 ../src/folder-conf.c:799 ../src/mailbox-conf.c:402
-#: ../src/mailbox-conf.c:423 ../src/mailbox-conf.c:439
-#: ../src/mailbox-conf.c:1123 ../src/pref-manager.c:505
-#: ../src/sendmsg-window.c:533 ../src/sendmsg-window.c:1546
-#: ../src/sendmsg-window.c:1998 ../src/sendmsg-window.c:3322
-#: ../src/sendmsg-window.c:4689 ../src/sendmsg-window.c:4986
-#: ../src/sendmsg-window.c:5143 ../src/spell-check.c:382
-#: ../src/store-address.c:208
-#| msgid "Cancel"
+#: ../src/filter-run-dialog.c:316 ../src/folder-conf.c:311
+#: ../src/folder-conf.c:573 ../src/folder-conf.c:806 ../src/mailbox-conf.c:462
+#: ../src/mailbox-conf.c:483 ../src/mailbox-conf.c:499
+#: ../src/mailbox-conf.c:1222 ../src/mailbox-conf.c:1259
+#: ../src/pref-manager.c:3298 ../src/sendmsg-window.c:532
+#: ../src/sendmsg-window.c:1557 ../src/sendmsg-window.c:2009
+#: ../src/sendmsg-window.c:3335 ../src/sendmsg-window.c:4698
+#: ../src/sendmsg-window.c:4995 ../src/sendmsg-window.c:5152
+#: ../src/spell-check.c:382 ../src/store-address.c:208
 msgid "_Cancel"
 msgstr "C_ancelar"
 
-#: ../libbalsa/identity.c:487 ../libbalsa/libbalsa-gpgme-cb.c:156
-#: ../libbalsa/libbalsa-gpgme-cb.c:368 ../libbalsa/smtp-server.c:540
-#: ../src/ab-window.c:140 ../src/balsa-app.c:87 ../src/balsa-message.c:1765
-#: ../src/balsa-mime-widget-callbacks.c:86 ../src/filter-edit-callbacks.c:1238
+#: ../libbalsa/identity.c:469 ../libbalsa/libbalsa-gpgme-cb.c:156
+#: ../libbalsa/libbalsa-gpgme-cb.c:368 ../libbalsa/smtp-server.c:471
+#: ../src/ab-window.c:140 ../src/balsa-app.c:88 ../src/balsa-message.c:1767
+#: ../src/balsa-mime-widget-callbacks.c:86 ../src/filter-edit-callbacks.c:1246
 #: ../src/filter-edit-dialog.c:570 ../src/filter-export-dialog.c:78
-#: ../src/filter-run-dialog.c:310 ../src/main-window.c:4035
-#: ../src/pref-manager.c:503 ../src/sendmsg-window.c:1545
-#: ../src/sendmsg-window.c:1999 ../src/sendmsg-window.c:3321
-#: ../src/sendmsg-window.c:4690 ../src/store-address.c:209
+#: ../src/filter-run-dialog.c:315 ../src/main-window.c:4001
+#: ../src/pref-manager.c:3296 ../src/sendmsg-window.c:1556
+#: ../src/sendmsg-window.c:2010 ../src/sendmsg-window.c:3334
+#: ../src/sendmsg-window.c:4699 ../src/store-address.c:209
 msgid "_OK"
 msgstr "_Aceptar"
 
 # src/main-window.c:396
 # src/main-window.c:395
-#: ../libbalsa/identity.c:499
+#: ../libbalsa/identity.c:481
 msgid "Current"
 msgstr "Actual"
 
 # src/pref-manager.c:1333
 # src/pref-manager.c:1476
-#: ../libbalsa/identity.c:753 ../libbalsa/smtp-server.c:263
+#: ../libbalsa/identity.c:731 ../libbalsa/smtp-server.c:179
 msgid "Default"
 msgstr "Predeterminado"
 
 # src/mailbox-conf.c:890
 # src/mailbox-conf.c:965
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:955
+#: ../libbalsa/identity.c:933
 msgid "_Face Path"
 msgstr "Ruta de la _cara"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:961
+#: ../libbalsa/identity.c:939
 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:989
+#: ../libbalsa/identity.c:962
 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:991
+#: ../libbalsa/identity.c:964
 msgid "_Identity name:"
 msgstr "Nombre de la _identidad:"
 
 # src/store-address.c:50
 # src/store-address.c:52
-#: ../libbalsa/identity.c:993
+#: ../libbalsa/identity.c:966
 msgid "_Full name:"
 msgstr "Nombre _completo:"
 
 # src/store-address.c:52
 # src/store-address.c:54
-#: ../libbalsa/identity.c:995
+#: ../libbalsa/identity.c:968
 msgid "_Mailing address:"
 msgstr "_Dirección de correo:"
 
 # src/sendmsg-window.c:885
 # src/sendmsg-window.c:928
-#: ../libbalsa/identity.c:997
+#: ../libbalsa/identity.c:970
 msgid "Reply _to:"
 msgstr "_Responder a:"
 
 # src/filter-edit-dialog.c:454
 # src/filter-edit-dialog.c:404
-#: ../libbalsa/identity.c:999
+#: ../libbalsa/identity.c:972
 msgid "_Domain:"
 msgstr "_Dominio:"
 
 # src/main-window.c:421
 # src/main-window.c:428
 #. create the "Messages" tab
-#: ../libbalsa/identity.c:1003
+#: ../libbalsa/identity.c:976
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../libbalsa/identity.c:1005
+#: ../libbalsa/identity.c:978
 msgid "_BCC:"
 msgstr "_Cco:"
 
 # src/pref-manager.c:1007
 # src/pref-manager.c:1137
-#: ../libbalsa/identity.c:1007
+#: ../libbalsa/identity.c:980
 msgid "Reply _string:"
 msgstr "_Cadena de respuesta:"
 
 # src/message-window.c:120
 # src/message-window.c:114
-#: ../libbalsa/identity.c:1009
+#: ../libbalsa/identity.c:982
 msgid "F_orward string:"
 msgstr "Cadena de r_eenvío:"
 
-#: ../libbalsa/identity.c:1012
+#: ../libbalsa/identity.c:985
 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:1015
+#: ../libbalsa/identity.c:988
 #, fuzzy
 #| msgid "request _Message Disposition Notification by default"
 msgid "request positive (successful) _Delivery Status Notification by default"
@@ -675,62 +651,62 @@ 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:1019
+#: ../libbalsa/identity.c:992
 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:1029
+#: ../libbalsa/identity.c:1001
 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:1034
+#: ../libbalsa/identity.c:1005
 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:1037
+#: ../libbalsa/identity.c:1008
 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:1040
+#: ../libbalsa/identity.c:1011
 msgid "_Execute signature"
 msgstr "_Ejecutar firma"
 
 # src/sendmsg-window.c:1434
 # src/sendmsg-window.c:1483
-#: ../libbalsa/identity.c:1043
+#: ../libbalsa/identity.c:1014
 msgid "Incl_ude signature"
 msgstr "Incl_uir firma"
 
-#: ../libbalsa/identity.c:1046
+#: ../libbalsa/identity.c:1017
 msgid "Include signature when for_warding"
 msgstr "Incluir firma cuando se _reenvíe"
 
-#: ../libbalsa/identity.c:1049
+#: ../libbalsa/identity.c:1020
 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:1052
+#: ../libbalsa/identity.c:1023
 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:1055
+#: ../libbalsa/identity.c:1026
 msgid "Prepend si_gnature"
 msgstr "An_teponer firma"
 
-#: ../libbalsa/identity.c:1061
+#: ../libbalsa/identity.c:1032
 #, fuzzy
 #| msgid ""
 #| "Signing and encrypting messages are possible\n"
@@ -742,31 +718,31 @@ msgstr ""
 "Sólo es posible firmar y cifrar mensajes\n"
 "si Balsa se construye con soporte criptográfico."
 
-#: ../libbalsa/identity.c:1066
+#: ../libbalsa/identity.c:1037
 msgid "Security"
 msgstr "Seguridad"
 
-#: ../libbalsa/identity.c:1069
+#: ../libbalsa/identity.c:1040
 msgid "sign messages by default"
 msgstr "firmar mensajes por omisión"
 
-#: ../libbalsa/identity.c:1072
+#: ../libbalsa/identity.c:1043
 msgid "encrypt messages by default"
 msgstr "cifrar mensajes por omisión"
 
-#: ../libbalsa/identity.c:1075
+#: ../libbalsa/identity.c:1046
 msgid "default protocol"
 msgstr "protocolo predeterminado"
 
-#: ../libbalsa/identity.c:1078
+#: ../libbalsa/identity.c:1049
 msgid "always trust GnuPG keys when encrypting"
 msgstr "confiar siempre en las claves GnuPG al cifrar"
 
-#: ../libbalsa/identity.c:1081
+#: ../libbalsa/identity.c:1052
 msgid "remind me if messages can be encrypted"
 msgstr "recordarme si se pueden cifrar los mensajes"
 
-#: ../libbalsa/identity.c:1084
+#: ../libbalsa/identity.c:1055
 msgid ""
 "use secret key with this id for signing\n"
 "(leave empty for automatic selection)"
@@ -776,19 +752,19 @@ msgstr ""
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../libbalsa/identity.c:1218
+#: ../libbalsa/identity.c:1189
 #, 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:1228
+#: ../libbalsa/identity.c:1199
 #, 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:1238
+#: ../libbalsa/identity.c:1209
 #, c-format
 msgid "Face header file %s contains binary data."
 msgstr "El archivo de cabecera de la cara %s contiene datos binarios."
@@ -796,68 +772,68 @@ 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:1258 ../src/balsa-message.c:1589
+#: ../libbalsa/identity.c:1229 ../src/balsa-message.c:1591
 #, c-format
 msgid "Error loading Face: %s"
 msgstr "Ha ocurrido un error al cargar la cara: %s"
 
-#: ../libbalsa/identity.c:1437
+#: ../libbalsa/identity.c:1408
 msgid "Error: The identity does not have a name"
 msgstr "Error: La identidad no tiene un nombre"
 
-#: ../libbalsa/identity.c:1447
+#: ../libbalsa/identity.c:1418
 msgid "Error: An identity with that name already exists"
 msgstr "Error: Ya existe una identidad con ese nombre"
 
-#: ../libbalsa/identity.c:1642
+#: ../libbalsa/identity.c:1611
 msgid "Do you really want to delete the selected identity?"
 msgstr "¿Está seguro que quiere eliminar la identidad seleccionada?"
 
-#: ../libbalsa/identity.c:1681
+#: ../libbalsa/identity.c:1656
 #, 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:1727
+#: ../libbalsa/identity.c:1695
 msgid "Manage Identities"
 msgstr "Gestionar identidades"
 
-#: ../libbalsa/identity.c:1731 ../libbalsa/smtp-server.c:542
-#: ../src/address-book-config.c:237 ../src/address-book-config.c:340
-#: ../src/address-book-config.c:386 ../src/filter-edit-callbacks.c:1240
+#: ../libbalsa/identity.c:1699 ../libbalsa/smtp-server.c:473
+#: ../src/address-book-config.c:238 ../src/address-book-config.c:340
+#: ../src/address-book-config.c:386 ../src/filter-edit-callbacks.c:1248
 #: ../src/filter-edit-dialog.c:572 ../src/filter-export-dialog.c:80
-#: ../src/filter-run-dialog.c:312 ../src/folder-conf.c:305
-#: ../src/folder-conf.c:567 ../src/folder-conf.c:800 ../src/main-window.c:3941
-#: ../src/pref-manager.c:506 ../src/toolbar-prefs.c:141
+#: ../src/filter-run-dialog.c:317 ../src/folder-conf.c:312
+#: ../src/folder-conf.c:574 ../src/folder-conf.c:807 ../src/main-window.c:3905
+#: ../src/pref-manager.c:3299 ../src/toolbar-prefs.c:141
 msgid "_Help"
 msgstr "Ay_uda"
 
 # src/main-window.c:191
 # src/main-window.c:196
 #. new button
-#: ../libbalsa/identity.c:1732 ../src/filter-edit-dialog.c:224
+#: ../libbalsa/identity.c:1700 ../src/filter-edit-dialog.c:224
 #: ../src/mailbox-node.c:1078
 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:1733 ../src/ab-main.c:853
-#: ../src/filter-edit-callbacks.c:1073 ../src/filter-edit-dialog.c:318
+#: ../libbalsa/identity.c:1701 ../src/ab-main.c:853
+#: ../src/filter-edit-callbacks.c:1081 ../src/filter-edit-dialog.c:318
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../libbalsa/identity.c:2125
+#: ../libbalsa/identity.c:2085
 msgid "GnuPG MIME mode"
 msgstr "Modo MIME de GnuPG"
 
-#: ../libbalsa/identity.c:2127
+#: ../libbalsa/identity.c:2087
 msgid "GnuPG OpenPGP mode"
 msgstr "Modo OpenPGP de GnuPG"
 
-#: ../libbalsa/identity.c:2130
+#: ../libbalsa/identity.c:2090
 msgid "GpgSM S/MIME mode"
 msgstr "Modo S/MIME de GpgSM"
 
@@ -883,13 +859,13 @@ msgstr "Error del servidor de correo IMAP %s: %s"
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../libbalsa/imap-server.c:527 ../libbalsa/server.c:351
+#: ../libbalsa/imap-server.c:527 ../libbalsa/server.c:368
 #, 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:529 ../libbalsa/server.c:353
+#: ../libbalsa/imap-server.c:529 ../libbalsa/server.c:370
 #, c-format
 msgid "Falling back\n"
 msgstr ""
@@ -897,15 +873,15 @@ 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:539 ../libbalsa/imap-server.c:575
-#: ../libbalsa/server.c:362 ../libbalsa/server.c:396 ../libbalsa/server.c:441
-#: ../libbalsa/server.c:455
+#: ../libbalsa/server.c:379 ../libbalsa/server.c:413 ../libbalsa/server.c:471
+#: ../libbalsa/server.c:485
 msgid "Balsa passwords"
 msgstr "Contraseñas de Balsa"
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../libbalsa/imap-server.c:548 ../libbalsa/server.c:371
-#: ../libbalsa/server.c:448
+#: ../libbalsa/imap-server.c:548 ../libbalsa/server.c:388
+#: ../libbalsa/server.c:478
 #, fuzzy, c-format
 #| msgid "Error showing %s: %s\n"
 msgid "Error storing password for %s@%s: %s\n"
@@ -930,106 +906,115 @@ msgstr "No se puede conectar con el servidor: %s"
 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:135
-msgid "User ID"
-msgstr "ID del usuario"
-
-#: ../libbalsa/libbalsa-gpgme-cb.c:135
-msgid "Key ID"
-msgstr "ID de clave"
+# libmutt/imap/imap_ssl.c:297
+# libmutt/imap/imap_ssl.c:297
+#: ../libbalsa/libbalsa.c:369
+msgid "Invalid date"
+msgstr "Fecha inválida"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:135
-msgid "Length"
-msgstr "Longitud"
+# libmutt/imap/imap_ssl.c:254
+# libmutt/imap/imap_ssl.c:254
+#: ../libbalsa/libbalsa.c:386 ../src/pref-manager.c:934
+#: ../src/pref-manager.c:3600
+msgid "Unknown"
+msgstr "Desconocido"
 
-# src/main-window.c:259
-# src/main-window.c:262
-#: ../libbalsa/libbalsa-gpgme-cb.c:135
-msgid "Validity"
-msgstr "Validez"
+#: ../libbalsa/libbalsa.c:528 ../libbalsa/libbalsa.c:633
+msgid "SSL/TLS certificate"
+msgstr "Certificado SSL/TLS"
 
-# src/sendmsg-window.c:191
-# src/sendmsg-window.c:196
-#. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/libbalsa-gpgme-cb.c:152
-msgid "Select key"
-msgstr "Seleccione clave"
+#: ../libbalsa/libbalsa.c:532 ../libbalsa/libbalsa.c:637
+msgid "_Accept Once"
+msgstr "_Aceptar una vez"
 
-# src/sendmsg-window.c:166
-# src/sendmsg-window.c:172
-#: ../libbalsa/libbalsa-gpgme-cb.c:173
-#, c-format
-msgid "Select the private key for the signer %s"
-msgstr "Seleccione la clave privada para el firmante %s"
+#: ../libbalsa/libbalsa.c:533 ../libbalsa/libbalsa.c:638
+msgid "Accept & _Save"
+msgstr "Acepta_r y guardar"
 
-# src/balsa-message.c:1316
-# src/balsa-message.c:1474
-#: ../libbalsa/libbalsa-gpgme-cb.c:178
-#, c-format
-msgid "Select the public key for the recipient %s"
-msgstr "Seleccione la clave pública para el destinatario %s"
+# src/sendmsg-window.c:224
+# src/sendmsg-window.c:228
+#: ../libbalsa/libbalsa.c:534 ../libbalsa/libbalsa.c:639
+msgid "_Reject"
+msgstr "_Rechazar"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:183
+#: ../libbalsa/libbalsa.c:544
 #, c-format
+#| msgid ""
+#| "Authenticity of this certificate could not be verified.\n"
+#| "<b>Reason:</b> %s\n"
+#| "<b>This certificate belongs to:</b>\n"
 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."
+"<big><b>Authenticity of this certificate could not be verified.</b></big>\n"
+"Reason: %s"
 msgstr ""
+"<big><b>No se pudo verificar la autenticidad de este certificado.</b></big>\n"
+"Razón: %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:324
+#: ../libbalsa/libbalsa.c:591
 #, c-format
-msgid "Insufficient trust for recipient %s"
-msgstr "No hay suficiente confianza en el destinatario %s"
-
-#: ../libbalsa/libbalsa-gpgme-cb.c:328
-#, fuzzy, c-format
-#| msgid "The validity of the key with user ID \"%s\" is \"%s\"."
-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:339
-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:365
-#, fuzzy
-#| msgid "_Pass Phrase:"
-msgid "Enter Passphrase"
-msgstr "Frase de _paso:"
+msgid ""
+"Authenticity of this certificate could not be verified.\n"
+"<b>Reason:</b> %s\n"
+"<b>This certificate belongs to:</b>\n"
+msgstr ""
+"La autenticidad de este certificado no pudo ser verificada.\n"
+"<b>Razón:</b> %s\n"
+"<b>Este certificado pertenece a:</b>\n"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:393
-#, fuzzy, c-format
-#| msgid ""
-#| "The passphrase for this key was bad, please try again!\n"
-#| "\n"
-#| "Key: %s"
+# libmutt/imap/imap_ssl.c:462
+# libmutt/imap/imap_ssl.c:462
+#: ../libbalsa/libbalsa.c:603
 msgid ""
-"%s\n"
-"The passphrase for this key was bad, please try again!\n"
 "\n"
-"Key: %s"
+"<b>This certificate was issued by:</b>\n"
 msgstr ""
-"La frase de paso de esta clave era incorrecta. Inténtelo de nuevo.\n"
 "\n"
-"Clave: %s"
+"<b>Este certificado fue emitido por: </b>\n"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:398
-#, fuzzy, c-format
-#| msgid ""
-#| "Please enter the passphrase for the secret key!\n"
-#| "\n"
-#| "Key: %s"
+#: ../libbalsa/libbalsa.c:614
+#, c-format
 msgid ""
-"%s\n"
-"Please enter the passphrase for the secret key!\n"
-"\n"
-"Key: %s"
+"<b>This certificate is valid</b>\n"
+"from %s\n"
+"to %s\n"
+"<b>Fingerprint:</b> %s"
 msgstr ""
-"Introduzca la frase de paso para la clave secreta:\n"
-"\n"
-"Clave: %s"
+"<b>Este certificado es válido</b>\n"
+"de %s\n"
+"a %s\n"
+"<b>Huella</b> %s"
+
+#: ../libbalsa/libbalsa.c:688
+#, c-format
+msgid "Connection to %s timed out. Abort?"
+msgstr "Se agotó el tiempo de conexión para %s. ¿Abortar?"
+
+#: ../libbalsa/libbalsa.c:845
+#, c-format
+msgid "No image data"
+msgstr "Sin datos de imagen"
+
+# libmutt/imap/imap_ssl.c:297
+# libmutt/imap/imap_ssl.c:297
+#: ../libbalsa/libbalsa.c:879
+#, c-format
+msgid "Invalid input format"
+msgstr "Formato de entrada inválido"
+
+#: ../libbalsa/libbalsa.c:883
+#, c-format
+msgid "Internal buffer overrun"
+msgstr "Sobrepasado el búfer interno"
+
+#. Translators: please do not translate Face.
+#: ../libbalsa/libbalsa.c:900
+#, c-format
+msgid "Bad X-Face data"
+msgstr "Datos X-Face erróneos"
+
+#: ../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»."
 
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
@@ -1094,7 +1079,6 @@ msgstr "No se pudo obtener una parte: %s"
 # src/balsa-message.c:331
 #: ../libbalsa/libbalsa-gpgme.c:756 ../libbalsa/libbalsa-gpgme.c:774
 #, c-format
-#| msgid "could not list keys for \"%s\""
 msgid "could not list keys for “%s”"
 msgstr "no se pudieron listar las claves para «%s»"
 
@@ -1146,230 +1130,219 @@ msgstr "%s: validez insuficiente para el uid %s"
 # src/balsa-message.c:331
 #: ../libbalsa/libbalsa-gpgme.c:894 ../libbalsa/libbalsa-gpgme.c:908
 #, c-format
-#| msgid "could not list keys for \"%s\""
 msgid "could not list keys"
 msgstr "no se pudieron listar las claves"
 
-#: ../libbalsa/libbalsa-conf.c:141
-#| msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
-msgid "Your Balsa configuration is now stored in “~/.balsa/config”."
-msgstr "Su configuración de Balsa ahora se guarda en «~/.balsa/config»."
+#: ../libbalsa/libbalsa-gpgme-cb.c:135
+msgid "User ID"
+msgstr "ID del usuario"
 
-# libmutt/mx.c:459 libmutt/mx.c:605
-# libmutt/mx.c:459 libmutt/mx.c:605
-#: ../libbalsa/libbalsa-vfs.c:554 ../src/sendmsg-window.c:4479
-#, c-format
-msgid "not a regular file"
-msgstr "no es un archivo regular"
+#: ../libbalsa/libbalsa-gpgme-cb.c:135
+msgid "Key ID"
+msgstr "ID de clave"
 
-#: ../libbalsa/libbalsa-vfs.c:606
-#, c-format
-msgid "Cannot launch, missing application"
-msgstr "No se puede lanzar, falta la aplicación"
+#: ../libbalsa/libbalsa-gpgme-cb.c:135
+msgid "Length"
+msgstr "Longitud"
 
-# src/balsa-message.c:701
-# src/balsa-message.c:812
-#: ../libbalsa/libbalsa-vfs.c:672
-#, c-format
-msgid "Open with %s"
-msgstr "Abrir con %s"
+# src/main-window.c:259
+# src/main-window.c:262
+#: ../libbalsa/libbalsa-gpgme-cb.c:135
+msgid "Validity"
+msgstr "Validez"
 
-# ¿con "part" se refiere a MIME part?
-# src/balsa-message.c:701
-# src/balsa-message.c:812
-#: ../libbalsa/libbalsa-vfs.c:725
+# src/sendmsg-window.c:191
+# src/sendmsg-window.c:196
+#. FIXME: create dialog according to the Gnome HIG
+#: ../libbalsa/libbalsa-gpgme-cb.c:152
+msgid "Select key"
+msgstr "Seleccione clave"
+
+# src/sendmsg-window.c:166
+# src/sendmsg-window.c:172
+#: ../libbalsa/libbalsa-gpgme-cb.c:173
 #, c-format
-msgid "Open _part with %s"
-msgstr "Ver par_te con %s"
+msgid "Select the private key for the signer %s"
+msgstr "Seleccione la clave privada para el firmante %s"
 
-# libmutt/imap/imap_ssl.c:297
-# libmutt/imap/imap_ssl.c:297
-#: ../libbalsa/libbalsa.c:366
-msgid "Invalid date"
-msgstr "Fecha inválida"
+# src/balsa-message.c:1316
+# src/balsa-message.c:1474
+#: ../libbalsa/libbalsa-gpgme-cb.c:178
+#, c-format
+msgid "Select the public key for the recipient %s"
+msgstr "Seleccione la clave pública para el destinatario %s"
 
-# libmutt/imap/imap_ssl.c:254
-# libmutt/imap/imap_ssl.c:254
-#: ../libbalsa/libbalsa.c:383 ../src/pref-manager.c:1384
-#: ../src/pref-manager.c:1480
-msgid "Unknown"
-msgstr "Desconocido"
+#: ../libbalsa/libbalsa-gpgme-cb.c:183
+#, 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.c:525 ../libbalsa/libbalsa.c:630
-msgid "SSL/TLS certificate"
-msgstr "Certificado SSL/TLS"
+#: ../libbalsa/libbalsa-gpgme-cb.c:324
+#, c-format
+msgid "Insufficient trust for recipient %s"
+msgstr "No hay suficiente confianza en el destinatario %s"
 
-#: ../libbalsa/libbalsa.c:529 ../libbalsa/libbalsa.c:634
-msgid "_Accept Once"
-msgstr "_Aceptar una vez"
+#: ../libbalsa/libbalsa-gpgme-cb.c:328
+#, fuzzy, c-format
+#| msgid "The validity of the key with user ID \"%s\" is \"%s\"."
+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.c:530 ../libbalsa/libbalsa.c:635
-#| msgid "Accept&_Save"
-msgid "Accept & _Save"
-msgstr "Acepta_r y guardar"
+#: ../libbalsa/libbalsa-gpgme-cb.c:339
+msgid "Use this key anyway?"
+msgstr "¿Quiere usar esta clave de todos modos?"
 
-# src/sendmsg-window.c:224
-# src/sendmsg-window.c:228
-#: ../libbalsa/libbalsa.c:531 ../libbalsa/libbalsa.c:636
-msgid "_Reject"
-msgstr "_Rechazar"
+#. FIXME: create dialog according to the Gnome HIG
+#: ../libbalsa/libbalsa-gpgme-cb.c:365
+#| msgid "_Pass Phrase:"
+msgid "Enter Passphrase"
+msgstr "Introduzca la frase de paso"
 
-#: ../libbalsa/libbalsa.c:541
+#: ../libbalsa/libbalsa-gpgme-cb.c:393
 #, fuzzy, c-format
 #| msgid ""
-#| "Authenticity of this certificate could not be verified.\n"
-#| "<b>Reason:</b> %s\n"
-#| "<b>This certificate belongs to:</b>\n"
-msgid ""
-"<big><b>Authenticity of this certificate could not be verified.</b></big>\n"
-"Reason: %s"
-msgstr ""
-"La autenticidad de este certificado no pudo ser verificada.\n"
-"<b>Razón:</b> %s\n"
-"<b>Este certificado pertenece a:</b>\n"
-
-#: ../libbalsa/libbalsa.c:588
-#, c-format
-msgid ""
-"Authenticity of this certificate could not be verified.\n"
-"<b>Reason:</b> %s\n"
-"<b>This certificate belongs to:</b>\n"
-msgstr ""
-"La autenticidad de este certificado no pudo ser verificada.\n"
-"<b>Razón:</b> %s\n"
-"<b>Este certificado pertenece a:</b>\n"
-
-# libmutt/imap/imap_ssl.c:462
-# libmutt/imap/imap_ssl.c:462
-#: ../libbalsa/libbalsa.c:600
+#| "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"
-"<b>This certificate was issued by:</b>\n"
+"Key: %s"
 msgstr ""
+"La frase de paso de esta clave era incorrecta. Inténtelo de nuevo.\n"
 "\n"
-"<b>Este certificado fue emitido por: </b>\n"
+"Clave: %s"
 
-#: ../libbalsa/libbalsa.c:611
-#, c-format
+#: ../libbalsa/libbalsa-gpgme-cb.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "Please enter the passphrase for the secret key!\n"
+#| "\n"
+#| "Key: %s"
 msgid ""
-"<b>This certificate is valid</b>\n"
-"from %s\n"
-"to %s\n"
-"<b>Fingerprint:</b> %s"
+"%s\n"
+"Please enter the passphrase for the secret key!\n"
+"\n"
+"Key: %s"
 msgstr ""
-"<b>Este certificado es válido</b>\n"
-"de %s\n"
-"a %s\n"
-"<b>Huella</b> %s"
+"Introduzca la frase de paso para la clave secreta:\n"
+"\n"
+"Clave: %s"
 
-#: ../libbalsa/libbalsa.c:685
-#, c-format
-msgid "Connection to %s timed out. Abort?"
-msgstr "Se agotó el tiempo de conexión para %s. ¿Abortar?"
+#: ../libbalsa/libbalsa-progress.c:65 ../src/main-window.c:3272
+msgid "_Hide"
+msgstr "_Ocultar"
 
-#: ../libbalsa/libbalsa.c:842
+# libmutt/mx.c:459 libmutt/mx.c:605
+# libmutt/mx.c:459 libmutt/mx.c:605
+#: ../libbalsa/libbalsa-vfs.c:557 ../src/sendmsg-window.c:4493
 #, c-format
-msgid "No image data"
-msgstr "Sin datos de imagen"
+msgid "not a regular file"
+msgstr "no es un archivo regular"
 
-# libmutt/imap/imap_ssl.c:297
-# libmutt/imap/imap_ssl.c:297
-#: ../libbalsa/libbalsa.c:876
+#: ../libbalsa/libbalsa-vfs.c:609
 #, c-format
-msgid "Invalid input format"
-msgstr "Formato de entrada inválido"
+msgid "Cannot launch, missing application"
+msgstr "No se puede lanzar, falta la aplicación"
 
-#: ../libbalsa/libbalsa.c:880
+# src/balsa-message.c:701
+# src/balsa-message.c:812
+#: ../libbalsa/libbalsa-vfs.c:675
 #, c-format
-msgid "Internal buffer overrun"
-msgstr "Sobrepasado el búfer interno"
+msgid "Open with %s"
+msgstr "Abrir con %s"
 
-#. Translators: please do not translate Face.
-#: ../libbalsa/libbalsa.c:897
+# ¿con "part" se refiere a MIME part?
+# src/balsa-message.c:701
+# src/balsa-message.c:812
+#: ../libbalsa/libbalsa-vfs.c:728
 #, c-format
-msgid "Bad X-Face data"
-msgstr "Datos X-Face erróneos"
+msgid "Open _part with %s"
+msgstr "Ver par_te con %s"
 
 # libbalsa/mailbox.c:262
 # libbalsa/mailbox.c:275
-#: ../libbalsa/mailbox.c:504
+#: ../libbalsa/mailbox.c:510
 #, 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:511
+#: ../libbalsa/mailbox.c:517
 #, 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:528
-#, fuzzy, c-format
+#: ../libbalsa/mailbox.c:534
+#, c-format
 #| msgid "Bad local mailbox path \"%s\""
 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:533
+#: ../libbalsa/mailbox.c:539
 #, 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:862
+#: ../libbalsa/mailbox.c:854
 #, c-format
 msgid "Applying filter rules to %s"
 msgstr "Aplicando reglas de filtrado a: %s"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../libbalsa/mailbox.c:1027
+#: ../libbalsa/mailbox.c:1019
 #, c-format
 msgid "Copying from %s to %s"
 msgstr "Copiando de %s a %s"
 
-#: ../libbalsa/mailbox.c:1957
+#: ../libbalsa/mailbox.c:1952
 #, 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:2162
+#: ../libbalsa/mailbox.c:2157
 #, 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:2989
+#: ../libbalsa/mailbox.c:2984
 msgid "from unknown"
 msgstr "desde desconocido"
 
 # src/main-window.c:177
 # src/main-window.c:184
-#: ../libbalsa/mailbox.c:2991
-#| msgid "Loading..."
+#: ../libbalsa/mailbox.c:2986
 msgid "Loading…"
 msgstr "Cargando…"
 
-#: ../libbalsa/mailbox.c:3960
+#: ../libbalsa/mailbox.c:3955
 #, 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:4050
+#: ../libbalsa/mailbox.c:4045
 msgid "Reconstructing message"
 msgstr "Reconstruyendo el mensaje"
 
 # src/main-window.c:403
 # src/main-window.c:406
-#: ../libbalsa/mailbox.c:4310
+#: ../libbalsa/mailbox.c:4304
 #, 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"
@@ -1378,10 +1351,9 @@ msgstr "Ha fallado la búsqueda de mensajes duplicados en el buzón de origen"
 #. LIBBALSA_INFORMATION_MESSAGE here but it would be overwritten by
 #. login information...
 #: ../libbalsa/mailbox_imap.c:613
-#, fuzzy
 #| msgid "IMAP connection has been severed. Reconnecting..."
 msgid "IMAP connection has been severed. Reconnecting…"
-msgstr "La conexión IMAP se ha cortado. Re-conectando…"
+msgstr "La conexión IMAP se ha cortado. Volviendo a conectar…"
 
 #: ../libbalsa/mailbox_imap.c:616
 msgid "IMAP protocol error. Try enabling bug workarounds."
@@ -1396,15 +1368,16 @@ 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:631
-#, fuzzy, c-format
+#, c-format
 #| msgid "Async IMAP cmd %s could not be executed. Reconnecting..."
 msgid "Async IMAP cmd %s could not be executed. Reconnecting…"
-msgstr "El comando IMAP asíncrono %s no se pudo ejecutar. Reconectando…"
+msgstr ""
+"No se pudo ejecutar el comando IMAP asíncrono %s. Volviendo a conectar…"
 
 # libbalsa/mailbox_pop3.c:184
 # libbalsa/mailbox_pop3.c:198
 #: ../libbalsa/mailbox_imap.c:1122 ../libbalsa/mailbox_maildir.c:503
-#: ../libbalsa/mailbox_mbox.c:737 ../libbalsa/mailbox_mh.c:539
+#: ../libbalsa/mailbox_mbox.c:754 ../libbalsa/mailbox_mh.c:539
 #, c-format
 msgid "%s: Opening %s Refcount: %d\n"
 msgstr "%s: Abriendo %s Conteo de ref: %d\n"
@@ -1424,7 +1397,7 @@ msgstr ""
 "volviendo al método de búsqueda predeterminado"
 
 #: ../libbalsa/mailbox_imap.c:1668
-#, fuzzy, c-format
+#, c-format
 #| msgid "No path found for mailbox \"%s\", using \"%s\""
 msgid "No path found for mailbox “%s”, using “%s”"
 msgstr "No se encontró ruta para el buzón «%s», usando «%s»"
@@ -1468,50 +1441,50 @@ 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:564
-#, fuzzy, c-format
+#: ../libbalsa/mailbox_local.c:569
+#, c-format
 #| msgid "Failed to save cache file \"%s\": %s."
 msgid "Failed to save cache file “%s”: %s."
 msgstr "Falló al guardar el archivo de caché «%s»: %s."
 
-#: ../libbalsa/mailbox_local.c:598
+#: ../libbalsa/mailbox_local.c:603
 #, 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:607
+#: ../libbalsa/mailbox_local.c:612
 #, c-format
 msgid "Failed to read cache file %s: %s"
 msgstr "Falló al leer el archivo de caché %s: %s"
 
-#: ../libbalsa/mailbox_local.c:625 ../libbalsa/mailbox_local.c:644
-#: ../libbalsa/mailbox_local.c:668
+#: ../libbalsa/mailbox_local.c:630 ../libbalsa/mailbox_local.c:649
+#: ../libbalsa/mailbox_local.c:673
 #, 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:1241
+#: ../libbalsa/mailbox_local.c:1246
 #, c-format
 msgid "Filtering %s"
 msgstr "Filtrando %s"
 
-#: ../libbalsa/mailbox_local.c:1330
+#: ../libbalsa/mailbox_local.c:1335
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: ../libbalsa/mailbox_local.c:2131
+#: ../libbalsa/mailbox_local.c:2133
 #, 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:2153
-#, fuzzy, c-format
+#: ../libbalsa/mailbox_local.c:2155
+#, c-format
 #| msgid "Failed to sync mailbox \"%s\""
 msgid "Failed to sync mailbox “%s”"
 msgstr "Falló al sincronizar buzón «%s»"
@@ -1526,16 +1499,16 @@ 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:200
-#, fuzzy, c-format
+#, c-format
 #| msgid "Could not create a MailDir directory at %s (%s)"
 msgid "Could not create a Maildir directory at %s (%s)"
-msgstr "No se pudo crear un directorio Maildir en %s (%s)"
+msgstr "No se pudo crear una carpeta Maildir en %s (%s)"
 
 # libbalsa/mailbox.c:275
 # libbalsa/mailbox.c:290
 #: ../libbalsa/mailbox_maildir.c:208 ../libbalsa/mailbox_maildir.c:217
 #: ../libbalsa/mailbox_maildir.c:228
-#, fuzzy, c-format
+#, c-format
 #| msgid "Could not create a MailDir at %s (%s)"
 msgid "Could not create a Maildir at %s (%s)"
 msgstr "No se pudo crear un Maildir en %s (%s)"
@@ -1565,13 +1538,13 @@ msgstr ""
 
 # src/pref-manager.c:1087
 # src/pref-manager.c:1218
-#: ../libbalsa/mailbox_maildir.c:484 ../libbalsa/mailbox_mbox.c:684
+#: ../libbalsa/mailbox_maildir.c:484 ../libbalsa/mailbox_mbox.c:701
 #: ../libbalsa/mailbox_mh.c:522
 #, c-format
 msgid "Mailbox does not exist."
 msgstr "El buzón no existe."
 
-#: ../libbalsa/mailbox_maildir.c:924 ../libbalsa/mailbox_mbox.c:1968
+#: ../libbalsa/mailbox_maildir.c:924 ../libbalsa/mailbox_mbox.c:1985
 #: ../libbalsa/mailbox_mh.c:1102
 #, c-format
 msgid "Data copy error"
@@ -1596,7 +1569,6 @@ msgstr "No se pudo crear escribir el archivo %s: %s"
 # src/balsa-message.c:1474
 #: ../libbalsa/mailbox_mbox.c:429
 #, c-format
-#| msgid "Failed to create temporary file \"%s\": %s"
 msgid "Failed to create temporary file “%s”: %s"
 msgstr "falló al crear el archivo temporal «%s»: %s"
 
@@ -1617,43 +1589,43 @@ msgstr "No se pudo desenlazar el archivo %s: %s"
 
 # libbalsa/mailbox.c:262
 # libbalsa/mailbox.c:275
-#: ../libbalsa/mailbox_mbox.c:692
+#: ../libbalsa/mailbox_mbox.c:709
 #, 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:704
+#: ../libbalsa/mailbox_mbox.c:721
 #, 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:712
+#: ../libbalsa/mailbox_mbox.c:729
 #, 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:1924
+#: ../libbalsa/mailbox_mbox.c:1941
 #, 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:1936
-#, fuzzy, c-format
+#: ../libbalsa/mailbox_mbox.c:1953
+#, c-format
 #| msgid "%s: could not get new mime stream."
 msgid "%s: could not get new MIME stream."
-msgstr "%s: no se pudo obtener el flujo mime nuevo."
+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:1944
+#: ../libbalsa/mailbox_mbox.c:1961
 #, c-format
 msgid "%s: %s is not in mbox format."
 msgstr "%s: %s no está en formato mbox."
@@ -1694,78 +1666,109 @@ msgstr "No se puede crear el mensaje"
 msgid "Message rename error"
 msgstr "Error al renombrar el mensaje"
 
-#: ../libbalsa/mailbox_pop3.c:196
-#, 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:259
+#, fuzzy, c-format
+#| msgid "Saving sent message to %s failed: %s"
+msgid "Saving the POP3 message UID list failed: %s"
+msgstr "Ha fallado al guardar el mensaje %s: %s"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../libbalsa/mailbox_pop3.c:345
-#, c-format
-msgid "Saving POP message to %s failed"
+#: ../libbalsa/mailbox_pop3.c:297 ../libbalsa/mailbox_pop3.c:321
+#, fuzzy, c-format
+#| msgid "Saving POP message to %s failed"
+msgid "Passing POP message to %s failed: %s"
 msgstr "Ha fallado al guardar el mensaje POP en %s"
 
-# src/pref-manager.c:192
-# src/pref-manager.c:191
-#: ../libbalsa/mailbox_pop3.c:352
-#, c-format
-msgid "Retrieving Message %d of %d"
-msgstr "Descargando mensaje %d de %d"
+# libmutt/mx.c:848
+# libmutt/mx.c:848
+#: ../libbalsa/mailbox_pop3.c:326
+#, fuzzy, c-format
+#| msgid "Saving POP message to %s failed"
+msgid "Saving POP message failed"
+msgstr "Ha fallado al guardar el mensaje POP en %s"
 
-#: ../libbalsa/mailbox_pop3.c:375
-#, c-format
-msgid "Received %ld kB of %ld"
-msgstr "Se han recibido %ld KiB de %ld"
+#: ../libbalsa/mailbox_pop3.c:345
+#, fuzzy, c-format
+#| msgid "Transferring POP message to %s failed."
+msgid "Transferring POP message to %s failed: %s"
+msgstr "La transferencia del mensaje POP a %s falló."
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../libbalsa/mailbox_pop3.c:389
+#: ../libbalsa/mailbox_pop3.c:380
 #, c-format
-msgid "Saving POP message to %s failed."
-msgstr "Ha fallado al guardar el mensaje POP a %s."
+#| msgid "Message from %s: %s"
+msgid "Message %lu of %lu (%s of %s)"
+msgstr "Mensaje %lu de %lu (%s de %s)"
 
-#: ../libbalsa/mailbox_pop3.c:399
+#: ../libbalsa/mailbox_pop3.c:437
 #, c-format
-msgid "Transferring POP message to %s failed."
-msgstr "La transferencia del mensaje POP a %s falló."
+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"
 
-#: ../libbalsa/mailbox_pop3.c:481
-#, c-format
-msgid ""
-"POP3 mailbox %s temp file error:\n"
-"%s"
-msgstr ""
-"Error en el archivo temporal del buzón POP3 %s:\n"
-"%s"
+# src/balsa-message.c:1316
+# src/balsa-message.c:1474
+#: ../libbalsa/mailbox_pop3.c:495 ../libbalsa/send.c:787
+#, fuzzy, c-format
+#| msgid "Could not load Face header file %s: %s"
+msgid "Cannot load certificate file %s: %s"
+msgstr "No se pudo cargar el archivo de cabeceras de la cara %s: %s"
 
-#: ../libbalsa/mailbox_pop3.c:506
-#, c-format
-msgid "POP3 mailbox %s error: %s\n"
+#: ../libbalsa/mailbox_pop3.c:509
+#, fuzzy, c-format
+#| msgid "POP3 mailbox %s error: %s\n"
+msgid "POP3 mailbox %s: cannot connect %s: %s"
 msgstr "Error al acceder al buzón POP3 %s:%s\n"
 
-#: ../libbalsa/mailbox_pop3.c:544
-#, c-format
-#| msgid "POP3 message %d oversized: %d kB - skipped."
-msgid "POP3 message %d oversized: %d kB — skipped."
+#: ../libbalsa/mailbox_pop3.c:518
+#, fuzzy, c-format
+#| msgid "POP3 mailbox %s error: %s\n"
+msgid "POP3 mailbox %s error: %s"
+msgstr "Error al acceder al buzón POP3 %s:%s\n"
+
+#: ../libbalsa/mailbox_pop3.c:562
+#, fuzzy, c-format
+#| msgid "POP3 message %d oversized: %d kB — skipped."
+msgid "POP3 message %d oversized: %s — skipped."
 msgstr "El mensaje POP3 %d sobrepasa el tamaño: %d kB - se omite."
 
-#: ../libbalsa/mailbox_pop3.c:556
-#, c-format
-msgid "POP3 error: cannot open %s for writing."
-msgstr "Error POP3: no se puede abrir %s para escritura."
+#: ../libbalsa/mailbox_pop3.c:640
+#| msgid "Disconnected"
+msgid "Connected"
+msgstr "Conectado"
 
-#: ../libbalsa/mailbox_pop3.c:564
-#, c-format
-msgid "POP3 error: cannot close %s."
-msgstr "Error POP3: no se puede cerrar %s."
+# libmutt/mx.c:848
+# libmutt/mx.c:848
+#: ../libbalsa/mailbox_pop3.c:654
+#, fuzzy, c-format
+#| msgid "New message to %s: %s"
+msgid "%lu new messages (%s)"
+msgstr "Mensaje nuevo a %s: %s"
+
+# libmutt/imap/browse.c:93
+# libmutt/imap/browse.c:93
+#: ../libbalsa/mailbox_pop3.c:665
+#| msgid "Deleting messages"
+msgid "Deleting messages on server…"
+msgstr "Eliminación de mensajes en el servidor…"
 
 # libmutt/imap/imap_ssl.c:481
 # libmutt/imap/imap_ssl.c:481
-#: ../libbalsa/mailbox_pop3.c:599
+#: ../libbalsa/mailbox_pop3.c:687
+#, c-format
+#| msgid "POP3 error: %s."
+msgid "POP3 error: %s"
+msgstr "Error POP3: %s"
+
+#. done - clean up
+#: ../libbalsa/mailbox_pop3.c:694 ../libbalsa/send.c:1085
 #, c-format
-msgid "POP3 error: %s."
-msgstr "Error POP3: %s."
+#| msgid "_Finnish"
+msgid "Finished"
+msgstr "Terminado"
 
 #: ../libbalsa/message.c:615
 #, fuzzy, c-format
@@ -1774,137 +1777,118 @@ msgid "Mailbox (%s) is read-only: cannot change flags."
 msgstr ""
 "El buzón de origen (%s) es de sólo lectura. No se pueden cambiar las marcas."
 
-#: ../libbalsa/misc.c:596
-#| msgid "west european"
+#: ../libbalsa/misc.c:395
 msgid "West European"
 msgstr "Europeo occidental"
 
-#: ../libbalsa/misc.c:598 ../libbalsa/misc.c:632
-#| msgid "east european"
+#: ../libbalsa/misc.c:397 ../libbalsa/misc.c:431
 msgid "East European"
 msgstr "Europeo oriental"
 
-#: ../libbalsa/misc.c:600
-#| msgid "south european"
+#: ../libbalsa/misc.c:399
 msgid "South European"
 msgstr "Europeo del sur"
 
-#: ../libbalsa/misc.c:602
-#| msgid "north european"
+#: ../libbalsa/misc.c:401
 msgid "North European"
 msgstr "Europeo del norte"
 
-#: ../libbalsa/misc.c:604 ../libbalsa/misc.c:634
-#| msgid "cyrillic"
+#: ../libbalsa/misc.c:403 ../libbalsa/misc.c:433
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: ../libbalsa/misc.c:606 ../libbalsa/misc.c:640
-#| msgid "arabic"
+#: ../libbalsa/misc.c:405 ../libbalsa/misc.c:439
 msgid "Arabic"
 msgstr "Árabe"
 
-#: ../libbalsa/misc.c:608 ../libbalsa/misc.c:636
-#| msgid "_Greek"
+#: ../libbalsa/misc.c:407 ../libbalsa/misc.c:435
 msgid "Greek"
 msgstr "Griego"
 
-#: ../libbalsa/misc.c:610 ../libbalsa/misc.c:638
-#| msgid "_Hebrew"
+#: ../libbalsa/misc.c:409 ../libbalsa/misc.c:437
 msgid "Hebrew"
 msgstr "Hebreo"
 
 # libinit_balsa/balsa-druid-page-directory.gob:60
 # libinit_balsa/balsa-druid-page-directory.gob:60
-#: ../libbalsa/misc.c:612
-#| msgid "_Turkish"
+#: ../libbalsa/misc.c:411
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../libbalsa/misc.c:614
-#| msgid "nordic"
+#: ../libbalsa/misc.c:413
 msgid "Nordic"
 msgstr "Nórdico"
 
-#: ../libbalsa/misc.c:616
+#: ../libbalsa/misc.c:415
 msgid "Thai"
 msgstr "Tailandés"
 
-#: ../libbalsa/misc.c:618 ../libbalsa/misc.c:642
-#| msgid "baltic"
+#: ../libbalsa/misc.c:417 ../libbalsa/misc.c:441
 msgid "Baltic"
 msgstr "Báltico"
 
-#: ../libbalsa/misc.c:620
-#| msgid "celtic"
+#: ../libbalsa/misc.c:419
 msgid "Celtic"
 msgstr "Celta"
 
-#: ../libbalsa/misc.c:622
-#| msgid "west europe (euro)"
+#: ../libbalsa/misc.c:421
 msgid "West European (euro)"
 msgstr "Europeo occidental (euro)"
 
-#: ../libbalsa/misc.c:624
-#| msgid "_Russian"
+#: ../libbalsa/misc.c:423
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../libbalsa/misc.c:626
-#| msgid "_Ukrainian"
+#: ../libbalsa/misc.c:425
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: ../libbalsa/misc.c:628
-#| msgid "japanese"
+#: ../libbalsa/misc.c:427
 msgid "Japanese"
 msgstr "Japonés"
 
-#: ../libbalsa/misc.c:630
-#| msgid "_Korean"
+#: ../libbalsa/misc.c:429
 msgid "Korean"
 msgstr "Coreano"
 
 # libmutt/mbox.c:1028
-#: ../libbalsa/misc.c:823
+#: ../libbalsa/misc.c:622
 #, c-format
 msgid "Cannot open %s: %s"
 msgstr "No se pudo abrir %s: %s"
 
-#: ../libbalsa/misc.c:832
+#: ../libbalsa/misc.c:631
 #, 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:959
+#: ../libbalsa/misc.c:758
 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:966
+#: ../libbalsa/misc.c:765
 #, c-format
-#| msgid "Waiting for fcntl lock... %d"
 msgid "Waiting for fcntl lock… %d"
 msgstr "Esperando el bloqueo fcntl… %d"
 
 # libmutt/mx.c:223
 # libmutt/mx.c:223
-#: ../libbalsa/misc.c:994
+#: ../libbalsa/misc.c:793
 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:1001
+#: ../libbalsa/misc.c:800
 #, c-format
-#| msgid "Waiting for flock attempt... %d"
 msgid "Waiting for flock attempt… %d"
 msgstr "Esperando para intentar el bloqueo flock… %d"
 
-#: ../libbalsa/misc.c:1283
+#: ../libbalsa/misc.c:1077
 #, c-format
 msgid "LDAP Directory for %s"
 msgstr "Directorio LDAP para %s"
@@ -2150,9 +2134,6 @@ msgstr ""
 "Huella de la clave: %s"
 
 #: ../libbalsa/rfc3156.c:797
-#| msgid ""
-#| "\n"
-#| "User ID: %s"
 msgid ""
 "\n"
 "User IDs:"
@@ -2161,7 +2142,6 @@ msgstr ""
 "ID de usuario:"
 
 #: ../libbalsa/rfc3156.c:800
-#| msgid "User ID"
 msgid ""
 "\n"
 "User ID:"
@@ -2170,14 +2150,12 @@ msgstr ""
 "ID del usuario:"
 
 #: ../libbalsa/rfc3156.c:811
-#| msgid " revoked"
 msgid " [Revoked]"
 msgstr "[Revocada]"
 
 # libmutt/imap/imap_ssl.c:297
 # libmutt/imap/imap_ssl.c:297
 #: ../libbalsa/rfc3156.c:813
-#| msgid " invalid"
 msgid " [Invalid]"
 msgstr " [No válida]"
 
@@ -2314,192 +2292,173 @@ msgstr "línea «%s» mal formada, falta «:»"
 msgid "malformed line “%s”, empty name or value"
 msgstr ""
 
-# src/pref-manager.c:971
-# src/pref-manager.c:1099
-#: ../libbalsa/send.c:246 ../libbalsa/send.c:253
-#| msgid "Sending Mail..."
-msgid "Sending Mail…"
-msgstr "Enviando correo…"
+# libinit_balsa/balsa-druid-page-user.gob:91
+# libinit_balsa/balsa-druid-page-user.gob:91
+#: ../libbalsa/send.c:206
+#, c-format
+#| msgid "SMT_P server:"
+msgid "SMTP server %s"
+msgstr "Servidor SMTP %s"
 
-#: ../libbalsa/send.c:250 ../src/main-window.c:3257
-msgid "_Hide"
-msgstr "_Ocultar"
+#: ../libbalsa/send.c:627
+#, c-format
+#| msgid "Page %d of %d"
+msgid "Message %u of %u"
+msgstr "Mensaje %u de %u"
 
-#: ../libbalsa/send.c:959
+#: ../libbalsa/send.c:650
 #, c-format
-msgid ""
-"Could not send the message to %s:\n"
-"%d: %s\n"
-"Message left in your outbox.\n"
+msgid "Cannot reach SMTP server %s (%s), any queued message will remain in %s."
 msgstr ""
-"No se pudo enviar el mensaje a %s:\n"
-"%d: %s\n"
-"El mensaje se ha dejado en la bandeja de salida.\n"
+
+# src/pref-manager.c:971
+# src/pref-manager.c:1099
+#: ../libbalsa/send.c:840
+#| msgid "Sending Mail…"
+msgid "Sending Mail"
+msgstr "Enviando correo"
+
+# libmutt/imap/browse.c:93
+# libmutt/imap/browse.c:93
+#: ../libbalsa/send.c:946
+#, c-format
+#| msgid "Save this message and close"
+msgid "Save message in %s…"
+msgstr "Guardar mensaje en %s…"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../libbalsa/send.c:1005
+#: ../libbalsa/send.c:954
 #, c-format
 msgid "Saving sent message to %s failed: %s"
 msgstr "Ha fallado al guardar el mensaje %s: %s"
 
-#: ../libbalsa/send.c:1035 ../libbalsa/send.c:1047
-#, c-format
+#: ../libbalsa/send.c:985
+#, fuzzy, c-format
+#| msgid ""
+#| "Relaying refused:\n"
+#| "%d: %s\n"
+#| "Message left in your outbox.\n"
 msgid ""
-"Relaying refused:\n"
-"%d: %s\n"
-"Message left in your outbox.\n"
+"Sending message failed: %s\n"
+"Message left in your outbox."
 msgstr ""
 "Reenvío rechazado:\n"
 "%d: %s\n"
 "El mensaje se ha dejado en la bandeja de salida.\n"
 
-#: ../libbalsa/send.c:1054
-msgid ""
-"Message submission problem, placing it into your outbox.\n"
-"System will attempt to resubmit the message until you delete it."
-msgstr ""
-"Problema al enviar un mensaje. Se dejará en su bandeja de salida.\n"
-"El sistema volverá a intentar enviarlo hasta que lo borre."
+# libmutt/mx.c:848
+# libmutt/mx.c:848
+#: ../libbalsa/send.c:1006
+#, fuzzy, c-format
+#| msgid "Continue message to %s: %s"
+msgid "Sending queued messages to %s"
+msgstr "Continuar mensaje a %s: %s"
 
 # libmutt/imap/imap_ssl.c:229
 # libmutt/imap/imap_ssl.c:229
-#: ../libbalsa/send.c:1083
-msgid "Connected to MTA"
-msgstr "Conectado a MTA"
-
-#. status code, mailbox
-#: ../libbalsa/send.c:1092
-#, c-format
-msgid "From: %d <%s>"
-msgstr "De: %d <%s>"
-
-# src/mailbox-conf.c:485
-# src/mailbox-conf.c:490
-#. mailbox, status code, status text
-#: ../libbalsa/send.c:1096
-#, c-format
-msgid "From %s: %d %s"
-msgstr "De %s: %d %s"
-
-#. status code, mailbox
-#: ../libbalsa/send.c:1107
-#, c-format
-msgid "To: %d <%s>"
-msgstr "Para: %d <%s>"
-
-# src/mailbox-conf.c:485
-# src/mailbox-conf.c:490
-#. mailbox, status code, status text
-#: ../libbalsa/send.c:1111
+#: ../libbalsa/send.c:1014
 #, c-format
-msgid "To %s: %d %s"
-msgstr "Para: %s: %d %s"
-
-#: ../libbalsa/send.c:1149
-msgid "Disconnected"
-msgstr "Desconectado"
-
-#: ../libbalsa/send.c:1380
-msgid ""
-"SMTP server refused connection.\n"
-"Check your internet connection."
-msgstr ""
-"El servidor SMTP rechazó la conexión.\n"
-"Compruebe su conexión a Internet."
-
-#: ../libbalsa/send.c:1385
-msgid ""
-"SMTP server cannot be reached.\n"
-"Check your internet connection."
-msgstr ""
-"El servidor SMTP no se ha podido alcanzar.\n"
-"Compruebe su conexión de Internet."
+#| msgid "Connected to MTA"
+msgid "Connected to %s"
+msgstr "Conectado a %s"
 
-#: ../libbalsa/send.c:1394
-msgid "Message left in Outbox (try again later)"
-msgstr "El mensaje se dejó en la bandeja de salida (intente más tarde)"
+# src/mailbox-conf.c:581
+#: ../libbalsa/send.c:1068
+#, fuzzy, c-format
+#| msgid "Scanning of %s failed: %s"
+msgid "Connecting SMTP server %s (%s) failed: %s"
+msgstr "Falló el escrutinio de %s: %s"
 
-#: ../libbalsa/send.c:1398
-#, c-format
-msgid ""
-"SMTP server problem (%d): %s\n"
-"Message is left in outbox."
-msgstr ""
-"Problema en el servidor SMTP (%d): %s\n"
-"El mensaje se ha dejado en la bandeja de salida."
+# libmutt/mx.c:848
+# libmutt/mx.c:848
+#: ../libbalsa/send.c:1091
+#, fuzzy, c-format
+#| msgid "Forward message to %s: %s"
+msgid "Transmitted %u message to %s"
+msgid_plural "Transmitted %u messages to %s"
+msgstr[0] "Reenviar mensaje a %s: %s"
+msgstr[1] "Reenviar mensaje a %s: %s"
 
 # libmutt/mx.c:1375
 # libmutt/mx.c:1375
-#: ../libbalsa/send.c:1704 ../libbalsa/send.c:1773
+#: ../libbalsa/send.c:1263 ../libbalsa/send.c:1329
 #, 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:1707 ../libbalsa/send.c:1776
+#: ../libbalsa/send.c:1266 ../libbalsa/send.c:1332
 #, c-format
 msgid "Cannot read %s"
 msgstr "No se puede leer %s"
 
-#: ../libbalsa/send.c:1737
+#: ../libbalsa/send.c:1296
 #, c-format
-#| msgid ""
-#| "Cannot determine charset for text file `%s'; sending as mime type `%s'"
 msgid ""
 "Cannot determine character set 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:2112
+#: ../libbalsa/send.c:1731
 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:2200
+#: ../libbalsa/send.c:1831
 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:494
+#: ../libbalsa/server.c:537
 #, 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:381 ../src/mailbox-conf.c:203
-#: ../src/mailbox-conf.c:1437 ../src/pref-manager.c:388
-#: ../src/pref-manager.c:3333
-msgid "Never"
-msgstr "Nunca"
-
-#: ../libbalsa/smtp-server.c:383 ../src/mailbox-conf.c:204
-#: ../src/mailbox-conf.c:1438
-msgid "If Possible"
-msgstr "Si es posible"
+#: ../libbalsa/smtp-server.c:298
+msgid "SMTP over SSL (SMTPS)"
+msgstr "SMTP sobre SSL (SMTPS)"
 
 # src/main-window.c:448
 # src/main-window.c:455
-#: ../libbalsa/smtp-server.c:385 ../src/mailbox-conf.c:205
-msgid "Required"
-msgstr "Requerido"
+#: ../libbalsa/smtp-server.c:299 ../libinit_balsa/assistant_page_user.c:69
+#: ../src/mailbox-conf.c:1295
+#| msgid "Required"
+msgid "TLS required"
+msgstr "Se requiere TLS"
+
+#: ../libbalsa/smtp-server.c:300 ../libinit_balsa/assistant_page_user.c:70
+#: ../src/mailbox-conf.c:1296
+msgid "TLS if possible (not recommended)"
+msgstr "TLS si es posible (no recomendado)"
 
-#: ../libbalsa/smtp-server.c:421
+#: ../libbalsa/smtp-server.c:301 ../libinit_balsa/assistant_page_user.c:71
+#: ../src/mailbox-conf.c:1297
+msgid "None (not recommended)"
+msgstr ""
+
+#: ../libbalsa/smtp-server.c:332
 #, c-format
 msgid "Error displaying server help: %s\n"
 msgstr "Error al mostrar la ayuda del servidor: %s\n"
 
 # libinit_balsa/balsa-druid-page-user.gob:91
 # libinit_balsa/balsa-druid-page-user.gob:91
-#: ../libbalsa/smtp-server.c:536
+#: ../libbalsa/smtp-server.c:467
 msgid "SMTP Server"
 msgstr "Servidor SMTP"
 
-#: ../libbalsa/smtp-server.c:564
+# src/sendmsg-window.c:228
+# src/sendmsg-window.c:232
+#: ../libbalsa/smtp-server.c:497 ../src/folder-conf.c:336
+#: ../src/mailbox-conf.c:1278 ../src/mailbox-conf.c:1391
+msgid "_Basic"
+msgstr "_Básico"
+
+#: ../libbalsa/smtp-server.c:502
 msgid "_Descriptive Name:"
 msgstr "Nombre _descriptivo:"
 
@@ -2507,36 +2466,84 @@ msgstr "Nombre _descriptivo:"
 # src/mailbox-conf.c:891 src/mailbox-conf.c:949
 #. pop server
 #. imap server
-#: ../libbalsa/smtp-server.c:571 ../src/folder-conf.c:377
-#: ../src/mailbox-conf.c:1186 ../src/mailbox-conf.c:1301
+#: ../libbalsa/smtp-server.c:510 ../src/folder-conf.c:384
+#: ../src/mailbox-conf.c:1285 ../src/mailbox-conf.c:1400
 msgid "_Server:"
 msgstr "_Servidor:"
 
+#. security
+#: ../libbalsa/smtp-server.c:518 ../src/mailbox-conf.c:1290
+#| msgid "Security"
+msgid "Se_curity:"
+msgstr "_Seguridad:"
+
+#. authentication or anonymous access
+#: ../libbalsa/smtp-server.c:522
+msgid "Server requires authentication"
+msgstr "El servidor requiere autenticación"
+
+# src/filter-edit-dialog.c:626
+# src/filter-edit-dialog.c:538
+#: ../libbalsa/smtp-server.c:523
+#| msgid "Notification:"
+msgid "_Authentication:"
+msgstr "_Autenticación:"
+
 # src/mailbox-conf.c:822 src/mailbox-conf.c:882
 # src/mailbox-conf.c:899 src/mailbox-conf.c:957
-#: ../libbalsa/smtp-server.c:578
+#: ../libbalsa/smtp-server.c:529
 msgid "_User Name:"
 msgstr " _Usuario:"
 
-#: ../libbalsa/smtp-server.c:585
+#: ../libbalsa/smtp-server.c:536
 msgid "_Pass Phrase:"
 msgstr "Frase de _paso:"
 
-#: ../libbalsa/smtp-server.c:594 ../src/mailbox-conf.c:225
-msgid "Use _TLS:"
-msgstr "Usar _TLS:"
+# 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
+#: ../libbalsa/smtp-server.c:549 ../src/folder-conf.c:374
+#: ../src/mailbox-conf.c:1329 ../src/mailbox-conf.c:1456
+msgid "_Advanced"
+msgstr "_Avanzado"
+
+#. client certificate and passphrase
+#. client certificate configuration
+#: ../libbalsa/smtp-server.c:552 ../src/mailbox-conf.c:264
+msgid "Server requires client certificate"
+msgstr "El servidor requiere un certificado de cliente"
+
+#: ../libbalsa/smtp-server.c:553
+msgid "_Client Certificate:"
+msgstr "_Certificado de cliente:"
 
+#: ../libbalsa/smtp-server.c:557 ../src/mailbox-conf.c:267
+msgid "Choose Client Certificate"
+msgstr "Elegir certificado de cliente"
+
+# libmutt/imap/imap_ssl.c:523
 # libmutt/imap/imap_ssl.c:523
+#: ../libbalsa/smtp-server.c:559 ../src/mailbox-conf.c:266
+#| msgid "C_ertificate Pass Phrase:"
+msgid "Certificate _File:"
+msgstr "Archivo del _certificado:"
+
 # libmutt/imap/imap_ssl.c:523
-#: ../libbalsa/smtp-server.c:599
-msgid "C_ertificate Pass Phrase:"
+# libmutt/imap/imap_ssl.c:523
+#: ../libbalsa/smtp-server.c:566 ../src/mailbox-conf.c:272
+#| msgid "C_ertificate Pass Phrase:"
+msgid "Certificate _Pass Phrase:"
 msgstr "Frase de paso del _certificado:"
 
-#: ../libbalsa/smtp-server.c:611
+#. split large messages
+#: ../libbalsa/smtp-server.c:575
 msgid "Sp_lit message larger than"
 msgstr "_Partir el mensaje si es mayor de"
 
-#: ../libbalsa/smtp-server.c:616 ../src/pref-manager.c:1898
+#: ../libbalsa/smtp-server.c:580 ../src/pref-manager.c:2186
 msgid "MB"
 msgstr "MiB"
 
@@ -2554,23 +2561,15 @@ msgstr "Fuente del mensaje"
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../libbalsa/source-viewer.c:250 ../src/main-window.c:2062
+#: ../libbalsa/source-viewer.c:250 ../src/main-window.c:2067
 #: ../src/message-window.c:848
 #, c-format
-#| msgid "Error loading %s: %s\n"
 msgid "Error adding from %s: %s\n"
 msgstr "Error al desde %s: %s\n"
 
-# src/sendmsg-window.c:1694
-# src/sendmsg-window.c:1749
-#: ../libinit_balsa/assistant_helper.c:66
-#, c-format
-msgid "Error loading %s: %s\n"
-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:201
+#: ../libinit_balsa/assistant_helper.c:177
 #, c-format
 msgid "The path %s must be relative to the filesystem root (start with /)."
 msgstr ""
@@ -2579,11 +2578,8 @@ 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:213
+#: ../libinit_balsa/assistant_helper.c:189
 #, c-format
-#| msgid ""
-#| "Couldn't create a directory: mkdir() failed on pathname \"%s\", with "
-#| "error \"%s\"."
 msgid ""
 "Couldn’t create a directory: mkdir() failed on pathname “%s”, with error "
 "“%s”."
@@ -2593,18 +2589,16 @@ msgstr ""
 
 # 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:225
-#: ../libinit_balsa/assistant_helper.c:248
+#: ../libinit_balsa/assistant_helper.c:201
+#: ../libinit_balsa/assistant_helper.c:224
 #, c-format
-#| msgid "The file with pathname \"%s\" is not a directory."
 msgid "The file with pathname “%s” is not a directory."
 msgstr "El archivo con la ruta «%s» no es una carpeta."
 
 # 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:239
+#: ../libinit_balsa/assistant_helper.c:215
 #, c-format
-#| msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
 msgid "Couldn’t create a directory: mkdir() failed on pathname “%s”."
 msgstr "No se ha podido crear la carpeta: mkdir() falló en la ruta «%s»."
 
@@ -2638,7 +2632,6 @@ msgid "Configure Balsa"
 msgstr "Configurar Balsa"
 
 #: ../libinit_balsa/assistant_page_defclient.c:54
-#| msgid "Use balsa as default email client?"
 msgid "Use Balsa as default email client?"
 msgstr "¿Quiere usar Balsa como cliente de correo predeterminado?"
 
@@ -2705,7 +2698,6 @@ msgstr ""
 # libbalsa/mailbox.c:290
 #: ../libinit_balsa/assistant_page_directory.c:123
 #, 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 en la ruta «%s»\n"
 
@@ -2713,7 +2705,6 @@ msgstr "No se pudo crear un buzón en la ruta «%s»\n"
 # libinit_balsa/balsa-druid-page-directory.gob:101
 #: ../libinit_balsa/assistant_page_directory.c:155
 #, c-format
-#| msgid "The mailbox \"%s\" does not appear to be valid."
 msgid "The mailbox “%s” does not appear to be valid."
 msgstr "El buzón «%s» aparentemente no es válido."
 
@@ -2732,10 +2723,9 @@ msgstr ""
 "%s"
 
 #: ../libinit_balsa/assistant_page_directory.c:222
-#, fuzzy
 #| msgid "Other options"
 msgid "_Verify locations"
-msgstr "Otras opciones"
+msgstr "_Verificar ubicaciones"
 
 # libinit_balsa/balsa-druid-page-directory.gob:151
 # libinit_balsa/balsa-druid-page-directory.gob:151
@@ -2803,77 +2793,82 @@ msgstr ""
 "preconfigurado esto por usted):"
 
 #: ../libinit_balsa/assistant_page_user.c:68
+msgid "SSL"
+msgstr "SSL"
+
+#: ../libinit_balsa/assistant_page_user.c:74
 msgid "Yes, remember it"
 msgstr "Sí, recordarlo"
 
-#: ../libinit_balsa/assistant_page_user.c:68
+#: ../libinit_balsa/assistant_page_user.c:74
 msgid "No, type it in every time"
 msgstr "No, teclearlo cada vez"
 
-#: ../libinit_balsa/assistant_page_user.c:101
+#: ../libinit_balsa/assistant_page_user.c:105
 msgid "Name of mail server for incoming _mail:"
 msgstr "Nombre del servidor para el correo _entrante:"
 
-#: ../libinit_balsa/assistant_page_user.c:106
+#: ../libinit_balsa/assistant_page_user.c:110
 msgid "_Type of mail server:"
 msgstr "_Tipo de servidor de correo:"
 
-#: ../libinit_balsa/assistant_page_user.c:110
-msgid "Connect using _SSL:"
-msgstr "Conectar usando _SSL:"
+#: ../libinit_balsa/assistant_page_user.c:114
+#| msgid "Connect using _SSL:"
+msgid "Connection _Security"
+msgstr "_Seguridad de la conexión"
 
-#: ../libinit_balsa/assistant_page_user.c:113
+#: ../libinit_balsa/assistant_page_user.c:118
 msgid "Your email _login name:"
 msgstr "Su nombre de _usuario de correo:"
 
 # src/mailbox-conf.c:827 src/mailbox-conf.c:886
 # src/mailbox-conf.c:904 src/mailbox-conf.c:961
-#: ../libinit_balsa/assistant_page_user.c:116
+#: ../libinit_balsa/assistant_page_user.c:121
 msgid "Your _password:"
 msgstr "Su _contraseña:"
 
 # libinit_balsa/balsa-druid-page-user.gob:91
 # libinit_balsa/balsa-druid-page-user.gob:91
-#: ../libinit_balsa/assistant_page_user.c:124
+#: ../libinit_balsa/assistant_page_user.c:128
 msgid "_SMTP Server:"
 msgstr "Servidor _SMTP:"
 
 #. 2.1
-#: ../libinit_balsa/assistant_page_user.c:129
+#: ../libinit_balsa/assistant_page_user.c:132
 msgid "Your real _name:"
 msgstr "Su nombre _real:"
 
-#: ../libinit_balsa/assistant_page_user.c:135
+#: ../libinit_balsa/assistant_page_user.c:138
 #, fuzzy
 #| msgid "Your _Email Address, for this email account:"
 msgid "Your _email address for this email account:"
 msgstr "Su dirección de _correo-e, para esta cuenta de correo:"
 
-#: ../libinit_balsa/assistant_page_user.c:140
+#: ../libinit_balsa/assistant_page_user.c:143
 msgid "_Remember your password:"
 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:145
+#: ../libinit_balsa/assistant_page_user.c:148
 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:163
+#: ../libinit_balsa/assistant_page_user.c:166
 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:284
+#: ../libinit_balsa/assistant_page_user.c:293
 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:324
+#: ../libinit_balsa/assistant_page_user.c:331
 #, c-format
 msgid ""
 "Local Mail Problem\n"
@@ -2918,13 +2913,184 @@ msgstr ""
 "--o su administrador de red en su lugar de trabajo/estudio/similar quizá "
 "haya configurado su equipo para conectarse a la red."
 
+#: ../libnetclient/net-client.c:78 ../libnetclient/net-client.c:116
+#, c-format
+msgid "network client is already connected"
+msgstr "el cliente de red ya está conectado"
+
+#: ../libnetclient/net-client.c:155 ../libnetclient/net-client.c:198
+#, c-format
+msgid "network client is not connected"
+msgstr "el cliente de red no está conectado"
+
+#: ../libnetclient/net-client.c:166
+#, c-format
+msgid "reply length %lu exceeds the maximum allowed length %lu"
+msgstr ""
+
+#: ../libnetclient/net-client.c:181
+#, c-format
+msgid "connection lost"
+msgstr "conexión perdida"
+
+#: ../libnetclient/net-client.c:229
+#, c-format
+msgid "line too long"
+msgstr "línea demasiado larga"
+
+# src/message-window.c:120
+# src/message-window.c:114
+#: ../libnetclient/net-client.c:298
+#, c-format
+#| msgid "Error printing message: %s"
+msgid "error initializing certificate: %s"
+msgstr "error al inicializar el certificado: %s"
+
+# src/sendmsg-window.c:1694
+# src/sendmsg-window.c:1749
+#: ../libnetclient/net-client.c:308
+#, c-format
+#| msgid "Error loading Face: %s"
+msgid "error loading certificate: %s"
+msgstr "error al cargar el certificado: %s"
+
+# src/message-window.c:120
+# src/message-window.c:114
+#: ../libnetclient/net-client.c:316
+#, c-format
+#| msgid "Error printing message: %s"
+msgid "error initializing key: %s"
+msgstr "error al inicializar la clave: %s"
+
+# src/sendmsg-window.c:1694
+# src/sendmsg-window.c:1749
+#: ../libnetclient/net-client.c:372
+#, c-format
+#| msgid "Error loading Face: %s"
+msgid "error loading key: %s"
+msgstr "error al cargar la clave: %s"
+
+#: ../libnetclient/net-client.c:412
+#, c-format
+#| msgid "Disconnected"
+msgid "not connected"
+msgstr "no conectado"
+
+#: ../libnetclient/net-client.c:414
+#, c-format
+msgid "connection is already encrypted"
+msgstr "la conexión ya está cifrada"
+
+# src/pref-manager.c:240
+# src/pref-manager.c:246
+#. unexpected server reply
+#: ../libnetclient/net-client-pop.c:214 ../libnetclient/net-client-pop.c:431
+#: ../libnetclient/net-client-smtp.c:586 ../libnetclient/net-client-smtp.c:657
+#: ../libnetclient/net-client-smtp.c:699
+#, fuzzy, c-format
+#| msgid "Mail server: %s\n"
+msgid "bad server reply: %s"
+msgstr "Servidor de correo: %s\n"
+
+#: ../libnetclient/net-client-pop.c:253
+#, c-format
+msgid "bad server reply"
+msgstr "respuesta del servidor incorrecta"
+
+# libmutt/imap/imap_ssl.c:481
+# libmutt/imap/imap_ssl.c:481
+#: ../libnetclient/net-client-pop.c:423 ../libnetclient/net-client-pop.c:702
+#, c-format
+#| msgid "POP3 error: %s."
+msgid "error: %s"
+msgstr "error: %s"
+
+#: ../libnetclient/net-client-pop.c:426
+#, c-format
+#| msgid "No error"
+msgid "error"
+msgstr "error"
+
+# src/mailbox-conf.c:827 src/mailbox-conf.c:886
+# src/mailbox-conf.c:904 src/mailbox-conf.c:961
+#: ../libnetclient/net-client-pop.c:489 ../libnetclient/net-client-smtp.c:396
+#, c-format
+#| msgid "Password needed"
+msgid "password required"
+msgstr "se necesita contraseña"
+
+#: ../libnetclient/net-client-pop.c:508 ../libnetclient/net-client-smtp.c:411
+#, c-format
+msgid "no suitable authentication mechanism"
+msgstr ""
+
+#: ../libnetclient/net-client-smtp.c:142
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "the server does not support ACLs"
+msgid "remote server does not support STARTTLS"
+msgstr ""
+"\n"
+"el servidor no soporta listas de control de acceso (ACL)"
+
+# libmutt/imap/imap_ssl.c:481
+# libmutt/imap/imap_ssl.c:481
+#: ../libnetclient/net-client-smtp.c:689
+#, fuzzy, c-format
+#| msgid "Sending error: %s"
+msgid "transient error %d: %s"
+msgstr "Enviando error: %s"
+
+# libmutt/imap/imap_ssl.c:481
+# libmutt/imap/imap_ssl.c:481
+#: ../libnetclient/net-client-smtp.c:694
+#, c-format
+#| msgid "Sending error: %s"
+msgid "permanent error %d: %s"
+msgstr "error permanente %d: %s"
+
+# libmutt/imap/auth.c:373
+# libmutt/imap/auth.c:373
+#: ../libnetclient/net-client-utils.c:143
+#, fuzzy, c-format
+#| msgid "Removing duplicates failed: %s"
+msgid "importing GSS service name %s failed: %s"
+msgstr "La eliminación de duplicados falló: %s"
+
+#: ../libnetclient/net-client-utils.c:186
+#, c-format
+msgid "cannot initialize GSS security context: %s"
+msgstr "no se puede inicializar el contexto de seguridad GSS :%s"
+
+#: ../libnetclient/net-client-utils.c:225
+#, c-format
+msgid "malformed GSS security token: %s"
+msgstr "testigo de seguridad GSS mal formado: %s"
+
+#: ../libnetclient/net-client-utils.c:234
+#, c-format
+msgid "malformed GSS security token"
+msgstr "testigo de seguridad GSS mal formado"
+
+#: ../libnetclient/net-client-utils.c:250
+#, c-format
+msgid "cannot create GSS login request: %s"
+msgstr "no se puede crear la solicitud de inicio de sesión GSS :%s"
+
+# libmutt/imap/imap_ssl.c:254
+# libmutt/imap/imap_ssl.c:254
+#: ../libnetclient/net-client-utils.c:315
+#, c-format
+#| msgid "unknown error"
+msgid "unknown error code %u:%u"
+msgstr "código de error desconocido %u:%u"
+
 #: ../sounds/balsa.soundlist.in.h:1
-#| msgid "Balsa E-mail reader"
 msgid "Balsa Email Reader"
 msgstr "Lector de correo Balsa"
 
 #: ../sounds/balsa.soundlist.in.h:2
-#| msgid "Program startup"
 msgid "Program start-up"
 msgstr "Inicio del programa"
 
@@ -2952,8 +3118,8 @@ msgstr "_Dirección"
 
 #: ../src/ab-main.c:848 ../src/address-book-config.c:226
 #: ../src/address-book-config.c:331 ../src/address-book-config.c:375
-#: ../src/filter-edit-dialog.c:498 ../src/main-window.c:3999
-#: ../src/pref-manager.c:504
+#: ../src/filter-edit-dialog.c:498 ../src/main-window.c:3965
+#: ../src/pref-manager.c:3297
 msgid "_Apply"
 msgstr "_Aplicar"
 
@@ -2966,8 +3132,8 @@ 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:184 ../src/filter-edit-dialog.c:207
-#: ../src/filter-export-dialog.c:90 ../src/filter-run-dialog.c:224
-#: ../src/filter-run-dialog.c:329
+#: ../src/filter-export-dialog.c:90 ../src/filter-run-dialog.c:229
+#: ../src/filter-run-dialog.c:334
 msgid "Name"
 msgstr "Nombre"
 
@@ -2986,14 +3152,12 @@ msgid "_Search for Name:"
 msgstr "_Buscar por nombre:"
 
 #: ../src/ab-window.c:326
-#| msgid "Run Editor"
 msgid "Run _Editor"
 msgstr "Ejecutar _editor"
 
 # src/address-book.c:499
 # src/address-book.c:558
 #: ../src/ab-window.c:332
-#| msgid "_Re-Import"
 msgid "_Re-import"
 msgstr "_Volver a importar"
 
@@ -3029,9 +3193,6 @@ msgstr "No se pudo lanzar %s: %s"
 # libbalsa/send.c:794
 #: ../src/ab-window.c:730
 #, c-format
-#| msgid ""
-#| "Error opening address book '%s':\n"
-#| "%s"
 msgid ""
 "Error opening address book “%s”:\n"
 "%s"
@@ -3072,9 +3233,9 @@ msgstr "Añadir %s libreta de direcciones"
 # 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:334
-#: ../src/address-book-config.c:379 ../src/mailbox-conf.c:552
-#: ../src/pref-manager.c:1699 ../src/pref-manager.c:1772
-#: ../src/pref-manager.c:2872
+#: ../src/address-book-config.c:379 ../src/mailbox-conf.c:612
+#: ../src/pref-manager.c:2014 ../src/pref-manager.c:2097
+#: ../src/pref-manager.c:2791
 msgid "_Add"
 msgstr "_Añadir"
 
@@ -3093,7 +3254,6 @@ msgstr "Nombre de la libreta de _direcciones:"
 # src/address-book.c:394
 #: ../src/address-book-config.c:374
 #, c-format
-#| msgid "Modify %s Address Book"
 msgid "Modify Osmo Address Book"
 msgstr "Modificar la libreta de direcciones Osmo"
 
@@ -3101,7 +3261,6 @@ msgstr "Modificar la libreta de direcciones Osmo"
 # src/address-book.c:394
 #: ../src/address-book-config.c:378
 #, c-format
-#| msgid "Add %s Address Book"
 msgid "Add Osmo Address Book"
 msgstr "Añadir libreta de direcciones Osmo"
 
@@ -3157,74 +3316,71 @@ msgstr "Activar _TLS"
 
 # src/address-book.c:369
 # src/address-book.c:394
-#: ../src/address-book-config.c:561 ../src/address-book-config.c:954
+#: ../src/address-book-config.c:561 ../src/address-book-config.c:961
 msgid "GPE Address Book"
 msgstr "Libreta de direcciones GPE"
 
-#: ../src/address-book-config.c:594 ../src/main-window.c:940
-#: ../src/main-window.c:4106
+#: ../src/address-book-config.c:601 ../src/main-window.c:948
+#: ../src/main-window.c:4078
 #, c-format
 msgid "Error displaying help: %s\n"
 msgstr "Error al mostrar la ayuda: %s\n"
 
-#: ../src/address-book-config.c:671
-#| msgid "No path found.  Do you want to give one?"
+#: ../src/address-book-config.c:678
 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:930
-#| msgid "VCard Address Book (GnomeCard)"
+#: ../src/address-book-config.c:937
 msgid "vCard Address Book (GnomeCard)"
 msgstr "Libreta de direcciones VCard (GnomeCard)"
 
-#: ../src/address-book-config.c:936
+#: ../src/address-book-config.c:943
 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:941
+#: ../src/address-book-config.c:948
 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:947
+#: ../src/address-book-config.c:954
 msgid "LDAP Address Book"
 msgstr "Libreta de direcciones LDAP"
 
 # src/address-book.c:369
 # src/address-book.c:394
-#: ../src/address-book-config.c:961
+#: ../src/address-book-config.c:968
 msgid "Rubrica2 Address Book"
 msgstr "Libreta de direcciones de Rubrica2"
 
 # src/address-book.c:369
 # src/address-book.c:394
-#: ../src/address-book-config.c:968
-#| msgid "Address Book"
+#: ../src/address-book-config.c:975
 msgid "Osmo Address Book"
 msgstr "Libreta de direcciones Osmo"
 
-#: ../src/balsa-app.c:63 ../src/folder-conf.c:274 ../src/mailbox-conf.c:1279
+#: ../src/balsa-app.c:64 ../src/folder-conf.c:281 ../src/mailbox-conf.c:1378
 #, 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:66 ../src/folder-conf.c:277 ../src/mailbox-conf.c:1282
+#: ../src/balsa-app.c:67 ../src/folder-conf.c:284 ../src/mailbox-conf.c:1381
 msgid "_Remember password in keyring"
 msgstr "_Recordar la contraseña en el depósito de claves"
 
-#: ../src/balsa-app.c:69 ../src/folder-conf.c:280 ../src/mailbox-conf.c:1285
+#: ../src/balsa-app.c:70 ../src/folder-conf.c:287 ../src/mailbox-conf.c:1384
 msgid "_Remember password"
 msgstr "_Recordar  contraseña"
 
 # src/balsa-app.c:68
 # src/balsa-app.c:72
-#: ../src/balsa-app.c:75
+#: ../src/balsa-app.c:76
 #, c-format
 msgid ""
 "Opening remote mailbox %s.\n"
@@ -3235,34 +3391,33 @@ msgstr ""
 
 # src/balsa-app.c:71
 # src/balsa-app.c:76
-#: ../src/balsa-app.c:80
+#: ../src/balsa-app.c:81
 #, 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:83
+#: ../src/balsa-app.c:84
 msgid "Password needed"
 msgstr "Se necesita contraseña"
 
 # libmutt/mbox.c:1028
-#: ../src/balsa-app.c:529
+#: ../src/balsa-app.c:523
 #, c-format
-#| msgid "Couldn't open mailbox \"%s\""
 msgid "Couldn’t open mailbox “%s”"
 msgstr "No se pudo abrir el buzón «%s»"
 
 # src/balsa-index.c:305
 # src/balsa-index.c:298
-#: ../src/balsa-index.c:384 ../src/pref-manager.c:395
+#: ../src/balsa-index.c:384 ../src/pref-manager.c:219
 msgid "Date"
 msgstr "Fecha"
 
 # src/filter-edit-dialog.c:45
 # src/filter-edit-dialog.c:44
-#: ../src/balsa-index.c:399 ../src/pref-manager.c:396
-#: ../src/sendmsg-window.c:2686
+#: ../src/balsa-index.c:399 ../src/pref-manager.c:220
+#: ../src/sendmsg-window.c:2699
 msgid "Size"
 msgstr "Tamaño"
 
@@ -3276,55 +3431,48 @@ msgstr "Ha fallado el envío a la papelera: %s"
 # src/main-window.c:295 src/message-window.c:107
 # src/main-window.c:301 src/message-window.c:103
 #: ../src/balsa-index.c:1811
-#| msgid "Reply"
 msgid "_Reply…"
 msgstr "_Responder…"
 
 # src/main-window.c:302 src/message-window.c:113
 # src/main-window.c:308
 #: ../src/balsa-index.c:1813
-#| msgid "Reply To _All..."
 msgid "Reply To _All…"
 msgstr "Responder a _todos…"
 
 # src/main-window.c:302 src/message-window.c:113
 # src/main-window.c:308
 #: ../src/balsa-index.c:1815
-#| msgid "Reply To _Group..."
 msgid "Reply To _Group…"
 msgstr "Responder al _grupo…"
 
 # src/main-window.c:310 src/message-window.c:120
 # src/main-window.c:315 src/message-window.c:114
 #: ../src/balsa-index.c:1817
-#| msgid "_Forward Attached..."
 msgid "_Forward Attached…"
 msgstr "_Reenviar adjunto…"
 
 # src/balsa-index-page.c:486
 # src/balsa-index-page.c:534
 #: ../src/balsa-index.c:1819
-#| msgid "Forward _Inline..."
 msgid "Forward _Inline…"
 msgstr "Reenviar _en línea…"
 
 #: ../src/balsa-index.c:1821
-#| msgid "_Pipe through..."
 msgid "_Pipe through…"
 msgstr "_Filtrar a través de…"
 
 # src/main-window.c:360
 # src/main-window.c:360
 #: ../src/balsa-index.c:1823
-#| msgid "Store Address"
 msgid "_Store Address…"
 msgstr "_Almacenar dirección…"
 
 # src/main-window.c:338
 # src/main-window.c:341
 #: ../src/balsa-index.c:1837 ../src/mailbox-node.c:1105
-#: ../src/mailbox-node.c:1121 ../src/pref-manager.c:1704
-#: ../src/pref-manager.c:1779 ../src/pref-manager.c:2879
+#: ../src/mailbox-node.c:1121 ../src/pref-manager.c:2019
+#: ../src/pref-manager.c:2104 ../src/pref-manager.c:2798
 msgid "_Delete"
 msgstr "_Eliminar"
 
@@ -3369,8 +3517,6 @@ msgstr "_Ver fuente"
 # libmutt/mbox.c:712
 #: ../src/balsa-index.c:2116
 #, c-format
-#| msgid "Failed to copy %d message to mailbox \"%s\": %s"
-#| msgid_plural "Failed to copy %d messages to mailbox \"%s\": %s"
 msgid "Failed to copy %d message to mailbox “%s”: %s"
 msgid_plural "Failed to copy %d messages to mailbox “%s”: %s"
 msgstr[0] "Falló al copiar %d mensaje al buzón «%s»: %s"
@@ -3380,7 +3526,6 @@ msgstr[1] "Falló al copiar %d mensajes al buzón «%s»: %s"
 # libmutt/mx.c:848
 #: ../src/balsa-index.c:2128
 #, c-format
-#| msgid "Copied to \"%s\"."
 msgid "Copied to “%s”."
 msgstr "Copiado a «%s»."
 
@@ -3388,7 +3533,6 @@ msgstr "Copiado a «%s»."
 # src/balsa-index-page.c:546
 #: ../src/balsa-index.c:2129
 #, c-format
-#| msgid "Moved to \"%s\"."
 msgid "Moved to “%s”."
 msgstr "Movido a «%s»."
 
@@ -3447,7 +3591,6 @@ msgstr "No se pudo encontrar buzón"
 # src/main-window.c:259
 # src/main-window.c:262
 #: ../src/balsa-mblist.c:1775
-#| msgid "_Other..."
 msgid "_Other…"
 msgstr "_Otros…"
 
@@ -3460,207 +3603,198 @@ msgstr "Elegir carpeta de destino"
 # src/main-window.c:259
 # src/main-window.c:262
 #: ../src/balsa-mblist.c:2086
-#| msgid "Other..."
 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:282
+#: ../src/balsa-message.c:283
 msgid "Check cryptographic signature"
 msgstr "Comprobar firma criptográfica"
 
-#: ../src/balsa-message.c:299
+#: ../src/balsa-message.c:300
 msgid "Select message part to display"
 msgstr "Seleccionar parte del mensaje a mostrar"
 
-#: ../src/balsa-message.c:374
+#: ../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:378
+#: ../src/balsa-message.c:379
 msgid "Not found"
 msgstr "No se encontró"
 
-#: ../src/balsa-message.c:607
+#: ../src/balsa-message.c:608
 msgid "Find:"
 msgstr "Buscar:"
 
-#: ../src/balsa-message.c:619 ../src/toolbar-factory.c:149
+#: ../src/balsa-message.c:620 ../src/toolbar-factory.c:149
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../src/balsa-message.c:626 ../src/toolbar-factory.c:150
+#: ../src/balsa-message.c:627 ../src/toolbar-factory.c:150
 msgid "Next"
 msgstr "Siguiente"
 
 # src/main-window.c:444
 # src/main-window.c:451
-#: ../src/balsa-message.c:710
+#: ../src/balsa-message.c:711
 msgid "Content"
 msgstr "Contenido"
 
 # src/main-window.c:421
 # src/main-window.c:428
-#: ../src/balsa-message.c:796
+#: ../src/balsa-message.c:797
 msgid "Message parts"
 msgstr "Partes del mensaje"
 
 # src/main-window.c:392
 # src/main-window.c:389
-#: ../src/balsa-message.c:988
-#| msgid "Save selected as..."
+#: ../src/balsa-message.c:989
 msgid "Save selected as…"
 msgstr "Guardar seleccionados como…"
 
 # src/main-window.c:392
 # src/main-window.c:389
-#: ../src/balsa-message.c:995
-#| msgid "Save selected to folder..."
+#: ../src/balsa-message.c:996
 msgid "Save selected to folder…"
 msgstr "Guardar seleccionados en la carpeta…"
 
 # src/main-window.c:267 src/message-window.c:61
 # src/main-window.c:269
-#: ../src/balsa-message.c:1104
+#: ../src/balsa-message.c:1106
 msgid "(No sender)"
 msgstr "(sin remitente)"
 
 # libmutt/mbox.c:712
-#: ../src/balsa-message.c:1157 ../src/balsa-message.c:1169
+#: ../src/balsa-message.c:1159 ../src/balsa-message.c:1171
 #, c-format
-#| msgid "Could not access message %u in mailbox \"%s\"."
 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:1336
+#: ../src/balsa-message.c:1338
 msgid "mixed parts"
 msgstr "partes mezcladas"
 
 # src/balsa-message.c:725
 # src/balsa-message.c:788
-#: ../src/balsa-message.c:1338
+#: ../src/balsa-message.c:1340
 msgid "alternative parts"
 msgstr "partes alternativas"
 
-#: ../src/balsa-message.c:1340
+#: ../src/balsa-message.c:1342
 msgid "signed parts"
 msgstr "partes firmadas"
 
-#: ../src/balsa-message.c:1342
+#: ../src/balsa-message.c:1344
 msgid "encrypted parts"
 msgstr "partes cifradas"
 
 # src/print.c:471
 # src/print.c:503
-#: ../src/balsa-message.c:1344
-#| msgid "rfc822 message"
+#: ../src/balsa-message.c:1346
 msgid "RFC822 message"
 msgstr "Mensaje RFC822"
 
-#: ../src/balsa-message.c:1346
+#: ../src/balsa-message.c:1348
 #, c-format
-#| msgid "\"%s\" parts"
 msgid "“%s” parts"
 msgstr "«%s» partes"
 
-#: ../src/balsa-message.c:1394
+#: ../src/balsa-message.c:1396
 msgid "force inline for all parts"
 msgstr "forzar en línea para todas las partes"
 
-#: ../src/balsa-message.c:1437
+#: ../src/balsa-message.c:1439
 #, c-format
-#| msgid "rfc822 message (from %s, subject \"%s\")"
 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:1449
+#: ../src/balsa-message.c:1451
 msgid "complete message"
 msgstr "completar un mensaje"
 
-#: ../src/balsa-message.c:1466
+#: ../src/balsa-message.c:1468
 #, 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:1477
+#: ../src/balsa-message.c:1479
 #, c-format
 msgid "part %s: %s"
 msgstr "parte %s: %s"
 
-#: ../src/balsa-message.c:1492
+#: ../src/balsa-message.c:1494
 msgid "encrypted: "
 msgstr "cifrado: "
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../src/balsa-message.c:1632
+#: ../src/balsa-message.c:1634
 #, 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:1640
+#: ../src/balsa-message.c:1642
 #, 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:1669
-#| msgid "_Save"
+#: ../src/balsa-message.c:1671
 msgid "_Save…"
 msgstr "_Guardar…"
 
 # src/filter-edit-dialog.c:52
 # src/filter-edit-dialog.c:50
-#: ../src/balsa-message.c:1678 ../src/balsa-mime-widget-message.c:441
-#| msgid "Copy to folder:"
+#: ../src/balsa-message.c:1680 ../src/balsa-mime-widget-message.c:447
 msgid "_Copy to folder…"
 msgstr "_Copiar a la carpeta…"
 
-#: ../src/balsa-message.c:1761
+#: ../src/balsa-message.c:1763
 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:1786
+#: ../src/balsa-message.c:1788
 #, 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:1811
+#: ../src/balsa-message.c:1813
 #, 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:1844 ../src/balsa-mime-widget-callbacks.c:164
+#: ../src/balsa-message.c:1846 ../src/balsa-mime-widget-callbacks.c:164
 #, 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:2487 ../src/balsa-message.c:2636
+#: ../src/balsa-message.c:2485 ../src/balsa-message.c:2626
 #, 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:2584
+#: ../src/balsa-message.c:2582
 #, fuzzy, c-format
 #| msgid ""
 #| "The sender of this mail, %s, requested \n"
@@ -3676,11 +3810,11 @@ msgstr ""
 
 # src/sendmsg-window.c:1129
 # src/sendmsg-window.c:1180
-#: ../src/balsa-message.c:2594
+#: ../src/balsa-message.c:2592
 msgid "Reply to MDN?"
 msgstr "¿Quiere enviar un MDN?"
 
-#: ../src/balsa-message.c:2812
+#: ../src/balsa-message.c:2802
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once.\n"
@@ -3691,18 +3825,18 @@ msgstr ""
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../src/balsa-message.c:2833 ../src/balsa-message.c:2918
-#: ../src/balsa-message.c:3040
+#: ../src/balsa-message.c:2823 ../src/balsa-message.c:2908
+#: ../src/balsa-message.c:3030
 #, c-format
 msgid "Parsing a message part failed: %s"
 msgstr "Ha fallado al analizar una parte del mensaje: %s"
 
-#: ../src/balsa-message.c:2834 ../src/balsa-message.c:2919
-#: ../src/balsa-message.c:3041
+#: ../src/balsa-message.c:2824 ../src/balsa-message.c:2909
+#: ../src/balsa-message.c:3031
 msgid "Possible disk space problem."
 msgstr "Posible problema de espacio en el disco."
 
-#: ../src/balsa-message.c:2848
+#: ../src/balsa-message.c:2838
 #, fuzzy, c-format
 #| msgid ""
 #| "The message sent by %s with subject \"%s\" contains an encrypted part, "
@@ -3714,7 +3848,7 @@ msgstr ""
 "El mensaje enviado por %s con el asunto «%s» contiene una parte cifrada, "
 "pero la estructura es inválida."
 
-#: ../src/balsa-message.c:2856
+#: ../src/balsa-message.c:2846
 #, fuzzy, c-format
 #| msgid ""
 #| "The message sent by %s with subject \"%s\" contains a PGP encrypted part, "
@@ -3726,11 +3860,8 @@ msgstr ""
 "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:2869
+#: ../src/balsa-message.c:2859
 #, c-format
-#| msgid ""
-#| "The message sent by %s with subject \"%s\" contains a S/MIME encrypted "
-#| "part, but this crypto protocol is not available."
 msgid ""
 "The message sent by %s with subject “%s” contains a S/MIME encrypted part, "
 "but this crypto protocol is not available."
@@ -3738,12 +3869,8 @@ 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:2936
+#: ../src/balsa-message.c:2926
 #, 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."
 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."
@@ -3752,11 +3879,8 @@ msgstr ""
 "pero su estructura no es válida. La firma, si es que hay alguna, no se puede "
 "comprobar."
 
-#: ../src/balsa-message.c:2949
+#: ../src/balsa-message.c:2939
 #, c-format
-#| msgid ""
-#| "The message sent by %s with subject \"%s\" contains a %s signed part, but "
-#| "this crypto protocol is not available."
 msgid ""
 "The message sent by %s with subject “%s” contains a %s signed part, but this "
 "crypto protocol is not available."
@@ -3764,33 +3888,33 @@ msgstr ""
 "El mensaje enviado por %s con el asunto «%s» contiene una parte %s firmada, "
 "pero este protocolo criptográfico no está disponible."
 
-#: ../src/balsa-message.c:2952
+#: ../src/balsa-message.c:2942
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/balsa-message.c:2952 ../src/print-gtk.c:199
+#: ../src/balsa-message.c:2942 ../src/print-gtk.c:199
 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:2976 ../src/balsa-message.c:3103
+#: ../src/balsa-message.c:2966 ../src/balsa-message.c:3093
 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:2982
+#: ../src/balsa-message.c:2972
 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:2987 ../src/balsa-message.c:3107
+#: ../src/balsa-message.c:2977 ../src/balsa-message.c:3097
 msgid "Detected a good signature with insufficient validity/trust"
 msgstr "Se detectó una firma buena con validez/confianza insuficiente"
 
-#: ../src/balsa-message.c:2994 ../src/balsa-message.c:3113
+#: ../src/balsa-message.c:2984 ../src/balsa-message.c:3103
 #, fuzzy, c-format
 #| msgid ""
 #| "Checking the signature of the message sent by %s with subject \"%s\" "
@@ -3805,11 +3929,8 @@ msgstr ""
 "devolvió:\n"
 "%s"
 
-#: ../src/balsa-message.c:3006
+#: ../src/balsa-message.c:2996
 #, c-format
-#| msgid ""
-#| "Checking the signature of the message sent by %s with subject \"%s\" "
-#| "failed with an error!"
 msgid ""
 "Checking the signature of the message sent by %s with subject “%s” failed "
 "with an error!"
@@ -3817,14 +3938,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:3065
+#: ../src/balsa-message.c:3055
 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:3067
+#: ../src/balsa-message.c:3057
 msgid ""
 "The signature check and removal of the OpenPGP armor cannot be performed "
 "because this message is displayed more than once."
@@ -3832,13 +3953,52 @@ 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:3070
+#: ../src/balsa-message.c:3060
 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:718
+# src/balsa-message.c:780
+#: ../src/balsa-mime-widget.c:240 ../src/balsa-mime-widget-message.c:176
+#: ../src/balsa-mime-widget-message.c:222
+#, c-format
+msgid "File name: %s"
+msgstr "Nombre del archivo: %s"
+
+# src/message-window.c:120
+# src/message-window.c:114
+#: ../src/balsa-mime-widget.c:256
+#, c-format
+msgid "Error reading message part: %s"
+msgstr "Ha ocurrido un error al leer la parte del mensaje: %s"
+
+#: ../src/balsa-mime-widget.c:288
+#, c-format
+msgid "Type: %s (%s)"
+msgstr "Tipo: %s (%s)"
+
+# src/balsa-message.c:713
+# src/balsa-message.c:775
+#: ../src/balsa-mime-widget.c:292
+#, c-format
+msgid "Content Type: %s"
+msgstr "Tipo de contenido: %s"
+
+# src/balsa-message.c:709
+# src/balsa-message.c:771
+#: ../src/balsa-mime-widget.c:306
+msgid "No open or view action defined for this content type"
+msgstr "No hay definida ninguna acción ver o abrir para este tipo de contenido"
+
+# src/balsa-message.c:725
+# src/balsa-message.c:788
+#: ../src/balsa-mime-widget.c:311
+msgid "S_ave part"
+msgstr "_Guardar parte"
+
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../src/balsa-mime-widget-callbacks.c:52 ../src/sendmsg-window.c:1453
+#: ../src/balsa-mime-widget-callbacks.c:52 ../src/sendmsg-window.c:1452
 #, c-format
 msgid "Could not launch application: %s"
 msgstr "No se pudo lanzar la aplicación: %s"
@@ -3853,7 +4013,6 @@ msgstr "Guardar parte MIME %s"
 # libmutt/mbox.c:1028
 #: ../src/balsa-mime-widget-callbacks.c:122
 #, c-format
-#| msgid "Could not construct uri from %s"
 msgid "Could not construct URI from %s"
 msgstr "No se pudo construir el URI a partir de %s"
 
@@ -3886,7 +4045,6 @@ 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:144 ../src/balsa-print-object.c:113
-#| msgid "Message parts"
 msgid "message headers"
 msgstr "cabeceras del mensaje"
 
@@ -3904,14 +4062,6 @@ msgstr "Tipo de contenido: external-body\n"
 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:176
-#: ../src/balsa-mime-widget-message.c:222 ../src/balsa-mime-widget.c:240
-#, c-format
-msgid "File name: %s"
-msgstr "Nombre del archivo: %s"
-
 #: ../src/balsa-mime-widget-message.c:187
 #, c-format
 msgid "Access type: URL\n"
@@ -3961,53 +4111,52 @@ msgstr "_Enviar mensaje para obtener esta parte"
 
 # src/sendmsg-window.c:1694
 # src/sendmsg-window.c:1749
-#: ../src/balsa-mime-widget-message.c:311 ../src/balsa-mime-widget-text.c:800
-#: ../src/sendmsg-window.c:1476
+#: ../src/balsa-mime-widget-message.c:323 ../src/balsa-mime-widget-text.c:808
+#: ../src/sendmsg-window.c:1487
 #, 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:346
+#: ../src/balsa-mime-widget-message.c:358
 #, c-format
 msgid "Could not get a part: %s"
 msgstr "No se pudo obtener una parte: %s"
 
-#: ../src/balsa-mime-widget-message.c:380
+#: ../src/balsa-mime-widget-message.c:386
 #, 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:433
-#| msgid "Reply"
+#: ../src/balsa-mime-widget-message.c:439
 msgid "Reply…"
 msgstr "Responder…"
 
 #. Gmail sometimes fails to do that.
-#: ../src/balsa-mime-widget-message.c:711
+#: ../src/balsa-mime-widget-message.c:710
 msgid "Error:"
 msgstr "Error:"
 
-#: ../src/balsa-mime-widget-message.c:712
+#: ../src/balsa-mime-widget-message.c:711
 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:725
-#: ../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:3500 ../src/sendmsg-window.c:5021
+#: ../src/balsa-mime-widget-message.c:724
+#: ../src/balsa-print-object-header.c:156 ../src/sendmsg-window.c:747
+#: ../src/sendmsg-window.c:749 ../src/sendmsg-window.c:841
+#: ../src/sendmsg-window.c:3513 ../src/sendmsg-window.c:5030
 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:730
-#: ../src/balsa-print-object-header.c:164 ../src/sendmsg-window.c:3496
+#: ../src/balsa-mime-widget-message.c:729
+#: ../src/balsa-print-object-header.c:164 ../src/sendmsg-window.c:3509
 msgid "Date:"
 msgstr "Fecha:"
 
@@ -4016,25 +4165,25 @@ 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:736
-#: ../src/balsa-print-object-header.c:169 ../src/sendmsg-window.c:3507
+#: ../src/balsa-mime-widget-message.c:735
+#: ../src/balsa-print-object-header.c:169 ../src/sendmsg-window.c:3520
 msgid "From:"
 msgstr "De:"
 
 # src/sendmsg-window.c:885
 # src/sendmsg-window.c:928
-#: ../src/balsa-mime-widget-message.c:743
+#: ../src/balsa-mime-widget-message.c:742
 msgid "Reply-To:"
 msgstr "Responder a:"
 
-#: ../src/balsa-mime-widget-message.c:756
+#: ../src/balsa-mime-widget-message.c:755
 #: ../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:764
+#: ../src/balsa-mime-widget-message.c:763
 #: ../src/balsa-print-object-header.c:180
 msgid "Disposition-Notification-To:"
 msgstr "Notificación:"
@@ -4057,14 +4206,12 @@ msgstr "Abrir enlace"
 # src/pref-manager.c:971
 # src/pref-manager.c:1099
 #: ../src/balsa-mime-widget-text.c:517
-#| msgid "Send link..."
 msgid "Send link…"
 msgstr "Enviar enlace…"
 
 # src/balsa-message.c:1247
 # src/balsa-message.c:1417
-#: ../src/balsa-mime-widget-text.c:548 ../src/balsa-mime-widget-text.c:1078
-#| msgid "Save"
+#: ../src/balsa-mime-widget-text.c:548 ../src/balsa-mime-widget-text.c:1086
 msgid "Save…"
 msgstr "Guardar…"
 
@@ -4074,49 +4221,42 @@ msgstr "Resaltar frases estructuradas"
 
 # libmutt/mx.c:630
 # libmutt/mx.c:630
-#: ../src/balsa-mime-widget-text.c:785
+#: ../src/balsa-mime-widget-text.c:786
 #, c-format
-#| msgid "Calling URL %s..."
 msgid "Calling URL %s…"
 msgstr "Llamando a la URL %s…"
 
-#: ../src/balsa-mime-widget-text.c:1045
-#| msgid "Zoom _In"
+#: ../src/balsa-mime-widget-text.c:1053
 msgid "Zoom In"
 msgstr "Ampliar"
 
-#: ../src/balsa-mime-widget-text.c:1050
-#| msgid "Zoom _Out"
+#: ../src/balsa-mime-widget-text.c:1058
 msgid "Zoom Out"
 msgstr "Reducir"
 
-#: ../src/balsa-mime-widget-text.c:1055
-#| msgid "Zoom _100%"
+#: ../src/balsa-mime-widget-text.c:1063
 msgid "Zoom 100%"
 msgstr "Ampliación 100%"
 
 # src/sendmsg-window.c:191
 # src/sendmsg-window.c:196
-#: ../src/balsa-mime-widget-text.c:1064
+#: ../src/balsa-mime-widget-text.c:1072
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: ../src/balsa-mime-widget-text.c:1087
-#| msgid "Print"
+#: ../src/balsa-mime-widget-text.c:1095
 msgid "Print…"
 msgstr "Imprimir…"
 
 # src/main-window.c:360
 # src/main-window.c:360
-#: ../src/balsa-mime-widget-text.c:1225
-#| msgid "Store Address"
+#: ../src/balsa-mime-widget-text.c:1233
 msgid "S_tore Address"
 msgstr "A_lmacenar dirección"
 
 # src/store-address.c:50
 # src/store-address.c:52
-#: ../src/balsa-mime-widget-text.c:1232
-#| msgid "Full Name"
+#: ../src/balsa-mime-widget-text.c:1240
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
@@ -4124,38 +4264,33 @@ msgstr "Nombre completo:"
 # src/address-book.c:435
 # libinit_balsa/balsa-druid-page-user.gob:83 src/address-book.c:252
 # src/address-book.c:470
-#: ../src/balsa-mime-widget-text.c:1233
-#| msgid "Nick Name"
+#: ../src/balsa-mime-widget-text.c:1241
 msgid "Nick Name:"
 msgstr "Apodo:"
 
 # src/filter-edit-dialog.c:490
 # src/address-book-config.c:321
-#: ../src/balsa-mime-widget-text.c:1234
-#| msgid "_First Name:"
+#: ../src/balsa-mime-widget-text.c:1242
 msgid "First Name:"
 msgstr "Nombre:"
 
 # src/address-book-config.c:351
 # src/address-book-config.c:381
-#: ../src/balsa-mime-widget-text.c:1235
-#| msgid "_Last Name:"
+#: ../src/balsa-mime-widget-text.c:1243
 msgid "Last Name:"
 msgstr "Apellido:"
 
-#: ../src/balsa-mime-widget-text.c:1236
-#| msgid "O_rganization:"
+#: ../src/balsa-mime-widget-text.c:1244
 msgid "Organization:"
 msgstr "Organización:"
 
 # src/store-address.c:52
 # src/store-address.c:54
-#: ../src/balsa-mime-widget-text.c:1238
-#| msgid "_Email Address:"
+#: ../src/balsa-mime-widget-text.c:1246
 msgid "Email Address:"
 msgstr "Dirección de correo-e:"
 
-#: ../src/balsa-mime-widget-text.c:1266
+#: ../src/balsa-mime-widget-text.c:1274
 #, fuzzy, c-format
 #| msgid ""
 #| "The message sent by %s with subject \"%s\" contains 8-bit characters, but "
@@ -4170,22 +4305,18 @@ msgstr ""
 
 #: ../src/balsa-mime-widget-vcalendar.c:65
 #, c-format
-#| msgid "This is an iTIP calendar \"%s\" message."
 msgid "This is an iTIP calendar “%s” message."
 msgstr "Este es un mensaje «%s» de calendario iTIP."
 
 #: ../src/balsa-mime-widget-vcalendar.c:171
-#| msgid "Summary"
 msgid "Summary:"
 msgstr "Resumen:"
 
 #: ../src/balsa-mime-widget-vcalendar.c:172
-#| msgid "Organizer"
 msgid "Organizer:"
 msgstr "Organizador:"
 
 #: ../src/balsa-mime-widget-vcalendar.c:173
-#| msgid "Start"
 msgid "Start:"
 msgstr "Inicio:"
 
@@ -4196,19 +4327,16 @@ msgstr "Fin:"
 # src/filter-edit-dialog.c:741
 # src/filter-edit-dialog.c:653
 #: ../src/balsa-mime-widget-vcalendar.c:175
-#| msgid "Location"
 msgid "Location:"
 msgstr "Ubicación:"
 
 #: ../src/balsa-mime-widget-vcalendar.c:207
-#| msgid "Attendee"
 msgid "Attendee:"
 msgid_plural "Attendees:"
 msgstr[0] "Participante:"
 msgstr[1] "Participantes:"
 
 #: ../src/balsa-mime-widget-vcalendar.c:211
-#| msgid "Description"
 msgid "Description:"
 msgstr "Descripción:"
 
@@ -4229,47 +4357,14 @@ msgid "Decline"
 msgstr "Rechazar"
 
 #: ../src/balsa-mime-widget-vcalendar.c:303
-#| msgid "iTip Calendar Request"
 msgid "iTIP Calendar Request"
 msgstr "Petición de calendario iTIP"
 
-#: ../src/balsa-mime-widget-vcalendar.c:341
+#: ../src/balsa-mime-widget-vcalendar.c:333
 #, c-format
-#| msgid "Sending the iTip calendar reply failed: %s"
 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:257
-#, c-format
-msgid "Error reading message part: %s"
-msgstr "Ha ocurrido un error al leer la parte del mensaje: %s"
-
-#: ../src/balsa-mime-widget.c:284
-#, 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:288
-#, 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:302
-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:307
-msgid "S_ave part"
-msgstr "_Guardar parte"
-
 #: ../src/balsa-print-object-default.c:152
 #: ../src/balsa-print-object-default.c:154
 #: ../src/balsa-print-object-default.c:157
@@ -4343,7 +4438,7 @@ msgstr "Participantes"
 msgid "Attendee"
 msgstr "Participante"
 
-#: ../src/balsa-print-object-text.c:680 ../src/sendmsg-window.c:2698
+#: ../src/balsa-print-object-text.c:680 ../src/sendmsg-window.c:2711
 msgid "Description"
 msgstr "Descripción"
 
@@ -4373,7 +4468,7 @@ msgstr "Coincide cuando la fecha está en el intervalo:"
 msgid "Match when date is outside the interval:"
 msgstr "Coincidir cuando la fecha esté fuera del intervalo:"
 
-#: ../src/filter-edit-callbacks.c:339 ../src/filter-edit-callbacks.c:1134
+#: ../src/filter-edit-callbacks.c:339 ../src/filter-edit-callbacks.c:1142
 msgid "Match when one of these flags is set:"
 msgstr "Coincide cuando tiene una de estas marcas:"
 
@@ -4410,36 +4505,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:900
+#: ../src/filter-edit-callbacks.c:908
 #, 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:938
+#: ../src/filter-edit-callbacks.c:946
 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:952
+#: ../src/filter-edit-callbacks.c:960
 msgid "_All"
 msgstr "_Todos"
 
-#: ../src/filter-edit-callbacks.c:953
+#: ../src/filter-edit-callbacks.c:961
 msgid "C_lear"
 msgstr "_Limpiar"
 
 # src/filter-edit-dialog.c:313
 # src/filter-edit-dialog.c:296
-#: ../src/filter-edit-callbacks.c:955 ../src/main-window.c:3983
+#: ../src/filter-edit-callbacks.c:963 ../src/main-window.c:3949
 msgid "_Body"
 msgstr "_Cuerpo"
 
 # src/sendmsg-window.c:222
 # src/sendmsg-window.c:226
-#: ../src/filter-edit-callbacks.c:956 ../src/main-window.c:3984
+#: ../src/filter-edit-callbacks.c:964 ../src/main-window.c:3950
 msgid "_To:"
 msgstr "_A:"
 
@@ -4447,124 +4542,123 @@ 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:957 ../src/main-window.c:3985
+#: ../src/filter-edit-callbacks.c:965 ../src/main-window.c:3951
 msgid "_From:"
 msgstr "_De:"
 
 # src/sendmsg-window.c:224
 # src/sendmsg-window.c:228
-#: ../src/filter-edit-callbacks.c:958
+#: ../src/filter-edit-callbacks.c:966
 msgid "_Subject"
 msgstr "A_sunto"
 
-#: ../src/filter-edit-callbacks.c:959 ../src/main-window.c:3987
+#: ../src/filter-edit-callbacks.c:967 ../src/main-window.c:3953
 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:961
+#: ../src/filter-edit-callbacks.c:969
 msgid "_User header:"
 msgstr "Cabecera de _usuario:"
 
 # src/balsa-mblist.c:218
 # src/balsa-mblist.c:218
-#: ../src/filter-edit-callbacks.c:992
+#: ../src/filter-edit-callbacks.c:1000
 msgid "Unread"
 msgstr "No leído"
 
-#: ../src/filter-edit-callbacks.c:1011
+#: ../src/filter-edit-callbacks.c:1019
 msgid "One of the specified f_ields contains"
 msgstr "Uno de los campos especif_icados contiene"
 
-#: ../src/filter-edit-callbacks.c:1022
+#: ../src/filter-edit-callbacks.c:1030
 msgid "Contain/Does _Not Contain"
 msgstr "Contiene/_No contiene"
 
-#: ../src/filter-edit-callbacks.c:1041
+#: ../src/filter-edit-callbacks.c:1049
 msgid "_One of the regular expressions matches"
 msgstr "_Una de las expresiones regulares coincide"
 
-#: ../src/filter-edit-callbacks.c:1077
+#: ../src/filter-edit-callbacks.c:1085
 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:1088
+#: ../src/filter-edit-callbacks.c:1096
 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:1103
+#: ../src/filter-edit-callbacks.c:1111
 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:1124
 msgid "Inside/outside the date interval"
 msgstr "Dentro/fuera del intervalo de fechas"
 
-#: ../src/filter-edit-callbacks.c:1157
+#: ../src/filter-edit-callbacks.c:1165
 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:1176
+#: ../src/filter-edit-callbacks.c:1184
 msgid "Search T_ype:"
 msgstr "T_ipo de búsqueda:"
 
-#: ../src/filter-edit-callbacks.c:1254
+#: ../src/filter-edit-callbacks.c:1262
 msgid "Edit condition for filter: "
 msgstr "Editar condición para filtro: "
 
-#: ../src/filter-edit-callbacks.c:1473 ../src/save-restore.c:1891
+#: ../src/filter-edit-callbacks.c:1483 ../src/save-restore.c:1884
 msgid "Filter with no condition was omitted"
 msgstr "El filtro sin condiciones fue ignorado"
 
-#: ../src/filter-edit-callbacks.c:1500
+#: ../src/filter-edit-callbacks.c:1515
 #, 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:1699
+#: ../src/filter-edit-callbacks.c:1714
 msgid "New filter"
 msgstr "Nuevo filtro"
 
-#: ../src/filter-edit-callbacks.c:1828
+#: ../src/filter-edit-callbacks.c:1843
 msgid "No filter name specified."
 msgstr "No ha especificado un nombre para el filtro."
 
-#: ../src/filter-edit-callbacks.c:1833
+#: ../src/filter-edit-callbacks.c:1848
 #, c-format
-#| msgid "Filter \"%s\" already exists."
 msgid "Filter “%s” already exists."
 msgstr "El filtro «%s» ya existe."
 
-#: ../src/filter-edit-callbacks.c:1843
+#: ../src/filter-edit-callbacks.c:1858
 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:1929
+#: ../src/filter-edit-callbacks.c:1944
 msgid "Filter has matched"
 msgstr "El filtro ha coincidido"
 
-#: ../src/filter-edit-callbacks.c:1949
+#: ../src/filter-edit-callbacks.c:1964
 msgid "You must provide a sound to play"
 msgstr "Debe proporciona un sonido a reproducir"
 
-#: ../src/filter-edit-callbacks.c:2131
+#: ../src/filter-edit-callbacks.c:2146
 #, 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:95 ../src/pref-manager.c:402
+#: ../src/filter-edit-dialog.c:95 ../src/pref-manager.c:226
 msgid "Simple"
 msgstr "Simple"
 
@@ -4635,7 +4729,6 @@ msgstr "Nombre del _filtro:"
 
 #. The filter op-code : "OR" or "AND" all the conditions
 #: ../src/filter-edit-dialog.c:272
-#| msgid "Operation between conditions"
 msgid "Operation between conditions:"
 msgstr "Operación entre condiciones:"
 
@@ -4676,7 +4769,6 @@ msgstr "Reproducir sonido:"
 # src/filter-edit-dialog.c:643
 # src/filter-edit-dialog.c:554
 #: ../src/filter-edit-dialog.c:400
-#| msgid "Use Sound..."
 msgid "Use Sound…"
 msgstr "Usar sonido…"
 
@@ -4689,7 +4781,6 @@ msgstr "_Abrir"
 # src/filter-edit-dialog.c:652
 # src/filter-edit-dialog.c:559
 #: ../src/filter-edit-dialog.c:418
-#| msgid "Popup text:"
 msgid "Pop-up text:"
 msgstr "Texto emergente:"
 
@@ -4715,12 +4806,10 @@ msgstr "Acción"
 # src/filter-edit-dialog.c:755
 # src/filter-edit-dialog.c:666
 #: ../src/filter-edit-dialog.c:503
-#| msgid "Revert"
 msgid "Re_vert"
 msgstr "Re_vertir"
 
 #: ../src/filter-edit-dialog.c:554
-#| 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 poder "
@@ -4729,13 +4818,11 @@ msgstr ""
 # src/main-window.c:259
 # src/main-window.c:262
 #: ../src/filter-edit-dialog.c:567
-#| msgid "_Filters"
 msgid "Filters"
 msgstr "Filtros"
 
 #: ../src/filter-edit-dialog.c:635
 #, c-format
-#| msgid "Filter \"%s\" has no condition."
 msgid "Filter “%s” has no condition."
 msgstr "El filtro «%s» no tiene condiciones."
 
@@ -4753,32 +4840,27 @@ msgstr ""
 "modificar filtros."
 
 #: ../src/filter-export-dialog.c:75
-#| msgid "_Export Filters..."
 msgid "Export Filters"
 msgstr "Exportar filtros"
 
-#: ../src/filter-run-callbacks.c:184
+#: ../src/filter-run-callbacks.c:192
 #, 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:242 ../src/filter-run-callbacks.c:264
 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:245 ../src/filter-run-callbacks.c:267
 #, c-format
-#| msgid "Filter applied to \"%s\"."
 msgid "Filter applied to “%s”."
 msgstr "Filtro aplicado a «%s»."
 
-#: ../src/filter-run-callbacks.c:298
+#: ../src/filter-run-callbacks.c:306
 #, c-format
-#| msgid ""
-#| "The destination mailbox of the filter \"%s\" is \"%s\".\n"
-#| "You can't associate it with the same mailbox (that causes recursion)."
 msgid ""
 "The destination mailbox of the filter “%s” is “%s”.\n"
 "You can’t associate it with the same mailbox (that causes recursion)."
@@ -4786,13 +4868,8 @@ 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:314
 #, c-format
-#| msgid ""
-#| "The filter \"%s\" is not compatible with the mailbox type of \"%s\".\n"
-#| "This happens for example when you use regular expressions match with IMAP "
-#| "mailboxes, it is done by a very slow method; if possible, use substring "
-#| "match instead."
 msgid ""
 "The filter “%s” is not compatible with the mailbox type of “%s”.\n"
 "This happens for example when you use regular expressions match with IMAP "
@@ -4805,27 +4882,25 @@ msgstr ""
 
 # src/filter-edit-dialog.c:783
 # src/filter-edit-dialog.c:693
-#: ../src/filter-run-dialog.c:192
-#| msgid "Balsa Filters of Mailbox: "
+#: ../src/filter-run-dialog.c:197
 msgid "Filters of Mailbox: "
 msgstr "Filtros del buzón: "
 
 # src/pref-manager.c:1931
 # src/pref-manager.c:2155
-#: ../src/filter-run-dialog.c:233
+#: ../src/filter-run-dialog.c:238
 msgid "On reception"
 msgstr "Al recibir"
 
-#: ../src/filter-run-dialog.c:245
+#: ../src/filter-run-dialog.c:250
 msgid "On exit"
 msgstr "Al salir"
 
-#: ../src/filter-run-dialog.c:354
-#| msgid "Apply Selected"
+#: ../src/filter-run-dialog.c:359
 msgid "_Apply Selected"
 msgstr "_Aplicar seleccionados"
 
-#: ../src/filter-run-dialog.c:370
+#: ../src/filter-run-dialog.c:375
 #, fuzzy
 #| msgid "Edit the selected mailbox"
 msgid "Add selected filter to mailbox"
@@ -4833,7 +4908,7 @@ msgstr "Editar el buzón seleccionado"
 
 # src/main-window.c:403
 # src/main-window.c:406
-#: ../src/filter-run-dialog.c:380
+#: ../src/filter-run-dialog.c:385
 #, fuzzy
 #| msgid "Remove duplicated messages from the current mailbox"
 msgid "Remove selected filter from mailbox"
@@ -4841,25 +4916,23 @@ msgstr "Eliminar los mensajes duplicados del buzón actual"
 
 # src/main-window.c:392
 # src/main-window.c:389
-#: ../src/filter-run-dialog.c:422
-#| msgid "Save selected to folder..."
+#: ../src/filter-run-dialog.c:427
 msgid "Move selected filter up"
 msgstr "Subir el filtro seleccionado"
 
 # src/main-window.c:392
 # src/main-window.c:389
-#: ../src/filter-run-dialog.c:432
-#| msgid "Save selected to folder..."
+#: ../src/filter-run-dialog.c:437
 msgid "Move selected filter down"
 msgstr "Bajar el filtro seleccionado"
 
 # src/sendmsg-window.c:885
 # src/sendmsg-window.c:928
-#: ../src/filter-run-dialog.c:438
+#: ../src/filter-run-dialog.c:443
 msgid "A_pply Now!"
 msgstr "_Aplicar ya"
 
-#: ../src/filter-run-dialog.c:484
+#: ../src/filter-run-dialog.c:489
 msgid ""
 "The filters dialog is opened, close it before you can run filters on any "
 "mailbox"
@@ -4868,115 +4941,90 @@ msgstr ""
 "el \n"
 "filtrado en cualquier buzón"
 
-#: ../src/folder-conf.c:110
+#: ../src/folder-conf.c:117
 #, 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:299
+#: ../src/folder-conf.c:306
 msgid "Remote IMAP folder"
 msgstr "Carpeta IMAP remota"
 
 # src/address-book-config.c:132 src/mailbox-conf.c:301 src/mailbox-conf.c:925
 # src/address-book-config.c:134 src/mailbox-conf.c:287
 # src/mailbox-conf.c:1000
-#: ../src/folder-conf.c:303 ../src/folder-conf.c:798 ../src/mailbox-conf.c:548
+#: ../src/folder-conf.c:310 ../src/folder-conf.c:805 ../src/mailbox-conf.c:608
 msgid "_Update"
 msgstr "Act_ualizar"
 
-#: ../src/folder-conf.c:303
+#: ../src/folder-conf.c:310
 msgid "C_reate"
 msgstr "_Crear"
 
-# src/sendmsg-window.c:228
-# src/sendmsg-window.c:232
-#: ../src/folder-conf.c:329 ../src/mailbox-conf.c:1178
-#: ../src/mailbox-conf.c:1292
-msgid "_Basic"
-msgstr "_Básico"
-
-#: ../src/folder-conf.c:334
+#: ../src/folder-conf.c:341
 msgid "_Max number of connections:"
 msgstr "Número _máximo de conexiones:"
 
-#: ../src/folder-conf.c:340 ../src/mailbox-conf.c:1352
+#: ../src/folder-conf.c:347 ../src/mailbox-conf.c:1451
 msgid "Enable _persistent cache"
 msgstr "Activar caché _persistente"
 
-#: ../src/folder-conf.c:347
+#: ../src/folder-conf.c:354
 msgid "Use IDLE command"
 msgstr "Usar el comando IDLE"
 
-#: ../src/folder-conf.c:354 ../src/mailbox-conf.c:1355
+#: ../src/folder-conf.c:361 ../src/mailbox-conf.c:1454
 msgid "Enable _bug workarounds"
 msgstr "Activar arreglos de _bugs"
 
-#: ../src/folder-conf.c:361
+#: ../src/folder-conf.c:368
 msgid "Use STATUS for mailbox checking"
 msgstr "Usar STATUS para la comprobación de buzones"
 
-# 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/folder-conf.c:367 ../src/mailbox-conf.c:1231
-#: ../src/mailbox-conf.c:1357
-msgid "_Advanced"
-msgstr "_Avanzado"
-
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:370
+#: ../src/folder-conf.c:377
 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:1194
+#: ../src/folder-conf.c:392 ../src/mailbox-conf.c:1303
 msgid "Use_r name:"
 msgstr "Nombre de _usuario:"
 
 # src/mailbox-conf.c:827 src/mailbox-conf.c:886
 # src/mailbox-conf.c:904 src/mailbox-conf.c:961
-#: ../src/folder-conf.c:391
+#: ../src/folder-conf.c:398
 msgid "_Password:"
 msgstr "_Contraseña:"
 
-#: ../src/folder-conf.c:398 ../src/mailbox-conf.c:1315
+#: ../src/folder-conf.c:405 ../src/mailbox-conf.c:1414
 msgid "_Anonymous access"
 msgstr "Acceso _anónimo"
 
-#: ../src/folder-conf.c:409
+#: ../src/folder-conf.c:416
 msgid "Subscribed _folders only"
 msgstr "Sólo carpetas _suscritas"
 
-#: ../src/folder-conf.c:412
-#| msgid "Always show _INBOX"
+#: ../src/folder-conf.c:419
 msgid "Always show _Inbox"
 msgstr "Siempre mostrar la _Bandeja de entrada"
 
-#: ../src/folder-conf.c:415
+#: ../src/folder-conf.c:422
 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:562
+#: ../src/folder-conf.c:569
 msgid "Select parent folder"
 msgstr "Seleccione carpeta madre"
 
-#: ../src/folder-conf.c:641
+#: ../src/folder-conf.c:648
 #, c-format
-#| msgid ""
-#| "Renaming INBOX is special!\n"
-#| "You will create a subfolder %s in %s\n"
-#| "containing the messages from INBOX.\n"
-#| "INBOX and its subfolders will remain.\n"
-#| "What would you like to do?"
 msgid ""
 "Renaming Inbox is special!\n"
 "You will create a subfolder %s in %s\n"
@@ -4990,12 +5038,11 @@ msgstr ""
 "La bandeja de entrada y sus subcarpetas se conservarán.\n"
 "¿Qué quiere hacer?"
 
-#: ../src/folder-conf.c:648
+#: ../src/folder-conf.c:655
 msgid "Question"
 msgstr "Pregunta"
 
-#: ../src/folder-conf.c:652
-#| msgid "Rename INBOX"
+#: ../src/folder-conf.c:659
 msgid "Rename Inbox"
 msgstr "Renombrar la bandeja de entrada"
 
@@ -5004,21 +5051,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:654
+#: ../src/folder-conf.c:661
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/folder-conf.c:679
+#: ../src/folder-conf.c:686
 #, c-format
 msgid "Folder rename failed. Reason: %s"
 msgstr "Hubo un fallo al renombrar la carpeta con motivo: %s"
 
-#: ../src/folder-conf.c:731
+#: ../src/folder-conf.c:738
 #, c-format
 msgid "Folder creation failed. Reason: %s"
 msgstr "Hubo un fallo al crear la carpeta con motivo: %s"
 
-#: ../src/folder-conf.c:778
+#: ../src/folder-conf.c:785
 msgid ""
 "An IMAP folder that is not a mailbox\n"
 "has no properties that can be changed."
@@ -5027,57 +5074,56 @@ msgstr ""
 "no tiene propiedades que puedan ser cambiadas."
 
 # libmutt/mbox.c:1066
-#: ../src/folder-conf.c:794
+#: ../src/folder-conf.c:801
 msgid "Remote IMAP subfolder"
 msgstr "Subcarpeta IMAP remota"
 
-#: ../src/folder-conf.c:798
+#: ../src/folder-conf.c:805
 msgid "_Create"
 msgstr "_Crear"
 
-#: ../src/folder-conf.c:828
+#: ../src/folder-conf.c:835
 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:836
+#: ../src/folder-conf.c:843
 msgid "_Folder name:"
 msgstr "_Nombre de la carpeta:"
 
-#: ../src/folder-conf.c:842
+#: ../src/folder-conf.c:849
 msgid "Host:"
 msgstr "Anfitrión:"
 
-#: ../src/folder-conf.c:851
+#: ../src/folder-conf.c:858
 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:856
-#| msgid "_Browse..."
+#: ../src/folder-conf.c:863
 msgid "_Browse…"
 msgstr "E_xaminar…"
 
-#: ../src/folder-conf.c:870
+#: ../src/folder-conf.c:877
 msgid "read-only"
 msgstr "sólo lectura"
 
-#: ../src/folder-conf.c:871
+#: ../src/folder-conf.c:878
 msgid "read-write"
 msgstr "lectura y escritura"
 
-#: ../src/folder-conf.c:872
+#: ../src/folder-conf.c:879
 msgid "admin"
 msgstr "administrador"
 
-#: ../src/folder-conf.c:873
+#: ../src/folder-conf.c:880
 msgid "post"
 msgstr "publicar"
 
-#: ../src/folder-conf.c:874
+#: ../src/folder-conf.c:881
 msgid "append"
 msgstr "añadir"
 
@@ -5087,19 +5133,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:875
+#: ../src/folder-conf.c:882
 msgid "delete"
 msgstr "eliminar"
 
-#: ../src/folder-conf.c:876
+#: ../src/folder-conf.c:883
 msgid "special"
 msgstr "especial"
 
-#: ../src/folder-conf.c:882
+#: ../src/folder-conf.c:889
 msgid "Permissions:"
 msgstr "Permisos:"
 
-#: ../src/folder-conf.c:889
+#: ../src/folder-conf.c:896
 msgid ""
 "\n"
 "detailed permissions are available only for open folders"
@@ -5107,10 +5153,7 @@ msgstr ""
 "\n"
 "los permisos detallados sólo están disponibles para carpetas abiertas"
 
-#: ../src/folder-conf.c:896
-#| msgid ""
-#| "\n"
-#| "the server does not support ACL's"
+#: ../src/folder-conf.c:903
 msgid ""
 "\n"
 "the server does not support ACLs"
@@ -5120,32 +5163,32 @@ msgstr ""
 
 # src/pref-manager.c:1235
 # src/pref-manager.c:1376
-#: ../src/folder-conf.c:905
+#: ../src/folder-conf.c:912
 msgid "mine: "
 msgstr "mios: "
 
-#: ../src/folder-conf.c:943
+#: ../src/folder-conf.c:950
 msgid "Quota:"
 msgstr "Cuota:"
 
-#: ../src/folder-conf.c:947
+#: ../src/folder-conf.c:954
 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:952
+#: ../src/folder-conf.c:959
 msgid "the server does not support quotas"
 msgstr "el servidor no soporta cuotas"
 
-#: ../src/folder-conf.c:954
+#: ../src/folder-conf.c:961
 msgid "no limits"
 msgstr "sin límites"
 
-#: ../src/folder-conf.c:959
+#: ../src/folder-conf.c:966
 #, c-format
 msgid "%s of %s (%.1f%%) used"
 msgstr "%s de %s (%.1f%%) usado"
 
-#: ../src/folder-conf.c:996
+#: ../src/folder-conf.c:1003
 msgid ""
 "This folder is not stored in configuration. I do not yet know how to remove "
 "it from remote server."
@@ -5155,8 +5198,8 @@ msgstr ""
 
 # src/mailbox-conf.c:157
 # src/mailbox-conf.c:157
-#: ../src/folder-conf.c:1005
-#, fuzzy, c-format
+#: ../src/folder-conf.c:1012
+#, 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"
@@ -5168,19 +5211,17 @@ msgstr ""
 "Podrá usar más tarde «Carpeta IMAP nueva» para agregar esta carpeta "
 "nuevamente.\n"
 
-#: ../src/folder-conf.c:1013
+#: ../src/folder-conf.c:1020
 msgid "Confirm"
 msgstr "Confirmar"
 
 # src/pref-manager.c:1459
 # src/pref-manager.c:1608
 #: ../src/information-dialog.c:231
-#| msgid "Information - Balsa"
 msgid "Information — Balsa"
 msgstr "Información - Balsa"
 
-#: ../src/information-dialog.c:235 ../src/main-window.c:4004
-#| msgid "C_lear"
+#: ../src/information-dialog.c:235 ../src/main-window.c:3970
 msgid "_Clear"
 msgstr "_Limpiar"
 
@@ -5203,24 +5244,41 @@ msgstr "ERROR: "
 msgid "FATAL: "
 msgstr "FATAL: "
 
-#: ../src/mailbox-conf.c:220
+# src/pref-manager.c:194
+# src/pref-manager.c:193
+#: ../src/mailbox-conf.c:207 ../src/mailbox-conf.c:1536
+#: ../src/pref-manager.c:212 ../src/pref-manager.c:1152
+msgid "Never"
+msgstr "Nunca"
+
+#: ../src/mailbox-conf.c:208 ../src/mailbox-conf.c:1537
+msgid "If Possible"
+msgstr "Si es posible"
+
+# src/main-window.c:448
+# src/main-window.c:455
+#: ../src/mailbox-conf.c:209
+msgid "Required"
+msgstr "Requerido"
+
+#: ../src/mailbox-conf.c:224
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
+#: ../src/mailbox-conf.c:229
+msgid "Use _TLS:"
+msgstr "Usar _TLS:"
+
 # 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/mailbox-conf.c:348
+#: ../src/mailbox-conf.c:408
 msgid "No mailbox selected."
 msgstr "Ningún buzón seleccionado."
 
-#: ../src/mailbox-conf.c:378
+#: ../src/mailbox-conf.c:438
 #, c-format
-#| msgid ""
-#| "Mailbox \"%s\" is used by Balsa and I cannot remove it.\n"
-#| "If you really want to remove it, assign its function\n"
-#| "to some other mailbox."
 msgid ""
 "Mailbox “%s” is used by Balsa and I cannot remove it.\n"
 "If you really want to remove it, assign its function\n"
@@ -5232,8 +5290,8 @@ msgstr ""
 
 # src/mailbox-conf.c:157
 # src/mailbox-conf.c:157
-#: ../src/mailbox-conf.c:388
-#, fuzzy, c-format
+#: ../src/mailbox-conf.c:448
+#, c-format
 #| msgid ""
 #| "This will remove the mailbox \"%s\" from the list of mailboxes.  You may "
 #| "also delete the disk file or files associated with this mailbox.\n"
@@ -5247,25 +5305,24 @@ msgid ""
 "mailbox again.\n"
 "What would you like to do?"
 msgstr ""
-"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"
+"Esto quitará el buzón «%s» de la lista de buzones.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é quiere hacer?"
 
 # src/pref-manager.c:1058
 # src/pref-manager.c:1188
-#: ../src/mailbox-conf.c:400
+#: ../src/mailbox-conf.c:460
 msgid "Remove from _list"
 msgstr "Quitar de la _lista"
 
-#: ../src/mailbox-conf.c:401
+#: ../src/mailbox-conf.c:461
 msgid "Remove from list and _disk"
 msgstr "Eliminar el buzón de la lista y el _disco"
 
-#: ../src/mailbox-conf.c:409
-#, fuzzy, c-format
+#: ../src/mailbox-conf.c:469
+#, c-format
 #| msgid ""
 #| "This will remove the mailbox \"%s\" and all its messages from your IMAP "
 #| "server.  If %s has subfolders, it will still appear as a node in the "
@@ -5280,7 +5337,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 quitará 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"
@@ -5288,14 +5345,14 @@ msgstr ""
 
 # src/pref-manager.c:1058
 # src/pref-manager.c:1188
-#: ../src/mailbox-conf.c:422
+#: ../src/mailbox-conf.c:482
 msgid "_Remove from server"
 msgstr "_Eliminar del servidor"
 
 # src/mailbox-conf.c:157
 # src/mailbox-conf.c:157
-#: ../src/mailbox-conf.c:429
-#, fuzzy, c-format
+#: ../src/mailbox-conf.c:489
+#, 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"
@@ -5311,24 +5368,24 @@ msgstr ""
 
 # src/pref-manager.c:1058
 # src/pref-manager.c:1188
-#: ../src/mailbox-conf.c:438
+#: ../src/mailbox-conf.c:498
 msgid "_Remove from list"
 msgstr "_Eliminar de la lista"
 
-#: ../src/mailbox-conf.c:482
+#: ../src/mailbox-conf.c:542
 #, c-format
 msgid "Folder deletion failed. Reason: %s"
 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:778
+#: ../src/mailbox-conf.c:879
 #, c-format
 msgid "%s on %s"
 msgstr "%s en %s"
 
 # src/mailbox-conf.c:581
-#: ../src/mailbox-conf.c:918
+#: ../src/mailbox-conf.c:1017
 #, c-format
 msgid ""
 "Rename of %s to %s failed:\n"
@@ -5339,92 +5396,102 @@ 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:1103
+#: ../src/mailbox-conf.c:1202
 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:1112
+#: ../src/mailbox-conf.c:1211
 #, c-format
 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:1113
+#: ../src/mailbox-conf.c:1212
 #, c-format
 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:1155
+#: ../src/mailbox-conf.c:1254
 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:1181 ../src/mailbox-conf.c:1295
+#: ../src/mailbox-conf.c:1282 ../src/mailbox-conf.c:1394
 msgid "Mailbox _name:"
 msgstr "_Nombre del buzón:"
 
+#: ../src/mailbox-conf.c:1294
+msgid "POP3 over SSL (POP3S)"
+msgstr "POP3 sobre SSL (POP3S)"
+
 # src/mailbox-conf.c:827 src/mailbox-conf.c:886
 # src/mailbox-conf.c:904 src/mailbox-conf.c:961
 #. password field
-#: ../src/mailbox-conf.c:1200 ../src/mailbox-conf.c:1327
+#: ../src/mailbox-conf.c:1308 ../src/mailbox-conf.c:1426
 msgid "Pass_word:"
 msgstr "_Contraseña:"
 
 # src/main-window.c:403
 # src/main-window.c:406
-#: ../src/mailbox-conf.c:1207
+#: ../src/mailbox-conf.c:1314
 msgid "_Delete messages from server after download"
 msgstr "_Eliminar los mensajes del servidor después de descargarlos"
 
-#: ../src/mailbox-conf.c:1213
+#: ../src/mailbox-conf.c:1318
 msgid "_Enable check for new mail"
 msgstr "_Activar búsqueda de correo nuevo "
 
-#: ../src/mailbox-conf.c:1218
+#: ../src/mailbox-conf.c:1322
 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:1222
+#: ../src/mailbox-conf.c:1324
 msgid "Fi_lter Command:"
 msgstr "Comando del fi_ltro:"
 
-#: ../src/mailbox-conf.c:1235
+#. toggle for apop
+#: ../src/mailbox-conf.c:1334
 msgid "Disable _APOP"
 msgstr "Desactivar _APOP"
 
+#. toggle for enabling pipeling
+#: ../src/mailbox-conf.c:1336
+msgid "Overlap commands"
+msgstr ""
+
 # 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:1308
+#: ../src/mailbox-conf.c:1407
 msgid "_Username:"
 msgstr "Nombre de _usuario:"
 
 # src/mailbox-conf.c:890
 # src/mailbox-conf.c:965
-#: ../src/mailbox-conf.c:1332
+#: ../src/mailbox-conf.c:1431
 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:1416
+#: ../src/mailbox-conf.c:1515
 msgid "_Identity:"
 msgstr "_Identidad:"
 
-#: ../src/mailbox-conf.c:1439 ../src/pref-manager.c:3335
+#: ../src/mailbox-conf.c:1538 ../src/pref-manager.c:1154
 msgid "Always"
 msgstr "Siempre"
 
-#: ../src/mailbox-conf.c:1443
+#: ../src/mailbox-conf.c:1542
 msgid ""
 "_Decrypt and check\n"
 "signatures automatically:"
@@ -5432,11 +5499,11 @@ msgstr ""
 "_Descifrar y comprobar\n"
 "firmas automáticamente:"
 
-#: ../src/mailbox-conf.c:1470
+#: ../src/mailbox-conf.c:1569
 msgid "Show _Recipient column instead of Sender"
 msgstr "Mostrar columna del _destinatario en vez del remitente"
 
-#: ../src/mailbox-conf.c:1484
+#: ../src/mailbox-conf.c:1583
 msgid "_Subscribe for new mail check"
 msgstr "_Suscribirse para comprobación de correo"
 
@@ -5446,7 +5513,6 @@ msgstr "La edición de la carpeta a ser escrita."
 
 #: ../src/mailbox-node.c:497
 #, c-format
-#| msgid "Scanning %s. Please wait..."
 msgid "Scanning %s. Please wait…"
 msgstr "Escrutando %s. Espere por favor…"
 
@@ -5469,40 +5535,34 @@ msgstr "Falló el escrutinio de %s: %s"
 # src/mailbox-conf.c:718
 # src/mailbox-conf.c:793
 #: ../src/mailbox-node.c:1063
-#| msgid "Local _mbox mailbox..."
 msgid "Local _mbox mailbox…"
 msgstr "Buzón _mbox local…"
 
 # src/mailbox-conf.c:718
 # src/mailbox-conf.c:793
 #: ../src/mailbox-node.c:1065
-#| msgid "Local Mail_dir mailbox..."
 msgid "Local Mail_dir mailbox…"
 msgstr "Buzón Mail_dir local…"
 
 # src/mailbox-conf.c:718
 # src/mailbox-conf.c:793
 #: ../src/mailbox-node.c:1067
-#| msgid "Local M_H mailbox..."
 msgid "Local M_H mailbox…"
 msgstr "Buzón M_H local…"
 
 # libmutt/mbox.c:1066
 #: ../src/mailbox-node.c:1069
-#| msgid "Remote _IMAP mailbox..."
 msgid "Remote _IMAP mailbox…"
 msgstr "Buzón _IMAP remoto…"
 
 # src/pref-manager.c:1162
 # src/pref-manager.c:1298
 #: ../src/mailbox-node.c:1072
-#| msgid "Remote IMAP folder"
 msgid "Remote IMAP _folder…"
 msgstr "Carpeta IMAP remota…"
 
 # libmutt/mbox.c:1066
 #: ../src/mailbox-node.c:1074
-#| msgid "Remote IMAP subfolder"
 msgid "Remote IMAP _subfolder…"
 msgstr "_Subcarpeta IMAP remota…"
 
@@ -5514,7 +5574,6 @@ msgstr "_Revisar"
 # src/mblist-window.c:450
 # src/mblist-window.c:473
 #: ../src/mailbox-node.c:1095
-#| msgid "_Properties"
 msgid "_Properties…"
 msgstr "_Propiedades…"
 
@@ -5562,7 +5621,6 @@ msgstr "_Editar/Aplicar filtros"
 # libinit_balsa/balsa-druid-page-directory.gob:101
 #: ../src/mailbox-node.c:1234
 #, c-format
-#| msgid "The path \"%s\" does not lead to a mailbox."
 msgid "The path “%s” does not lead to a mailbox."
 msgstr "La ruta «%s» aparentemente no lleva a un buzón."
 
@@ -5578,7 +5636,96 @@ msgstr "Buzón local %s cargado como %s\n"
 msgid "Local folder %s\n"
 msgstr "Carpeta local %s\n"
 
-#: ../src/main-window.c:275
+#: ../src/main.c:120 ../src/main.c:125 ../src/main.c:131 ../src/main.c:137
+#: ../src/main.c:143
+#, 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:120
+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:126
+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:132
+msgid "Sentbox"
+msgstr "Correo enviado"
+
+# libinit_balsa/balsa-druid-page-directory.gob:60
+# libinit_balsa/balsa-druid-page-directory.gob:60
+#: ../src/main.c:138
+msgid "Draftbox"
+msgstr "Borradores"
+
+# libinit_balsa/balsa-druid-page-directory.gob:60
+# libinit_balsa/balsa-druid-page-directory.gob:60
+#: ../src/main.c:143
+msgid "Trash"
+msgstr "Papelera"
+
+# libmutt/mbox.c:1066
+#: ../src/main.c:384
+msgid "Compressing mail folders…"
+msgstr "Comprimiendo las carpetas de correo…"
+
+#: ../src/main.c:648
+msgid "Get new mail on start-up"
+msgstr "Obtener el correo nuevo al iniciar"
+
+#: ../src/main.c:650
+msgid "Compose a new email to EMAIL@ADDRESS"
+msgstr "Redactar un correo-e nuevo a CORREO@DIRECCIÓN"
+
+#: ../src/main.c:652
+msgid "Attach file at URI"
+msgstr "Adjuntar archivo al URI"
+
+#: ../src/main.c:655
+msgid "Opens MAILBOXNAME"
+msgstr "Abre NOMBREBUZÓN"
+
+#: ../src/main.c:655
+msgid "MAILBOXNAME"
+msgstr "NOMBREBUZÓN"
+
+# libmutt/mx.c:459 libmutt/mx.c:605
+# libmutt/mx.c:459 libmutt/mx.c:605
+#: ../src/main.c:658
+msgid "Opens first unread mailbox"
+msgstr "Abre el primer buzón no leído"
+
+#: ../src/main.c:661
+msgid "Opens default Inbox on start-up"
+msgstr "Abre la bandeja de entrada predeterminado al inicio"
+
+# libmutt/mx.c:1375
+# libmutt/mx.c:1375
+#: ../src/main.c:664
+msgid "Prints number unread and unsent messages"
+msgstr "Imprimir el número de mensajes no leídos y no enviados"
+
+#: ../src/main.c:666
+msgid "Debug IMAP connection"
+msgstr "Depurar la conexión IMAP"
+
+#: ../src/main.c:667
+msgid "Show help options"
+msgstr "Mostrar opciones de ayuda"
+
+#: ../src/main.c:668
+msgid "Show version"
+msgstr "Mostrar versión"
+
+#: ../src/main-window.c:280
 msgid ""
 "Balsa is sending a mail now.\n"
 "Abort sending?"
@@ -5586,67 +5733,66 @@ msgstr ""
 "Balsa está enviando un correo ahora.\n"
 "¿Abortar el envío?"
 
-#: ../src/main-window.c:444
+#: ../src/main-window.c:450
 msgid "Subject or Sender Contains:"
 msgstr "El asunto o el remitente contiene:"
 
-#: ../src/main-window.c:445
+#: ../src/main-window.c:451
 msgid "Subject or Recipient Contains:"
 msgstr "El asunto o el receptor contiene:"
 
-#: ../src/main-window.c:446
+#: ../src/main-window.c:452
 msgid "Subject Contains:"
 msgstr "El asunto contiene:"
 
-#: ../src/main-window.c:447
+#: ../src/main-window.c:453
 msgid "Body Contains:"
 msgstr "El cuerpo contiene:"
 
-#: ../src/main-window.c:448
+#: ../src/main-window.c:454
 msgid "Older than (days):"
 msgstr "Más antiguo que (días):"
 
-#: ../src/main-window.c:449
+#: ../src/main-window.c:455
 msgid "Old at most (days):"
 msgstr "Como mucho más antiguo que (días):"
 
-#: ../src/main-window.c:965
+#: ../src/main-window.c:973
 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
+#: ../src/main-window.c:984
 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
+#: ../src/main-window.c:989
 msgid "About Balsa"
 msgstr "Acerca de Balsa"
 
-#: ../src/main-window.c:1003
-#| msgid "Balsa closes files and connections. Please wait..."
+#: ../src/main-window.c:1011
 msgid "Balsa closes files and connections. Please wait…"
 msgstr "Balsa cierra los archivos y conexiones. Espere…"
 
-#: ../src/main-window.c:1396
+#: ../src/main-window.c:1401
 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
+#: ../src/main-window.c:1421
 #, 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:1422
+#: ../src/main-window.c:1427
 #, c-format
 msgid "Removed %d duplicate"
 msgid_plural "Removed %d duplicates"
@@ -5655,12 +5801,12 @@ msgstr[1] "%d duplicados eliminados"
 
 # src/pref-manager.c:237 src/pref-manager.c:949 src/pref-manager.c:1027
 # src/pref-manager.c:1838
-#: ../src/main-window.c:1427
+#: ../src/main-window.c:1432
 msgid "No duplicates found"
 msgstr "No se encontraron duplicados"
 
 # libmutt/mbox.c:712
-#: ../src/main-window.c:2915
+#: ../src/main-window.c:2920
 #, c-format
 msgid ""
 "Unable to Open Mailbox!\n"
@@ -5671,67 +5817,59 @@ msgstr ""
 
 # src/balsa-message.c:701
 # src/balsa-message.c:812
-#: ../src/main-window.c:2950
+#: ../src/main-window.c:2955
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
 # src/pref-manager.c:971
 # src/pref-manager.c:1099
-#: ../src/main-window.c:3253 ../src/main-window.c:3271
-#| msgid "Checking Mail..."
+#: ../src/main-window.c:3268 ../src/main-window.c:3286
 msgid "Checking Mail…"
 msgstr "Comprobando correo…"
 
 # src/mailbox-conf.c:718
 # src/mailbox-conf.c:793
-#: ../src/main-window.c:3411
+#: ../src/main-window.c:3426
 #, 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:3415
+#: ../src/main-window.c:3430
 #, c-format
 msgid "Local mailbox: %s"
 msgstr "Buzón local: %s"
 
-#: ../src/main-window.c:3579
+#: ../src/main-window.c:3594
 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:3644
-#, c-format
-msgid "Sending error: %s"
-msgstr "Enviando error: %s"
-
-#: ../src/main-window.c:3708
+#: ../src/main-window.c:3637
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Ha recibido %d mensaje nuevo."
 msgstr[1] "Ha recibido %d mensajes nuevos."
 
-#: ../src/main-window.c:3711
+#: ../src/main-window.c:3640
 msgid "You have new mail."
 msgstr "Tiene correo nuevo."
 
-#: ../src/main-window.c:3779 ../src/main-window.c:3814
+#: ../src/main-window.c:3708 ../src/main-window.c:3743
 msgid "Balsa: New mail"
 msgstr "Balsa: Correo nuevo"
 
 # src/main-window.c:399
 # src/main-window.c:401
-#: ../src/main-window.c:3937
+#: ../src/main-window.c:3901
 msgid "Search mailbox"
 msgstr "Buscar buzón"
 
 # src/filter-edit-dialog.c:570
 # src/filter-edit-dialog.c:491
-#: ../src/main-window.c:3961
+#: ../src/main-window.c:3927
 msgid "_Search for:"
 msgstr "_Buscar:"
 
@@ -5739,57 +5877,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:3974
+#: ../src/main-window.c:3940
 msgid "In:"
 msgstr "En:"
 
 # src/balsa-index.c:304 src/filter-edit-dialog.c:349
 # src/balsa-index.c:297 src/filter-edit-dialog.c:326
-#: ../src/main-window.c:3986
+#: ../src/main-window.c:3952
 msgid "S_ubject"
 msgstr "_Asunto"
 
 # src/message-window.c:120
 # src/message-window.c:114
 #. Frame with Apply and Clear buttons
-#: ../src/main-window.c:3991
+#: ../src/main-window.c:3957
 msgid "Show only matching messages"
 msgstr "Mostrar sólo los mensajes que coincidan"
 
 # src/balsa-message.c:651
 # src/balsa-message.c:713
 #. Frame with OK button
-#: ../src/main-window.c:4012
+#: ../src/main-window.c:3978
 msgid "Open next matching message"
 msgstr "Abrir el siguiente mensaje coincidente"
 
-#: ../src/main-window.c:4024
+#: ../src/main-window.c:3990
 msgid "_Reverse search"
 msgstr "Búsqueda _invertida"
 
 # src/filter-edit-dialog.c:313
 # src/filter-edit-dialog.c:296
-#: ../src/main-window.c:4029
+#: ../src/main-window.c:3995
 msgid "_Wrap around"
 msgstr "_Ajustar cuerpo"
 
 # libmutt/mbox.c:1028
-#: ../src/main-window.c:4247
+#: ../src/main-window.c:4219
 #, c-format
 msgid "Could not open trash: %s"
 msgstr "No se pudo abrir la papelera: %s"
 
 # libmutt/mx.c:1050
 # libmutt/mx.c:1050
-#: ../src/main-window.c:4383
+#: ../src/main-window.c:4354
 #, c-format
-#| msgid "Balsa: %s (readonly)"
 msgid "Balsa: %s (read-only)"
 msgstr "Balsa: %s (sólo lectura)"
 
 # src/filter-edit-dialog.c:783
 # src/filter-edit-dialog.c:693
-#: ../src/main-window.c:4385
+#: ../src/main-window.c:4356
 #, c-format
 msgid "Balsa: %s"
 msgstr "Balsa: %s"
@@ -5798,28 +5935,28 @@ msgstr "Balsa: %s"
 # src/mailbox-conf.c:793
 #. xgettext: this is the first part of the message
 #. * "Shown mailbox: %s with %d messages, %d new, %d hidden".
-#: ../src/main-window.c:4882
+#: ../src/main-window.c:4856
 #, c-format
 msgid "Shown mailbox: %s "
 msgstr "Buzón mostrado: %s "
 
 # libmutt/mx.c:1375
 # libmutt/mx.c:1375
-#: ../src/main-window.c:4887
+#: ../src/main-window.c:4861
 #, 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:4894
+#: ../src/main-window.c:4868
 #, c-format
 msgid ", %d new"
 msgid_plural ", %d new"
 msgstr[0] ", %d nuevo"
 msgstr[1] ", %d nuevos"
 
-#: ../src/main-window.c:4901
+#: ../src/main-window.c:4875
 #, c-format
 msgid ", %d hidden"
 msgid_plural ", %d hidden"
@@ -5828,115 +5965,16 @@ msgstr[1] ", %d ocultos"
 
 # libmutt/mx.c:1375
 # libmutt/mx.c:1375
-#: ../src/main-window.c:4946
+#: ../src/main-window.c:4920
 #, c-format
 msgid "The next unread message is in %s"
 msgstr "El siguiente mensaje no leído está en %s"
 
-#: ../src/main-window.c:4953
+#: ../src/main-window.c:4927
 #, c-format
 msgid "Do you want to select %s?"
 msgstr "¿Quiere seleccionar %s?"
 
-#: ../src/main.c:124 ../src/main.c:129 ../src/main.c:135 ../src/main.c:141
-#: ../src/main.c:147
-#, c-format
-#| msgid "Balsa cannot open your \"%s\" mailbox."
-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:124
-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:130
-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:136
-msgid "Sentbox"
-msgstr "Correo enviado"
-
-# libinit_balsa/balsa-druid-page-directory.gob:60
-# libinit_balsa/balsa-druid-page-directory.gob:60
-#: ../src/main.c:142
-msgid "Draftbox"
-msgstr "Borradores"
-
-# libinit_balsa/balsa-druid-page-directory.gob:60
-# libinit_balsa/balsa-druid-page-directory.gob:60
-#: ../src/main.c:147
-msgid "Trash"
-msgstr "Papelera"
-
-# libmutt/mbox.c:1066
-#: ../src/main.c:401
-#| msgid "Compressing mail folders..."
-msgid "Compressing mail folders…"
-msgstr "Comprimiendo las carpetas de correo…"
-
-#: ../src/main.c:655
-#| msgid "Get new mail on startup"
-msgid "Get new mail on start-up"
-msgstr "Obtener el correo nuevo al iniciar"
-
-#: ../src/main.c:657
-msgid "Compose a new email to EMAIL@ADDRESS"
-msgstr "Redactar un correo-e nuevo a CORREO@DIRECCIÓN"
-
-#: ../src/main.c:659
-msgid "Attach file at URI"
-msgstr "Adjuntar archivo al URI"
-
-#: ../src/main.c:662
-msgid "Opens MAILBOXNAME"
-msgstr "Abre NOMBREBUZÓN"
-
-#: ../src/main.c:662
-msgid "MAILBOXNAME"
-msgstr "NOMBREBUZÓN"
-
-# libmutt/mx.c:459 libmutt/mx.c:605
-# libmutt/mx.c:459 libmutt/mx.c:605
-#: ../src/main.c:665
-msgid "Opens first unread mailbox"
-msgstr "Abre el primer buzón no leído"
-
-#: ../src/main.c:668
-#| msgid "Opens default Inbox on startup"
-msgid "Opens default Inbox on start-up"
-msgstr "Abre la bandeja de entrada predeterminado al inicio"
-
-# libmutt/mx.c:1375
-# libmutt/mx.c:1375
-#: ../src/main.c:671
-msgid "Prints number unread and unsent messages"
-msgstr "Imprimir el número de mensajes no leídos y no enviados"
-
-#: ../src/main.c:673
-msgid "Debug POP3 connection"
-msgstr "Depurar la conexión POP3"
-
-#: ../src/main.c:675
-msgid "Debug IMAP connection"
-msgstr "Depurar la conexión IMAP"
-
-#: ../src/main.c:676
-#| msgid "Other options"
-msgid "Show help options"
-msgstr "Mostrar opciones de ayuda"
-
-#: ../src/main.c:677
-#| msgid "Show icon"
-msgid "Show version"
-msgstr "Mostrar versión"
-
 # src/filter-edit-dialog.c:425 src/sendmsg-window.c:514
 # src/filter-edit-dialog.c:384 src/sendmsg-window.c:543
 #: ../src/message-window.c:303
@@ -5952,258 +5990,227 @@ msgstr "Mensaje de %s: %s"
 
 # src/pref-manager.c:192
 # src/pref-manager.c:191
-#: ../src/pref-manager.c:386
+#: ../src/pref-manager.c:210
 msgid "While retrieving messages"
 msgstr "Al obtener mensajes"
 
 # src/pref-manager.c:1087
 # src/pref-manager.c:1218
-#: ../src/pref-manager.c:387
+#: ../src/pref-manager.c:211
 msgid "Until closed"
 msgstr "Hasta que se cierre"
 
 # src/main-window.c:421
 # src/main-window.c:428
-#: ../src/pref-manager.c:393
+#: ../src/pref-manager.c:217
 msgid "Message number"
 msgstr "Número del mensaje"
 
 # src/address-book.c:477
 # src/address-book.c:523
-#: ../src/pref-manager.c:397
+#: ../src/pref-manager.c:221
 msgid "Sender"
 msgstr "Remitente"
 
-#: ../src/pref-manager.c:401
+#: ../src/pref-manager.c:225
 msgid "Flat"
 msgstr "Plano"
 
-#: ../src/pref-manager.c:403
+#: ../src/pref-manager.c:227
 msgid "JWZ"
 msgstr "JWZ"
 
-# src/filter-edit-dialog.c:783
-# src/filter-edit-dialog.c:693
-#. must NOT be modal
-#: ../src/pref-manager.c:499
-msgid "Balsa Preferences"
-msgstr "Preferencias de Balsa"
+# src/pref-manager.c:1333
+# src/pref-manager.c:1476
+#: ../src/pref-manager.c:937
+#, c-format
+msgid "%s (default)"
+msgstr "%s (predeterminado)"
 
-# libinit_balsa/balsa-druid-page-directory.gob:194
-# libinit_balsa/balsa-druid-page-directory.gob:194
-#: ../src/pref-manager.c:552
-msgid "Mail options"
-msgstr "Opciones de correo"
+# src/pref-manager.c:1333
+# src/pref-manager.c:1476
+#: ../src/pref-manager.c:1054
+msgid "Default layout"
+msgstr "Distribución predeterminada"
 
-# libinit_balsa/balsa-druid-page-directory.gob:194
-# libinit_balsa/balsa-druid-page-directory.gob:194
-#: ../src/pref-manager.c:554
-msgid "Display options"
-msgstr "Opciones de visualización"
+# libmutt/mx.c:1065
+# libmutt/mx.c:1065
+#: ../src/pref-manager.c:1055
+msgid "Wide message layout"
+msgstr "Distribución de mensaje ancho"
 
-# src/address-book.c:369
-# src/address-book.c:394
-#: ../src/pref-manager.c:556 ../src/pref-manager.c:2812
-msgid "Address books"
-msgstr "Libretas de direcciones"
+#: ../src/pref-manager.c:1056
+msgid "Wide screen layout"
+msgstr "Distribución de pantalla ancha"
 
-#: ../src/pref-manager.c:560 ../src/toolbar-factory.c:164
-msgid "Spelling"
-msgstr "Ortografía"
+# libmutt/mx.c:1375
+# libmutt/mx.c:1375
+#: ../src/pref-manager.c:1064
+msgid "Show next unread message"
+msgstr "Muestra el siguiente mensaje no leído"
 
-#: ../src/pref-manager.c:564
-#| msgid "Startup"
-msgid "Start-up"
-msgstr "Inicio"
+#: ../src/pref-manager.c:1065
+msgid "Show next message"
+msgstr "Mostrar mensaje siguiente"
 
-#: ../src/pref-manager.c:566 ../src/pref-manager.c:2602
-msgid "Miscellaneous"
-msgstr "Varios"
+#: ../src/pref-manager.c:1066
+msgid "Close message window"
+msgstr "Cerrar la ventana del mensaje"
 
-# src/pref-manager.c:1333
-# src/pref-manager.c:1476
-#: ../src/pref-manager.c:1387
+#: ../src/pref-manager.c:1120
 #, c-format
-msgid "%s (default)"
-msgstr "%s (predeterminado)"
+msgid "Error displaying %s: %s\n"
+msgstr "Error mostrando %s: %s\n"
+
+#: ../src/pref-manager.c:1133
+msgid "Show nothing"
+msgstr "No mostrar nada"
+
+#: ../src/pref-manager.c:1135
+msgid "Show dialog"
+msgstr "Mostrar diálogo"
+
+#: ../src/pref-manager.c:1137
+msgid "Show in list"
+msgstr "Mostrar en lista"
+
+#: ../src/pref-manager.c:1139
+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:1141
+msgid "Print to console"
+msgstr "Imprimir en la consola"
+
+#: ../src/pref-manager.c:1153
+msgid "Ask me"
+msgstr "Preguntarme"
+
+# libmutt/mbox.c:1066
+#: ../src/pref-manager.c:1701
+msgid "Remote POP3 mailbox…"
+msgstr "Buzón POP3 remoto…"
+
+# libmutt/mbox.c:1066
+#: ../src/pref-manager.c:1705
+msgid "Remote IMAP mailbox…"
+msgstr "Buzón IMAP remoto…"
+
+# src/pref-manager.c:1162
+# src/pref-manager.c:1298
+#: ../src/pref-manager.c:1709
+msgid "Remote IMAP folder…"
+msgstr "Carpeta IMAP remota…"
 
 # src/pref-manager.c:1058
 # src/pref-manager.c:1188
-#: ../src/pref-manager.c:1653
+#: ../src/pref-manager.c:1970
 msgid "Remote mailbox servers"
 msgstr "Servidores de buzones remotos"
 
-#: ../src/pref-manager.c:1674 ../src/pref-manager.c:2833
-#: ../src/sendmsg-window.c:2668
+#: ../src/pref-manager.c:1987 ../src/pref-manager.c:2752
+#: ../src/sendmsg-window.c:2681
 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:1682
+#: ../src/pref-manager.c:1995
 msgid "Mailbox name"
 msgstr "Nombre del buzón"
 
 # src/filter-edit-dialog.c:313
 # src/filter-edit-dialog.c:296
-#: ../src/pref-manager.c:1702 ../src/pref-manager.c:1775
-#: ../src/pref-manager.c:2876
+#: ../src/pref-manager.c:2017 ../src/pref-manager.c:2100
+#: ../src/pref-manager.c:2795
 msgid "_Modify"
 msgstr "_Modificar"
 
 # libinit_balsa/balsa-druid-page-user.gob:94
 # libinit_balsa/balsa-druid-page-user.gob:94
-#: ../src/pref-manager.c:1716
+#: ../src/pref-manager.c:2039
 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:1718
+#: ../src/pref-manager.c:2042
 msgid "Select your local mail directory"
 msgstr "Seleccione su directorio de correo local"
 
-#: ../src/pref-manager.c:1739
+#: ../src/pref-manager.c:2066
 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:1761
+#: ../src/pref-manager.c:2084
 msgid "Server name"
 msgstr "Nombre del servidor"
 
-# src/pref-manager.c:240
-# src/pref-manager.c:246
-#: ../src/pref-manager.c:1801
-msgid "Mail servers"
-msgstr "Servidores de correo"
-
-#: ../src/pref-manager.c:1803
-msgid "Incoming"
-msgstr "Entrante"
-
-#: ../src/pref-manager.c:1805
-msgid "Outgoing"
-msgstr "Saliente"
-
-#: ../src/pref-manager.c:1832
+#: ../src/pref-manager.c:2128
 msgid "Checking"
 msgstr "Comprobar"
 
-#: ../src/pref-manager.c:1838
+#: ../src/pref-manager.c:2131
 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:1847 ../src/pref-manager.c:2625
-#: ../src/pref-manager.c:2684
+#: ../src/pref-manager.c:2139 ../src/pref-manager.c:2311
+#: ../src/pref-manager.c:2926 ../src/pref-manager.c:2975
 msgid "minutes"
 msgstr "minutos"
 
 # libmutt/mbox.c:1066
-#: ../src/pref-manager.c:1853
+#: ../src/pref-manager.c:2144
 msgid "Check _IMAP mailboxes"
 msgstr "Comprobar buzones _IMAP"
 
-#: ../src/pref-manager.c:1858
-#| msgid "Check INBOX _only"
+#: ../src/pref-manager.c:2148
 msgid "Check Inbox _only"
 msgstr "Comprobar _solo la bandeja de entrada"
 
-#: ../src/pref-manager.c:1864
+#: ../src/pref-manager.c:2153
 msgid "When mail arrives:"
 msgstr "Cuando llega correo:"
 
 # src/balsa-message.c:651
 # src/balsa-message.c:713
-#: ../src/pref-manager.c:1869
+#: ../src/pref-manager.c:2158
 msgid "Display message"
 msgstr "Mostrar mensaje"
 
 # src/filter-edit-dialog.c:635
 # src/filter-edit-dialog.c:547
-#: ../src/pref-manager.c:1874
+#: ../src/pref-manager.c:2163
 msgid "Play sound"
 msgstr "Reproducir sonido"
 
-#: ../src/pref-manager.c:1879
+#: ../src/pref-manager.c:2168
 msgid "Show icon"
 msgstr "Mostrar icono"
 
-#: ../src/pref-manager.c:1887
+#: ../src/pref-manager.c:2175
 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:1891
+#: ../src/pref-manager.c:2178
 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:1917
-msgid "Quoted and flowed text"
-msgstr "Texto citado y volado"
-
-# src/sendmsg-window.c:891
-# src/sendmsg-window.c:934
-#: ../src/pref-manager.c:1922
-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:1926
-#| msgid ""
-#| "Quoted text\n"
-#| "regular expression:"
-msgid "Quoted text regular expression:"
-msgstr "Expresión regular de texto citado:"
-
-#: ../src/pref-manager.c:1934
-msgid "Wrap text at"
-msgstr "Ajustar el texto en"
-
-#: ../src/pref-manager.c:1942 ../src/pref-manager.c:2095
-msgid "characters"
-msgstr "caracteres"
-
-#. handling of multipart/alternative
-#: ../src/pref-manager.c:1957
-msgid "Display of multipart/alternative parts"
-msgstr "Mostrar partes Multipart/Alternative"
-
-#: ../src/pref-manager.c:1960
-#| msgid "Prefer text/plain over html"
-msgid "Prefer text/plain over HTML"
-msgstr "Preferir text/plain antes que HTML"
-
-#: ../src/pref-manager.c:1976
-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:1983
-#| msgid "display as \"?\""
-msgid "display as “?”"
-msgstr "mostrar como «?»"
-
-#: ../src/pref-manager.c:1991
-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:2018
+#: ../src/pref-manager.c:2207
 msgid "Message disposition notification requests"
 msgstr "Solicitudes de notificación de entrega de mensaje"
 
-#: ../src/pref-manager.c:2020
+#: ../src/pref-manager.c:2212
 msgid ""
 "When I receive a message whose sender requested a Message Disposition "
 "Notification (MDN), send it if:"
@@ -6211,11 +6218,7 @@ 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:2032
-#| 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)."
+#: ../src/pref-manager.c:2220
 msgid ""
 "The message header looks clean (the notify-to address is the return path, "
 "and I am in the “To:” or “CC:” list)."
@@ -6223,259 +6226,361 @@ msgstr ""
 "La cabecera del mensaje parece limpia (la dirección de notificación es igual "
 "a la ruta de retorno, y yo estoy en la lista «Para:» o «Cc:»)."
 
-#: ../src/pref-manager.c:2046
+#: ../src/pref-manager.c:2234
 msgid "The message header looks suspicious."
 msgstr "La cabecera del mensaje parece sospechosa."
 
-#: ../src/pref-manager.c:2080
+#: ../src/pref-manager.c:2258
 msgid "Word wrap"
 msgstr "Ajuste de palabra"
 
-#: ../src/pref-manager.c:2085
+#: ../src/pref-manager.c:2261
 msgid "Wrap outgoing text at"
 msgstr "Ajustar el texto saliente en"
 
-#: ../src/pref-manager.c:2108
+#: ../src/pref-manager.c:2270 ../src/pref-manager.c:2525
+msgid "characters"
+msgstr "caracteres"
+
+#: ../src/pref-manager.c:2289
 msgid "Other options"
 msgstr "Otras opciones"
 
 # src/pref-manager.c:1007
 # src/pref-manager.c:1137
-#: ../src/pref-manager.c:2113
+#: ../src/pref-manager.c:2291
 msgid "Reply prefix:"
 msgstr "Prefijo de respuesta:"
 
-#: ../src/pref-manager.c:2116
+#: ../src/pref-manager.c:2294
 msgid "Automatically quote original when replying"
 msgstr "Citar automáticamente el original al responder"
 
-#: ../src/pref-manager.c:2119
+#: ../src/pref-manager.c:2297
 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:2122
+#: ../src/pref-manager.c:2300
 msgid "Copy outgoing messages to sentbox"
 msgstr "Copiar mensajes salientes a bandeja de enviados"
 
-#: ../src/pref-manager.c:2124
+#: ../src/pref-manager.c:2302
 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:2127
+#: ../src/pref-manager.c:2306
+#| msgid "_Check mail automatically every"
+msgid "_Send queued mail automatically every"
+msgstr "_Enviar el correo encolado automáticamente cada"
+
+#: ../src/pref-manager.c:2316
 msgid "Edit headers in external editor"
 msgstr "Editar cabeceras en un editor externo"
 
-#: ../src/pref-manager.c:2129
+#: ../src/pref-manager.c:2318
 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:2146
-msgid "Layout"
-msgstr "Disposición"
-
-#: ../src/pref-manager.c:2148
-msgid "Sort and thread"
-msgstr "Ordenar y separar en conversaciones"
-
-# src/main-window.c:421
-# src/main-window.c:428
-#: ../src/pref-manager.c:2150 ../src/print-gtk.c:497
-msgid "Message"
-msgstr "Mensaje"
-
-# src/main-window.c:399
-# src/main-window.c:401
-#: ../src/pref-manager.c:2152
-msgid "Colors"
-msgstr "Colores"
-
-#: ../src/pref-manager.c:2154 ../src/pref-manager.c:2241
-msgid "Format"
-msgstr "Formato"
-
-#: ../src/pref-manager.c:2156
-msgid "Status messages"
-msgstr "Mensajes de estado"
-
-#: ../src/pref-manager.c:2181 ../src/toolbar-prefs.c:170
+#: ../src/pref-manager.c:2336 ../src/toolbar-prefs.c:170
 msgid "Main window"
 msgstr "Ventana principal"
 
-#: ../src/pref-manager.c:2184
+#: ../src/pref-manager.c:2339
 msgid "Use preview pane"
 msgstr "Usar panel de vista previa"
 
-#: ../src/pref-manager.c:2186
-msgid "Show mailbox statistics in left pane"
-msgstr "Mostrar estadísticas de buzón en el panel izquierdo"
+#: ../src/pref-manager.c:2343
+#, fuzzy
+#| msgid "Select all messages in current mailbox"
+msgid "Show message counts in mailbox list"
+msgstr "Seleccionar todos los mensajes en el buzón actual"
 
-#: ../src/pref-manager.c:2190
+#: ../src/pref-manager.c:2349
 msgid "Automatically view message when mailbox opened"
 msgstr "Ver mensaje automáticamente al abrir un buzón"
 
-#: ../src/pref-manager.c:2193
+#: ../src/pref-manager.c:2352
 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:2199
-#| msgid "PageUp/PageDown keys scroll text by"
+#: ../src/pref-manager.c:2356
 msgid "Page Up/Page Down keys scroll text by"
 msgstr "RePág/AvPág desplazan el texto"
 
-#: ../src/pref-manager.c:2207
+#: ../src/pref-manager.c:2364
 msgid "percent"
 msgstr "por ciento"
 
-#: ../src/pref-manager.c:2221
-msgid "Display progress dialog"
-msgstr "Mostrar diálogo de progreso"
+# src/main-window.c:421
+# src/main-window.c:428
+#: ../src/pref-manager.c:2381 ../src/toolbar-prefs.c:192
+msgid "Message window"
+msgstr "Ventana del mensaje"
+
+#: ../src/pref-manager.c:2383
+msgid "After moving a message:"
+msgstr "Después de mover un mensaje:"
+
+#: ../src/pref-manager.c:2404
+msgid "Sorting and threading"
+msgstr "Ordenar y conversaciones"
+
+#: ../src/pref-manager.c:2406
+msgid "Default sort column:"
+msgstr "Columna de ordenación predeterminada:"
+
+#: ../src/pref-manager.c:2413
+msgid "Default threading style:"
+msgstr "Estilo de conversación predeterminado:"
+
+# src/pref-manager.c:1087
+# src/pref-manager.c:1218
+#: ../src/pref-manager.c:2421
+msgid "Expand threads on open"
+msgstr "Expandir conversaciones al abrir"
+
+#: ../src/pref-manager.c:2446 ../src/print-gtk.c:506
+msgid "Fonts"
+msgstr "Tipografías"
+
+# src/main-window.c:421
+# src/main-window.c:428
+#: ../src/pref-manager.c:2449
+msgid "Use system fonts"
+msgstr "Usar la tipografía del sistema"
+
+#: ../src/pref-manager.c:2457
+msgid "Use default font size"
+msgstr "Usar tamaño de tipografía predeterminado"
+
+# src/main-window.c:421
+# src/main-window.c:428
+#: ../src/pref-manager.c:2463
+msgid "Message font:"
+msgstr "Tipografía del mensaje:"
+
+#: ../src/pref-manager.c:2470
+msgid "Subject font:"
+msgstr "Tipografía del asunto:"
+
+#. Quoted text regular expression
+#. and RFC2646-style flowed text
+#: ../src/pref-manager.c:2510
+msgid "Quoted and flowed text"
+msgstr "Texto citado y volado"
+
+# src/sendmsg-window.c:891
+# src/sendmsg-window.c:934
+#: ../src/pref-manager.c:2513
+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:2516
+msgid "Quoted text regular expression:"
+msgstr "Expresión regular de texto citado:"
+
+#: ../src/pref-manager.c:2519
+msgid "Wrap text at"
+msgstr "Ajustar el texto en"
+
+#. handling of multipart/alternative
+#: ../src/pref-manager.c:2542
+msgid "Display of multipart/alternative parts"
+msgstr "Mostrar partes Multipart/Alternative"
+
+#: ../src/pref-manager.c:2546
+msgid "Prefer text/plain over HTML"
+msgstr "Preferir text/plain antes que HTML"
 
-#: ../src/pref-manager.c:2246
+# src/main-window.c:421
+# src/main-window.c:428
+#: ../src/pref-manager.c:2562
+msgid "Message colors"
+msgstr "Colores del mensaje"
+
+#: ../src/pref-manager.c:2567
+#, c-format
+msgid "Quote level %d color"
+msgstr "Color del nivel de cita %d"
+
+#: ../src/pref-manager.c:2585
+msgid "Link color"
+msgstr "Color del enlace"
+
+#: ../src/pref-manager.c:2587
+msgid "Hyperlink color"
+msgstr "Color del hiperenlace"
+
+#: ../src/pref-manager.c:2602 ../src/pref-manager.c:3217
+msgid "Format"
+msgstr "Formato"
+
+#: ../src/pref-manager.c:2605
 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:2248
+#: ../src/pref-manager.c:2607
 msgid "Selected headers:"
 msgstr "Cabeceras seleccionadas:"
 
+#. treatment of messages with 8-bit chars, but without proper MIME encoding
+#: ../src/pref-manager.c:2625
+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:2630
+msgid "display as “?”"
+msgstr "mostrar como «?»"
+
+#: ../src/pref-manager.c:2638
+msgid "display in codeset"
+msgstr "mostrar en el conjunto de códigos"
+
 # src/pref-manager.c:1459
 # src/pref-manager.c:1608
-#: ../src/pref-manager.c:2270
+#: ../src/pref-manager.c:2663
 msgid "Information messages"
 msgstr "Mensajes de información"
 
 # src/pref-manager.c:1459
 # src/pref-manager.c:1608
-#: ../src/pref-manager.c:2275
+#: ../src/pref-manager.c:2667
 msgid "Information messages:"
 msgstr "Mensajes de información:"
 
 # src/pref-manager.c:1491
 # src/pref-manager.c:1644
-#: ../src/pref-manager.c:2279
+#: ../src/pref-manager.c:2671
 msgid "Warning messages:"
 msgstr "Mensajes de advertencia:"
 
 # src/pref-manager.c:1491
 # src/pref-manager.c:1644
-#: ../src/pref-manager.c:2283
+#: ../src/pref-manager.c:2675
 msgid "Error messages:"
 msgstr "Mensajes de error:"
 
 # src/pref-manager.c:1491
 # src/pref-manager.c:1644
-#: ../src/pref-manager.c:2287
+#: ../src/pref-manager.c:2679
 msgid "Fatal error messages:"
 msgstr "Mensajes de error fatal:"
 
-#: ../src/pref-manager.c:2291
+#: ../src/pref-manager.c:2683
 msgid "Debug messages:"
 msgstr "Mensajes de depuración:"
 
-# src/main-window.c:421
-# src/main-window.c:428
-#: ../src/pref-manager.c:2316
-msgid "Message colors"
-msgstr "Colores del mensaje"
-
-#: ../src/pref-manager.c:2322
-#, c-format
-msgid "Quote level %d color"
-msgstr "Color del nivel de cita %d"
-
-#: ../src/pref-manager.c:2335
-msgid "Link color"
-msgstr "Color del enlace"
-
-#: ../src/pref-manager.c:2337
-msgid "Hyperlink color"
-msgstr "Color del hiperenlace"
-
-#: ../src/pref-manager.c:2423 ../src/print-gtk.c:506
-msgid "Fonts"
-msgstr "Tipografías"
-
-# src/main-window.c:421
-# src/main-window.c:428
-#: ../src/pref-manager.c:2429
-#| msgid "Message font:"
-msgid "Use system fonts"
-msgstr "Usar la tipografía del sistema"
-
-# src/main-window.c:421
-# src/main-window.c:428
-#: ../src/pref-manager.c:2437
-msgid "Message font:"
-msgstr "Tipografía del mensaje:"
-
-#: ../src/pref-manager.c:2444
-msgid "Subject font:"
-msgstr "Tipografía del asunto:"
-
-#: ../src/pref-manager.c:2452
-msgid "Use default font size"
-msgstr "Usar tamaño de tipografía predeterminado"
+#: ../src/pref-manager.c:2701
+msgid "Display progress dialog"
+msgstr "Mostrar diálogo de progreso"
 
-#: ../src/pref-manager.c:2508
-msgid "Sorting and threading"
-msgstr "Ordenar y conversaciones"
+# src/address-book.c:369
+# src/address-book.c:394
+#: ../src/pref-manager.c:2732 ../src/pref-manager.c:3350
+msgid "Address books"
+msgstr "Libretas de direcciones"
 
-#: ../src/pref-manager.c:2512
-msgid "Default sort column:"
-msgstr "Columna de ordenación predeterminada:"
+# src/pref-manager.c:1999
+# src/pref-manager.c:2225
+#: ../src/pref-manager.c:2760
+msgid "Address book name"
+msgstr "Nombre de la libreta de direcciones"
 
-#: ../src/pref-manager.c:2516
-msgid "Default threading style:"
-msgstr "Estilo de conversación predeterminado:"
+#: ../src/pref-manager.c:2768
+msgid "Auto-complete"
+msgstr "Auto-completado"
 
-# src/pref-manager.c:1087
-# src/pref-manager.c:1218
-#: ../src/pref-manager.c:2521
-msgid "Expand threads on open"
-msgstr "Expandir conversaciones al abrir"
+#: ../src/pref-manager.c:2801
+msgid "_Set as default"
+msgstr "_Establecer como predeterminado"
 
-#: ../src/pref-manager.c:2574
+#: ../src/pref-manager.c:2818
 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:2576
+#: ../src/pref-manager.c:2822
 msgid "Check signature"
 msgstr "Comprobar firma"
 
-#: ../src/pref-manager.c:2577
+#: ../src/pref-manager.c:2824
 msgid "Check quoted"
 msgstr "Comprobar citado"
 
-#: ../src/pref-manager.c:2604
+#: ../src/pref-manager.c:2840
+msgid "Start-up options"
+msgstr "Opciones de inicio"
+
+#: ../src/pref-manager.c:2843
+msgid "Open Inbox upon start-up"
+msgstr "Abrir bandeja de entrada al inicio"
+
+#: ../src/pref-manager.c:2845
+msgid "Check mail upon start-up"
+msgstr "Comprobar correo al inicio"
+
+#: ../src/pref-manager.c:2847
+msgid "Remember open mailboxes between sessions"
+msgstr "Recordar buzones abiertos entre sesiones"
+
+#: ../src/pref-manager.c:2865
+msgid "Folder scanning"
+msgstr "Escrutinio de carpetas"
+
+#: ../src/pref-manager.c:2868
+msgid ""
+"Choose depth 1 for fast start-up; this defers scanning some folders. To see "
+"more of the tree at start-up, choose a greater depth."
+msgstr ""
+"Elija profundidad 1 para un inicio rápido; esto pospone el análisis de "
+"algunas carpetas. Para ver más del árbol al inicio, elija una profundidad "
+"mayor."
+
+#: ../src/pref-manager.c:2875
+msgid "Scan local folders to depth"
+msgstr "Inspeccionar las carpetas locales hasta la profundidad"
+
+#: ../src/pref-manager.c:2884
+msgid "Scan IMAP folders to depth"
+msgstr "Inspeccionar las carpetas IMAP hasta la profundidad"
+
+#: ../src/pref-manager.c:2906 ../src/pref-manager.c:3364
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#: ../src/pref-manager.c:2909
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../src/pref-manager.c:2605
+#: ../src/pref-manager.c:2911
 msgid "Empty trash on exit"
 msgstr "Vaciar la papelera al salir"
 
-#: ../src/pref-manager.c:2612
+#: ../src/pref-manager.c:2915
 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:2640
+#: ../src/pref-manager.c:2943
 msgid "Deleting messages"
 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:2645
+#: ../src/pref-manager.c:2948
 #, c-format
 msgid ""
 "The following setting is global, but may be overridden for the selected "
@@ -6486,169 +6591,76 @@ msgstr ""
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../src/pref-manager.c:2657
+#: ../src/pref-manager.c:2956
 msgid "Hide messages marked as deleted"
 msgstr "Ocultar mensajes marcados como borrados"
 
-#: ../src/pref-manager.c:2659
+#: ../src/pref-manager.c:2958
 msgid "The following settings are global:"
 msgstr "Los siguientes ajustes son globales:"
 
-#: ../src/pref-manager.c:2665
+#: ../src/pref-manager.c:2961
 msgid "Expunge deleted messages when mailbox is closed"
 msgstr "Purgar los mensajes borrados cuando se cierra un buzón"
 
-#: ../src/pref-manager.c:2672
-#| msgid "...and if unused more than"
+#: ../src/pref-manager.c:2965
 msgid "…and if unused more than"
 msgstr "… y si no se usa más de"
 
-# src/main-window.c:421
-# src/main-window.c:428
-#: ../src/pref-manager.c:2696 ../src/toolbar-prefs.c:192
-msgid "Message window"
-msgstr "Ventana del mensaje"
-
-#: ../src/pref-manager.c:2701
-msgid "After moving a message:"
-msgstr "Después de mover un mensaje:"
-
-#: ../src/pref-manager.c:2727
-#| msgid "Startup options"
-msgid "Start-up options"
-msgstr "Opciones de inicio"
-
-#: ../src/pref-manager.c:2730
-#| msgid "Open Inbox upon startup"
-msgid "Open Inbox upon start-up"
-msgstr "Abrir bandeja de entrada al inicio"
-
-#: ../src/pref-manager.c:2732
-#| msgid "Check mail upon startup"
-msgid "Check mail upon start-up"
-msgstr "Comprobar correo al inicio"
-
-#: ../src/pref-manager.c:2734
-msgid "Remember open mailboxes between sessions"
-msgstr "Recordar buzones abiertos entre sesiones"
-
-#: ../src/pref-manager.c:2748
-msgid "Folder scanning"
-msgstr "Escrutinio de carpetas"
-
-#: ../src/pref-manager.c:2750
-#| msgid ""
-#| "Choose depth 1 for fast startup; this defers scanning some folders.  To "
-#| "see more of the tree at startup, choose a greater depth."
-msgid ""
-"Choose depth 1 for fast start-up; this defers scanning some folders. To see "
-"more of the tree at start-up, choose a greater depth."
-msgstr ""
-"Elija profundidad 1 para un inicio rápido; esto pospone el análisis de "
-"algunas carpetas. Para ver más del árbol al inicio, elija una profundidad "
-"mayor."
-
-#: ../src/pref-manager.c:2761
-msgid "Scan local folders to depth"
-msgstr "Inspeccionar las carpetas locales hasta la profundidad"
-
-#: ../src/pref-manager.c:2773
-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:2841
-msgid "Address book name"
-msgstr "Nombre de la libreta de direcciones"
-
-#: ../src/pref-manager.c:2849
-msgid "Auto-complete"
-msgstr "Auto-completado"
-
-#: ../src/pref-manager.c:2882
-msgid "_Set as default"
-msgstr "_Establecer como predeterminado"
-
-# libmutt/mbox.c:1066
-#: ../src/pref-manager.c:3187
-#| msgid "Remote POP3 mailbox..."
-msgid "Remote POP3 mailbox…"
-msgstr "Buzón POP3 remoto…"
-
-# libmutt/mbox.c:1066
-#: ../src/pref-manager.c:3191
-#| msgid "Remote IMAP mailbox..."
-msgid "Remote IMAP mailbox…"
-msgstr "Buzón IMAP remoto…"
-
-# src/pref-manager.c:1162
-# src/pref-manager.c:1298
-#: ../src/pref-manager.c:3195
-#| msgid "Remote IMAP folder"
-msgid "Remote IMAP folder…"
-msgstr "Carpeta IMAP remota…"
-
-#: ../src/pref-manager.c:3314
-msgid "Show nothing"
-msgstr "No mostrar nada"
-
-#: ../src/pref-manager.c:3316
-msgid "Show dialog"
-msgstr "Mostrar diálogo"
-
-#: ../src/pref-manager.c:3318
-msgid "Show in list"
-msgstr "Mostrar en lista"
+# libinit_balsa/balsa-druid-page-directory.gob:194
+# libinit_balsa/balsa-druid-page-directory.gob:194
+#: ../src/pref-manager.c:3182
+msgid "Mail options"
+msgstr "Opciones de correo"
 
-#: ../src/pref-manager.c:3320
-msgid "Show in status bar"
-msgstr "Mostrar en la barra de estado"
+#: ../src/pref-manager.c:3186
+msgid "Incoming"
+msgstr "Entrante"
 
-# src/filter-edit-dialog.c:54
-# src/filter-edit-dialog.c:52
-#: ../src/pref-manager.c:3322
-msgid "Print to console"
-msgstr "Imprimir en la consola"
+#: ../src/pref-manager.c:3190
+msgid "Outgoing"
+msgstr "Saliente"
 
-#: ../src/pref-manager.c:3334
-msgid "Ask me"
-msgstr "Preguntarme"
+# libinit_balsa/balsa-druid-page-directory.gob:194
+# libinit_balsa/balsa-druid-page-directory.gob:194
+#: ../src/pref-manager.c:3201
+msgid "Display options"
+msgstr "Opciones de visualización"
 
-# src/pref-manager.c:1333
-# src/pref-manager.c:1476
-#: ../src/pref-manager.c:3466
-msgid "Default layout"
-msgstr "Distribución predeterminada"
+#: ../src/pref-manager.c:3205
+msgid "Sort and thread"
+msgstr "Ordenar y separar en conversaciones"
 
-# libmutt/mx.c:1065
-# libmutt/mx.c:1065
-#: ../src/pref-manager.c:3467
-msgid "Wide message layout"
-msgstr "Distribución de mensaje ancho"
+# src/main-window.c:421
+# src/main-window.c:428
+#: ../src/pref-manager.c:3209 ../src/print-gtk.c:497
+msgid "Message"
+msgstr "Mensaje"
 
-#: ../src/pref-manager.c:3468
-msgid "Wide screen layout"
-msgstr "Distribución de pantalla ancha"
+# src/main-window.c:399
+# src/main-window.c:401
+#: ../src/pref-manager.c:3213
+msgid "Colors"
+msgstr "Colores"
 
-# libmutt/mx.c:1375
-# libmutt/mx.c:1375
-#: ../src/pref-manager.c:3476
-msgid "Show next unread message"
-msgstr "Muestra el siguiente mensaje no leído"
+#: ../src/pref-manager.c:3221
+msgid "Status messages"
+msgstr "Mensajes de estado"
 
-#: ../src/pref-manager.c:3477
-msgid "Show next message"
-msgstr "Mostrar mensaje siguiente"
+# src/filter-edit-dialog.c:783
+# src/filter-edit-dialog.c:693
+#. must NOT be modal
+#: ../src/pref-manager.c:3292
+msgid "Balsa Preferences"
+msgstr "Preferencias de Balsa"
 
-#: ../src/pref-manager.c:3478
-msgid "Close message window"
-msgstr "Cerrar la ventana del mensaje"
+#: ../src/pref-manager.c:3355 ../src/toolbar-factory.c:166
+msgid "Spelling"
+msgstr "Ortografía"
 
-#: ../src/pref-manager.c:3531
-#, c-format
-msgid "Error displaying %s: %s\n"
-msgstr "Error mostrando %s: %s\n"
+#: ../src/pref-manager.c:3360
+msgid "Start-up"
+msgstr "Inicio"
 
 #: ../src/print-gtk.c:89 ../src/print-gtk.c:248
 #, c-format
@@ -6666,10 +6678,9 @@ msgid "Signed matter"
 msgstr "Impreso firmado"
 
 #: ../src/print-gtk.c:154
-#, fuzzy
 #| msgid "encrypted parts"
 msgid "Encrypted matter"
-msgstr "partes cifradas"
+msgstr "Parte cifrada"
 
 #: ../src/print-gtk.c:197
 #, c-format
@@ -6684,7 +6695,6 @@ msgstr "OpenPGP"
 
 #: ../src/print-gtk.c:352
 #, 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] ""
@@ -6765,11 +6775,11 @@ msgstr "_Derecha"
 msgid "Error printing message: %s"
 msgstr "Error al imprimir el mensaje: %s"
 
-#: ../src/save-restore.c:592
+#: ../src/save-restore.c:588
 msgid "Error during filters loading: "
 msgstr "Error durante la carga de filtros: "
 
-#: ../src/save-restore.c:594
+#: ../src/save-restore.c:590
 #, c-format
 msgid ""
 "Error during filters loading: %s\n"
@@ -6778,15 +6788,11 @@ msgstr ""
 "Error durante la carga de filtros: %s\n"
 "Los filtros pueden tener errores."
 
-#: ../src/save-restore.c:715
-#| msgid "The option not to recognize \"format=flowed\" text has been removed."
+#: ../src/save-restore.c:711
 msgid "The option not to recognize “format=flowed” text has been removed."
 msgstr "La opción de no reconocer text «format=flowed» se ha eliminado."
 
-#: ../src/save-restore.c:994
-#| msgid ""
-#| "The option not to send \"format=flowed\" text is now on the Options menu "
-#| "of the compose window."
+#: ../src/save-restore.c:988
 msgid ""
 "The option not to send “format=flowed” text is now on the Options menu of "
 "the compose window."
@@ -6794,17 +6800,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:1026
+#: ../src/save-restore.c:1027
 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:1103
-#| msgid ""
-#| "This version of Balsa uses a new user interface; if you have changed "
-#| "Balsa's keyboard accelerators, you will need to set them again."
+#: ../src/save-restore.c:1104
 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."
@@ -6815,194 +6818,190 @@ msgstr ""
 #. 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:184
+#: ../src/sendmsg-window.c:183
 msgid "_Brazilian Portuguese"
 msgstr "_Portugués brasileño"
 
-#: ../src/sendmsg-window.c:185
+#: ../src/sendmsg-window.c:184
 msgid "_Catalan"
 msgstr "_Catalán"
 
-#: ../src/sendmsg-window.c:186
+#: ../src/sendmsg-window.c:185
 msgid "_Chinese Simplified"
 msgstr "_Chino simplificado"
 
-#: ../src/sendmsg-window.c:187
+#: ../src/sendmsg-window.c:186
 msgid "_Chinese Traditional"
 msgstr "_Chino tradicional"
 
 # src/sendmsg-window.c:226
 # src/sendmsg-window.c:230
-#: ../src/sendmsg-window.c:188
+#: ../src/sendmsg-window.c:187
 msgid "_Czech"
 msgstr "_Checo"
 
-#: ../src/sendmsg-window.c:189
+#: ../src/sendmsg-window.c:188
 msgid "_Danish"
 msgstr "_Danés"
 
-#: ../src/sendmsg-window.c:190
+#: ../src/sendmsg-window.c:189
 msgid "_Dutch"
 msgstr "_Holandés"
 
-#: ../src/sendmsg-window.c:191
+#: ../src/sendmsg-window.c:190
 msgid "_English (American)"
 msgstr "_Inglés (americano)"
 
-#: ../src/sendmsg-window.c:192
+#: ../src/sendmsg-window.c:191
 msgid "_English (British)"
 msgstr "_Inglés (británico)"
 
-#: ../src/sendmsg-window.c:193
+#: ../src/sendmsg-window.c:192
 msgid "_Esperanto"
 msgstr "_Esperanto"
 
-#: ../src/sendmsg-window.c:194
+#: ../src/sendmsg-window.c:193
 msgid "_Estonian"
 msgstr "_Estonio"
 
-#: ../src/sendmsg-window.c:195
+#: ../src/sendmsg-window.c:194
 msgid "_Finnish"
 msgstr "_Finlandés"
 
-#: ../src/sendmsg-window.c:196
+#: ../src/sendmsg-window.c:195
 msgid "_French"
 msgstr "_Francés"
 
-#: ../src/sendmsg-window.c:197
+#: ../src/sendmsg-window.c:196
 msgid "_German"
 msgstr "_Alemán"
 
-#: ../src/sendmsg-window.c:198
+#: ../src/sendmsg-window.c:197
 msgid "_German (Austrian)"
 msgstr "_Alemán (Austríaco)"
 
-#: ../src/sendmsg-window.c:199
+#: ../src/sendmsg-window.c:198
 msgid "_German (Swiss)"
 msgstr "_Alemán (Suizo)"
 
-#: ../src/sendmsg-window.c:200
+#: ../src/sendmsg-window.c:199
 msgid "_Greek"
 msgstr "_Griego"
 
-#: ../src/sendmsg-window.c:201
+#: ../src/sendmsg-window.c:200
 msgid "_Hebrew"
 msgstr "_Hebreo"
 
-#: ../src/sendmsg-window.c:202
+#: ../src/sendmsg-window.c:201
 msgid "_Hungarian"
 msgstr "_Húngaro"
 
-#: ../src/sendmsg-window.c:203
+#: ../src/sendmsg-window.c:202
 msgid "_Italian"
 msgstr "_Italiano"
 
-#: ../src/sendmsg-window.c:204
+#: ../src/sendmsg-window.c:203
 msgid "_Japanese (JIS)"
 msgstr "_Japonés (JIS)"
 
-#: ../src/sendmsg-window.c:205
+#: ../src/sendmsg-window.c:204
 msgid "_Kazakh"
 msgstr "_Kazajo"
 
-#: ../src/sendmsg-window.c:206
+#: ../src/sendmsg-window.c:205
 msgid "_Korean"
 msgstr "_Coreano"
 
-#: ../src/sendmsg-window.c:207
+#: ../src/sendmsg-window.c:206
 msgid "_Latvian"
 msgstr "_Letón"
 
-#: ../src/sendmsg-window.c:208
+#: ../src/sendmsg-window.c:207
 msgid "_Lithuanian"
 msgstr "_Lituano"
 
-#: ../src/sendmsg-window.c:209
+#: ../src/sendmsg-window.c:208
 msgid "_Norwegian"
 msgstr "_Noruego"
 
-#: ../src/sendmsg-window.c:210
+#: ../src/sendmsg-window.c:209
 msgid "_Polish"
 msgstr "_Polaco"
 
-#: ../src/sendmsg-window.c:211
-#| msgid "_Portugese"
+#: ../src/sendmsg-window.c:210
 msgid "_Portuguese"
 msgstr "_Portugués"
 
 # src/filter-edit-dialog.c:454
 # src/filter-edit-dialog.c:404
-#: ../src/sendmsg-window.c:212
+#: ../src/sendmsg-window.c:211
 msgid "_Romanian"
 msgstr "_Rumano"
 
-#: ../src/sendmsg-window.c:213
+#: ../src/sendmsg-window.c:212
 msgid "_Russian"
 msgstr "_Ruso"
 
-#: ../src/sendmsg-window.c:214
+#: ../src/sendmsg-window.c:213
 msgid "_Serbian"
 msgstr "_Servio"
 
-#: ../src/sendmsg-window.c:215
+#: ../src/sendmsg-window.c:214
 msgid "_Serbian (Latin)"
 msgstr "_Servio (Latino)"
 
-#: ../src/sendmsg-window.c:216
+#: ../src/sendmsg-window.c:215
 msgid "_Slovak"
 msgstr "_Eslovaco"
 
-#: ../src/sendmsg-window.c:217
+#: ../src/sendmsg-window.c:216
 msgid "_Spanish"
 msgstr "_Español"
 
-#: ../src/sendmsg-window.c:218
+#: ../src/sendmsg-window.c:217
 msgid "_Swedish"
 msgstr "_Sueco"
 
-#: ../src/sendmsg-window.c:219
+#: ../src/sendmsg-window.c:218
 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:220
+#: ../src/sendmsg-window.c:219
 msgid "_Turkish"
 msgstr "_Turco"
 
-#: ../src/sendmsg-window.c:221
+#: ../src/sendmsg-window.c:220
 msgid "_Ukrainian"
 msgstr "_Ucraniano"
 
-#: ../src/sendmsg-window.c:222
+#: ../src/sendmsg-window.c:221
 msgid "_Generic UTF-8"
 msgstr "_Genérico UTF-8"
 
 # src/sendmsg-window.c:891
 # src/sendmsg-window.c:934
-#: ../src/sendmsg-window.c:270
+#: ../src/sendmsg-window.c:269
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: ../src/sendmsg-window.c:270
+#: ../src/sendmsg-window.c:269
 msgid "Inline"
 msgstr "En línea"
 
-#: ../src/sendmsg-window.c:270
+#: ../src/sendmsg-window.c:269
 msgid "Reference"
 msgstr "Referencia"
 
 # src/main-window.c:267 src/message-window.c:61
 # src/main-window.c:269
-#: ../src/sendmsg-window.c:518
+#: ../src/sendmsg-window.c:517
 msgid "(No name)"
 msgstr "(sin nombre)"
 
-#: ../src/sendmsg-window.c:524
+#: ../src/sendmsg-window.c:523
 #, c-format
-#| msgid ""
-#| "The message to '%s' is modified.\n"
-#| "Save message to Draftbox?"
 msgid ""
 "The message to “%s” is modified.\n"
 "Save message to Draftbox?"
@@ -7010,24 +7009,18 @@ msgstr ""
 "El mensaje a «%s» se ha modificado.\n"
 "¿Guardar mensaje en borradores?"
 
-#: ../src/sendmsg-window.c:819
+#: ../src/sendmsg-window.c:818
 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:892
+#: ../src/sendmsg-window.c:891
 msgid "Select Identity"
 msgstr "Seleccionar la identidad"
 
-#: ../src/sendmsg-window.c:1407
+#: ../src/sendmsg-window.c:1406
 #, c-format
-#| msgid ""
-#| "Saying yes will not send the file `%s' itself, but just a MIME message/"
-#| "external-body reference.  Note that the recipient must have proper "
-#| "permissions to see the `real' file.\n"
-#| "\n"
-#| "Do you really want to attach this file as reference?"
 msgid ""
 "Saying yes will not send the file “%s” itself, but just a MIME message/"
 "external-body reference. Note that the recipient must have proper "
@@ -7042,22 +7035,16 @@ msgstr ""
 "\n"
 "¿Quiere realmente adjuntar este archivo como referencia?"
 
-#: ../src/sendmsg-window.c:1420
+#: ../src/sendmsg-window.c:1419
 msgid "Attach as Reference?"
 msgstr "¿Adjuntar como referencia?"
 
-#: ../src/sendmsg-window.c:1541
-#| msgid "Choose charset"
+#: ../src/sendmsg-window.c:1552
 msgid "Choose character set"
 msgstr "Elegir conjunto de caracteres"
 
-#: ../src/sendmsg-window.c:1549
+#: ../src/sendmsg-window.c:1560
 #, c-format
-#| msgid ""
-#| "File\n"
-#| "%s\n"
-#| "is not encoded in US-ASCII or UTF-8.\n"
-#| "Please choose the charset used to encode the file."
 msgid ""
 "File\n"
 "%s\n"
@@ -7069,66 +7056,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:1569
+#: ../src/sendmsg-window.c:1580
 msgid "Attach as MIME type:"
 msgstr "Adjuntar como tipo MIME:"
 
-#: ../src/sendmsg-window.c:1630
+#: ../src/sendmsg-window.c:1641
 #, c-format
-#| msgid "Character set for file %s changed from \"%s\" to \"%s\"."
 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:1673 ../src/sendmsg-window.c:5025
+#: ../src/sendmsg-window.c:1684 ../src/sendmsg-window.c:5034
 msgid "(no subject)"
 msgstr "(Sin asunto)"
 
-#: ../src/sendmsg-window.c:1711
+#: ../src/sendmsg-window.c:1722
 #, 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:1719
+#: ../src/sendmsg-window.c:1730
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: ../src/sendmsg-window.c:1759
+#: ../src/sendmsg-window.c:1770
 msgid "forwarded message"
 msgstr "mensaje reenviado"
 
-#: ../src/sendmsg-window.c:1764
+#: ../src/sendmsg-window.c:1775
 #, c-format
-#| msgid "Message from %s, subject: \"%s\""
 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:1842 ../src/sendmsg-window.c:1915
+#: ../src/sendmsg-window.c:1853 ../src/sendmsg-window.c:1926
 msgid "Remove"
 msgstr "Eliminar"
 
 # src/mblist-window.c:446
 # src/mblist-window.c:469
-#: ../src/sendmsg-window.c:1927
-#| msgid "_Open"
+#: ../src/sendmsg-window.c:1938
 msgid "Open…"
 msgstr "Abrir…"
 
-#: ../src/sendmsg-window.c:1939
+#: ../src/sendmsg-window.c:1950
 msgid "(URL)"
 msgstr "(URL)"
 
-#: ../src/sendmsg-window.c:1995
+#: ../src/sendmsg-window.c:2006
 msgid "Attach file"
 msgstr "Adjuntar archivo"
 
-#: ../src/sendmsg-window.c:2108 ../src/sendmsg-window.c:2211
-#: ../src/sendmsg-window.c:6866
+#: ../src/sendmsg-window.c:2119 ../src/sendmsg-window.c:2222
+#: ../src/sendmsg-window.c:6865
 msgid ""
 "Attaching message failed.\n"
 "Possible reason: not enough temporary space"
@@ -7140,177 +7124,174 @@ msgstr ""
 # src/sendmsg-window.c:835
 # src/balsa-message.c:633 src/filter-edit-dialog.c:316 src/print.c:348
 # src/sendmsg-window.c:867
-#: ../src/sendmsg-window.c:2430
+#: ../src/sendmsg-window.c:2441
 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:2578
+#: ../src/sendmsg-window.c:2591
 msgid "S_ubject:"
 msgstr "As_unto:"
 
-#: ../src/sendmsg-window.c:2605
+#: ../src/sendmsg-window.c:2618
 msgid "F_CC:"
 msgstr "F_cc:"
 
 # src/sendmsg-window.c:891
 # src/sendmsg-window.c:934
 #. Attachment list
-#: ../src/sendmsg-window.c:2631
+#: ../src/sendmsg-window.c:2644
 msgid "_Attachments:"
 msgstr "_Adjuntos:"
 
-#: ../src/sendmsg-window.c:2675
+#: ../src/sendmsg-window.c:2688
 msgid "Mode"
 msgstr "Modo"
 
 # src/balsa-message.c:301
 # src/balsa-message.c:331
-#: ../src/sendmsg-window.c:3021
+#: ../src/sendmsg-window.c:3034
 #, 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:3045
+#: ../src/sendmsg-window.c:3058
 msgid "No subject"
 msgstr "Sin asunto"
 
-#: ../src/sendmsg-window.c:3079
+#: ../src/sendmsg-window.c:3092
 #, c-format
-#| msgid "inlined file \"%s\" (%s)"
 msgid "inlined file “%s” (%s)"
 msgstr "archivo incluido en línea «%s» (%s)"
 
-#: ../src/sendmsg-window.c:3082
+#: ../src/sendmsg-window.c:3095
 #, c-format
-#| msgid "attached file \"%s\" (%s)"
 msgid "attached file “%s” (%s)"
 msgstr "archivo adjunto «%s» (%s)"
 
-#: ../src/sendmsg-window.c:3086
+#: ../src/sendmsg-window.c:3099
 #, c-format
 msgid "inlined %s part"
 msgstr "%s partes incluidas en línea"
 
-#: ../src/sendmsg-window.c:3088
+#: ../src/sendmsg-window.c:3101
 #, c-format
 msgid "attached %s part"
 msgstr "parte %s adjuntada"
 
-#: ../src/sendmsg-window.c:3156
+#: ../src/sendmsg-window.c:3169
 #, c-format
-#| msgid "message from %s, subject \"%s\""
 msgid "message from %s, subject “%s”"
 msgstr "mensaje de %s, asunto: «%s»"
 
-#: ../src/sendmsg-window.c:3283
+#: ../src/sendmsg-window.c:3296
 msgid "quoted"
 msgstr "citado"
 
 # src/sendmsg-window.c:891
 # src/sendmsg-window.c:934
-#: ../src/sendmsg-window.c:3288 ../src/sendmsg-window.c:3291
+#: ../src/sendmsg-window.c:3301 ../src/sendmsg-window.c:3304
 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:3317
+#: ../src/sendmsg-window.c:3330
 msgid "Select parts for quotation"
 msgstr "Seleccione partes para citarlas"
 
-#: ../src/sendmsg-window.c:3328
+#: ../src/sendmsg-window.c:3341
 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:3481
+#: ../src/sendmsg-window.c:3494
 msgid "you"
 msgstr "usted"
 
-#: ../src/sendmsg-window.c:3490
+#: ../src/sendmsg-window.c:3503
 #, 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:3527
+#: ../src/sendmsg-window.c:3540
 #, c-format
 msgid "Message-ID: %s\n"
 msgstr "Message-ID: %s\n"
 
-#: ../src/sendmsg-window.c:3533
+#: ../src/sendmsg-window.c:3546
 msgid "References:"
 msgstr "Referencias:"
 
-#: ../src/sendmsg-window.c:3544
+#: ../src/sendmsg-window.c:3557
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "El %s, %s escribió:\n"
 
-#: ../src/sendmsg-window.c:3546
+#: ../src/sendmsg-window.c:3559
 #, 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:3659
+#: ../src/sendmsg-window.c:3672
 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:3800
+#: ../src/sendmsg-window.c:3813
 msgid "Could not save message."
 msgstr "No se pudo guardar el mensaje."
 
 # libmutt/mbox.c:1028
-#: ../src/sendmsg-window.c:3807
+#: ../src/sendmsg-window.c:3820
 #, 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:3832
+#: ../src/sendmsg-window.c:3845
 msgid "Message saved."
 msgstr "Mensaje guardado."
 
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
-#: ../src/sendmsg-window.c:4456 ../src/sendmsg-window.c:4464
-#: ../src/sendmsg-window.c:4471 ../src/sendmsg-window.c:4478
-#: ../src/sendmsg-window.c:4502
+#: ../src/sendmsg-window.c:4470 ../src/sendmsg-window.c:4478
+#: ../src/sendmsg-window.c:4485 ../src/sendmsg-window.c:4492
+#: ../src/sendmsg-window.c:4516
 #, c-format
 msgid "Could not attach the file %s: %s."
 msgstr "No se pudo adjuntar el archivo %s: %s"
 
-#: ../src/sendmsg-window.c:4457
+#: ../src/sendmsg-window.c:4471
 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:4465
+#: ../src/sendmsg-window.c:4479
 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:4472
+#: ../src/sendmsg-window.c:4486
 msgid "does not exist"
 msgstr "no existe"
 
-#: ../src/sendmsg-window.c:4503
+#: ../src/sendmsg-window.c:4517
 msgid "not in current directory"
 msgstr "no está en el directorio actual"
 
-#: ../src/sendmsg-window.c:4553
+#: ../src/sendmsg-window.c:4567
 #, fuzzy
 #| msgid ""
 #| "The link that you selected created\n"
@@ -7327,23 +7308,22 @@ msgstr ""
 "Copia oculta (Cco). Compruebe que la\n"
 "dirección es apropiada."
 
-# src/sendmsg-window.c:1403
-# src/sendmsg-window.c:1454
-#: ../src/sendmsg-window.c:4635
+#: ../src/sendmsg-window.c:4676
 #, c-format
-msgid "Could not open the file %s.\n"
-msgstr "No se pudo abrir el archivo %s\n"
+#| msgid "attached file “%s” (%s)"
+msgid "Cannot not read the file “%s”: %s"
+msgstr "No se puede leer el archivo «%s»: %s"
 
 # src/sendmsg-window.c:1434
 # src/sendmsg-window.c:1483
-#: ../src/sendmsg-window.c:4686
+#: ../src/sendmsg-window.c:4695
 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:4871
+#: ../src/sendmsg-window.c:4880
 #, 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"
@@ -7351,33 +7331,32 @@ msgstr "No se pudo cargar el archivo de cabeceras de la cara %s: %s"
 # src/balsa-message.c:1316
 # src/balsa-message.c:1474
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:4874
+#: ../src/sendmsg-window.c:4883
 #, c-format
 msgid "Could not load X-Face header file %s: %s"
 msgstr "No se pudo cargar el archivo de cabeceras de X-Face %s: %s"
 
 # src/balsa-index.c:304 src/filter-edit-dialog.c:349
 # src/balsa-index.c:297 src/filter-edit-dialog.c:326
-#: ../src/sendmsg-window.c:4982
-#| msgid "No subject"
+#: ../src/sendmsg-window.c:4991
 msgid "No Subject"
 msgstr "Sin asunto"
 
 # src/address-book.c:477
 # src/address-book.c:523
-#: ../src/sendmsg-window.c:4987
+#: ../src/sendmsg-window.c:4996
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../src/sendmsg-window.c:5008
+#: ../src/sendmsg-window.c:5017
 msgid "You did not specify a subject for this message"
 msgstr "No especificó un asunto para este mensaje"
 
-#: ../src/sendmsg-window.c:5009
+#: ../src/sendmsg-window.c:5018
 msgid "If you would like to provide one, enter it below."
 msgstr "Si quiere proporcionar uno, introdúzcalo abajo."
 
-#: ../src/sendmsg-window.c:5102
+#: ../src/sendmsg-window.c:5111
 #, c-format
 msgid ""
 "You did not select encryption for this message, although %s public keys are "
@@ -7388,19 +7367,19 @@ msgstr ""
 "%s están disponibles para todos los destinatarios. Para proteger su "
 "privacidad el mensaje se podría cifrar con %s."
 
-#: ../src/sendmsg-window.c:5124
+#: ../src/sendmsg-window.c:5133
 msgid "Send _encrypted"
 msgstr "Enviar ci_frado"
 
-#: ../src/sendmsg-window.c:5139
+#: ../src/sendmsg-window.c:5148
 msgid "Send _unencrypted"
 msgstr "Enviar _sin cifrado"
 
-#: ../src/sendmsg-window.c:5199
+#: ../src/sendmsg-window.c:5208
 msgid "You selected OpenPGP security for this message.\n"
 msgstr "Seleccionó seguridad OpenPGP para este mensaje.\n"
 
-#: ../src/sendmsg-window.c:5204
+#: ../src/sendmsg-window.c:5213
 msgid ""
 "The message text will be sent as plain text and as HTML, but only the plain "
 "part can be signed.\n"
@@ -7408,12 +7387,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:5209
+#: ../src/sendmsg-window.c:5218
 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:5213
+#: ../src/sendmsg-window.c:5222
 msgid ""
 "You should select MIME mode if the complete message shall be protected. Do "
 "you really want to proceed?"
@@ -7421,43 +7400,42 @@ msgstr ""
 "Debería seleccionar el modo MIME si se debe proteger el mensaje completo. "
 "¿Realmente quiere seguir adelante?"
 
-#: ../src/sendmsg-window.c:5238
+#: ../src/sendmsg-window.c:5247
 #, c-format
-#| msgid "sending message with gpg mode %d"
 msgid "sending message with GPG mode %d"
 msgstr "enviando mensaje con modo GPG %d"
 
-#: ../src/sendmsg-window.c:5277
+#: ../src/sendmsg-window.c:5275
 msgid "Message could not be created"
 msgstr "El mensaje no se pudo crear"
 
-#: ../src/sendmsg-window.c:5279
+#: ../src/sendmsg-window.c:5277
 msgid "Message could not be queued in outbox"
 msgstr "El mensaje no se pudo poner en la cola de salida"
 
-#: ../src/sendmsg-window.c:5281
+#: ../src/sendmsg-window.c:5279
 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:5283
+#: ../src/sendmsg-window.c:5281
 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:5286
+#: ../src/sendmsg-window.c:5284
 msgid "Message could not be signed"
 msgstr "El mensaje no se pudo firmar"
 
-#: ../src/sendmsg-window.c:5288
+#: ../src/sendmsg-window.c:5286
 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:5294
+#: ../src/sendmsg-window.c:5292
 #, c-format
 msgid ""
 "Send failed: %s\n"
@@ -7468,57 +7446,57 @@ msgstr ""
 
 # libmutt/imap/auth.c:373
 # libmutt/imap/auth.c:373
-#: ../src/sendmsg-window.c:5299
+#: ../src/sendmsg-window.c:5297
 #, 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:5398
+#: ../src/sendmsg-window.c:5396
 #, 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:5419
+#: ../src/sendmsg-window.c:5417
 msgid "Message postponed."
 msgstr "Mensaje pospuesto."
 
 # src/balsa-message.c:651
 # src/balsa-message.c:713
-#: ../src/sendmsg-window.c:5424
+#: ../src/sendmsg-window.c:5422
 msgid "Could not postpone message."
 msgstr "No se pudo posponer el mensaje."
 
-#: ../src/sendmsg-window.c:5636
+#: ../src/sendmsg-window.c:5634
 #, c-format
 msgid "Error starting spell checker: %s"
 msgstr "Error al iniciar el comprobador de ortografía: %s"
 
 # src/sendmsg-window.c:1129
 # src/sendmsg-window.c:1180
-#: ../src/sendmsg-window.c:6387
+#: ../src/sendmsg-window.c:6385
 #, c-format
 msgid "Reply to %s: %s"
 msgstr "Responder a %s: %s"
 
 # libmutt/mx.c:848
 # libmutt/mx.c:848
-#: ../src/sendmsg-window.c:6392
+#: ../src/sendmsg-window.c:6390
 #, 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:6396
+#: ../src/sendmsg-window.c:6394
 #, c-format
 msgid "New message to %s: %s"
 msgstr "Mensaje nuevo a %s: %s"
 
-#: ../src/sendmsg-window.c:6566
+#: ../src/sendmsg-window.c:6564
 msgid "_Language"
 msgstr "_Idioma"
 
@@ -7529,7 +7507,6 @@ msgstr "Ortografía"
 # src/main-window.c:177
 # src/main-window.c:184
 #: ../src/spell-check.c:339
-#| msgid "_Change"
 msgid "C_hange"
 msgstr "_Cambiar"
 
@@ -7559,7 +7536,6 @@ msgid "Skip the current word"
 msgstr "Omitir la palabra actual"
 
 #: ../src/spell-check.c:362
-#| msgid "Ignore A_ll"
 msgid "I_gnore All"
 msgstr "Ignorar _todo"
 
@@ -7589,9 +7565,8 @@ msgstr "Terminar la comprobación ortográfica"
 msgid "Revert all changes and finish spell checking"
 msgstr "Revertir todos los cambios y terminar la comprobación ortográfica"
 
-#: ../src/spell-check.c:1028
+#: ../src/spell-check.c:1018
 #, c-format
-#| msgid "BalsaSpellCheck: Pspell Error: %s\n"
 msgid "BalsaSpellCheck: Enchant Error: %s\n"
 msgstr "ComprobaciónDeEscrituraDeBalsa: error de enchant: %s\n"
 
@@ -7610,7 +7585,6 @@ msgstr "Almacenar dirección"
 # src/mblist-window.c:501 src/mblist-window.c:517 src/mblist-window.c:536
 # src/mblist-window.c:551
 #: ../src/store-address.c:246
-#| msgid "No address book selected...."
 msgid "No address book selected…"
 msgstr "No hay una libreta de direcciones seleccionada…"
 
@@ -7635,7 +7609,6 @@ 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:290
-#| msgid "Address Book"
 msgid "Address Book:"
 msgstr "Libreta de direcciones:"
 
@@ -7644,7 +7617,6 @@ msgstr "Libreta de direcciones:"
 # src/balsa-message.c:633 src/filter-edit-dialog.c:316 src/print.c:348
 # src/sendmsg-window.c:867
 #: ../src/store-address.c:336
-#| msgid "From:"
 msgid "From: "
 msgstr "De:"
 
@@ -7785,32 +7757,41 @@ msgid "Send"
 msgstr "Enviar"
 
 #: ../src/toolbar-factory.c:160
+#| msgid "_Send Queued Mail"
+msgid "Send queued"
+msgstr "Enviar encolados"
+
+#: ../src/toolbar-factory.c:161
 msgid "Exchange"
 msgstr "Intercambiar"
 
-#: ../src/toolbar-factory.c:161
+#: ../src/toolbar-factory.c:162 ../src/toolbar-factory.c:194
+msgid "Queue"
+msgstr "Encolar"
+
+#: ../src/toolbar-factory.c:163
 msgid "Attach"
 msgstr "Adjuntar"
 
 # src/balsa-message.c:1247
 # src/balsa-message.c:1417
-#: ../src/toolbar-factory.c:162
+#: ../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:163
+#: ../src/toolbar-factory.c:165
 msgid "Identity"
 msgstr "Identidad"
 
 # src/main-window.c:399
 # src/main-window.c:401
-#: ../src/toolbar-factory.c:165
+#: ../src/toolbar-factory.c:167
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../src/toolbar-factory.c:166
+#: ../src/toolbar-factory.c:168
 msgid ""
 "Toggle\n"
 "new"
@@ -7818,11 +7799,11 @@ msgstr ""
 "Activar\n"
 "nuevo"
 
-#: ../src/toolbar-factory.c:167
+#: ../src/toolbar-factory.c:169
 msgid "Mark all"
 msgstr "Marcar todos"
 
-#: ../src/toolbar-factory.c:168
+#: ../src/toolbar-factory.c:170
 msgid ""
 "All\n"
 "headers"
@@ -7832,7 +7813,7 @@ msgstr ""
 
 # src/filter-edit-dialog.c:783
 # src/filter-edit-dialog.c:693
-#: ../src/toolbar-factory.c:169
+#: ../src/toolbar-factory.c:171
 msgid ""
 "Reset\n"
 "Filter"
@@ -7840,34 +7821,33 @@ msgstr ""
 "Restablecer\n"
 "filtro"
 
-#: ../src/toolbar-factory.c:170
-#| msgid "Msg Preview"
+#: ../src/toolbar-factory.c:172
 msgid "Message Preview"
 msgstr "Vista previa del mensaje"
 
-#: ../src/toolbar-factory.c:172
+#: ../src/toolbar-factory.c:174
 msgid "Sign"
 msgstr "Firmar"
 
-#: ../src/toolbar-factory.c:173
+#: ../src/toolbar-factory.c:175
 msgid "Encrypt"
 msgstr "Cifrar"
 
 # src/balsa-mblist.c:218
 # src/balsa-mblist.c:218
-#: ../src/toolbar-factory.c:175
+#: ../src/toolbar-factory.c:177
 msgid "Undo"
 msgstr "Deshacer"
 
-#: ../src/toolbar-factory.c:176
+#: ../src/toolbar-factory.c:178
 msgid "Redo"
 msgstr "Rehacer"
 
-#: ../src/toolbar-factory.c:177
+#: ../src/toolbar-factory.c:179
 msgid "Expunge"
 msgstr "Purgar"
 
-#: ../src/toolbar-factory.c:178
+#: ../src/toolbar-factory.c:180
 msgid ""
 "Empty\n"
 "Trash"
@@ -7877,47 +7857,41 @@ msgstr ""
 
 # src/main-window.c:389
 # src/main-window.c:386
-#: ../src/toolbar-factory.c:179
+#: ../src/toolbar-factory.c:181
 msgid "Edit"
 msgstr "Editar"
 
-#: ../src/toolbar-factory.c:192
-msgid "Queue"
-msgstr "Encolar"
-
-#: ../src/toolbar-factory.c:405
+#: ../src/toolbar-factory.c:407
 #, c-format
-#| msgid "Unknown toolbar icon \"%s\""
 msgid "Unknown toolbar icon “%s”"
 msgstr "Icono «%s» de la barra de herramientas desconocido"
 
-#: ../src/toolbar-factory.c:482
+#: ../src/toolbar-factory.c:484
 msgid "Queue this message for sending"
 msgstr "Encolar este mensaje para enviarlo"
 
-#: ../src/toolbar-factory.c:494
+#: ../src/toolbar-factory.c:496
 msgid "Text Be_low Icons"
 msgstr "Texto _debajo de los iconos"
 
-#: ../src/toolbar-factory.c:495
+#: ../src/toolbar-factory.c:497
 msgid "Priority Text Be_side Icons"
 msgstr "Prioridad de texto j_unto a los iconos"
 
-#: ../src/toolbar-factory.c:497
+#: ../src/toolbar-factory.c:499
 msgid "_Icons Only"
 msgstr "Sólo _iconos"
 
-#: ../src/toolbar-factory.c:498
+#: ../src/toolbar-factory.c:500
 msgid "_Text Only"
 msgstr "Sólo _texto"
 
-#: ../src/toolbar-factory.c:760
+#: ../src/toolbar-factory.c:764
 #, c-format
 msgid "Use Desktop _Default (%s)"
 msgstr "Usar los pre_determinados del escritorio (%s)"
 
-#: ../src/toolbar-factory.c:786
-#| msgid "Customize Toolbars"
+#: ../src/toolbar-factory.c:790
 msgid "_Customize Toolbars…"
 msgstr "_Personalizar barras de herramientas…"
 
@@ -7937,60 +7911,167 @@ msgstr "Opciones de barra de herramientas"
 msgid "_Wrap button labels"
 msgstr "_Auto-ajuste de etiquetas de botones"
 
-#: ../src/toolbar-prefs.c:379
+#: ../src/toolbar-prefs.c:386
 #, 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:415
+#: ../src/toolbar-prefs.c:422
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: ../src/toolbar-prefs.c:445
+#: ../src/toolbar-prefs.c:452
 msgid "_Restore toolbar to standard buttons"
 msgstr "_Restaurar barra de herramientas a los botones estándar"
 
 #. Style button
-#: ../src/toolbar-prefs.c:449
-#| msgid "Toolbar _style..."
+#: ../src/toolbar-prefs.c:456
 msgid "Toolbar _style…"
 msgstr "E_stilo de la barra de herramientas…"
 
-#: ../src/toolbar-prefs.c:466
+#: ../src/toolbar-prefs.c:473
 msgid "Available buttons"
 msgstr "Botones disponibles"
 
 # src/main-window.c:396
 # src/main-window.c:395
-#: ../src/toolbar-prefs.c:482
+#: ../src/toolbar-prefs.c:489
 msgid "Current toolbar"
 msgstr "Barra de herramientas actual"
 
-#: ../src/toolbar-prefs.c:503
-#| msgid "Cut the selected text"
+#: ../src/toolbar-prefs.c:510
 msgid "Move selected item up"
 msgstr "Subir el elemento seleccionado"
 
 # src/main-window.c:392
 # src/main-window.c:389
-#: ../src/toolbar-prefs.c:513
-#, fuzzy
+#: ../src/toolbar-prefs.c:520
 #| msgid "Save selected to folder..."
 msgid "Remove selected item from toolbar"
-msgstr "Guardar seleccionados a carpeta…"
+msgstr "Quitar el elemento seleccionado de la barra de herramientas"
 
-#: ../src/toolbar-prefs.c:521
+#: ../src/toolbar-prefs.c:528
 msgid "Add selected item to toolbar"
 msgstr "Añadir el elemento seleccionado a la barra de herramientas"
 
 # src/main-window.c:392
 # src/main-window.c:389
-#: ../src/toolbar-prefs.c:528
-#| msgid "Save selected to folder..."
+#: ../src/toolbar-prefs.c:535
 msgid "Move selected item down"
 msgstr "Bajar el elemento seleccionado"
 
+# src/sendmsg-window.c:1694
+# src/sendmsg-window.c:1749
+#~ msgid "Error reading signature from %s"
+#~ msgstr "Ha ocurrido un error al cargar la firma de %s"
+
+# src/pref-manager.c:192
+# src/pref-manager.c:191
+#~ msgid "Retrieving Message %d of %d"
+#~ msgstr "Descargando mensaje %d de %d"
+
+#~ msgid "Received %ld kB of %ld"
+#~ msgstr "Se han recibido %ld KiB de %ld"
+
+# libmutt/mx.c:848
+# libmutt/mx.c:848
+#~ msgid "Saving POP message to %s failed."
+#~ msgstr "Ha fallado al guardar el mensaje POP a %s."
+
+#~ msgid ""
+#~ "POP3 mailbox %s temp file error:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Error en el archivo temporal del buzón POP3 %s:\n"
+#~ "%s"
+
+#~ msgid "POP3 error: cannot open %s for writing."
+#~ msgstr "Error POP3: no se puede abrir %s para escritura."
+
+#~ msgid "POP3 error: cannot close %s."
+#~ msgstr "Error POP3: no se puede cerrar %s."
+
+#~ msgid ""
+#~ "Could not send the message to %s:\n"
+#~ "%d: %s\n"
+#~ "Message left in your outbox.\n"
+#~ msgstr ""
+#~ "No se pudo enviar el mensaje a %s:\n"
+#~ "%d: %s\n"
+#~ "El mensaje se ha dejado en la bandeja de salida.\n"
+
+#~ msgid ""
+#~ "Message submission problem, placing it into your outbox.\n"
+#~ "System will attempt to resubmit the message until you delete it."
+#~ msgstr ""
+#~ "Problema al enviar un mensaje. Se dejará en su bandeja de salida.\n"
+#~ "El sistema volverá a intentar enviarlo hasta que lo borre."
+
+#~ msgid "From: %d <%s>"
+#~ msgstr "De: %d <%s>"
+
+# src/mailbox-conf.c:485
+# src/mailbox-conf.c:490
+#~ msgid "From %s: %d %s"
+#~ msgstr "De %s: %d %s"
+
+#~ msgid "To: %d <%s>"
+#~ msgstr "Para: %d <%s>"
+
+# src/mailbox-conf.c:485
+# src/mailbox-conf.c:490
+#~ msgid "To %s: %d %s"
+#~ msgstr "Para: %s: %d %s"
+
+#~ msgid ""
+#~ "SMTP server refused connection.\n"
+#~ "Check your internet connection."
+#~ msgstr ""
+#~ "El servidor SMTP rechazó la conexión.\n"
+#~ "Compruebe su conexión a Internet."
+
+#~ msgid ""
+#~ "SMTP server cannot be reached.\n"
+#~ "Check your internet connection."
+#~ msgstr ""
+#~ "El servidor SMTP no se ha podido alcanzar.\n"
+#~ "Compruebe su conexión de Internet."
+
+#~ msgid "Message left in Outbox (try again later)"
+#~ msgstr "El mensaje se dejó en la bandeja de salida (intente más tarde)"
+
+#~ msgid ""
+#~ "SMTP server problem (%d): %s\n"
+#~ "Message is left in outbox."
+#~ msgstr ""
+#~ "Problema en el servidor SMTP (%d): %s\n"
+#~ "El mensaje se ha dejado en la bandeja de salida."
+
+# src/sendmsg-window.c:1694
+# src/sendmsg-window.c:1749
+#~ msgid "Error loading %s: %s\n"
+#~ msgstr "Ha ocurrido un error al cargar %s: %s\n"
+
+#~ msgid "Debug POP3 connection"
+#~ msgstr "Depurar la conexión POP3"
+
+# src/pref-manager.c:240
+# src/pref-manager.c:246
+#~ msgid "Mail servers"
+#~ msgstr "Servidores de correo"
+
+#~ msgid "Layout"
+#~ msgstr "Disposición"
+
+#~ msgid "Show mailbox statistics in left pane"
+#~ msgstr "Mostrar estadísticas de buzón en el panel izquierdo"
+
+# src/sendmsg-window.c:1403
+# src/sendmsg-window.c:1454
+#~ msgid "Could not open the file %s.\n"
+#~ msgstr "No se pudo abrir el archivo %s\n"
+
 # src/balsa-message.c:575
 # src/balsa-message.c:639
 #~ msgid "Bcc:"
@@ -8379,9 +8460,6 @@ msgstr "Bajar el elemento seleccionado"
 #~ 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"
 
@@ -8585,9 +8663,6 @@ msgstr "Bajar el elemento seleccionado"
 #~ 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..."
@@ -9132,11 +9207,6 @@ msgstr "Bajar el elemento seleccionado"
 #~ 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"
@@ -9290,11 +9360,6 @@ msgstr "Bajar el elemento seleccionado"
 #~ msgid "Send _plain"
 #~ msgstr "Enviar _plano"
 
-# libmutt/mx.c:848
-# libmutt/mx.c:848
-#~ msgid "Continue message to %s: %s"
-#~ msgstr "Continuar mensaje a %s: %s"
-
 #~ msgid "Failed to convert %s to a Gnome VFS URI"
 #~ msgstr "Falló al convertir %s a un URI Gnome VFS"
 



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