talons

commit 32979c5f79d1c2132bdbbe4d0add6e97f48ac699
parent 5db77bed1e609211d473dffb1309fb5eba6a6cf2
Author: Ricardo Mones <ricardo@mones.org>
Date:   Sun, 20 Dec 2015 03:44:31 +0100

Update Spanish translation for release

Diffstat:
M
po/es.po
 | 
4390
+++++++++++++++++++++++++++++++++++++++----------------------------------------

1 file changed, 2147 insertions(+), 2243 deletions(-)
diff --git a/po/es.po b/po/es.po
@@ -8,12 +8,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Claws Mail 3.13.0\n"
+"Project-Id-Version: Claws Mail 3.14.0\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"
-"POT-Creation-Date: 2015-10-09 18:08+0200\n"
-"PO-Revision-Date: 2015-07-21 10:28+0200\n"
-"Last-Translator: Carles Tubio <c@rles-tub.io>\n"
-"Language-Team: Ricardo Mones <ricardo@mones.org>\n"
+"POT-Creation-Date: 2015-12-20 02:28+0100\n"
+"PO-Revision-Date: 2015-12-20 03:34+0100\n"
+"Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
+"Language-Team: Spanish\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,20 +82,20 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "«Recibir correo» recupera el correo de las cuentas marcadas"
 
 #: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7217 src/editaddress.c:1263
-#: src/editaddress.c:1320 src/editaddress.c:1340
+#: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1265
+#: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
-#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
-#: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:275 src/plugins/managesieve/sieve_manager.c:465
-#: src/plugins/pdf_viewer/poppler_viewer.c:1796
+#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:427
+#: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
+#: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:465
+#: src/plugins/pdf_viewer/poppler_viewer.c:1807
 #: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1866 src/prefs_template.c:79
 msgid "Name"
 msgstr "Nombre"
 
-#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4060
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -150,12 +150,12 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:990 src/ldaputil.c:326 src/plugins/bogofilter/bogofilter.c:884
+#: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
-#: src/plugins/vcalendar/vcal_folder.c:1805
-#: src/plugins/vcalendar/vcal_folder.c:1809
-#: src/plugins/vcalendar/vcal_folder.c:1820
-#: src/plugins/vcalendar/vcal_folder.c:1823 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
+#: src/plugins/vcalendar/vcal_folder.c:1821
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -219,7 +219,7 @@ msgstr "No se puede copiar una agenda a si misma."
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "No se puede mover la carpeta a si misma o a su sub-estructura."
 
-#: src/addr_compl.c:689 src/addressbook.c:4873
+#: src/addr_compl.c:689 src/addressbook.c:4947
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "Grupo"
@@ -292,9 +292,9 @@ msgstr ""
 "¿Realmente quiere reemplazar todos los nombres de\n"
 "atributos con los valores por defecto?"
 
-#: src/addrcustomattr.c:212 src/addressbook.c:435 src/addressbook.c:463
-#: src/addressbook.c:480 src/edittags.c:272
-#: src/plugins/archive/archiver_gtk.c:1182 src/prefs_actions.c:1090
+#: src/addrcustomattr.c:212 src/addressbook.c:438 src/addressbook.c:466
+#: src/addressbook.c:483 src/edittags.c:272
+#: src/plugins/archive/archiver_gtk.c:1186 src/prefs_actions.c:1090
 #: src/prefs_filtering.c:1693 src/prefs_template.c:1119
 msgid "_Delete"
 msgstr "_Borrar"
@@ -364,11 +364,11 @@ msgstr "Dirección"
 msgid "Address book path"
 msgstr "Ruta a la agenda de direcciones"
 
-#: src/addrduplicates.c:793 src/addressbook.c:1433 src/addressbook.c:1486
+#: src/addrduplicates.c:793 src/addressbook.c:1438 src/addressbook.c:1491
 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 
-#: src/addrduplicates.c:794 src/addressbook.c:1487
+#: src/addrduplicates.c:794 src/addressbook.c:1492
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
@@ -376,7 +376,7 @@ msgstr "¿Borrar realmente la(s) dirección(es)?"
 msgid "Delete address"
 msgstr "Borrar dirección"
 
-#: src/addrduplicates.c:843 src/addressbook.c:1434
+#: src/addrduplicates.c:843 src/addressbook.c:1439
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Esta dirección es solo de lectura y no se puede borrar."
 
@@ -388,8 +388,8 @@ msgstr "Añadir a la agenda"
 msgid "Contact"
 msgstr "Contacto"
 
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1055
-#: src/editaddress.c:1130 src/editgroup.c:290
+#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1057
+#: src/editaddress.c:1132 src/editgroup.c:290
 msgid "Remarks"
 msgstr "Notas"
 
@@ -397,7 +397,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressadd.c:535 src/addressbook.c:3209 src/addressbook.c:3260
+#: src/addressadd.c:535 src/addressbook.c:3217 src/addressbook.c:3268
 msgid "Add address(es)"
 msgstr "Añadir dirección(es)"
 
@@ -405,262 +405,263 @@ msgstr "Añadir dirección(es)"
 msgid "Can't add the specified address"
 msgstr "No se puede añadir la dirección especificada"
 
-#: src/addressbook.c:126 src/addressbook.c:4861 src/editaddress.c:1052
-#: src/editaddress.c:1113 src/editgroup.c:289 src/expldifdlg.c:518
-#: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:763
+#: src/addressbook.c:126 src/addressbook.c:4935 src/editaddress.c:1054
+#: src/editaddress.c:1115 src/editgroup.c:289 src/expldifdlg.c:517
+#: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:762
 msgid "Email Address"
 msgstr "Dirección de correo"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "_Book"
 msgstr "_Agenda"
 
-#: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
-#: src/addressbook.c:479 src/compose.c:581 src/mainwindow.c:508
+#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
 #: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/addressbook.c:404 src/compose.c:586 src/mainwindow.c:511
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
 #: src/messageview.c:213
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: src/addressbook.c:405 src/compose.c:587 src/mainwindow.c:513
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
 #: src/messageview.c:214
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: src/addressbook.c:408 src/addressbook.c:465
+#: src/addressbook.c:411 src/addressbook.c:468
 msgid "New _Book"
 msgstr "Nueva _agenda"
 
-#: src/addressbook.c:409 src/addressbook.c:466
+#: src/addressbook.c:412 src/addressbook.c:469
 msgid "New _Folder"
 msgstr "Nueva _carpeta"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:413
 msgid "New _vCard"
 msgstr "Nueva _vCard"
 
-#: src/addressbook.c:414
+#: src/addressbook.c:417
 msgid "New _JPilot"
 msgstr "Nuevo _JPilot"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "New LDAP _Server"
 msgstr "Nuevo servidor LDAP"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:424
 msgid "_Edit book"
 msgstr "_Editar agenda"
 
-#: src/addressbook.c:422
+#: src/addressbook.c:425
 msgid "_Delete book"
 msgstr "_Borrar agenda"
 
-#: src/addressbook.c:424 src/compose.c:598
+#: src/addressbook.c:427 src/compose.c:604
 #: src/plugins/managesieve/sieve_editor.c:85
+#: src/plugins/managesieve/sieve_editor.c:433
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Save"
 msgstr "_Guardar..."
 
-#: src/addressbook.c:425 src/compose.c:602 src/messageview.c:223
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:227
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr "_Seleccionar todo"
 
-#: src/addressbook.c:430 src/addressbook.c:469 src/addressbook.c:485
+#: src/addressbook.c:433 src/addressbook.c:472 src/addressbook.c:488
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:610 src/mainwindow.c:542 src/messageview.c:226
+#: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
+#: src/compose.c:617 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/addressbook.c:437 src/addressbook.c:482
+#: src/addressbook.c:440 src/addressbook.c:485
 msgid "New _Address"
 msgstr "Nueva _dirección"
 
-#: src/addressbook.c:438 src/addressbook.c:467 src/addressbook.c:483
+#: src/addressbook.c:441 src/addressbook.c:470 src/addressbook.c:486
 msgid "New _Group"
 msgstr "Nuevo _grupo"
 
-#: src/addressbook.c:440 src/addressbook.c:489
+#: src/addressbook.c:443 src/addressbook.c:492
 msgid "_Mail To"
 msgstr "_Correo para"
 
-#: src/addressbook.c:444
+#: src/addressbook.c:447
 msgid "Import _LDIF file..."
 msgstr "Importar fichero _LDIF..."
 
-#: src/addressbook.c:445
+#: src/addressbook.c:448
 msgid "Import M_utt file..."
 msgstr "Importar fichero M_utt..."
 
-#: src/addressbook.c:446
+#: src/addressbook.c:449
 msgid "Import _Pine file..."
 msgstr "Importar fichero _Pine..."
 
-#: src/addressbook.c:448
+#: src/addressbook.c:451
 msgid "Export _HTML..."
 msgstr "Exportar _HTML..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:452
 msgid "Export LDI_F..."
 msgstr "Exportar LDI_F..."
 
-#: src/addressbook.c:451
+#: src/addressbook.c:454
 msgid "Find duplicates..."
 msgstr "Buscar duplicados..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:455
 msgid "Edit custom attributes..."
 msgstr "Editar atributos de usuario..."
 
-#: src/addressbook.c:455 src/compose.c:690 src/mainwindow.c:806
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
 #: src/messageview.c:339
 msgid "_About"
 msgstr "_Acerca de"
 
-#: src/addressbook.c:491
+#: src/addressbook.c:494
 msgid "_Browse Entry"
 msgstr "_Ver entrada"
 
-#: src/addressbook.c:504 src/crash.c:457 src/crash.c:476 src/importldif.c:115
-#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:140
-#: src/plugins/pgpcore/sgpgme.c:168 src/plugins/vcalendar/day-view.c:402
+#: src/addressbook.c:507 src/crash.c:456 src/crash.c:475 src/importldif.c:114
+#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:139
+#: src/plugins/pgpcore/sgpgme.c:167 src/plugins/vcalendar/day-view.c:402
 #: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:683
 #: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:122
+#: src/addressbook.c:514 src/addressbook.c:533 src/importldif.c:121
 msgid "Success"
 msgstr "Éxito"
 
-#: src/addressbook.c:512 src/importldif.c:123
+#: src/addressbook.c:515 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Argumentos incorrectos"
 
-#: src/addressbook.c:513 src/importldif.c:124
+#: src/addressbook.c:516 src/importldif.c:123
 msgid "File not specified"
 msgstr "No se especificó el fichero"
 
-#: src/addressbook.c:514 src/importldif.c:125
+#: src/addressbook.c:517 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Error abriendo el fichero"
 
-#: src/addressbook.c:515 src/importldif.c:126
+#: src/addressbook.c:518 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Error leyendo el fichero"
 
-#: src/addressbook.c:516 src/importldif.c:127
+#: src/addressbook.c:519 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Encontrado final del fichero"
 
-#: src/addressbook.c:517 src/importldif.c:128
+#: src/addressbook.c:520 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Error reservando memoria"
 
-#: src/addressbook.c:518 src/importldif.c:129
+#: src/addressbook.c:521 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Formato de fichero erróneo"
 
-#: src/addressbook.c:519 src/importldif.c:130
+#: src/addressbook.c:522 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Error escribiendo en el fichero"
 
-#: src/addressbook.c:520 src/importldif.c:131
+#: src/addressbook.c:523 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Error abriendo el directorio"
 
-#: src/addressbook.c:521 src/importldif.c:132
+#: src/addressbook.c:524 src/importldif.c:131
 msgid "No path specified"
 msgstr "No se especificó una ruta"
 
-#: src/addressbook.c:531
+#: src/addressbook.c:534
 msgid "Error connecting to LDAP server"
 msgstr "Error conectando al servidor LDAP"
 
-#: src/addressbook.c:532
+#: src/addressbook.c:535
 msgid "Error initializing LDAP"
 msgstr "Error inicializando LDAP"
 
-#: src/addressbook.c:533
+#: src/addressbook.c:536
 msgid "Error binding to LDAP server"
 msgstr "Error enlazando con el servidor LDAP"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:537
 msgid "Error searching LDAP database"
 msgstr "Error buscando en la base de datos LDAP"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:538
 msgid "Timeout performing LDAP operation"
 msgstr "Fuera de tiempo en la operación LDAP"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:539
 msgid "Error in LDAP search criteria"
 msgstr "Error en el criterio de búsqueda LDAP"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:540
 msgid "No LDAP entries found for search criteria"
 msgstr "No se encontraron entradas LDAP para el criterio de búsqueda"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:541
 msgid "LDAP search terminated on request"
 msgstr "Se solicitó concluir la búsqueda LDAP"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:542
 msgid "Error starting TLS connection"
 msgstr "Error iniciando la conexión TLS"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:543
 msgid "Distinguished Name (dn) is missing"
 msgstr "Falta el nombre distinguido (dn)"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:544
 msgid "Missing required information"
 msgstr "Falta la información necesaria"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:545
 msgid "Another contact exists with that key"
 msgstr "Ya existe un contacto con esa clave"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:546
 msgid "Strong(er) authentication required"
 msgstr "Se necesita autenticación (más) fuerte"
 
-#: src/addressbook.c:910
+#: src/addressbook.c:913
 msgid "Sources"
 msgstr "Fuentes"
 
-#: src/addressbook.c:914 src/prefs_matcher.c:632 src/prefs_other.c:475
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:1109
-msgid "Lookup name:"
-msgstr "Buscar nombre:"
+#: src/addressbook.c:1112 src/editldap.c:779
+msgid "Search"
+msgstr "Buscar"
 
-#: src/addressbook.c:1478
+#: src/addressbook.c:1483
 msgid "Delete group"
 msgstr "Borrar grupo"
 
-#: src/addressbook.c:1479
+#: src/addressbook.c:1484
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -668,26 +669,26 @@ msgstr ""
 "¿Quiere borrar el(los) grupo(s)?\n"
 "Las direcciones que contienen no se perderán."
 
-#: src/addressbook.c:2190
+#: src/addressbook.c:2195
 msgid "Cannot paste. Target address book is readonly."
 msgstr "No puedo pegar. El libro de direcciones destino es solo de lectura."
 
-#: src/addressbook.c:2200
+#: src/addressbook.c:2205
 msgid "Cannot paste into an address group."
 msgstr "No se puede pegar dentro de un grupo de direcciones."
 
-#: src/addressbook.c:2906
+#: src/addressbook.c:2914
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "¿Quiere borrar los resultados de la búsqueda y direcciones en «%s»?"
 
-#: src/addressbook.c:2909 src/addressbook.c:2935 src/addressbook.c:2942
+#: src/addressbook.c:2917 src/addressbook.c:2943 src/addressbook.c:2950
 #: src/plugins/archive/archiver_prefs.c:329 src/prefs_filtering_action.c:177
 #: src/toolbar.c:415
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:2918
+#: src/addressbook.c:2926
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -696,21 +697,21 @@ msgstr ""
 "¿Quiere borrar «%s»? Si borra sólo la carpeta las direcciones que contenga "
 "se moverán a la carpeta padre."
 
-#: src/addressbook.c:2921 src/imap_gtk.c:363 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:333 src/plugins/rssyl/rssyl_cb_menu.c:157
-#: src/plugins/vcalendar/vcal_folder.c:1968
+#: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
+#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:2922
-msgid "+Delete _folder only"
-msgstr "+Borrar sólo _carpeta"
+#: src/addressbook.c:2930
+msgid "Delete _folder only"
+msgstr "Borrar sólo _carpeta"
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2930
 msgid "Delete folder and _addresses"
 msgstr "Borrar carpeta y _direcciones"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2941
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -719,7 +720,7 @@ msgstr ""
 "¿Quiere borrar «%s»?\n"
 "Las direcciones que contiene no se perderán."
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2948
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -728,28 +729,28 @@ msgstr ""
 "¿Quiere borrar «%s»?\n"
 "Las direcciones que contiene se perderán."
 
-#: src/addressbook.c:3054
+#: src/addressbook.c:3062
 #, c-format
 msgid "Search '%s'"
 msgstr " Buscar «%s»"
 
-#: src/addressbook.c:3192 src/addressbook.c:3241
+#: src/addressbook.c:3200 src/addressbook.c:3249
 msgid "New Contacts"
 msgstr "Nuevos contactos"
 
-#: src/addressbook.c:4022
+#: src/addressbook.c:4088
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se puede guardar el fichero índice."
 
-#: src/addressbook.c:4026
+#: src/addressbook.c:4092
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pueden guardar los ficheros de direcciones"
 
-#: src/addressbook.c:4036
+#: src/addressbook.c:4102
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:4041
+#: src/addressbook.c:4107
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -757,7 +758,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se puede guardar el nuevo fichero índice."
 
-#: src/addressbook.c:4054
+#: src/addressbook.c:4120
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -765,7 +766,7 @@ msgstr ""
 "No se puede convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:4060
+#: src/addressbook.c:4126
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -773,7 +774,7 @@ msgstr ""
 "No se puede convertir la antigua agenda,\n"
 "no se pudo guardar el fichero índice para la nueva."
 
-#: src/addressbook.c:4065
+#: src/addressbook.c:4131
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -781,53 +782,53 @@ msgstr ""
 "No se puede convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para la nueva."
 
-#: src/addressbook.c:4072 src/addressbook.c:4078
+#: src/addressbook.c:4138 src/addressbook.c:4144
 msgid "Addressbook conversion error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:4192
+#: src/addressbook.c:4258
 msgid "Addressbook Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:4193
+#: src/addressbook.c:4259
 msgid "Could not read address index"
 msgstr "No se puede leer el índice de direcciones"
 
-#: src/addressbook.c:4524
+#: src/addressbook.c:4590
 msgid "Busy searching..."
 msgstr "Buscando..."
 
-#: src/addressbook.c:4825
+#: src/addressbook.c:4899
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:4837 src/addressbook_foldersel.c:182 src/exphtmldlg.c:372
-#: src/expldifdlg.c:389 src/exporthtml.c:984 src/importldif.c:658
+#: src/addressbook.c:4911 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
+#: src/expldifdlg.c:388 src/exporthtml.c:984 src/importldif.c:657
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:4849
+#: src/addressbook.c:4923
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:4885 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2768 src/prefs_folder_column.c:78
+#: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:4897
+#: src/addressbook.c:4971
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4909 src/addressbook.c:4921
+#: src/addressbook.c:4983 src/addressbook.c:4995
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4933
+#: src/addressbook.c:5007
 msgid "LDAP servers"
 msgstr "Servidores LDAP"
 
-#: src/addressbook.c:4945
+#: src/addressbook.c:5019
 msgid "LDAP Query"
 msgstr "Petición LDAP"
 
@@ -839,12 +840,12 @@ msgstr "Petición LDAP"
 #: src/plugins/bsfilter/bsfilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:326
 #: src/plugins/spamassassin/spamassassin.c:117
-#: src/plugins/spamassassin/spamassassin_gtk.c:443
-#: src/plugins/spamassassin/spamassassin_gtk.c:490
-#: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:675
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1619 src/prefs_matcher.c:1626
-#: src/prefs_matcher.c:1634 src/prefs_matcher.c:1636 src/prefs_matcher.c:2524
-#: src/prefs_matcher.c:2528
+#: src/plugins/spamassassin/spamassassin_gtk.c:442
+#: src/plugins/spamassassin/spamassassin_gtk.c:489
+#: src/plugins/spamassassin/spamassassin_gtk.c:612 src/prefs_matcher.c:675
+#: src/prefs_matcher.c:710 src/prefs_matcher.c:1618 src/prefs_matcher.c:1625
+#: src/prefs_matcher.c:1633 src/prefs_matcher.c:1635 src/prefs_matcher.c:2519
+#: src/prefs_matcher.c:2523
 msgid "Any"
 msgstr "Cualquiera"
 
@@ -909,8 +910,8 @@ msgstr "N.º direcciones"
 msgid "Header Fields"
 msgstr "Campos cabecera"
 
-#: src/addrgather.c:562 src/exphtmldlg.c:659 src/expldifdlg.c:723
-#: src/importldif.c:1023
+#: src/addrgather.c:562 src/exphtmldlg.c:658 src/expldifdlg.c:722
+#: src/importldif.c:1022
 msgid "Finish"
 msgstr "Finalizar"
 
@@ -947,20 +948,20 @@ msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Falló la actualización. No se escribieron los cambios en el directorio."
 
-#: src/alertpanel.c:146 src/compose.c:9406
+#: src/alertpanel.c:146 src/compose.c:9473
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6196
-#: src/compose.c:11778 src/file_checker.c:78 src/file_checker.c:100
+#: src/alertpanel.c:159 src/compose.c:5680 src/compose.c:6203
+#: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
 #: src/messageview.c:855 src/messageview.c:868
-#: src/plugins/pgpcore/sgpgme.c:747 src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4886
+#: src/plugins/pgpcore/sgpgme.c:746 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4892
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5615 src/inc.c:669
-#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:280
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5621 src/inc.c:669
+#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
 msgid "Error"
 msgstr "Error"
 
@@ -992,66 +993,66 @@ msgstr "Nombre LDAP"
 msgid "Attribute Value"
 msgstr "Valor del atributo"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr "Nada"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr "un visor"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr "un parser MIME"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr "carpetas"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr "filtrado"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr "un interfaz de privacidad"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr "un notificador"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr "una utilidad"
 
-#: src/common/plugin.c:73
+#: src/common/plugin.c:71
 msgid "things"
 msgstr "cosas"
 
-#: src/common/plugin.c:334
+#: src/common/plugin.c:332
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 "Este módulo proporciona %s (%s), que ya está proporcionado por el módulo %s."
 
-#: src/common/plugin.c:436
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr "El módulo ya está cargado"
 
-#: src/common/plugin.c:447
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "Falló la petición de memoria para el Módulo"
 
-#: src/common/plugin.c:481
+#: src/common/plugin.c:479
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr "Este módulo no está bajo licencia compatible con GPL v3 o posterior."
 
-#: src/common/plugin.c:490
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr "Este módulo es para la versión GTK1 de Claws Mail."
 
-#: src/common/plugin.c:772
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1060,7 +1061,7 @@ msgstr ""
 "Su versión de Claws Mail es más moderna que la versión con la que se "
 "construyó el módulo «%s»"
 
-#: src/common/plugin.c:775
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1068,12 +1069,12 @@ msgstr ""
 "Su versión de Claws Mail es más moderna que la versión con la que se "
 "construyó el módulo."
 
-#: src/common/plugin.c:784
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Su versión de Claws Mail es demasiado antigua para el módulo «%s»."
 
-#: src/common/plugin.c:786
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Su versión de Claws Mail es demasiado antigua para el módulo."
 
@@ -1219,585 +1220,585 @@ msgstr "Falta el fichero de certificado P12 %s (%s)\n"
 msgid "<not in certificate>"
 msgstr "<no en el certificado>"
 
-#: src/common/string_match.c:83
+#: src/common/string_match.c:81
 msgid "(Subject cleared by RegExp)"
 msgstr "(Asunto vacío por expr. reg.)"
 
-#: src/common/utils.c:255
+#: src/common/utils.c:257
 #, c-format
 msgid "%dB"
 msgstr "%d B"
 
-#: src/common/utils.c:256
+#: src/common/utils.c:258
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02d kB"
 
-#: src/common/utils.c:257
+#: src/common/utils.c:259
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02d MB"
 
-#: src/common/utils.c:258
+#: src/common/utils.c:260
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2f GB"
 
-#: src/common/utils.c:4878
+#: src/common/utils.c:4806
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/common/utils.c:4879
+#: src/common/utils.c:4807
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Lunes"
 
-#: src/common/utils.c:4880
+#: src/common/utils.c:4808
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Martes"
 
-#: src/common/utils.c:4881
+#: src/common/utils.c:4809
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: src/common/utils.c:4882
+#: src/common/utils.c:4810
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Jueves"
 
-#: src/common/utils.c:4883
+#: src/common/utils.c:4811
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Viernes"
 
-#: src/common/utils.c:4884
+#: src/common/utils.c:4812
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/common/utils.c:4886
+#: src/common/utils.c:4814
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Enero"
 
-#: src/common/utils.c:4887
+#: src/common/utils.c:4815
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Febrero"
 
-#: src/common/utils.c:4888
+#: src/common/utils.c:4816
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marzo"
 
-#: src/common/utils.c:4889
+#: src/common/utils.c:4817
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Abril"
 
-#: src/common/utils.c:4890
+#: src/common/utils.c:4818
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mayo"
 
-#: src/common/utils.c:4891
+#: src/common/utils.c:4819
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Junio"
 
-#: src/common/utils.c:4892
+#: src/common/utils.c:4820
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Julio"
 
-#: src/common/utils.c:4893
+#: src/common/utils.c:4821
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Agosto"
 
-#: src/common/utils.c:4894
+#: src/common/utils.c:4822
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Septiembre"
 
-#: src/common/utils.c:4895
+#: src/common/utils.c:4823
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octubre"
 
-#: src/common/utils.c:4896
+#: src/common/utils.c:4824
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Noviembre"
 
-#: src/common/utils.c:4897
+#: src/common/utils.c:4825
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Diciembre"
 
-#: src/common/utils.c:4899
+#: src/common/utils.c:4827
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dom"
 
-#: src/common/utils.c:4900
+#: src/common/utils.c:4828
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Lun"
 
-#: src/common/utils.c:4901
+#: src/common/utils.c:4829
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Mar"
 
-#: src/common/utils.c:4902
+#: src/common/utils.c:4830
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mié"
 
-#: src/common/utils.c:4903
+#: src/common/utils.c:4831
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Jue"
 
-#: src/common/utils.c:4904
+#: src/common/utils.c:4832
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Vie"
 
-#: src/common/utils.c:4905
+#: src/common/utils.c:4833
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sáb"
 
-#: src/common/utils.c:4907
+#: src/common/utils.c:4835
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Ene"
 
-#: src/common/utils.c:4908
+#: src/common/utils.c:4836
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:4909
+#: src/common/utils.c:4837
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4910
+#: src/common/utils.c:4838
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Abr"
 
-#: src/common/utils.c:4911
+#: src/common/utils.c:4839
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "May"
 
-#: src/common/utils.c:4912
+#: src/common/utils.c:4840
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4913
+#: src/common/utils.c:4841
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:4914
+#: src/common/utils.c:4842
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ago"
 
-#: src/common/utils.c:4915
+#: src/common/utils.c:4843
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4916
+#: src/common/utils.c:4844
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Oct"
 
-#: src/common/utils.c:4917
+#: src/common/utils.c:4845
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4918
+#: src/common/utils.c:4846
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dic"
 
-#: src/common/utils.c:4929
+#: src/common/utils.c:4857
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4930
+#: src/common/utils.c:4858
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4931
+#: src/common/utils.c:4859
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4932
+#: src/common/utils.c:4860
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/compose.c:570
+#: src/compose.c:576
 msgid "_Add..."
 msgstr "_Añadir..."
 
-#: src/compose.c:571 src/mh_gtk.c:369 src/plugins/mailmbox/plugin_gtk.c:302
-#: src/plugins/rssyl/rssyl_cb_menu.c:320
+#: src/compose.c:577 src/mh_gtk.c:368 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/plugins/rssyl/rssyl_cb_menu.c:318
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: src/compose.c:573 src/folderview.c:241
+#: src/compose.c:579 src/folderview.c:241
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: src/compose.c:580 src/mainwindow.c:510 src/messageview.c:212
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: src/compose.c:583
+#: src/compose.c:589
 msgid "_Spelling"
 msgstr "_Ortografía"
 
-#: src/compose.c:585 src/compose.c:652
+#: src/compose.c:591 src/compose.c:658
 msgid "_Options"
 msgstr "_Opciones"
 
-#: src/compose.c:589
+#: src/compose.c:595
 msgid "S_end"
 msgstr "_Enviar"
 
-#: src/compose.c:590
+#: src/compose.c:596
 msgid "Send _later"
 msgstr "Enviar _después"
 
-#: src/compose.c:593
+#: src/compose.c:599
 msgid "_Attach file"
 msgstr "_Adjuntar fichero"
 
-#: src/compose.c:594
+#: src/compose.c:600
 msgid "_Insert file"
 msgstr "_Insertar fichero"
 
-#: src/compose.c:595
+#: src/compose.c:601
 msgid "Insert si_gnature"
 msgstr "Insertar _firma"
 
-#: src/compose.c:596
+#: src/compose.c:602
 msgid "_Replace signature"
 msgstr "_Reemplazar firma"
 
-#: src/compose.c:600
+#: src/compose.c:606
 msgid "_Print"
 msgstr "I_mprimir"
 
-#: src/compose.c:605 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Deshacer"
 
-#: src/compose.c:606 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:612 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Rehacer"
 
-#: src/compose.c:609 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:615 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/compose.c:613
+#: src/compose.c:619
 msgid "_Special paste"
 msgstr "Pegar e_special"
 
-#: src/compose.c:614
+#: src/compose.c:620
 msgid "As _quotation"
 msgstr "Como _citación"
 
-#: src/compose.c:615
+#: src/compose.c:621
 msgid "_Wrapped"
 msgstr "_Recortado"
 
-#: src/compose.c:616
+#: src/compose.c:622
 msgid "_Unwrapped"
 msgstr "_Sin recortar"
 
-#: src/compose.c:618 src/mainwindow.c:543
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Seleccionar todo"
 
-#: src/compose.c:620
+#: src/compose.c:626
 msgid "A_dvanced"
 msgstr "Avanza_das"
 
-#: src/compose.c:621
+#: src/compose.c:627
 msgid "Move a character backward"
 msgstr "Ir al carácter anterior"
 
-#: src/compose.c:622
+#: src/compose.c:628
 msgid "Move a character forward"
 msgstr "Ir al carácter siguiente"
 
-#: src/compose.c:623
+#: src/compose.c:629
 msgid "Move a word backward"
 msgstr "Ir a la palabra anterior"
 
-#: src/compose.c:624
+#: src/compose.c:630
 msgid "Move a word forward"
 msgstr "Ir a la palabra siguiente"
 
-#: src/compose.c:625
+#: src/compose.c:631
 msgid "Move to beginning of line"
 msgstr "Ir al principio de la línea"
 
-#: src/compose.c:626
+#: src/compose.c:632
 msgid "Move to end of line"
 msgstr "Ir al final de la línea"
 
-#: src/compose.c:627
+#: src/compose.c:633
 msgid "Move to previous line"
 msgstr "Ir a la línea anterior"
 
-#: src/compose.c:628
+#: src/compose.c:634
 msgid "Move to next line"
 msgstr "Ir a la línea siguiente"
 
-#: src/compose.c:629
+#: src/compose.c:635
 msgid "Delete a character backward"
 msgstr "Borrar el carácter anterior"
 
-#: src/compose.c:630
+#: src/compose.c:636
 msgid "Delete a character forward"
 msgstr "Borrar el carácter siguiente"
 
-#: src/compose.c:631
+#: src/compose.c:637
 msgid "Delete a word backward"
 msgstr "Borrar la palabra anterior"
 
-#: src/compose.c:632
+#: src/compose.c:638
 msgid "Delete a word forward"
 msgstr "Borrar la palabra siguiente"
 
-#: src/compose.c:633
+#: src/compose.c:639
 msgid "Delete line"
 msgstr "Borrar línea"
 
-#: src/compose.c:634
+#: src/compose.c:640
 msgid "Delete to end of line"
 msgstr "Borrar hasta el final de la línea"
 
-#: src/compose.c:637 src/messageview.c:229
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Buscar"
 
-#: src/compose.c:640
+#: src/compose.c:646
 msgid "_Wrap current paragraph"
 msgstr "_Recortar el párrafo actual"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "Wrap all long _lines"
 msgstr "Recortar todas las líneas largas"
 
-#: src/compose.c:643
+#: src/compose.c:649
 msgid "Edit with e_xternal editor"
 msgstr "Editar con un editor e_xterno"
 
-#: src/compose.c:646
+#: src/compose.c:652
 msgid "_Check all or check selection"
 msgstr "_Comprobar todo o la selección"
 
-#: src/compose.c:647
+#: src/compose.c:653
 msgid "_Highlight all misspelled words"
 msgstr "_Resaltar todas las faltas ortográficas"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "Check _backwards misspelled word"
 msgstr "Comprobar faltas hacia _atrás"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "_Forward to next misspelled word"
 msgstr "Avanzar hasta la siguiente _falta"
 
-#: src/compose.c:657
+#: src/compose.c:663
 msgid "Reply _mode"
 msgstr "_Modo de respuesta"
 
-#: src/compose.c:659
+#: src/compose.c:665
 msgid "Privacy _System"
 msgstr "_Sistema de privacidad"
 
-#: src/compose.c:664
+#: src/compose.c:670
 msgid "_Priority"
 msgstr "_Prioridad"
 
-#: src/compose.c:666 src/mainwindow.c:606 src/messageview.c:265
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "Codificación de caract_eres"
 
-#: src/compose.c:671 src/mainwindow.c:611 src/messageview.c:270
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr "Europeo Occidental"
 
-#: src/compose.c:672 src/mainwindow.c:612 src/messageview.c:271
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr "Báltico"
 
-#: src/compose.c:673 src/mainwindow.c:613 src/messageview.c:272
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: src/compose.c:674 src/mainwindow.c:614 src/messageview.c:273
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr "Árabe"
 
-#: src/compose.c:675 src/mainwindow.c:615 src/messageview.c:274
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: src/compose.c:676 src/mainwindow.c:616 src/messageview.c:275
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr "Japonés"
 
-#: src/compose.c:677 src/mainwindow.c:617 src/messageview.c:276
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr "Chino"
 
-#: src/compose.c:678 src/mainwindow.c:618 src/messageview.c:277
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/compose.c:679 src/mainwindow.c:619 src/messageview.c:278
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr "Tailandés"
 
-#: src/compose.c:682 src/mainwindow.c:728 src/messageview.c:314
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "_Agenda de direcciones"
 
-#: src/compose.c:684
+#: src/compose.c:690
 msgid "_Template"
 msgstr "Plan_tilla"
 
-#: src/compose.c:686 src/mainwindow.c:756 src/messageview.c:335
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "Accio_nes"
 
-#: src/compose.c:695
+#: src/compose.c:701
 msgid "Aut_o wrapping"
 msgstr "Aut_o-recorte"
 
-#: src/compose.c:696
+#: src/compose.c:702
 msgid "Auto _indent"
 msgstr "Auto-_sangrado"
 
-#: src/compose.c:697
+#: src/compose.c:703
 msgid "Si_gn"
 msgstr "Fir_mar"
 
-#: src/compose.c:698
+#: src/compose.c:704
 msgid "_Encrypt"
 msgstr "_Cifrado"
 
-#: src/compose.c:699
+#: src/compose.c:705
 msgid "_Request Return Receipt"
 msgstr "Solicitar acuse de _recibo"
 
-#: src/compose.c:700
+#: src/compose.c:706
 msgid "Remo_ve references"
 msgstr "Eliminar re_ferencias"
 
-#: src/compose.c:701
+#: src/compose.c:707
 msgid "Show _ruler"
 msgstr "Mostrar _regleta"
 
-#: src/compose.c:706 src/compose.c:716
+#: src/compose.c:712 src/compose.c:722
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:707 src/mainwindow.c:660 src/messageview.c:303
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr "_Todo"
 
-#: src/compose.c:708 src/mainwindow.c:661 src/messageview.c:304
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "_Remitente"
 
-#: src/compose.c:709
+#: src/compose.c:715
 msgid "_Mailing-list"
 msgstr "_Lista-Correo"
 
-#: src/compose.c:714
+#: src/compose.c:720
 msgid "_Highest"
 msgstr "_Muy alta"
 
-#: src/compose.c:715
+#: src/compose.c:721
 msgid "Hi_gh"
 msgstr "_Alta"
 
-#: src/compose.c:717
+#: src/compose.c:723
 msgid "Lo_w"
 msgstr "_Baja"
 
-#: src/compose.c:718
+#: src/compose.c:724
 msgid "_Lowest"
 msgstr "M_uy baja"
 
-#: src/compose.c:723 src/mainwindow.c:871 src/messageview.c:352
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automático"
 
-#: src/compose.c:724 src/mainwindow.c:872 src/messageview.c:353
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:725 src/mainwindow.c:873 src/messageview.c:354
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:729 src/mainwindow.c:877 src/messageview.c:358
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:732 src/mainwindow.c:880 src/messageview.c:361
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Griego (ISO-8859-_7)"
 
-#: src/compose.c:737 src/mainwindow.c:885 src/messageview.c:366
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turco (ISO-8859-_9)"
 
-#: src/compose.c:1066
+#: src/compose.c:1072
 msgid "New message From format error."
 msgstr "Error de formato en el Desde del mensaje nuevo."
 
-#: src/compose.c:1158
+#: src/compose.c:1164
 msgid "New message subject format error."
 msgstr "Error de formato en el asunto del mensaje nuevo."
 
-#: src/compose.c:1189 src/quote_fmt.c:569
+#: src/compose.c:1195 src/quote_fmt.c:569
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Componer» en la línea %d."
 
-#: src/compose.c:1450
+#: src/compose.c:1456
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "No se puede responder. El correo original probablemente no existe."
 
-#: src/compose.c:1633 src/quote_fmt.c:586
+#: src/compose.c:1639 src/quote_fmt.c:586
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
@@ -1805,12 +1806,12 @@ msgstr ""
 "El campo «Desde» de la plantilla «Responder» contiene una dirección de "
 "correo inválida."
 
-#: src/compose.c:1681 src/quote_fmt.c:589
+#: src/compose.c:1687 src/quote_fmt.c:589
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Responder» en la línea %d."
 
-#: src/compose.c:1817 src/compose.c:2009 src/quote_fmt.c:606
+#: src/compose.c:1823 src/compose.c:2015 src/quote_fmt.c:606
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1818,55 +1819,55 @@ msgstr ""
 "El campo «Desde» de la plantilla «Reenviar» contiene una dirección de correo "
 "inválida."
 
-#: src/compose.c:1877 src/quote_fmt.c:609
+#: src/compose.c:1883 src/quote_fmt.c:609
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Reenviar» en la línea %d."
 
-#: src/compose.c:2051
+#: src/compose.c:2057
 msgid "Fw: multiple emails"
 msgstr "Rv: múltiples correos"
 
-#: src/compose.c:2531
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Redirigir» en la línea %d."
 
-#: src/compose.c:2598 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2601 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2604 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Responder a:"
 
-#: src/compose.c:2607 src/compose.c:4929 src/compose.c:4931
+#: src/compose.c:2613 src/compose.c:4935 src/compose.c:4937
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Grupos de noticias:"
 
-#: src/compose.c:2610 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Enviar a:"
 
-#: src/compose.c:2613 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "En-Respuesta-A:"
 
-#: src/compose.c:2617 src/compose.c:4926 src/compose.c:4934
+#: src/compose.c:2623 src/compose.c:4932 src/compose.c:4940
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "Para:"
 
-#: src/compose.c:2826
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "No se pudo adjuntar un fichero (falló la conversión de caracteres)."
 
-#: src/compose.c:2832
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1881,16 +1882,16 @@ msgstr[1] ""
 "Se han adjuntado los siguientes ficheros: \n"
 "%s"
 
-#: src/compose.c:3105
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "La «marca de cita» de la plantilla no es válida."
 
-#: src/compose.c:3596
+#: src/compose.c:3602
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "No se puede obtener el tamaño del fichero «%s»."
 
-#: src/compose.c:3607
+#: src/compose.c:3613
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1899,57 +1900,57 @@ msgstr ""
 "Está a punto de insertar un fichero de %s en el cuerpo del mensaje. ¿Está "
 "seguro de que desea hacerlo?"
 
-#: src/compose.c:3610
+#: src/compose.c:3616
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
-#: src/compose.c:3611 src/compose.c:11260
-msgid "+_Insert"
-msgstr "+_Insertar"
+#: src/compose.c:3617 src/compose.c:10529 src/compose.c:11390
+msgid "_Insert"
+msgstr "_Insertar"
 
-#: src/compose.c:3735
+#: src/compose.c:3741
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:3736
+#: src/compose.c:3742
 msgid "Empty file"
 msgstr "Fichero vacío"
 
-#: src/compose.c:3737
-msgid "+_Attach anyway"
-msgstr "+_Adjuntar igualmente"
+#: src/compose.c:3743
+msgid "_Attach anyway"
+msgstr "_Adjuntar igualmente"
 
-#: src/compose.c:3746
+#: src/compose.c:3752
 #, c-format
 msgid "Can't read %s."
 msgstr "No puedo leer %s."
 
-#: src/compose.c:3773
+#: src/compose.c:3779
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:4766 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4772 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:4773 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4779 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 
-#: src/compose.c:4776 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4782 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sin asunto] - Componer mensaje%s"
 
-#: src/compose.c:4778 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4784 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Componer un mensaje nuevo"
 
-#: src/compose.c:4805 src/messageview.c:890
+#: src/compose.c:4811 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1957,55 +1958,55 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
-#: src/compose.c:5025 src/compose.c:5057 src/compose.c:5099
-#: src/plugins/attachwarner/attachwarner.c:217 src/prefs_account.c:3269
-#: src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5031 src/compose.c:5063 src/compose.c:5105
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:5026
+#: src/compose.c:5032
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 "El único destinatario es la dirección CC por omisión. ¿Enviar de todas "
 "formas?"
 
-#: src/compose.c:5027 src/compose.c:5059 src/compose.c:5092 src/compose.c:5615
-#: src/plugins/attachwarner/attachwarner.c:209
-msgid "+_Send"
-msgstr "+_Enviar"
+#: src/compose.c:5033 src/compose.c:5065 src/compose.c:5098 src/compose.c:5622
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
+#: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
+msgid "_Send"
+msgstr "_Enviar"
 
-#: src/compose.c:5058
+#: src/compose.c:5064
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 "El único destinatario es la dirección BCC por omisión. ¿Enviar de todas "
 "formas?"
 
-#: src/compose.c:5075
+#: src/compose.c:5081
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:5094 src/plugins/attachwarner/attachwarner.c:211
-msgid "+_Queue"
-msgstr "+_A la cola"
+#: src/compose.c:5100 src/plugins/attachwarner/attachwarner.c:212
+msgid "_Queue"
+msgstr "_A la cola"
 
-#: src/compose.c:5095
+#: src/compose.c:5101
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "El asunto esta vacío. %s"
 
-#: src/compose.c:5096
+#: src/compose.c:5102 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "¿Enviarlo igualmente?"
 
-#: src/compose.c:5097
+#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "¿Ponerlo en la cola igualmente?"
 
-#: src/compose.c:5099 src/toolbar.c:425
+#: src/compose.c:5105 src/toolbar.c:425
 msgid "Send later"
 msgstr "Enviar después"
 
-#: src/compose.c:5152 src/compose.c:9864
+#: src/compose.c:5158 src/compose.c:9993
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2015,7 +2016,7 @@ msgstr ""
 "\n"
 "Falló la conversión del conjunto caracteres."
 
-#: src/compose.c:5155 src/compose.c:9867
+#: src/compose.c:5161 src/compose.c:9996
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2025,7 +2026,7 @@ msgstr ""
 "\n"
 "No se pudo obtener la clave de cifrado del destinatario."
 
-#: src/compose.c:5161 src/compose.c:9861
+#: src/compose.c:5167 src/compose.c:9990
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2036,7 +2037,7 @@ msgstr ""
 "\n"
 "Falló la firma: %s"
 
-#: src/compose.c:5164
+#: src/compose.c:5170
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2047,11 +2048,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5166
+#: src/compose.c:5172
 msgid "Could not queue message for sending."
 msgstr "No se puede poner en la cola el mensaje para enviar."
 
-#: src/compose.c:5181 src/compose.c:5241
+#: src/compose.c:5187 src/compose.c:5247
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2059,7 +2060,7 @@ msgstr ""
 "El mensaje está en la cola pero no se pudo enviar.\n"
 "Utilice «Enviar mensaje(s) en cola» en la ventana principal para enviarlo"
 
-#: src/compose.c:5237
+#: src/compose.c:5243
 #, c-format
 msgid ""
 "%s\n"
@@ -2068,7 +2069,7 @@ msgstr ""
 "%s\n"
 "Utilice «Enviar mensaje(s) en cola» en la ventana principal para reintentar."
 
-#: src/compose.c:5612
+#: src/compose.c:5618
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2079,7 +2080,7 @@ msgstr ""
 "al conjunto de caracteres %s especificado.\n"
 "¿Enviarlo como %s?"
 
-#: src/compose.c:5669
+#: src/compose.c:5676
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2092,100 +2093,100 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:5780
+#: src/compose.c:5787
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "No se puede cifrar el correo: %s"
 
-#: src/compose.c:5901
+#: src/compose.c:5908
 msgid "Encryption warning"
 msgstr "Aviso de cifrado"
 
-#: src/compose.c:5902
-msgid "+C_ontinue"
-msgstr "+C_ontinuar"
+#: src/compose.c:5909
+msgid "C_ontinue"
+msgstr "C_ontinuar"
 
-#: src/compose.c:5951
+#: src/compose.c:5958
 msgid "No account for sending mails available!"
 msgstr "¡No hay ninguna cuenta disponible para enviar correos!"
 
-#: src/compose.c:5960
+#: src/compose.c:5967
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "La cuenta seleccionada no es NNTP: es imposible enviar el post."
 
-#: src/compose.c:6195
+#: src/compose.c:6202
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "El adjunto %s ya no existe. ¿Ignorar?"
 
-#: src/compose.c:6196 src/mainwindow.c:651 src/toolbar.c:231
+#: src/compose.c:6203 src/mainwindow.c:651 src/toolbar.c:231
 #: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Cancelar envío"
 
-#: src/compose.c:6196
+#: src/compose.c:6203
 msgid "Ignore attachment"
 msgstr "Ignorar adjunto"
 
-#: src/compose.c:6236
+#: src/compose.c:6243
 #, c-format
 msgid "Original %s part"
 msgstr "Parte original %s"
 
-#: src/compose.c:6818
+#: src/compose.c:6825
 msgid "Add to address _book"
 msgstr "Añadir a la agen_da"
 
-#: src/compose.c:6979
+#: src/compose.c:6986
 msgid "Delete entry contents"
 msgstr "Borrar contenidos de la cuenta"
 
-#: src/compose.c:6983 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6990 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Usar «tab» para autocompletar con la agenda"
 
-#: src/compose.c:7205
+#: src/compose.c:7212
 msgid "Mime type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:7211 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
-#: src/prefs_matcher.c:630 src/prefs_summaries.c:435
-#: src/prefs_summary_column.c:85 src/summaryview.c:445
+#: src/compose.c:7218 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/prefs_matcher.c:630 src/prefs_summaries.c:434
+#: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:7274
+#: src/compose.c:7281
 msgid "Save Message to "
 msgstr "Guardar mensaje en "
 
-#: src/compose.c:7311 src/editjpilot.c:276 src/editldap.c:518
-#: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
-#: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1021
+#: src/compose.c:7318 src/editjpilot.c:276 src/editldap.c:517
+#: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
+#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
 #: src/plugins/clamd/clamav_plugin_gtk.c:299
-#: src/plugins/spamassassin/spamassassin_gtk.c:418
+#: src/plugins/spamassassin/spamassassin_gtk.c:417
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: src/compose.c:7784
+#: src/compose.c:7791
 msgid "Hea_der"
 msgstr "_Cabecera"
 
-#: src/compose.c:7789
+#: src/compose.c:7796
 msgid "_Attachments"
 msgstr "_Adjuntos"
 
-#: src/compose.c:7803
+#: src/compose.c:7810
 msgid "Othe_rs"
 msgstr "Ot_ros"
 
-#: src/compose.c:7818
+#: src/compose.c:7825
 msgid "S_ubject:"
 msgstr "As_unto:"
 
-#: src/compose.c:8041
+#: src/compose.c:8049
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2194,24 +2195,19 @@ msgstr ""
 "No se puede iniciar el corrector ortográfico.\n"
 "%s"
 
-#: src/compose.c:8150
-#, c-format
-msgid "<i>%s</i>"
-msgstr "<i>%s</i>"
-
-#: src/compose.c:8180
+#: src/compose.c:8188
 msgid "_From:"
 msgstr "_Desde:"
 
-#: src/compose.c:8197
+#: src/compose.c:8205
 msgid "Account to use for this email"
 msgstr "Cuenta a usar para este correo"
 
-#: src/compose.c:8199
+#: src/compose.c:8207
 msgid "Sender address to be used"
 msgstr "Dirección del remitente a usar"
 
-#: src/compose.c:8365
+#: src/compose.c:8373
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2220,68 +2216,68 @@ msgstr ""
 "No se ha podido cargar el sistema de privacidad «%s». No será posible firmar "
 "o cifrar este mensaje."
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1073
+#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Ninguno"
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8575 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla en la línea %d."
 
-#: src/compose.c:8683
+#: src/compose.c:8691
 msgid "Template From format error."
 msgstr "Error de formato en el Desde de la plantilla."
 
-#: src/compose.c:8701
+#: src/compose.c:8709
 msgid "Template To format error."
 msgstr "Error de formato en el Para de la plantilla."
 
-#: src/compose.c:8719
+#: src/compose.c:8727
 msgid "Template Cc format error."
 msgstr "Error de formato en el Cc de la plantilla."
 
-#: src/compose.c:8737
+#: src/compose.c:8745
 msgid "Template Bcc format error."
 msgstr "Error de formato en el Bcc de la plantilla."
 
-#: src/compose.c:8755
+#: src/compose.c:8763
 msgid "Template Reply-To format error."
 msgstr "Error de formato en el Reply-To de la plantilla."
 
-#: src/compose.c:8774
+#: src/compose.c:8782
 msgid "Template subject format error."
 msgstr "Error de formato en el asunto de la plantilla."
 
-#: src/compose.c:9043
+#: src/compose.c:9051
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:9058
+#: src/compose.c:9066
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:9132
+#: src/compose.c:9140
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:9149
+#: src/compose.c:9157
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:9190
+#: src/compose.c:9198
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:9210
+#: src/compose.c:9218
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:9211
+#: src/compose.c:9219
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:9403
+#: src/compose.c:9470
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2292,15 +2288,15 @@ msgstr ""
 "¿Desea terminar el proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:9830 src/messageview.c:1097
+#: src/compose.c:9959 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail necesita acceso a la red para poder enviar este correo."
 
-#: src/compose.c:9856
+#: src/compose.c:9985
 msgid "Could not queue message."
 msgstr "El mensaje no se pudo poner en la cola."
 
-#: src/compose.c:9858
+#: src/compose.c:9987
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2311,15 +2307,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10036
+#: src/compose.c:10165
 msgid "Could not save draft."
 msgstr "No se puede guardar el borrador."
 
-#: src/compose.c:10040
+#: src/compose.c:10169
 msgid "Could not save draft"
 msgstr "No se puede guardar el borrador"
 
-#: src/compose.c:10041
+#: src/compose.c:10170
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2327,24 +2323,24 @@ msgstr ""
 "No se ha podido guardar el borrador.\n"
 "¿Desea cancelar la salida o descartar este correo?"
 
-#: src/compose.c:10043
+#: src/compose.c:10172
 msgid "_Cancel exit"
 msgstr "_Cancelar salida"
 
-#: src/compose.c:10043
+#: src/compose.c:10172
 msgid "_Discard email"
 msgstr "_Descartar correo"
 
-#: src/compose.c:10203 src/compose.c:10217
+#: src/compose.c:10332 src/compose.c:10346
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:10231
+#: src/compose.c:10360
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No se puede leer el fichero «%s»."
 
-#: src/compose.c:10233
+#: src/compose.c:10362
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2353,62 +2349,54 @@ msgstr ""
 "El fichero «%s» contenía caracteres inválidos para\n"
 "la codificación actual, la inserción puede ser incorrecta."
 
-#: src/compose.c:10320
+#: src/compose.c:10449
 msgid "Discard message"
 msgstr "Descartar mensaje"
 
-#: src/compose.c:10321
+#: src/compose.c:10450
 msgid "This message has been modified. Discard it?"
 msgstr "Este mensaje se ha modificado. ¿Desea descartarlo?"
 
-#: src/compose.c:10322 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10451 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/compose.c:10322
+#: src/compose.c:10451 src/compose.c:10455
 msgid "_Save to Drafts"
 msgstr "Guardar en _Borradores"
 
-#: src/compose.c:10324 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10453 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: src/compose.c:10325
+#: src/compose.c:10454
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Este mensaje se ha modificado. ¿Guardar los últimos cambios?"
 
-#: src/compose.c:10326
+#: src/compose.c:10455
 msgid "_Don't save"
 msgstr "_No guardar"
 
-#: src/compose.c:10326
-msgid "+_Save to Drafts"
-msgstr "+Guardar en _Borradores"
-
-#: src/compose.c:10396
+#: src/compose.c:10526
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:10398
+#: src/compose.c:10528
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:10399 src/prefs_actions.c:329
+#: src/compose.c:10529 src/prefs_actions.c:329
 #: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
-#: src/prefs_matcher.c:775 src/prefs_template.c:311 src/prefs_toolbar.c:1050
+#: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:10399
-msgid "_Insert"
-msgstr "_Insertar"
-
-#: src/compose.c:11257
+#: src/compose.c:11387
 msgid "Insert or attach?"
 msgstr "¿Insertar o adjuntar?"
 
-#: src/compose.c:11258
+#: src/compose.c:11388
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2416,16 +2404,16 @@ msgstr ""
 "¿Quiere insertar el contenido de este/os fichero/s en el cuerpo del correo o "
 "prefiere adjuntarlo/s al mismo?"
 
-#: src/compose.c:11260
+#: src/compose.c:11390
 msgid "_Attach"
 msgstr "_Adjuntar"
 
-#: src/compose.c:11477
+#: src/compose.c:11607
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Error de formato de cita en la línea %d."
 
-#: src/compose.c:11772
+#: src/compose.c:11902
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2434,16 +2422,16 @@ msgstr ""
 "Está a punto de responder a %d mensajes. Abrir las ventanas podría llevar "
 "algún tiempo. ¿Desea continuar?"
 
-#: src/crash.c:141
+#: src/crash.c:140
 #, c-format
 msgid "Claws Mail process (%ld) received signal %ld"
 msgstr "El proceso Claws Mail (%ld) recibió la señal %ld"
 
-#: src/crash.c:187
+#: src/crash.c:186
 msgid "Claws Mail has crashed"
 msgstr "Claws Mail ha terminado abruptamente"
 
-#: src/crash.c:203
+#: src/crash.c:202
 #, c-format
 msgid ""
 "%s.\n"
@@ -2452,23 +2440,23 @@ msgstr ""
 "%s.\n"
 "Por favor, rellene un informe de error e incluya la información siguiente."
 
-#: src/crash.c:208
+#: src/crash.c:207
 msgid "Debug log"
 msgstr "Traza de depuración"
 
-#: src/crash.c:252 src/toolbar.c:422
+#: src/crash.c:251 src/toolbar.c:422
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/crash.c:257
+#: src/crash.c:256
 msgid "Save..."
 msgstr "Guardar..."
 
-#: src/crash.c:262
+#: src/crash.c:261
 msgid "Create bug report"
 msgstr "Crear informe de error"
 
-#: src/crash.c:312
+#: src/crash.c:311
 msgid "Save crash information"
 msgstr "Guardar información de terminación incorrecta"
 
@@ -2536,7 +2524,7 @@ msgstr "Debe especificarse una dirección de correo."
 msgid "A Name and Value must be supplied."
 msgstr "Debe especificarse un Nombre y un Valor"
 
-#: src/editaddress.c:676
+#: src/editaddress.c:676 src/prefs_folder_item.c:1675
 msgid "Discard"
 msgstr "Descartar"
 
@@ -2573,46 +2561,46 @@ msgstr "Q_uitar imagen asociada"
 msgid "Photo"
 msgstr "Foto"
 
-#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:517
-#: src/exporthtml.c:761 src/ldif.c:747
+#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:516
+#: src/exporthtml.c:761 src/ldif.c:746
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
-#: src/editaddress.c:961 src/editaddress.c:965 src/ldif.c:755
+#: src/editaddress.c:963 src/editaddress.c:967 src/ldif.c:754
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: src/editaddress.c:962 src/editaddress.c:964 src/ldif.c:751
+#: src/editaddress.c:964 src/editaddress.c:966 src/ldif.c:750
 msgid "First Name"
 msgstr "Nombre"
 
-#: src/editaddress.c:968 src/editaddress.c:970
+#: src/editaddress.c:970 src/editaddress.c:972
 msgid "Nickname"
 msgstr "Apodo"
 
-#: src/editaddress.c:1054 src/editaddress.c:1122
+#: src/editaddress.c:1056 src/editaddress.c:1124
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1264 src/editaddress.c:1333 src/editaddress.c:1353
+#: src/editaddress.c:1266 src/editaddress.c:1335 src/editaddress.c:1355
 #: src/editaddress_other_attributes_ldap.c:303
 #: src/editaddress_other_attributes_ldap.c:371 src/prefs_customheader.c:222
 msgid "Value"
 msgstr "Valor"
 
-#: src/editaddress.c:1424
+#: src/editaddress.c:1426
 msgid "_User Data"
 msgstr "Datos de _usuario"
 
-#: src/editaddress.c:1425
+#: src/editaddress.c:1427
 msgid "_Email Addresses"
 msgstr "_Direcciones de correo"
 
-#: src/editaddress.c:1428 src/editaddress.c:1431
+#: src/editaddress.c:1430 src/editaddress.c:1433
 msgid "O_ther Attributes"
 msgstr "O_tros atributos"
 
-#: src/editaddress.c:1582
+#: src/editaddress.c:1584
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2642,8 +2630,8 @@ msgid " Check File "
 msgstr " Comprobar fichero "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1958
-#: src/wizard.c:1186 src/wizard.c:1598
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "Fichero"
 
@@ -2691,13 +2679,13 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:556 src/foldersel.c:585 src/imap_gtk.c:195 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:93
+#: src/editgroup.c:556 src/foldersel.c:585 src/imap_gtk.c:194 src/mh_gtk.c:144
+#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:91
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:557 src/foldersel.c:586 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:94
+#: src/editgroup.c:557 src/foldersel.c:586 src/mh_gtk.c:145
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -2721,61 +2709,61 @@ msgstr "Elemento(s) adicional(es) de la dirección"
 msgid "Add New JPilot Entry"
 msgstr "Añadir nueva entrada JPilot"
 
-#: src/editldap_basedn.c:138
+#: src/editldap_basedn.c:137
 msgid "Edit LDAP - Select Search Base"
 msgstr "Editar LDAP - Seleccionar base de búsqueda"
 
-#: src/editldap_basedn.c:157 src/editldap.c:441
+#: src/editldap_basedn.c:156 src/editldap.c:440
 msgid "Hostname"
 msgstr "Nombre de máquina"
 
-#: src/editldap_basedn.c:167 src/editldap.c:458
+#: src/editldap_basedn.c:166 src/editldap.c:457
 #: src/plugins/clamd/clamav_plugin_gtk.c:389 src/ssl_manager.c:110
 msgid "Port"
 msgstr "Puerto"
 
-#: src/editldap_basedn.c:177 src/editldap.c:502
+#: src/editldap_basedn.c:176 src/editldap.c:501
 msgid "Search Base"
 msgstr "Base de búsqueda"
 
-#: src/editldap_basedn.c:198
+#: src/editldap_basedn.c:197
 msgid "Available Search Base(s)"
 msgstr "Base(s) de búsqueda disponible(s)"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:287
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 "No pude leer la base de búsqueda del servidor - configúrela manualmente"
 
-#: src/editldap_basedn.c:292 src/editldap.c:281
+#: src/editldap_basedn.c:291 src/editldap.c:280
 msgid "Could not connect to server"
 msgstr "No se puede conectar al servidor"
 
-#: src/editldap.c:152
+#: src/editldap.c:151
 msgid "A Name must be supplied."
 msgstr "Debe proporcionar un nombre."
 
-#: src/editldap.c:164
+#: src/editldap.c:163
 msgid "A Hostname must be supplied for the server."
 msgstr "Debe proporcionar un nombre de máquina para el servidor."
 
-#: src/editldap.c:177
+#: src/editldap.c:176
 msgid "At least one LDAP search attribute should be supplied."
 msgstr "Debe proporcionar al menos un atributo de búsqueda LDAP."
 
-#: src/editldap.c:278
+#: src/editldap.c:277
 msgid "Connected successfully to server"
 msgstr "Conectado con éxito al servidor"
 
-#: src/editldap.c:336 src/editldap.c:974
+#: src/editldap.c:335 src/editldap.c:973
 msgid "Edit LDAP Server"
 msgstr "Editar servidor LDAP"
 
-#: src/editldap.c:437
+#: src/editldap.c:436
 msgid "A name that you wish to call the server."
 msgstr "Un nombre con el que denominar al servidor."
 
-#: src/editldap.c:450
+#: src/editldap.c:449
 msgid ""
 "This is the hostname of the server. For example, \"ldap.mydomain.com\" may "
 "be appropriate for the \"mydomain.com\" organization. An IP address may also "
@@ -2787,15 +2775,15 @@ msgstr ""
 "dirección IP. Puede especificar «localhost» si el servidor LDAP esta "
 "ejecutándose en la misma máquina que Claws Mail."
 
-#: src/editldap.c:470
+#: src/editldap.c:469
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3342
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
-#: src/editldap.c:475
+#: src/editldap.c:474
 msgid ""
 "Enable secure connection to the LDAP server via TLS. If connection fails, be "
 "sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
@@ -2805,7 +2793,7 @@ msgstr ""
 "falla compruebe que la configuración en ldap.conf es correcta (especialmente "
 "los campos TLS_CACERTDIR y TLS_REQCERT)."
 
-#: src/editldap.c:479
+#: src/editldap.c:478
 msgid ""
 "Enable secure connection to the LDAP server via SSL. If connection fails, be "
 "sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
@@ -2815,19 +2803,19 @@ msgstr ""
 "falla compruebe que la configuración en ldap.conf es correcta (especialmente "
 "los campos TLS_CACERTDIR y TLS_REQCERT)."
 
-#: src/editldap.c:491
+#: src/editldap.c:490
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr "El número de puerto en el que escucha el servidor. Por omisión el 389."
 
-#: src/editldap.c:494
+#: src/editldap.c:493
 msgid " Check Server "
 msgstr " Comprobar servidor "
 
-#: src/editldap.c:498
+#: src/editldap.c:497
 msgid "Press this button to test the connection to the server."
 msgstr "Pulse este botón para probar la conexión con el servidor."
 
-#: src/editldap.c:511
+#: src/editldap.c:510
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
@@ -2841,7 +2829,7 @@ msgstr ""
 "  ou=gente,dc=nombredominio,dc=com\n"
 "  o=Nombre Organizacion,c=Pais\n"
 
-#: src/editldap.c:522
+#: src/editldap.c:521
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
@@ -2849,11 +2837,11 @@ msgstr ""
 "Pulse este botón para buscar el nombre de los nombres de directorio "
 "disponibles en el servidor."
 
-#: src/editldap.c:578
+#: src/editldap.c:577
 msgid "Search Attributes"
 msgstr "Atributos de búsqueda"
 
-#: src/editldap.c:587
+#: src/editldap.c:586
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
@@ -2861,11 +2849,11 @@ msgstr ""
 "Una lista de nombres de atributos LDAP que deberán buscarse cuando se vaya a "
 "encontrar un nombre o dirección."
 
-#: src/editldap.c:590
+#: src/editldap.c:589
 msgid " Defaults "
 msgstr " Por omisión "
 
-#: src/editldap.c:594
+#: src/editldap.c:593
 msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
@@ -2873,11 +2861,11 @@ msgstr ""
 "Reinicia los nombres de atributo al valor por omisión que debería encontrar "
 "la mayoría de nombres y direcciones durante un proceso de búsqueda."
 
-#: src/editldap.c:600
+#: src/editldap.c:599
 msgid "Max Query Age (secs)"
 msgstr "Espera máx. por petición (seg.)"
 
-#: src/editldap.c:615
+#: src/editldap.c:614
 msgid ""
 "This defines the maximum period of time (in seconds) that an address search "
 "result is valid for address completion purposes. Search results are stored "
@@ -2901,11 +2889,11 @@ msgstr ""
 "en las búsquedas siguientes. Esto es útil para servidores lentos a expensas "
 "de más memoria para almacenar los resultados."
 
-#: src/editldap.c:632
+#: src/editldap.c:631
 msgid "Include server in dynamic search"
 msgstr "Incluir el servidor en la búsqueda dinámica"
 
-#: src/editldap.c:637
+#: src/editldap.c:636
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
@@ -2913,11 +2901,11 @@ msgstr ""
 "Marque esta opción para incluir este servidor en las búsquedas dinámicas al "
 "usar autocompletar direcciones."
 
-#: src/editldap.c:643
+#: src/editldap.c:642
 msgid "Match names 'containing' search term"
 msgstr "Coincide con nombres «conteniendo» el término buscado"
 
-#: src/editldap.c:648
+#: src/editldap.c:647
 msgid ""
 "Searches for names and addresses can be performed either using \"begins-with"
 "\" or \"contains\" search term. Check this option to perform a \"contains\" "
@@ -2932,11 +2920,11 @@ msgstr ""
 "las búsquedas de autocompletar contra otros interfaces de direcciones usan "
 "«comienza-con»."
 
-#: src/editldap.c:701
+#: src/editldap.c:700
 msgid "Bind DN"
 msgstr "Asociar DN"
 
-#: src/editldap.c:710
+#: src/editldap.c:709
 msgid ""
 "The LDAP user account name to be used to connect to the server. This is "
 "usually only used for protected servers. This name is typically formatted "
@@ -2948,51 +2936,47 @@ msgstr ""
 "formatea como «cn=usuario,dc=claws-mail,dc=com». Normalmente se deja vacío "
 "al realizar la búsqueda."
 
-#: src/editldap.c:717
+#: src/editldap.c:716
 msgid "Bind Password"
 msgstr "Asociar contraseña"
 
-#: src/editldap.c:727
+#: src/editldap.c:726
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "La contraseña a usar al conectar como el usuario \"Asociar DN\"."
 
-#: src/editldap.c:732
+#: src/editldap.c:731
 msgid "Timeout (secs)"
 msgstr "Tiempo límite (seg.)"
 
-#: src/editldap.c:746
+#: src/editldap.c:745
 msgid "The timeout period in seconds."
 msgstr "El tiempo máximo en segundos."
 
-#: src/editldap.c:750
+#: src/editldap.c:749
 msgid "Maximum Entries"
 msgstr "Nº entradas máximas"
 
-#: src/editldap.c:764
+#: src/editldap.c:763
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 "El número máximo de entradas que deberían retornarse en los resultados de la "
 "búsqueda."
 
-#: src/editldap.c:779 src/prefs_account.c:3233
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "Básicas"
 
-#: src/editldap.c:780
-msgid "Search"
-msgstr "Buscar"
-
-#: src/editldap.c:781 src/gtk/quicksearch.c:680
+#: src/editldap.c:780 src/gtk/quicksearch.c:680
 msgid "Extended"
 msgstr "Extendido"
 
-#: src/editldap.c:979
+#: src/editldap.c:978
 msgid "Add New LDAP Server"
 msgstr "Añadir nuevo servidor LDAP"
 
 #: src/edittags.c:187 src/prefs_filtering_action.c:1446
-#: src/prefs_summaries.c:442
+#: src/prefs_summaries.c:441
 msgid "Tag"
 msgstr "Etiqueta"
 
@@ -3054,19 +3038,19 @@ msgstr "Añadir nueva entrada vCard"
 msgid "Impossible to set the client certificate.\n"
 msgstr "Imposible establecer el certificado de cliente.\n"
 
-#: src/exphtmldlg.c:106
+#: src/exphtmldlg.c:105
 msgid "Please specify output directory and file to create."
 msgstr "Especifique el directorio de salida y el fichero a crear."
 
-#: src/exphtmldlg.c:109
+#: src/exphtmldlg.c:108
 msgid "Select stylesheet and formatting."
 msgstr "Seleccione la hoja de estilos y formato."
 
-#: src/exphtmldlg.c:112 src/expldifdlg.c:114
+#: src/exphtmldlg.c:111 src/expldifdlg.c:113
 msgid "File exported successfully."
 msgstr "Fichero exportado con éxito."
 
-#: src/exphtmldlg.c:178
+#: src/exphtmldlg.c:177
 #, c-format
 msgid ""
 "The HTML output directory '%s'\n"
@@ -3075,11 +3059,11 @@ msgstr ""
 "El directorio de salida HTML «%s»\n"
 "no existe. ¿Desea crearlo?"
 
-#: src/exphtmldlg.c:181
+#: src/exphtmldlg.c:180
 msgid "Create directory"
 msgstr "Crear directorio"
 
-#: src/exphtmldlg.c:190
+#: src/exphtmldlg.c:189
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
@@ -3088,123 +3072,123 @@ msgstr ""
 "No pude crear el directorio de salida para el fichero HTML:\n"
 "%s"
 
-#: src/exphtmldlg.c:192 src/expldifdlg.c:202
+#: src/exphtmldlg.c:191 src/expldifdlg.c:201
 msgid "Failed to Create Directory"
 msgstr "Fallo al crear el directorio"
 
-#: src/exphtmldlg.c:234
+#: src/exphtmldlg.c:233
 msgid "Error creating HTML file"
 msgstr "Error creando el fichero HTML"
 
-#: src/exphtmldlg.c:320
+#: src/exphtmldlg.c:319
 msgid "Select HTML output file"
 msgstr "Seleccionar el fichero HTML de salida"
 
-#: src/exphtmldlg.c:384
+#: src/exphtmldlg.c:383
 msgid "HTML Output File"
 msgstr "Fichero HTML de salida"
 
-#: src/exphtmldlg.c:393 src/expldifdlg.c:410 src/export.c:171 src/import.c:170
-#: src/importldif.c:685
+#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:171 src/import.c:170
+#: src/importldif.c:684
 msgid "B_rowse"
 msgstr "Explo_rar"
 
-#: src/exphtmldlg.c:446 src/plugins/fancy/fancy_prefs.c:300
+#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:300
 msgid "Stylesheet"
 msgstr "Hoja de estilos"
 
-#: src/exphtmldlg.c:454 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
+#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
 #: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
-#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6036
+#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
 msgid "None"
 msgstr "Ninguno"
 
-#: src/exphtmldlg.c:455 src/prefs_folder_item.c:512 src/prefs_other.c:116
-#: src/prefs_other.c:408
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr "Por omisión"
 
-#: src/exphtmldlg.c:456 src/plugins/pgpcore/select-keys.c:244
-#: src/plugins/pgpcore/sgpgme.c:148 src/plugins/pgpcore/sgpgme.c:164
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
+#: src/plugins/pgpcore/sgpgme.c:147 src/plugins/pgpcore/sgpgme.c:163
 msgid "Full"
 msgstr "Completo"
 
-#: src/exphtmldlg.c:457
+#: src/exphtmldlg.c:456
 msgid "Custom"
 msgstr "Adecuado"
 
-#: src/exphtmldlg.c:458
+#: src/exphtmldlg.c:457
 msgid "Custom-2"
 msgstr "Adecuado-2"
 
-#: src/exphtmldlg.c:459
+#: src/exphtmldlg.c:458
 msgid "Custom-3"
 msgstr "Adecuado-3"
 
-#: src/exphtmldlg.c:460
+#: src/exphtmldlg.c:459
 msgid "Custom-4"
 msgstr "Adecuado-4"
 
-#: src/exphtmldlg.c:467
+#: src/exphtmldlg.c:466
 msgid "Full Name Format"
 msgstr "Formato de nombre completo"
 
-#: src/exphtmldlg.c:475
+#: src/exphtmldlg.c:474
 msgid "First Name, Last Name"
 msgstr "Nombre, Apellidos"
 
-#: src/exphtmldlg.c:476
+#: src/exphtmldlg.c:475
 msgid "Last Name, First Name"
 msgstr "Apellidos, Nombre"
 
-#: src/exphtmldlg.c:483
+#: src/exphtmldlg.c:482
 msgid "Color Banding"
 msgstr "Bandas de color"
 
-#: src/exphtmldlg.c:489
+#: src/exphtmldlg.c:488
 msgid "Format Email Links"
 msgstr "Formatear enlaces de correo electrónico"
 
-#: src/exphtmldlg.c:495
+#: src/exphtmldlg.c:494
 msgid "Format User Attributes"
 msgstr "Formatear atributos del usuario"
 
-#: src/exphtmldlg.c:540 src/expldifdlg.c:613 src/importldif.c:892
+#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:891
 msgid "Address Book :"
 msgstr "Agenda de direcciones :"
 
-#: src/exphtmldlg.c:550 src/expldifdlg.c:623 src/importldif.c:902
+#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:901
 msgid "File Name :"
 msgstr "Nombre de fichero :"
 
-#: src/exphtmldlg.c:560
+#: src/exphtmldlg.c:559
 msgid "Open with Web Browser"
 msgstr "Abrir con el navegador web"
 
-#: src/exphtmldlg.c:592
+#: src/exphtmldlg.c:591
 msgid "Export Address Book to HTML File"
 msgstr "Exportar agenda a un fichero HTML"
 
-#: src/exphtmldlg.c:657 src/expldifdlg.c:721 src/importldif.c:1021
+#: src/exphtmldlg.c:656 src/expldifdlg.c:720 src/importldif.c:1020
 msgid "File Info"
 msgstr "Información de fichero"
 
-#: src/exphtmldlg.c:658
+#: src/exphtmldlg.c:657
 msgid "Format"
 msgstr "Formato"
 
-#: src/expldifdlg.c:108
+#: src/expldifdlg.c:107
 msgid "Please specify output directory and LDIF filename to create."
 msgstr ""
 "Especifique el directorio de salida y el nombre del fichero LDIF a crear."
 
-#: src/expldifdlg.c:111
+#: src/expldifdlg.c:110
 msgid "Specify parameters to format distinguished name."
 msgstr "Especifique los parámetros para dar formato al nombre distinguido."
 
-#: src/expldifdlg.c:188
+#: src/expldifdlg.c:187
 #, c-format
 msgid ""
 "LDIF Output Directory '%s'\n"
@@ -3213,11 +3197,11 @@ msgstr ""
 "El directorio de salida LDIF «%s»\n"
 "no existe. ¿Desea crear uno nuevo?"
 
-#: src/expldifdlg.c:191
+#: src/expldifdlg.c:190
 msgid "Create Directory"
 msgstr "Crear directorio"
 
-#: src/expldifdlg.c:200
+#: src/expldifdlg.c:199
 #, c-format
 msgid ""
 "Could not create output directory for LDIF file:\n"
@@ -3226,11 +3210,11 @@ msgstr ""
 "No se puede crear el directorio de salida para el fichero LDIF:\n"
 "%s"
 
-#: src/expldifdlg.c:242
+#: src/expldifdlg.c:241
 msgid "Suffix was not supplied"
 msgstr "No se proporcionó un sufijo"
 
-#: src/expldifdlg.c:244
+#: src/expldifdlg.c:243
 msgid ""
 "A suffix is required if data is to be used for an LDAP server. Are you sure "
 "you wish to proceed without a suffix?"
@@ -3238,19 +3222,19 @@ msgstr ""
 "Es necesario un sufijo si los datos se van a usar en un servidor LDAP. ¿Está "
 "seguro de que quiere continuar sin un sufijo?"
 
-#: src/expldifdlg.c:262
+#: src/expldifdlg.c:261
 msgid "Error creating LDIF file"
 msgstr "Error creando el fichero LDIF"
 
-#: src/expldifdlg.c:337
+#: src/expldifdlg.c:336
 msgid "Select LDIF output file"
 msgstr "Seleccionar el fichero LDIF de salida"
 
-#: src/expldifdlg.c:401
+#: src/expldifdlg.c:400
 msgid "LDIF Output File"
 msgstr "Fichero LDIF de salida"
 
-#: src/expldifdlg.c:432
+#: src/expldifdlg.c:431
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"
@@ -3260,7 +3244,7 @@ msgstr ""
 "estilo de:\n"
 "  uid=102376,ou=gente,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:438
+#: src/expldifdlg.c:437
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
@@ -3270,7 +3254,7 @@ msgstr ""
 "estilo de:\n"
 "  cn=Juan Nadie,ou=gente,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:444
+#: src/expldifdlg.c:443
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
@@ -3280,11 +3264,11 @@ msgstr ""
 "un DN del estilo de:\n"
 "  mail=juan.nadie@dominio.com,ou=gente,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:490
+#: src/expldifdlg.c:489
 msgid "Suffix"
 msgstr "Sufijo"
 
-#: src/expldifdlg.c:500
+#: src/expldifdlg.c:499
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"
@@ -3298,15 +3282,15 @@ msgstr ""
 "  ou=gente,dc=nombredominio,dc=com\n"
 "  o=Nombre Organizacion,c=Pais\n"
 
-#: src/expldifdlg.c:508
+#: src/expldifdlg.c:507
 msgid "Relative DN"
 msgstr "DN relativo"
 
-#: src/expldifdlg.c:516
+#: src/expldifdlg.c:515
 msgid "Unique ID"
 msgstr "ID único"
 
-#: src/expldifdlg.c:524
+#: src/expldifdlg.c:523
 msgid ""
 "The LDIF file contains several data records that are usually loaded into an "
 "LDAP server. Each data record in the LDIF file is uniquely identified by a "
@@ -3321,11 +3305,11 @@ msgstr ""
 "seleccione una de las opciones de RDN disponibles para usarla en la creación "
 "del DN."
 
-#: src/expldifdlg.c:544
+#: src/expldifdlg.c:543
 msgid "Use DN attribute if present in data"
 msgstr "Usar el atributo DN si esta presente en los datos"
 
-#: src/expldifdlg.c:549
+#: src/expldifdlg.c:548
 msgid ""
 "The addressbook may contain entries that were previously imported from an "
 "LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
@@ -3338,11 +3322,11 @@ msgstr ""
 "exportado. Se usará el RDN seleccionado arriba si no se encuentra el "
 "atributo DN."
 
-#: src/expldifdlg.c:559
+#: src/expldifdlg.c:558
 msgid "Exclude record if no Email Address"
 msgstr "Excluir registros sin dirección de correo"
 
-#: src/expldifdlg.c:564
+#: src/expldifdlg.c:563
 msgid ""
 "An addressbook may contain entries without Email Addresses. Check this "
 "option to ignore these records."
@@ -3350,15 +3334,15 @@ msgstr ""
 "Una agenda puede contener entradas sin direcciones de correo electrónico. "
 "Marque esta opción para ignorar tales registros."
 
-#: src/expldifdlg.c:656
+#: src/expldifdlg.c:655
 msgid "Export Address Book to LDIF File"
 msgstr "Exportar agenda a un fichero LDIF"
 
-#: src/expldifdlg.c:722
+#: src/expldifdlg.c:721
 msgid "Distinguished Name"
 msgstr "Nombre distinguido"
 
-#: src/export.c:113 src/summaryview.c:8148
+#: src/export.c:113 src/summaryview.c:8190
 msgid "Export to mbox file"
 msgstr "Exportar a fichero mbox"
 
@@ -3394,8 +3378,8 @@ msgstr "Seleccione fichero de exportación"
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: src/exporthtml.c:771 src/importldif.c:1022
-#: src/plugins/archive/archiver_gtk.c:731
+#: src/exporthtml.c:771 src/importldif.c:1021
+#: src/plugins/archive/archiver_gtk.c:735
 msgid "Attributes"
 msgstr "Atributos"
 
@@ -3612,7 +3596,7 @@ msgstr ""
 "filtrando mensaje (%s%s%s)\n"
 "%sfichero de mensaje: %s\n"
 
-#: src/folder.c:1565 src/foldersel.c:403 src/prefs_folder_item.c:306
+#: src/folder.c:1565 src/foldersel.c:403 src/prefs_folder_item.c:300
 msgid "Inbox"
 msgstr "Entrada"
 
@@ -3620,16 +3604,15 @@ msgstr "Entrada"
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/folder.c:1573 src/foldersel.c:411
-#: src/plugins/attachwarner/attachwarner.c:217 src/prefs_folder_item.c:309
+#: src/folder.c:1573 src/foldersel.c:411 src/prefs_folder_item.c:303
 msgid "Queue"
 msgstr "Cola"
 
-#: src/folder.c:1577 src/foldersel.c:415 src/prefs_folder_item.c:310
+#: src/folder.c:1577 src/foldersel.c:415 src/prefs_folder_item.c:304
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/folder.c:1581 src/foldersel.c:419 src/prefs_folder_item.c:308
+#: src/folder.c:1581 src/foldersel.c:419 src/prefs_folder_item.c:302
 msgid "Drafts"
 msgstr "Borradores"
 
@@ -3670,31 +3653,31 @@ msgstr "El nombre de una carpeta no puede empezar o terminar con un punto."
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:587 src/imap_gtk.c:199 src/mh_gtk.c:147
-#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:95
+#: src/foldersel.c:587 src/imap_gtk.c:198 src/mh_gtk.c:146
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:595 src/imap_gtk.c:210 src/imap_gtk.c:216
-#: src/imap_gtk.c:272 src/imap_gtk.c:277 src/mh_gtk.c:155 src/mh_gtk.c:264
-#: src/news_gtk.c:315 src/plugins/mailmbox/plugin_gtk.c:255
-#: src/plugins/mailmbox/plugin_gtk.c:425 src/plugins/rssyl/rssyl_cb_menu.c:208
-#: src/plugins/vcalendar/vcal_folder.c:2042
+#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215
+#: src/imap_gtk.c:271 src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263
+#: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:254
+#: src/plugins/mailmbox/plugin_gtk.c:424 src/plugins/rssyl/rssyl_cb_menu.c:206
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "No se puede usar «%c» en el nombre de la carpeta."
 
-#: src/foldersel.c:610 src/imap_gtk.c:226 src/imap_gtk.c:284 src/mh_gtk.c:168
-#: src/mh_gtk.c:274 src/news_gtk.c:322 src/plugins/mailmbox/plugin_gtk.c:270
-#: src/plugins/mailmbox/plugin_gtk.c:437 src/plugins/rssyl/rssyl_cb_menu.c:221
-#: src/plugins/vcalendar/vcal_folder.c:2049
+#: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
+#: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
+#: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La carpeta «%s» ya existe."
 
-#: src/foldersel.c:617 src/imap_gtk.c:232 src/mh_gtk.c:174
-#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:126
+#: src/foldersel.c:617 src/imap_gtk.c:231 src/mh_gtk.c:173
+#: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
+#: src/plugins/rssyl/rssyl_cb_menu.c:124
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "No se puede crear la carpeta «%s»."
@@ -3729,13 +3712,13 @@ msgstr "Enviar _cola..."
 
 #: src/folderview.c:387 src/folderview.c:434
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:391 src/summaryview.c:6312
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6316
 msgid "New"
 msgstr "Nuevos"
 
 #: src/folderview.c:388 src/folderview.c:435
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:390 src/summaryview.c:6314
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6318
 msgid "Unread"
 msgstr "No leídos"
 
@@ -3745,7 +3728,7 @@ msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:437 src/summaryview.c:446
+#: src/folderview.c:437 src/summaryview.c:445
 msgid "#"
 msgstr "Nº"
 
@@ -3761,103 +3744,98 @@ msgstr ""
 "¿Desea marcar todos los correos en esta carpeta y sus subcarpetas como "
 "leídos?"
 
-#: src/folderview.c:841 src/summaryview.c:4128
+#: src/folderview.c:841 src/summaryview.c:4134
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "¿Quiere realmente marcar todos los correos en la carpeta como leídos?"
 
-#: src/folderview.c:845 src/summaryview.c:4127
+#: src/folderview.c:845 src/summaryview.c:4133
 msgid "Mark all as read"
 msgstr "Marcar todo como leído"
 
-#: src/folderview.c:1007 src/imap.c:4601 src/mainwindow.c:5169 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Revisando carpeta %s%c%s..."
 
-#: src/folderview.c:1011 src/imap.c:4606 src/mainwindow.c:5174 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Revisando carpeta %s..."
 
-#: src/folderview.c:1042
+#: src/folderview.c:1050
 msgid "Rebuild folder tree"
 msgstr "Reconstruir árbol de carpetas"
 
-#: src/folderview.c:1043
+#: src/folderview.c:1051
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Reconstruir el árbol de carpetas eliminará la caché local. ¿Desea continuar?"
 
-#: src/folderview.c:1053
+#: src/folderview.c:1061
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo árbol de carpetas..."
 
-#: src/folderview.c:1055
+#: src/folderview.c:1063
 msgid "Scanning folder tree..."
 msgstr "Explorando árbol de carpetas..."
 
-#: src/folderview.c:1146
+#: src/folderview.c:1154
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "No se puede explorar la carpeta %s\n"
 
-#: src/folderview.c:1200
+#: src/folderview.c:1208
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:2113
+#: src/folderview.c:2124
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Cerrando carpeta %s..."
 
-#: src/folderview.c:2208
+#: src/folderview.c:2219
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Abriendo carpeta %s..."
 
-#: src/folderview.c:2226
+#: src/folderview.c:2237
 msgid "Folder could not be opened."
 msgstr "No se puede abrir la carpeta."
 
-#: src/folderview.c:2369 src/mainwindow.c:2893 src/mainwindow.c:2897
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2370
+#: src/folderview.c:2380
 msgid "Delete all messages in trash?"
 msgstr "¿Borrar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2371
-msgid "+_Empty trash"
-msgstr "+_Vaciar papelera"
+#: src/folderview.c:2381
+msgid "_Empty trash"
+msgstr "_Vaciar papelera"
 
-#: src/folderview.c:2415 src/inc.c:1540 src/toolbar.c:2607
+#: src/folderview.c:2424 src/inc.c:1540 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Notificación conexión"
 
-#: src/folderview.c:2416 src/toolbar.c:2608
+#: src/folderview.c:2425 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Está trabajando sin conexión ¿Ignorar?"
 
-#: src/folderview.c:2427 src/toolbar.c:2627
+#: src/folderview.c:2436 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Enviar mensajes en la cola"
 
-#: src/folderview.c:2428 src/toolbar.c:2628
+#: src/folderview.c:2437 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "¿Enviar todos los mensajes en la cola?"
 
-#: src/folderview.c:2429 src/messageview.c:856 src/messageview.c:873
-#: src/toolbar.c:2629
-msgid "_Send"
-msgstr "_Enviar"
-
-#: src/folderview.c:2437 src/toolbar.c:2647
+#: src/folderview.c:2446 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocurrieron algunos errores enviando los mensajes en la cola."
 
-#: src/folderview.c:2440 src/main.c:2714 src/toolbar.c:2650
+#: src/folderview.c:2449 src/main.c:2717 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3866,64 +3844,64 @@ msgstr ""
 "Hubo algún error enviando los mensajes en la cola:\n"
 "%s"
 
-#: src/folderview.c:2517
+#: src/folderview.c:2524
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "¿Quiere realmente copiar la carpeta «%s» a «%s»?"
 
-#: src/folderview.c:2518
+#: src/folderview.c:2525
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "¿Quiere realmente hacer de la carpeta «%s» una subcarpeta de «%s»?"
 
-#: src/folderview.c:2520
+#: src/folderview.c:2527
 msgid "Copy folder"
 msgstr "Copiar carpeta"
 
-#: src/folderview.c:2520
+#: src/folderview.c:2527
 msgid "Move folder"
 msgstr "Mover carpeta"
 
-#: src/folderview.c:2531
+#: src/folderview.c:2538
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s a %s..."
 
-#: src/folderview.c:2531
+#: src/folderview.c:2538
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Moviendo %s a %s..."
 
-#: src/folderview.c:2565
+#: src/folderview.c:2572
 msgid "Source and destination are the same."
 msgstr "El destino y el origen son la misma."
 
-#: src/folderview.c:2568
+#: src/folderview.c:2575
 msgid "Can't copy a folder to one of its children."
 msgstr "No se puede copiar una carpeta a una de sus subcarpetas."
 
-#: src/folderview.c:2569
+#: src/folderview.c:2576
 msgid "Can't move a folder to one of its children."
 msgstr "No se puede mover la carpeta a una de sus subcarpetas."
 
-#: src/folderview.c:2572
+#: src/folderview.c:2579
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "No se pueden mover carpetas entre buzones distintos."
 
-#: src/folderview.c:2575
+#: src/folderview.c:2582
 msgid "Copy failed!"
 msgstr "¡Copiar falló!"
 
-#: src/folderview.c:2575
+#: src/folderview.c:2582
 msgid "Move failed!"
 msgstr "¡Mover falló!"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2632
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuración de procesamiento para la carpeta «%s»"
 
-#: src/folderview.c:3054 src/summaryview.c:4573 src/summaryview.c:4678
+#: src/folderview.c:3060 src/summaryview.c:4579 src/summaryview.c:4684
 msgid "The destination folder can only be used to store subfolders."
 msgstr "La carpeta destino sólo puede usarse para almacenar subcarpetas."
 
@@ -3973,7 +3951,7 @@ msgstr "desconocido"
 msgid "Can't retrieve newsgroup list."
 msgstr "No se puede obtener la lista de grupos."
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1916 src/summaryview.c:1587
+#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1916 src/summaryview.c:1584
 msgid "Done."
 msgstr "Hecho."
 
@@ -4038,36 +4016,30 @@ msgstr ""
 "\n"
 "Información del sistema\n"
 
-#: src/gtk/about.c:167
+#: src/gtk/about.c:168
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Localización: %s (caracteres: %s)\n"
 "Sistema operativo: %s %s (%s)"
 
-#: src/gtk/about.c:176
+#: src/gtk/about.c:177
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Localización: %s (caracteres: %s)\n"
 "Sistema operativo: %s"
 
-#: src/gtk/about.c:185
+#: src/gtk/about.c:186
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Localización: %s (caracteres: %s)\n"
 "Sistema operativo: desconocido"
 
@@ -4186,57 +4158,49 @@ msgstr ""
 #: src/gtk/about.c:567
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <"
+"this program. If not, see "
 msgstr ""
 "Debería haber recibido una copia de la GNU General Public License junto con "
-"este programa; en caso contrario, vea <"
-
-#: src/gtk/about.c:572
-msgid ""
-">. \n"
-"\n"
-msgstr ""
-">. \n"
-"\n"
+"este programa; en caso contrario, vea "
 
-#: src/gtk/about.c:698 src/main.c:2538
+#: src/gtk/about.c:698 src/main.c:2541
 msgid "Session statistics\n"
 msgstr "Estadísticas de sesión\n"
 
-#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2548 src/main.c:2551
+#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2551 src/main.c:2554
 #, c-format
 msgid "Started: %s\n"
 msgstr "Iniciado: %s\n"
 
-#: src/gtk/about.c:718 src/main.c:2557
+#: src/gtk/about.c:718 src/main.c:2560
 msgid "Incoming traffic\n"
 msgstr "Tráfico entrante\n"
 
-#: src/gtk/about.c:721 src/main.c:2560
+#: src/gtk/about.c:721 src/main.c:2563
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Mensajes recibidos: %d\n"
 
-#: src/gtk/about.c:728 src/main.c:2566
+#: src/gtk/about.c:728 src/main.c:2569
 msgid "Outgoing traffic\n"
 msgstr "Tráfico saliente\n"
 
-#: src/gtk/about.c:731 src/main.c:2569
+#: src/gtk/about.c:731 src/main.c:2572
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Mensajes nuevos/redirigidos: %d\n"
 
-#: src/gtk/about.c:736 src/main.c:2573
+#: src/gtk/about.c:736 src/main.c:2576
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Mensajes respondidos: %d\n"
 
-#: src/gtk/about.c:741 src/main.c:2577
+#: src/gtk/about.c:741 src/main.c:2580
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Mensajes reenviados: %d\n"
 
-#: src/gtk/about.c:746 src/main.c:2581
+#: src/gtk/about.c:746 src/main.c:2584
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total mensajes salientes: %d\n"
@@ -4379,10 +4343,10 @@ msgstr "No se encontraron faltas ortográficas."
 msgid "Replace unknown word"
 msgstr "Sustituir palabra desconocida"
 
-#: src/gtk/gtkaspell.c:1459
+#: src/gtk/gtkaspell.c:1460
 #, c-format
-msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Sustituir \"%s\" con: </span>"
+msgid "Replace \"%s\" with: "
+msgstr "Sustituir «%s» con: "
 
 #: src/gtk/gtkaspell.c:1503
 msgid ""
@@ -4480,8 +4444,8 @@ msgid "Configuring..."
 msgstr "Configurando..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2174 src/prefs_summaries.c:436
-#: src/prefs_summary_column.c:84 src/quote_fmt.c:49 src/summaryview.c:444
+#: src/prefs_matcher.c:2165 src/prefs_summaries.c:435
+#: src/prefs_summary_column.c:84 src/quote_fmt.c:49 src/summaryview.c:443
 msgid "Date"
 msgstr "Fecha"
 
@@ -4490,8 +4454,8 @@ msgid "Date:"
 msgstr "Fecha:"
 
 #: src/gtk/headers.h:10 src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2171 src/prefs_summaries.c:438
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:50 src/summaryview.c:442
+#: src/prefs_matcher.c:2162 src/prefs_summaries.c:437
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:50 src/summaryview.c:441
 msgid "From"
 msgstr "Desde"
 
@@ -4512,14 +4476,14 @@ msgid "Reply-To"
 msgstr "Responder a"
 
 #: src/gtk/headers.h:13 src/plugins/address_keeper/address_keeper_prefs.c:140
-#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2172
-#: src/prefs_summaries.c:439 src/prefs_summary_column.c:83 src/quote_fmt.c:57
-#: src/summaryview.c:443
+#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2163
+#: src/prefs_summaries.c:438 src/prefs_summary_column.c:83 src/quote_fmt.c:57
+#: src/summaryview.c:442
 msgid "To"
 msgstr "Para"
 
 #: src/gtk/headers.h:14 src/plugins/address_keeper/address_keeper_prefs.c:149
-#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2173
+#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2164
 #: src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
@@ -4529,7 +4493,7 @@ msgid "Bcc"
 msgstr "Bcc"
 
 #: src/gtk/headers.h:16 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2175 src/quote_fmt.c:61
+#: src/prefs_matcher.c:2166 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "ID-Mensaje"
 
@@ -4542,7 +4506,7 @@ msgid "In-Reply-To"
 msgstr "En-Respuesta-A"
 
 #: src/gtk/headers.h:18 src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2177 src/quote_fmt.c:60
+#: src/prefs_matcher.c:2168 src/quote_fmt.c:60
 msgid "References"
 msgstr "Referencias"
 
@@ -4551,17 +4515,17 @@ msgid "References:"
 msgstr "Referencias:"
 
 #: src/gtk/headers.h:19 src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2170 src/prefs_summaries.c:440
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:56 src/summaryview.c:441
+#: src/prefs_matcher.c:2161 src/prefs_summaries.c:439
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:56 src/summaryview.c:440
 msgid "Subject"
 msgstr "Asunto"
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:702
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:703
 #: src/summary_search.c:440
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: src/gtk/headers.h:20
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:432
 msgid "Comments"
 msgstr "Comentarios"
 
@@ -4573,7 +4537,7 @@ msgstr "Comentarios:"
 msgid "Keywords"
 msgstr "Palabras clave"
 
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:704
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Keywords:"
 msgstr "Palabras clave:"
 
@@ -4650,7 +4614,7 @@ msgid "Received:"
 msgstr "Recibido:"
 
 #: src/gtk/headers.h:33 src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2176 src/quote_fmt.c:59
+#: src/prefs_matcher.c:2167 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
@@ -4675,8 +4639,8 @@ msgid "Seen:"
 msgstr "Visto:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:79 src/summaryview.c:2801
+#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:443
+#: src/prefs_summary_column.c:79 src/summaryview.c:2805
 msgid "Status"
 msgstr "Estado"
 
@@ -4966,11 +4930,10 @@ msgstr "Leyenda de iconos"
 
 #: src/gtk/icon_legend.c:140
 msgid ""
-"<span weight=\"bold\">The following icons are used to show the status of "
-"messages and folders:</span>"
+"The following icons are used to show the status of messages and folders:"
 msgstr ""
-"<span weight=\"bold\">Los siguientes iconos se usan para mostrar el estado "
-"de los mensajes y las carpetas:</span>"
+"Los siguientes iconos se usan para mostrar el estado de los mensajes y "
+"las carpetas:"
 
 #: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
 #, c-format
@@ -5005,16 +4968,20 @@ msgid "Clear _Log"
 msgstr "_Limpiar traza"
 
 #: src/gtk/menu.c:137
+msgid "Warning:"
+msgstr "Aviso:"
+
+#: src/gtk/menu.c:138
 msgid ""
-"<span><b>Warning:</b> This URL was too long for displaying and\n"
+"This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
-"corrupted, malformed or part of some DoS attempt.</span>"
+"corrupted, malformed or part of some DoS attempt."
 msgstr ""
-"<span><b>Aviso:</b> Esta URL ha sido truncada por seguridad ya\n"
-"que era demasiado larga para mostrarla. Este mensaje podría estar\n"
-"corrompido, mal construido o ser parte de un intento de DoS.</span>"
+"Esta URL era demasiado larga para mostrarla y ha sido truncada\n"
+"por seguridad. Este mensaje podría estar corrompido, mal construido\n"
+"o ser parte de un intento de denegación de servicio (DoS)."
 
-#: src/gtk/pluginwindow.c:164 src/gtk/pluginwindow.c:169
+#: src/gtk/pluginwindow.c:163 src/gtk/pluginwindow.c:168
 msgid ""
 "\n"
 "\n"
@@ -5024,19 +4991,19 @@ msgstr ""
 "\n"
 "Versión: "
 
-#: src/gtk/pluginwindow.c:167
+#: src/gtk/pluginwindow.c:166
 msgid "Error: "
 msgstr "Error: "
 
-#: src/gtk/pluginwindow.c:168
+#: src/gtk/pluginwindow.c:167
 msgid "Plugin is not functional."
 msgstr "El módulo no está operativo."
 
-#: src/gtk/pluginwindow.c:201
+#: src/gtk/pluginwindow.c:200
 msgid "Select the Plugins to load"
 msgstr "Seleccionar los módulos a cargar"
 
-#: src/gtk/pluginwindow.c:216
+#: src/gtk/pluginwindow.c:215
 #, c-format
 msgid ""
 "The following error occurred while loading %s :\n"
@@ -5047,7 +5014,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:304 src/plugins/acpi_notifier/acpi_notifier.c:790
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:790
 #: src/plugins/address_keeper/address_keeper_prefs.c:256
 #: src/plugins/archive/archiver_prefs.c:90
 #: src/plugins/attachwarner/attachwarner_prefs.c:229
@@ -5067,43 +5034,40 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:487
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
-#: src/plugins/pgpcore/prefs_gpg.c:615 src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:79
-#: src/plugins/spamassassin/spamassassin_gtk.c:648
-#: src/plugins/vcalendar/vcal_prefs.c:680 src/prefs_toolbar.c:944
+#: src/plugins/spamassassin/spamassassin_gtk.c:647
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Módulos"
 
-#: src/gtk/pluginwindow.c:337
+#: src/gtk/pluginwindow.c:336
 msgid "Load..."
 msgstr "Cargar..."
 
-#: src/gtk/pluginwindow.c:338
+#: src/gtk/pluginwindow.c:337
 msgid "Unload"
 msgstr "Descargar"
 
-#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:223
+#: src/gtk/pluginwindow.c:350 src/prefs_summaries.c:222
 msgid "Description"
 msgstr "Descripción"
 
 #: src/gtk/pluginwindow.c:374
 #, c-format
-msgid ""
-"For more information about plugins see the <a href=\"%s\"><span underline="
-"\"none\">Claws Mail website</span></a>."
+msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr ""
-"Para más información sobre los módulos vea el <a href=\"%s\"><span underline="
-"\"none\">sitio web de Claws Mail</span></a>."
+"Para más información sobre los módulos vea el %ssitio web de Claws Mail%s."
 
-#: src/gtk/pluginwindow.c:414
+#: src/gtk/pluginwindow.c:415
 msgid "Click here to load one or more plugins"
 msgstr "Pulse aquí para cargar uno o más módulos"
 
-#: src/gtk/pluginwindow.c:417
+#: src/gtk/pluginwindow.c:418
 msgid "Unload the selected plugin"
 msgstr "Descargar el módulo seleccionado"
 
-#: src/gtk/pluginwindow.c:482
+#: src/gtk/pluginwindow.c:483
 msgid "Loaded plugins"
 msgstr "Módulos cargados"
 
@@ -5116,9 +5080,9 @@ msgid "_Hide"
 msgstr "_Ocultar"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3232 src/prefs_account.c:3250 src/prefs_account.c:3268
-#: src/prefs_account.c:3286 src/prefs_account.c:3304 src/prefs_account.c:3322
-#: src/prefs_account.c:3341 src/prefs_account.c:3433
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5527,14 +5491,14 @@ msgstr "Etiquetas:"
 
 #: src/headerview.c:193 src/plugins/notification/notification_popup.c:316
 #: src/plugins/notification/notification_popup.c:623
-#: src/plugins/notification/notification_trayicon.c:845 src/summaryview.c:3361
-#: src/summaryview.c:3379 src/summaryview.c:3400
+#: src/plugins/notification/notification_trayicon.c:845 src/summaryview.c:3363
+#: src/summaryview.c:3381 src/summaryview.c:3402
 msgid "(No From)"
 msgstr "(Sin remite)"
 
 #: src/headerview.c:208 src/plugins/notification/notification_popup.c:318
 #: src/plugins/notification/notification_popup.c:627
-#: src/plugins/notification/notification_trayicon.c:848 src/summaryview.c:3413
+#: src/plugins/notification/notification_trayicon.c:848 src/summaryview.c:3414
 #: src/summaryview.c:3417
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
@@ -5543,8 +5507,9 @@ msgstr "(Sin asunto)"
 msgid "Error:"
 msgstr "Error:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2549
-#: src/plugins/pdf_viewer/poppler_viewer.c:698
+#: src/image_viewer.c:299 src/mimeview.c:2558
+#: src/plugins/att_remover/att_remover.c:301
+#: src/plugins/pdf_viewer/poppler_viewer.c:699
 msgid "Filename:"
 msgstr "Nombre del fichero:"
 
@@ -5560,223 +5525,187 @@ msgstr "Cargar imagen"
 msgid "IMAP4 connection broken\n"
 msgstr "La conexión IMAP4 se rompió\n"
 
-#: src/imap.c:621
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 #, c-format
-msgid "IMAP error on %s: authenticated\n"
-msgstr "Error IMAP en %s: autentificado\n"
+msgid "IMAP error on %s:"
+msgstr "Error IMAP en %s:"
+
+#: src/imap.c:621
+msgid " authenticated\n"
+msgstr " autenticado\n"
 
 #: src/imap.c:624
-#, c-format
-msgid "IMAP error on %s: not authenticated\n"
-msgstr "Error IMAP en %s: no autentificado\n"
+msgid " not authenticated\n"
+msgstr " sin autenticación\n"
 
 #: src/imap.c:627
-#, c-format
-msgid "IMAP error on %s: bad state\n"
-msgstr "Error IMAP en %s: estado incorrecto\n"
+msgid " bad state\n"
+msgstr " estado incorrecto\n"
 
 #: src/imap.c:630
-#, c-format
-msgid "IMAP error on %s: stream error\n"
-msgstr "Error IMAP en %s: error del flujo\n"
+msgid " stream error\n"
+msgstr " error del canal\n"
 
 #: src/imap.c:633
-#, c-format
-msgid ""
-"IMAP error on %s: parse error (very probably non-RFC compliance from the "
-"server)\n"
-msgstr ""
-"Error IMAP en %s: error interpretando (seguramente el servidor no es "
-"conforme a los RFC)\n"
+msgid " parse error (very probably non-RFC compliance from the server)\n"
+msgstr " error interpretando (seguramente el servidor no es conforme a los RFC)\n"
 
 #: src/imap.c:637
-#, c-format
-msgid "IMAP error on %s: connection refused\n"
-msgstr "Error IMAP en %s: conexión rechazada\n"
+msgid " connection refused\n"
+msgstr " conexión rehusada\n"
 
 #: src/imap.c:640
-#, c-format
-msgid "IMAP error on %s: memory error\n"
-msgstr "Error IMAP en %s: error de memoria\n"
+msgid " memory error\n"
+msgstr " error de memoria\n"
 
 #: src/imap.c:643
-#, c-format
-msgid "IMAP error on %s: fatal error\n"
-msgstr "Error IMAP en %s: error fatal\n"
+msgid " fatal error\n"
+msgstr " error fatal\n"
 
 #: src/imap.c:646
-#, c-format
-msgid ""
-"IMAP error on %s: protocol error(very probably non-RFC compliance from the "
-"server)\n"
-msgstr ""
-"Error IMAP en %s: error de protocolo (seguramente el servidor no es conforme "
-"a los RFC)\n"
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
+msgstr "  error de protocolo (seguramente el servidor no es conforme a los RFC)\n"
 
 #: src/imap.c:650
-#, c-format
-msgid "IMAP error on %s: connection not accepted\n"
-msgstr "Error IMAP en %s: la conexión no fue aceptada\n"
+msgid " connection not accepted\n"
+msgstr " la conexión no fue aceptada\n"
 
 #: src/imap.c:653
-#, c-format
-msgid "IMAP error on %s: APPEND error\n"
-msgstr "Error IMAP en %s: error de APPEND\n"
+msgid " APPEND error\n"
+msgstr " error de APPEND\n"
 
 #: src/imap.c:656
-#, c-format
-msgid "IMAP error on %s: NOOP error\n"
-msgstr "Error IMAP en %s: error de NOOP\n"
+msgid " NOOP error\n"
+msgstr " error de NOOP\n"
 
 #: src/imap.c:659
-#, c-format
-msgid "IMAP error on %s: LOGOUT error\n"
-msgstr "Error IMAP en %s: error de LOGOUT\n"
+msgid " LOGOUT error\n"
+msgstr " error de LOGOUT\n"
 
 #: src/imap.c:662
-#, c-format
-msgid "IMAP error on %s: CAPABILITY error\n"
-msgstr "Error IMAP en %s: error de CAPABILITY\n"
+msgid " CAPABILITY error\n"
+msgstr " error de CAPABILITY\n"
 
 #: src/imap.c:665
-#, c-format
-msgid "IMAP error on %s: CHECK error\n"
-msgstr "Error IMAP en %s: error de CHECK\n"
+msgid " CHECK error\n"
+msgstr " error de CHECK\n"
 
 #: src/imap.c:668
-#, c-format
-msgid "IMAP error on %s: CLOSE error\n"
-msgstr "Error IMAP en %s: error de CLOSE\n"
+msgid " CLOSE error\n"
+msgstr " error de CLOSE\n"
 
 #: src/imap.c:671
-#, c-format
-msgid "IMAP error on %s: EXPUNGE error\n"
-msgstr "Error IMAP en %s: error de EXPUNGE\n"
+msgid " EXPUNGE error\n"
+msgstr " error de EXPUNGE\n"
 
 #: src/imap.c:674
-#, c-format
-msgid "IMAP error on %s: COPY error\n"
-msgstr "Error IMAP en %s: error de COPY\n"
+msgid " COPY error\n"
+msgstr " error de COPY\n"
 
 #: src/imap.c:677
-#, c-format
-msgid "IMAP error on %s: UID COPY error\n"
-msgstr "Error IMAP en %s: error de UID COPY\n"
+msgid " UID COPY error\n"
+msgstr " error de UID COPY\n"
 
 #: src/imap.c:680
-#, c-format
-msgid "IMAP error on %s: CREATE error\n"
-msgstr "Error IMAP en %s: error de CREATE\n"
+msgid " CREATE error\n"
+msgstr " error de CREATE\n"
 
 #: src/imap.c:683
-#, c-format
-msgid "IMAP error on %s: DELETE error\n"
-msgstr "Error IMAP en %s: error de DELETE\n"
+msgid " DELETE error\n"
+msgstr " error de DELETE\n"
 
 #: src/imap.c:686
-#, c-format
-msgid "IMAP error on %s: EXAMINE error\n"
-msgstr "Error IMAP en %s: error de EXAMINE\n"
+msgid " EXAMINE error\n"
+msgstr " error de EXAMINE\n"
 
 #: src/imap.c:689
-#, c-format
-msgid "IMAP error on %s: FETCH error\n"
-msgstr "Error IMAP en %s: error de FETCH\n"
+msgid " FETCH error\n"
+msgstr " error de FETCH\n"
 
 #: src/imap.c:692
-#, c-format
-msgid "IMAP error on %s: UID FETCH error\n"
-msgstr "Error IMAP en %s: error de UID FETCH\n"
+msgid " UID FETCH error\n"
+msgstr " error de UID FETCH\n"
 
 #: src/imap.c:695
-#, c-format
-msgid "IMAP error on %s: LIST error\n"
-msgstr "Error IMAP en %s: error de LIST\n"
+msgid " LIST error\n"
+msgstr " error de LIST\n"
 
 #: src/imap.c:698
-#, c-format
-msgid "IMAP error on %s: LOGIN error\n"
-msgstr "Error IMAP en %s: error de LOGIN\n"
+msgid " LOGIN error\n"
+msgstr " error de LOGIN\n"
 
 #: src/imap.c:701
-#, c-format
-msgid "IMAP error on %s: LSUB error\n"
-msgstr "Error IMAP en %s: error de LSUB\n"
+msgid " LSUB error\n"
+msgstr " error de LSUB\n"
 
 #: src/imap.c:704
-#, c-format
-msgid "IMAP error on %s: RENAME error\n"
-msgstr "Error IMAP en %s: error de RENAME\n"
+msgid " RENAME error\n"
+msgstr " error de RENAME\n"
 
 #: src/imap.c:707
-#, c-format
-msgid "IMAP error on %s: SEARCH error\n"
-msgstr "Error IMAP en %s: error de SEARCH\n"
+msgid " SEARCH error\n"
+msgstr " error de SEARCH\n"
 
 #: src/imap.c:710
-#, c-format
-msgid "IMAP error on %s: UID SEARCH error\n"
-msgstr "Error IMAP en %s: error de UID SEARCH\n"
+msgid " UID SEARCH error\n"
+msgstr " error de UID SEARCH\n"
 
 #: src/imap.c:713
-#, c-format
-msgid "IMAP error on %s: SELECT error\n"
-msgstr "Error IMAP en %s: error de SELECT\n"
+msgid " SELECT error\n"
+msgstr " error de SELECT\n"
 
 #: src/imap.c:716
-#, c-format
-msgid "IMAP error on %s: STATUS error\n"
-msgstr "Error IMAP en %s: error de STATUS\n"
+msgid " STATUS error\n"
+msgstr " error de STATUS\n"
 
 #: src/imap.c:719
-#, c-format
-msgid "IMAP error on %s: STORE error\n"
-msgstr "Error IMAP en %s: error de STORE\n"
+msgid " STORE error\n"
+msgstr " error de STORE\n"
 
 #: src/imap.c:722
-#, c-format
-msgid "IMAP error on %s: UID STORE error\n"
-msgstr "Error IMAP en %s: error de UID STORE\n"
+msgid " UID STORE error\n"
+msgstr " error de UID STORE\n"
 
 #: src/imap.c:725
-#, c-format
-msgid "IMAP error on %s: SUBSCRIBE error\n"
-msgstr "Error IMAP en %s: error de SUBSCRIBE\n"
+msgid " SUBSCRIBE error\n"
+msgstr " error de SUBSCRIBE\n"
 
 #: src/imap.c:728
-#, c-format
-msgid "IMAP error on %s: UNSUBSCRIBE error\n"
-msgstr "Error IMAP en %s: error de UNSUBSCRIBE\n"
+msgid " UNSUBSCRIBE error\n"
+msgstr " error de UNSUBSCRIBE\n"
 
 #: src/imap.c:731
-#, c-format
-msgid "IMAP error on %s: STARTTLS error\n"
-msgstr "Error IMAP en %s: error de STARTTLS\n"
+msgid " STARTTLS error\n"
+msgstr " error de STARTTLS\n"
 
 #: src/imap.c:734
-#, c-format
-msgid "IMAP error on %s: INVAL error\n"
-msgstr "Error IMAP en %s: error de INVAL\n"
+msgid " INVAL error\n"
+msgstr " error de INVAL\n"
 
 #: src/imap.c:737
-#, c-format
-msgid "IMAP error on %s: EXTENSION error\n"
-msgstr "Error IMAP en %s: error de EXTENSION\n"
+msgid " EXTENSION error\n"
+msgstr " error de EXTENSION\n"
 
 #: src/imap.c:740
-#, c-format
-msgid "IMAP error on %s: SASL error\n"
-msgstr "Error IMAP en %s: error de SASL\n"
+msgid " SASL error\n"
+msgstr " error de SASL\n"
 
 #: src/imap.c:744
-#, c-format
-msgid "IMAP error on %s: SSL error\n"
-msgstr "Error IMAP en %s: error de SSL\n"
+msgid " SSL error\n"
+msgstr " error de SSL\n"
 
 #: src/imap.c:748
 #, c-format
-msgid "IMAP error on %s: Unknown error [%d]\n"
-msgstr "Error IMAP en %s: error desconocido [%d]\n"
+msgid " Unknown error [%d]\n"
+msgstr " Error desconocido [%d]\n"
 
 #: src/imap.c:940
 msgid ""
@@ -5834,8 +5763,8 @@ msgstr "Falló la conexión con %s"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La conexión IMAP4 con %s se ha desconectado. Reconectando...\n"
 
-#: src/imap.c:1021 src/imap.c:3646 src/imap.c:4305 src/imap.c:4402
-#: src/imap.c:4582 src/imap.c:5391
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail necesita acceso a la red para poder acceder al servidor IMAP."
@@ -5876,7 +5805,7 @@ msgstr "No se puede conectar al servidor IMAP4: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No se puede conectar al servidor IMAP4: %s:%d\n"
 
-#: src/imap.c:1231 src/imap.c:4067
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "No se puede iniciar la sesión TLS.\n"
 
@@ -5898,63 +5827,63 @@ msgstr "Añadiendo mensajes..."
 msgid "Copying messages..."
 msgstr "Copiando mensajes..."
 
-#: src/imap.c:2507
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "no se pueden establecer los flags «borrado»\n"
 
-#: src/imap.c:2514 src/imap.c:5021
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "no puedo purgar\n"
 
-#: src/imap.c:2865
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscando carpetas no suscritas en %s..."
 
-#: src/imap.c:2868
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscando subcarpetas de %s..."
 
-#: src/imap.c:3186
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 
-#: src/imap.c:3201
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 
-#: src/imap.c:3332
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "no puedo renombrar el buzón: %s a %s\n"
 
-#: src/imap.c:3445
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "no se puede borrar el buzón\n"
 
-#: src/imap.c:3724
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "LIST falló\n"
 
-#: src/imap.c:3809
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "Etiquetando mensajes..."
 
-#: src/imap.c:3912
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: src/imap.c:4064
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "El servidor necesita TLS para acceder a él.\n"
 
-#: src/imap.c:4074
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "No se pueden refrescar las capacidades.\n"
 
-#: src/imap.c:4079
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5963,20 +5892,20 @@ msgstr ""
 "La conexión con %s falló: el servidor necesita TLS, pero Claws Mail ha sido "
 "compilado sin soporte TLS.\n"
 
-#: src/imap.c:4087
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "Los accesos al servidor están deshabilitados.\n"
 
-#: src/imap.c:4310
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr "Recuperando mensaje..."
 
-#: src/imap.c:5014
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no se pueden establecer los flags 'borrado': %d\n"
 
-#: src/imap.c:6049
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6049,7 +5978,7 @@ msgstr "R_econstruir árbol de carpetas"
 msgid "Show only subscribed _folders"
 msgstr "Mostrar sólo las carpe_tas suscritas"
 
-#: src/imap_gtk.c:196
+#: src/imap_gtk.c:195
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
@@ -6059,26 +5988,26 @@ msgstr ""
 "(si quiere crear una carpeta para almacenar subcarpetas\n"
 "sólo y no correo, añada «/» al final del nombre)"
 
-#: src/imap_gtk.c:200 src/mh_gtk.c:148
+#: src/imap_gtk.c:199 src/mh_gtk.c:147
 msgid "Inherit properties from parent folder"
 msgstr "Heredar las propiedades de la carpeta padre"
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/news_gtk.c:306
-#: src/plugins/mailmbox/plugin_gtk.c:414 src/plugins/rssyl/rssyl_cb_menu.c:201
-#: src/plugins/vcalendar/vcal_folder.c:2034
+#: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
+#: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Introduzca el nuevo nombre para «%s»:"
 
-#: src/imap_gtk.c:263 src/mh_gtk.c:256 src/plugins/mailmbox/plugin_gtk.c:415
-#: src/plugins/rssyl/rssyl_cb_menu.c:202
-#: src/plugins/vcalendar/vcal_folder.c:2035
+#: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
+#: src/plugins/rssyl/rssyl_cb_menu.c:200
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: src/imap_gtk.c:292 src/mh_gtk.c:282 src/news_gtk.c:328
-#: src/plugins/mailmbox/plugin_gtk.c:445 src/plugins/rssyl/rssyl_cb_menu.c:228
-#: src/plugins/vcalendar/vcal_folder.c:2055
+#: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
+#: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6086,7 +6015,7 @@ msgstr ""
 "No se puede renombrar la carpeta.\n"
 "El nuevo nombre no está permitido."
 
-#: src/imap_gtk.c:360 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:154
+#: src/imap_gtk.c:359 src/mh_gtk.c:202 src/plugins/rssyl/rssyl_cb_menu.c:152
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6099,44 +6028,44 @@ msgstr ""
 "\n"
 "¿Está seguro de que quiere borrarlos?"
 
-#: src/imap_gtk.c:381 src/news_gtk.c:281 src/plugins/mailmbox/plugin_gtk.c:350
-#: src/plugins/rssyl/rssyl_cb_menu.c:175
-#: src/plugins/vcalendar/vcal_folder.c:1988
+#: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
+#: src/plugins/rssyl/rssyl_cb_menu.c:173
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No se puede eliminar la carpeta «%s»."
 
-#: src/imap_gtk.c:507
+#: src/imap_gtk.c:506
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr "¿Quiere buscar subcarpetas no suscritas de «%s»?"
 
-#: src/imap_gtk.c:510
+#: src/imap_gtk.c:509
 msgid "Search recursively"
 msgstr "Buscar recursivamente"
 
-#: src/imap_gtk.c:515 src/imap_gtk.c:574
+#: src/imap_gtk.c:514 src/imap_gtk.c:573
 msgid "Subscriptions"
 msgstr "Suscripciones"
 
-#: src/imap_gtk.c:516
-msgid "+_Search"
-msgstr "+_Buscar"
+#: src/imap_gtk.c:515
+msgid "_Search"
+msgstr "_Buscar"
 
-#: src/imap_gtk.c:526
+#: src/imap_gtk.c:525
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Elija una subcarpeta de %s a la que suscribirse: "
 
-#: src/imap_gtk.c:537 src/mainwindow.c:675
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "Suscribir"
 
-#: src/imap_gtk.c:539 src/imap_gtk.c:541
+#: src/imap_gtk.c:538 src/imap_gtk.c:540
 msgid "All of them"
 msgstr "Todas ellas"
 
-#: src/imap_gtk.c:557
+#: src/imap_gtk.c:556
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -6148,31 +6077,31 @@ msgstr ""
 "Si hay nuevas carpetas, creadas y suscritas desde otro cliente, utilice "
 "«Comprobar si hay carpetas nuevas» en la raíz del buzón."
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:565
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "¿Quiere %s la carpeta «%s»?"
 
-#: src/imap_gtk.c:567
+#: src/imap_gtk.c:566
 msgid "subscribe"
 msgstr "suscribir"
 
-#: src/imap_gtk.c:567
+#: src/imap_gtk.c:566
 msgid "unsubscribe"
 msgstr "desuscribir"
 
-#: src/imap_gtk.c:569 src/prefs_folder_item.c:1440
-#: src/prefs_folder_item.c:1468 src/prefs_folder_item.c:1496
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428
+#: src/prefs_folder_item.c:1456 src/prefs_folder_item.c:1484
 msgid "Apply to subfolders"
 msgstr "Aplicar a subcarpetas"
 
-#: src/imap_gtk.c:575
-msgid "+_Subscribe"
-msgstr "+_Suscribir"
+#: src/imap_gtk.c:574
+msgid "_Subscribe"
+msgstr "_Suscribir"
 
-#: src/imap_gtk.c:575
-msgid "+_Unsubscribe"
-msgstr "+_Desuscribir"
+#: src/imap_gtk.c:575 src/news_gtk.c:267
+msgid "_Unsubscribe"
+msgstr "Des_uscribir"
 
 #: src/import.c:113 src/import.c:207
 msgid "Import mbox file"
@@ -6206,35 +6135,35 @@ msgstr "No se puede encontrar carpeta de destino."
 msgid "Select importing file"
 msgstr "Seleccionar fichero a importar"
 
-#: src/importldif.c:186
+#: src/importldif.c:185
 msgid "Please specify address book name and file to import."
 msgstr "Especifique el nombre de la agenda y el fichero a importar."
 
-#: src/importldif.c:189
+#: src/importldif.c:188
 msgid "Select and rename LDIF field names to import."
 msgstr "Seleccione y renombre los campos LDIF a importar."
 
-#: src/importldif.c:192
+#: src/importldif.c:191
 msgid "File imported."
 msgstr "Fichero importado."
 
-#: src/importldif.c:451 src/importmutt.c:123 src/importpine.c:122
+#: src/importldif.c:450 src/importmutt.c:122 src/importpine.c:121
 msgid "Please select a file."
 msgstr "Seleccione un fichero."
 
-#: src/importldif.c:457 src/importmutt.c:128 src/importpine.c:127
+#: src/importldif.c:456 src/importmutt.c:127 src/importpine.c:126
 msgid "Address book name must be supplied."
 msgstr "Debe proporcionar un nombre de agenda de direcciones."
 
-#: src/importldif.c:497
+#: src/importldif.c:496
 msgid "LDIF file imported successfully."
 msgstr "Fichero LDIF importado con éxito."
 
-#: src/importldif.c:582
+#: src/importldif.c:581
 msgid "Select LDIF File"
 msgstr "Seleccionar fichero LDIF"
 
-#: src/importldif.c:668
+#: src/importldif.c:667
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
@@ -6242,43 +6171,43 @@ msgstr ""
 "Especifique el nombre para la agenda que será creada a partir de los datos "
 "del fichero LDIF."
 
-#: src/importldif.c:673
+#: src/importldif.c:672
 msgid "File Name"
 msgstr "Nombre del fichero"
 
-#: src/importldif.c:683
+#: src/importldif.c:682
 msgid "The full file specification of the LDIF file to import."
 msgstr "La especificación completa del fichero LDIF a importar."
 
-#: src/importldif.c:690
+#: src/importldif.c:689
 msgid "Select the LDIF file to import."
 msgstr "Seleccione el fichero LDIF a importar."
 
-#: src/importldif.c:726
+#: src/importldif.c:725
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:727 src/summaryview.c:439
+#: src/importldif.c:726 src/summaryview.c:438
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:728
+#: src/importldif.c:727
 msgid "LDIF Field Name"
 msgstr "Nombre de campo LDIF"
 
-#: src/importldif.c:729
+#: src/importldif.c:728
 msgid "Attribute Name"
 msgstr "Nombre de atributo"
 
-#: src/importldif.c:784
+#: src/importldif.c:783
 msgid "LDIF Field"
 msgstr "Campo LDIF"
 
-#: src/importldif.c:796
+#: src/importldif.c:795
 msgid "Attribute"
 msgstr "Atributo"
 
-#: src/importldif.c:808
+#: src/importldif.c:807
 msgid ""
 "Choose the LDIF field that will be renamed or selected for import in the "
 "list above. Reserved fields (marked with a tick in the \"R\" column), are "
@@ -6296,63 +6225,63 @@ msgstr ""
 "debajo de la lista. Doble clic en cualquier parte de la fila y también será "
 "seleccionado el campo para importar."
 
-#: src/importldif.c:823
+#: src/importldif.c:822
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "El campo LDIF puede renombrarse al nombre del atributo de usuario."
 
-#: src/importldif.c:828
+#: src/importldif.c:827
 msgid "Select for Import"
 msgstr "Seleccionar para importar"
 
-#: src/importldif.c:833
+#: src/importldif.c:832
 msgid "Select the LDIF field for import into the address book."
 msgstr "Seleccionar el campo LDIF para importarlo a la agenda."
 
-#: src/importldif.c:835
+#: src/importldif.c:834
 msgid " Modify "
 msgstr " Modificar "
 
-#: src/importldif.c:840
+#: src/importldif.c:839
 msgid "This button will update the list above with the data supplied."
 msgstr "Este botón actualizará la lista superior con los datos proporcionados."
 
-#: src/importldif.c:912
+#: src/importldif.c:911
 msgid "Records Imported :"
 msgstr "Registros importados :"
 
-#: src/importldif.c:944
+#: src/importldif.c:943
 msgid "Import LDIF file into Address Book"
 msgstr "Importar fichero LDIF a la agenda"
 
-#: src/importldif.c:981
+#: src/importldif.c:980
 msgid "Proceed"
 msgstr "Proceder"
 
-#: src/importmutt.c:142
+#: src/importmutt.c:141
 msgid "Error importing MUTT file."
 msgstr "Error importando el fichero de MUTT."
 
-#: src/importmutt.c:157
+#: src/importmutt.c:156
 msgid "Select MUTT File"
 msgstr "Seleccionar fichero MUTT"
 
-#: src/importmutt.c:204
+#: src/importmutt.c:203
 msgid "Import MUTT file into Address Book"
 msgstr "Importar fichero MUTT a la agenda"
 
-#: src/importmutt.c:289 src/importpine.c:289
+#: src/importmutt.c:288 src/importpine.c:288
 msgid "Please select a file to import."
 msgstr "Seleccione el fichero a importar."
 
-#: src/importpine.c:141
+#: src/importpine.c:140
 msgid "Error importing Pine file."
 msgstr "Error importando el fichero de Pine."
 
-#: src/importpine.c:156
+#: src/importpine.c:155
 msgid "Select Pine File"
 msgstr "Seleccionar fichero Pine"
 
-#: src/importpine.c:203
+#: src/importpine.c:202
 msgid "Import Pine file into Address Book"
 msgstr "Importar fichero Pine a la agenda"
 
@@ -6400,12 +6329,12 @@ msgstr "Conexión fallida"
 msgid "Auth failed"
 msgstr "Autorización fallida"
 
-#: src/inc.c:662 src/prefs_matcher.c:396 src/prefs_summaries.c:447
-#: src/prefs_summary_column.c:88 src/summaryview.c:2797 src/summaryview.c:6338
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:378
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "Tiempo límite"
 
@@ -6587,7 +6516,7 @@ msgstr "Só_lo una vez"
 msgid "Some SN"
 msgstr "Algún SN"
 
-#: src/ldif.c:759
+#: src/ldif.c:758
 msgid "Nick Name"
 msgstr "Apodo"
 
@@ -6656,19 +6585,11 @@ msgstr "Migrando la configuración..."
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread no está soportado por glib.\n"
 
-#: src/main.c:1136
-msgid "Sylpheed-Claws 2.6.0 (or older)"
-msgstr "Sylpheed-Claws 2.6.0 (o anterior)"
+#: src/main.c:1137 src/main.c:1141 src/main.c:1145
+msgid "(or older)"
+msgstr "(o anterior)"
 
-#: src/main.c:1139
-msgid "Sylpheed-Claws 1.9.15 (or older)"
-msgstr "Sylpheed-Claws 1.9.15 (o anterior)"
-
-#: src/main.c:1142
-msgid "Sylpheed-Claws 1.0.5 (or older)"
-msgstr "Sylpheed-Claws 1.0.5 (o anterior)"
-
-#: src/main.c:1442
+#: src/main.c:1445
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6687,7 +6608,7 @@ msgstr[1] ""
 "de los módulos para más información:\n"
 "%s"
 
-#: src/main.c:1470
+#: src/main.c:1473
 msgid ""
 "Claws Mail has detected a configured mailbox, but it is incomplete. It is "
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
@@ -6697,7 +6618,7 @@ msgstr ""
 "ser debido a una cuenta IMAP que esté fallando. Utilice «Reconstruir árbol "
 "de carpetas» en la carpeta padre del buzón para intentar arreglarlo."
 
-#: src/main.c:1476
+#: src/main.c:1479
 msgid ""
 "Claws Mail has detected a configured mailbox, but could not load it. It is "
 "probably provided by an out-of-date external plugin. Please reinstall the "
@@ -6707,36 +6628,36 @@ msgstr ""
 "probable que esté soportado por un módulo externo desactualizado. Por favor "
 "reinstale el módulo e inténtelo de nuevo."
 
-#: src/main.c:1726
+#: src/main.c:1729
 msgid "Missing filename\n"
 msgstr "Falta el nombre de fichero\n"
 
-#: src/main.c:1733
+#: src/main.c:1736
 msgid "Cannot open filename for reading\n"
 msgstr "No se puede abrir el fichero para lectura\n"
 
-#: src/main.c:1744
+#: src/main.c:1747
 msgid "Malformed header\n"
 msgstr "Cabecera mal formada\n"
 
-#: src/main.c:1751
+#: src/main.c:1754
 msgid "Duplicated 'To:' header\n"
 msgstr "Cabecera «To:» duplicada\n"
 
-#: src/main.c:1762
+#: src/main.c:1765
 msgid "Missing required 'To:' header\n"
 msgstr "Falta la cabecera «To:» obligatoria\n"
 
-#: src/main.c:1905
+#: src/main.c:1908
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:1907
+#: src/main.c:1910
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre la ventana de edición"
 
-#: src/main.c:1908
+#: src/main.c:1911
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6754,11 +6675,11 @@ msgstr ""
 "vacía,\n"
 "                         después el cuerpo hasta fin de fichero."
 
-#: src/main.c:1913
+#: src/main.c:1916
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      suscribirse a la URI dada si es posible"
 
-#: src/main.c:1914
+#: src/main.c:1917
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6768,23 +6689,23 @@ msgstr ""
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados como adjuntos"
 
-#: src/main.c:1917
+#: src/main.c:1920
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recibe los mensajes nuevos"
 
-#: src/main.c:1918
+#: src/main.c:1921
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe mensajes nuevos de todas las cuentas"
 
-#: src/main.c:1919
+#: src/main.c:1922
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     cancela la recepción de mensajes en curso"
 
-#: src/main.c:1920
+#: src/main.c:1923
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       cancela el envío de mensajes en curso"
 
-#: src/main.c:1921
+#: src/main.c:1924
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6804,15 +6725,15 @@ msgstr ""
 "                         recursivo: falso si parám. empieza por: 0, n, N, f "
 "o F"
 
-#: src/main.c:1928
+#: src/main.c:1931
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todos los mensajes en la cola"
 
-#: src/main.c:1929
+#: src/main.c:1932
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  muestra el número total de mensajes"
 
-#: src/main.c:1930
+#: src/main.c:1933
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6820,15 +6741,15 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         muestra el estado de cada carpeta"
 
-#: src/main.c:1932
+#: src/main.c:1935
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           muestra las estadísticas de la sesión"
 
-#: src/main.c:1933
+#: src/main.c:1936
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     reinicializa las estadísticas de la sesión"
 
-#: src/main.c:1934
+#: src/main.c:1937
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6836,35 +6757,35 @@ msgstr ""
 "  --select carpt[/mnsj]  va a la carpeta/mensaje especificados\n"
 "                         carpt es un identificador como «carpeta/subcarpeta»"
 
-#: src/main.c:1936
+#: src/main.c:1939
 msgid "  --online               switch to online mode"
 msgstr "  --online               cambiar a modo de trabajo con conexión"
 
-#: src/main.c:1937
+#: src/main.c:1940
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              cambiar a modo de trabajo sin conexión"
 
-#: src/main.c:1938
+#: src/main.c:1941
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       salir de Claws Mail"
 
-#: src/main.c:1939
+#: src/main.c:1942
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:1940
+#: src/main.c:1943
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         activa o desactiva el modo de depuración"
 
-#: src/main.c:1941
+#: src/main.c:1944
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              presenta esta ayuda y finaliza"
 
-#: src/main.c:1942
+#: src/main.c:1945
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           informa de la versión y finaliza"
 
-#: src/main.c:1943
+#: src/main.c:1946
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6872,11 +6793,11 @@ msgstr ""
 "  --version-full -V      informa de la versión y características incluidas y "
 "finaliza"
 
-#: src/main.c:1944
+#: src/main.c:1947
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           muestra el directorio del configuración"
 
-#: src/main.c:1945
+#: src/main.c:1948
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6884,32 +6805,32 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                         usa el directorio del configuración especificado"
 
-#: src/main.c:1995
+#: src/main.c:1998
 msgid "Unknown option\n"
 msgstr "Error desconocido\n"
 
-#: src/main.c:2013
+#: src/main.c:2016
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Procesando (%s)..."
 
-#: src/main.c:2016
+#: src/main.c:2019
 msgid "top level folder"
 msgstr "carpeta superior"
 
-#: src/main.c:2099
+#: src/main.c:2102
 msgid "Queued messages"
 msgstr "Mensajes en cola"
 
-#: src/main.c:2100
+#: src/main.c:2103
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
 
-#: src/main.c:2842
+#: src/main.c:2845
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: la red está conectada.\n"
 
-#: src/main.c:2848
+#: src/main.c:2851
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: la red está desconectada.\n"
 
@@ -6917,7 +6838,7 @@ msgstr "NetworkManager: la red está desconectada.\n"
 msgid "_File"
 msgstr "_Fichero"
 
-#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:434
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr "_Ver"
 
@@ -7093,11 +7014,11 @@ msgstr "Siguiente _carpeta sin leer"
 msgid "_Other folder..."
 msgstr "_Otra carpeta..."
 
-#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr "Parte siguiente"
 
-#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:202
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Parte anterior"
 
@@ -7190,7 +7111,7 @@ msgstr "Componer un mensaje de noticias"
 msgid "_Reply"
 msgstr "_Responder"
 
-#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:426
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "Respon_der a"
 
@@ -7266,7 +7187,7 @@ msgstr "Borrar _hilo"
 msgid "Cancel a news message"
 msgstr "Cancelar una noticia"
 
-#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:427
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr "_Marcar"
 
@@ -7320,11 +7241,11 @@ msgstr "Bloquear"
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: src/mainwindow.c:717 src/summaryview.c:428
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "Etiqueta de co_lor"
 
-#: src/mainwindow.c:718 src/summaryview.c:429
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "Eti_quetas"
 
@@ -7332,7 +7253,7 @@ msgstr "Eti_quetas"
 msgid "Re-_edit"
 msgstr "Re_editar"
 
-#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1027
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Verificar firma"
 
@@ -7388,7 +7309,7 @@ msgstr "Por el _Para"
 msgid "By _Subject"
 msgstr "Por el A_sunto"
 
-#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:432
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "Crear regla de procesamiento"
 
@@ -7644,11 +7565,11 @@ msgstr "Por bloqueado"
 msgid "D_on't sort"
 msgstr "N_o ordenar"
 
-#: src/mainwindow.c:865 src/prefs_summaries.c:456
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: src/mainwindow.c:866 src/prefs_summaries.c:457
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "Descendente"
 
@@ -7656,7 +7577,7 @@ msgstr "Descendente"
 msgid "_Auto detect"
 msgstr "_Auto detectar"
 
-#: src/mainwindow.c:1305 src/summaryview.c:6264
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr "Aplicar etiquetas..."
 
@@ -7695,7 +7616,7 @@ msgstr "traza de filtrado desactivada\n"
 #: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
 #: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1065
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr "Sin título"
 
@@ -7750,127 +7671,127 @@ msgstr ""
 msgid "No posting allowed"
 msgstr "No esta permitido enviar"
 
-#: src/mainwindow.c:3972
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr "La importación de mbox ha fallado."
 
-#: src/mainwindow.c:3981 src/mainwindow.c:3990
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr "La exportación a mbox ha fallado."
 
-#: src/mainwindow.c:4031 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:4031 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr "¿Salir de Claws Mail?"
 
-#: src/mainwindow.c:4222
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr "Sincronización de carpeta"
 
-#: src/mainwindow.c:4223
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr "¿Quiere sincronizar sus carpetas ahora?"
 
-#: src/mainwindow.c:4224
-msgid "+_Synchronise"
-msgstr "+_Sincronizar"
+#: src/mainwindow.c:4229
+msgid "_Synchronise"
+msgstr "_Sincronizar"
 
-#: src/mainwindow.c:4665
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/mainwindow.c:4702
+#: src/mainwindow.c:4707
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Borrado %d mensaje repetido en %d carpetas.\n"
 msgstr[1] "Borrados %d mensajes repetidos en %d carpetas.\n"
 
-#: src/mainwindow.c:4963 src/summaryview.c:5753
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "Reglas de procesamiento a aplicar antes de las de las carpetas"
 
-#: src/mainwindow.c:4971
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "Reglas de procesamiento a aplicar después de las de las carpetas"
 
-#: src/mainwindow.c:4979 src/summaryview.c:5764
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "Configuración de filtrado"
 
-#: src/mainwindow.c:5094
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "No se puede registrar como cliente por defecto: imposible obtener la ruta al "
 "ejecutable."
 
-#: src/mainwindow.c:5153
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "Se ha registrado Claws Mail como cliente por defecto."
 
-#: src/mainwindow.c:5155
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "No se puede registrar como cliente por defecto: imposible escribir en el "
 "registro."
 
-#: src/mainwindow.c:5313
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "Olvidada %d contraseña en %d cuentas.\n"
 msgstr[1] "Olvidadas %d contraseñas en %d cuentas.\n"
 
-#: src/matcher.c:211 src/matcher.c:212 src/matcher.c:213 src/matcher.c:214
-#: src/matcher.c:215 src/matcher.c:216 src/matcher.c:217
+#: src/matcher.c:214 src/matcher.c:215 src/matcher.c:216 src/matcher.c:217
+#: src/matcher.c:218 src/matcher.c:219 src/matcher.c:220 src/matcher.c:221
 #, c-format
 msgid "%s header"
 msgstr "cabecera %s"
 
-#: src/matcher.c:218
+#: src/matcher.c:222
 msgid "header"
 msgstr "cabecera"
 
-#: src/matcher.c:219
+#: src/matcher.c:223
 msgid "header line"
 msgstr "línea de cabecera"
 
-#: src/matcher.c:220
+#: src/matcher.c:224
 msgid "body line"
 msgstr "línea de cuerpo"
 
-#: src/matcher.c:221
+#: src/matcher.c:225
 msgid "tag"
 msgstr "etiqueta"
 
-#: src/matcher.c:525 src/matcher.c:530 src/matcher.c:550 src/matcher.c:555
+#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
 #: src/message_search.c:212 src/prefs_matcher.c:742 src/summary_search.c:466
 msgid "Case sensitive"
 msgstr "Sensible a mayús./minús."
 
-#: src/matcher.c:525 src/matcher.c:530 src/matcher.c:550 src/matcher.c:555
+#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
 msgid "Case insensitive"
 msgstr "Ignorar mayús./minús."
 
-#: src/matcher.c:1843
+#: src/matcher.c:1849
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "comprobando si el mensaje coincide [ %s ]\n"
 
-#: src/matcher.c:1912 src/matcher.c:1931 src/matcher.c:1944
+#: src/matcher.c:1920 src/matcher.c:1939 src/matcher.c:1952
 msgid "message matches\n"
 msgstr "el mensaje coincide\n"
 
-#: src/matcher.c:1919 src/matcher.c:1937 src/matcher.c:1946
+#: src/matcher.c:1927 src/matcher.c:1945 src/matcher.c:1954
 msgid "message does not match\n"
 msgstr "el mensaje no coincide\n"
 
-#: src/matcher.c:2209 src/matcher.c:2210 src/matcher.c:2211 src/matcher.c:2212
-#: src/matcher.c:2213 src/matcher.c:2214 src/matcher.c:2215 src/matcher.c:2216
+#: src/matcher.c:2217 src/matcher.c:2218 src/matcher.c:2219 src/matcher.c:2220
+#: src/matcher.c:2221 src/matcher.c:2222 src/matcher.c:2223 src/matcher.c:2224
 msgid "(none)"
 msgstr "(ninguna)"
 
@@ -7898,8 +7819,8 @@ msgstr "Sobreescribir fichero mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Este fichero ya existe. ¿Desea sobreescribir su contenido?"
 
-#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1848
-#: src/prefs_themes.c:533 src/textview.c:3077
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
+#: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
@@ -7944,7 +7865,7 @@ msgstr "Se llegó al final del mensaje. ¿Seguir desde el principio?"
 msgid "Search finished"
 msgstr "Búsqueda concluida"
 
-#: src/messageview.c:298 src/textview.c:239
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr "Componer un mensaje _nuevo"
 
@@ -8002,9 +7923,9 @@ msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "El mensaje no cumple el estándar MIME. Puede mostrarse incorrectamente."
 
-#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:2001
-#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4831
-#: src/summaryview.c:4834 src/textview.c:3065
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
+#: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr "Guardar como"
 
@@ -8012,8 +7933,8 @@ msgstr "Guardar como"
 msgid "Overwrite existing file?"
 msgstr "¿Sobreescribir el fichero existente?"
 
-#: src/messageview.c:1857 src/summaryview.c:4851 src/summaryview.c:4854
-#: src/summaryview.c:4869
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "No se pudo guardar el fichero «%s»."
@@ -8111,7 +8032,7 @@ msgstr ""
 "Por favor, elija la cuenta que desea utilizar para enviar la notificación de "
 "acuse de recibo:"
 
-#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:588
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -8147,8 +8068,8 @@ msgstr ""
 "\n"
 "  El mensaje se ha borrado o movido a otra carpeta"
 
-#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4201
-#: src/summaryview.c:6992
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
+#: src/summaryview.c:7037
 msgid "An error happened while learning.\n"
 msgstr "Ocurrió un error mientras se aprendía.\n"
 
@@ -8164,7 +8085,7 @@ msgstr "Borrando mensajes..."
 msgid "Remove _mailbox..."
 msgstr "Eliminar _buzón..."
 
-#: src/mh_gtk.c:224
+#: src/mh_gtk.c:223
 #, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
@@ -8175,7 +8096,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:299
+#: src/mh_gtk.c:365 src/plugins/mailmbox/plugin_gtk.c:298
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
@@ -8184,63 +8105,63 @@ msgstr ""
 "¿Eliminar realmente el buzón «%s»?\n"
 "(Los mensajes NO serán borrados del disco)"
 
-#: src/mh_gtk.c:368 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/mh_gtk.c:367 src/plugins/mailmbox/plugin_gtk.c:300
 msgid "Remove mailbox"
 msgstr "Eliminar buzón"
 
-#: src/mimeview.c:193
+#: src/mimeview.c:192
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/mimeview.c:195
+#: src/mimeview.c:194
 msgid "Open _with..."
 msgstr "Abrir _con..."
 
-#: src/mimeview.c:197
+#: src/mimeview.c:196
 msgid "Send to..."
 msgstr "Enviar a..."
 
-#: src/mimeview.c:198
+#: src/mimeview.c:197
 msgid "_Display as text"
 msgstr "_Mostrar como texto"
 
-#: src/mimeview.c:199
+#: src/mimeview.c:198
 msgid "_Save as..."
 msgstr "_Guardar como..."
 
-#: src/mimeview.c:200
+#: src/mimeview.c:199
 msgid "Save _all..."
 msgstr "Gu_ardar todo..."
 
-#: src/mimeview.c:273
+#: src/mimeview.c:272
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: src/mimeview.c:1032 src/mimeview.c:1037 src/mimeview.c:1042
-#: src/mimeview.c:1047
+#: src/mimeview.c:1026 src/mimeview.c:1031 src/mimeview.c:1036
+#: src/mimeview.c:1041
 msgid "View full information"
 msgstr "Ver la información completa"
 
-#: src/mimeview.c:1053
+#: src/mimeview.c:1047
 msgid "Check again"
 msgstr "Verificar de nuevo"
 
-#: src/mimeview.c:1065
+#: src/mimeview.c:1059
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Pulse en el icono para comprobarla."
 
-#: src/mimeview.c:1067
+#: src/mimeview.c:1061
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Pulse en el icono o la tecla «%s» para comprobarla."
 
-#: src/mimeview.c:1077
+#: src/mimeview.c:1071
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Expiró el tiempo comprobando la firma. Pulse en el icono para reintentarlo."
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1073
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8248,40 +8169,40 @@ msgstr ""
 "Expiró el tiempo comprobando la firma. Pulse en el icono o la tecla «%s» "
 "para reintentarlo."
 
-#: src/mimeview.c:1319
+#: src/mimeview.c:1313
 msgid "Checking signature..."
 msgstr "Verificando firma..."
 
-#: src/mimeview.c:1360
+#: src/mimeview.c:1354
 msgid "Go back to email"
 msgstr "Volver al correo"
 
-#: src/mimeview.c:1767 src/mimeview.c:1856 src/mimeview.c:2048
-#: src/mimeview.c:2084 src/mimeview.c:2196
+#: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
+#: src/mimeview.c:2078 src/mimeview.c:2190
 #: src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "No se pudo guardar la parte del mensaje multipartes: %s"
 
-#: src/mimeview.c:1845 src/textview.c:3075
+#: src/mimeview.c:1839 src/textview.c:3073
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "¿Sobreescribir el fichero existente «%s»?"
 
-#: src/mimeview.c:1887 src/plugins/archive/archiver_prefs.c:126
+#: src/mimeview.c:1881 src/plugins/archive/archiver_prefs.c:126
 msgid "Select destination folder"
 msgstr "Seleccionar carpeta destino"
 
-#: src/mimeview.c:1894 src/plugins/archive/archiver_prefs.c:132
+#: src/mimeview.c:1888 src/plugins/archive/archiver_prefs.c:132
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "«%s» no es un directorio."
 
-#: src/mimeview.c:2131 src/mimeview.c:2138 src/textview.c:2992
+#: src/mimeview.c:2125 src/mimeview.c:2132 src/textview.c:2990
 msgid "Open with"
 msgstr "Abrir con"
 
-#: src/mimeview.c:2132 src/mimeview.c:2139 src/textview.c:2993
+#: src/mimeview.c:2126 src/mimeview.c:2133 src/textview.c:2991
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8290,11 +8211,22 @@ msgstr ""
 "Teclee la orden para abrir el fichero:\n"
 "(«%s» será sustituido por el fichero)"
 
-#: src/mimeview.c:2230
+#: src/mimeview.c:2228
+#, c-format
+msgid ""
+"Could not convert attachment name to UTF-16:\n"
+"\n"
+"%s"
+msgstr ""
+"No se pudo convertir el nombre del adjunto a UTF-16:\n"
+"\n"
+"%s"
+
+#: src/mimeview.c:2236
 msgid "Execute untrusted binary?"
 msgstr "¿Ejecutar binario no fiable?"
 
-#: src/mimeview.c:2231
+#: src/mimeview.c:2237
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8306,19 +8238,20 @@ msgstr ""
 "\n"
 "¿Desea ejecutar este fichero?"
 
-#: src/mimeview.c:2235
+#: src/mimeview.c:2241
 msgid "Run binary"
 msgstr "Ejecutar binario"
 
-#: src/mimeview.c:2534
+#: src/mimeview.c:2543 src/plugins/att_remover/att_remover.c:299
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/mimeview.c:2535 src/plugins/pdf_viewer/poppler_viewer.c:699
+#: src/mimeview.c:2544 src/plugins/att_remover/att_remover.c:300
+#: src/plugins/pdf_viewer/poppler_viewer.c:700 src/summaryview.c:2695
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: src/mimeview.c:2549 src/plugins/vcalendar/vcalendar.c:1271
+#: src/mimeview.c:2558 src/plugins/vcalendar/vcalendar.c:1274
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1722
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1732
 msgid "Description:"
@@ -8419,20 +8352,16 @@ msgstr "_Suscribirse a un grupo de noticias..."
 msgid "_Unsubscribe newsgroup"
 msgstr "Des_uscribir grupo de noticias"
 
-#: src/news_gtk.c:266
+#: src/news_gtk.c:265
 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr "¿Desuscribirse realmente del grupo «%s»?"
 
-#: src/news_gtk.c:267
+#: src/news_gtk.c:266
 msgid "Unsubscribe newsgroup"
 msgstr "Desuscribir grupo de noticias"
 
-#: src/news_gtk.c:268
-msgid "_Unsubscribe"
-msgstr "Des_uscribir"
-
-#: src/news_gtk.c:307
+#: src/news_gtk.c:306
 msgid "Rename newsgroup folder"
 msgstr "Renombrar carpeta de grupo de noticias"
 
@@ -8547,7 +8476,7 @@ msgid "Laptop LED"
 msgstr "LED del portátil"
 
 #: src/plugins/address_keeper/address_keeper.c:252
-#: src/plugins/attachwarner/attachwarner.c:250
+#: src/plugins/attachwarner/attachwarner.c:256
 msgid "Failed to register check before send hook"
 msgstr "Falló el registro de la función de comprobar antes de enviar"
 
@@ -8577,7 +8506,7 @@ msgstr "Ruta en la agenda donde se guardarán las direcciones"
 #: src/plugins/address_keeper/address_keeper_prefs.c:121
 #: src/plugins/bogofilter/bogofilter_gtk.c:278
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:447
+#: src/plugins/spamassassin/spamassassin_gtk.c:446
 #: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
 #: src/prefs_matcher.c:679
 msgid "Select..."
@@ -8683,36 +8612,36 @@ msgstr "Pulse el botón Cancelar para detener el archivado"
 msgid "Archiving:"
 msgstr "Archivando:"
 
-#: src/plugins/archive/archiver_gtk.c:503
+#: src/plugins/archive/archiver_gtk.c:507
 msgid "Folder and archive must be selected"
 msgstr "Debe seleccionar una carpeta y un archivo"
 
-#: src/plugins/archive/archiver_gtk.c:512
+#: src/plugins/archive/archiver_gtk.c:516
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s : ya existe. ¿Continuar de todas formas?"
 
-#: src/plugins/archive/archiver_gtk.c:515
+#: src/plugins/archive/archiver_gtk.c:519
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: es un enlace. No se puede continuar"
 
-#: src/plugins/archive/archiver_gtk.c:518
+#: src/plugins/archive/archiver_gtk.c:522
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: es un directorio. No se puede continuar"
 
-#: src/plugins/archive/archiver_gtk.c:521
+#: src/plugins/archive/archiver_gtk.c:525
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: no hay permisos. No se puede continuar"
 
-#: src/plugins/archive/archiver_gtk.c:524
+#: src/plugins/archive/archiver_gtk.c:528
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: error desconocido. No se puede continuar"
 
-#: src/plugins/archive/archiver_gtk.c:561
+#: src/plugins/archive/archiver_gtk.c:565
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -8721,7 +8650,7 @@ msgstr ""
 "Nombre de fichero inválido:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:574
+#: src/plugins/archive/archiver_gtk.c:578
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -8730,7 +8659,7 @@ msgstr ""
 "Nombre de carpeta de Claws Mail inválida:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:603
+#: src/plugins/archive/archiver_gtk.c:607
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -8745,181 +8674,181 @@ msgstr ""
 "\n"
 "¿Continuar de todas formas?"
 
-#: src/plugins/archive/archiver_gtk.c:705
+#: src/plugins/archive/archiver_gtk.c:709
 msgid "Archive result"
 msgstr "Resultado del archivado"
 
-#: src/plugins/archive/archiver_gtk.c:735
+#: src/plugins/archive/archiver_gtk.c:739
 msgid "Values"
 msgstr "Valores"
 
-#: src/plugins/archive/archiver_gtk.c:744
+#: src/plugins/archive/archiver_gtk.c:748
 msgid "Archive"
 msgstr "Archivo"
 
-#: src/plugins/archive/archiver_gtk.c:750
+#: src/plugins/archive/archiver_gtk.c:754
 msgid "Archive format"
 msgstr "Formato de archivo"
 
-#: src/plugins/archive/archiver_gtk.c:757
+#: src/plugins/archive/archiver_gtk.c:761
 msgid "Compression method"
 msgstr "Método de compresión"
 
-#: src/plugins/archive/archiver_gtk.c:765
+#: src/plugins/archive/archiver_gtk.c:769
 msgid "Number of files"
 msgstr "Número de ficheros"
 
-#: src/plugins/archive/archiver_gtk.c:773
+#: src/plugins/archive/archiver_gtk.c:777
 msgid "Archive Size"
 msgstr "Tamaño del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:781
+#: src/plugins/archive/archiver_gtk.c:785
 msgid "Folder Size"
 msgstr "Tamaño de la carpeta"
 
-#: src/plugins/archive/archiver_gtk.c:790
+#: src/plugins/archive/archiver_gtk.c:794
 msgid "Compression level"
 msgstr "Nivel de compresión"
 
-#: src/plugins/archive/archiver_gtk.c:795
-#: src/plugins/archive/archiver_gtk.c:803
-#: src/plugins/archive/archiver_gtk.c:811
-#: src/plugins/pdf_viewer/poppler_viewer.c:718 src/prefs_folder_item.c:514
+#: src/plugins/archive/archiver_gtk.c:799
+#: src/plugins/archive/archiver_gtk.c:807
+#: src/plugins/archive/archiver_gtk.c:815
+#: src/plugins/pdf_viewer/poppler_viewer.c:719 src/prefs_folder_item.c:507
 msgid "Yes"
 msgstr "Sí"
 
-#: src/plugins/archive/archiver_gtk.c:795
-#: src/plugins/archive/archiver_gtk.c:803
-#: src/plugins/archive/archiver_gtk.c:811
-#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:513
-#: src/prefs_summaries.c:373
+#: src/plugins/archive/archiver_gtk.c:799
+#: src/plugins/archive/archiver_gtk.c:807
+#: src/plugins/archive/archiver_gtk.c:815
+#: src/plugins/pdf_viewer/poppler_viewer.c:722 src/prefs_folder_item.c:506
+#: src/prefs_summaries.c:372
 msgid "No"
 msgstr "No"
 
-#: src/plugins/archive/archiver_gtk.c:798
+#: src/plugins/archive/archiver_gtk.c:802
 msgid "MD5 checksum"
 msgstr "Suma de control MD5"
 
-#: src/plugins/archive/archiver_gtk.c:806
+#: src/plugins/archive/archiver_gtk.c:810
 msgid "Descriptive names"
 msgstr "Nombres descriptivos"
 
-#: src/plugins/archive/archiver_gtk.c:814
+#: src/plugins/archive/archiver_gtk.c:818
 msgid "Delete selected files"
 msgstr "Borrar los ficheros seleccionados"
 
-#: src/plugins/archive/archiver_gtk.c:823
-#: src/plugins/archive/archiver_gtk.c:1199
+#: src/plugins/archive/archiver_gtk.c:827
+#: src/plugins/archive/archiver_gtk.c:1203
 msgid "Select mails before"
 msgstr "Seleccionar correos antes de"
 
-#: src/plugins/archive/archiver_gtk.c:899
+#: src/plugins/archive/archiver_gtk.c:903
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Seleccione un nombre para el archivo (el sufijo debería reflejar el tipo, p."
 "ej.: .tgz)"
 
-#: src/plugins/archive/archiver_gtk.c:947
+#: src/plugins/archive/archiver_gtk.c:951
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld de %ld"
 
-#: src/plugins/archive/archiver_gtk.c:984
+#: src/plugins/archive/archiver_gtk.c:988
 msgid "Create Archive"
 msgstr "Crear un archivo"
 
-#: src/plugins/archive/archiver_gtk.c:999
+#: src/plugins/archive/archiver_gtk.c:1003
 msgid "Enter Archiver arguments"
 msgstr "Parámetros de archivado"
 
-#: src/plugins/archive/archiver_gtk.c:1012
+#: src/plugins/archive/archiver_gtk.c:1016
 msgid "Folder to archive"
 msgstr "Carpeta a archivar"
 
-#: src/plugins/archive/archiver_gtk.c:1019
+#: src/plugins/archive/archiver_gtk.c:1023
 msgid "Folder which is the root of the archive"
 msgstr "Carpeta raíz del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1024
+#: src/plugins/archive/archiver_gtk.c:1028
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 "Pulse este botón para seleccionar la carpeta que será la raíz del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1030
+#: src/plugins/archive/archiver_gtk.c:1034
 msgid "Name for archive"
 msgstr "Nombre del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1036
+#: src/plugins/archive/archiver_gtk.c:1040
 msgid "Archive location and name"
 msgstr "Ubicación y nombre del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1038
+#: src/plugins/archive/archiver_gtk.c:1042
 #: src/plugins/archive/archiver_prefs.c:194
 #: src/plugins/pgpcore/select-keys.c:422
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: src/plugins/archive/archiver_gtk.c:1041
+#: src/plugins/archive/archiver_gtk.c:1045
 msgid "Click this button to select a name and location for the archive"
 msgstr "Pulse este botón para seleccionar el nombre y ubicación del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/archive/archiver_gtk.c:1047
 msgid "Choose compression"
 msgstr "Elija la compresión"
 
-#: src/plugins/archive/archiver_gtk.c:1056
+#: src/plugins/archive/archiver_gtk.c:1060
 msgid "Choose this option to use ZIP compression for the archive"
 msgstr "Utilizar compresión ZIP en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1063
+#: src/plugins/archive/archiver_gtk.c:1067
 msgid "Choose this option to use BZIP2 compression for the archive"
 msgstr "Utilizar compresión BZIP2 en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1070
+#: src/plugins/archive/archiver_gtk.c:1074
 msgid "Choose this to use Compress compression for your archive"
 msgstr "Utilizar compresión Compress en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1077
+#: src/plugins/archive/archiver_gtk.c:1081
 msgid "Choose this option to disable compression for the archive"
 msgstr "Desactivar la compresión en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1097
+#: src/plugins/archive/archiver_gtk.c:1101
 msgid "Choose format"
 msgstr "Elegir formato"
 
-#: src/plugins/archive/archiver_gtk.c:1110
+#: src/plugins/archive/archiver_gtk.c:1114
 msgid "Choose this option to use TAR as format for the archive"
 msgstr "Utilizar el formato TAR en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1117
+#: src/plugins/archive/archiver_gtk.c:1121
 msgid "Choose this to use SHAR as format for the archive"
 msgstr "Utilizar el formato SHAR en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1124
+#: src/plugins/archive/archiver_gtk.c:1128
 msgid "Choose this option to use CPIO as format for the archive"
 msgstr "Utilizar el formato CPIO en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1131
+#: src/plugins/archive/archiver_gtk.c:1135
 msgid "Choose this option to use PAX as format for the archive"
 msgstr "Utilizar el formato PAX en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1151
+#: src/plugins/archive/archiver_gtk.c:1155
 msgid "Miscellaneous options"
 msgstr "Opciones adicionales"
 
-#: src/plugins/archive/archiver_gtk.c:1160
+#: src/plugins/archive/archiver_gtk.c:1164
 msgid "_Recursive"
 msgstr "_Recursivo"
 
-#: src/plugins/archive/archiver_gtk.c:1164
+#: src/plugins/archive/archiver_gtk.c:1168
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Incluir las subcarpetas en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1166
+#: src/plugins/archive/archiver_gtk.c:1170
 msgid "_MD5sum"
 msgstr "Suma de control _MD5"
 
-#: src/plugins/archive/archiver_gtk.c:1170
+#: src/plugins/archive/archiver_gtk.c:1174
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archive.\n"
 "Be aware though, that this dramatically increases the time it\n"
@@ -8929,11 +8858,11 @@ msgstr ""
 "Cuidado: esta opción incrementa dramáticamente el tiempo que se tardará\n"
 "en crear el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1174
+#: src/plugins/archive/archiver_gtk.c:1178
 msgid "R_ename"
 msgstr "R_enombrar"
 
-#: src/plugins/archive/archiver_gtk.c:1178
+#: src/plugins/archive/archiver_gtk.c:1182
 #: src/plugins/archive/archiver_prefs.c:325
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -8944,7 +8873,7 @@ msgstr ""
 "El esquema de nombrado es: fecha_desde@para@asunto.\n"
 "Los nombres se truncarán a un máximo de 96 caracteres."
 
-#: src/plugins/archive/archiver_gtk.c:1186
+#: src/plugins/archive/archiver_gtk.c:1190
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -8952,11 +8881,11 @@ msgstr ""
 "Borrar los correos después del archivado.\n"
 "Actualmente sólo soporta IMAP4, mbox local y POP3"
 
-#: src/plugins/archive/archiver_gtk.c:1190
+#: src/plugins/archive/archiver_gtk.c:1194
 msgid "Selection options"
 msgstr "Opciones de selección"
 
-#: src/plugins/archive/archiver_gtk.c:1206
+#: src/plugins/archive/archiver_gtk.c:1210
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9047,18 +8976,6 @@ msgstr "Renombrar"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Borrar los correos después de realizar el archivado"
 
-#: src/plugins/att_remover/att_remover.c:299
-msgid "<b>Type: </b>"
-msgstr "<b>Tipo: </b> "
-
-#: src/plugins/att_remover/att_remover.c:300
-msgid "<b>Size: </b>"
-msgstr "<b>Tamaño: </b> "
-
-#: src/plugins/att_remover/att_remover.c:301
-msgid "<b>Filename: </b>"
-msgstr "<b>Nombre de fichero: </b>"
-
 #: src/plugins/att_remover/att_remover.c:332
 msgid "Remove attachments"
 msgstr "Eliminar adjuntos"
@@ -9068,8 +8985,8 @@ msgstr "Eliminar adjuntos"
 msgid "Remove"
 msgstr "Eliminar"
 
-#: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:445
-#: src/prefs_summary_column.c:80 src/summaryview.c:2785
+#: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:444
+#: src/prefs_summary_column.c:80 src/summaryview.c:2789
 msgid "Attachment"
 msgstr "Adjunto"
 
@@ -9117,32 +9034,31 @@ msgstr ""
 msgid "Attachment handling"
 msgstr "Gestión de adjuntos"
 
-#: src/plugins/attachwarner/attachwarner.c:214
+#: src/plugins/attachwarner/attachwarner.c:217
 #, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
-"attached. Mention appears on line %d, which begins with text: <span weight="
-"\"bold\">%.20s</span>...\n"
+"attached. Mention appears on line %d, which begins with text: %s\n"
 "\n"
-"%s it anyway?"
+"%s"
 msgstr ""
 "Se menciona un adjunto en el correo que está a punto de enviar, pero no se "
 "adjuntó ningún fichero. La mención aparece en la línea %d, que comienza con "
-"el texto <span weight=\"bold\">%.20s</span>…\n"
+"el texto: %s\n"
 "\n"
-"¿%s de todas formas?"
+"%s"
 
-#: src/plugins/attachwarner/attachwarner.c:218
+#: src/plugins/attachwarner/attachwarner.c:223
 msgid "Attachment warning"
 msgstr "Aviso de adjuntos"
 
-#: src/plugins/attachwarner/attachwarner.c:243
-#: src/plugins/attachwarner/attachwarner.c:280
-#: src/plugins/attachwarner/attachwarner.c:332
+#: src/plugins/attachwarner/attachwarner.c:249
+#: src/plugins/attachwarner/attachwarner.c:286
+#: src/plugins/attachwarner/attachwarner.c:338
 msgid "Attach warner"
 msgstr "Aviso de adjuntos"
 
-#: src/plugins/attachwarner/attachwarner.c:290
+#: src/plugins/attachwarner/attachwarner.c:296
 msgid ""
 "Warns user if some reference to attachments is found in the message text and "
 "no file is attached."
@@ -9318,25 +9234,25 @@ msgstr "Aprendizaje de correo basura"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
 #: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:400
+#: src/plugins/spamassassin/spamassassin_gtk.c:399
 msgid "Process messages on receiving"
 msgstr "Procesar mensajes al recibir"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
 #: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:358
+#: src/plugins/spamassassin/spamassassin_gtk.c:357
 msgid "Maximum size"
 msgstr "Tamaño máximo"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
 #: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:367
+#: src/plugins/spamassassin/spamassassin_gtk.c:366
 msgid "Messages larger than this will not be checked"
 msgstr "No se comprobarán los mensajes mayores de este tamaño"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1506
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1507
 msgid "KB"
 msgstr "kB"
 
@@ -9354,7 +9270,7 @@ msgstr "Solo marcar como basura"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:416
+#: src/plugins/spamassassin/spamassassin_gtk.c:415
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
@@ -9363,7 +9279,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:233
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:422
+#: src/plugins/spamassassin/spamassassin_gtk.c:421
 msgid "Click this button to select a folder for storing spam"
 msgstr ""
 "Pulse este botón para seleccionar una carpeta donde guardar el correo basura"
@@ -9396,13 +9312,13 @@ msgstr "Sólo se realiza para mensajes en carpetas MH"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:268
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:437
+#: src/plugins/spamassassin/spamassassin_gtk.c:436
 msgid "Whitelist senders found in address book/folder"
 msgstr "Permitir los remitentes presentes en la agenda/carpeta"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:272
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:441
+#: src/plugins/spamassassin/spamassassin_gtk.c:440
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9412,7 +9328,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:282
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:451
+#: src/plugins/spamassassin/spamassassin_gtk.c:450
 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
 "Pulse este botón para seleccionar una agenda o carpeta de la agenda de "
@@ -9441,7 +9357,7 @@ msgstr "Ruta al ejecutable bogofilter"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:309
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:429
+#: src/plugins/spamassassin/spamassassin_gtk.c:428
 msgid "Mark spam as read"
 msgstr "Marcar correo basura como leído"
 
@@ -9512,7 +9428,7 @@ msgstr ""
 "Las opciones se encuentran en «/Configuración/Preferencias/Módulos/Bsfilter»"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:408
+#: src/plugins/spamassassin/spamassassin_gtk.c:407
 msgid "Save spam in"
 msgstr "Guardar correo basura en"
 
@@ -9911,8 +9827,8 @@ msgstr "Las CSS en este fichero se aplicarán a todas las partes HTML"
 
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
-#: src/plugins/pgpcore/prefs_gpg.c:190 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1440 src/prefs_account.c:1529 src/prefs_account.c:1990
+#: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "E_xplorar"
@@ -10101,11 +10017,11 @@ msgstr ""
 "Agrega la cabecera X-FETCH-TIME con la fecha y hora de la recuperación del "
 "mensaje en formato RFC822"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:125
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr "Módulo GData: Autorización necesaria"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -10123,79 +10039,81 @@ msgstr ""
 "Introduzca dicho código en el siguiente campo para conceder acceso a Claws "
 "Mail a su lista de contactos de Google."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:142
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr "Paso 1:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:148
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr ""
 "Haga clic aquí para abrir la página de autorización de Google en el navegador"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:152
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr "Paso 2:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:158
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr "Introducir código:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:324
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "Módulo GData: error solicitando contactos: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:340
+#. TRANSLATORS: First part of "Added X of Y contacts to cache"
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
 msgstr[0] "Añadido %d de"
 msgstr[1] "Añadidos %d de"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#. TRANSLATORS: Second part of "Added X of Y contacts to cache"
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] "1 contacto al almacenamiento temporal"
 msgstr[1] "%d contactos al almacenamiento temporal"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:352
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "Módulo GData: comenzando solicitud asíncrona de contactos\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:373
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "Módulo GData: error solicitando grupos: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:410
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr "Módulo GData: grupos recibidos\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:417
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr "Módulo GData: comenzando solicitud asíncrona de grupos\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:442
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "Módulo GData: Error de autorización: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:449
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr "Módulo GData: Autorización realizada con éxito\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:459
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "Módulo GData: Iniciando la autorización interactiva\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:469
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr ""
 "Módulo GData: Consiguió el código de autorización, solicitando la "
 "autorización\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:476
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
@@ -10203,26 +10121,26 @@ msgstr ""
 "Módulo GData: No se recibió el código de autorización, cancelada la "
 "solicitud de la autorización\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:493
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "Módulo GData: Error de actualización de autorización: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:502
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "Módulo GData: Actualización de autorización correcta\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:555
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Módulo GData: Tratando de renovar la autorización\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1744
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Autenticación"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:152
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "Usuario:"
 
@@ -10324,26 +10242,22 @@ msgstr ""
 "Comentarios y sugerencias para <ricardo@mones.org> serán bienvenidas.\n"
 
 #: src/plugins/libravatar/libravatar_prefs.c:137
-msgid "<span color=\"red\">Error reading cache stats</span>"
-msgstr "<span color=\"red\">Error al leer las estadísticas de la caché</span>"
+msgid "Error reading cache stats"
+msgstr "Error leyendo las estadísticas de la cache"
 
 #: src/plugins/libravatar/libravatar_prefs.c:141
 #, c-format
-msgid ""
-"<span color=\"red\">Using %s in %d files, %d directories, %d others and %d "
-"errors</span>"
-msgstr ""
-"<span color=\"red\">Usando %s en %d archivos,%d directorios, %d otros y %d "
-"errores</span>"
+msgid "Using %s in %d files, %d directories, %d others and %d errors"
+msgstr "Usando %s en %d archivos, %d carpetas, %d otros y %d errores"
 
 #: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
-msgstr "Usando %s en %d archivos,%d directorios y %d otros"
+msgstr "Usando %s en %d archivos, %d carpetas y %d otros"
 
 #: src/plugins/libravatar/libravatar_prefs.c:164
 msgid "Clear icon cache"
-msgstr "Limipiar caché de avatares"
+msgstr "Limpiar caché de avatares"
 
 #: src/plugins/libravatar/libravatar_prefs.c:165
 msgid "Are you sure you want to remove all cached avatar icons?"
@@ -10365,9 +10279,8 @@ msgstr ""
 "• %u archivos eliminados."
 
 #: src/plugins/libravatar/libravatar_prefs.c:188
-msgid "<span color=\"#006400\">Icon cache successfully cleared!</span>"
-msgstr ""
-"<span color=\"#006400\">Caché de avatares eliminada con éxito!</span>"
+msgid "Icon cache successfully cleared!"
+msgstr "¡Caché de avatares eliminada con éxito!"
 
 #: src/plugins/libravatar/libravatar_prefs.c:191
 #, c-format
@@ -10385,8 +10298,8 @@ msgstr ""
 "• %u archivos que no se han podido eliminar."
 
 #: src/plugins/libravatar/libravatar_prefs.c:198
-msgid "<span color=\"red\">Error clearing icon cache.</span>"
-msgstr "<span color=\"red\">Error al borrar la caché de avatares.</span>"
+msgid "Error clearing icon cache."
+msgstr "Error limpiando la caché de avatares."
 
 #: src/plugins/libravatar/libravatar_prefs.c:213
 msgid "_Use cached icons"
@@ -10403,8 +10316,8 @@ msgstr ""
 msgid "Cache refresh interval"
 msgstr "Intervalo de refresco de la caché"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1485
-#: src/prefs_matcher.c:335
+#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1486
+#: src/prefs_matcher.c:336
 msgid "hours"
 msgstr "horas"
 
@@ -10494,10 +10407,13 @@ msgid "Request timeout"
 msgstr "Tiempo límite de la petición"
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
-#: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:558
-#: src/prefs_summaries.c:539
-msgid "seconds"
-msgstr "segundos"
+#: src/plugins/notification/notification_prefs.c:1073
+#: src/plugins/notification/notification_prefs.c:1368
+#: src/plugins/notification/notification_prefs.c:1674
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
+#: src/prefs_summaries.c:538
+msgid "second(s)"
+msgstr "segundo(s)"
 
 #: src/plugins/libravatar/libravatar_prefs.c:411
 msgid ""
@@ -10521,8 +10437,8 @@ msgid "Network"
 msgstr "Red"
 
 #: src/plugins/mailmbox/plugin.c:58
-msgid "mailmbox folder (etPan!)"
-msgstr "carpeta mailmbox (etPan!)"
+msgid "mailmbox folder"
+msgstr "carpeta mailmbox"
 
 #: src/plugins/mailmbox/plugin.c:63
 msgid "This is a plugin to handle mailboxes in mbox format."
@@ -10532,10 +10448,6 @@ msgstr "Este módulo permite gestionar buzones en formato mbox."
 msgid "MBOX"
 msgstr "MBOX"
 
-#: src/plugins/mailmbox/plugin_gtk.c:86
-msgid "mbox (etPan!)..."
-msgstr "Mbox (etPan!)..."
-
 #: src/plugins/mailmbox/plugin_gtk.c:190
 msgid ""
 "Input the location of mailbox.\n"
@@ -10546,7 +10458,7 @@ msgstr ""
 "Si especifica un buzón existente será\n"
 "escaneado automáticamente."
 
-#: src/plugins/mailmbox/plugin_gtk.c:331
+#: src/plugins/mailmbox/plugin_gtk.c:330
 #, c-format
 msgid ""
 "All folder(s) and message(s) under '%s' will be deleted.\n"
@@ -10609,7 +10521,7 @@ msgstr "Sieve: reintentar autenticación\n"
 msgid "Auth method not available"
 msgstr "Método de autenticación no disponible"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5651
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5657
 msgid "_Filter"
 msgstr "_Filtrar"
 
@@ -10660,17 +10572,13 @@ msgstr "Comprobando la sintaxis..."
 msgid "This script has been modified. Save the latest changes?"
 msgstr "Este script ha sido modificado. ¿Guardar los últimos cambios?"
 
-#: src/plugins/managesieve/sieve_editor.c:433
-msgid "+_Save"
-msgstr "+_Guardar"
-
 #: src/plugins/managesieve/sieve_editor.c:693
 #, c-format
 msgid "%s - Sieve Filter%s"
 msgstr "%s - Sieve Filtro%s"
 
 #: src/plugins/managesieve/sieve_editor.c:742
-#: src/plugins/pdf_viewer/poppler_viewer.c:1276
+#: src/plugins/pdf_viewer/poppler_viewer.c:1278
 msgid "Loading..."
 msgstr "Cargando..."
 
@@ -10781,7 +10689,7 @@ msgid "Require TLS"
 msgstr "Requerir TLS"
 
 #: src/plugins/managesieve/sieve_prefs.c:203
-#: src/plugins/rssyl/rssyl_feed_props.c:268
+#: src/plugins/rssyl/rssyl_feed_props.c:267
 msgid "No authentication"
 msgstr "Sin autenticación"
 
@@ -10794,28 +10702,28 @@ msgid "Specify authentication"
 msgstr "Especificar autenticación"
 
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:329
-#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1279
-#: src/prefs_account.c:1790
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr "Usuario"
 
 #: src/plugins/managesieve/sieve_prefs.c:247
-#: src/plugins/rssyl/rssyl_feed_props.c:413
-#: src/plugins/vcalendar/vcal_prefs.c:337
-#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1285
-#: src/prefs_account.c:1810 src/prefs_account.c:2516 src/prefs_account.c:2538
-#: src/wizard.c:1204 src/wizard.c:1616
+#: src/plugins/rssyl/rssyl_feed_props.c:394
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr "Contraseña"
 
-#: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1568
-#: src/prefs_account.c:1762
+#: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
-#: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1578
-#: src/prefs_account.c:1771 src/prefs_send.c:291
+#: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "Automático"
 
@@ -10831,20 +10739,20 @@ msgstr "No se especificó el servidor Sieve."
 msgid "Sieve"
 msgstr "Sieve"
 
-#: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
+#: src/plugins/newmail/newmail.c:106 src/plugins/newmail/newmail.c:149
 msgid "NewMail"
 msgstr "Registro de correo nuevo"
 
-#: src/plugins/newmail/newmail.c:115
+#: src/plugins/newmail/newmail.c:111
 msgid "Failed to register newmail hook"
 msgstr "Falló el registro de la función de registro de correo nuevo"
 
-#: src/plugins/newmail/newmail.c:132
+#: src/plugins/newmail/newmail.c:128
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "No se puede abrir el fichero de registro %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:145
+#: src/plugins/newmail/newmail.c:141
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -10861,7 +10769,7 @@ msgstr ""
 "\n"
 "El registro actual esta en %s"
 
-#: src/plugins/newmail/newmail.c:179
+#: src/plugins/newmail/newmail.c:175
 msgid "Log file"
 msgstr "Fichero de registro"
 
@@ -11134,13 +11042,13 @@ msgid "Show banner"
 msgstr "Mostrar panel"
 
 #: src/plugins/notification/notification_prefs.c:767
-#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:144
-#: src/prefs_receive.c:183 src/prefs_summaries.c:505
+#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:143
+#: src/prefs_receive.c:183 src/prefs_summaries.c:504
 msgid "Never"
 msgstr "Nunca"
 
 #: src/plugins/notification/notification_prefs.c:769 src/prefs_receive.c:181
-#: src/prefs_summaries.c:487 src/prefs_summaries.c:506
+#: src/prefs_summaries.c:486 src/prefs_summaries.c:505
 msgid "Always"
 msgstr "Siempre"
 
@@ -11236,12 +11144,6 @@ msgstr "Activar emergente"
 msgid "Popup timeout"
 msgstr "Tiempo límite del emergente"
 
-#: src/plugins/notification/notification_prefs.c:1073
-#: src/plugins/notification/notification_prefs.c:1368
-#: src/plugins/notification/notification_prefs.c:1674
-msgid "second(s)"
-msgstr "segundo(s)"
-
 #: src/plugins/notification/notification_prefs.c:1102
 msgid "Make popup sticky"
 msgstr "Hacer el emergente persistente"
@@ -11424,115 +11326,125 @@ msgid_plural "%d new articles in RSS feeds arrived"
 msgstr[0] "recibido %d artículo de canal RSS nuevo"
 msgstr[1] "recibidos %d artículos de canal RSS nuevos"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/plugins/pdf_viewer/poppler_viewer.c:702
 msgid "Title:"
 msgstr "Título:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:703
+#: src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Author:"
 msgstr "Autor:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/plugins/pdf_viewer/poppler_viewer.c:706
 msgid "Creator:"
 msgstr "Creador:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/plugins/pdf_viewer/poppler_viewer.c:707
 msgid "Producer:"
 msgstr "Productor:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:709
+#: src/plugins/pdf_viewer/poppler_viewer.c:710
 msgid "Created:"
 msgstr "Creado:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:713
+#: src/plugins/pdf_viewer/poppler_viewer.c:714
 msgid "Modified:"
 msgstr "Modificado:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:716
+#: src/plugins/pdf_viewer/poppler_viewer.c:717
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:718
-#: src/plugins/pdf_viewer/poppler_viewer.c:721
+#: src/plugins/pdf_viewer/poppler_viewer.c:719
+#: src/plugins/pdf_viewer/poppler_viewer.c:722
 msgid "Optimized:"
 msgstr "Optimizado:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1179
+#: src/plugins/pdf_viewer/poppler_viewer.c:1180
 msgid "PDF properties"
 msgstr "Propiedades del PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1335
+#: src/plugins/pdf_viewer/poppler_viewer.c:1329
+msgid "Enter password"
+msgstr "Introducir contraseña"
+
+#: src/plugins/pdf_viewer/poppler_viewer.c:1330
+msgid ""
+"This document is locked and requires a password before it can be opened."
+msgstr ""
+"Este documento está bloqueado y necesita una contraseña para abrirlo."
+
+#: src/plugins/pdf_viewer/poppler_viewer.c:1345
 #, c-format
 msgid "%s Document"
 msgstr "%s documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1341
+#: src/plugins/pdf_viewer/poppler_viewer.c:1351
 #, c-format
 msgid "of %d"
 msgstr "de %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1358
+#: src/plugins/pdf_viewer/poppler_viewer.c:1368
 msgid "PDF rendering failed for an unknown reason."
 msgstr "La presentación del PDF falló por razones desconocidas."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1721
-#: src/plugins/pdf_viewer/poppler_viewer.c:1939
+#: src/plugins/pdf_viewer/poppler_viewer.c:1732
+#: src/plugins/pdf_viewer/poppler_viewer.c:1950
 msgid "Document Index"
 msgstr "Índice del documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1907
+#: src/plugins/pdf_viewer/poppler_viewer.c:1918
 msgid "First Page"
 msgstr "Primera página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1910
+#: src/plugins/pdf_viewer/poppler_viewer.c:1921
 msgid "Previous Page"
 msgstr "Página anterior"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1913
+#: src/plugins/pdf_viewer/poppler_viewer.c:1924
 msgid "Next Page"
 msgstr "Página siguiente"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1916
+#: src/plugins/pdf_viewer/poppler_viewer.c:1927
 msgid "Last Page"
 msgstr "Última página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1919
+#: src/plugins/pdf_viewer/poppler_viewer.c:1930
 msgid "Zoom In"
 msgstr "Aumentar"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1921
+#: src/plugins/pdf_viewer/poppler_viewer.c:1932
 msgid "Zoom Out"
 msgstr "Disminuir"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1935
 msgid "Fit Page"
 msgstr "Ajustar página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1938
 msgid "Fit Page Width"
 msgstr "Ajustar ancho"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1930
+#: src/plugins/pdf_viewer/poppler_viewer.c:1941
 msgid "Rotate Left"
 msgstr "Rotar izquierda"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1933
+#: src/plugins/pdf_viewer/poppler_viewer.c:1944
 msgid "Rotate Right"
 msgstr "Rotar derecha"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1936
+#: src/plugins/pdf_viewer/poppler_viewer.c:1947
 msgid "Document Info"
 msgstr "Información del documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1941
+#: src/plugins/pdf_viewer/poppler_viewer.c:1952
 msgid "Page Number"
 msgstr "Número de página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1943
+#: src/plugins/pdf_viewer/poppler_viewer.c:1954
 msgid "Zoom Factor"
 msgstr "Factor de aumento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2048
+#: src/plugins/pdf_viewer/poppler_viewer.c:2059
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11545,13 +11457,13 @@ msgstr ""
 "\n"
 "Cualquier comentario será bienvenido: iwkse@claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2054
-#: src/plugins/pdf_viewer/poppler_viewer.c:2062
-#: src/plugins/pdf_viewer/poppler_viewer.c:2082
+#: src/plugins/pdf_viewer/poppler_viewer.c:2065
+#: src/plugins/pdf_viewer/poppler_viewer.c:2073
+#: src/plugins/pdf_viewer/poppler_viewer.c:2093
 msgid "PDF Viewer"
 msgstr "Visor PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2058
+#: src/plugins/pdf_viewer/poppler_viewer.c:2069
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11574,7 +11486,7 @@ msgstr "Editar reglas de filtrado perl (ext)..."
 msgid "Failed to register PGP address autocompletion hook"
 msgstr "Falló registrando el hook de completar direcciones en el módulo PGP"
 
-#: src/plugins/pgpcore/passphrase.c:86 src/plugins/pgpcore/prefs_gpg.c:128
+#: src/plugins/pgpcore/passphrase.c:86 src/plugins/pgpcore/prefs_gpg.c:127
 msgid "Passphrase"
 msgstr "Frase contraseña"
 
@@ -11582,50 +11494,23 @@ msgstr "Frase contraseña"
 msgid "[no user id]"
 msgstr "[sin id usuario]"
 
-#: src/plugins/pgpcore/passphrase.c:260
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the "
-"new key:</span>\n"
-"\n"
-"%.*s\n"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">%sPor favor introduzca la contraseña "
-"para la nueva clave:</span>\n"
-"\n"
-"%.*s\n"
+#: src/plugins/pgpcore/passphrase.c:261
+msgid "Please enter the passphrase for the new key:"
+msgstr "Por favor, introduzca la contraseña para la nueva clave:"
 
-#: src/plugins/pgpcore/passphrase.c:263
+#: src/plugins/pgpcore/passphrase.c:264
 msgid "Passphrases did not match.\n"
 msgstr "Las contraseñas no coinciden.\n"
 
-#: src/plugins/pgpcore/passphrase.c:266
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the "
-"new key:</span>\n"
-"\n"
-"%.*s\n"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Por favor introduzca de nuevo la "
-"contraseña para la nueva clave:</span>\n"
-"\n"
-"%.*s\n"
-
-#: src/plugins/pgpcore/passphrase.c:270
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-"span>\n"
-"\n"
-"%.*s\n"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">%sPor favor introduzca la contraseña "
-"para:</span>\n"
-"\n"
-"%.*s\n"
+#: src/plugins/pgpcore/passphrase.c:268
+msgid "Please re-enter the passphrase for the new key:"
+msgstr "Por favor, introduzca de nuevo la contraseña para la nueva clave:"
 
 #: src/plugins/pgpcore/passphrase.c:273
+msgid "Please enter the passphrase for:"
+msgstr "Por favor, introduzca la contraseña para:"
+
+#: src/plugins/pgpcore/passphrase.c:276
 msgid "Bad passphrase.\n"
 msgstr "Contraseña errónea.\n"
 
@@ -11744,88 +11629,89 @@ msgstr ""
 msgid "Core operations"
 msgstr "Operaciones principales"
 
-#: src/plugins/pgpcore/prefs_gpg.c:123
+#: src/plugins/pgpcore/prefs_gpg.c:122
 msgid "Automatically check signatures"
 msgstr "Verificar firmas automáticamente"
 
-#: src/plugins/pgpcore/prefs_gpg.c:126
+#: src/plugins/pgpcore/prefs_gpg.c:125
 msgid "Use keyring for address autocompletion"
 msgstr "Usar el anillo de claves para autocompletar direcciones"
 
-#: src/plugins/pgpcore/prefs_gpg.c:131
+#: src/plugins/pgpcore/prefs_gpg.c:130
 msgid "Use gpg-agent to manage passwords"
 msgstr "Usar gpg-agent para gestionar las contraseñas"
 
-#: src/plugins/pgpcore/prefs_gpg.c:136
+#: src/plugins/pgpcore/prefs_gpg.c:135
 msgid "Store passphrase in memory"
 msgstr "Almacenar la contraseña en memoria"
 
-#: src/plugins/pgpcore/prefs_gpg.c:146
+#: src/plugins/pgpcore/prefs_gpg.c:145
 msgid "Expire after"
 msgstr "Caduca después de"
 
-#: src/plugins/pgpcore/prefs_gpg.c:160
+#: src/plugins/pgpcore/prefs_gpg.c:159
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Estableciéndolo a '0' guarda la contraseña durante toda la sesión"
 
-#: src/plugins/pgpcore/prefs_gpg.c:164 src/plugins/rssyl/rssyl_prefs.c:154
-#: src/prefs_receive.c:159
+#: src/plugins/pgpcore/prefs_gpg.c:163
+#: src/plugins/rssyl/rssyl_feed_props.c:475
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: src/plugins/pgpcore/prefs_gpg.c:174
+#: src/plugins/pgpcore/prefs_gpg.c:173
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar la entrada al introducir la contraseña"
 
-#: src/plugins/pgpcore/prefs_gpg.c:181
+#: src/plugins/pgpcore/prefs_gpg.c:180
 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "Mostrar un aviso al inicio si GnuPG no funciona"
 
-#: src/plugins/pgpcore/prefs_gpg.c:184
+#: src/plugins/pgpcore/prefs_gpg.c:183
 msgid "Path to GnuPG executable"
 msgstr "Ruta al ejecutable de GnuPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:189
+#: src/plugins/pgpcore/prefs_gpg.c:188
 msgid ""
 "If left blank the location of the GnuPG executable will be automatically "
 "determined."
 msgstr ""
-"Si está en blanco la ubicación del ejecutable de GnuPG se determinará "
-"de manera automática."
+"Si está en blanco la ubicación del ejecutable de GnuPG se determinará de "
+"manera automática."
 
-#: src/plugins/pgpcore/prefs_gpg.c:230
+#: src/plugins/pgpcore/prefs_gpg.c:229
 msgid "Select GnuPG executable"
 msgstr "Seleccionar ejecutable de GnuPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:354
+#: src/plugins/pgpcore/prefs_gpg.c:353
 msgid "Sign key"
 msgstr "Clave para firmar"
 
-#: src/plugins/pgpcore/prefs_gpg.c:362
+#: src/plugins/pgpcore/prefs_gpg.c:361
 msgid "Use default GnuPG key"
 msgstr "Usar la clave GnuPG por omisión"
 
-#: src/plugins/pgpcore/prefs_gpg.c:373
+#: src/plugins/pgpcore/prefs_gpg.c:372
 msgid "Select key by your email address"
 msgstr "Seleccionar clave en base a la dirección de correo"
 
-#: src/plugins/pgpcore/prefs_gpg.c:384
+#: src/plugins/pgpcore/prefs_gpg.c:383
 msgid "Specify key manually"
 msgstr "Especificar la clave manualmente"
 
-#: src/plugins/pgpcore/prefs_gpg.c:394
+#: src/plugins/pgpcore/prefs_gpg.c:393
 msgid "User or key ID:"
 msgstr "Usuario o ID de clave:"
 
-#: src/plugins/pgpcore/prefs_gpg.c:435
+#: src/plugins/pgpcore/prefs_gpg.c:434
 msgid "No secret key found."
 msgstr "No se encontró ninguna clave secreta."
 
-#: src/plugins/pgpcore/prefs_gpg.c:438
+#: src/plugins/pgpcore/prefs_gpg.c:437
 msgid "Generate a new key pair"
 msgstr "Generar un nuevo par de claves"
 
-#: src/plugins/pgpcore/prefs_gpg.c:616
+#: src/plugins/pgpcore/prefs_gpg.c:615
 msgid "GPG"
 msgstr "GPG"
 
@@ -11839,17 +11725,17 @@ msgstr "No hay coincidencia exacta para «%s», por favor seleccione la clave."
 msgid "Collecting info for '%s' ... %c"
 msgstr "Recogiendo información para «%s» ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:141
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:146
-#: src/plugins/pgpcore/sgpgme.c:162
+#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:145
+#: src/plugins/pgpcore/sgpgme.c:161
 msgid "Marginal"
 msgstr "Marginal"
 
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:150
-#: src/plugins/pgpcore/sgpgme.c:166
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:149
+#: src/plugins/pgpcore/sgpgme.c:165
 msgid "Ultimate"
 msgstr "Absoluta"
 
@@ -11893,7 +11779,7 @@ msgid ""
 "If you choose to encrypt the message with this key, you don't\n"
 "know for sure that it will go to the person you mean it to.\n"
 "\n"
-"Key details: ID %s, primary identity %s &lt;%s&gt;\n"
+"Key details: ID %s, primary identity %s <%s>\n"
 "\n"
 "Do you trust this key enough to use it anyway?"
 msgstr ""
@@ -11901,186 +11787,185 @@ msgstr ""
 "Si elige cifrar el mensaje con esta clave no sabrá con certeza\n"
 "si llegará a la persona a la que lo quiere enviar.\n"
 "\n"
-"Detalles: ID %s, identidad primaria %s &lt;%s&gt;\n"
+"Detalles: ID %s, identidad primaria %s <%s>\n"
 "\n"
 "¿Es suficientemente fiable como para usarla de todas maneras?"
 
-#: src/plugins/pgpcore/sgpgme.c:80 src/privacy.c:249 src/privacy.c:253
+#: src/plugins/pgpcore/sgpgme.c:79 src/privacy.c:249 src/privacy.c:253
 #: src/privacy.c:270 src/privacy.c:274
 msgid "No signature found"
 msgstr "No se encontró firma"
 
-#: src/plugins/pgpcore/sgpgme.c:160
+#: src/plugins/pgpcore/sgpgme.c:159
 msgid "Untrusted"
 msgstr "No fiable"
 
-#: src/plugins/pgpcore/sgpgme.c:200 src/plugins/pgpcore/sgpgme.c:219
+#: src/plugins/pgpcore/sgpgme.c:199 src/plugins/pgpcore/sgpgme.c:218
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "La firma no se puede comprobar - %s"
 
-#: src/plugins/pgpcore/sgpgme.c:204 src/plugins/pgpcore/sgpgme.c:208
+#: src/plugins/pgpcore/sgpgme.c:203 src/plugins/pgpcore/sgpgme.c:207
 msgid "The signature has not been checked."
 msgstr "La firma no ha sido comprobada."
 
-#: src/plugins/pgpcore/sgpgme.c:214
+#: src/plugins/pgpcore/sgpgme.c:213
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 "Núcleo PGP: no se puede obtener la clave - gpg-agent no está ejecutándose."
 
-#: src/plugins/pgpcore/sgpgme.c:229
-#, c-format
-msgid "The signature can't be checked - %s."
-msgstr "La firma no se puede comprobar - %s."
-
-#: src/plugins/pgpcore/sgpgme.c:241
+#: src/plugins/pgpcore/sgpgme.c:231
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Firma válida de \"%s\" [ultimate]"
 
-#: src/plugins/pgpcore/sgpgme.c:244
+#: src/plugins/pgpcore/sgpgme.c:234
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Firma válida de \"%s\" [full]"
 
-#: src/plugins/pgpcore/sgpgme.c:247
+#: src/plugins/pgpcore/sgpgme.c:237
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Firma válida de \"%s\" [marginal]"
 
-#: src/plugins/pgpcore/sgpgme.c:253
+#: src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma válida de \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:258
+#: src/plugins/pgpcore/sgpgme.c:247 src/plugins/pgpcore/sgpgme.c:267
+#, c-format
+msgid "Key 0x%s not available to verify this signature"
+msgstr "La clave 0x%s no está disponible para verificar esta firma"
+
+#: src/plugins/pgpcore/sgpgme.c:254
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:261
+#: src/plugins/pgpcore/sgpgme.c:257
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Firma válida de \"%s\", pero la clave ha expirado."
 
-#: src/plugins/pgpcore/sgpgme.c:264
+#: src/plugins/pgpcore/sgpgme.c:260
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Firma válida de \"%s\", pero la clave ha sido revocada."
 
-#: src/plugins/pgpcore/sgpgme.c:267
+#: src/plugins/pgpcore/sgpgme.c:263
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Firma inválida de \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:271
-#, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "La clave 0x%s no está disponible para verificar esta firma"
-
-#: src/plugins/pgpcore/sgpgme.c:276
+#: src/plugins/pgpcore/sgpgme.c:272
 msgid "The signature has not been checked"
 msgstr "La firma no ha sido comprobada"
 
-#: src/plugins/pgpcore/sgpgme.c:295
+#: src/plugins/pgpcore/sgpgme.c:291
 msgid "Error checking signature: no status\n"
 msgstr "Error verificando la firma digital: no hay estado\n"
 
-#: src/plugins/pgpcore/sgpgme.c:313
+#: src/plugins/pgpcore/sgpgme.c:309
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Error verificando la firma digital: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:331
+#: src/plugins/pgpcore/sgpgme.c:327
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Firma digital realizada el %s usando %s ID de clave %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:337
+#: src/plugins/pgpcore/sgpgme.c:333
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Firma válida del UID «%s» (Validez: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:342
+#: src/plugins/pgpcore/sgpgme.c:338
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "UID de clave caducado «%s»\n"
 
-#: src/plugins/pgpcore/sgpgme.c:347
+#: src/plugins/pgpcore/sgpgme.c:343
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Firma caducada del UID «%s» (Validez: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:352
+#: src/plugins/pgpcore/sgpgme.c:348
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "UID de clave revocado «%s»\n"
 
-#: src/plugins/pgpcore/sgpgme.c:357
+#: src/plugins/pgpcore/sgpgme.c:353
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Firma INVÁLIDA de «%s»\n"
 
-#: src/plugins/pgpcore/sgpgme.c:368
+#: src/plugins/pgpcore/sgpgme.c:366
 #, c-format
-msgid "                    uid \"%s\" (Validity: %s)\n"
-msgstr "               UID «%s» (Validez: %s\n"
+msgid "uid \"%s\" (Validity: %s)\n"
+msgstr "UID «%s» (Validez: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:370
+#: src/plugins/pgpcore/sgpgme.c:368
 msgid "Revoked"
 msgstr "Revocado"
 
-#: src/plugins/pgpcore/sgpgme.c:374
+#: src/plugins/pgpcore/sgpgme.c:373
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Confianza del propietario: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:377
+#: src/plugins/pgpcore/sgpgme.c:374
+msgid "No key!"
+msgstr "¡No hay clave!"
+
+#: src/plugins/pgpcore/sgpgme.c:376
 msgid "Primary key fingerprint:"
 msgstr "Huella de clave primaria:"
 
-#: src/plugins/pgpcore/sgpgme.c:395
+#: src/plugins/pgpcore/sgpgme.c:394
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "AVISO: la dirección del firmante «%s» no coincide con la entrada DNS\n"
 
-#: src/plugins/pgpcore/sgpgme.c:401
+#: src/plugins/pgpcore/sgpgme.c:400
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "La dirección verificada del firmante es «%s»\n"
 
-#: src/plugins/pgpcore/sgpgme.c:435
+#: src/plugins/pgpcore/sgpgme.c:434
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "No se puede obtener datos del mensaje, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:451
+#: src/plugins/pgpcore/sgpgme.c:450
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "No se puede inicializar datos, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:606
+#: src/plugins/pgpcore/sgpgme.c:605
 msgid "Secret key specification is ambiguous"
 msgstr "La especificación de clave secreta es ambigua"
 
-#: src/plugins/pgpcore/sgpgme.c:616
+#: src/plugins/pgpcore/sgpgme.c:615
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Clave secreta no encontrada (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:629
+#: src/plugins/pgpcore/sgpgme.c:628
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Error estableciendo clave secreta: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:718
+#: src/plugins/pgpcore/sgpgme.c:717
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "El protocolo «%s» de Gpgme no es utilizable: el motor «%s» no esta instalado "
 "apropiadamente."
 
-#: src/plugins/pgpcore/sgpgme.c:724
+#: src/plugins/pgpcore/sgpgme.c:723
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12089,12 +11974,12 @@ msgstr ""
 "El protocolo «%s» de Gpgme no es utilizable: el motor «%s» versión %s está "
 "instalado pero es necesaria la versión %s.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:732
+#: src/plugins/pgpcore/sgpgme.c:731
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "El protocolo «%s» de Gpgme no es utilizable: (problema desconocido)"
 
-#: src/plugins/pgpcore/sgpgme.c:748
+#: src/plugins/pgpcore/sgpgme.c:747
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12102,7 +11987,7 @@ msgstr ""
 "GnuPG no esta adecuadamente instalado o necesita actualizarse.\n"
 "Soporte de OpenPGP deshabilitado."
 
-#: src/plugins/pgpcore/sgpgme.c:782
+#: src/plugins/pgpcore/sgpgme.c:781
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12110,11 +11995,11 @@ msgstr ""
 "Tiene que guardar la información de la cuenta con «Aceptar» antes de poder "
 "generar un par de claves.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:787
+#: src/plugins/pgpcore/sgpgme.c:786
 msgid "No PGP key found"
 msgstr "No se encontró ninguna clave PGP"
 
-#: src/plugins/pgpcore/sgpgme.c:788
+#: src/plugins/pgpcore/sgpgme.c:787
 msgid ""
 "Claws Mail did not find a secret PGP key, which means that you won't be able "
 "to sign emails or receive encrypted emails.\n"
@@ -12124,12 +12009,12 @@ msgstr ""
 "capaz de firmar correos o recibir correos cifrados.\n"
 "¿Quiere crear un nuevo par de claves ahora?"
 
-#: src/plugins/pgpcore/sgpgme.c:858 src/plugins/pgpcore/sgpgme.c:874
+#: src/plugins/pgpcore/sgpgme.c:857 src/plugins/pgpcore/sgpgme.c:873
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "No se puede generar el nuevo par de claves: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:865
+#: src/plugins/pgpcore/sgpgme.c:864
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12137,11 +12022,11 @@ msgstr ""
 "Generando su nuevo par de claves... Por favor mueva el ratón para ayudar a "
 "generar entropía..."
 
-#: src/plugins/pgpcore/sgpgme.c:880
+#: src/plugins/pgpcore/sgpgme.c:879
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "No se puede generar el nuevo par de claves: error desconocido"
 
-#: src/plugins/pgpcore/sgpgme.c:884
+#: src/plugins/pgpcore/sgpgme.c:883
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12154,66 +12039,66 @@ msgstr ""
 "\n"
 "¿Desea exportarla a un servidor de claves?"
 
-#: src/plugins/pgpcore/sgpgme.c:888
+#: src/plugins/pgpcore/sgpgme.c:887
 msgid "Key generated"
 msgstr "Clave generada"
 
-#: src/plugins/pgpcore/sgpgme.c:927
+#: src/plugins/pgpcore/sgpgme.c:926
 msgid "Key exported."
 msgstr "Clave exportada."
 
-#: src/plugins/pgpcore/sgpgme.c:929
+#: src/plugins/pgpcore/sgpgme.c:928
 msgid "Couldn't export key."
 msgstr "No se pudo exportar la clave."
 
-#: src/plugins/pgpcore/sgpgme.c:933
+#: src/plugins/pgpcore/sgpgme.c:932
 msgid "Key export isn't implemented in Windows."
 msgstr "La exportación de claves no está implementada en Windows."
 
-#: src/plugins/pgpinline/pgpinline.c:157
+#: src/plugins/pgpinline/pgpinline.c:155
 msgid "Incorrect part"
 msgstr "Parte incorrecta"
 
-#: src/plugins/pgpinline/pgpinline.c:161
+#: src/plugins/pgpinline/pgpinline.c:159
 msgid "Not a text part"
 msgstr "No es una parte de texto"
 
-#: src/plugins/pgpinline/pgpinline.c:172 src/plugins/pgpinline/pgpinline.c:324
+#: src/plugins/pgpinline/pgpinline.c:170 src/plugins/pgpinline/pgpinline.c:322
 msgid "Couldn't get text data."
 msgstr "No se puede obtener el texto."
 
-#: src/plugins/pgpinline/pgpinline.c:190
+#: src/plugins/pgpinline/pgpinline.c:188
 msgid "Couldn't convert text data to any sane charset."
 msgstr "No se puede convertir el texto a un conjunto de caracteres válido."
 
-#: src/plugins/pgpinline/pgpinline.c:198 src/plugins/pgpinline/pgpinline.c:520
-#: src/plugins/pgpinline/pgpinline.c:659 src/plugins/pgpinline/pgpinline.c:715
-#: src/plugins/pgpmime/pgpmime.c:184 src/plugins/pgpmime/pgpmime.c:330
-#: src/plugins/pgpmime/pgpmime.c:510 src/plugins/pgpmime/pgpmime.c:653
+#: src/plugins/pgpinline/pgpinline.c:196 src/plugins/pgpinline/pgpinline.c:518
+#: src/plugins/pgpinline/pgpinline.c:657 src/plugins/pgpinline/pgpinline.c:713
+#: src/plugins/pgpmime/pgpmime.c:183 src/plugins/pgpmime/pgpmime.c:329
+#: src/plugins/pgpmime/pgpmime.c:509 src/plugins/pgpmime/pgpmime.c:652
 #: src/plugins/smime/smime.c:415
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "No se pudo inicializar el contexto GPG, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:317
+#: src/plugins/pgpinline/pgpinline.c:315
 msgid "Couldn't parse mime part."
 msgstr "No se puede procesar la parte mime."
 
-#: src/plugins/pgpinline/pgpinline.c:347 src/plugins/pgpmime/pgpmime.c:353
+#: src/plugins/pgpinline/pgpinline.c:345 src/plugins/pgpmime/pgpmime.c:352
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "No se puede abrir el fichero descifrado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:364 src/plugins/pgpinline/pgpinline.c:373
-#: src/plugins/pgpinline/pgpinline.c:382 src/plugins/pgpinline/pgpinline.c:390
-#: src/plugins/pgpinline/pgpinline.c:400 src/plugins/pgpinline/pgpinline.c:409
-#: src/plugins/pgpmime/pgpmime.c:364 src/plugins/pgpmime/pgpmime.c:378
+#: src/plugins/pgpinline/pgpinline.c:362 src/plugins/pgpinline/pgpinline.c:371
+#: src/plugins/pgpinline/pgpinline.c:380 src/plugins/pgpinline/pgpinline.c:388
+#: src/plugins/pgpinline/pgpinline.c:398 src/plugins/pgpinline/pgpinline.c:407
+#: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "No se puede escribir al fichero descifrado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:378 src/plugins/pgpinline/pgpinline.c:379
-#: src/plugins/pgpinline/pgpinline.c:380
+#: src/plugins/pgpinline/pgpinline.c:376 src/plugins/pgpinline/pgpinline.c:377
+#: src/plugins/pgpinline/pgpinline.c:378
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -12221,51 +12106,51 @@ msgstr ""
 "\n"
 "--- Inicio de los datos cifrados PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:396 src/plugins/pgpinline/pgpinline.c:397
-#: src/plugins/pgpinline/pgpinline.c:398
+#: src/plugins/pgpinline/pgpinline.c:394 src/plugins/pgpinline/pgpinline.c:395
+#: src/plugins/pgpinline/pgpinline.c:396
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Fin de los datos cifrados PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:417 src/plugins/pgpmime/pgpmime.c:390
+#: src/plugins/pgpinline/pgpinline.c:415 src/plugins/pgpmime/pgpmime.c:389
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "No se puede cerrar el fichero descifrado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:429
+#: src/plugins/pgpinline/pgpinline.c:427
 msgid "Couldn't scan decrypted file."
 msgstr "No se puede escanear el fichero descifrado."
 
-#: src/plugins/pgpinline/pgpinline.c:437
+#: src/plugins/pgpinline/pgpinline.c:435
 msgid "Couldn't scan decrypted file parts."
 msgstr "No se pueden escanear las partes del fichero descifrado ."
 
-#: src/plugins/pgpinline/pgpinline.c:494 src/plugins/pgpinline/pgpinline.c:686
+#: src/plugins/pgpinline/pgpinline.c:492 src/plugins/pgpinline/pgpinline.c:684
 msgid "Malformed message"
 msgstr "Mensaje mal formado"
 
-#: src/plugins/pgpinline/pgpinline.c:505
+#: src/plugins/pgpinline/pgpinline.c:503
 msgid "Couldn't create temporary file."
 msgstr "No se puede crear el fichero temporal."
 
-#: src/plugins/pgpinline/pgpinline.c:544 src/plugins/pgpmime/pgpmime.c:537
+#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:536
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Falló la firma de los datos, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:562 src/plugins/pgpmime/pgpmime.c:564
+#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:563
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "La firma de los datos falló debido a un firmante inválido: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:571 src/plugins/pgpmime/pgpmime.c:573
+#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:572
 msgid "Data signing failed, no results."
 msgstr "Falló la firma de los datos, no hay resultados."
 
-#: src/plugins/pgpinline/pgpinline.c:581 src/plugins/pgpmime/pgpmime.c:584
+#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:583
 msgid "Data signing failed, no contents."
 msgstr "Falló la firma de los datos, no hay contenido."
 
-#: src/plugins/pgpinline/pgpinline.c:625
+#: src/plugins/pgpinline/pgpinline.c:623
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
@@ -12273,22 +12158,22 @@ msgstr ""
 "Por favor, tenga en cuenta que los adjuntos no serán cifrados por el sistema "
 "PGP/Inline, ni tampoco las cabeceras de correo, como el Asunto."
 
-#: src/plugins/pgpinline/pgpinline.c:669 src/plugins/pgpmime/pgpmime.c:663
+#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:662
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "No se pudo añadir la clave GPG %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:697 src/plugins/pgpmime/pgpmime.c:692
+#: src/plugins/pgpinline/pgpinline.c:695 src/plugins/pgpmime/pgpmime.c:691
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "No se puede crear el fichero temporal, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:728 src/plugins/pgpmime/pgpmime.c:719
+#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:718
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Falló el cifrado, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:797
+#: src/plugins/pgpinline/pgpinline.c:795
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
@@ -12322,28 +12207,28 @@ msgstr ""
 "\n"
 "GPGME es copyright 2001 por Werner Koch <dd9jn@gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:204
+#: src/plugins/pgpmime/pgpmime.c:203
 msgid "Signature boundary not found."
 msgstr "No se encontró el delimitador de la firma."
 
-#: src/plugins/pgpmime/pgpmime.c:402 src/plugins/smime/smime.c:496
+#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:496
 msgid "Couldn't parse decrypted file."
 msgstr "No se puede interpretar el fichero descifrado."
 
-#: src/plugins/pgpmime/pgpmime.c:408 src/plugins/smime/smime.c:503
+#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:503
 msgid "Couldn't parse decrypted file parts."
 msgstr "No se pueden interpretar las partes del fichero."
 
-#: src/plugins/pgpmime/pgpmime.c:456 src/plugins/pgpmime/pgpmime.c:495
+#: src/plugins/pgpmime/pgpmime.c:455 src/plugins/pgpmime/pgpmime.c:494
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "No se puede crear el fichero temporal: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:597
+#: src/plugins/pgpmime/pgpmime.c:596
 msgid "OpenPGP digital signature"
 msgstr "Firma digital OpenPGP"
 
-#: src/plugins/pgpmime/pgpmime.c:619
+#: src/plugins/pgpmime/pgpmime.c:618
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -12351,7 +12236,7 @@ msgstr ""
 "Por favor, tenga en cuenta que las cabeceras de correo, como el Asunto, no "
 "serán cifradas por el sistema PGP/MIME."
 
-#: src/plugins/pgpmime/pgpmime.c:791
+#: src/plugins/pgpmime/pgpmime.c:790
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -12393,17 +12278,18 @@ msgid "Show Python console..."
 msgstr "Mostrar la consola de Python..."
 
 #: src/plugins/python/python_plugin.c:503
+#: src/plugins/rssyl/rssyl_feed_props.c:482
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2505
-#: src/prefs_account.c:2527 src/prefs_account.c:2791 src/wizard.c:1194
-#: src/wizard.c:1606
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr "Explorar"
 
 #: src/plugins/python/python_plugin.c:651
-#: src/plugins/python/python_plugin.c:733
+#: src/plugins/python/python_plugin.c:735
 msgid "Python"
 msgstr "Python"
 
@@ -12411,7 +12297,7 @@ msgstr "Python"
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Error al registrar el «compose create hook» en el módulo Python"
 
-#: src/plugins/python/python_plugin.c:738
+#: src/plugins/python/python_plugin.c:740
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -12500,7 +12386,7 @@ msgstr ""
 "\n"
 "Comentarios para <berndth@gmx.de> serán bienvenidos."
 
-#: src/plugins/python/python_plugin.c:789
+#: src/plugins/python/python_plugin.c:791
 msgid "Python integration"
 msgstr "Integración con Python"
 
@@ -12574,35 +12460,35 @@ msgstr "(vacío)"
 msgid "Refresh all feeds"
 msgstr "Refrescar todos los canales"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:66
+#: src/plugins/rssyl/rssyl_cb_menu.c:65
 msgid "Subscribe feed"
 msgstr "Suscribir canal"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:67
+#: src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Introduzca la URL del canal de información al que suscribirse:"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:100
+#: src/plugins/rssyl/rssyl_cb_menu.c:98
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "No se puede usar «%c» en el nombre de la carpeta."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:255
+#: src/plugins/rssyl/rssyl_cb_menu.c:253
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws Mail necesita acceso a la red para actualizar el canal."
 msgstr[1] "Claws Mail necesita acceso a la red para actualizar los canales."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:318
+#: src/plugins/rssyl/rssyl_cb_menu.c:316
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "¿Quiere realmente eliminar el árbol de canales «%s»?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:319
+#: src/plugins/rssyl/rssyl_cb_menu.c:317
 msgid "Remove feed tree"
 msgstr "Eliminar árbol de canales"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:354
+#: src/plugins/rssyl/rssyl_cb_menu.c:351
 msgid "Select an OPML file"
 msgstr "Seleccionar un fichero OPML"
 
@@ -12653,51 +12539,51 @@ msgstr ""
 "RSSyl: La aplicación está finalizando, no se pudo finalizar la actualización "
 "del canal en «%s»\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:274
+#: src/plugins/rssyl/rssyl_feed_props.c:273
 msgid "HTTP Basic authentication"
 msgstr "Usar autenticación HTTP básica"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:291
+#: src/plugins/rssyl/rssyl_feed_props.c:290
 msgid "Use default refresh interval"
 msgstr "Usar el intervalo de refresco predeterminado"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:302
 msgid "Keep old items"
 msgstr "Guardar elementos antiguos"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:308
 msgid "_Trim"
 msgstr "Recor_tar"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:311
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr "Actualizar canal, borrando elementos que no se encuentren en la fuente"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:314
+#: src/plugins/rssyl/rssyl_feed_props.c:313
 msgid "Fetch comments if possible"
 msgstr "Recuperar los comentarios si es posible"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:339
-msgid "Always mark as new"
-msgstr "Marcar siempre como nuevo"
+#: src/plugins/rssyl/rssyl_feed_props.c:338
+msgid "Always mark it as new"
+msgstr "Marcarlo siempre como nuevo"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:345
-msgid "If only its text changed"
-msgstr "Sólo si el texto ha cambiado"
+#: src/plugins/rssyl/rssyl_feed_props.c:344
+msgid "Only mark it as new if its text has changed"
+msgstr "Sólo marcarlo como nuevo si su texto ha cambiado"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:351
-msgid "Never mark as new"
-msgstr "Nunca marcar como nuevo"
+#: src/plugins/rssyl/rssyl_feed_props.c:350
+msgid "Never mark it as new"
+msgstr "Nunca marcarlo como nuevo"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:356
-msgid "Add item title to top of message"
-msgstr "Añadir el título del elemento encima del mensaje"
+#: src/plugins/rssyl/rssyl_feed_props.c:355
+msgid "Add item title to the top of message"
+msgstr "Añadir el título del elemento en la parte superior del mensaje"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:363
+#: src/plugins/rssyl/rssyl_feed_props.c:362
 msgid "Ignore title rename"
 msgstr "Ignorar el renombrado del título"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:368
+#: src/plugins/rssyl/rssyl_feed_props.c:367
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -12705,45 +12591,52 @@ msgstr ""
 "Activar esto para mantener el nombre actual de la capeta incluso si el autor "
 "del canal cambia el título del mismo."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:372
-#: src/plugins/vcalendar/vcal_prefs.c:518
+#: src/plugins/rssyl/rssyl_feed_props.c:371
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "Verificar la validez del certificado SSL"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:388
-msgid "<b>Source URL:</b>"
-msgstr "<b>URL de origen:</b>"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:410
+#: src/plugins/rssyl/rssyl_feed_props.c:391
 msgid "User name"
 msgstr "Nombre de usuario"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:433
-msgid ""
-"<b>Fetch comments on posts aged less than:</b>\n"
-"<small>(In days; set to -1 to fetch all comments)</small>"
-msgstr ""
-"<b>Recuperar comentarios de artículos menos antiguos de:</b>\n"
-"<small>(En días; establecer a -1 para recuperarlos todos)</small>"
+#: src/plugins/rssyl/rssyl_feed_props.c:404
+msgid "Source URL"
+msgstr "URL de origen"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:491
-msgid ""
-"<b>Refresh interval in minutes:</b>\n"
-"<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
-msgstr ""
-"<b>Intervalo de refresco en minutos:</b>\n"
-"<small>(Establecer a 0 para desactivar el refresco automático de este "
-"canal)</small>"
+#: src/plugins/rssyl/rssyl_feed_props.c:417
+msgid "Fetch comments on posts aged less than"
+msgstr "Recuperar los comentarios de elementos con una antiguedad inferior a"
+
+#: src/plugins/rssyl/rssyl_feed_props.c:425
+msgid "day(s)"
+msgstr "día(s)"
+
+#: src/plugins/rssyl/rssyl_feed_props.c:426
+msgid "Set to -1 to fetch all comments"
+msgstr "Establecer a -1 para recuperarlos todos"
+
+#: src/plugins/rssyl/rssyl_feed_props.c:450
+msgid "If an item changes"
+msgstr "Si un elemento cambia"
+
+#: src/plugins/rssyl/rssyl_feed_props.c:455
+msgid "Items"
+msgstr "Elementos"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:517
-msgid "<b>If an item changes, do not mark it as new:</b>"
-msgstr "<b>Si un elemento cambia, no marcarlo como nuevo:</b>"
+#: src/plugins/rssyl/rssyl_feed_props.c:468
+msgid "Refresh interval"
+msgstr "Intervalo de refresco"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:609
+#: src/plugins/rssyl/rssyl_feed_props.c:476
+msgid "Set to 0 to disable automatic refreshing for this feed"
+msgstr "Establecer a 0 para desactivar el refresco automático de este canal"
+
+#: src/plugins/rssyl/rssyl_feed_props.c:528
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:617
+#: src/plugins/rssyl/rssyl_feed_props.c:536
 msgid "Set feed properties"
 msgstr "Establecer las propiedades del canal"
 
@@ -12838,8 +12731,8 @@ msgid "Subscribe new feed?"
 msgstr "¿Suscribir nuevo canal?"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
-msgid "<b>Feed folder:</b>"
-msgstr "<b>Carpeta del canal:</b> "
+msgid "Feed folder:"
+msgstr "Carpeta del canal:"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:73
 msgid ""
@@ -12859,17 +12752,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Actualizando comentarios para «%s»..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1598
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr "401 (Se requiere autorización)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1601
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr "403 (No autorizado)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1604
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr "404 (No encontrado)"
 
@@ -12892,7 +12785,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:142
+#: src/plugins/rssyl/rssyl_update_feed.c:140
 #, c-format
 msgid ""
 "No valid feed found at\n"
@@ -12901,12 +12794,21 @@ msgstr ""
 "Canal no válido encontrado en\n"
 "<b>%s</b>"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:224
+#: src/plugins/rssyl/rssyl_update_feed.c:152
+msgid "Untitled feed"
+msgstr "Canal sin título"
+
+#: src/plugins/rssyl/rssyl_update_feed.c:154
+#, c-format
+msgid "RSSyl: Possibly invalid feed without title at %s.\n"
+msgstr "RSSyl: Posible canal inválido sin título en «%s»\n"
+
+#: src/plugins/rssyl/rssyl_update_feed.c:228
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr "Actualizando canal «%s»..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:246
+#: src/plugins/rssyl/rssyl_update_feed.c:250
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -12919,7 +12821,7 @@ msgstr ""
 "\n"
 "Por favor contacte con los desarrolladores, esto no debería suceder."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:330
+#: src/plugins/rssyl/rssyl_update_feed.c:334
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr "Claws Mail necesita acceso a la red para actualizar los canales."
 
@@ -12933,7 +12835,7 @@ msgstr ""
 "adjunta.\n"
 
 #: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:913
+#: src/plugins/smime/smime.c:915
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -13040,12 +12942,12 @@ msgstr "Habilitado"
 msgid "Forward to:"
 msgstr "Reenviar a:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1554
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "Contraseña:"
 
 #: src/plugins/spamassassin/spamassassin.c:77
-#: src/plugins/spamassassin/spamassassin_gtk.c:649
+#: src/plugins/spamassassin/spamassassin_gtk.c:648
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
@@ -13117,55 +13019,55 @@ msgstr ""
 "\n"
 "Las opciones están en /Configuración/Preferencias/Módulos/SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:91
+#: src/plugins/spamassassin/spamassassin_gtk.c:90
 msgid "Localhost"
 msgstr "Máquina local"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:92
+#: src/plugins/spamassassin/spamassassin_gtk.c:91
 msgid "TCP"
 msgstr "TCP"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:93
+#: src/plugins/spamassassin/spamassassin_gtk.c:92
 msgid "Unix Socket"
 msgstr "Conector Unix"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:269
+#: src/plugins/spamassassin/spamassassin_gtk.c:268
 msgid "Enable SpamAssassin plugin"
 msgstr "Habilitar el módulo SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:273
+#: src/plugins/spamassassin/spamassassin_gtk.c:272
 msgid "Transport"
 msgstr "Transporte"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:281
+#: src/plugins/spamassassin/spamassassin_gtk.c:280
 msgid "Type of transport"
 msgstr "Tipo de transporte"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:302
+#: src/plugins/spamassassin/spamassassin_gtk.c:301
 msgid "User"
 msgstr "Usuario"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:315
+#: src/plugins/spamassassin/spamassassin_gtk.c:314
 msgid "User to use with spamd server"
 msgstr "Usuario a utilizar con el servidor spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:317
+#: src/plugins/spamassassin/spamassassin_gtk.c:316
 msgid "spamd"
 msgstr "spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:335
+#: src/plugins/spamassassin/spamassassin_gtk.c:334
 msgid "Hostname or IP address of spamd server"
 msgstr "Nombre o dirección IP del servidor spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:346
+#: src/plugins/spamassassin/spamassassin_gtk.c:345
 msgid "Port of spamd server"
 msgstr "Puerto del servidor spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:352
+#: src/plugins/spamassassin/spamassassin_gtk.c:351
 msgid "Path of Unix socket"
 msgstr "Ruta al conector Unix"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:387
+#: src/plugins/spamassassin/spamassassin_gtk.c:386
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
@@ -13246,8 +13148,8 @@ msgid "Show"
 msgstr "Mostrar"
 
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1475 src/prefs_folder_item.c:560
-#: src/prefs_matcher.c:336
+#: src/prefs_account.c:1476 src/prefs_folder_item.c:553
+#: src/prefs_matcher.c:337
 msgid "days"
 msgstr "días"
 
@@ -13339,12 +13241,12 @@ msgstr "Mes anterior"
 msgid "Next month"
 msgstr "Mes siguiente"
 
-#: src/plugins/vcalendar/plugin.c:43 src/plugins/vcalendar/plugin.c:64
-#: src/plugins/vcalendar/vcal_prefs.c:681
+#: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "vCalendar"
 
-#: src/plugins/vcalendar/plugin.c:69
+#: src/plugins/vcalendar/plugin.c:73
 msgid ""
 "This plugin enables vCalendar message handling like that produced by "
 "Evolution or Outlook.\n"
@@ -13374,7 +13276,7 @@ msgstr ""
 "y calendarios, publicar su información de libre/ocupado y recuperar esa "
 "información de otras personas."
 
-#: src/plugins/vcalendar/plugin.c:102
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "Calendario"
 
@@ -13414,7 +13316,7 @@ msgstr "Tiene un elemento pendiente."
 
 #: src/plugins/vcalendar/vcalendar.c:483 src/plugins/vcalendar/vcalendar.c:490
 #: src/plugins/vcalendar/vcalendar.c:495 src/plugins/vcalendar/vcalendar.c:503
-#: src/plugins/vcalendar/vcalendar.c:512 src/plugins/vcalendar/vcalendar.c:750
+#: src/plugins/vcalendar/vcalendar.c:512 src/plugins/vcalendar/vcalendar.c:753
 msgid "Details follow:"
 msgstr "Los detalles son los siguientes:"
 
@@ -13434,24 +13336,19 @@ msgstr "Se ha cancelado una reunión a la que había sido invitado."
 msgid "You have been forwarded an appointment."
 msgstr "Se le ha enviado una cita."
 
-#: src/plugins/vcalendar/vcalendar.c:564
-#, c-format
-msgid "%s <span weight=\"bold\">(this event recurs)</span>"
-msgstr "%s <span weight=\"bold\">(este evento es recurrente)</span>"
+#: src/plugins/vcalendar/vcalendar.c:565
+msgid "(this event recurs)"
+msgstr "(este evento es recurrente)"
 
-#: src/plugins/vcalendar/vcalendar.c:570
-#, c-format
-msgid ""
-"%s <span weight=\"bold\">(this event is part of a recurring event)</span>"
-msgstr ""
-"%s <span weight=\"bold\">(este evento es parte de un evento recurrente)</"
-"span>"
+#: src/plugins/vcalendar/vcalendar.c:572
+msgid "(this event is part of a recurring event)"
+msgstr "(este evento es parte de un evento recurrente)"
 
-#: src/plugins/vcalendar/vcalendar.c:749
+#: src/plugins/vcalendar/vcalendar.c:752
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Se recibió una respuesta a una propuesta de reunión desconocida."
 
-#: src/plugins/vcalendar/vcalendar.c:753
+#: src/plugins/vcalendar/vcalendar.c:756
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13460,35 +13357,35 @@ msgstr ""
 "Se recibió una respuesta a una propuesta de reunión.\n"
 "%s ha %s la invitación cuyos detalles se indican:"
 
-#: src/plugins/vcalendar/vcalendar.c:832
+#: src/plugins/vcalendar/vcalendar.c:835
 msgid "Error - could not get the calendar MIME part."
 msgstr "Error - no se pudo obtener la parte MIME del calendario."
 
-#: src/plugins/vcalendar/vcalendar.c:839
+#: src/plugins/vcalendar/vcalendar.c:842
 msgid "Error - no calendar part found."
 msgstr "Error - no se encontró la parte del calendario."
 
-#: src/plugins/vcalendar/vcalendar.c:853
+#: src/plugins/vcalendar/vcalendar.c:856
 msgid "Error - Unknown calendar component type."
 msgstr "Error - Tipo de componente de calendario desconocido."
 
-#: src/plugins/vcalendar/vcalendar.c:982
+#: src/plugins/vcalendar/vcalendar.c:985
 msgid "Send a notification to the attendees"
 msgstr "Enviar una notificación a los asistentes"
 
-#: src/plugins/vcalendar/vcalendar.c:991
+#: src/plugins/vcalendar/vcalendar.c:994
 msgid "Cancel meeting"
 msgstr "Cancelar reunión"
 
-#: src/plugins/vcalendar/vcalendar.c:992
+#: src/plugins/vcalendar/vcalendar.c:995
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "¿Está seguro de que quiere cancelar esta reunión?"
 
-#: src/plugins/vcalendar/vcalendar.c:1087
+#: src/plugins/vcalendar/vcalendar.c:1090
 msgid "No account found"
 msgstr "No se encontró ninguna cuenta"
 
-#: src/plugins/vcalendar/vcalendar.c:1088
+#: src/plugins/vcalendar/vcalendar.c:1091
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13496,68 +13393,68 @@ msgstr ""
 "No tiene ninguna cuenta que coincida con algún convocado.\n"
 "¿Desea responder de todas maneras?"
 
-#: src/plugins/vcalendar/vcalendar.c:1090
-msgid "+Reply anyway"
-msgstr "+Responder igualmente"
+#: src/plugins/vcalendar/vcalendar.c:1093
+msgid "Reply anyway"
+msgstr "Responder igualmente"
 
-#: src/plugins/vcalendar/vcalendar.c:1219
+#: src/plugins/vcalendar/vcalendar.c:1222
 msgid "Answer"
 msgstr "Responder"
 
-#: src/plugins/vcalendar/vcalendar.c:1220
+#: src/plugins/vcalendar/vcalendar.c:1223
 msgid "Edit meeting..."
 msgstr "Editar reunión..."
 
-#: src/plugins/vcalendar/vcalendar.c:1221
+#: src/plugins/vcalendar/vcalendar.c:1224
 msgid "Cancel meeting..."
 msgstr "Cancelar reunión..."
 
-#: src/plugins/vcalendar/vcalendar.c:1222
+#: src/plugins/vcalendar/vcalendar.c:1225
 msgid "Launch website"
 msgstr "Abrir página web"
 
-#: src/plugins/vcalendar/vcalendar.c:1226
+#: src/plugins/vcalendar/vcalendar.c:1229
 msgid "You are already busy at this time."
 msgstr "Usted ya está ocupado a esa hora."
 
-#: src/plugins/vcalendar/vcalendar.c:1265
+#: src/plugins/vcalendar/vcalendar.c:1268
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1740
 msgid "Event:"
 msgstr "Evento:"
 
-#: src/plugins/vcalendar/vcalendar.c:1266
+#: src/plugins/vcalendar/vcalendar.c:1269
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1729
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: src/plugins/vcalendar/vcalendar.c:1267
+#: src/plugins/vcalendar/vcalendar.c:1270
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
 msgid "Location:"
 msgstr "Ubicación:"
 
-#: src/plugins/vcalendar/vcalendar.c:1268
+#: src/plugins/vcalendar/vcalendar.c:1271
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1730
 msgid "Summary:"
 msgstr "Resumen:"
 
-#: src/plugins/vcalendar/vcalendar.c:1269
+#: src/plugins/vcalendar/vcalendar.c:1272
 msgid "Starting:"
 msgstr "Comienza:"
 
-#: src/plugins/vcalendar/vcalendar.c:1270
+#: src/plugins/vcalendar/vcalendar.c:1273
 msgid "Ending:"
 msgstr "Finaliza:"
 
-#: src/plugins/vcalendar/vcalendar.c:1272
+#: src/plugins/vcalendar/vcalendar.c:1275
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1723
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1733
 msgid "Attendees:"
 msgstr "Convocados:"
 
-#: src/plugins/vcalendar/vcalendar.c:1274
+#: src/plugins/vcalendar/vcalendar.c:1277
 msgid "Action:"
 msgstr "Acción:"
 
@@ -13597,27 +13494,27 @@ msgstr "Vista _mensual"
 msgid "Meetings"
 msgstr "Reuniones"
 
-#: src/plugins/vcalendar/vcal_folder.c:1478
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr "en el pasado"
 
-#: src/plugins/vcalendar/vcal_folder.c:1481
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr "hoy"
 
-#: src/plugins/vcalendar/vcal_folder.c:1484
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr "mañana"
 
-#: src/plugins/vcalendar/vcal_folder.c:1487
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr "esta semana"
 
-#: src/plugins/vcalendar/vcal_folder.c:1490
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr "más tarde"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -13626,17 +13523,17 @@ msgstr ""
 "\n"
 "Estos son los eventos planificados %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1589
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Excedido el tiempo (%d segundos) conectando a %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1607
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr "Error %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1804
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13649,7 +13546,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1808
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13662,7 +13559,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1819
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13673,7 +13570,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1822
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13684,45 +13581,45 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1851
-#: src/plugins/vcalendar/vcal_folder.c:1854
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr "No se puede crear el directorio %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1892
+#: src/plugins/vcalendar/vcal_folder.c:1893
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 "Claws Mail necesita acceso a la red para actualizar la subscripción del "
 "calendario web."
 
-#: src/plugins/vcalendar/vcal_folder.c:1903
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Recuperando calendario para %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1904
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr "nueva suscripción"
 
-#: src/plugins/vcalendar/vcal_folder.c:1915
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr ""
 "Claws Mail necesita acceso a la red para poder actualizar la subscripción."
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr "Suscribirse a un calendario web"
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr "Introduzca la URL del calendario web:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr "No se pudo procesar la URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1967
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr "¿Desea realmente desuscribirse?"
 
@@ -13996,17 +13893,17 @@ msgid "Check availability"
 msgstr "Comprobar disponibilidad"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
-msgid "<b>Starts at:</b> "
-msgstr "<b>Comienza a las:</b> "
+msgid "Starts at:"
+msgstr "Comienza a las:"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1628
-msgid "<b> on:</b>"
-msgstr "<b> en:</b> "
+msgid "on:"
+msgstr "en:"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
-msgid "<b>Ends at:</b> "
-msgstr "<b>Finaliza a las:</b> "
+msgid "Ends at:"
+msgstr "Finaliza a las:"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1663
 msgid "New meeting"
@@ -14065,102 +13962,113 @@ msgid_plural "Remind me in %d minutes"
 msgstr[0] "Recuérdamelo en %d minuto"
 msgstr[1] "Recuérdamelo en %d minutos"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2034
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2035
 msgid "Empty calendar"
 msgstr "Calendario vacío"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2035
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2036
 msgid "There is nothing to export."
 msgstr "No hay nada que exportar."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2075
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2076
 msgid "Could not export the calendar."
 msgstr "No se puede exportar el calendario."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2092
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2093
 msgid "Export calendar to ICS"
 msgstr "Exportar calendario a ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2115
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2116
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "No se puede exportar el calendario a «%s»\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2231
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2232
 msgid "Could not export the freebusy info."
 msgstr "No se puede exportar la información de libre/ocupado."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2263
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2264
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "No se puede exportar la información de libre/ocupado a «%s»\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:266
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr "Recordatorios"
 
-#: src/plugins/vcalendar/vcal_prefs.c:275
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr "Avisarme"
 
-#: src/plugins/vcalendar/vcal_prefs.c:287
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr "minutos antes de un evento"
 
-#: src/plugins/vcalendar/vcal_prefs.c:299
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr "Exportación de calendario"
 
-#: src/plugins/vcalendar/vcal_prefs.c:310
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr "Exportar automáticamente el calendario a"
 
-#: src/plugins/vcalendar/vcal_prefs.c:319
-#: src/plugins/vcalendar/vcal_prefs.c:425
+#: src/plugins/vcalendar/vcal_prefs.c:335
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr "Puede exportarlo a un fichero local o URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:321
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Especifique un fichero local o URL (http://servidor/ruta/fichero.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:351
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr "Incluir las suscripciones webcal en la exportación"
 
-#: src/plugins/vcalendar/vcal_prefs.c:361
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr "Orden a ejecutar tras la exportación del calendario"
 
-#: src/plugins/vcalendar/vcal_prefs.c:390
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Registrar el calendario de Claws en el reloj Orage de XFCE"
 
-#: src/plugins/vcalendar/vcal_prefs.c:392
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr "Permite a Orage (versión 4.4 o mayor) ver el calendario de Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:404
+#: src/plugins/vcalendar/vcal_prefs.c:421
+msgid "Export as GNOME shell calendar server"
+msgstr "Exportar como servidor de calendario del shell de GNOME"
+
+#: src/plugins/vcalendar/vcal_prefs.c:423
+msgid ""
+"Register D-Bus calendar server interface to export Claws Mail's calendar"
+msgstr ""
+"Registrar el interfaz D-Bus del servidor de calendario para exportar el "
+"calendario de Claws Mail"
+
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr "Información libre/ocupado"
 
-#: src/plugins/vcalendar/vcal_prefs.c:416
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr "Exportar automáticamente el estado de libre/ocupado a"
 
-#: src/plugins/vcalendar/vcal_prefs.c:427
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Especifique un fichero local o URL (http://servidor/ruta/fichero.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr "Orden a ejecutar tras la exportación del estado de libre/ocupado"
 
-#: src/plugins/vcalendar/vcal_prefs.c:484
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr "Obtener el estado de libre/ocupado de otros desde"
 
-#: src/plugins/vcalendar/vcal_prefs.c:492
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -14169,7 +14077,7 @@ msgstr ""
 "Especifique un fichero local o URL (http://servidor/ruta/fichero.ifb). Use "
 "%u para la parte izquierda de la dirección de correo, %d para el dominio"
 
-#: src/plugins/vcalendar/vcal_prefs.c:506
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr "Opciones SSL"
 
@@ -14224,12 +14132,12 @@ msgstr "hubo un error en la sesión POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "orden TOP no soportada\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1449 src/prefs_account.c:2433
-#: src/wizard.c:1482
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:337 src/prefs_account.c:1562 src/prefs_account.c:2448
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14237,7 +14145,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "Noticias (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1484
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "Fichero mbox local"
 
@@ -14265,93 +14173,93 @@ msgstr "Nombre completo"
 msgid "Mail address"
 msgstr "Dirección de correo"
 
-#: src/prefs_account.c:1128 src/wizard.c:1507
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "Configuración automática"
 
-#: src/prefs_account.c:1130 src/wizard.c:1508
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/prefs_account.c:1146
+#: src/prefs_account.c:1147
 msgid ""
-"<span weight=\"bold\">Warning: this version of Claws Mail\n"
-"has been built without IMAP and News support.</span>"
+"Warning: this version of Claws Mail\n"
+"has been built without IMAP and News support."
 msgstr ""
-"<span weight=\"bold\">Aviso: esta versión de Claws Mail\n"
-"se construyó sin soporte para IMAP y noticias.</span>"
+"Aviso: esta versión de Claws Mail\n"
+"se construyó sin soporte para IMAP y noticias."
 
-#: src/prefs_account.c:1175
+#: src/prefs_account.c:1176
 msgid "This server requires authentication"
 msgstr "Este servidor requiere autenticación"
 
-#: src/prefs_account.c:1182
+#: src/prefs_account.c:1183
 msgid "Authenticate on connect"
 msgstr "Autenticación al conectar"
 
-#: src/prefs_account.c:1236
+#: src/prefs_account.c:1237
 msgid "News server"
 msgstr "Servidor de news"
 
-#: src/prefs_account.c:1242
+#: src/prefs_account.c:1243
 msgid "Server for receiving"
 msgstr "Servidor de recepción"
 
-#: src/prefs_account.c:1248
+#: src/prefs_account.c:1249
 msgid "Local mailbox"
 msgstr "Buzón local"
 
-#: src/prefs_account.c:1255
+#: src/prefs_account.c:1256
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account.c:1263
+#: src/prefs_account.c:1264
 msgid "Use mail command rather than SMTP server"
 msgstr "Usar mandato para correo en vez de servidor SMTP"
 
-#: src/prefs_account.c:1272
+#: src/prefs_account.c:1273
 msgid "command to send mails"
 msgstr "orden para enviar los correos"
 
-#: src/prefs_account.c:1337
+#: src/prefs_account.c:1338
 #, c-format
 msgid "Account%d"
 msgstr "Cuenta%d"
 
-#: src/prefs_account.c:1423
+#: src/prefs_account.c:1424
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1429 src/prefs_account.c:1518
+#: src/prefs_account.c:1430 src/prefs_account.c:1519
 msgid "Default Inbox"
 msgstr "Entrada por defecto"
 
-#: src/prefs_account.c:1436 src/prefs_account.c:1443 src/prefs_account.c:1525
-#: src/prefs_account.c:1532
+#: src/prefs_account.c:1437 src/prefs_account.c:1444 src/prefs_account.c:1526
+#: src/prefs_account.c:1533
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Los mensajes sin filtrar se guardarán en esta carpeta"
 
-#: src/prefs_account.c:1451
+#: src/prefs_account.c:1452
 msgid "Use secure authentication (APOP)"
 msgstr "Utilizar autenticación segura (APOP)"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
 msgid "Remove messages on server when received"
 msgstr "Eliminar los mensajes del servidor al recibirlos"
 
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
 msgid "Remove after"
 msgstr "Eliminar después de"
 
-#: src/prefs_account.c:1472 src/prefs_account.c:1482
+#: src/prefs_account.c:1473 src/prefs_account.c:1483
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 días y 0 horas: borrar inmediatamente"
 
-#: src/prefs_account.c:1495
+#: src/prefs_account.c:1496
 msgid "Receive size limit"
 msgstr "Límite de tamaño al recibir"
 
-#: src/prefs_account.c:1498
+#: src/prefs_account.c:1499
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14359,79 +14267,79 @@ msgstr ""
 "Los mensajes que sobrepasen este límite serán recuperados parcialmente. Al "
 "seleccionarlos podrá descargarlos por completo o borrarlos."
 
-#: src/prefs_account.c:1538 src/prefs_account.c:2463
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1545
+#: src/prefs_account.c:1546
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artículos a descargar"
 
-#: src/prefs_account.c:1555
+#: src/prefs_account.c:1556
 msgid "unlimited if 0 is specified"
 msgstr "sin límite si se especifica 0"
 
-#: src/prefs_account.c:1591
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "Directorio del servidor IMAP"
 
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(vacío habitualmente)"
 
-#: src/prefs_account.c:1609
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "Mostrar sólo carpetas suscritas"
 
-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 "Modo de ancho de banda eficiente (evita recuperar las etiquetas remotas)"
 
-#: src/prefs_account.c:1618
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Este modo usa menos ancho de banda, pero puede ser más lento con algunos "
 "servidores."
 
-#: src/prefs_account.c:1625
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensajes al recibir"
 
-#: src/prefs_account.c:1632
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permitir el filtrado usando módulos al recibir"
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "«Recibir correo» comprueba si hay nuevos mensajes en esta cuenta"
 
-#: src/prefs_account.c:1717 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:623 src/prefs_matcher.c:1974 src/prefs_matcher.c:1996
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
+#: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Cabecera"
 
-#: src/prefs_account.c:1719
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "Generar identificador de mensaje"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr "Enviar la dirección de correo de la cuenta en el «Message-Id»"
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "Añadir cabecera de agente de usuario"
 
-#: src/prefs_account.c:1732
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 
-#: src/prefs_account.c:1747
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticación SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:1832
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14439,181 +14347,181 @@ msgstr ""
 "Si deja estos campos vacíos, se utilizarán el mismo identificador de usuario "
 "y contraseña usados para la recepción."
 
-#: src/prefs_account.c:1843
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticación con POP3 antes de enviar"
 
-#: src/prefs_account.c:1858
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "Tiempo límite para autenticación POP: "
 
-#: src/prefs_account.c:1866
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr "minutos"
 
-#: src/prefs_account.c:1936 src/prefs_account.c:1982
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "Firma"
 
-#: src/prefs_account.c:1939
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "Insertar la firma automáticamente"
 
-#: src/prefs_account.c:1944
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "Separador de la firma"
 
-#: src/prefs_account.c:1969
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "Salida de la orden"
 
-#: src/prefs_account.c:2002
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
-#: src/prefs_account.c:2054
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "Diccionarios de corrección ortográfica"
 
-#: src/prefs_account.c:2064 src/prefs_folder_item.c:1092
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Diccionario por omisión"
 
-#: src/prefs_account.c:2077 src/prefs_folder_item.c:1126
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Diccionario alternativo predeterminado"
 
-#: src/prefs_account.c:2163 src/prefs_account.c:3287
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1442
-#: src/prefs_folder_item.c:1833 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
+#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
+#: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Componer"
 
-#: src/prefs_account.c:2178 src/prefs_folder_item.c:1470 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Responder"
 
-#: src/prefs_account.c:2193 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1498 src/prefs_quote.c:149 src/toolbar.c:413
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
+#: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/prefs_account.c:2240
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "Sistema de privacidad por omisión"
 
-#: src/prefs_account.c:2269
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "Firmar siempre los mensajes"
 
-#: src/prefs_account.c:2271
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "Cifrar siempre los mensajes"
 
-#: src/prefs_account.c:2273
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr "Firmar siempre los mensajes al responder a un mensaje firmado"
 
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Cifrar siempre los mensajes al responder a un mensaje cifrado"
 
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Cifrar los mensajes enviados con la clave propia además de las del "
 "destinatario"
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "Guardar en claro los mensajes enviados cifrados"
 
-#: src/prefs_account.c:2437 src/prefs_account.c:2452 src/prefs_account.c:2466
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr "No usar SSL"
 
-#: src/prefs_account.c:2440
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para la conexión POP3"
 
-#: src/prefs_account.c:2443 src/prefs_account.c:2458 src/prefs_account.c:2489
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar la orden STARTTLS para abrir la sesión SSL"
 
-#: src/prefs_account.c:2455
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para la conexión IMAP4"
 
-#: src/prefs_account.c:2475
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para la conexión NNTP"
 
-#: src/prefs_account.c:2479
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account.c:2483
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "No usar SSL (pero usar STARTTLS si es necesario)"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para la conexión SMTP"
 
-#: src/prefs_account.c:2494
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "Certificados de cliente"
 
-#: src/prefs_account.c:2502
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "Certificado para recepción"
 
-#: src/prefs_account.c:2507 src/prefs_account.c:2509 src/prefs_account.c:2529
-#: src/prefs_account.c:2531
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Certificado de cliente como fichero PKCS12 o PEM"
 
-#: src/prefs_account.c:2524
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "Certificado para envío"
 
-#: src/prefs_account.c:2557
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr "Aceptar automáticamente los certificados SSL válidos"
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr "Usar SSL no-bloqueante"
 
-#: src/prefs_account.c:2572
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Desactive esto si tiene problemas de conexión con SSL"
 
-#: src/prefs_account.c:2690
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "Puerto SMTP"
 
-#: src/prefs_account.c:2697
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "Puerto POP3"
 
-#: src/prefs_account.c:2704
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "Puerto IMAP4"
 
-#: src/prefs_account.c:2711
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "Puerto NNTP"
 
-#: src/prefs_account.c:2717
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "Nombre de dominio"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14621,15 +14529,15 @@ msgstr ""
 "El nombre de dominio se usará en la parte derecha de los identificadores de "
 "mensaje generados («Message-Id») y al conectar a servidores SMTP."
 
-#: src/prefs_account.c:2734
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "Usar orden para comunicarse con el servidor"
 
-#: src/prefs_account.c:2742
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Mover los correos borrados a la papelera y purgarlos inmediatamente"
 
-#: src/prefs_account.c:2744
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -14637,108 +14545,108 @@ msgstr ""
 "Mueve los correos borrados a la papelera en lugar de usar la marca "
 "«\\Deleted» sin purgarlos."
 
-#: src/prefs_account.c:2748
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar los mensajes cruzados como leídos y de color:"
 
-#: src/prefs_account.c:2804
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "Poner mensajes enviados en"
 
-#: src/prefs_account.c:2806
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "Poner mensajes para la cola en"
 
-#: src/prefs_account.c:2808
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "Poner borradores de mensajes en"
 
-#: src/prefs_account.c:2810
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "Poner mensajes borrados en"
 
-#: src/prefs_account.c:2870
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "No se especificó el nombre de la cuenta."
 
-#: src/prefs_account.c:2874
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "No se especificó la dirección de correo."
 
-#: src/prefs_account.c:2881
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "No se especificó el servidor SMTP."
 
-#: src/prefs_account.c:2886
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "No se especificó el usuario."
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "No se especificó el servidor POP3."
 
-#: src/prefs_account.c:2911
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "La carpeta de entrada por omisión no existe."
 
-#: src/prefs_account.c:2917
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "No se especificó el servidor IMAP4."
 
-#: src/prefs_account.c:2922
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "No se especificó el servidor NNTP."
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "no se especificó el nombre de fichero del buzón local."
 
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "no se especificó el mandato de correo."
 
-#: src/prefs_account.c:3251
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account.c:3305 src/prefs_folder_item.c:1849 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Plantillas"
 
-#: src/prefs_account.c:3323
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: src/prefs_account.c:3434
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/prefs_account.c:3725
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "Preferencias para una nueva cuenta"
 
-#: src/prefs_account.c:3727
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferencias de la cuenta"
 
-#: src/prefs_account.c:3848 src/wizard.c:1372
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "Falló (dirección errónea)"
 
-#: src/prefs_account.c:3933
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "Seleccionar fichero de firma"
 
-#: src/prefs_account.c:3951 src/prefs_account.c:3968 src/wizard.c:1056
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "Seleccionar fichero del certificado"
 
-#: src/prefs_account.c:4064
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/prefs_account.c:4204
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (módulo no cargado)"
@@ -14772,7 +14680,7 @@ msgid "Replace the selected action in list with the action above"
 msgstr "Sustituir la acción seleccionada en la lista con la acción de arriba"
 
 #: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
-#: src/prefs_filtering.c:486 src/prefs_matcher.c:781 src/prefs_template.c:320
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:779 src/prefs_template.c:320
 #: src/prefs_toolbar.c:1056
 msgid "Re_move"
 msgstr "Eli_minar"
@@ -14799,7 +14707,7 @@ msgstr "Mover abajo la acción seleccionada"
 
 #: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
 #: src/prefs_filtering.c:836 src/prefs_filtering.c:838
-#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:900
+#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:896
 #: src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Nueva)"
@@ -14860,7 +14768,7 @@ msgid "Do you really want to delete all the actions?"
 msgstr "¿Realmente quiere borrar todas las acciones?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2125
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114
 #: src/prefs_template.c:572 src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Entrada no guardada"
@@ -14873,10 +14781,10 @@ msgstr "La entrada no fue guardada. ¿Cerrar igualmente?"
 
 #: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
 #: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2127
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117
 #: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
-msgid "+_Continue editing"
-msgstr "+_Seguir editando"
+msgid "_Continue editing"
+msgstr "_Seguir editando"
 
 #: src/prefs_actions.c:903
 msgid "Actions list not saved"
@@ -15116,7 +15024,7 @@ msgid "Custom header configuration"
 msgstr "Configuración de cabeceras de usuario"
 
 #: src/prefs_customheader.c:506 src/prefs_display_header.c:599
-#: src/prefs_matcher.c:1595 src/prefs_matcher.c:1610
+#: src/prefs_matcher.c:1594 src/prefs_matcher.c:1609
 msgid "Header name is not set."
 msgstr "No se estableció el nombre de cabecera."
 
@@ -15210,23 +15118,27 @@ msgstr "Esa cabecera ya existe en la lista."
 msgid "%s will be replaced with file name / URI"
 msgstr "%s se sustituirá con el nombre de fichero / URI"
 
-#: src/prefs_ext_prog.c:120
+#: src/prefs_ext_prog.c:110
+msgid "For the text editor, %w will be replaced with GtkSocket ID"
+msgstr "Para el editor de texto, %w se sustituirá con el ID del GtkSocket"
+
+#: src/prefs_ext_prog.c:129
 msgid "Use system defaults when possible"
 msgstr "Usar los valores del sistema cuando sea posible"
 
-#: src/prefs_ext_prog.c:141
+#: src/prefs_ext_prog.c:150
 msgid "Web browser"
 msgstr "Navegador web"
 
-#: src/prefs_ext_prog.c:169
+#: src/prefs_ext_prog.c:178
 msgid "Text editor"
 msgstr "Editor de texto"
 
-#: src/prefs_ext_prog.c:197
+#: src/prefs_ext_prog.c:210
 msgid "Command for 'Display as text'"
 msgstr "Orden para «Mostrar como texto»"
 
-#: src/prefs_ext_prog.c:210
+#: src/prefs_ext_prog.c:223
 msgid ""
 "This option enables MIME parts to be displayed in the message view via a "
 "script when using the 'Display as text' contextual menu item"
@@ -15234,12 +15146,12 @@ msgstr ""
 "Esta opción permite mostrar partes MIME en la vista de mensajes a través de "
 "un script cuando se usa la opción «Mostrar como texto» del menú contextual"
 
-#: src/prefs_ext_prog.c:269 src/prefs_image_viewer.c:138
+#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
 #: src/prefs_message.c:354
 msgid "Message View"
 msgstr "Vista de mensaje"
 
-#: src/prefs_ext_prog.c:270
+#: src/prefs_ext_prog.c:283
 msgid "External Programs"
 msgstr "Programas externos"
 
@@ -15262,8 +15174,8 @@ msgstr "Ocultar"
 msgid "Message flags"
 msgstr "Marcas de mensaje"
 
-#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:443
-#: src/prefs_summary_column.c:78 src/summaryview.c:2791
+#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:442
+#: src/prefs_summary_column.c:78 src/summaryview.c:2795
 msgid "Mark"
 msgstr "Marca"
 
@@ -15288,7 +15200,7 @@ msgstr "Marcar como bueno"
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:441
+#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:440
 msgid "Color label"
 msgstr "Etiqueta de color"
 
@@ -15303,8 +15215,8 @@ msgstr "Redirigir"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
 #: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:629
-#: src/prefs_summaries.c:446 src/prefs_summary_column.c:87
-#: src/summaryview.c:447
+#: src/prefs_summaries.c:445 src/prefs_summary_column.c:87
+#: src/summaryview.c:446
 msgid "Score"
 msgstr "Puntos"
 
@@ -15318,7 +15230,7 @@ msgstr "Establecer puntos"
 
 #: src/prefs_filtering_action.c:196 src/prefs_filtering_action.c:197
 #: src/prefs_filtering_action.c:198 src/prefs_matcher.c:633
-#: src/prefs_summary_column.c:89 src/summaryview.c:449
+#: src/prefs_summary_column.c:89 src/summaryview.c:448
 msgid "Tags"
 msgstr "Etiquetas"
 
@@ -15387,25 +15299,25 @@ msgstr "El nombre de la etiqueta está vacío."
 msgid "No action was defined."
 msgstr "No se definió ninguna acción."
 
-#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2169
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2160
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "carácter %"
 
-#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2178
+#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2169
 msgid "filename (should not be modified)"
 msgstr "nombre de fichero (no debe modificarse)"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2179
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2170
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "nueva línea"
 
-#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2180
+#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2171
 msgid "escape character for quotes"
 msgstr "carácter de escape para citas"
 
-#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2181
+#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2172
 msgid "quote character"
 msgstr "carácter de cita"
 
@@ -15573,8 +15485,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Columnas ocultas"
 
-#: src/prefs_folder_column.c:290 src/prefs_summaries.c:410
-#: src/prefs_summaries.c:588 src/prefs_summary_column.c:304
+#: src/prefs_folder_column.c:290 src/prefs_summaries.c:409
+#: src/prefs_summaries.c:587 src/prefs_summary_column.c:304
 msgid "Displayed columns"
 msgstr "Columnas visibles"
 
@@ -15583,18 +15495,19 @@ msgstr "Columnas visibles"
 msgid " Use default "
 msgstr " Usar configuración inicial "
 
-#: src/prefs_folder_item.c:268 src/prefs_folder_item.c:876
-#: src/prefs_folder_item.c:1402
+#: src/prefs_folder_item.c:262 src/prefs_folder_item.c:864
+#: src/prefs_folder_item.c:1390
+#, suzzy
 msgid ""
-"<i>These preferences will not be saved as this folder is a top-level folder. "
+"These preferences will not be saved as this folder is a top-level folder. "
 "However, you can set them for the whole mailbox tree by using \"Apply to "
-"subfolders\".</i>"
+"subfolders\"."
 msgstr ""
-"<i>Estas preferencias no se guardarán ya que esta carpeta es un buzón raíz. "
+"Estas preferencias no se guardarán ya que esta carpeta es un buzón raíz. "
 "Sin embargo puede usarlas para establecerlas en todo el árbol de carpetas "
-"del buzón usando «Aplicar a subcarpetas».</i>"
+"del buzón usando «Aplicar a subcarpetas»."
 
-#: src/prefs_folder_item.c:280 src/prefs_folder_item.c:888
+#: src/prefs_folder_item.c:274 src/prefs_folder_item.c:876
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -15602,55 +15515,55 @@ msgstr ""
 "Aplicar a\n"
 "subcarpetas"
 
-#: src/prefs_folder_item.c:305
+#: src/prefs_folder_item.c:299
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:307
+#: src/prefs_folder_item.c:301
 msgid "Outbox"
 msgstr "Salida"
 
-#: src/prefs_folder_item.c:323
+#: src/prefs_folder_item.c:317
 msgid "Folder type"
 msgstr "Tipo de carpeta"
 
-#: src/prefs_folder_item.c:336
+#: src/prefs_folder_item.c:329
 msgid "Simplify Subject RegExp"
 msgstr "Expr. reg. para simplificar asunto"
 
-#: src/prefs_folder_item.c:362
+#: src/prefs_folder_item.c:355
 msgid "Test string:"
 msgstr "Texto de prueba:"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:372
 msgid "Result:"
 msgstr "Resultado:"
 
-#: src/prefs_folder_item.c:394
+#: src/prefs_folder_item.c:387
 msgid "Folder chmod"
 msgstr "Permisos de la carpeta"
 
-#: src/prefs_folder_item.c:420
+#: src/prefs_folder_item.c:413
 msgid "Folder color"
 msgstr "Color de la carpeta"
 
-#: src/prefs_folder_item.c:433 src/prefs_folder_item.c:1671
+#: src/prefs_folder_item.c:426 src/prefs_folder_item.c:1659
 msgid "Pick color for folder"
 msgstr "Elegir color para la carpeta"
 
-#: src/prefs_folder_item.c:451
+#: src/prefs_folder_item.c:444
 msgid "Run Processing rules at start-up"
 msgstr "Ejecutar las reglas de procesamiento al iniciar"
 
-#: src/prefs_folder_item.c:466
+#: src/prefs_folder_item.c:459
 msgid "Run Processing rules when opening"
 msgstr "Ejecutar las reglas de procesamiento al abrir"
 
-#: src/prefs_folder_item.c:480
+#: src/prefs_folder_item.c:473
 msgid "Scan for new mail"
 msgstr "Examinar si hay correo nuevo"
 
-#: src/prefs_folder_item.c:482
+#: src/prefs_folder_item.c:475
 msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
@@ -15658,11 +15571,11 @@ msgstr ""
 "Active esta opción si el correo es servido directamente en esta carpeta por "
 "el filtrado del servidor en IMAP o por una aplicación externa"
 
-#: src/prefs_folder_item.c:502
+#: src/prefs_folder_item.c:495
 msgid "Select the HTML part of multipart messages"
 msgstr "Seleccionar la parte HTML en mensajes multiparte"
 
-#: src/prefs_folder_item.c:519
+#: src/prefs_folder_item.c:512
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
@@ -15670,65 +15583,61 @@ msgstr ""
 "«Por omisión» obedecerá las preferencias globales (que se encuentran en /"
 "Preferencias/Vista de mensaje/Opciones de texto)"
 
-#: src/prefs_folder_item.c:529
+#: src/prefs_folder_item.c:522
 msgid "Synchronise for offline use"
 msgstr "Sincronizar para uso sin conexión"
 
-#: src/prefs_folder_item.c:550
+#: src/prefs_folder_item.c:543
 msgid "Fetch message bodies from the last"
 msgstr "Recuperar cuerpos de mensaje desde el último"
 
-#: src/prefs_folder_item.c:557
+#: src/prefs_folder_item.c:550
 msgid "0: all bodies"
 msgstr "0: todos los cuerpos"
 
-#: src/prefs_folder_item.c:565
+#: src/prefs_folder_item.c:558
 msgid "Remove older messages bodies"
 msgstr "Eliminar cuerpos de mensaje antiguos"
 
-#: src/prefs_folder_item.c:582
+#: src/prefs_folder_item.c:575
 msgid "Discard folder cache"
 msgstr "Descartar la caché de carpeta"
 
-#: src/prefs_folder_item.c:897
+#: src/prefs_folder_item.c:885
 msgid "Request Return Receipt"
 msgstr "Solicitar acuse de recibo"
 
-#: src/prefs_folder_item.c:912
+#: src/prefs_folder_item.c:900
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Guardar los mensajes salientes en esta carpeta en vez de en Enviado"
 
-#: src/prefs_folder_item.c:925 src/prefs_folder_item.c:948
-#: src/prefs_folder_item.c:972 src/prefs_folder_item.c:995
-#: src/prefs_folder_item.c:1018
+#: src/prefs_folder_item.c:913 src/prefs_folder_item.c:936
+#: src/prefs_folder_item.c:960 src/prefs_folder_item.c:983
+#: src/prefs_folder_item.c:1006
 msgid "Default "
 msgstr "Por omisión "
 
-#: src/prefs_folder_item.c:949
+#: src/prefs_folder_item.c:937
 msgid " for replies"
 msgstr " para respuestas"
 
-#: src/prefs_folder_item.c:1041
+#: src/prefs_folder_item.c:1029
 msgid "Default account"
 msgstr "Cuenta primaria"
 
-#: src/prefs_folder_item.c:1684
+#: src/prefs_folder_item.c:1672
 msgid "Discard cache"
 msgstr "Descartar caché"
 
-#: src/prefs_folder_item.c:1685
+#: src/prefs_folder_item.c:1673
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr "¿Quiere borrar realmente los datos locales en caché para esta carpeta?"
 
-#: src/prefs_folder_item.c:1687
-msgid "+Discard"
-msgstr "+Descartar"
-
-#: src/prefs_folder_item.c:1816
+#: src/prefs_folder_item.c:1803
 msgid "General"
 msgstr "Genéricas"
 
-#: src/prefs_folder_item.c:1895
+#: src/prefs_folder_item.c:1882
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Propiedades de la carpeta %s"
@@ -15737,7 +15646,7 @@ msgstr "Propiedades de la carpeta %s"
 msgid "Folder and Message Lists"
 msgstr "Carpeta y listas de mensajes"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2046
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2035
 msgid "Message"
 msgstr "Mensaje"
 
@@ -15763,7 +15672,7 @@ msgstr "Usar una tipografía distinta para imprimir"
 msgid "Message Printing"
 msgstr "Impresión de mensajes"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:732
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:731
 #: src/prefs_themes.c:365
 msgid "Display"
 msgstr "Ver"
@@ -15917,7 +15826,7 @@ msgstr "Mensajes de error"
 msgid "Status messages for filtering/processing log"
 msgstr "Mensajes de estado de filtrado/traza de procesamiento"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:689
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr "Otras"
 
@@ -15925,156 +15834,156 @@ msgstr "Otras"
 msgid "Logging"
 msgstr "Depuración"
 
-#: src/prefs_matcher.c:330
+#: src/prefs_matcher.c:331
 msgid "more than"
 msgstr "más que"
 
-#: src/prefs_matcher.c:331
+#: src/prefs_matcher.c:332
 msgid "less than"
 msgstr "menos que"
 
-#: src/prefs_matcher.c:337
+#: src/prefs_matcher.c:338
 msgid "weeks"
 msgstr "semanas"
 
-#: src/prefs_matcher.c:341
+#: src/prefs_matcher.c:342
 msgid "higher than"
 msgstr "más alto que"
 
-#: src/prefs_matcher.c:342
+#: src/prefs_matcher.c:343
 msgid "lower than"
 msgstr "más bajo que"
 
-#: src/prefs_matcher.c:343 src/prefs_matcher.c:349
+#: src/prefs_matcher.c:344 src/prefs_matcher.c:350
 msgid "exactly"
 msgstr "exactamente"
 
-#: src/prefs_matcher.c:347
+#: src/prefs_matcher.c:348
 msgid "greater than"
 msgstr "mayor que"
 
-#: src/prefs_matcher.c:348
+#: src/prefs_matcher.c:349
 msgid "smaller than"
 msgstr "menor que"
 
-#: src/prefs_matcher.c:353
+#: src/prefs_matcher.c:354
 msgid "bytes"
 msgstr "bytes"
 
-#: src/prefs_matcher.c:354
+#: src/prefs_matcher.c:355
 msgid "kilobytes"
 msgstr "kilobytes"
 
-#: src/prefs_matcher.c:355
+#: src/prefs_matcher.c:356
 msgid "megabytes"
 msgstr "megabytes"
 
-#: src/prefs_matcher.c:359
+#: src/prefs_matcher.c:360
 msgid "contains"
 msgstr "contiene"
 
-#: src/prefs_matcher.c:360
+#: src/prefs_matcher.c:361
 msgid "doesn't contain"
 msgstr "no contiene"
 
-#: src/prefs_matcher.c:383
+#: src/prefs_matcher.c:385
 msgid "headers part"
 msgstr "sección cabeceras"
 
-#: src/prefs_matcher.c:384
+#: src/prefs_matcher.c:386
 msgid "headers values"
 msgstr "valores de cabeceras"
 
-#: src/prefs_matcher.c:385
+#: src/prefs_matcher.c:387
 msgid "body part"
 msgstr "sección cuerpo"
 
-#: src/prefs_matcher.c:386
+#: src/prefs_matcher.c:388
 msgid "whole message"
 msgstr "mensaje completo"
 
-#: src/prefs_matcher.c:392 src/summaryview.c:6328
+#: src/prefs_matcher.c:394 src/summaryview.c:6332
 msgid "Marked"
 msgstr "Marcado"
 
-#: src/prefs_matcher.c:393 src/summaryview.c:6326
+#: src/prefs_matcher.c:395 src/summaryview.c:6330
 msgid "Deleted"
 msgstr "Borrado"
 
-#: src/prefs_matcher.c:394
+#: src/prefs_matcher.c:396
 msgid "Replied"
 msgstr "Respondido"
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6320
+#: src/prefs_matcher.c:397 src/summaryview.c:6324
 msgid "Forwarded"
 msgstr "Reenviado"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6310 src/toolbar.c:416
+#: src/prefs_matcher.c:399 src/summaryview.c:6314 src/toolbar.c:416
 #: src/toolbar.c:934 src/toolbar.c:1978
 msgid "Spam"
 msgstr "Basura"
 
-#: src/prefs_matcher.c:398
+#: src/prefs_matcher.c:400
 msgid "Has attachment"
 msgstr "Tiene adjunto"
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6346
+#: src/prefs_matcher.c:401 src/summaryview.c:6350
 msgid "Signed"
 msgstr "Firmado"
 
-#: src/prefs_matcher.c:403
+#: src/prefs_matcher.c:405
 msgid "set"
 msgstr "establecido"
 
-#: src/prefs_matcher.c:404
+#: src/prefs_matcher.c:406
 msgid "not set"
 msgstr "no establecido"
 
-#: src/prefs_matcher.c:408
+#: src/prefs_matcher.c:410
 msgid "yes"
 msgstr "si"
 
-#: src/prefs_matcher.c:409
+#: src/prefs_matcher.c:411
 msgid "no"
 msgstr "no"
 
-#: src/prefs_matcher.c:413
+#: src/prefs_matcher.c:415
 msgid "Any tags"
 msgstr "Cualquier etiqueta"
 
-#: src/prefs_matcher.c:414
+#: src/prefs_matcher.c:416
 msgid "Specific tag"
 msgstr "Etiqueta específica"
 
-#: src/prefs_matcher.c:418
+#: src/prefs_matcher.c:420
 msgid "ignored"
 msgstr "ignorado"
 
-#: src/prefs_matcher.c:419
+#: src/prefs_matcher.c:421
 msgid "not ignored"
 msgstr "no ignorado"
 
-#: src/prefs_matcher.c:420
+#: src/prefs_matcher.c:422
 msgid "watched"
 msgstr "observado"
 
-#: src/prefs_matcher.c:421
+#: src/prefs_matcher.c:423
 msgid "not watched"
 msgstr "no observado"
 
-#: src/prefs_matcher.c:425
+#: src/prefs_matcher.c:427
 msgid "found"
 msgstr "encontrado"
 
-#: src/prefs_matcher.c:426
+#: src/prefs_matcher.c:428
 msgid "not found"
 msgstr "no encontrado"
 
-#: src/prefs_matcher.c:430
+#: src/prefs_matcher.c:432
 msgid "0 (Passed)"
 msgstr "0 (Pasado)"
 
-#: src/prefs_matcher.c:431
+#: src/prefs_matcher.c:433
 msgid "non-0 (Failed)"
 msgstr "no-0 (Fallido)"
 
@@ -16118,54 +16027,54 @@ msgstr "Parcialmente descargado"
 msgid "External program test"
 msgstr "Prueba con un programa externo"
 
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1616 src/prefs_matcher.c:1631
-#: src/prefs_matcher.c:2521
+#: src/prefs_matcher.c:710 src/prefs_matcher.c:1615 src/prefs_matcher.c:1630
+#: src/prefs_matcher.c:2516
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Todos"
 
-#: src/prefs_matcher.c:744
+#: src/prefs_matcher.c:743
 msgid "Use regexp"
 msgstr "Usar exp.reg."
 
-#: src/prefs_matcher.c:821
+#: src/prefs_matcher.c:819
 msgid "Message must match"
 msgstr "El mensaje debe cumplir"
 
-#: src/prefs_matcher.c:825
+#: src/prefs_matcher.c:823
 msgid "at least one"
 msgstr "al menos una de"
 
-#: src/prefs_matcher.c:826
+#: src/prefs_matcher.c:824
 msgid "all"
 msgstr "todas"
 
-#: src/prefs_matcher.c:829
+#: src/prefs_matcher.c:827
 msgid "of above rules"
 msgstr "las reglas anteriores"
 
-#: src/prefs_matcher.c:1534 src/prefs_matcher.c:1600
+#: src/prefs_matcher.c:1533 src/prefs_matcher.c:1599
 msgid "Search pattern is not set."
 msgstr "No se estableció el patrón de búsqueda."
 
-#: src/prefs_matcher.c:1543
+#: src/prefs_matcher.c:1542
 msgid "Test command is not set."
 msgstr "No se estableció la orden de prueba."
 
-#: src/prefs_matcher.c:1617
+#: src/prefs_matcher.c:1616
 msgid "all addresses in all headers"
 msgstr "todas las direcciones en todas las cabeceras"
 
-#: src/prefs_matcher.c:1620
+#: src/prefs_matcher.c:1619
 msgid "any address in any header"
 msgstr "cualquier dirección en cualquier cabecera"
 
-#: src/prefs_matcher.c:1622
+#: src/prefs_matcher.c:1621
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "la(s) dirección(es) en la cabecera «%s»"
 
-#: src/prefs_matcher.c:1623
+#: src/prefs_matcher.c:1622
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16178,83 +16087,83 @@ msgstr ""
 "Si quiere encontrar coincidencias de «%s» en todo el libro de direcciones "
 "deberá seleccionar «%s» en la lista desplegable de agenda/carpeta."
 
-#: src/prefs_matcher.c:1842
+#: src/prefs_matcher.c:1841
 msgid "Headers part"
 msgstr "Sección cabeceras"
 
-#: src/prefs_matcher.c:1846
+#: src/prefs_matcher.c:1845
 msgid "Headers values"
 msgstr "Valores de cabeceras"
 
-#: src/prefs_matcher.c:1850
+#: src/prefs_matcher.c:1849
 msgid "Body part"
 msgstr "Sección cuerpo"
 
-#: src/prefs_matcher.c:1854
+#: src/prefs_matcher.c:1853
 msgid "Whole message"
 msgstr "Mensaje completo"
 
-#: src/prefs_matcher.c:1973 src/prefs_matcher.c:2017
+#: src/prefs_matcher.c:1966 src/prefs_matcher.c:2008
 msgid "in"
 msgstr "en"
 
-#: src/prefs_matcher.c:1975
+#: src/prefs_matcher.c:1968
 msgid "content is"
 msgstr "contenido es"
 
-#: src/prefs_matcher.c:1984
+#: src/prefs_matcher.c:1977
 msgid "Age is"
 msgstr "Edad es"
 
-#: src/prefs_matcher.c:1989
+#: src/prefs_matcher.c:1982
 msgid "Flag"
 msgstr "Marca"
 
-#: src/prefs_matcher.c:1990 src/prefs_matcher.c:2007
+#: src/prefs_matcher.c:1983 src/prefs_matcher.c:1998
 msgid "is"
 msgstr "es"
 
-#: src/prefs_matcher.c:1995
+#: src/prefs_matcher.c:1988
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/prefs_matcher.c:2006
+#: src/prefs_matcher.c:1997
 msgid "Label"
 msgstr "Etiqueta"
 
-#: src/prefs_matcher.c:2012
+#: src/prefs_matcher.c:2003
 msgid "Value:"
 msgstr "Valor:"
 
-#: src/prefs_matcher.c:2029
+#: src/prefs_matcher.c:2018
 msgid "Score is"
 msgstr "Puntuación es"
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2019
 msgid "points"
 msgstr "puntos"
 
-#: src/prefs_matcher.c:2040
+#: src/prefs_matcher.c:2029
 msgid "Size is"
 msgstr "Tamaño es"
 
-#: src/prefs_matcher.c:2045
+#: src/prefs_matcher.c:2034
 msgid "Scope:"
 msgstr "Alcance:"
 
-#: src/prefs_matcher.c:2047
+#: src/prefs_matcher.c:2036
 msgid "tags"
 msgstr "etiquetas"
 
-#: src/prefs_matcher.c:2052
+#: src/prefs_matcher.c:2041
 msgid "type is"
 msgstr "tipo es"
 
-#: src/prefs_matcher.c:2056
+#: src/prefs_matcher.c:2045
 msgid "Program returns"
 msgstr "El programa devuelve"
 
-#: src/prefs_matcher.c:2126
+#: src/prefs_matcher.c:2115
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -16262,11 +16171,11 @@ msgstr ""
 "La entrada no fue guardada.\n"
 "¿Cerrar igualmente?"
 
-#: src/prefs_matcher.c:2190
+#: src/prefs_matcher.c:2181
 msgid "Match Type: 'Test'"
 msgstr "Tipo de coincidencia: «Probar»"
 
-#: src/prefs_matcher.c:2191
+#: src/prefs_matcher.c:2182
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -16278,7 +16187,7 @@ msgstr ""
 "\n"
 "Se pueden usar los siguientes símbolos:"
 
-#: src/prefs_matcher.c:2290
+#: src/prefs_matcher.c:2281
 msgid "Current condition rules"
 msgstr "Reglas de condición actuales"
 
@@ -16443,7 +16352,7 @@ msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Elegir el color para las firmas"
 
-#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:358
+#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:357
 msgid "Folder list"
 msgstr "Lista de carpetas"
 
@@ -16545,15 +16454,15 @@ msgstr "Elegir color para «color %d»"
 msgid "Colors"
 msgstr "Colores"
 
-#: src/prefs_other.c:97
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr "Elegir configuración de atajos de teclado"
 
-#: src/prefs_other.c:111
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr "Seleccionar combinación:"
 
-#: src/prefs_other.c:126
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16561,35 +16470,35 @@ msgstr ""
 "Puede también modificar cada atajo de menú presionando\n"
 "la(s) tecla(s) al situar el puntero sobre el elemento."
 
-#: src/prefs_other.c:479
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr "Añadir la dirección al destino con doble clic"
 
-#: src/prefs_other.c:482
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr "Al salir"
 
-#: src/prefs_other.c:485
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr "Confirmar al salir"
 
-#: src/prefs_other.c:492
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "Vaciar la papelera al salir"
 
-#: src/prefs_other.c:495
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensajes en cola"
 
-#: src/prefs_other.c:497
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
-#: src/prefs_other.c:500
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Habilitar los atajos de teclado configurables"
 
-#: src/prefs_other.c:503
+#: src/prefs_other.c:502
 msgid ""
 "If checked, you can change the keyboard shortcuts of most of the menu items "
 "by focusing on the menu item and pressing a key combination.\n"
@@ -16600,15 +16509,15 @@ msgstr ""
 "de teclas.\n"
 "Desmarque esta opción si quiere bloquear todos los atajos existentes."
 
-#: src/prefs_other.c:510
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr "Seleccionar configuración de atajos de teclado..."
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr "Gestión de metadatos"
 
-#: src/prefs_other.c:521
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16617,33 +16526,33 @@ msgstr ""
 "metadatos;\n"
 "Evita la pérdida de datos en caso de caídas pero puede llevar cierto tiempo."
 
-#: src/prefs_other.c:525
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr "Más seguro"
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr "Más rápido"
 
-#: src/prefs_other.c:545
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr "Tiempo límite de E/S del conector"
 
-#: src/prefs_other.c:567
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "Preguntar antes de vaciar la papelera"
 
-#: src/prefs_other.c:569
+#: src/prefs_other.c:568
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 "Preguntar sobre las reglas de filtrado específicas de la cuenta al filtrar "
 "manualmente"
 
-#: src/prefs_other.c:574
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr "Usar borrado de ficheros seguro si es posible"
 
-#: src/prefs_other.c:578
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16651,7 +16560,7 @@ msgstr ""
 "Usar borrado de ficheros seguro si es posible\n"
 "(el programa «shred» no está disponible)"
 
-#: src/prefs_other.c:583
+#: src/prefs_other.c:582
 msgid ""
 "Use the 'shred' program to overwrite files with random data before deleting "
 "them. This slows down deletion. Be sure to read shred's man page for caveats."
@@ -16660,11 +16569,11 @@ msgstr ""
 "aleatorios antes de borrarlos. Esto ralentiza el borrado. Asegúrese de leer "
 "las implicaciones en la página del manual de shred."
 
-#: src/prefs_other.c:587
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Sincronizar carpetas sin conexión tan pronto como sea posible"
 
-#: src/prefs_other.c:690
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
@@ -16974,172 +16883,172 @@ msgstr "Elegir color de los fallos ortográficos. Usar negro para subrayar"
 msgid "Spell Checking"
 msgstr "Corrección ortográfica"
 
-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:153
 msgid "the abbreviated weekday name"
 msgstr "el día la semana abreviado"
 
-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:154
 msgid "the full weekday name"
 msgstr "el día de la semana completo"
 
-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:155
 msgid "the abbreviated month name"
 msgstr "el nombre del mes abreviado"
 
-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:156
 msgid "the full month name"
 msgstr "el nombre del mes completo"
 
-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:157
 msgid "the preferred date and time for the current locale"
 msgstr "la fecha y hora preferida para la localización actual"
 
-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:158
 msgid "the century number (year/100)"
 msgstr "el número de siglo (año/100)"
 
-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:159
 msgid "the day of the month as a decimal number"
 msgstr "el día del mes como número decimal"
 
-#: src/prefs_summaries.c:161
+#: src/prefs_summaries.c:160
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "la hora como número usando el reloj de 24 horas"
 
-#: src/prefs_summaries.c:162
+#: src/prefs_summaries.c:161
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "la hora como número usando el reloj de 12 horas"
 
-#: src/prefs_summaries.c:163
+#: src/prefs_summaries.c:162
 msgid "the day of the year as a decimal number"
 msgstr "el día del año como número decimal"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:163
 msgid "the month as a decimal number"
 msgstr "el mes como número decimal"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:164
 msgid "the minute as a decimal number"
 msgstr "el minuto como número decimal"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:165
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:166
 msgid "the second as a decimal number"
 msgstr "el segundo como número decimal"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:167
 msgid "the day of the week as a decimal number"
 msgstr "el día de la semana como número decimal"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:168
 msgid "the preferred date for the current locale"
 msgstr "la fecha preferida para la localización actual"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:169
 msgid "the last two digits of a year"
 msgstr "los dos últimos dígitos del año"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:170
 msgid "the year as a decimal number"
 msgstr "el año como número decimal"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:171
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria o nombre o abreviatura"
 
-#: src/prefs_summaries.c:193 src/prefs_summaries.c:241
-#: src/prefs_summaries.c:562
+#: src/prefs_summaries.c:192 src/prefs_summaries.c:240
+#: src/prefs_summaries.c:561
 msgid "Date format"
 msgstr "Formato de fecha"
 
-#: src/prefs_summaries.c:217
+#: src/prefs_summaries.c:216
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_summaries.c:259
+#: src/prefs_summaries.c:258
 msgid "Example"
 msgstr "Ejemplo"
 
-#: src/prefs_summaries.c:364
+#: src/prefs_summaries.c:363
 msgid "Display message count next to folder name"
 msgstr "Ver el número de mensajes junto al nombre de la carpeta"
 
-#: src/prefs_summaries.c:374
+#: src/prefs_summaries.c:373
 msgid "Unread messages"
 msgstr "Mensajes sin leer"
 
-#: src/prefs_summaries.c:375
+#: src/prefs_summaries.c:374
 msgid "Unread and Total messages"
 msgstr "Mensajes sin leer y totales"
 
-#: src/prefs_summaries.c:385
+#: src/prefs_summaries.c:384
 msgid "Open last opened folder at start-up"
 msgstr "Abrir la última carpeta abierta al inicio"
 
-#: src/prefs_summaries.c:388
+#: src/prefs_summaries.c:387
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abreviar nombres de grupo con más de"
 
-#: src/prefs_summaries.c:402
+#: src/prefs_summaries.c:401
 msgid "letters"
 msgstr "letras"
 
-#: src/prefs_summaries.c:420
+#: src/prefs_summaries.c:419
 msgid "Message list"
 msgstr "Lista de mensajes"
 
-#: src/prefs_summaries.c:426
+#: src/prefs_summaries.c:425
 msgid "Sort new folders by"
 msgstr "Ordenar las carpetas nuevas por"
 
-#: src/prefs_summaries.c:434 src/prefs_summary_column.c:86
+#: src/prefs_summaries.c:433 src/prefs_summary_column.c:86
 msgid "Number"
 msgstr "Número"
 
-#: src/prefs_summaries.c:437
+#: src/prefs_summaries.c:436
 msgid "Thread date"
 msgstr "Fecha del hilo"
 
-#: src/prefs_summaries.c:448
+#: src/prefs_summaries.c:447
 msgid "Don't sort"
 msgstr "No ordenar"
 
-#: src/prefs_summaries.c:465
+#: src/prefs_summaries.c:464
 msgid "Set default selection when entering a folder"
 msgstr "Establecer la selección por defecto al entrar en una carpeta"
 
-#: src/prefs_summaries.c:478
+#: src/prefs_summaries.c:477
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Mostrar el diálogo de «No hay mensajes sin leer (o nuevos)»"
 
-#: src/prefs_summaries.c:488
+#: src/prefs_summaries.c:487
 msgid "Assume 'Yes'"
 msgstr "Asumir «Sí»"
 
-#: src/prefs_summaries.c:489
+#: src/prefs_summaries.c:488
 msgid "Assume 'No'"
 msgstr "Asumir «No»"
 
-#: src/prefs_summaries.c:497
+#: src/prefs_summaries.c:496
 msgid "Open message when selected"
 msgstr "Abrir el mensaje cuando se seleccione"
 
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:506
 msgid "When message view is visible"
 msgstr "Cuando la vista de mensajes sea visible"
 
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:512
 msgid "Thread using subject in addition to standard headers"
 msgstr "Jerarquizar usando el asunto además de las cabeceras estándar"
 
-#: src/prefs_summaries.c:517
+#: src/prefs_summaries.c:516
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
 
-#: src/prefs_summaries.c:519
+#: src/prefs_summaries.c:518
 msgid ""
 "Defers moving, copying and deleting of messages until you choose 'Tools/"
 "Execute'"
@@ -17147,39 +17056,39 @@ msgstr ""
 "Pospone los movimientos, copiados y borrados de mensajes hasta que se "
 "seleccione «Herramientas/Ejecutar»"
 
-#: src/prefs_summaries.c:522
+#: src/prefs_summaries.c:521
 msgid "Mark message as read"
 msgstr "Marcar el mensaje como leído"
 
-#: src/prefs_summaries.c:525
+#: src/prefs_summaries.c:524
 msgid "when selected, after"
 msgstr "al seleccionarlo, después de"
 
-#: src/prefs_summaries.c:545
+#: src/prefs_summaries.c:544
 msgid "only when opened in a new window, or replied to"
 msgstr "sólo al abrirlo en una ventana nueva, o al responderlo"
 
-#: src/prefs_summaries.c:552
+#: src/prefs_summaries.c:551
 msgid "Display sender using address book"
 msgstr "Mostrar remitente usando la agenda"
 
-#: src/prefs_summaries.c:556
+#: src/prefs_summaries.c:555
 msgid "Show tooltips"
 msgstr "Mostrar ayudas de herramienta"
 
-#: src/prefs_summaries.c:582
+#: src/prefs_summaries.c:581
 msgid "Date format help"
 msgstr "Ayuda del formato de fecha"
 
-#: src/prefs_summaries.c:600
+#: src/prefs_summaries.c:599
 msgid "Confirm before marking all messages in a folder as read"
 msgstr "Confirmar antes de marcar todos los correos en una carpeta como leídos"
 
-#: src/prefs_summaries.c:603
+#: src/prefs_summaries.c:602
 msgid "Translate header names"
 msgstr "Traducir nombres de cabeceras"
 
-#: src/prefs_summaries.c:605
+#: src/prefs_summaries.c:604
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
@@ -17187,7 +17096,7 @@ msgstr ""
 "Las cabeceras estándar mostradas (como «From:», «Subject:») serán traducidas "
 "a su idioma."
 
-#: src/prefs_summaries.c:733
+#: src/prefs_summaries.c:732
 msgid "Summaries"
 msgstr "Resúmenes"
 
@@ -18167,7 +18076,7 @@ msgstr "Condición:"
 msgid "Find _all"
 msgstr "Encontrar _todos"
 
-#: src/summary_search.c:690 src/summaryview.c:1108 src/summaryview.c:1369
+#: src/summary_search.c:690 src/summaryview.c:1105 src/summaryview.c:1366
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Buscando en %s...\n"
@@ -18180,271 +18089,274 @@ msgstr "Se llegó al principio de la lista, ¿seguir desde el final?"
 msgid "End of list reached; continue from beginning?"
 msgstr "Se terminó la lista, ¿comenzar desde el principio?"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:429
 msgid "Create _filter rule"
 msgstr "Crear regla de _filtrado"
 
-#: src/summaryview.c:558
+#: src/summaryview.c:557
 msgid "Toggle quick search bar"
 msgstr "Conmutar barra de búsqueda rápida"
 
-#: src/summaryview.c:595
+#: src/summaryview.c:594
 msgid "Toggle multiple selection"
 msgstr "Commutar la selección múltiple"
 
-#: src/summaryview.c:1297
+#: src/summaryview.c:1294
 msgid "Process mark"
 msgstr "Procesar marcas"
 
-#: src/summaryview.c:1298
+#: src/summaryview.c:1295
 msgid "Some marks are left. Process them?"
 msgstr "Quedan algunas marcas. ¿Procesarlas?"
 
-#: src/summaryview.c:1348
+#: src/summaryview.c:1345
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:1845 src/summaryview.c:1897
+#: src/summaryview.c:1842 src/summaryview.c:1894
 msgid "No more unread messages"
 msgstr "No hay más mensajes sin leer"
 
-#: src/summaryview.c:1846
+#: src/summaryview.c:1843
 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1858 src/summaryview.c:1910 src/summaryview.c:1953
-#: src/summaryview.c:2005 src/summaryview.c:2084
+#: src/summaryview.c:1855 src/summaryview.c:1907 src/summaryview.c:1950
+#: src/summaryview.c:2002 src/summaryview.c:2081
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Error interno: valor inesperado para prefs_common.next_unread_msg_dialog\n"
 
-#: src/summaryview.c:1866
+#: src/summaryview.c:1863
 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 
-#: src/summaryview.c:1898
+#: src/summaryview.c:1895
 msgid "No unread message found. Go to next folder?"
 msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1940 src/summaryview.c:1992
+#: src/summaryview.c:1937 src/summaryview.c:1989
 msgid "No more new messages"
 msgstr "No hay más mensajes nuevos"
 
-#: src/summaryview.c:1941
+#: src/summaryview.c:1938
 msgid "No new message found. Search from the end?"
 msgstr "No hay mensajes nuevos. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1961
+#: src/summaryview.c:1958
 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 
-#: src/summaryview.c:1993
+#: src/summaryview.c:1990
 msgid "No new message found. Go to next folder?"
 msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:2030 src/summaryview.c:2071
+#: src/summaryview.c:2027 src/summaryview.c:2068
 msgid "No more marked messages"
 msgstr "No hay más mensajes marcados"
 
-#: src/summaryview.c:2031
+#: src/summaryview.c:2028
 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:2040
+#: src/summaryview.c:2037
 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 
-#: src/summaryview.c:2072
+#: src/summaryview.c:2069
 msgid "No marked message found. Go to next folder?"
 msgstr "No hay mensajes marcados. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:2109 src/summaryview.c:2134
+#: src/summaryview.c:2106 src/summaryview.c:2131
 msgid "No more labeled messages"
 msgstr "No hay más mensajes etiquetados"
 
-#: src/summaryview.c:2110
+#: src/summaryview.c:2107
 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:2119 src/summaryview.c:2144
+#: src/summaryview.c:2116 src/summaryview.c:2141
 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 
-#: src/summaryview.c:2135
+#: src/summaryview.c:2132
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:2449
+#: src/summaryview.c:2446
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por el asunto..."
 
-#: src/summaryview.c:2634
+#: src/summaryview.c:2631
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrado(s)"
 
-#: src/summaryview.c:2638
+#: src/summaryview.c:2635
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:2639 src/summaryview.c:2646
+#: src/summaryview.c:2636 src/summaryview.c:2643
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2644
+#: src/summaryview.c:2641
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:2658
+#: src/summaryview.c:2655
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " elemento seleccionado"
 msgstr[1] " elementos seleccionados"
 
-#: src/summaryview.c:2676 src/summaryview.c:2712
+#: src/summaryview.c:2673 src/summaryview.c:2716
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuevo(s), %d no leído(s), %d total(es) (%s)"
 
-#: src/summaryview.c:2683
-#, c-format
-msgid ""
-"<b>Message summary</b>\n"
-"<b>New:</b> %d\n"
-"<b>Unread:</b> %d\n"
-"<b>Total:</b> %d\n"
-"<b>Size:</b> %s\n"
-"\n"
-"<b>Marked:</b> %d\n"
-"<b>Replied:</b> %d\n"
-"<b>Forwarded:</b> %d\n"
-"<b>Locked:</b> %d\n"
-"<b>Ignored:</b> %d\n"
-"<b>Watched:</b> %d"
-msgstr ""
-"<b>Resumen de mensajes</b>\n"
-"<b>Nuevos:</b> %d\n"
-"<b>Sin leer:</b> %d\n"
-"<b>Total:</b> %d\n"
-"<b>Tamaño:</b> %s\n"
-"\n"
-"<b>Marcados:</b> %d\n"
-"<b>Respondidos:</b> %d\n"
-"<b>Reenviados:</b> %d\n"
-"<b>Bloqueados:</b> %d\n"
-"<b>Ignorados:</b> %d\n"
-"<b>Observados:</b> %d"
+#: src/summaryview.c:2691
+msgid "Message summary"
+msgstr "Resumen de mensajes"
+
+#: src/summaryview.c:2692
+msgid "New:"
+msgstr "Nuevos:"
+
+#: src/summaryview.c:2693
+msgid "Unread:"
+msgstr "Sin leer:"
+
+#: src/summaryview.c:2694
+msgid "Total:"
+msgstr "Total:"
+
+#: src/summaryview.c:2696
+msgid "Marked:"
+msgstr "Marcados:"
+
+#: src/summaryview.c:2697
+msgid "Replied:"
+msgstr "Respondidos:"
+
+#: src/summaryview.c:2698
+msgid "Forwarded:"
+msgstr "Reenviados:"
+
+#: src/summaryview.c:2699
+msgid "Locked:"
+msgstr "Bloqueados:"
 
-#: src/summaryview.c:2707
+#: src/summaryview.c:2700
+msgid "Ignored:"
+msgstr "ignorados:"
+
+#: src/summaryview.c:2701
+msgid "Watched:"
+msgstr "Observados:"
+
+#: src/summaryview.c:2711
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d seleccionados (%s/%s), %d sin leer"
 
-#: src/summaryview.c:2989
+#: src/summaryview.c:2991
 msgid "Sorting summary..."
 msgstr "Ordenando el resumen..."
 
-#: src/summaryview.c:3128
+#: src/summaryview.c:3130
 msgid "Setting summary from message data..."
 msgstr "Estableciendo el resumen de los mensajes..."
 
-#: src/summaryview.c:3333
+#: src/summaryview.c:3335
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
-#: src/summaryview.c:3385
+#: src/summaryview.c:3387
 msgid "(No Recipient)"
 msgstr "(Sin destinatario)"
 
-#: src/summaryview.c:3420
+#: src/summaryview.c:3422
 #, c-format
-msgid ""
-"%s\n"
-"<span color='%s' style='italic'>From: %s, on %s</span>"
-msgstr ""
-"%s\n"
-"<span color='%s' style='italic'>Desde: %s, en %s</span>"
+msgid "From: %s, on %s"
+msgstr "Desde: %s, en %s"
 
-#: src/summaryview.c:3427
+#: src/summaryview.c:3431
 #, c-format
-msgid ""
-"%s\n"
-"<span color='%s' style='italic'>To: %s, on %s</span>"
-msgstr ""
-"%s\n"
-"<span color='%s' style='italic'>Desde: %s, en %s</span>"
+msgid "To: %s, on %s"
+msgstr "Para: %s, en %s"
 
-#: src/summaryview.c:4304
+#: src/summaryview.c:4310
 msgid "You're not the author of the article.\n"
 msgstr "Usted no es el autor del artículo.\n"
 
-#: src/summaryview.c:4397
+#: src/summaryview.c:4403
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "¿Quiere borrar realmente el mensaje seleccionado?"
 msgstr[1] "¿Quiere borrar realmente los %d mensajes seleccionados?"
 
-#: src/summaryview.c:4400
+#: src/summaryview.c:4406
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
-#: src/summaryview.c:4568
+#: src/summaryview.c:4574
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:4673
+#: src/summaryview.c:4679
 msgid "Destination to copy is same as current folder."
 msgstr "El destino de copia es la carpeta actual."
 
-#: src/summaryview.c:4838
+#: src/summaryview.c:4844
 msgid "Append or Overwrite"
 msgstr "Añadir o sobreescribir"
 
-#: src/summaryview.c:4839
+#: src/summaryview.c:4845
 msgid "Append or overwrite existing file?"
 msgstr "¿Añadir o sobreescribir el fichero existente?"
 
-#: src/summaryview.c:4840
+#: src/summaryview.c:4846
 msgid "_Append"
 msgstr "_Añadir"
 
-#: src/summaryview.c:4840
+#: src/summaryview.c:4846
 msgid "_Overwrite"
 msgstr "S_obreescribir"
 
-#: src/summaryview.c:4881
+#: src/summaryview.c:4887
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "Está a punto de imprimir %d mensajes, uno a uno. ¿Desea continuar?"
 
-#: src/summaryview.c:5365
+#: src/summaryview.c:5371
 msgid "Building threads..."
 msgstr "Construyendo jerarquía..."
 
-#: src/summaryview.c:5613
+#: src/summaryview.c:5619
 msgid "Skip these rules"
 msgstr "Saltarse estas reglas"
 
-#: src/summaryview.c:5616
+#: src/summaryview.c:5622
 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 "Aplicar estas reglas independientemente de la cuenta a la que pertenecen"
 
-#: src/summaryview.c:5619
+#: src/summaryview.c:5625
 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplicar estas reglas si se aplican a la cuenta actual"
 
-#: src/summaryview.c:5648
+#: src/summaryview.c:5654
 msgid "Filtering"
 msgstr "Filtrando"
 
-#: src/summaryview.c:5649
+#: src/summaryview.c:5655
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18452,55 +18364,55 @@ msgstr ""
 "Hay ciertas reglas de filtrado que pertenecen a una cuenta.\n"
 "Por favor seleccione que quiere hacer con ellas:"
 
-#: src/summaryview.c:5679
+#: src/summaryview.c:5685
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:5758
+#: src/summaryview.c:5764
 msgid "Processing configuration"
 msgstr "Configuración de procesamiento"
 
-#: src/summaryview.c:6306
+#: src/summaryview.c:6310
 msgid "Ignored thread"
 msgstr "Hilo ignorado"
 
-#: src/summaryview.c:6308
+#: src/summaryview.c:6312
 msgid "Watched thread"
 msgstr "Hilo observado"
 
-#: src/summaryview.c:6316
+#: src/summaryview.c:6320
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Respondido y también reenviado - pulse para ver la respuesta"
 
-#: src/summaryview.c:6318
+#: src/summaryview.c:6322
 msgid "Replied - click to see reply"
 msgstr "Respondido - pulse para ver la respuesta"
 
-#: src/summaryview.c:6330
+#: src/summaryview.c:6334
 msgid "To be moved"
 msgstr "Será movido"
 
-#: src/summaryview.c:6332
+#: src/summaryview.c:6336
 msgid "To be copied"
 msgstr "Será copiado"
 
-#: src/summaryview.c:6344
+#: src/summaryview.c:6348
 msgid "Signed, has attachment(s)"
 msgstr "Firmado, tiene adjunto(s)"
 
-#: src/summaryview.c:6348
+#: src/summaryview.c:6352
 msgid "Encrypted, has attachment(s)"
 msgstr "Cifrado, tiene adjunto(s)"
 
-#: src/summaryview.c:6350
+#: src/summaryview.c:6354
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: src/summaryview.c:6352
+#: src/summaryview.c:6356
 msgid "Has attachment(s)"
 msgstr "Tiene adjunto(s)"
 
-#: src/summaryview.c:7960
+#: src/summaryview.c:8004
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18509,53 +18421,53 @@ msgstr ""
 "Error en la expresión regular (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8065
+#: src/summaryview.c:8107
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Volver a la lista de carpetas (tiene mensajes sin leer)"
 
-#: src/summaryview.c:8070
+#: src/summaryview.c:8112
 msgid "Go back to the folder list"
 msgstr "Volver a la lista de carpetas"
 
-#: src/textview.c:232
+#: src/textview.c:231
 msgid "_Open in web browser"
 msgstr "_Abrir con el navegador web"
 
-#: src/textview.c:233
+#: src/textview.c:232
 msgid "Copy this _link"
 msgstr "_Copiar el enlace"
 
-#: src/textview.c:240
+#: src/textview.c:239
 msgid "_Reply to this address"
 msgstr "_Responder a esta dirección"
 
-#: src/textview.c:241
+#: src/textview.c:240
 msgid "Add to _Address book"
 msgstr "Añadir a la _agenda"
 
-#: src/textview.c:242
+#: src/textview.c:241
 msgid "Copy this add_ress"
 msgstr "Copiar esta di_rección"
 
-#: src/textview.c:248
+#: src/textview.c:247
 msgid "_Open image"
 msgstr "_Abrir imagen"
 
-#: src/textview.c:249
+#: src/textview.c:248
 msgid "_Save image..."
 msgstr "_Guardar imagen..."
 
-#: src/textview.c:723
+#: src/textview.c:722
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bytes)]"
 
-#: src/textview.c:726
+#: src/textview.c:725
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 
-#: src/textview.c:915
+#: src/textview.c:914
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -18569,69 +18481,69 @@ msgstr ""
 "\n"
 "  Utilice "
 
-#: src/textview.c:920
+#: src/textview.c:919
 msgid "'Network Log'"
 msgstr "«Traza de red»"
 
-#: src/textview.c:921
+#: src/textview.c:920
 msgid " in the Tools menu for more information."
 msgstr " en el menú Herramientas para más información."
 
-#: src/textview.c:984
+#: src/textview.c:983
 msgid "  The following can be performed on this part\n"
 msgstr "  Puede efectuar las siguientes acciones en esta parte haciendo\n"
 
-#: src/textview.c:986
+#: src/textview.c:985
 msgid "  by right-clicking the icon or list item:"
 msgstr "  clic con el botón derecho en el icono o elemento de la lista:"
 
-#: src/textview.c:990
+#: src/textview.c:989
 msgid "     - To save, select "
 msgstr "     - Para guardar, seleccione "
 
-#: src/textview.c:991
+#: src/textview.c:990
 msgid "'Save as...'"
 msgstr "«Guardar como...»"
 
 # NOTE: closing quote is within and untranslated string
-#: src/textview.c:993 src/textview.c:1005 src/textview.c:1017
-#: src/textview.c:1027
+#: src/textview.c:992 src/textview.c:1004 src/textview.c:1016
+#: src/textview.c:1026
 msgid " (Shortcut key: '"
 msgstr " (Atajo de teclado: ')"
 
-#: src/textview.c:1001
+#: src/textview.c:1000
 msgid "     - To display as text, select "
 msgstr "     - Para mostrar como texto, seleccione "
 
-#: src/textview.c:1002
+#: src/textview.c:1001
 msgid "'Display as text'"
 msgstr "«Mostrar como texto»"
 
-#: src/textview.c:1013
+#: src/textview.c:1012
 msgid "     - To open with an external program, select "
 msgstr "     - Para abrir con un programa externo, seleccione "
 
-#: src/textview.c:1014
+#: src/textview.c:1013
 msgid "'Open'"
 msgstr "«Abrir»"
 
-#: src/textview.c:1022
+#: src/textview.c:1021
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativamente doble clic, o clic con el botón "
 
-#: src/textview.c:1023
+#: src/textview.c:1022
 msgid "mouse button)\n"
 msgstr "central del ratón)\n"
 
-#: src/textview.c:1025
+#: src/textview.c:1024
 msgid "     - Or use "
 msgstr "     - O utilice"
 
-#: src/textview.c:1026
+#: src/textview.c:1025
 msgid "'Open with...'"
 msgstr "«Abrir con...»"
 
-#: src/textview.c:1140
+#: src/textview.c:1139
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -18642,34 +18554,31 @@ msgstr ""
 "    %s\n"
 "Código de salida %d\n"
 
-#: src/textview.c:2189
+#: src/textview.c:2188
 msgid "Tags: "
 msgstr "Etiquetas: "
 
-#: src/textview.c:2891
-#, c-format
-msgid ""
-"The real URL is different from the displayed URL.\n"
-"\n"
-"<b>Displayed URL:</b> %s\n"
-"\n"
-"<b>Real URL:</b> %s\n"
-"\n"
-"Open it anyway?"
-msgstr ""
-"La URL real es distinta de la URL mostrada.\n"
-"\n"
-"<b>URL mostrada:</b> %s\n"
-"\n"
-"<b>URL real:</b> %s\n"
-"\n"
-"¿Abrirla de todas formas?"
+#: src/textview.c:2894
+msgid "The real URL is different from the displayed URL."
+msgstr "La URL real es distinta de la URL mostrada."
+
+#: src/textview.c:2895
+msgid "Displayed URL:"
+msgstr "URL mostrada:"
 
-#: src/textview.c:2900
+#: src/textview.c:2896
+msgid "Real URL:"
+msgstr "URL real:"
+
+#: src/textview.c:2897
+msgid "Open it anyway?"
+msgstr "¿Abrirla de todas formas?"
+
+#: src/textview.c:2898
 msgid "Phishing attempt warning"
 msgstr "Aviso de intento de «phishing»"
 
-#: src/textview.c:2901
+#: src/textview.c:2899
 msgid "_Open URL"
 msgstr "_Abrir URL"
 
@@ -19101,22 +19010,22 @@ msgid "Please enter your SMTP username."
 msgstr "Por favor introduzca su nombre de usuario SMTP."
 
 #: src/wizard.c:968
-msgid "<span weight=\"bold\">Your name:</span>"
-msgstr "<span weight=\"bold\">Su nombre:</span>"
+msgid "Your name:"
+msgstr "Su nombre:"
 
-#: src/wizard.c:978
-msgid "<span weight=\"bold\">Your email address:</span>"
-msgstr "<span weight=\"bold\">Su dirección de correo:</span>"
+#: src/wizard.c:979
+msgid "Your email address:"
+msgstr "Su dirección de correo:"
 
-#: src/wizard.c:988
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "Su organización:"
 
-#: src/wizard.c:1021
-msgid "<span weight=\"bold\">Mailbox name:</span>"
-msgstr "<span weight=\"bold\">Nombre del buzón:</span>"
+#: src/wizard.c:1024
+msgid "Mailbox name:"
+msgstr "Nombre del buzón:"
 
-#: src/wizard.c:1029
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -19124,7 +19033,7 @@ msgstr ""
 "Puede especificar también una ruta absoluta, por ejemplo: «/home/usuario/"
 "Documentos/Correo»"
 
-#: src/wizard.c:1100
+#: src/wizard.c:1103
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -19132,56 +19041,55 @@ msgstr ""
 "Puede especificar el número de puerto añadiéndolo al final: «correo.ejemplo."
 "com:25»"
 
-#: src/wizard.c:1103
-msgid "<span weight=\"bold\">SMTP server address:</span>"
-msgstr "<span weight=\"bold\">Dirección del servidor SMTP:</span>"
+#: src/wizard.c:1106
+msgid "SMTP server address:"
+msgstr "Dirección del servidor SMTP:"
 
-#: src/wizard.c:1109
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "Usar autenticación"
 
-#: src/wizard.c:1117
-msgid "<span size=\"small\">(empty to use the same as receive)</span>"
-msgstr ""
-"<span size=\"small\">(vacío para usar el mismo que en la recepción)</span>"
+#: src/wizard.c:1121
+msgid "(empty to use the same as receive)"
+msgstr "(vacío para usar el mismo que en la recepción)"
 
-#: src/wizard.c:1131
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "Usuario SMTP:"
 
-#: src/wizard.c:1142
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "Contraseña SMTP:"
 
-#: src/wizard.c:1155
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "Usar SSL para conectar al servidor SMTP"
 
-#: src/wizard.c:1166 src/wizard.c:1578
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "Usar SSL a través de STARTTLS"
 
-#: src/wizard.c:1178 src/wizard.c:1590
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "Certificado SSL de cliente (opcional)"
 
-#: src/wizard.c:1245 src/wizard.c:1275 src/wizard.c:1526
-msgid "<span weight=\"bold\">Server address:</span>"
-msgstr "<span weight=\"bold\">Dirección del servidor:</span>"
-
-#: src/wizard.c:1305
-msgid "<span weight=\"bold\">Local mailbox:</span>"
-msgstr "<span weight=\"bold\">Buzón local:</span>"
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
+msgid "Server address:"
+msgstr "Dirección del servidor:"
 
-#: src/wizard.c:1473
-msgid "<span weight=\"bold\">Server type:</span>"
-msgstr "<span weight=\"bold\">Tipo de servidor:</span>"
+#: src/wizard.c:1314
+msgid "Local mailbox:"
+msgstr "Buzón local:"
 
 #: src/wizard.c:1483
+msgid "Server type:"
+msgstr "Tipo de servidor:"
+
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1537
+#: src/wizard.c:1548
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -19189,39 +19097,35 @@ msgstr ""
 "Puede especificar el número de puerto añadiéndolo al final: «correo.ejemplo."
 "com:110»"
 
-#: src/wizard.c:1542
-msgid "<span weight=\"bold\">Username:</span>"
-msgstr "<span weight=\"bold\">Nombre de usuario:</span>"
-
-#: src/wizard.c:1567
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "Usar SSL para conectar al servidor de recepción"
 
-#: src/wizard.c:1632
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "Directorio del servidor IMAP:"
 
-#: src/wizard.c:1643
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "Mostrar sólo las carpetas suscritas"
 
-#: src/wizard.c:1651
+#: src/wizard.c:1663
 msgid ""
-"<span weight=\"bold\">Warning: this version of Claws Mail\n"
-"has been built without IMAP support.</span>"
+"Warning: this version of Claws Mail\n"
+"has been built without IMAP support."
 msgstr ""
-"<span weight=\"bold\">Aviso: esta versión de Claws Mail\n"
-"se construyó sin soporte IMAP.</span>"
+"Aviso: esta versión de Claws Mail\n"
+"se construyó sin soporte IMAP."
 
-#: src/wizard.c:1769
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "Ayudante de configuración de Claws Mail"
 
-#: src/wizard.c:1803
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "Bienvenido a Claws Mail "
 
-#: src/wizard.c:1811
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19235,31 +19139,31 @@ msgstr ""
 "correo más comunes de manera que pueda comenzar a usar Claws Mail en menos "
 "de cinco minutos."
 
-#: src/wizard.c:1824
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "Sobre usted"
 
-#: src/wizard.c:1832 src/wizard.c:1847 src/wizard.c:1862 src/wizard.c:1878
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr "Los campos en etiquetados en negrilla deben ser completados"
 
-#: src/wizard.c:1839
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "Recibiendo correo"
 
-#: src/wizard.c:1854
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "Enviando correo"
 
-#: src/wizard.c:1870
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "Guardando el correo en el disco"
 
-#: src/wizard.c:1886
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "Configuración finalizada."
 
-#: src/wizard.c:1894
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."