[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-446-gc4f2d187a

mones at claws-mail.org mones at claws-mail.org
Sat Apr 2 12:10:39 UTC 2022


The branch, gtk3 has been updated
       via  c4f2d187ad7bc1926895e3a8d938766981cd08a9 (commit)
      from  eed3501bc8c172360952dbc0ca2e3e8dd5598d01 (commit)

Summary of changes:
 po/es.po | 6978 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 3592 insertions(+), 3386 deletions(-)


- Log -----------------------------------------------------------------
commit c4f2d187ad7bc1926895e3a8d938766981cd08a9
Author: Ricardo Mones <ricardo at mones.org>
Date:   Sat Apr 2 14:10:23 2022 +0200

    Update Spanish translation

diff --git a/po/es.po b/po/es.po
index 7c86f7c79..d8731c82c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,17 +1,17 @@
 # Spanish translation of Claws Mail.
-# Copyright © 2000-2021 The Claws Mail team.
+# Copyright © 2000-2022 The Claws Mail team.
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
-# Ricardo Mones <ricardo at mones.org>, 2000-2021.
+# Ricardo Mones <ricardo at mones.org>, 2000-2022.
 # Carles Tubio Terrón <c at rles-tub.io>, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Claws Mail 3.99.1\n"
+"Project-Id-Version: Claws Mail 4.0.1\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2021-07-09 13:48+0200\n"
-"PO-Revision-Date: 2021-07-09 13:48+0200\n"
+"POT-Creation-Date: 2022-03-31 20:11+0200\n"
+"PO-Revision-Date: 2022-03-31 20:17+0200\n"
 "Last-Translator: Ricardo Mones <ricardo at mones.org>\n"
 "Language-Team: Spanish\n"
 "Language: es\n"
@@ -46,158 +46,238 @@ msgstr ""
 "orden dado, la casilla indica que cuentas se incluirán. El texto en negrita "
 "indica la cuenta predeterminada."
 
-#: src/account.c:822
+#: src/account.c:781 src/foldersel.c:348
+msgid "_New"
+msgstr "_Nueva"
+
+#: src/account.c:787
+msgid "Create a new account"
+msgstr "Crear una cuenta nueva"
+
+#: src/account.c:789 src/addressbook.c:401 src/addressbook.c:431
+#: src/addressbook.c:456 src/addressbook.c:473 src/compose.c:615
+#: src/mainwindow.c:518 src/messageview.c:213
+#: src/plugins/managesieve/sieve_editor.c:82
+msgid "_Edit"
+msgstr "_Editar"
+
+#: src/account.c:795
+msgid "Edit preferences for the selected account"
+msgstr "Editar preferencias de la cuenta seleccionada"
+
+#: src/account.c:797 src/addrcustomattr.c:162 src/addrcustomattr.c:188
+#: src/addrcustomattr.c:495 src/addrduplicates.c:395 src/addrduplicates.c:793
+#: src/addressbook.c:1478 src/addressbook.c:1486 src/addressbook.c:2954
+#: src/addressbook.c:2982 src/addressbook.c:2989 src/editaddress.c:1325
+#: src/editaddress.c:1553 src/editaddress_other_attributes_ldap.c:431
+#: src/edittags.c:234 src/edittags.c:270 src/edittags.c:586 src/mh_gtk.c:207
+#: src/plugins/managesieve/sieve_manager.c:766 src/prefs_actions.c:724
+#: src/prefs_actions.c:746 src/prefs_customheader.c:256
+#: src/prefs_filtering.c:472 src/prefs_filtering.c:1196
+#: src/prefs_filtering.c:1216 src/prefs_template.c:316 src/prefs_template.c:899
+#: src/prefs_template.c:912 src/prefs_toolbar.c:1010 src/ssl_manager.c:211
+#: src/ssl_manager.c:453
+msgid "D_elete"
+msgstr "_Borrar"
+
+#: src/account.c:803
+msgid "Delete the selected account from the list"
+msgstr "Borrar la cuenta seleccionada de la lista"
+
+#: src/account.c:805 src/addressbook.c:428 src/addressbook.c:464
+#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:552
+#: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: src/account.c:811
+msgid "Create a new copy of the selected account"
+msgstr "Crear una copia de la cuenta seleccionada"
+
+#: src/account.c:813 src/editaddress.c:1324 src/gtk/foldersort.c:318
+#: src/prefs_actions.c:401 src/prefs_customheader.c:289
+#: src/prefs_display_header.c:391 src/prefs_filtering_action.c:620
+#: src/prefs_filtering.c:538 src/prefs_folder_column.c:316
+#: src/prefs_matcher.c:831 src/prefs_summary_column.c:330
+#: src/prefs_summary_open.c:295 src/prefs_template.c:374
+#: src/prefs_toolbar.c:1058
+msgid "_Down"
+msgstr "A_bajo"
+
+#: src/account.c:819
+msgid "Move the selected account down"
+msgstr "Mover abajo la cuenta seleccionada"
+
+#: src/account.c:821 src/editaddress.c:1323 src/gtk/foldersort.c:312
+#: src/prefs_actions.c:393 src/prefs_customheader.c:283
+#: src/prefs_display_header.c:385 src/prefs_filtering_action.c:615
+#: src/prefs_filtering.c:530 src/prefs_folder_column.c:312
+#: src/prefs_matcher.c:826 src/prefs_summary_column.c:326
+#: src/prefs_summary_open.c:289 src/prefs_template.c:366
+#: src/prefs_toolbar.c:1054
+msgid "_Up"
+msgstr "_Arriba"
+
+#: src/account.c:827
+msgid "Move the selected account up"
+msgstr "Mover arriba la cuenta seleccionada"
+
+#: src/account.c:834
 msgid " _Set as default account "
 msgstr " _Establecer como primaria "
 
-#: src/account.c:829 src/action.c:1405 src/addrduplicates.c:843
-#: src/addressadd.c:601 src/addressbook.c:427 src/addressbook.c:1437
-#: src/addressbook.c:3258 src/addressbook.c:3309 src/addressbook.c:4176
-#: src/addressbook.c:4182 src/addressbook.c:4298 src/addrindex.c:1836
-#: src/alertpanel.c:129 src/alertpanel.c:193 src/browseldap.c:301
-#: src/compose.c:631 src/exphtmldlg.c:293 src/expldifdlg.c:323
-#: src/gtk/about.c:912 src/gtk/gtkutils.c:90 src/gtk/icon_legend.c:184
-#: src/gtk/pluginwindow.c:391 src/gtk/prefswindow.c:509
-#: src/gtk/sslcertwindow.c:374 src/importldif.c:438 src/inc.c:841
-#: src/message_search.c:320 src/messageview.c:225
-#: src/plugins/managesieve/sieve_editor.c:88
-#: src/plugins/managesieve/sieve_editor.c:631
-#: src/plugins/managesieve/sieve_manager.c:785
-#: src/plugins/pdf_viewer/poppler_viewer.c:1228
-#: src/plugins/pgpcore/sgpgme.c:815 src/prefs_actions.c:887
-#: src/prefs_actions.c:892 src/prefs_actions.c:918 src/prefs_filtering.c:1465
-#: src/prefs_filtering.c:1487 src/prefs_filtering.c:1509
-#: src/prefs_matcher.c:2162 src/prefs_template.c:567 src/prefs_template.c:592
-#: src/prefs_template.c:597 src/summary_search.c:785
+#: src/account.c:841 src/action.c:1408 src/addrduplicates.c:399
+#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:422
+#: src/addressbook.c:1432 src/addressbook.c:3257 src/addressbook.c:3309
+#: src/addressbook.c:4178 src/addressbook.c:4183 src/addressbook.c:4299
+#: src/addrindex.c:1836 src/alertpanel.c:139 src/alertpanel.c:203
+#: src/browseldap.c:301 src/compose.c:636 src/edittags.c:591
+#: src/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
+#: src/gtk/about.c:917 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/prefswindow.c:512 src/gtk/sslcertwindow.c:374 src/importldif.c:438
+#: src/inc.c:841 src/message_search.c:238 src/message_search.c:320
+#: src/messageview.c:226 src/plugins/managesieve/sieve_editor.c:88
+#: src/plugins/managesieve/sieve_editor.c:632
+#: src/plugins/managesieve/sieve_manager.c:786
+#: src/plugins/pdf_viewer/poppler_viewer.c:1233
+#: src/plugins/pgpcore/sgpgme.c:1004 src/prefs_actions.c:915
+#: src/prefs_actions.c:920 src/prefs_actions.c:946 src/prefs_filtering.c:1469
+#: src/prefs_filtering.c:1493 src/prefs_filtering.c:1516
+#: src/prefs_matcher.c:2167 src/prefs_template.c:567 src/prefs_template.c:592
+#: src/prefs_template.c:597 src/prefs_themes.c:718 src/summary_search.c:495
+#: src/summary_search.c:785
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/account.c:914
+#: src/account.c:926
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Las cuentas con carpetas remotas no se pueden copiar."
 
-#: src/account.c:921
+#: src/account.c:933
 #, c-format
 msgid "Copy of %s"
 msgstr "Copia de %s"
 
-#: src/account.c:1125
+#: src/account.c:1137
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "¿Realmente quiere borrar la cuenta «%s»?"
 
-#: src/account.c:1127
+#: src/account.c:1139
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
-#: src/account.c:1128
+#: src/account.c:1140
 msgid "Delete account"
 msgstr "Borrar cuenta"
 
-#: src/account.c:1129 src/addrcustomattr.c:162 src/addrcustomattr.c:187
-#: src/addrcustomattr.c:495 src/addrduplicates.c:147 src/addrduplicates.c:793
-#: src/addressadd.c:300 src/addressbook.c:1483 src/addressbook.c:1490
-#: src/addressbook.c:2957 src/addressbook.c:2969 src/addressbook.c:2982
-#: src/addressbook.c:2989 src/addressbook_foldersel.c:212 src/addrgather.c:554
-#: src/compose.c:3681 src/compose.c:3809 src/compose.c:5115 src/compose.c:5152
-#: src/compose.c:5189 src/compose.c:5232 src/compose.c:5796 src/compose.c:5859
-#: src/compose.c:6091 src/compose.c:9516 src/compose.c:10694
-#: src/compose.c:10699 src/compose.c:10773 src/compose.c:11665
-#: src/compose.c:12183 src/editaddress.c:172 src/editaddress.c:815
-#: src/editaddress.c:820 src/editbook.c:196 src/editgroup.c:407
-#: src/editjpilot.c:305 src/editldap_basedn.c:238 src/editldap.c:362
-#: src/edittags.c:222 src/edittags.c:258 src/editvcard.c:203
-#: src/exphtmldlg.c:603 src/exphtmldlg.c:678 src/expldifdlg.c:671
-#: src/expldifdlg.c:747 src/export.c:174 src/foldersel.c:350
-#: src/folderview.c:2480 src/folderview.c:2538 src/grouplistdialog.c:241
-#: src/gtk/foldersort.c:243 src/gtk/gtkaspell.c:1513 src/gtk/inputdialog.c:368
-#: src/gtk/prefswindow.c:504 src/gtk/progressdialog.c:97 src/imap.c:1178
-#: src/imap_gtk.c:369 src/imap_gtk.c:515 src/imap_gtk.c:574 src/import.c:173
-#: src/import.c:204 src/importldif.c:923 src/importldif.c:989
-#: src/importmutt.c:250 src/importpine.c:249 src/inc.c:888 src/main.c:2249
-#: src/mainwindow.c:4000 src/mainwindow.c:4202 src/mbox.c:552
-#: src/messageview.c:2065 src/messageview.c:2076 src/mh_gtk.c:207
-#: src/mh_gtk.c:375 src/mimeview.c:1905 src/mimeview.c:1930 src/mimeview.c:2355
-#: src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:214
-#: src/plugins/archive/archiver_gtk.c:117
+#: src/account.c:1141 src/addrcustomattr.c:162 src/addrcustomattr.c:188
+#: src/addrcustomattr.c:498 src/addrduplicates.c:147 src/addrduplicates.c:793
+#: src/addressadd.c:300 src/addressbook.c:1478 src/addressbook.c:1486
+#: src/addressbook.c:2954 src/addressbook.c:2967 src/addressbook.c:2981
+#: src/addressbook.c:2988 src/addressbook_foldersel.c:212 src/addrgather.c:554
+#: src/compose.c:3701 src/compose.c:3829 src/compose.c:5140 src/compose.c:5177
+#: src/compose.c:5214 src/compose.c:5257 src/compose.c:5821 src/compose.c:5880
+#: src/compose.c:6116 src/compose.c:9554 src/compose.c:10736
+#: src/compose.c:10741 src/compose.c:10815 src/compose.c:11715
+#: src/compose.c:12232 src/editaddress.c:172 src/editaddress.c:815
+#: src/editbook.c:196 src/editgroup.c:407 src/editjpilot.c:305
+#: src/editldap_basedn.c:238 src/editldap.c:362 src/edittags.c:234
+#: src/edittags.c:270 src/editvcard.c:203 src/exphtmldlg.c:608
+#: src/exphtmldlg.c:683 src/expldifdlg.c:673 src/expldifdlg.c:749
+#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2497
+#: src/folderview.c:2555 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
+#: src/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
+#: src/gtk/progressdialog.c:95 src/imap.c:1183 src/imap_gtk.c:369
+#: src/imap_gtk.c:516 src/imap_gtk.c:576 src/import.c:173 src/import.c:208
+#: src/importldif.c:925 src/importldif.c:991 src/importmutt.c:250
+#: src/importpine.c:249 src/inc.c:890 src/main.c:2286 src/mainwindow.c:4009
+#: src/mainwindow.c:4212 src/mbox.c:549 src/messageview.c:2080
+#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1818
+#: src/mimeview.c:1843 src/mimeview.c:2268 src/news.c:409 src/news_gtk.c:252
+#: src/password_gtk.c:211 src/plugins/archive/archiver_gtk.c:117
 #: src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
-#: src/plugins/archive/archiver_gtk.c:945
-#: src/plugins/archive/archiver_gtk.c:1046
-#: src/plugins/att_remover/att_remover.c:388
-#: src/plugins/att_remover/att_remover.c:430
-#: src/plugins/attachwarner/attachwarner.c:217
+#: src/plugins/archive/archiver_gtk.c:944
+#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/att_remover/att_remover.c:387
+#: src/plugins/att_remover/att_remover.c:429
+#: src/plugins/attachwarner/attachwarner.c:218
 #: src/plugins/clamd/clamav_plugin_gtk.c:91
 #: src/plugins/gdata/cm_gdata_contacts.c:136
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:334
+#: src/plugins/keyword_warner/keyword_warner.c:196
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:335
 #: src/plugins/managesieve/sieve_editor.c:336
-#: src/plugins/managesieve/sieve_editor.c:434
-#: src/plugins/managesieve/sieve_editor.c:631
+#: src/plugins/managesieve/sieve_editor.c:435
+#: src/plugins/managesieve/sieve_editor.c:632
 #: src/plugins/managesieve/sieve_manager.c:330
-#: src/plugins/notification/notification_foldercheck.c:590
+#: src/plugins/notification/notification_foldercheck.c:588
 #: src/plugins/notification/notification_trayicon.c:550
-#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:157
-#: src/plugins/rssyl/rssyl_cb_menu.c:323
-#: src/plugins/rssyl/rssyl_feed_props.c:492
+#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:194
+#: src/plugins/rssyl/rssyl_cb_menu.c:361
+#: src/plugins/rssyl/rssyl_feed_props.c:481
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
-#: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1058
-#: src/plugins/vcalendar/vcal_folder.c:1997
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:931 src/prefs_actions.c:217
-#: src/prefs_actions.c:702 src/prefs_actions.c:723 src/prefs_customheader.c:177
-#: src/prefs_customheader.c:693 src/prefs_display_header.c:246
-#: src/prefs_filtering_action.c:392 src/prefs_filtering.c:351
-#: src/prefs_filtering.c:1194 src/prefs_filtering.c:1213
-#: src/prefs_folder_column.c:341 src/prefs_folder_item.c:1761
-#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:287
-#: src/prefs_summary_column.c:355 src/prefs_summary_open.c:181
-#: src/prefs_template.c:399 src/prefs_template.c:899 src/prefs_template.c:912
-#: src/prefs_themes.c:596 src/send_message.c:294 src/ssl_manager.c:448
-#: src/summaryview.c:1327 src/summaryview.c:4550 src/summaryview.c:5012
-#: src/summaryview.c:5066 src/summaryview.c:5805 src/textview.c:2881
-#: src/toolbar.c:3054 src/wizard.c:1814
+#: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcal_folder.c:2032
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:931 src/prefs_actions.c:219
+#: src/prefs_actions.c:724 src/prefs_actions.c:746 src/prefs_actions.c:1315
+#: src/prefs_customheader.c:177 src/prefs_customheader.c:693
+#: src/prefs_display_header.c:246 src/prefs_filtering_action.c:392
+#: src/prefs_filtering.c:351 src/prefs_filtering.c:1196
+#: src/prefs_filtering.c:1216 src/prefs_folder_column.c:341
+#: src/prefs_folder_item.c:1827 src/prefs_matcher.c:572 src/prefs_other.c:148
+#: src/prefs_summaries.c:284 src/prefs_summary_column.c:355
+#: src/prefs_summary_open.c:181 src/prefs_template.c:399
+#: src/prefs_template.c:899 src/prefs_template.c:912 src/prefs_themes.c:600
+#: src/send_message.c:294 src/ssl_manager.c:453 src/summaryview.c:1331
+#: src/summaryview.c:4560 src/summaryview.c:5029 src/summaryview.c:5085
+#: src/summaryview.c:5824 src/textview.c:3113 src/toolbar.c:3108
+#: src/wizard.c:1833
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/account.c:1129 src/addrcustomattr.c:216 src/addressbook.c:437
-#: src/addressbook.c:462 src/addressbook.c:479 src/edittags.c:285
-#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1313
-#: src/plugins/mailmbox/plugin_gtk.c:334
+#: src/account.c:1141 src/addrcustomattr.c:218 src/addressbook.c:432
+#: src/addressbook.c:457 src/addressbook.c:474 src/edittags.c:297
+#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1310
+#: src/plugins/att_remover/att_remover.c:429
+#: src/plugins/mailmbox/plugin_gtk.c:335
 #: src/plugins/managesieve/sieve_manager.c:330
-#: src/plugins/vcalendar/vcal_folder.c:1997 src/prefs_actions.c:1077
-#: src/prefs_customheader.c:693 src/prefs_filtering.c:1681
-#: src/prefs_template.c:1105 src/summaryview.c:4550
+#: src/plugins/rssyl/rssyl_cb_menu.c:194
+#: src/plugins/vcalendar/vcal_folder.c:2032 src/prefs_actions.c:1105
+#: src/prefs_customheader.c:693 src/prefs_display_header.c:328
+#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4560
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: src/account.c:1602
+#: src/account.c:1615
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "R"
 
-#: src/account.c:1608
+#: src/account.c:1621
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "«Recibir correo» recupera el correo de las cuentas marcadas"
 
-#: src/account.c:1615 src/addrduplicates.c:472 src/addressadd.c:220
-#: src/addressbook.c:128 src/compose.c:7467 src/editaddress.c:1475
-#: src/editaddress.c:1497 src/editaddress.c:1516
+#: src/account.c:1628 src/addrduplicates.c:472 src/addressadd.c:220
+#: src/addressbook.c:128 src/compose.c:7500 src/editaddress.c:1478
+#: src/editaddress.c:1500 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:369
 #: src/editaddress_other_attributes_ldap.c:389 src/editbook.c:168
 #: src/editgroup.c:288 src/editjpilot.c:255 src/editldap.c:426
 #: src/editvcard.c:171 src/importmutt.c:221 src/importpine.c:220
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
-#: src/plugins/pdf_viewer/poppler_viewer.c:1849
-#: src/plugins/pgpcore/select-keys.c:464 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1854 src/prefs_summaries.c:477 src/prefs_template.c:78
-#: src/prefs_themes.c:993
+#: src/plugins/pdf_viewer/poppler_viewer.c:1860
+#: src/plugins/pgpcore/select-keys.c:468 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1862 src/prefs_summaries.c:479 src/prefs_template.c:78
+#: src/prefs_themes.c:1092
 msgid "Name"
 msgstr "Nombre"
 
-#: src/account.c:1623 src/prefs_account.c:1267 src/prefs_account.c:4955
+#: src/account.c:1636 src/prefs_account.c:1267 src/prefs_account.c:4958
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/account.c:1631 src/ssl_manager.c:109
+#: src/account.c:1644 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Servidor"
 
@@ -237,7 +317,7 @@ msgstr ""
 "Acciones de filtrado inválidas:\n"
 "%s"
 
-#: src/action.c:997
+#: src/action.c:1000
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -248,36 +328,44 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:999 src/compose.c:5265 src/compose.c:5270 src/compose.c:9669
-#: src/compose.c:9708 src/ldaputil.c:333
+#: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
+#: src/compose.c:9751 src/ldaputil.c:334
 #: src/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1831
-#: src/plugins/vcalendar/vcal_folder.c:1849
-#: src/plugins/vcalendar/vcal_folder.c:1852 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1825
+#: src/plugins/vcalendar/vcal_folder.c:1829
+#: src/plugins/vcalendar/vcal_folder.c:1847
+#: src/plugins/vcalendar/vcal_folder.c:1850 src/privacy.c:64
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/action.c:1218 src/action.c:1395
+#: src/action.c:1223 src/action.c:1397
 msgid "Completed"
 msgstr "Completado"
 
-#: src/action.c:1255
+#: src/action.c:1260
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Ejecutando: %s\n"
 
-#: src/action.c:1259
+#: src/action.c:1264
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Finalizado: %s\n"
 
-#: src/action.c:1305
+#: src/action.c:1307
 msgid "Action's input/output"
 msgstr "Entrada/salida de la acción"
 
-#: src/action.c:1641
+#: src/action.c:1371
+msgid "_Execute"
+msgstr "_Ejecutar"
+
+#: src/action.c:1406
+msgid "_Stop"
+msgstr "_Detener"
+
+#: src/action.c:1648
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -288,11 +376,11 @@ msgstr ""
 "(«%%h» será sustituido con el parámetro)\n"
 "  %s"
 
-#: src/action.c:1646
+#: src/action.c:1653
 msgid "Action's hidden user argument"
 msgstr "Parámetro de usuario oculto para la acción"
 
-#: src/action.c:1650
+#: src/action.c:1657
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -303,23 +391,23 @@ msgstr ""
 "(«%%u» será sustituido con el parámetro)\n"
 "  %s"
 
-#: src/action.c:1655
+#: src/action.c:1662
 msgid "Action's user argument"
 msgstr "Parámetro de usuario para la acción"
 
-#: src/addrclip.c:481
+#: src/addrclip.c:483
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr "No se puede copiar una carpeta a si misma o su sub-estructura."
 
-#: src/addrclip.c:504
+#: src/addrclip.c:506
 msgid "Cannot copy an address book to itself."
 msgstr "No se puede copiar una agenda a si misma."
 
-#: src/addrclip.c:595
+#: src/addrclip.c:597
 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:699 src/addressbook.c:5006
+#: src/addr_compl.c:699 src/addressbook.c:5008
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:321
 msgid "Group"
 msgstr "Grupo"
@@ -372,19 +460,19 @@ msgstr "Borrar todos los nombres de atributo"
 msgid "Do you really want to delete all attribute names?"
 msgstr "¿Quiere borrar realmente todos los nombres de atributos?"
 
-#: src/addrcustomattr.c:185
+#: src/addrcustomattr.c:186
 msgid "Delete attribute name"
 msgstr "Borrar nombre de atributo"
 
-#: src/addrcustomattr.c:186
+#: src/addrcustomattr.c:187
 msgid "Do you really want to delete this attribute name?"
 msgstr "¿Quiere borrar realmente este nombre de atributo?"
 
-#: src/addrcustomattr.c:195
+#: src/addrcustomattr.c:197
 msgid "Reset to default"
 msgstr "Reiniciar valores"
 
-#: src/addrcustomattr.c:196
+#: src/addrcustomattr.c:198
 msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
@@ -392,97 +480,108 @@ msgstr ""
 "¿Realmente quiere reemplazar todos los nombres de\n"
 "atributos con los valores iniciales predeterminados?"
 
-#: src/addrcustomattr.c:197 src/compose.c:9783 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9825 src/exphtmldlg.c:181
 #: src/expldifdlg.c:191 src/expldifdlg.c:247 src/file_checker.c:83
-#: src/file_checker.c:107 src/folderview.c:880 src/folderview.c:1102
-#: src/folderview.c:2526 src/folderview.c:2628 src/inc.c:1668 src/main.c:407
-#: src/mainwindow.c:2868 src/mainwindow.c:2873 src/message_search.c:335
+#: src/file_checker.c:107 src/folderview.c:884 src/folderview.c:1112
+#: src/folderview.c:2543 src/folderview.c:2651 src/inc.c:1673 src/main.c:412
+#: src/mainwindow.c:2872 src/mainwindow.c:2877 src/message_search.c:335
 #: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:708
-#: src/plugins/pgpcore/sgpgme.c:899 src/plugins/pgpcore/sgpgme.c:1021
-#: src/plugins/vcalendar/vcalendar.c:961 src/prefs_migration.c:61
-#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/prefs_themes.c:573
-#: src/summary_search.c:796 src/summaryview.c:1327 src/summaryview.c:1940
-#: src/summaryview.c:1988 src/summaryview.c:2025 src/summaryview.c:2073
-#: src/summaryview.c:2107 src/summaryview.c:2140 src/summaryview.c:2174
-#: src/summaryview.c:2203 src/summaryview.c:4264 src/summaryview.c:4310
-#: src/summaryview.c:6072 src/toolbar.c:3034
+#: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:712
+#: src/plugins/pgpcore/sgpgme.c:1088 src/plugins/pgpcore/sgpgme.c:1211
+#: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
+#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
+#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
+#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
+#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
+#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
+#: src/summaryview.c:6091 src/toolbar.c:3088
 msgid "_No"
 msgstr "_No"
 
-#: src/addrcustomattr.c:197 src/compose.c:9783 src/compose.c:12183
+#: src/addrcustomattr.c:199 src/compose.c:9825 src/compose.c:12232
 #: src/exphtmldlg.c:181 src/expldifdlg.c:191 src/expldifdlg.c:247
-#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:880
-#: src/folderview.c:1102 src/folderview.c:2526 src/folderview.c:2628
-#: src/inc.c:1668 src/main.c:407 src/mainwindow.c:2868 src/mainwindow.c:2873
+#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:884
+#: src/folderview.c:1112 src/folderview.c:2543 src/folderview.c:2651
+#: src/inc.c:1673 src/main.c:412 src/mainwindow.c:2872 src/mainwindow.c:2877
 #: src/message_search.c:335 src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:708 src/plugins/pgpcore/sgpgme.c:899
-#: src/plugins/pgpcore/sgpgme.c:1021 src/plugins/vcalendar/vcalendar.c:122
-#: src/plugins/vcalendar/vcalendar.c:961 src/prefs_migration.c:61
-#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/prefs_themes.c:573
-#: src/summary_search.c:796 src/summaryview.c:1327 src/summaryview.c:1940
-#: src/summaryview.c:1988 src/summaryview.c:2025 src/summaryview.c:2073
-#: src/summaryview.c:2107 src/summaryview.c:2140 src/summaryview.c:2174
-#: src/summaryview.c:2203 src/summaryview.c:4264 src/summaryview.c:4310
-#: src/summaryview.c:5066 src/summaryview.c:6072 src/toolbar.c:3034
+#: src/plugins/pgpcore/select-keys.c:712 src/plugins/pgpcore/sgpgme.c:1088
+#: src/plugins/pgpcore/sgpgme.c:1211 src/plugins/vcalendar/vcalendar.c:123
+#: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
+#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
+#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
+#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
+#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
+#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
+#: src/summaryview.c:5085 src/summaryview.c:6091 src/toolbar.c:3088
 msgid "_Yes"
 msgstr "_Sí"
 
-#: src/addrcustomattr.c:217 src/edittags.c:286 src/prefs_actions.c:1078
-#: src/prefs_filtering.c:1682 src/prefs_template.c:1106
+#: src/addrcustomattr.c:219 src/edittags.c:298 src/prefs_actions.c:1106
+#: src/prefs_filtering.c:1690 src/prefs_template.c:1106
 msgid "Delete _all"
 msgstr "_Borrar todo"
 
-#: src/addrcustomattr.c:218
+#: src/addrcustomattr.c:220
 msgid "_Reset to default"
 msgstr "_Reiniciar valores"
 
-#: src/addrcustomattr.c:407
+#: src/addrcustomattr.c:410
 msgid "Attribute name is not set."
 msgstr "No se estableció el nombre del atributo."
 
-#: src/addrcustomattr.c:466
+#: src/addrcustomattr.c:469
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Editar nombres de atributos"
 
-#: src/addrcustomattr.c:480
+#: src/addrcustomattr.c:483
 msgid "New attribute name:"
 msgstr "Nombre del nuevo atributo:"
 
-#: src/addrcustomattr.c:496 src/addressadd.c:301
-#: src/addressbook_foldersel.c:213 src/addrgather.c:555 src/alertpanel.c:363
-#: src/compose.c:5859 src/compose.c:9517 src/editaddress.c:172
-#: src/editaddress.c:816 src/editaddress.c:821 src/editbook.c:197
-#: src/editgroup.c:408 src/editjpilot.c:306 src/editldap_basedn.c:239
-#: src/editldap.c:363 src/editvcard.c:204 src/export.c:175 src/foldersel.c:351
-#: src/grouplistdialog.c:242 src/gtk/foldersort.c:244 src/gtk/gtkaspell.c:1514
-#: src/gtk/inputdialog.c:369 src/gtk/prefswindow.c:505 src/import.c:174
-#: src/import.c:204 src/importmutt.c:251 src/importpine.c:250 src/main.c:2249
-#: src/mimeview.c:1906 src/password_gtk.c:215
+#: src/addrcustomattr.c:492 src/editaddress.c:1327 src/editaddress.c:1559
+#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:376
+#: src/edittags.c:581 src/prefs_actions.c:320 src/prefs_customheader.c:249
+#: src/prefs_display_header.c:321 src/prefs_display_header.c:372
+#: src/prefs_filtering_action.c:580 src/prefs_filtering.c:455
+#: src/prefs_folder_column.c:271 src/prefs_matcher.c:791
+#: src/prefs_summary_column.c:285 src/prefs_summary_open.c:241
+#: src/prefs_template.c:299 src/prefs_toolbar.c:998
+msgid "_Add"
+msgstr "_Añadir"
+
+#: src/addrcustomattr.c:499 src/addressadd.c:301
+#: src/addressbook_foldersel.c:213 src/addrgather.c:555 src/alertpanel.c:385
+#: src/compose.c:5880 src/compose.c:9555 src/editaddress.c:172
+#: src/editaddress.c:816 src/editbook.c:197 src/editgroup.c:408
+#: src/editjpilot.c:306 src/editldap_basedn.c:239 src/editldap.c:363
+#: src/editvcard.c:204 src/export.c:175 src/foldersel.c:350
+#: src/grouplistdialog.c:240 src/gtk/foldersort.c:245 src/gtk/gtkaspell.c:1513
+#: src/gtk/inputdialog.c:368 src/gtk/prefswindow.c:508 src/import.c:174
+#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2286
+#: src/mimeview.c:1819 src/password_gtk.c:213
 #: src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
 #: src/plugins/archive/archiver_gtk.c:749
-#: src/plugins/archive/archiver_gtk.c:1048
-#: src/plugins/att_remover/att_remover.c:389
+#: src/plugins/archive/archiver_gtk.c:1045
+#: src/plugins/att_remover/att_remover.c:388
 #: src/plugins/gdata/cm_gdata_contacts.c:137
-#: src/plugins/managesieve/sieve_editor.c:632
-#: src/plugins/notification/notification_foldercheck.c:591
+#: src/plugins/managesieve/sieve_editor.c:633
+#: src/plugins/notification/notification_foldercheck.c:589
 #: src/plugins/notification/notification_trayicon.c:550
 #: src/plugins/pgpcore/passphrase.c:123
-#: src/plugins/rssyl/rssyl_feed_props.c:509
+#: src/plugins/rssyl/rssyl_feed_props.c:487
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:51
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1789
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1913 src/prefs_actions.c:218
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1793
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1917 src/prefs_actions.c:220
 #: src/prefs_customheader.c:178 src/prefs_display_header.c:247
 #: src/prefs_filtering_action.c:393 src/prefs_filtering.c:352
 #: src/prefs_folder_column.c:342 src/prefs_matcher.c:573 src/prefs_other.c:149
-#: src/prefs_summaries.c:288 src/prefs_summary_column.c:356
+#: src/prefs_summaries.c:285 src/prefs_summary_column.c:356
 #: src/prefs_summary_open.c:182 src/prefs_template.c:400
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: src/addrcustomattr.c:517
+#: src/addrcustomattr.c:520
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -508,6 +607,11 @@ msgid ""
 msgstr ""
 "Claws Mail buscará ahora direcciones de correo duplicadas en la agenda."
 
+#: src/addrduplicates.c:147 src/addressbook.c:1160 src/compose.c:671
+#: src/messageview.c:232 src/plugins/managesieve/sieve_editor.c:102
+msgid "_Find"
+msgstr "_Buscar"
+
 #: src/addrduplicates.c:315
 msgid "No duplicate email addresses found in the address book"
 msgstr "No se encontraron direcciones de correo duplicadas en la agenda"
@@ -517,8 +621,8 @@ msgid "Duplicate email addresses"
 msgstr "Direcciones de correo duplicadas"
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:470 src/prefs_summaries.c:478
-#: src/toolbar.c:529
+#: src/plugins/pgpcore/select-keys.c:474 src/prefs_summaries.c:480
+#: src/toolbar.c:540
 msgid "Address"
 msgstr "Dirección"
 
@@ -526,11 +630,11 @@ msgstr "Dirección"
 msgid "Address book path"
 msgstr "Ruta a la agenda de direcciones"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1435 src/addressbook.c:1488
+#: src/addrduplicates.c:791 src/addressbook.c:1430 src/addressbook.c:1484
 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1489
+#: src/addrduplicates.c:792 src/addressbook.c:1485
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
@@ -538,7 +642,7 @@ msgstr "¿Borrar realmente la(s) dirección(es)?"
 msgid "Delete address"
 msgstr "Borrar dirección"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1436
+#: src/addrduplicates.c:842 src/addressbook.c:1431
 msgid "This address data is read-only and cannot be deleted."
 msgstr "Esta dirección es solo de lectura y no se puede borrar."
 
@@ -550,8 +654,8 @@ msgstr "Añadir a la agenda"
 msgid "Contact"
 msgstr "Contacto"
 
-#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1256
-#: src/editaddress.c:1301 src/editgroup.c:290
+#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
+#: src/editaddress.c:1303 src/editgroup.c:290
 msgid "Remarks"
 msgstr "Notas"
 
@@ -559,259 +663,248 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressadd.c:599 src/addressbook.c:3256 src/addressbook.c:3307
+#: src/addressadd.c:598 src/addressbook.c:3255 src/addressbook.c:3307
 msgid "Add address(es)"
 msgstr "Añadir dirección(es)"
 
-#: src/addressadd.c:600
+#: src/addressadd.c:599
 msgid "Can't add the specified address"
 msgstr "No se puede añadir la dirección especificada"
 
-#: src/addressbook.c:129 src/addressbook.c:4994 src/editaddress.c:1245
-#: src/editaddress.c:1282 src/editgroup.c:289 src/expldifdlg.c:507
-#: src/exporthtml.c:601 src/exporthtml.c:765 src/ldif.c:763
+#: src/addressbook.c:129 src/addressbook.c:4996 src/editaddress.c:1247
+#: src/editaddress.c:1284 src/editgroup.c:289 src/expldifdlg.c:509
+#: src/exporthtml.c:597 src/exporthtml.c:761 src/ldif.c:767
 msgid "Email Address"
 msgstr "Dirección de correo"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:400
 msgid "_Book"
 msgstr "_Agenda"
 
-#: src/addressbook.c:406 src/addressbook.c:436 src/addressbook.c:461
-#: src/addressbook.c:478 src/compose.c:610 src/mainwindow.c:517
-#: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
-msgid "_Edit"
-msgstr "_Editar"
-
-#: src/addressbook.c:407 src/compose.c:615 src/mainwindow.c:520
-#: src/messageview.c:215
+#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:521
+#: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: src/addressbook.c:410 src/addressbook.c:464
+#: src/addressbook.c:405 src/addressbook.c:459
 msgid "New _Book"
 msgstr "Nueva _agenda"
 
-#: src/addressbook.c:411 src/addressbook.c:465
+#: src/addressbook.c:406 src/addressbook.c:460
 msgid "New _Folder"
 msgstr "Nueva _carpeta"
 
-#: src/addressbook.c:412
+#: src/addressbook.c:407
 msgid "New _vCard"
 msgstr "Nueva _vCard"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:411
 msgid "New _JPilot"
 msgstr "Nuevo _JPilot"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:414
 msgid "New LDAP _Server"
 msgstr "Nuevo servidor LDAP"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:418
 msgid "_Edit book"
 msgstr "_Editar agenda"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:419
 msgid "_Delete book"
 msgstr "_Borrar agenda"
 
-#: src/addressbook.c:426 src/compose.c:627 src/gtk/gtkutils.c:69
+#: src/addressbook.c:421 src/compose.c:632 src/editaddress.c:1326
+#: src/editaddress.c:1556 src/editaddress_other_attributes_ldap.c:434
 #: src/plugins/managesieve/sieve_editor.c:85
-#: src/plugins/managesieve/sieve_editor.c:434
-#: src/plugins/managesieve/sieve_editor.c:633 src/wizard.c:1813
+#: src/plugins/managesieve/sieve_editor.c:435
+#: src/plugins/managesieve/sieve_editor.c:634 src/wizard.c:1832
 msgid "_Save"
 msgstr "_Guardar..."
 
-#: src/addressbook.c:430 src/addressbook.c:476 src/messageview.c:229
+#: src/addressbook.c:425 src/addressbook.c:471 src/messageview.c:230
 msgid "_Select all"
 msgstr "_Seleccionar todo"
 
-#: src/addressbook.c:432 src/addressbook.c:468 src/addressbook.c:484
+#: src/addressbook.c:427 src/addressbook.c:463 src/addressbook.c:479
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: src/addressbook.c:433 src/addressbook.c:469 src/addressbook.c:485
-#: src/compose.c:639 src/gtk/gtkutils.c:71 src/mainwindow.c:551
-#: src/messageview.c:228 src/plugins/managesieve/sieve_editor.c:96
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:429 src/addressbook.c:465 src/addressbook.c:481
+#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/addressbook.c:439 src/addressbook.c:481
+#: src/addressbook.c:434 src/addressbook.c:476
 msgid "New _Address"
 msgstr "Nueva _dirección"
 
-#: src/addressbook.c:440 src/addressbook.c:466 src/addressbook.c:482
+#: src/addressbook.c:435 src/addressbook.c:461 src/addressbook.c:477
 msgid "New _Group"
 msgstr "Nuevo _grupo"
 
-#: src/addressbook.c:442 src/addressbook.c:488
+#: src/addressbook.c:437 src/addressbook.c:483
 msgid "_Mail To"
 msgstr "_Correo para"
 
-#: src/addressbook.c:443 src/addressbook.c:492
+#: src/addressbook.c:438 src/addressbook.c:487
 msgid "_Merge"
 msgstr "_Fusionar"
 
-#: src/addressbook.c:447
+#: src/addressbook.c:442
 msgid "Import _LDIF file..."
 msgstr "Importar fichero _LDIF..."
 
-#: src/addressbook.c:448
+#: src/addressbook.c:443
 msgid "Import M_utt file..."
 msgstr "Importar fichero M_utt..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:444
 msgid "Import _Pine file..."
 msgstr "Importar fichero _Pine..."
 
-#: src/addressbook.c:451
+#: src/addressbook.c:446
 msgid "Export _HTML..."
 msgstr "Exportar _HTML..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:447
 msgid "Export LDI_F..."
 msgstr "Exportar LDI_F..."
 
-#: src/addressbook.c:454
+#: src/addressbook.c:449
 msgid "Find duplicates..."
 msgstr "Buscar duplicados..."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:450
 msgid "Edit custom attributes..."
 msgstr "Editar atributos de usuario..."
 
-#: src/addressbook.c:490
+#: src/addressbook.c:485
 msgid "_Browse Entry"
 msgstr "_Ver entrada"
 
-#: src/addressbook.c:504 src/crash.c:457 src/crash.c:476 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:144
-#: src/plugins/pgpcore/sgpgme.c:172 src/plugins/vcalendar/day-view.c:397
-#: src/plugins/vcalendar/month-view.c:424 src/prefs_themes.c:819
-#: src/prefs_themes.c:851 src/prefs_themes.c:852
+#: src/addressbook.c:499 src/crash.c:460 src/crash.c:479 src/importldif.c:114
+#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:330
+#: src/plugins/pgpcore/sgpgme.c:358 src/plugins/vcalendar/day-view.c:405
+#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:917
+#: src/prefs_themes.c:949 src/prefs_themes.c:950
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:121
+#: src/addressbook.c:506 src/addressbook.c:525 src/importldif.c:121
 msgid "Success"
 msgstr "Éxito"
 
-#: src/addressbook.c:512 src/importldif.c:122
+#: src/addressbook.c:507 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Argumentos incorrectos"
 
-#: src/addressbook.c:513 src/importldif.c:123
+#: src/addressbook.c:508 src/importldif.c:123
 msgid "File not specified"
 msgstr "No se especificó el fichero"
 
-#: src/addressbook.c:514 src/importldif.c:124
+#: src/addressbook.c:509 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Error abriendo el fichero"
 
-#: src/addressbook.c:515 src/importldif.c:125
+#: src/addressbook.c:510 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Error leyendo el fichero"
 
-#: src/addressbook.c:516 src/importldif.c:126
+#: src/addressbook.c:511 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Encontrado final del fichero"
 
-#: src/addressbook.c:517 src/importldif.c:127
+#: src/addressbook.c:512 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Error reservando memoria"
 
-#: src/addressbook.c:518 src/importldif.c:128
+#: src/addressbook.c:513 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Formato de fichero erróneo"
 
-#: src/addressbook.c:519 src/importldif.c:129
+#: src/addressbook.c:514 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Error escribiendo en el fichero"
 
-#: src/addressbook.c:520 src/importldif.c:130
+#: src/addressbook.c:515 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Error abriendo el directorio"
 
-#: src/addressbook.c:521 src/importldif.c:131
+#: src/addressbook.c:516 src/importldif.c:131
 msgid "No path specified"
 msgstr "No se especificó una ruta"
 
-#: src/addressbook.c:531
+#: src/addressbook.c:526
 msgid "Error connecting to LDAP server"
 msgstr "Error conectando al servidor LDAP"
 
-#: src/addressbook.c:532
+#: src/addressbook.c:527
 msgid "Error initializing LDAP"
 msgstr "Error inicializando LDAP"
 
-#: src/addressbook.c:533
+#: src/addressbook.c:528
 msgid "Error binding to LDAP server"
 msgstr "Error enlazando con el servidor LDAP"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:529
 msgid "Error searching LDAP database"
 msgstr "Error buscando en la base de datos LDAP"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:530
 msgid "Timeout performing LDAP operation"
 msgstr "Fuera de tiempo en la operación LDAP"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:531
 msgid "Error in LDAP search criteria"
 msgstr "Error en el criterio de búsqueda LDAP"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:532
 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:533
 msgid "LDAP search terminated on request"
 msgstr "Se solicitó concluir la búsqueda LDAP"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:534
 msgid "Error starting STARTTLS connection"
 msgstr "Error iniciando la conexión con STARTTLS"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:535
 msgid "Distinguished Name (dn) is missing"
 msgstr "Falta el nombre distinguido (dn)"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:536
 msgid "Missing required information"
 msgstr "Falta la información necesaria"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:537
 msgid "Another contact exists with that key"
 msgstr "Ya existe un contacto con esa clave"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:538
 msgid "Strong(er) authentication required"
 msgstr "Se necesita autenticación (más) fuerte"
 
-#: src/addressbook.c:911
+#: src/addressbook.c:906
 msgid "Sources"
 msgstr "Fuentes"
 
-#: src/addressbook.c:915 src/prefs_matcher.c:642 src/prefs_other.c:491
-#: src/toolbar.c:268 src/toolbar.c:2522
+#: src/addressbook.c:910 src/prefs_matcher.c:642 src/prefs_other.c:491
+#: src/toolbar.c:272 src/toolbar.c:2564
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:1108 src/editldap.c:777
+#: src/addressbook.c:1103 src/editldap.c:777
 msgid "Search"
 msgstr "Buscar"
 
-#: src/addressbook.c:1480
+#: src/addressbook.c:1475
 msgid "Delete group"
 msgstr "Borrar grupo"
 
-#: src/addressbook.c:1481
+#: src/addressbook.c:1476
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -819,26 +912,26 @@ msgstr ""
 "¿Quiere borrar el(los) grupo(s)?\n"
 "Las direcciones que contienen no se perderán."
 
-#: src/addressbook.c:2208
+#: src/addressbook.c:2205
 msgid "Cannot paste. Target address book is read-only."
 msgstr "No puedo pegar. El libro de direcciones destino es solo de lectura."
 
-#: src/addressbook.c:2218
+#: src/addressbook.c:2215
 msgid "Cannot paste into an address group."
 msgstr "No se puede pegar dentro de un grupo de direcciones."
 
-#: src/addressbook.c:2953
+#: src/addressbook.c:2950
 #, 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:2956 src/addressbook.c:2982 src/addressbook.c:2989
-#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:171
-#: src/toolbar.c:497
+#: src/addressbook.c:2953 src/addressbook.c:2981 src/addressbook.c:2988
+#: src/plugins/archive/archiver_prefs.c:430 src/prefs_filtering_action.c:171
+#: src/toolbar.c:507
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:2965
+#: src/addressbook.c:2963
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -847,20 +940,20 @@ msgstr ""
 "¿Quiere borrar «%s»? Si borra sólo la carpeta las direcciones que contenga "
 "se moverán a la carpeta padre."
 
-#: src/addressbook.c:2968 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:333 src/plugins/rssyl/rssyl_cb_menu.c:156
+#: src/addressbook.c:2966 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:334 src/plugins/rssyl/rssyl_cb_menu.c:193
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:2969
+#: src/addressbook.c:2967
 msgid "Delete _folder only"
 msgstr "Borrar sólo _carpeta"
 
-#: src/addressbook.c:2969
+#: src/addressbook.c:2968
 msgid "Delete folder and _addresses"
 msgstr "Borrar carpeta y _direcciones"
 
-#: src/addressbook.c:2980
+#: src/addressbook.c:2979
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -869,7 +962,7 @@ msgstr ""
 "¿Quiere borrar «%s»?\n"
 "Las direcciones que contiene no se perderán."
 
-#: src/addressbook.c:2987
+#: src/addressbook.c:2986
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -878,28 +971,28 @@ msgstr ""
 "¿Quiere borrar «%s»?\n"
 "Las direcciones que contiene se perderán."
 
-#: src/addressbook.c:3101
+#: src/addressbook.c:3100
 #, c-format
 msgid "Search '%s'"
 msgstr " Buscar «%s»"
 
-#: src/addressbook.c:3239 src/addressbook.c:3288
+#: src/addressbook.c:3238 src/addressbook.c:3288
 msgid "New Contacts"
 msgstr "Nuevos contactos"
 
-#: src/addressbook.c:4125
+#: src/addressbook.c:4127
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se puede guardar el fichero índice."
 
-#: src/addressbook.c:4129
+#: src/addressbook.c:4131
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pueden guardar los ficheros de direcciones"
 
-#: src/addressbook.c:4139
+#: src/addressbook.c:4141
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:4144
+#: src/addressbook.c:4146
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -907,7 +1000,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se puede guardar el nuevo fichero índice."
 
-#: src/addressbook.c:4157
+#: src/addressbook.c:4159
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -915,7 +1008,7 @@ msgstr ""
 "No se puede convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:4163
+#: src/addressbook.c:4165
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -923,7 +1016,7 @@ msgstr ""
 "No se puede convertir la antigua agenda,\n"
 "no se pudo guardar el fichero índice para la nueva."
 
-#: src/addressbook.c:4168
+#: src/addressbook.c:4170
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -931,57 +1024,57 @@ msgstr ""
 "No se puede convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para la nueva."
 
-#: src/addressbook.c:4175 src/addressbook.c:4181
+#: src/addressbook.c:4177 src/addressbook.c:4182
 msgid "Addressbook conversion error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:4296
+#: src/addressbook.c:4297
 msgid "Addressbook Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:4297
+#: src/addressbook.c:4298
 msgid "Could not read address index"
 msgstr "No se puede leer el índice de direcciones"
 
-#: src/addressbook.c:4628
+#: src/addressbook.c:4630
 msgid "Busy searching..."
 msgstr "Buscando..."
 
-#: src/addressbook.c:4958 src/prefs_send.c:220
+#: src/addressbook.c:4960 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:4970
+#: src/addressbook.c:4972
 msgid "Address Books"
 msgstr "Agendas de direcciones"
 
-#: src/addressbook.c:4982
+#: src/addressbook.c:4984
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:5018 src/exporthtml.c:885 src/folderview.c:361
-#: src/folderview.c:449 src/prefs_account.c:3420 src/prefs_folder_column.c:77
+#: src/addressbook.c:5020 src/exporthtml.c:881 src/folderview.c:362
+#: src/folderview.c:450 src/prefs_account.c:3422 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:5030
+#: src/addressbook.c:5032
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5042 src/addressbook.c:5054
+#: src/addressbook.c:5044 src/addressbook.c:5056
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5066
+#: src/addressbook.c:5068
 msgid "LDAP servers"
 msgstr "Servidores LDAP"
 
-#: src/addressbook.c:5078
+#: src/addressbook.c:5080
 msgid "LDAP Query"
 msgstr "Petición LDAP"
 
-#: src/addressbook_foldersel.c:203 src/exphtmldlg.c:369 src/expldifdlg.c:386
-#: src/exporthtml.c:985 src/importldif.c:539
+#: src/addressbook_foldersel.c:203 src/exphtmldlg.c:374 src/expldifdlg.c:388
+#: src/exporthtml.c:981 src/importldif.c:541
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
@@ -1046,8 +1139,8 @@ msgstr "N.º direcciones"
 msgid "Header Fields"
 msgstr "Campos cabecera"
 
-#: src/addrgather.c:585 src/exphtmldlg.c:635 src/expldifdlg.c:703
-#: src/importldif.c:965
+#: src/addrgather.c:585 src/exphtmldlg.c:640 src/expldifdlg.c:705
+#: src/importldif.c:967
 msgid "Finish"
 msgstr "Finalizar"
 
@@ -1084,27 +1177,27 @@ msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Falló la actualización. No se escribieron los cambios en el directorio."
 
-#: src/alertpanel.c:144 src/compose.c:9783
+#: src/alertpanel.c:154 src/compose.c:9825
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:157 src/compose.c:5859 src/compose.c:6404
-#: src/compose.c:12183 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:855 src/plugins/pgpcore/sgpgme.c:811
-#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5066
+#: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
+#: src/compose.c:12232 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:861 src/plugins/pgpcore/sgpgme.c:1000
+#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5085
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5796 src/inc.c:731
-#: src/plugins/pgpcore/sgpgme.c:156 src/plugins/pgpcore/sgpgme.c:311
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:731
+#: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Error"
 
-#: src/alertpanel.c:194 src/gtk/progressdialog.c:94
+#: src/alertpanel.c:204 src/gtk/progressdialog.c:92
 msgid "_View log"
 msgstr "_Ver traza"
 
-#: src/alertpanel.c:350
+#: src/alertpanel.c:372
 msgid "Show this message next time"
 msgstr "Mostrar este mensaje de nuevo"
 
@@ -1157,37 +1250,37 @@ msgid "a notifier"
 msgstr "un notificador"
 
 #: src/common/plugin.c:77
-msgid "an utility"
+msgid "a utility"
 msgstr "una utilidad"
 
 #: src/common/plugin.c:78
 msgid "things"
 msgstr "cosas"
 
-#: src/common/plugin.c:335
+#: src/common/plugin.c:336
 #, 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:438
+#: src/common/plugin.c:439
 msgid "Plugin already loaded"
 msgstr "El módulo ya está cargado"
 
-#: src/common/plugin.c:449
+#: src/common/plugin.c:450
 msgid "Failed to allocate memory for Plugin"
 msgstr "Falló la petición de memoria para el Módulo"
 
-#: src/common/plugin.c:483
+#: src/common/plugin.c:484
 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:492
+#: src/common/plugin.c:493
 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:770
+#: src/common/plugin.c:774
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1196,7 +1289,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:773
+#: src/common/plugin.c:777
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1204,18 +1297,18 @@ 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:782
+#: src/common/plugin.c:786
 #, 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:784
+#: src/common/plugin.c:788
 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."
 
-#: src/common/session.c:201 src/imap.c:1246
-msgid "SSL/TLS handshake failed\n"
-msgstr "Negociación SSL/TLS fallida\n"
+#: src/common/session.c:201 src/imap.c:1251
+msgid "TLS handshake failed\n"
+msgstr "Negociación TLS fallida\n"
 
 #: src/common/smtp.c:185
 msgid "No SMTP AUTH method available\n"
@@ -1246,109 +1339,109 @@ msgstr "El mensaje es demasiado grande (Máximo %s)\n"
 msgid "couldn't start STARTTLS session\n"
 msgstr "no se pudo iniciar la sesión STARTTLS\n"
 
-#: src/common/socket.c:571
+#: src/common/socket.c:566
 msgid "Socket IO timeout.\n"
 msgstr "Tiempo límite de E/S en el conector.\n"
 
-#: src/common/socket.c:600
+#: src/common/socket.c:595
 msgid "Connection timed out.\n"
 msgstr "La conexión excedió el límite de tiempo.\n"
 
-#: src/common/socket.c:740
+#: src/common/socket.c:735
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: la conexión ha fallado (%s).\n"
 
-#: src/common/socket.c:980
+#: src/common/socket.c:975
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: anfitrión desconocido.\n"
 
-#: src/common/socket.c:1072
+#: src/common/socket.c:1067
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: falló la búsqueda de la máquina (%s).\n"
 
-#: src/common/socket.c:1385
+#: src/common/socket.c:1380
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "escribir en fd%d: %s\n"
 
-#: src/common/ssl_certificate.c:338
+#: src/common/ssl_certificate.c:334
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr "No se encuentra el fichero de certificado P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:346
+#: src/common/ssl_certificate.c:342
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr "No se puede leer el fichero de certificado P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:355
+#: src/common/ssl_certificate.c:351
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr "No se puede importar el fichero de certificado P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:640
+#: src/common/ssl_certificate.c:636
 msgid "Internal error"
 msgstr "Error interno"
 
-#: src/common/ssl_certificate.c:645
+#: src/common/ssl_certificate.c:641
 msgid "Uncheckable"
 msgstr "No se puede comprobar"
 
-#: src/common/ssl_certificate.c:649
+#: src/common/ssl_certificate.c:645
 msgid "Self-signed certificate"
 msgstr "Certificado firmado por si mismo"
 
-#: src/common/ssl_certificate.c:652
+#: src/common/ssl_certificate.c:648
 msgid "Revoked certificate"
 msgstr "Certificado revocado"
 
-#: src/common/ssl_certificate.c:654
+#: src/common/ssl_certificate.c:650
 msgid "No certificate issuer found"
 msgstr "No se encontró el emisor del certificado"
 
-#: src/common/ssl_certificate.c:656
+#: src/common/ssl_certificate.c:652
 msgid "Certificate issuer is not a CA"
 msgstr "El emisor del certificado no es una AC"
 
-#: src/common/ssl_certificate.c:881
+#: src/common/ssl_certificate.c:877
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr "No se puede abrir el fichero de certificado %s: %s\n"
 
-#: src/common/ssl_certificate.c:885
+#: src/common/ssl_certificate.c:881
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr "Falta el fichero de certificado %s (%s)\n"
 
-#: src/common/ssl_certificate.c:904
+#: src/common/ssl_certificate.c:900
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr "No se puede abrir el fichero de clave %s (%s)\n"
 
-#: src/common/ssl_certificate.c:908
+#: src/common/ssl_certificate.c:904
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr "Falta el fichero de claves %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1056
+#: src/common/ssl_certificate.c:1052
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr "No se puede leer el fichero de certificado P12 %s\n"
 
-#: src/common/ssl_certificate.c:1059
+#: src/common/ssl_certificate.c:1055
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr "No se puede abrir el fichero de certificado P12 %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1063
+#: src/common/ssl_certificate.c:1059
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "Falta el fichero de certificado P12 %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1088 src/gtk/sslcertwindow.c:85
+#: src/common/ssl_certificate.c:1084 src/gtk/sslcertwindow.c:85
 #: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
 #: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
 #: src/gtk/sslcertwindow.c:134
@@ -1359,237 +1452,237 @@ msgstr "<no en el certificado>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Asunto vacío por expr. reg.)"
 
-#: src/common/utils.c:200
+#: src/common/utils.c:184
 #, c-format
 msgid "%dB"
 msgstr "%d B"
 
-#: src/common/utils.c:201
+#: src/common/utils.c:185
 #, c-format
-msgid "%d.%02dKB"
-msgstr "%d.%02d kB"
+msgid "%d.%02dKiB"
+msgstr "%d.%02d KiB"
 
-#: src/common/utils.c:202
+#: src/common/utils.c:186
 #, c-format
-msgid "%d.%02dMB"
-msgstr "%d.%02d MB"
+msgid "%d.%02dMiB"
+msgstr "%d.%02d MiB"
 
-#: src/common/utils.c:203
+#: src/common/utils.c:187
 #, c-format
-msgid "%.2fGB"
-msgstr "%.2f GB"
+msgid "%.2fGiB"
+msgstr "%.2f GiB"
 
-#: src/common/utils.c:4087
+#: src/common/utils.c:4118
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/common/utils.c:4088
+#: src/common/utils.c:4119
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Lunes"
 
-#: src/common/utils.c:4089
+#: src/common/utils.c:4120
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Martes"
 
-#: src/common/utils.c:4090
+#: src/common/utils.c:4121
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: src/common/utils.c:4091
+#: src/common/utils.c:4122
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Jueves"
 
-#: src/common/utils.c:4092
+#: src/common/utils.c:4123
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Viernes"
 
-#: src/common/utils.c:4093
+#: src/common/utils.c:4124
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/common/utils.c:4095
+#: src/common/utils.c:4126
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Enero"
 
-#: src/common/utils.c:4096
+#: src/common/utils.c:4127
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Febrero"
 
-#: src/common/utils.c:4097
+#: src/common/utils.c:4128
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marzo"
 
-#: src/common/utils.c:4098
+#: src/common/utils.c:4129
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Abril"
 
-#: src/common/utils.c:4099
+#: src/common/utils.c:4130
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mayo"
 
-#: src/common/utils.c:4100
+#: src/common/utils.c:4131
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Junio"
 
-#: src/common/utils.c:4101
+#: src/common/utils.c:4132
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Julio"
 
-#: src/common/utils.c:4102
+#: src/common/utils.c:4133
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Agosto"
 
-#: src/common/utils.c:4103
+#: src/common/utils.c:4134
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Septiembre"
 
-#: src/common/utils.c:4104
+#: src/common/utils.c:4135
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octubre"
 
-#: src/common/utils.c:4105
+#: src/common/utils.c:4136
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Noviembre"
 
-#: src/common/utils.c:4106
+#: src/common/utils.c:4137
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Diciembre"
 
-#: src/common/utils.c:4108
+#: src/common/utils.c:4139
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dom"
 
-#: src/common/utils.c:4109
+#: src/common/utils.c:4140
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Lun"
 
-#: src/common/utils.c:4110
+#: src/common/utils.c:4141
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Mar"
 
-#: src/common/utils.c:4111
+#: src/common/utils.c:4142
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mié"
 
-#: src/common/utils.c:4112
+#: src/common/utils.c:4143
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Jue"
 
-#: src/common/utils.c:4113
+#: src/common/utils.c:4144
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Vie"
 
-#: src/common/utils.c:4114
+#: src/common/utils.c:4145
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sáb"
 
-#: src/common/utils.c:4116
+#: src/common/utils.c:4147
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Ene"
 
-#: src/common/utils.c:4117
+#: src/common/utils.c:4148
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:4118
+#: src/common/utils.c:4149
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4119
+#: src/common/utils.c:4150
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Abr"
 
-#: src/common/utils.c:4120
+#: src/common/utils.c:4151
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "May"
 
-#: src/common/utils.c:4121
+#: src/common/utils.c:4152
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4122
+#: src/common/utils.c:4153
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:4123
+#: src/common/utils.c:4154
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ago"
 
-#: src/common/utils.c:4124
+#: src/common/utils.c:4155
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4125
+#: src/common/utils.c:4156
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Oct"
 
-#: src/common/utils.c:4126
+#: src/common/utils.c:4157
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4127
+#: src/common/utils.c:4158
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dic"
 
-#: src/common/utils.c:4138
+#: src/common/utils.c:4169
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4139
+#: src/common/utils.c:4170
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4140
+#: src/common/utils.c:4171
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4141
+#: src/common/utils.c:4172
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/compose.c:201
+#: src/compose.c:200
 msgid ""
 "You have opted to sign and/or encrypt this message but have not selected a "
 "privacy system.\n"
@@ -1601,362 +1694,360 @@ msgstr ""
 "\n"
 "La firma y el cifrado se han desactivado para este mensaje."
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "_Add..."
 msgstr "_Añadir..."
 
-#: src/compose.c:600 src/gtk/gtkutils.c:86
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:323
+#: src/compose.c:605 src/editgroup.c:346 src/mh_gtk.c:376
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:361
+#: src/prefs_actions.c:336 src/prefs_display_header.c:378
+#: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
+#: src/prefs_matcher.c:802 src/prefs_summary_column.c:292
+#: src/prefs_summary_open.c:247 src/prefs_themes.c:1200
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: src/compose.c:602 src/folderview.c:254
+#: src/compose.c:607 src/folderview.c:255
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: src/compose.c:609 src/mainwindow.c:519 src/messageview.c:214
+#: src/compose.c:614 src/mainwindow.c:520 src/messageview.c:215
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "_Spelling"
 msgstr "_Ortografía"
 
-#: src/compose.c:614 src/compose.c:681
+#: src/compose.c:619 src/compose.c:686
 msgid "_Options"
 msgstr "_Opciones"
 
-#: src/compose.c:616 src/mainwindow.c:522 src/messageview.c:216
+#: src/compose.c:621 src/mainwindow.c:523 src/messageview.c:217
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: src/compose.c:618
+#: src/compose.c:623
 msgid "S_end"
 msgstr "_Enviar"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "Send _later"
 msgstr "Enviar _después"
 
-#: src/compose.c:622
+#: src/compose.c:627
 msgid "_Attach file"
 msgstr "_Adjuntar fichero"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "_Insert file"
 msgstr "_Insertar fichero"
 
-#: src/compose.c:624
+#: src/compose.c:629
 msgid "Insert si_gnature"
 msgstr "Insertar _firma"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "_Replace signature"
 msgstr "_Reemplazar firma"
 
-#: src/compose.c:629
+#: src/compose.c:634
 msgid "_Print"
 msgstr "I_mprimir"
 
-#: src/compose.c:634 src/gtk/gtkutils.c:76
-#: src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Deshacer"
 
-#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Rehacer"
 
-#: src/compose.c:638 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/compose.c:642
+#: src/compose.c:647
 msgid "_Special paste"
 msgstr "Pegar e_special"
 
-#: src/compose.c:643
+#: src/compose.c:648
 msgid "As _quotation"
 msgstr "Como _citación"
 
-#: src/compose.c:644
+#: src/compose.c:649
 msgid "_Wrapped"
 msgstr "_Recortado"
 
-#: src/compose.c:645
+#: src/compose.c:650
 msgid "_Unwrapped"
 msgstr "_Sin recortar"
 
-#: src/compose.c:647 src/mainwindow.c:552
+#: src/compose.c:652 src/mainwindow.c:553
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Seleccionar todo"
 
-#: src/compose.c:649
+#: src/compose.c:654
 msgid "A_dvanced"
 msgstr "Avanza_das"
 
-#: src/compose.c:650
+#: src/compose.c:655
 msgid "Move a character backward"
 msgstr "Ir al carácter anterior"
 
-#: src/compose.c:651
+#: src/compose.c:656
 msgid "Move a character forward"
 msgstr "Ir al carácter siguiente"
 
-#: src/compose.c:652
+#: src/compose.c:657
 msgid "Move a word backward"
 msgstr "Ir a la palabra anterior"
 
-#: src/compose.c:653
+#: src/compose.c:658
 msgid "Move a word forward"
 msgstr "Ir a la palabra siguiente"
 
-#: src/compose.c:654
+#: src/compose.c:659
 msgid "Move to beginning of line"
 msgstr "Ir al principio de la línea"
 
-#: src/compose.c:655
+#: src/compose.c:660
 msgid "Move to end of line"
 msgstr "Ir al final de la línea"
 
-#: src/compose.c:656
+#: src/compose.c:661
 msgid "Move to previous line"
 msgstr "Ir a la línea anterior"
 
-#: src/compose.c:657
+#: src/compose.c:662
 msgid "Move to next line"
 msgstr "Ir a la línea siguiente"
 
-#: src/compose.c:658
+#: src/compose.c:663
 msgid "Delete a character backward"
 msgstr "Borrar el carácter anterior"
 
-#: src/compose.c:659
+#: src/compose.c:664
 msgid "Delete a character forward"
 msgstr "Borrar el carácter siguiente"
 
-#: src/compose.c:660
+#: src/compose.c:665
 msgid "Delete a word backward"
 msgstr "Borrar la palabra anterior"
 
-#: src/compose.c:661
+#: src/compose.c:666
 msgid "Delete a word forward"
 msgstr "Borrar la palabra siguiente"
 
-#: src/compose.c:662
+#: src/compose.c:667
 msgid "Delete line"
 msgstr "Borrar línea"
 
-#: src/compose.c:663
+#: src/compose.c:668
 msgid "Delete to end of line"
 msgstr "Borrar hasta el final de la línea"
 
-#: src/compose.c:666 src/gtk/gtkutils.c:73 src/messageview.c:231
-#: src/plugins/managesieve/sieve_editor.c:102
-msgid "_Find"
-msgstr "_Buscar"
-
-#: src/compose.c:669
+#: src/compose.c:674
 msgid "_Wrap current paragraph"
 msgstr "_Recortar el párrafo actual"
 
-#: src/compose.c:670
+#: src/compose.c:675
 msgid "Wrap all long _lines"
 msgstr "Recortar todas las líneas largas"
 
-#: src/compose.c:672
+#: src/compose.c:677
 msgid "Edit with e_xternal editor"
 msgstr "Editar con un editor e_xterno"
 
-#: src/compose.c:675
+#: src/compose.c:680
 msgid "_Check all or check selection"
 msgstr "_Comprobar todo o la selección"
 
-#: src/compose.c:676
+#: src/compose.c:681
 msgid "_Highlight all misspelled words"
 msgstr "_Resaltar todas las faltas ortográficas"
 
-#: src/compose.c:677
+#: src/compose.c:682
 msgid "Check _backwards misspelled word"
 msgstr "Comprobar faltas hacia _atrás"
 
-#: src/compose.c:678
+#: src/compose.c:683
 msgid "_Forward to next misspelled word"
 msgstr "Avanzar hasta la siguiente _falta"
 
-#: src/compose.c:685
+#: src/compose.c:690
 msgid "Reply _mode"
 msgstr "_Modo de respuesta"
 
-#: src/compose.c:687
+#: src/compose.c:692
 msgid "Privacy _System"
 msgstr "_Sistema de privacidad"
 
-#: src/compose.c:691
+#: src/compose.c:696
 msgid "_Priority"
 msgstr "_Prioridad"
 
-#: src/compose.c:693 src/mainwindow.c:614 src/messageview.c:267
+#: src/compose.c:698 src/mainwindow.c:615 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "Codificación de caract_eres"
 
-#: src/compose.c:698 src/mainwindow.c:619 src/messageview.c:272
+#: src/compose.c:703 src/mainwindow.c:620 src/messageview.c:273
 msgid "Western European"
 msgstr "Europeo Occidental"
 
-#: src/compose.c:699 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:621 src/messageview.c:274
 msgid "Baltic"
 msgstr "Báltico"
 
-#: src/compose.c:700 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:622 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: src/compose.c:701 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:623 src/messageview.c:276
 msgid "Arabic"
 msgstr "Árabe"
 
-#: src/compose.c:702 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:624 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: src/compose.c:703 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:625 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japonés"
 
-#: src/compose.c:704 src/mainwindow.c:625 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:626 src/messageview.c:279
 msgid "Chinese"
 msgstr "Chino"
 
-#: src/compose.c:705 src/mainwindow.c:626 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:627 src/messageview.c:280
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/compose.c:706 src/mainwindow.c:627 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:628 src/messageview.c:281
 msgid "Thai"
 msgstr "Tailandés"
 
-#: src/compose.c:709 src/mainwindow.c:737 src/messageview.c:316
+#: src/compose.c:714 src/mainwindow.c:738 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Agenda de direcciones"
 
-#: src/compose.c:711
+#: src/compose.c:716
 msgid "_Template"
 msgstr "Plan_tilla"
 
-#: src/compose.c:713 src/mainwindow.c:765 src/messageview.c:336
+#: src/compose.c:718 src/mainwindow.c:768 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Accio_nes"
 
-#: src/compose.c:717 src/mainwindow.c:819 src/messageview.c:340
+#: src/compose.c:722 src/mainwindow.c:822 src/messageview.c:343
 msgid "_About"
 msgstr "_Acerca de"
 
-#: src/compose.c:722
+#: src/compose.c:727
 msgid "Aut_o wrapping"
 msgstr "Aut_o-recorte"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "Auto _indent"
 msgstr "Auto-_sangrado"
 
-#: src/compose.c:724
+#: src/compose.c:729
 msgid "Si_gn"
 msgstr "Fir_mar"
 
-#: src/compose.c:725
+#: src/compose.c:730
 msgid "_Encrypt"
 msgstr "_Cifrado"
 
-#: src/compose.c:726
+#: src/compose.c:731
 msgid "_Request Return Receipt"
 msgstr "Solicitar acuse de _recibo"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "Remo_ve references"
 msgstr "Eliminar re_ferencias"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "Show _ruler"
 msgstr "Mostrar _regleta"
 
-#: src/compose.c:733 src/compose.c:743
+#: src/compose.c:738 src/compose.c:748
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:734 src/mainwindow.c:668 src/messageview.c:305
-#: src/summaryview.c:428
+#: src/compose.c:739 src/mainwindow.c:669 src/messageview.c:306
+#: src/summaryview.c:429
 msgid "_All"
 msgstr "_Todo"
 
-#: src/compose.c:735 src/mainwindow.c:669 src/messageview.c:306
-#: src/summaryview.c:429
+#: src/compose.c:740 src/mainwindow.c:670 src/messageview.c:307
+#: src/summaryview.c:430
 msgid "_Sender"
 msgstr "_Remitente"
 
-#: src/compose.c:736
+#: src/compose.c:741
 msgid "_Mailing-list"
 msgstr "_Lista-Correo"
 
-#: src/compose.c:741
+#: src/compose.c:746
 msgid "_Highest"
 msgstr "_Muy alta"
 
-#: src/compose.c:742
+#: src/compose.c:747
 msgid "Hi_gh"
 msgstr "_Alta"
 
-#: src/compose.c:744
+#: src/compose.c:749
 msgid "Lo_w"
 msgstr "_Baja"
 
-#: src/compose.c:745
+#: src/compose.c:750
 msgid "_Lowest"
 msgstr "M_uy baja"
 
-#: src/compose.c:750 src/mainwindow.c:884 src/messageview.c:353
+#: src/compose.c:755 src/mainwindow.c:887 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Automático"
 
-#: src/compose.c:751 src/mainwindow.c:885 src/messageview.c:354
+#: src/compose.c:756 src/mainwindow.c:888 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:752 src/mainwindow.c:886 src/messageview.c:355
+#: src/compose.c:757 src/mainwindow.c:889 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:756 src/mainwindow.c:890 src/messageview.c:359
+#: src/compose.c:761 src/mainwindow.c:893 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:759 src/mainwindow.c:893 src/messageview.c:362
+#: src/compose.c:764 src/mainwindow.c:896 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Griego (ISO-8859-_7)"
 
-#: src/compose.c:764 src/mainwindow.c:898 src/messageview.c:367
+#: src/compose.c:769 src/mainwindow.c:901 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turco (ISO-8859-_9)"
 
-#: src/compose.c:1035
+#: src/compose.c:1040
 msgid "New message From format error."
 msgstr "Error de formato en el «Desde» del mensaje nuevo."
 
-#: src/compose.c:1128
+#: src/compose.c:1133
 msgid "New message subject format error."
 msgstr "Error de formato en el asunto del mensaje nuevo."
 
-#: src/compose.c:1160 src/quote_fmt.c:565
+#: src/compose.c:1165 src/quote_fmt.c:565
 #, 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:1429
+#: src/compose.c:1434
 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:1614 src/quote_fmt.c:582
+#: src/compose.c:1619 src/quote_fmt.c:582
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
@@ -1964,12 +2055,12 @@ msgstr ""
 "El campo «Desde» de la plantilla «Responder» contiene una dirección de "
 "correo inválida."
 
-#: src/compose.c:1663 src/quote_fmt.c:585
+#: src/compose.c:1668 src/quote_fmt.c:585
 #, 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:1804 src/compose.c:2005 src/quote_fmt.c:602
+#: src/compose.c:1809 src/compose.c:2010 src/quote_fmt.c:602
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1977,55 +2068,55 @@ msgstr ""
 "El campo «Desde» de la plantilla «Reenviar» contiene una dirección de correo "
 "inválida."
 
-#: src/compose.c:1865 src/quote_fmt.c:605
+#: src/compose.c:1870 src/quote_fmt.c:605
 #, 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:2048
+#: src/compose.c:2053
 msgid "Fw: multiple emails"
 msgstr "Rv: múltiples correos"
 
-#: src/compose.c:2559
+#: src/compose.c:2575
 #, 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:2630 src/gtk/headers.h:14
+#: src/compose.c:2646 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2633 src/gtk/headers.h:15
+#: src/compose.c:2649 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2636 src/gtk/headers.h:12
+#: src/compose.c:2652 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
-#: src/compose.c:2639 src/compose.c:5014 src/compose.c:5016
+#: src/compose.c:2655 src/compose.c:5039 src/compose.c:5041
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Grupos:"
 
-#: src/compose.c:2642 src/gtk/headers.h:34
+#: src/compose.c:2658 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Seguimiento-A:"
 
-#: src/compose.c:2645 src/gtk/headers.h:17
+#: src/compose.c:2661 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "En-Respuesta-A:"
 
-#: src/compose.c:2649 src/compose.c:5011 src/compose.c:5019
+#: src/compose.c:2665 src/compose.c:5036 src/compose.c:5044
 #: src/gtk/headers.h:13 src/summary_search.c:429
 msgid "To:"
 msgstr "Para:"
 
-#: src/compose.c:2845
+#: src/compose.c:2861
 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:2851
+#: src/compose.c:2867
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2040,16 +2131,16 @@ msgstr[1] ""
 "Se han adjuntado los siguientes ficheros: \n"
 "%s"
 
-#: src/compose.c:3131
+#: src/compose.c:3147
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "La «marca de cita» de la plantilla no es válida."
 
-#: src/compose.c:3660
+#: src/compose.c:3680
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "No se puede obtener el tamaño del fichero «%s»."
 
-#: src/compose.c:3678
+#: src/compose.c:3698
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -2058,57 +2149,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:3681
+#: src/compose.c:3701
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
-#: src/compose.c:3682 src/compose.c:10773 src/compose.c:11665
+#: src/compose.c:3702 src/compose.c:10815 src/compose.c:11715
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: src/compose.c:3807
+#: src/compose.c:3827
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:3808
+#: src/compose.c:3828
 msgid "Empty file"
 msgstr "Fichero vacío"
 
-#: src/compose.c:3809
+#: src/compose.c:3829
 msgid "_Attach anyway"
 msgstr "_Adjuntar igualmente"
 
-#: src/compose.c:3818
+#: src/compose.c:3838
 #, c-format
 msgid "Can't read %s."
 msgstr "No puedo leer %s."
 
-#: src/compose.c:3845
+#: src/compose.c:3865
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:4855 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4880 src/plugins/managesieve/sieve_editor.c:697
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:4862 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4887 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 
-#: src/compose.c:4865 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4890 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sin asunto] - Componer mensaje%s"
 
-#: src/compose.c:4867 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4892 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Componer un mensaje nuevo"
 
-#: src/compose.c:4894 src/messageview.c:884
+#: src/compose.c:4919 src/messageview.c:891
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2116,61 +2207,64 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
-#: src/compose.c:5111 src/compose.c:5148
+#: src/compose.c:5136 src/compose.c:5173
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr ""
 "El único destinatario es la dirección predeterminada «%s». ¿Enviar de todas "
 "formas?"
 
-#: src/compose.c:5113 src/compose.c:5150 src/compose.c:5188 src/compose.c:5231
-#: src/prefs_account.c:4072 src/toolbar.c:487 src/toolbar.c:519
+#: src/compose.c:5138 src/compose.c:5175 src/compose.c:5213 src/compose.c:5256
+#: src/prefs_account.c:4080 src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:5115 src/compose.c:5152 src/compose.c:5189 src/compose.c:5232
-#: src/compose.c:5797 src/folderview.c:2538 src/messageview.c:856
-#: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3054
+#: src/compose.c:5140 src/compose.c:5177 src/compose.c:5214 src/compose.c:5257
+#: src/compose.c:5822 src/folderview.c:2555 src/messageview.c:862
+#: src/plugins/attachwarner/attachwarner.c:219
+#: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3108
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:5169
+#: src/compose.c:5194
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:5184
+#: src/compose.c:5209
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "El asunto esta vacío. %s"
 
-#: src/compose.c:5185 src/compose.c:5228
-#: src/plugins/attachwarner/attachwarner.c:215
+#: src/compose.c:5210 src/compose.c:5253
+#: src/plugins/attachwarner/attachwarner.c:216
+#: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Send it anyway?"
 msgstr "¿Enviarlo igualmente?"
 
-#: src/compose.c:5186 src/compose.c:5229
-#: src/plugins/attachwarner/attachwarner.c:215
+#: src/compose.c:5211 src/compose.c:5254
+#: src/plugins/attachwarner/attachwarner.c:216
+#: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Queue it anyway?"
 msgstr "¿Ponerlo en la cola igualmente?"
 
-#: src/compose.c:5188 src/compose.c:5231 src/toolbar.c:520
+#: src/compose.c:5213 src/compose.c:5256 src/toolbar.c:531
 msgid "Send later"
 msgstr "Enviar después"
 
-#: src/compose.c:5189 src/compose.c:5232
+#: src/compose.c:5214 src/compose.c:5257
 msgid "_Queue"
 msgstr "_A la cola"
 
-#: src/compose.c:5227
+#: src/compose.c:5252
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Enviando a %d destinatarios. %s"
 
-#: src/compose.c:5256
+#: src/compose.c:5281
 msgid "Could not queue message."
 msgstr "El mensaje no se pudo agregar a la cola."
 
-#: src/compose.c:5259
+#: src/compose.c:5284
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2181,7 +2275,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5263
+#: src/compose.c:5288
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2192,7 +2286,7 @@ msgstr ""
 "\n"
 "Falló la firma: %s"
 
-#: src/compose.c:5268
+#: src/compose.c:5293
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2203,7 +2297,7 @@ msgstr ""
 "\n"
 "Falló el cifrado: %s"
 
-#: src/compose.c:5273
+#: src/compose.c:5298
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2213,7 +2307,7 @@ msgstr ""
 "\n"
 "Falló la conversión del conjunto caracteres."
 
-#: src/compose.c:5277
+#: src/compose.c:5302
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2223,7 +2317,7 @@ msgstr ""
 "\n"
 "No se pudo obtener la clave de cifrado del destinatario."
 
-#: src/compose.c:5340 src/compose.c:5400
+#: src/compose.c:5365 src/compose.c:5425
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2231,7 +2325,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:5396
+#: src/compose.c:5421
 #, c-format
 msgid ""
 "%s\n"
@@ -2240,7 +2334,7 @@ msgstr ""
 "%s\n"
 "Utilice «Enviar mensaje(s) en cola» en la ventana principal para reintentar."
 
-#: src/compose.c:5793
+#: src/compose.c:5818
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2251,7 +2345,7 @@ msgstr ""
 "al conjunto de caracteres %s especificado.\n"
 "¿Enviarlo como %s?"
 
-#: src/compose.c:5855
+#: src/compose.c:5876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2264,99 +2358,98 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:6090
+#: src/compose.c:6115
 msgid "Encryption warning"
 msgstr "Aviso de cifrado"
 
-#: src/compose.c:6091
+#: src/compose.c:6116
 msgid "C_ontinue"
 msgstr "C_ontinuar"
 
-#: src/compose.c:6140
+#: src/compose.c:6165
 msgid "No account for sending mails available!"
 msgstr "¡No hay ninguna cuenta disponible para enviar correos!"
 
-#: src/compose.c:6149
+#: src/compose.c:6174
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "La cuenta seleccionada no es NNTP: es imposible enviar el post."
 
-#: src/compose.c:6403
+#: src/compose.c:6428
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "El adjunto %s ya no existe. ¿Ignorar?"
 
-#: src/compose.c:6405 src/mainwindow.c:659 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6430 src/mainwindow.c:660 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Cancelar envío"
 
-#: src/compose.c:6405
+#: src/compose.c:6431
 msgid "Ignore attachment"
 msgstr "Ignorar adjunto"
 
-#: src/compose.c:6461
+#: src/compose.c:6487
 #, c-format
 msgid "Original %s part"
 msgstr "Parte original %s"
 
-#: src/compose.c:7061
+#: src/compose.c:7094
 msgid "Add to address _book"
 msgstr "Añadir a la agen_da"
 
-#: src/compose.c:7216
+#: src/compose.c:7249
 msgid "Delete entry contents"
 msgstr "Borrar contenidos de la cuenta"
 
-#: src/compose.c:7220 src/plugins/vcalendar/vcal_meeting_gtk.c:302
+#: src/compose.c:7253 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Usar «tab» para autocompletar con la agenda"
 
-#: src/compose.c:7455
+#: src/compose.c:7488
 msgid "Mime type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:7461 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
-#: src/prefs_matcher.c:640 src/prefs_summaries.c:633
-#: src/prefs_summary_column.c:84 src/summaryview.c:467
+#: src/compose.c:7494 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:456
+#: src/prefs_matcher.c:640 src/prefs_summaries.c:635
+#: src/prefs_summary_column.c:84 src/summaryview.c:468
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:7523
+#: src/compose.c:7556
 msgid "Save Message to "
 msgstr "Guardar mensaje en "
 
-#: src/compose.c:7556 src/editjpilot.c:277 src/editldap.c:514
-#: src/editvcard.c:193 src/export.c:161 src/gtk/gtkutils.c:77 src/import.c:160
-#: src/importmutt.c:240 src/importpine.c:239
-#: src/plugins/archive/archiver_gtk.c:1081
+#: src/compose.c:7589 src/editjpilot.c:277 src/editldap.c:514
+#: src/editvcard.c:193 src/export.c:161 src/import.c:160 src/importmutt.c:240
+#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1078
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
-#: src/plugins/bsfilter/bsfilter_gtk.c:181
+#: src/plugins/bsfilter/bsfilter_gtk.c:180
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
 #: src/plugins/spamassassin/spamassassin_gtk.c:429
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: src/compose.c:7572
+#: src/compose.c:7605
 msgid "Select folder to save message to"
 msgstr "Seleccionar la carpeta en la que guardar el mensaje"
 
-#: src/compose.c:8022
+#: src/compose.c:8059
 msgid "Hea_der"
 msgstr "_Cabecera"
 
-#: src/compose.c:8027
+#: src/compose.c:8064
 msgid "_Attachments"
 msgstr "_Adjuntos"
 
-#: src/compose.c:8041
+#: src/compose.c:8078
 msgid "Othe_rs"
 msgstr "Ot_ros"
 
-#: src/compose.c:8056
+#: src/compose.c:8093
 msgid "S_ubject:"
 msgstr "As_unto:"
 
-#: src/compose.c:8280
+#: src/compose.c:8317
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2365,19 +2458,19 @@ msgstr ""
 "No se puede iniciar el corrector ortográfico.\n"
 "%s"
 
-#: src/compose.c:8431
+#: src/compose.c:8468
 msgid "_From:"
 msgstr "_Desde:"
 
-#: src/compose.c:8439
+#: src/compose.c:8476
 msgid "Account to use for this email"
 msgstr "Cuenta a usar para este correo"
 
-#: src/compose.c:8441
+#: src/compose.c:8478
 msgid "Sender address to be used"
 msgstr "Dirección del remitente a usar"
 
-#: src/compose.c:8623
+#: src/compose.c:8660
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2386,50 +2479,50 @@ msgstr ""
 "No se ha podido cargar el sistema de privacidad «%s». No será posible firmar "
 "o cifrar este mensaje."
 
-#: src/compose.c:8734 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8771 src/plugins/archive/archiver_gtk.c:1177
 msgid "_None"
 msgstr "_Ninguno"
 
-#: src/compose.c:8835 src/prefs_template.c:745
+#: src/compose.c:8872 src/prefs_template.c:745
 #, 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:8932
+#: src/compose.c:8969
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Error de formato en la cabecera «%s» de la plantilla."
 
-#: src/compose.c:9356
+#: src/compose.c:9394
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:9371
+#: src/compose.c:9409
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:9442
+#: src/compose.c:9480
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:9460
+#: src/compose.c:9498
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:9493
+#: src/compose.c:9531
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:9513
+#: src/compose.c:9551
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:9514
+#: src/compose.c:9552
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:9609
+#: src/compose.c:9648
 #, c-format
 msgid ""
 "Could not write the body to file:\n"
@@ -2438,7 +2531,14 @@ msgstr ""
 "No se puede escribir el cuerpo en el fichero:\n"
 "%s"
 
-#: src/compose.c:9667
+#: src/compose.c:9677
+msgid ""
+"Socket communication with an external editor is not available on Windows."
+msgstr ""
+"La comunicación por conector con un editor externo no está "
+"disponible en Windows."
+
+#: src/compose.c:9710
 #, c-format
 msgid ""
 "Could not spawn the following command:\n"
@@ -2449,35 +2549,34 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/compose.c:9706
+#: src/compose.c:9750
 #, c-format
-msgid "External editor stopped with an error:%s"
-msgstr "El editor externo se detuvo con un error:%s"
+msgid "External editor stopped with an error: %s"
+msgstr "El editor externo se detuvo con un error: %s"
 
-#: src/compose.c:9780
-#, c-format
+#: src/compose.c:9822
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process id: %d"
+"process id: %"
 msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Desea forzar la finalización del proceso?\n"
-"Id. de proceso: %d"
+"Id. de proceso: %"
 
-#: src/compose.c:10187 src/messageview.c:1085
+#: src/compose.c:10229 src/messageview.c:1094
 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:10389
+#: src/compose.c:10432
 msgid "Could not save draft."
 msgstr "No se puede guardar el borrador."
 
-#: src/compose.c:10393
+#: src/compose.c:10436
 msgid "Could not save draft"
 msgstr "No se puede guardar el borrador"
 
-#: src/compose.c:10394
+#: src/compose.c:10437
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2485,24 +2584,24 @@ msgstr ""
 "No se ha podido guardar el borrador.\n"
 "¿Desea cancelar la salida o descartar este correo?"
 
-#: src/compose.c:10396
+#: src/compose.c:10439
 msgid "_Cancel exit"
 msgstr "_Cancelar salida"
 
-#: src/compose.c:10396
+#: src/compose.c:10439
 msgid "_Discard email"
 msgstr "_Descartar correo"
 
-#: src/compose.c:10585 src/compose.c:10599
+#: src/compose.c:10627 src/compose.c:10641
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:10613
+#: src/compose.c:10655
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No se puede leer el fichero «%s»."
 
-#: src/compose.c:10615
+#: src/compose.c:10657
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2511,50 +2610,59 @@ msgstr ""
 "El fichero «%s» contenía caracteres inválidos para\n"
 "la codificación actual, la inserción puede ser incorrecta."
 
-#: src/compose.c:10692
+#: src/compose.c:10734
 msgid "Discard message"
 msgstr "Descartar mensaje"
 
-#: src/compose.c:10693
+#: src/compose.c:10735
 msgid "This message has been modified. Discard it?"
 msgstr "Este mensaje se ha modificado. ¿Desea descartarlo?"
 
-#: src/compose.c:10694 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10736 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/compose.c:10694 src/compose.c:10699
+#: src/compose.c:10736 src/compose.c:10741
 msgid "_Save to Drafts"
 msgstr "Guardar en _Borradores"
 
-#: src/compose.c:10697 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10739 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: src/compose.c:10698
+#: src/compose.c:10740
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Este mensaje se ha modificado. ¿Guardar los últimos cambios?"
 
-#: src/compose.c:10699
+#: src/compose.c:10741
 msgid "_Don't save"
 msgstr "_No guardar"
 
-#: src/compose.c:10770
+#: src/compose.c:10812
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:10772
+#: src/compose.c:10814
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:10773 src/gtk/gtkutils.c:75 src/prefs_actions.c:326
-#: src/prefs_filtering_action.c:585 src/prefs_matcher.c:796
-#: src/prefs_toolbar.c:1003
+#: src/compose.c:10815 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
+#: src/prefs_filtering.c:463 src/prefs_matcher.c:796 src/prefs_template.c:307
+#: src/prefs_toolbar.c:1004
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:11658
+#: src/compose.c:10892
+#, c-format
+msgid ""
+"Size of pasted text exceeds limit (%dKiB) for paste.\n"
+"Attach as file instead."
+msgstr ""
+"El tamaño del texto pegado excede el límite de pegado (%d KiB).\n"
+"Adjúntelo como un fichero en vez de pegarlo."
+
+#: src/compose.c:11708
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2569,20 +2677,20 @@ msgstr[1] ""
 "¿Quiere insertar el contenido de estos %d ficheros en el cuerpo del correo o "
 "prefiere adjuntarlos al mismo?"
 
-#: src/compose.c:11664
+#: src/compose.c:11714
 msgid "Insert or attach?"
 msgstr "¿Insertar o adjuntar?"
 
-#: src/compose.c:11665
+#: src/compose.c:11715
 msgid "_Attach"
 msgstr "_Adjuntar"
 
-#: src/compose.c:11881
+#: src/compose.c:11930
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Error de formato de cita en la línea %d."
 
-#: src/compose.c:12177
+#: src/compose.c:12226
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2596,11 +2704,11 @@ msgstr ""
 msgid "Claws Mail process (%ld) received signal %ld"
 msgstr "El proceso Claws Mail (%ld) recibió la señal %ld"
 
-#: src/crash.c:186
+#: src/crash.c:189
 msgid "Claws Mail has crashed"
 msgstr "Claws Mail ha terminado abruptamente"
 
-#: src/crash.c:203
+#: src/crash.c:206
 #, c-format
 msgid ""
 "%s.\n"
@@ -2609,23 +2717,24 @@ msgstr ""
 "%s.\n"
 "Por favor, rellene un informe de error e incluya la información siguiente."
 
-#: src/crash.c:208
+#: src/crash.c:211
 msgid "Debug log"
 msgstr "Traza de depuración"
 
-#: src/crash.c:252 src/expldifdlg.c:202 src/printing.c:508 src/toolbar.c:539
+#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:508 src/toolbar.c:550
+#: src/uri_opener.c:226
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/crash.c:257
+#: src/crash.c:260
 msgid "Save..."
 msgstr "Guardar..."
 
-#: src/crash.c:262
+#: src/crash.c:265
 msgid "Create bug report"
 msgstr "Crear informe de error"
 
-#: src/crash.c:312
+#: src/crash.c:315
 msgid "Save crash information"
 msgstr "Guardar información de terminación incorrecta"
 
@@ -2693,7 +2802,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:820 src/prefs_folder_item.c:1761
+#: src/editaddress.c:820 src/prefs_folder_item.c:1827
 msgid "Discard"
 msgstr "Descartar"
 
@@ -2701,15 +2810,15 @@ msgstr "Descartar"
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/editaddress.c:851 src/editaddress.c:901
+#: src/editaddress.c:851 src/editaddress.c:902
 msgid "Edit Person Data"
 msgstr "Editar datos personales"
 
-#: src/editaddress.c:930
+#: src/editaddress.c:931
 msgid "Choose a picture"
 msgstr "Elegir una imagen"
 
-#: src/editaddress.c:949
+#: src/editaddress.c:950
 #, c-format
 msgid ""
 "Failed to import image: \n"
@@ -2718,58 +2827,58 @@ msgstr ""
 "Falló al importar la imagen: \n"
 "%s"
 
-#: src/editaddress.c:991
+#: src/editaddress.c:992
 msgid "_Set picture"
 msgstr "A_sociar imagen"
 
-#: src/editaddress.c:992
+#: src/editaddress.c:993
 msgid "_Unset picture"
 msgstr "Q_uitar imagen asociada"
 
-#: src/editaddress.c:1048
+#: src/editaddress.c:1049
 msgid "Photo"
 msgstr "Foto"
 
-#: src/editaddress.c:1095 src/editaddress.c:1097 src/expldifdlg.c:506
-#: src/exporthtml.c:762 src/ldif.c:747
+#: src/editaddress.c:1096 src/editaddress.c:1098 src/expldifdlg.c:508
+#: src/exporthtml.c:758 src/ldif.c:751
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
-#: src/editaddress.c:1106 src/editaddress.c:1110 src/ldif.c:755
+#: src/editaddress.c:1107 src/editaddress.c:1111 src/ldif.c:759
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: src/editaddress.c:1107 src/editaddress.c:1109 src/ldif.c:751
+#: src/editaddress.c:1108 src/editaddress.c:1110 src/ldif.c:755
 msgid "First Name"
 msgstr "Nombre"
 
-#: src/editaddress.c:1113 src/editaddress.c:1115
+#: src/editaddress.c:1114 src/editaddress.c:1116
 msgid "Nickname"
 msgstr "Apodo"
 
-#: src/editaddress.c:1251 src/editaddress.c:1292
+#: src/editaddress.c:1253 src/editaddress.c:1294
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1480 src/editaddress.c:1507 src/editaddress.c:1526
+#: src/editaddress.c:1483 src/editaddress.c:1510 src/editaddress.c:1529
 #: src/editaddress_other_attributes_ldap.c:374
 #: src/editaddress_other_attributes_ldap.c:411 src/prefs_customheader.c:217
 msgid "Value"
 msgstr "Valor"
 
-#: src/editaddress.c:1594
+#: src/editaddress.c:1597
 msgid "_User Data"
 msgstr "Datos de _usuario"
 
-#: src/editaddress.c:1595
+#: src/editaddress.c:1598
 msgid "_Email Addresses"
 msgstr "_Direcciones de correo"
 
-#: src/editaddress.c:1598 src/editaddress.c:1601
+#: src/editaddress.c:1601 src/editaddress.c:1604
 msgid "O_ther Attributes"
 msgstr "O_tros atributos"
 
-#: src/editaddress.c:1769
+#: src/editaddress.c:1772
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2799,8 +2908,7 @@ msgid " Check File "
 msgstr " Comprobar fichero "
 
 #: src/editbook.c:181 src/editjpilot.c:268 src/editvcard.c:184
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2442
-#: src/wizard.c:1201 src/wizard.c:1632
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2443
 msgid "File"
 msgstr "Fichero"
 
@@ -2816,7 +2924,7 @@ msgstr "Debe proporcionar un nombre de grupo"
 msgid "Edit Group Data"
 msgstr "Editar datos del grupo"
 
-#: src/editgroup.c:323 src/exporthtml.c:598
+#: src/editgroup.c:323 src/exporthtml.c:594
 msgid "Group Name"
 msgstr "Nombre de grupo"
 
@@ -2848,13 +2956,13 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:555 src/foldersel.c:571 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
+#: src/editgroup.c:555 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:129
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:556 src/foldersel.c:572 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
+#: src/editgroup.c:556 src/foldersel.c:571 src/mh_gtk.c:145
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:130
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -2882,14 +2990,14 @@ msgstr "Añadir nueva entrada JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Editar LDAP - Seleccionar base de búsqueda"
 
-#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3189
-#: src/prefs_proxy.c:98
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3190
+#: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "Nombre de máquina"
 
 #: src/editldap_basedn.c:180 src/editldap.c:456
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3196
-#: src/prefs_proxy.c:105 src/ssl_manager.c:117
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3197
+#: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Puerto"
 
@@ -2950,9 +3058,9 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:468 src/prefs_account.c:4163
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#: src/editldap.c:468 src/prefs_account.c:4171
+msgid "TLS"
+msgstr "TLS"
 
 #: src/editldap.c:472
 msgid ""
@@ -2967,11 +3075,11 @@ msgstr ""
 
 #: src/editldap.c:477
 msgid ""
-"Enable secure connection to the LDAP server via SSL/TLS. If connection "
-"fails, be sure to check the correct configuration in ldap.conf "
-"(TLS_CACERTDIR and TLS_REQCERT fields)."
+"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 "
+"TLS_REQCERT fields)."
 msgstr ""
-"Activar las conexiones seguras SSL/TLS con el servidor LDAP. Si la conexión "
+"Activar las conexiones seguras TLS con el servidor LDAP. Si la conexión "
 "falla compruebe que la configuración en ldap.conf es correcta (especialmente "
 "los campos TLS_CACERTDIR y TLS_REQCERT)."
 
@@ -3117,12 +3225,12 @@ msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "La contraseña a usar al conectar como el usuario \"DN de enlace\"."
 
 #: src/editldap.c:727 src/prefs_account.c:1444 src/prefs_account.c:2073
-#: src/prefs_account.c:3001 src/prefs_account.c:3029 src/prefs_account.c:3230
-#: src/prefs_proxy.c:142
+#: src/prefs_account.c:3002 src/prefs_account.c:3030 src/prefs_account.c:3231
+#: src/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Mostrar contraseña"
 
-#: src/editldap.c:734
+#: src/editldap.c:734 src/plugins/spamassassin/spamassassin_gtk.c:389
 msgid "Timeout (secs)"
 msgstr "Tiempo límite (seg.)"
 
@@ -3141,11 +3249,11 @@ msgstr ""
 "El número máximo de entradas que deberían retornarse en los resultados de la "
 "búsqueda."
 
-#: src/editldap.c:776 src/prefs_account.c:4036
+#: src/editldap.c:776 src/prefs_account.c:4044
 msgid "Basic"
 msgstr "Básicas"
 
-#: src/editldap.c:778 src/gtk/quicksearch.c:877
+#: src/editldap.c:778 src/gtk/quicksearch.c:878
 msgid "Extended"
 msgstr "Extendido"
 
@@ -3153,48 +3261,60 @@ msgstr "Extendido"
 msgid "Add New LDAP Server"
 msgstr "Añadir nuevo servidor LDAP"
 
-#: src/edittags.c:191 src/gtk/quicksearch.c:865
-#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:640
+#: src/edittags.c:135
+msgctxt "Window title"
+msgid "Tags configuration"
+msgstr "Configuración de etiquetas"
+
+#: src/edittags.c:140
+msgctxt "Window title"
+msgid "Modify tags"
+msgstr "Modificar etiquetas"
+
+#: src/edittags.c:203 src/gtk/quicksearch.c:866
+#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:642
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: src/edittags.c:220
+#: src/edittags.c:232
 msgid "Delete tag"
 msgstr "Borrar etiqueta"
 
-#: src/edittags.c:221
+#: src/edittags.c:233
 msgid "Do you really want to delete this tag?"
 msgstr "¿Quiere borrar realmente esta etiqueta?"
 
-#: src/edittags.c:256
+#: src/edittags.c:268
 msgid "Delete all tags"
 msgstr "Borrar todas las etiquetas"
 
-#: src/edittags.c:257
+#: src/edittags.c:269
 msgid "Do you really want to delete all tags?"
 msgstr "¿Quiere borrar realmente todas las etiquetas?"
 
-#: src/edittags.c:427
+#: src/edittags.c:441
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr "El nombre de etiqueta introducido está reservado, elija uno distinto."
 
-#: src/edittags.c:469
-msgid "Tag is not set."
-msgstr "Etiqueta no establecida."
-
-#: src/edittags.c:547
-msgctxt "Dialog title"
-msgid "Apply tags"
-msgstr "Aplicar etiquetas"
-
-#: src/edittags.c:564
+#: src/edittags.c:572
 msgid "New tag:"
 msgstr "Nueva etiqueta:"
 
-#: src/edittags.c:597
-msgid "Please select tags to apply/remove. Changes are immediate."
+#: src/edittags.c:584
+msgid "Add the new tag"
+msgstr "Añadir la nueva etiqueta"
+
+#: src/edittags.c:589
+msgid "Delete the selected tag"
+msgstr "Borrar la etiqueta seleccionada"
+
+#: src/edittags.c:608
+msgid ""
+"Choose the tag(s) for the message(s).\n"
+"Changes are immediately applied."
 msgstr ""
-"Seleccione las etiquetas a aplicar/eliminar. Los cambios son inmediatos."
+"Seleccione la(s) etiqueta(s) para los mensajes.\n"
+"Los cambios se aplicarán inmediatamente."
 
 #: src/editvcard.c:94
 msgid "File does not appear to be vCard format."
@@ -3249,7 +3369,7 @@ msgstr ""
 msgid "Create directory"
 msgstr "Crear directorio"
 
-#: src/exphtmldlg.c:189
+#: src/exphtmldlg.c:190
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
@@ -3258,111 +3378,121 @@ msgstr ""
 "No pude crear el directorio de salida para el fichero HTML:\n"
 "%s"
 
-#: src/exphtmldlg.c:191 src/expldifdlg.c:201
+#: src/exphtmldlg.c:192 src/expldifdlg.c:201
 msgid "Failed to Create Directory"
 msgstr "Fallo al crear el directorio"
 
-#: src/exphtmldlg.c:233
+#: src/exphtmldlg.c:235
 msgid "Error creating HTML file"
 msgstr "Error creando el fichero HTML"
 
-#: src/exphtmldlg.c:319
+#: src/exphtmldlg.c:324
 msgid "Select HTML output file"
 msgstr "Seleccionar el fichero HTML de salida"
 
-#: src/exphtmldlg.c:378
+#: src/exphtmldlg.c:383
 msgid "HTML Output File"
 msgstr "Fichero HTML de salida"
 
-#: src/exphtmldlg.c:387 src/expldifdlg.c:404 src/export.c:167 src/import.c:166
-#: src/importldif.c:565
+#: src/exphtmldlg.c:392 src/expldifdlg.c:406 src/export.c:167 src/import.c:166
+#: src/importldif.c:567
 msgid "B_rowse"
 msgstr "Explo_rar"
 
-#: src/exphtmldlg.c:436 src/plugins/fancy/fancy_prefs.c:302
+#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:302
 msgid "Stylesheet"
 msgstr "Hoja de estilos"
 
-#: src/exphtmldlg.c:443 src/gtk/colorlabel.c:368 src/gtk/colorlabel.c:494
-#: src/gtk/gtkaspell.c:1572 src/gtk/gtkaspell.c:2207 src/gtk/menu.c:126
-#: src/mainwindow.c:1175 src/plugins/archive/archiver_prefs.c:313
+#: src/exphtmldlg.c:448 src/gtk/colorlabel.c:369 src/gtk/colorlabel.c:495
+#: src/gtk/gtkaspell.c:1567 src/gtk/gtkaspell.c:2202 src/gtk/menu.c:126
+#: src/mainwindow.c:1178 src/plugins/archive/archiver_prefs.c:312
 #: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1111
-#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1420 src/summaryview.c:6246
+#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6267
 msgid "None"
 msgstr "Ninguno"
 
-#: src/exphtmldlg.c:444 src/prefs_folder_item.c:531
-#: src/prefs_folder_item.c:1178 src/prefs_folder_item.c:1208
+#: src/exphtmldlg.c:449 src/prefs_folder_item.c:532
+#: src/prefs_folder_item.c:1240 src/prefs_folder_item.c:1271
 #: src/prefs_other.c:128 src/prefs_other.c:416
 msgid "Default"
 msgstr "Por omisión"
 
-#: src/exphtmldlg.c:445 src/plugins/pgpcore/select-keys.c:240
-#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:168
+#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:244
+#: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Completo"
 
-#: src/exphtmldlg.c:446
+#: src/exphtmldlg.c:451
 msgid "Custom"
 msgstr "Adecuado"
 
-#: src/exphtmldlg.c:447
+#: src/exphtmldlg.c:452
 msgid "Custom-2"
 msgstr "Adecuado-2"
 
-#: src/exphtmldlg.c:448
+#: src/exphtmldlg.c:453
 msgid "Custom-3"
 msgstr "Adecuado-3"
 
-#: src/exphtmldlg.c:449
+#: src/exphtmldlg.c:454
 msgid "Custom-4"
 msgstr "Adecuado-4"
 
-#: src/exphtmldlg.c:454
+#: src/exphtmldlg.c:459
 msgid "Full Name Format"
 msgstr "Formato de nombre completo"
 
-#: src/exphtmldlg.c:461
+#: src/exphtmldlg.c:466
 msgid "First Name, Last Name"
 msgstr "Nombre, Apellidos"
 
-#: src/exphtmldlg.c:462
+#: src/exphtmldlg.c:467
 msgid "Last Name, First Name"
 msgstr "Apellidos, Nombre"
 
-#: src/exphtmldlg.c:467
+#: src/exphtmldlg.c:472
 msgid "Color Banding"
 msgstr "Bandas de color"
 
-#: src/exphtmldlg.c:471
+#: src/exphtmldlg.c:476
 msgid "Format Email Links"
 msgstr "Formatear enlaces de correo electrónico"
 
-#: src/exphtmldlg.c:475
+#: src/exphtmldlg.c:480
 msgid "Format User Attributes"
 msgstr "Formatear atributos del usuario"
 
-#: src/exphtmldlg.c:517 src/expldifdlg.c:593 src/importldif.c:837
+#: src/exphtmldlg.c:522 src/expldifdlg.c:595 src/importldif.c:839
 msgid "Address Book:"
 msgstr "Agenda de direcciones :"
 
-#: src/exphtmldlg.c:526 src/expldifdlg.c:602 src/importldif.c:846
+#: src/exphtmldlg.c:531 src/expldifdlg.c:604 src/importldif.c:848
 msgid "File Name:"
 msgstr "Nombre de fichero :"
 
-#: src/exphtmldlg.c:535
+#: src/exphtmldlg.c:540
 msgid "Open with Web Browser"
 msgstr "Abrir con el navegador web"
 
-#: src/exphtmldlg.c:567
+#: src/exphtmldlg.c:572
 msgid "Export Address Book to HTML File"
 msgstr "Exportar agenda a un fichero HTML"
 
-#: src/exphtmldlg.c:633 src/expldifdlg.c:701 src/importldif.c:963
+#: src/exphtmldlg.c:606 src/expldifdlg.c:671 src/importldif.c:923
+#: src/message_search.c:228 src/summary_search.c:485 src/wizard.c:1830
+msgid "_Previous"
+msgstr "A_nterior"
+
+#: src/exphtmldlg.c:607 src/expldifdlg.c:672 src/importldif.c:924
+#: src/message_search.c:233 src/summary_search.c:490 src/wizard.c:1831
+msgid "_Next"
+msgstr "_Siguiente"
+
+#: src/exphtmldlg.c:638 src/expldifdlg.c:703 src/importldif.c:965
 msgid "File Info"
 msgstr "Información de fichero"
 
-#: src/exphtmldlg.c:634
+#: src/exphtmldlg.c:639
 msgid "Format"
 msgstr "Formato"
 
@@ -3413,15 +3543,15 @@ msgstr ""
 msgid "Error creating LDIF file"
 msgstr "Error creando el fichero LDIF"
 
-#: src/expldifdlg.c:336
+#: src/expldifdlg.c:338
 msgid "Select LDIF output file"
 msgstr "Seleccionar el fichero LDIF de salida"
 
-#: src/expldifdlg.c:395
+#: src/expldifdlg.c:397
 msgid "LDIF Output File"
 msgstr "Fichero LDIF de salida"
 
-#: src/expldifdlg.c:425
+#: src/expldifdlg.c:427
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"
@@ -3431,7 +3561,7 @@ msgstr ""
 "estilo de:\n"
 "  uid=102376,ou=gente,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:431
+#: src/expldifdlg.c:433
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
@@ -3441,7 +3571,7 @@ msgstr ""
 "estilo de:\n"
 "  cn=Juan Nadie,ou=gente,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:437
+#: src/expldifdlg.c:439
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
@@ -3451,11 +3581,11 @@ msgstr ""
 "un DN del estilo de:\n"
 "  mail=juan.nadie at dominio.com,ou=gente,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:481
+#: src/expldifdlg.c:483
 msgid "Suffix"
 msgstr "Sufijo"
 
-#: src/expldifdlg.c:491
+#: src/expldifdlg.c:493
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"
@@ -3469,15 +3599,15 @@ msgstr ""
 "  ou=gente,dc=nombredominio,dc=com\n"
 "  o=Nombre Organizacion,c=Pais\n"
 
-#: src/expldifdlg.c:498
+#: src/expldifdlg.c:500
 msgid "Relative DN"
 msgstr "DN relativo"
 
-#: src/expldifdlg.c:505
+#: src/expldifdlg.c:507
 msgid "Unique ID"
 msgstr "ID único"
 
-#: src/expldifdlg.c:512
+#: src/expldifdlg.c:514
 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 "
@@ -3492,11 +3622,11 @@ msgstr ""
 "seleccione una de las opciones de RDN disponibles para usarla en la creación "
 "del DN."
 
-#: src/expldifdlg.c:529
+#: src/expldifdlg.c:531
 msgid "Use DN attribute if present in data"
 msgstr "Usar el atributo DN si esta presente en los datos"
 
-#: src/expldifdlg.c:533
+#: src/expldifdlg.c:535
 msgid ""
 "The addressbook may contain entries that were previously imported from an "
 "LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
@@ -3509,11 +3639,11 @@ msgstr ""
 "exportado. Se usará el RDN seleccionado arriba si no se encuentra el "
 "atributo DN."
 
-#: src/expldifdlg.c:542
+#: src/expldifdlg.c:544
 msgid "Exclude record if no Email Address"
 msgstr "Excluir registros sin dirección de correo"
 
-#: src/expldifdlg.c:546
+#: src/expldifdlg.c:548
 msgid ""
 "An addressbook may contain entries without Email Addresses. Check this "
 "option to ignore these records."
@@ -3521,15 +3651,15 @@ msgstr ""
 "Una agenda puede contener entradas sin direcciones de correo electrónico. "
 "Marque esta opción para ignorar tales registros."
 
-#: src/expldifdlg.c:635
+#: src/expldifdlg.c:637
 msgid "Export Address Book to LDIF File"
 msgstr "Exportar agenda a un fichero LDIF"
 
-#: src/expldifdlg.c:702
+#: src/expldifdlg.c:704
 msgid "Distinguished Name"
 msgstr "Nombre distinguido"
 
-#: src/export.c:112 src/summaryview.c:8456
+#: src/export.c:112 src/summaryview.c:8485
 msgid "Export to mbox file"
 msgstr "Exportar a fichero mbox"
 
@@ -3565,32 +3695,32 @@ msgstr "Seleccione fichero de exportación"
 msgid "Select folder to export"
 msgstr "Seleccionar la carpeta a exportar"
 
-#: src/exporthtml.c:768
+#: src/exporthtml.c:764
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: src/exporthtml.c:772 src/importldif.c:964
+#: src/exporthtml.c:768 src/importldif.c:966
 #: src/plugins/archive/archiver_gtk.c:772
 msgid "Attributes"
 msgstr "Atributos"
 
-#: src/exporthtml.c:975
+#: src/exporthtml.c:971
 msgid "Claws Mail Address Book"
 msgstr "Agenda de direcciones de Claws Mail"
 
-#: src/exporthtml.c:1070 src/exportldif.c:607
+#: src/exporthtml.c:1066 src/exportldif.c:607
 msgid "Name already exists but is not a directory."
 msgstr "El nombre ya existe pero no es un directorio."
 
-#: src/exporthtml.c:1073 src/exportldif.c:610
+#: src/exporthtml.c:1069 src/exportldif.c:610
 msgid "No permissions to create directory."
 msgstr "No tiene permisos para crear el directorio."
 
-#: src/exporthtml.c:1076 src/exportldif.c:613
+#: src/exporthtml.c:1072 src/exportldif.c:613
 msgid "Name is too long."
 msgstr "El nombre es demasiado largo."
 
-#: src/exporthtml.c:1079 src/exportldif.c:616
+#: src/exporthtml.c:1075 src/exportldif.c:616
 msgid "Not specified."
 msgstr "Sin especificar."
 
@@ -3613,11 +3743,11 @@ msgstr ""
 "¡El fichero «%s» está vacío o corrompido! ¿Desea usar la copia de respaldo "
 "de «%s»?"
 
-#: src/filtering.c:603 src/filtering.c:678 src/filtering.c:707
+#: src/filtering.c:606 src/filtering.c:681 src/filtering.c:710
 msgid "rule is not account-based\n"
 msgstr "la regla no está basada en una cuenta\n"
 
-#: src/filtering.c:607
+#: src/filtering.c:610
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
@@ -3626,13 +3756,13 @@ msgstr ""
 "la regla está basada en una cuenta [id=%d, nombre=«%s»], que coincide con la "
 "cuenta usada actualmente para recuperar mensajes\n"
 
-#: src/filtering.c:609 src/filtering.c:626 src/filtering.c:627
-#: src/filtering.c:651 src/filtering.c:669 src/filtering.c:696
-#: src/filtering.c:697 src/filtering.c:714 src/filtering.c:715
+#: src/filtering.c:612 src/filtering.c:629 src/filtering.c:630
+#: src/filtering.c:654 src/filtering.c:672 src/filtering.c:699
+#: src/filtering.c:700 src/filtering.c:717 src/filtering.c:718
 msgid "NON_EXISTENT"
 msgstr "NO_EXISTENTE"
 
-#: src/filtering.c:617
+#: src/filtering.c:620
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
@@ -3640,7 +3770,7 @@ msgstr ""
 "la regla está basada en una cuenta, que no coincide con la cuenta usada "
 "actualmente para recuperar mensajes\n"
 
-#: src/filtering.c:624
+#: src/filtering.c:627
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
@@ -3649,14 +3779,14 @@ msgstr ""
 "la regla está basada en una cuenta [id=%d, nombre=«%s»], que no coincide con "
 "la cuenta usada actualmente para recuperar mensajes [id=%d, nombre=«%s»]\n"
 
-#: src/filtering.c:643
+#: src/filtering.c:646
 msgid ""
 "rule is not account-based, all rules are applied on user request anyway\n"
 msgstr ""
 "la regla no está basada en una cuenta, todas las reglas se aplican a "
 "petición del usuario de todos modos\n"
 
-#: src/filtering.c:649
+#: src/filtering.c:652
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
@@ -3665,18 +3795,18 @@ msgstr ""
 "la regla está basada en una cuenta [id=%d, nombre=«%s»], pero todas las "
 "reglase se aplican a petición del usuario\n"
 
-#: src/filtering.c:667
+#: src/filtering.c:670
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
 "la regla está basada en una cuenta [id=%d, nombre=«%s»], omitida a petición "
 "del usuario\n"
 
-#: src/filtering.c:672
+#: src/filtering.c:675
 msgid "rule is account-based, skipped on user request\n"
 msgstr "la regla está basada en una cuenta, omitida a petición del usuario\n"
 
-#: src/filtering.c:694
+#: src/filtering.c:697
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching current account [id="
@@ -3685,12 +3815,12 @@ msgstr ""
 "la regla está basada en una cuenta [id=%d, nombre=«%s»], que no coincide con "
 "la cuenta actual [id=%d, nombre=«%s»]\n"
 
-#: src/filtering.c:700
+#: src/filtering.c:703
 msgid "rule is account-based, not matching current account\n"
 msgstr ""
 "la regla está basada en una cuenta, que no coincide con la cuenta actual\n"
 
-#: src/filtering.c:712
+#: src/filtering.c:715
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], current account [id=%d, "
@@ -3699,65 +3829,65 @@ msgstr ""
 "la regla está basada en una cuenta [id=%d, nombre=«%s»], cuenta actual [id="
 "%d, nombre=«%s»]\n"
 
-#: src/filtering.c:752
+#: src/filtering.c:755
 #, c-format
 msgid "applying action [ %s ]\n"
 msgstr "aplicando acción [ %s ]\n"
 
-#: src/filtering.c:757
+#: src/filtering.c:760
 msgid "action could not apply\n"
 msgstr "la acción no se pudo aplicar\n"
 
-#: src/filtering.c:759
+#: src/filtering.c:762
 #, c-format
 msgid "no further processing after action [ %s ]\n"
 msgstr "no se sigue procesando después de la acción [ %s ]\n"
 
-#: src/filtering.c:820
+#: src/filtering.c:823
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "procesando regla «%s» [ %s ]\n"
 
-#: src/filtering.c:824
+#: src/filtering.c:827
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "procesando regla <sinnombre> [ %s ]\n"
 
-#: src/filtering.c:842
+#: src/filtering.c:845
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "desactivada regla «%s» [ %s ]\n"
 
-#: src/filtering.c:846
+#: src/filtering.c:849
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "desactivada regla <sinnombre> [ %s ]\n"
 
-#: src/filtering.c:884
+#: src/filtering.c:887
 msgid "undetermined"
 msgstr "indeterminada"
 
-#: src/filtering.c:888
+#: src/filtering.c:891
 msgid "incorporation"
 msgstr "incorporación"
 
-#: src/filtering.c:892
+#: src/filtering.c:895
 msgid "manually"
 msgstr "manualmente"
 
-#: src/filtering.c:896
+#: src/filtering.c:899
 msgid "folder processing"
 msgstr "procesamiento de la carpeta"
 
-#: src/filtering.c:900
+#: src/filtering.c:903
 msgid "pre-processing"
 msgstr "pre-procesamiento"
 
-#: src/filtering.c:904
+#: src/filtering.c:907
 msgid "post-processing"
 msgstr "post-procesamiento"
 
-#: src/filtering.c:919
+#: src/filtering.c:922
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3774,11 +3904,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:921 src/filtering.c:930
+#: src/filtering.c:924 src/filtering.c:933
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:928
+#: src/filtering.c:931
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3787,177 +3917,173 @@ msgstr ""
 "filtrando mensaje (%s%s%s)\n"
 "%sfichero de mensaje: %s\n"
 
-#: src/folder.c:1595 src/prefs_folder_item.c:318
+#: src/folder.c:1596 src/prefs_folder_item.c:324
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/folder.c:1599
+#: src/folder.c:1600
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/folder.c:1603 src/plugins/attachwarner/attachwarner.c:218
-#: src/prefs_folder_item.c:321
+#: src/folder.c:1604 src/plugins/attachwarner/attachwarner.c:219
+#: src/plugins/keyword_warner/keyword_warner.c:197 src/prefs_folder_item.c:327
 msgid "Queue"
 msgstr "Cola"
 
-#: src/folder.c:1607 src/prefs_folder_item.c:322
+#: src/folder.c:1608 src/prefs_folder_item.c:328
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/folder.c:1611 src/prefs_folder_item.c:320
+#: src/folder.c:1612 src/prefs_folder_item.c:326
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/folder.c:2042
+#: src/folder.c:2043
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Procesando (%s)...\n"
 
-#: src/folder.c:3294
+#: src/folder.c:3295
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copiando %s a %s...\n"
 
-#: src/folder.c:3294
+#: src/folder.c:3295
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Moviendo %s a %s...\n"
 
-#: src/folder.c:3604
+#: src/folder.c:3613
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Actualizando caché para %s..."
 
-#: src/folder.c:4466
+#: src/folder.c:4478
 msgid "Processing messages..."
 msgstr "Procesando mensajes..."
 
-#: src/folder.c:4601
+#: src/folder.c:4613
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Sincronizando %s para uso sin conexión...\n"
 
-#: src/folder.c:4860
+#: src/folder.c:4872
 msgid "A folder name cannot begin or end with a dot."
 msgstr "El nombre de una carpeta no puede empezar o terminar con un punto."
 
-#: src/folder.c:4864
+#: src/folder.c:4876
 msgid "A folder name can not end with a space."
 msgstr "El nombre de una carpeta no puede terminar con un espacio."
 
-#: src/foldersel.c:251
+#: src/foldersel.c:252
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:349
-msgid "_New"
-msgstr "_Nueva"
-
-#: src/foldersel.c:573 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:94
+#: src/foldersel.c:572 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:131
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:574 src/imap_gtk.c:198 src/mh_gtk.c:147
+#: src/foldersel.c:573 src/imap_gtk.c:198 src/mh_gtk.c:147
 msgid "Inherit properties and processing rules from parent folder"
 msgstr "Heredar las propiedades y reglas de procesamiento de la carpeta padre"
 
-#: src/foldersel.c:584 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
-#: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
-#: src/plugins/mailmbox/plugin_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:431
-#: src/plugins/rssyl/rssyl_cb_menu.c:202
-#: src/plugins/vcalendar/vcal_folder.c:2068
+#: src/foldersel.c:583 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:302
+#: src/plugins/mailmbox/plugin_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:433
+#: src/plugins/rssyl/rssyl_cb_menu.c:240
+#: src/plugins/vcalendar/vcal_folder.c:2104
 #, 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:599 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
-#: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:270
-#: src/plugins/mailmbox/plugin_gtk.c:443 src/plugins/rssyl/rssyl_cb_menu.c:214
-#: src/plugins/vcalendar/vcal_folder.c:2075
+#: src/foldersel.c:598 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/mh_gtk.c:273 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:270
+#: src/plugins/mailmbox/plugin_gtk.c:445 src/plugins/rssyl/rssyl_cb_menu.c:252
+#: src/plugins/vcalendar/vcal_folder.c:2111
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La carpeta «%s» ya existe."
 
-#: src/foldersel.c:606 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:605 src/imap_gtk.c:230 src/mh_gtk.c:173
 #: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:125
+#: src/plugins/rssyl/rssyl_cb_menu.c:162
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "No se puede crear la carpeta «%s»."
 
-#: src/folderview.c:247
+#: src/folderview.c:248
 msgid "Mark all re_ad"
 msgstr "Marcar todos como l_eídos"
 
-#: src/folderview.c:248
+#: src/folderview.c:249
 msgid "Mark all u_nread"
 msgstr "Marcar todos como _no leídos"
 
-#: src/folderview.c:249
+#: src/folderview.c:250
 msgid "Mark all read recursi_vely"
 msgstr "Marcar todos como leídos recurs_ivamente"
 
-#: src/folderview.c:250
+#: src/folderview.c:251
 msgid "Mark all unread recursi_vely"
 msgstr "Marcar todos como no leídos recursi_vamente"
 
-#: src/folderview.c:252
+#: src/folderview.c:253
 msgid "R_un processing rules"
 msgstr "Ejec_utar reglas de procesamiento"
 
-#: src/folderview.c:253 src/mainwindow.c:556
+#: src/folderview.c:254 src/mainwindow.c:557
 msgid "_Search folder..."
 msgstr "_Buscar en carpeta..."
 
-#: src/folderview.c:255
+#: src/folderview.c:256
 msgid "Process_ing..."
 msgstr "Pr_ocesamiento..."
 
-#: src/folderview.c:256
+#: src/folderview.c:257
 msgid "Empty _trash..."
 msgstr "_Vaciar papelera..."
 
-#: src/folderview.c:257
+#: src/folderview.c:258
 msgid "Send _queue..."
 msgstr "Enviar _cola..."
 
-#: src/folderview.c:264
+#: src/folderview.c:265
 msgid "Set Displayed columns"
 msgstr "Establecer columnas visibles"
 
-#: src/folderview.c:403 src/folderview.c:450
+#: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6518
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6535
 msgid "New"
 msgstr "Nuevos"
 
-#: src/folderview.c:404 src/folderview.c:451
+#: src/folderview.c:405 src/folderview.c:452
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6520
-#: src/toolbar.c:512
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6537
+#: src/toolbar.c:522
 msgid "Unread"
 msgstr "No leídos"
 
-#: src/folderview.c:405 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:406 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:453 src/summaryview.c:468
+#: src/folderview.c:454 src/summaryview.c:469
 msgid "#"
 msgstr "N.º"
 
-#: src/folderview.c:781
+#: src/folderview.c:785
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 
-#: src/folderview.c:866 src/summaryview.c:4262
+#: src/folderview.c:870 src/summaryview.c:4272
 msgid "Mark all as read"
 msgstr "Marcar todo como leído"
 
-#: src/folderview.c:867
+#: src/folderview.c:871
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -3965,15 +4091,15 @@ msgstr ""
 "¿Desea marcar todos los correos en esta carpeta y sus subcarpetas como "
 "leídos?"
 
-#: src/folderview.c:869 src/summaryview.c:4263
+#: src/folderview.c:873 src/summaryview.c:4273
 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:872 src/summaryview.c:4308
+#: src/folderview.c:876 src/summaryview.c:4318
 msgid "Mark all as unread"
 msgstr "Marcar todo como no leído"
 
-#: src/folderview.c:873
+#: src/folderview.c:877
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "unread?"
@@ -3981,95 +4107,95 @@ msgstr ""
 "¿Desea marcar todos los correos en esta carpeta y sus subcarpetas como no "
 "leídos?"
 
-#: src/folderview.c:875 src/summaryview.c:4309
+#: src/folderview.c:879 src/summaryview.c:4319
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr ""
 "¿Quiere realmente marcar todos los correos en la carpeta como no leídos?"
 
-#: src/folderview.c:1065 src/imap.c:4686
+#: src/folderview.c:1075 src/imap.c:4693
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Revisando carpeta %s/%s..."
 
-#: src/folderview.c:1068 src/imap.c:4690 src/mainwindow.c:5223 src/setup.c:96
+#: src/folderview.c:1078 src/imap.c:4697 src/mainwindow.c:5270 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Revisando carpeta %s..."
 
-#: src/folderview.c:1099
+#: src/folderview.c:1109
 msgid "Rebuild folder tree"
 msgstr "Reconstruir árbol de carpetas"
 
-#: src/folderview.c:1100
+#: src/folderview.c:1110
 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:1110
+#: src/folderview.c:1120
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo árbol de carpetas..."
 
-#: src/folderview.c:1112
+#: src/folderview.c:1122
 msgid "Scanning folder tree..."
 msgstr "Explorando árbol de carpetas..."
 
-#: src/folderview.c:1202
+#: src/folderview.c:1212
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "No se puede explorar la carpeta %s\n"
 
-#: src/folderview.c:1256
+#: src/folderview.c:1266
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:2225
+#: src/folderview.c:2235
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Cerrando carpeta %s..."
 
-#: src/folderview.c:2320
+#: src/folderview.c:2337
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Abriendo carpeta %s..."
 
-#: src/folderview.c:2338
+#: src/folderview.c:2355
 msgid "Folder could not be opened."
 msgstr "No se puede abrir la carpeta."
 
-#: src/folderview.c:2478 src/mainwindow.c:2866 src/mainwindow.c:2871
+#: src/folderview.c:2495 src/mainwindow.c:2870 src/mainwindow.c:2875
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2479
+#: src/folderview.c:2496
 msgid "Delete all messages in trash?"
 msgstr "¿Borrar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2480
+#: src/folderview.c:2497
 msgid "_Empty trash"
 msgstr "_Vaciar papelera"
 
-#: src/folderview.c:2524 src/inc.c:1666 src/toolbar.c:3032
+#: src/folderview.c:2541 src/inc.c:1671 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "Notificación conexión"
 
-#: src/folderview.c:2525 src/toolbar.c:3033
+#: src/folderview.c:2542 src/toolbar.c:3087
 msgid "You're working offline. Override?"
 msgstr "Está trabajando sin conexión ¿Ignorar?"
 
-#: src/folderview.c:2536 src/toolbar.c:3052
+#: src/folderview.c:2553 src/toolbar.c:3106
 msgid "Send queued messages"
 msgstr "Enviar mensajes en la cola"
 
-#: src/folderview.c:2537 src/toolbar.c:3053
+#: src/folderview.c:2554 src/toolbar.c:3107
 msgid "Send all queued messages?"
 msgstr "¿Enviar todos los mensajes en la cola?"
 
-#: src/folderview.c:2546 src/toolbar.c:3072
+#: src/folderview.c:2563 src/toolbar.c:3126
 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocurrieron algunos errores enviando los mensajes en la cola."
 
-#: src/folderview.c:2549 src/main.c:2882 src/toolbar.c:3075
+#: src/folderview.c:2566 src/main.c:2922 src/toolbar.c:3129
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4078,138 +4204,142 @@ msgstr ""
 "Hubo algún error enviando los mensajes en la cola:\n"
 "%s"
 
-#: src/folderview.c:2624
+#: src/folderview.c:2647
 #, 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:2625
+#: src/folderview.c:2648
 #, 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:2627
+#: src/folderview.c:2650
 msgid "Copy folder"
 msgstr "Copiar carpeta"
 
-#: src/folderview.c:2627
+#: src/folderview.c:2650
 msgid "Move folder"
 msgstr "Mover carpeta"
 
-#: src/folderview.c:2638
+#: src/folderview.c:2661
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s a %s..."
 
-#: src/folderview.c:2638
+#: src/folderview.c:2661
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Moviendo %s a %s..."
 
-#: src/folderview.c:2672
+#: src/folderview.c:2695
 msgid "Source and destination are the same."
 msgstr "El destino y el origen son la misma."
 
-#: src/folderview.c:2675
+#: src/folderview.c:2698
 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:2676
+#: src/folderview.c:2699
 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:2679
+#: src/folderview.c:2702
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "No se pueden mover carpetas entre buzones distintos."
 
-#: src/folderview.c:2682
+#: src/folderview.c:2705
 msgid "Copy failed!"
 msgstr "¡Copiar falló!"
 
-#: src/folderview.c:2682
+#: src/folderview.c:2705
 msgid "Move failed!"
 msgstr "¡Mover falló!"
 
-#: src/folderview.c:2732
+#: src/folderview.c:2755
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuración de procesamiento para la carpeta «%s»"
 
-#: src/folderview.c:3155 src/summaryview.c:4717 src/summaryview.c:4823
+#: src/folderview.c:3180 src/summaryview.c:4727 src/summaryview.c:4833
 msgid "The destination folder can only be used to store subfolders."
 msgstr "La carpeta destino sólo puede usarse para almacenar subcarpetas."
 
-#: src/grouplistdialog.c:161
+#: src/grouplistdialog.c:158
 msgid "Newsgroup subscription"
 msgstr "Suscripción a grupos de noticias"
 
-#: src/grouplistdialog.c:178
+#: src/grouplistdialog.c:175
 msgid "Select newsgroups for subscription:"
 msgstr "Seleccione los grupos de noticias a suscribir:"
 
-#: src/grouplistdialog.c:192
+#: src/grouplistdialog.c:189
 msgid "Find groups:"
 msgstr "Buscar grupos:"
 
-#: src/grouplistdialog.c:201
+#: src/grouplistdialog.c:198
 msgid " Search "
 msgstr " Buscar "
 
-#: src/grouplistdialog.c:215
+#: src/grouplistdialog.c:212
 msgid "Newsgroup name"
 msgstr "Nombre de grupo"
 
-#: src/grouplistdialog.c:216 src/prefs_send.c:188
+#: src/grouplistdialog.c:213 src/prefs_send.c:188
 msgid "Messages"
 msgstr "Mensajes"
 
-#: src/grouplistdialog.c:217
+#: src/grouplistdialog.c:214
 msgid "Type"
 msgstr "Tipo"
 
-#: src/grouplistdialog.c:357
+#: src/grouplistdialog.c:236
+msgid "_Refresh"
+msgstr "_Refrescar"
+
+#: src/grouplistdialog.c:354
 msgid "moderated"
 msgstr "moderado"
 
-#: src/grouplistdialog.c:359
-msgid "readonly"
+#: src/grouplistdialog.c:356
+msgid "read-only"
 msgstr "solo lectura"
 
-#: src/grouplistdialog.c:361 src/plugins/att_remover/att_remover.c:303
+#: src/grouplistdialog.c:358 src/plugins/att_remover/att_remover.c:302
 #: src/plugins/vcalendar/vcal_manager.c:115
 #: src/plugins/vcalendar/vcal_manager.c:149
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/grouplistdialog.c:436
+#: src/grouplistdialog.c:433
 msgid "Can't retrieve newsgroup list."
 msgstr "No se puede obtener la lista de grupos."
 
-#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1877 src/summaryview.c:1669
+#: src/grouplistdialog.c:470 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
 msgid "Done."
 msgstr "Hecho."
 
-#: src/grouplistdialog.c:506
+#: src/grouplistdialog.c:503
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de noticias recibidos (%s leídos)"
 
-#: src/gtk/about.c:133
+#: src/gtk/about.c:134
 msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
 msgstr ""
 "Claws Mail es un cliente de correo ligero, rápido y altamente configurable."
 
-#: src/gtk/about.c:136
+#: src/gtk/about.c:137
 msgid "For further information visit the Claws Mail website:"
 msgstr "Para más información visite el sitio web de Claws Mail:"
 
-#: src/gtk/about.c:141
+#: src/gtk/about.c:142
 msgid ""
 "For support and discussion subscribe to the Claws Mail users' mailing list:"
 msgstr ""
 "Para soporte y discusión suscríbase a la lista de usuarios de Claws Mail:"
 
-#: src/gtk/about.c:147
+#: src/gtk/about.c:148
 msgid ""
 "Claws Mail is free software released under the GPL. If you wish to donate to "
 "the Claws Mail project you can do so at:"
@@ -4217,21 +4347,21 @@ msgstr ""
 "Claws Mail es software libre distribuido bajo licencia GPL. Si desea "
 "realizar alguna donación al proyecto Claws Mail puede hacerlo en:"
 
-#: src/gtk/about.c:163 src/gtk/about.c:857
+#: src/gtk/about.c:164 src/gtk/about.c:862
 msgid ""
-"Copyright (C) 1999-2021\n"
+"Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2021\n"
+"Copyright (C) 1999-2022\n"
 "El equipo de Claws Mail\n"
 "e Hiroyuki Yamamoto"
 
-#: src/gtk/about.c:168
+#: src/gtk/about.c:169
 msgid "System Information\n"
 msgstr "Información del sistema\n"
 
-#: src/gtk/about.c:174
+#: src/gtk/about.c:175
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4240,7 +4370,7 @@ msgstr ""
 "Localización: %s (caracteres: %s)\n"
 "Sistema operativo: %s %s (%s)"
 
-#: src/gtk/about.c:183
+#: src/gtk/about.c:185
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4249,7 +4379,7 @@ msgstr ""
 "Localización: %s (caracteres: %s)\n"
 "Sistema operativo: %s"
 
-#: src/gtk/about.c:192
+#: src/gtk/about.c:195
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4258,96 +4388,96 @@ msgstr ""
 "Localización: %s (caracteres: %s)\n"
 "Sistema operativo: desconocido"
 
-#: src/gtk/about.c:249 src/prefs_themes.c:842 src/wizard.c:529
+#: src/gtk/about.c:254 src/prefs_themes.c:940 src/wizard.c:528
 msgid "The Claws Mail Team"
 msgstr "El equipo de Claws Mail"
 
-#: src/gtk/about.c:268
+#: src/gtk/about.c:273
 msgid "Previous team members"
 msgstr "Miembros anteriores del equipo"
 
-#: src/gtk/about.c:287
+#: src/gtk/about.c:292
 msgid "The translation team"
 msgstr "El equipo de traducción"
 
-#: src/gtk/about.c:306
+#: src/gtk/about.c:311
 msgid "Documentation team"
 msgstr "El equipo de documentación"
 
-#: src/gtk/about.c:324
+#: src/gtk/about.c:329
 msgid "Logo"
 msgstr "Logotipo"
 
-#: src/gtk/about.c:343
+#: src/gtk/about.c:348
 msgid "Icons"
 msgstr "Iconos"
 
-#: src/gtk/about.c:362
+#: src/gtk/about.c:367
 msgid "Contributors"
 msgstr "Contribuciones"
 
-#: src/gtk/about.c:411
+#: src/gtk/about.c:416
 msgid "Compiled-in Features"
 msgstr "Características incluidas al compilar"
 
-#: src/gtk/about.c:428
+#: src/gtk/about.c:433
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr "Añade soporte para la cabecera X-Face\n"
 
-#: src/gtk/about.c:438
+#: src/gtk/about.c:443
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr "Añade soporte para la comprobación ortográfica\n"
 
-#: src/gtk/about.c:448
+#: src/gtk/about.c:453
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
 msgstr "Añade soporte para conexiones cifradas con los servidores\n"
 
-#: src/gtk/about.c:458
+#: src/gtk/about.c:463
 msgctxt "IPv6"
 msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
 msgstr ""
 "Añade soporte para direcciones IPv6, el nuevo protocolo de direcciones de "
 "Internet\n"
 
-#: src/gtk/about.c:469
+#: src/gtk/about.c:474
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr "Permite conversiones entre diferentes conjuntos de caracteres\n"
 
-#: src/gtk/about.c:479
+#: src/gtk/about.c:484
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "Añade soporte para agendas de direcciones de PalmOS\n"
 
-#: src/gtk/about.c:489
+#: src/gtk/about.c:494
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "Añade soporte para agendas de direcciones compartidas con LDAP\n"
 
-#: src/gtk/about.c:499
+#: src/gtk/about.c:504
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "Añade soporte para servidores IMAP y NNTP\n"
 
-#: src/gtk/about.c:509
+#: src/gtk/about.c:514
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "Añade soporte para el manejo de sesión\n"
 
-#: src/gtk/about.c:519
+#: src/gtk/about.c:524
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "Añade soporte para detectar los cambios de conexión de red\n"
 
-#: src/gtk/about.c:529
+#: src/gtk/about.c:534
 msgctxt "librSVG"
 msgid "adds support for SVG themes\n"
 msgstr "Añade soporte para temas en formato SVG\n"
 
-#: src/gtk/about.c:562
+#: src/gtk/about.c:567
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -4358,7 +4488,7 @@ msgstr ""
 "Foundation; tanto en versión 3, como (opcionalmente) cualquier versión "
 "posterior."
 
-#: src/gtk/about.c:569
+#: src/gtk/about.c:574
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4370,7 +4500,7 @@ msgstr ""
 "ADECUACIÓN PARA ALGÚN PROPÓSITO PARTICULAR. Véase la GNU General Public "
 "License para más detalles."
 
-#: src/gtk/about.c:587
+#: src/gtk/about.c:592
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4378,150 +4508,158 @@ 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:722 src/main.c:2706
+#: src/gtk/about.c:727 src/main.c:2746
 msgid "Session statistics\n"
 msgstr "Estadísticas de sesión\n"
 
-#: src/gtk/about.c:732 src/gtk/about.c:735 src/main.c:2716 src/main.c:2719
+#: src/gtk/about.c:737 src/gtk/about.c:740 src/main.c:2756 src/main.c:2759
 #, c-format
 msgid "Started: %s\n"
 msgstr "Iniciado: %s\n"
 
-#: src/gtk/about.c:742 src/main.c:2725
+#: src/gtk/about.c:747 src/main.c:2765
 msgid "Incoming traffic\n"
 msgstr "Tráfico entrante\n"
 
-#: src/gtk/about.c:745 src/main.c:2728
+#: src/gtk/about.c:750 src/main.c:2768
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Mensajes recibidos: %d\n"
 
-#: src/gtk/about.c:752 src/main.c:2734
+#: src/gtk/about.c:757 src/main.c:2774
 msgid "Outgoing traffic\n"
 msgstr "Tráfico saliente\n"
 
-#: src/gtk/about.c:755 src/main.c:2737
+#: src/gtk/about.c:760 src/main.c:2777
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Mensajes nuevos/redirigidos: %d\n"
 
-#: src/gtk/about.c:760 src/main.c:2741
+#: src/gtk/about.c:765 src/main.c:2781
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Mensajes respondidos: %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2745
+#: src/gtk/about.c:770 src/main.c:2785
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Mensajes reenviados: %d\n"
 
-#: src/gtk/about.c:770 src/main.c:2749
+#: src/gtk/about.c:775 src/main.c:2789
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total mensajes salientes: %d\n"
 
-#: src/gtk/about.c:797
+#: src/gtk/about.c:802
 msgid "About Claws Mail"
 msgstr "Acerca de Claws Mail"
 
-#: src/gtk/about.c:872
+#: src/gtk/about.c:877
 msgid "_Info"
 msgstr "_Información"
 
-#: src/gtk/about.c:878
+#: src/gtk/about.c:883
 msgid "_Authors"
 msgstr "_Autores"
 
-#: src/gtk/about.c:884
+#: src/gtk/about.c:889
 msgid "_Features"
 msgstr "_Características"
 
-#: src/gtk/about.c:890
+#: src/gtk/about.c:895
 msgid "_License"
 msgstr "_Licencia"
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:903
 msgid "_Release Notes"
 msgstr "_Notas de la versión"
 
-#: src/gtk/about.c:904
+#: src/gtk/about.c:909
 msgid "_Statistics"
 msgstr "E_stadísticas"
 
-#: src/gtk/colorlabel.c:37 src/prefs_common.c:365
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
 msgid "Orange"
 msgstr "Naranja"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:369
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
 msgid "Red"
 msgstr "Rojo"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:373
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:377
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
 msgid "Sky blue"
 msgstr "Azul cielo"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:381
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
 msgid "Blue"
 msgstr "Azul"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:385
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
 msgid "Green"
 msgstr "Verde"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:389
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
 msgid "Brown"
 msgstr "Marrón"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:393
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
 msgid "Grey"
 msgstr "Gris"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:397
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
 msgid "Light brown"
 msgstr "Marrón claro"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:401
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
 msgid "Dark red"
 msgstr "Rojo oscuro"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:405
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
 msgid "Dark pink"
 msgstr "Rosa oscuro"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:409
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
 msgid "Steel blue"
 msgstr "Azul acero"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:413
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
 msgid "Gold"
 msgstr "Dorado"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:417
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
 msgid "Bright green"
 msgstr "Verde brillante"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:421
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/gtk/foldersort.c:229
+#: src/gtk/foldersort.c:230
 msgid "Set mailbox order"
 msgstr "Establecer orden de los buzones"
 
-#: src/gtk/foldersort.c:265
+#: src/gtk/foldersort.c:266
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
 "Mueva los buzones arriba o abajo para cambiar la posición en la lista de "
 "carpetas."
 
-#: src/gtk/foldersort.c:299
+#: src/gtk/foldersort.c:300
 msgid "Mailboxes"
 msgstr "Buzones"
 
+#: src/gtk/foldersort.c:316
+msgid "Move the selected mailbox up"
+msgstr "Mover arriba el buzón seleccionado"
+
+#: src/gtk/foldersort.c:322
+msgid "Move the selected mailbox down"
+msgstr "Mover abajo el buzón seleccionado"
+
 #: src/gtk/gtkaspell.c:341 src/gtk/gtkaspell.c:660
 msgid "No dictionary selected."
 msgstr "No seleccionó ningún diccionario"
@@ -4544,16 +4682,16 @@ msgstr "No se pudo inicializar el diccionario %s:"
 msgid "No misspelled word found."
 msgstr "No se encontraron faltas ortográficas."
 
-#: src/gtk/gtkaspell.c:1445
+#: src/gtk/gtkaspell.c:1443
 msgid "Replace unknown word"
 msgstr "Sustituir palabra desconocida"
 
-#: src/gtk/gtkaspell.c:1461
+#: src/gtk/gtkaspell.c:1459
 #, c-format
 msgid "Replace \"%s\" with: "
 msgstr "Sustituir «%s» con: "
 
-#: src/gtk/gtkaspell.c:1505
+#: src/gtk/gtkaspell.c:1504
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
@@ -4561,55 +4699,55 @@ msgstr ""
 "Si pulsa la tecla Control junto con el Retorno\n"
 "de carro se aprenderá del error.\n"
 
-#: src/gtk/gtkaspell.c:1806 src/gtk/gtkaspell.c:1943
+#: src/gtk/gtkaspell.c:1801 src/gtk/gtkaspell.c:1938
 msgid "More..."
 msgstr "Más..."
 
-#: src/gtk/gtkaspell.c:1862
+#: src/gtk/gtkaspell.c:1857
 #, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
 msgstr "«%s» desconocida en el diccionario «%s»"
 
-#: src/gtk/gtkaspell.c:1877
+#: src/gtk/gtkaspell.c:1872
 msgid "Accept in this session"
 msgstr "Aceptar para esta sesión"
 
-#: src/gtk/gtkaspell.c:1887
+#: src/gtk/gtkaspell.c:1882
 msgid "Add to personal dictionary"
 msgstr "Añadir al diccionario personal"
 
-#: src/gtk/gtkaspell.c:1897
+#: src/gtk/gtkaspell.c:1892
 msgid "Replace with..."
 msgstr "Sustituir por..."
 
-#: src/gtk/gtkaspell.c:1910
+#: src/gtk/gtkaspell.c:1905
 #, c-format
 msgid "Check with %s"
 msgstr " Comprobar con %s"
 
-#: src/gtk/gtkaspell.c:1932
+#: src/gtk/gtkaspell.c:1927
 msgid "(no suggestions)"
 msgstr "(no hay sugerencias)"
 
-#: src/gtk/gtkaspell.c:2006
+#: src/gtk/gtkaspell.c:2001
 #, c-format
 msgid "Dictionary: %s"
 msgstr "Diccionario: %s"
 
-#: src/gtk/gtkaspell.c:2020
+#: src/gtk/gtkaspell.c:2015
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Usar alternativo (%s)"
 
-#: src/gtk/gtkaspell.c:2031
+#: src/gtk/gtkaspell.c:2026
 msgid "Use both dictionaries"
 msgstr "Usar ambos diccionarios"
 
-#: src/gtk/gtkaspell.c:2047 src/prefs_spelling.c:143
+#: src/gtk/gtkaspell.c:2042 src/prefs_spelling.c:130
 msgid "Check while typing"
 msgstr "Comprobar mientras se escribe"
 
-#: src/gtk/gtkaspell.c:2129
+#: src/gtk/gtkaspell.c:2124
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
@@ -4618,7 +4756,7 @@ msgstr ""
 "El corrector no pudo cambiar de diccionario.\n"
 "%s"
 
-#: src/gtk/gtkaspell.c:2185
+#: src/gtk/gtkaspell.c:2180
 #, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
@@ -4627,94 +4765,26 @@ msgstr ""
 "El corrector ortográfico no pudo cambiar el diccionario alternativo.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:66 src/gtk/quicksearch.c:991 src/gtk/quicksearch.c:1020
-msgid "_Information"
-msgstr "_Información"
-
-#: src/gtk/gtkutils.c:67 src/mimeview.c:221
-msgid "_Open"
-msgstr "_Abrir"
-
-#: src/gtk/gtkutils.c:68
-msgid "_Properties"
-msgstr "_Propiedades"
-
-#: src/gtk/gtkutils.c:70 src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
-msgid "C_lear"
-msgstr "_Limpiar"
-
-#: src/gtk/gtkutils.c:72
-msgid "D_elete"
-msgstr "_Borrar"
-
-#: src/gtk/gtkutils.c:74
-msgid "Find and _Replace"
-msgstr "Buscar y _reemplazar"
-
-#: src/gtk/gtkutils.c:78
-msgid "_Bottom"
-msgstr "Al _fondo"
-
-#: src/gtk/gtkutils.c:79
-msgid "_Down"
-msgstr "A_bajo"
-
-#: src/gtk/gtkutils.c:80 src/wizard.c:1812
-msgid "_Next"
-msgstr "_Siguiente"
-
-#: src/gtk/gtkutils.c:81 src/wizard.c:1811
-msgid "_Previous"
-msgstr "A_nterior"
-
-#: src/gtk/gtkutils.c:82
-msgid "_Top"
-msgstr "En la _cima"
-
-#: src/gtk/gtkutils.c:83
-msgid "_Up"
-msgstr "_Arriba"
-
-#: src/gtk/gtkutils.c:84 src/mainwindow.c:681
-msgid "Help"
-msgstr "Ayuda"
-
-#: src/gtk/gtkutils.c:85
-msgid "_Add"
-msgstr "_Añadir"
-
-#: src/gtk/gtkutils.c:87
-msgid "_Stop"
-msgstr "_Detener"
-
-#: src/gtk/gtkutils.c:88
-msgid "_Execute"
-msgstr "_Ejecutar"
-
-#: src/gtk/gtkutils.c:89
-msgid "_Refresh"
-msgstr "_Refrescar"
-
-#: src/gtk/gtkutils.c:1882
+#: src/gtk/gtkutils.c:1743
 msgid "Failed: no service record found."
 msgstr "Falló: no hay registro del servicio."
 
-#: src/gtk/gtkutils.c:1885
+#: src/gtk/gtkutils.c:1746
 msgid "Failed: network error."
 msgstr "Falló: error de la red."
 
-#: src/gtk/gtkutils.c:1888
+#: src/gtk/gtkutils.c:1749
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Falló: error desconocido (%d)."
 
-#: src/gtk/gtkutils.c:1958
+#: src/gtk/gtkutils.c:1819
 msgid "Configuring..."
 msgstr "Configurando..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
-#: src/prefs_matcher.c:645 src/prefs_matcher.c:2212 src/prefs_summaries.c:634
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:466
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:636
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:467
 msgid "Date"
 msgstr "Fecha"
 
@@ -4722,10 +4792,10 @@ msgstr "Fecha"
 msgid "Date:"
 msgstr "Fecha:"
 
-#: src/gtk/headers.h:10 src/gtk/quicksearch.c:853
-#: src/prefs_filtering_action.c:1222 src/prefs_matcher.c:2209
-#: src/prefs_summaries.c:636 src/prefs_summary_column.c:81 src/quote_fmt.c:49
-#: src/summaryview.c:464
+#: src/gtk/headers.h:10 src/gtk/quicksearch.c:854
+#: src/prefs_filtering_action.c:1222 src/prefs_matcher.c:2215
+#: src/prefs_summaries.c:638 src/prefs_summary_column.c:81 src/quote_fmt.c:49
+#: src/summaryview.c:465
 msgid "From"
 msgstr "Desde"
 
@@ -4745,15 +4815,15 @@ msgstr "Remitente:"
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: src/gtk/headers.h:13 src/gtk/quicksearch.c:859
-#: src/prefs_filtering_action.c:1223 src/prefs_matcher.c:2210
-#: src/prefs_summaries.c:637 src/prefs_summary_column.c:82 src/quote_fmt.c:56
-#: src/summaryview.c:465
+#: src/gtk/headers.h:13 src/gtk/quicksearch.c:860
+#: src/prefs_filtering_action.c:1223 src/prefs_matcher.c:2216
+#: src/prefs_summaries.c:639 src/prefs_summary_column.c:82 src/quote_fmt.c:56
+#: src/summaryview.c:466
 msgid "To"
 msgstr "Para"
 
 #: src/gtk/headers.h:14 src/prefs_filtering_action.c:1224
-#: src/prefs_matcher.c:2211 src/quote_fmt.c:57
+#: src/prefs_matcher.c:2217 src/quote_fmt.c:57
 msgid "Cc"
 msgstr "Cc"
 
@@ -4762,7 +4832,7 @@ msgid "Bcc"
 msgstr "Bcc"
 
 #: src/gtk/headers.h:16 src/prefs_filtering_action.c:1226
-#: src/prefs_matcher.c:2213 src/quote_fmt.c:60
+#: src/prefs_matcher.c:2219 src/quote_fmt.c:60
 msgid "Message-ID"
 msgstr "ID-Mensaje"
 
@@ -4775,7 +4845,7 @@ msgid "In-Reply-To"
 msgstr "En-Respuesta-A"
 
 #: src/gtk/headers.h:18 src/prefs_filtering_action.c:1228
-#: src/prefs_matcher.c:2215 src/quote_fmt.c:59
+#: src/prefs_matcher.c:2221 src/quote_fmt.c:59
 msgid "References"
 msgstr "Referencias"
 
@@ -4783,10 +4853,10 @@ msgstr "Referencias"
 msgid "References:"
 msgstr "Referencias:"
 
-#: src/gtk/headers.h:19 src/gtk/quicksearch.c:847
-#: src/prefs_filtering_action.c:1221 src/prefs_matcher.c:2208
-#: src/prefs_summaries.c:638 src/prefs_summary_column.c:80 src/quote_fmt.c:55
-#: src/summaryview.c:463
+#: src/gtk/headers.h:19 src/gtk/quicksearch.c:848
+#: src/prefs_filtering_action.c:1221 src/prefs_matcher.c:2214
+#: src/prefs_summaries.c:640 src/prefs_summary_column.c:80 src/quote_fmt.c:55
+#: src/summaryview.c:464
 msgid "Subject"
 msgstr "Asunto"
 
@@ -4795,7 +4865,7 @@ msgstr "Asunto"
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:421
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:420
 msgid "Comments"
 msgstr "Comentarios"
 
@@ -4884,7 +4954,7 @@ msgid "Received:"
 msgstr "Recibido:"
 
 #: src/gtk/headers.h:33 src/prefs_filtering_action.c:1227
-#: src/prefs_matcher.c:2214 src/quote_fmt.c:58
+#: src/prefs_matcher.c:2220 src/quote_fmt.c:58
 msgid "Newsgroups"
 msgstr "Grupos"
 
@@ -4908,10 +4978,10 @@ msgstr "Visto"
 msgid "Seen:"
 msgstr "Visto:"
 
-#: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:642
-#: src/prefs_summary_column.c:78 src/prefs_themes.c:1031 src/ssl_manager.c:124
-#: src/summaryview.c:2888
+#: src/gtk/headers.h:37 src/gtk/progressdialog.c:147
+#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:644
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1130 src/ssl_manager.c:124
+#: src/summaryview.c:2894
 msgid "Status"
 msgstr "Estado"
 
@@ -4955,7 +5025,7 @@ msgstr "Agente-Usuario:"
 msgid "Content-Type"
 msgstr "Tipo-Contenido"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:340
+#: src/gtk/headers.h:42 src/image_viewer.c:338
 msgid "Content-Type:"
 msgstr "Tipo-Contenido:"
 
@@ -5238,7 +5308,7 @@ msgstr "Introducir contraseña"
 msgid "Remember password for this session"
 msgstr "Recordar la contraseña para esta sesión"
 
-#: src/gtk/inputdialog.c:364 src/gtk/inputdialog.c:411
+#: src/gtk/inputdialog.c:363 src/gtk/inputdialog.c:406
 msgid "Remember this"
 msgstr "Recordar esto"
 
@@ -5297,32 +5367,33 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:776
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:775
 #: src/plugins/address_keeper/address_keeper_prefs.c:280
-#: src/plugins/archive/archiver_prefs.c:106
-#: src/plugins/attachwarner/attachwarner_prefs.c:230
+#: src/plugins/archive/archiver_prefs.c:105
+#: src/plugins/attachwarner/attachwarner_prefs.c:234
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
-#: src/plugins/bsfilter/bsfilter_gtk.c:400
+#: src/plugins/bsfilter/bsfilter_gtk.c:399
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
 #: src/plugins/fancy/fancy_prefs.c:115
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:141
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:234
 #: src/plugins/libravatar/libravatar_prefs.c:563
 #: src/plugins/litehtml_viewer/lh_prefs.c:73
 #: src/plugins/managesieve/sieve_prefs.c:423
-#: src/plugins/notification/notification_prefs.c:403
-#: src/plugins/notification/notification_prefs.c:419
-#: src/plugins/notification/notification_prefs.c:438
-#: src/plugins/notification/notification_prefs.c:456
-#: src/plugins/notification/notification_prefs.c:474
-#: src/plugins/notification/notification_prefs.c:492
-#: src/plugins/notification/notification_prefs.c:510
-#: src/plugins/notification/notification_prefs.c:528
+#: src/plugins/notification/notification_prefs.c:401
+#: src/plugins/notification/notification_prefs.c:417
+#: src/plugins/notification/notification_prefs.c:436
+#: src/plugins/notification/notification_prefs.c:454
+#: src/plugins/notification/notification_prefs.c:472
+#: src/plugins/notification/notification_prefs.c:490
+#: src/plugins/notification/notification_prefs.c:508
+#: src/plugins/notification/notification_prefs.c:526
 #: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
 #: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:665
-#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:923
+#: src/plugins/vcalendar/vcal_prefs.c:775 src/prefs_toolbar.c:924
 msgid "Plugins"
 msgstr "Módulos"
 
@@ -5334,7 +5405,7 @@ msgstr "_Cargar..."
 msgid "_Unload"
 msgstr "_Descargar"
 
-#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:237
+#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:234
 msgid "Description"
 msgstr "Descripción"
 
@@ -5356,26 +5427,26 @@ msgstr "Descargar el módulo seleccionado"
 msgid "Loaded plugins"
 msgstr "Módulos cargados"
 
-#: src/gtk/prefswindow.c:503 src/gtk/prefswindow.c:508
-#: src/plugins/archive/archiver_gtk.c:946
+#: src/gtk/prefswindow.c:506 src/gtk/prefswindow.c:511
+#: src/plugins/archive/archiver_gtk.c:945
 #: src/plugins/clamd/clamav_plugin_gtk.c:92
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: src/gtk/prefswindow.c:639
+#: src/gtk/prefswindow.c:647
 msgid "Page Index"
 msgstr "Índice de páginas"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:847
+#: src/gtk/progressdialog.c:89 src/mainwindow.c:850
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4035 src/prefs_account.c:4053 src/prefs_account.c:4071
-#: src/prefs_account.c:4089 src/prefs_account.c:4107 src/prefs_account.c:4125
-#: src/prefs_account.c:4143 src/prefs_account.c:4162 src/prefs_account.c:4255
-#: src/prefs_account.c:4273 src/prefs_filtering_action.c:1380
-#: src/prefs_filtering.c:395 src/prefs_filtering.c:1863
+#: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
+#: src/prefs_account.c:4043 src/prefs_account.c:4061 src/prefs_account.c:4079
+#: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
+#: src/prefs_account.c:4151 src/prefs_account.c:4170 src/prefs_account.c:4253
+#: src/prefs_account.c:4271 src/prefs_filtering_action.c:1380
+#: src/prefs_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Cuenta"
 
@@ -5602,54 +5673,69 @@ msgstr ""
 "para los mensajes mostrados en la lista de mensajes.\n"
 "Se pueden utilizar los siguientes símbolos:"
 
-#: src/gtk/quicksearch.c:587
+#: src/gtk/quicksearch.c:588
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Algo falló durante la búsqueda. Por favor compruebe la traza."
 
-#: src/gtk/quicksearch.c:871
+#: src/gtk/quicksearch.c:872
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Desde/Para/Cc/Asunto/Etiqueta"
 
-#: src/gtk/quicksearch.c:889 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:890 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
 msgstr "Recursivo"
 
-#: src/gtk/quicksearch.c:895
+#: src/gtk/quicksearch.c:896
 msgid "Sticky"
 msgstr "Pegajoso"
 
-#: src/gtk/quicksearch.c:901
+#: src/gtk/quicksearch.c:902
 msgid "Type-ahead"
 msgstr "Mientras teclea"
 
-#: src/gtk/quicksearch.c:907
+#: src/gtk/quicksearch.c:908
 msgid "Run on select"
 msgstr "Ejecutar sobre la selección"
 
-#: src/gtk/quicksearch.c:934
+#: src/gtk/quicksearch.c:929 src/gtk/quicksearch.c:994
+#: src/gtk/quicksearch.c:1023 src/plugins/libravatar/libravatar_prefs.c:252
+#: src/prefs_actions.c:344 src/prefs_filtering.c:479 src/prefs_template.c:324
+#: src/summary_search.c:317
+msgid "C_lear"
+msgstr "_Limpiar"
+
+#: src/gtk/quicksearch.c:935
 msgid "Clear the current search"
 msgstr "Limpiar la búsqueda actual"
 
-#: src/gtk/quicksearch.c:944 src/summary_search.c:421
+#: src/gtk/quicksearch.c:945 src/summary_search.c:421
 msgid "Edit search criteria"
 msgstr "Editar el criterio de búsqueda"
 
-#: src/gtk/quicksearch.c:953
+#: src/gtk/quicksearch.c:948 src/gtk/quicksearch.c:992
+#: src/gtk/quicksearch.c:1021 src/prefs_actions.c:352
+#: src/prefs_filtering_action.c:562 src/prefs_matcher.c:774
+#: src/prefs_summaries.c:496 src/prefs_template.c:332 src/quote_fmt.c:526
+#: src/ssl_manager.c:216
+msgid "_Information"
+msgstr "_Información"
+
+#: src/gtk/quicksearch.c:954
 msgid "Information about extended symbols"
 msgstr "Información sobre los símbolos extendidos"
 
-#: src/gtk/quicksearch.c:992 src/gtk/quicksearch.c:1021
-#: src/gtk/quicksearch.c:1027
+#: src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
+#: src/gtk/quicksearch.c:1028
 msgid "E_dit"
 msgstr "E_ditar"
 
-#: src/gtk/sslcertwindow.c:179 src/ssl_manager.c:302
+#: src/gtk/sslcertwindow.c:179 src/ssl_manager.c:304
 #, c-format
 msgid "Correct%s"
 msgstr "Correcto%s"
 
 #: src/gtk/sslcertwindow.c:179 src/gtk/sslcertwindow.c:181
-#: src/ssl_manager.c:302 src/ssl_manager.c:306
+#: src/ssl_manager.c:304 src/ssl_manager.c:308
 msgid " (expired)"
 msgstr " (expirado)"
 
@@ -5691,8 +5777,8 @@ msgstr "Caduca en: "
 
 #: src/gtk/sslcertwindow.c:373
 #, c-format
-msgid "SSL/TLS certificate for %s"
-msgstr "Certificado SSL/TLS para %s"
+msgid "TLS certificate for %s"
+msgstr "Certificado TLS para %s"
 
 #: src/gtk/sslcertwindow.c:389
 #, c-format
@@ -5729,12 +5815,12 @@ msgid "_View certificate"
 msgstr "_Mostrar certificado"
 
 #: src/gtk/sslcertwindow.c:435
-msgid "SSL/TLS certificate is invalid"
-msgstr "Certificado SSL/TLS inválido"
+msgid "TLS certificate is invalid"
+msgstr "Certificado TLS inválido"
 
 #: src/gtk/sslcertwindow.c:437
-msgid "SSL/TLS certificate is unknown"
-msgstr "Certificado SSL/TLS desconocido"
+msgid "TLS certificate is unknown"
+msgstr "Certificado TLS desconocido"
 
 #: src/gtk/sslcertwindow.c:440 src/gtk/sslcertwindow.c:490
 #: src/gtk/sslcertwindow.c:552
@@ -5755,12 +5841,12 @@ msgstr ""
 "%s¿Quiere continuar?"
 
 #: src/gtk/sslcertwindow.c:485
-msgid "SSL/TLS certificate is invalid and expired"
-msgstr "Certificado SSL/TLS inválido y caducado"
+msgid "TLS certificate is invalid and expired"
+msgstr "Certificado TLS inválido y caducado"
 
 #: src/gtk/sslcertwindow.c:487
-msgid "SSL/TLS certificate is expired"
-msgstr "Certificado SSL/TLS caducado"
+msgid "TLS certificate is expired"
+msgstr "Certificado TLS caducado"
 
 #: src/gtk/sslcertwindow.c:490
 msgid "_Accept"
@@ -5788,46 +5874,46 @@ msgid "_View certificates"
 msgstr "_Mostrar certificados"
 
 #: src/gtk/sslcertwindow.c:548
-msgid "SSL/TLS certificate changed and is invalid"
-msgstr "Certificado SSL/TLS cambiado e inválido"
+msgid "TLS certificate changed and is invalid"
+msgstr "Certificado TLS cambiado e inválido"
 
 #: src/gtk/sslcertwindow.c:550
-msgid "SSL/TLS certificate changed"
-msgstr "Certificado SSL/TLS cambiado"
+msgid "TLS certificate changed"
+msgstr "Certificado TLS cambiado"
 
-#: src/headerview.c:94
+#: src/headerview.c:95
 msgid "Tags:"
 msgstr "Etiquetas:"
 
-#: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
+#: src/headerview.c:193 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:885 src/summaryview.c:3484
-#: src/summaryview.c:3502 src/summaryview.c:3541
+#: src/plugins/notification/notification_trayicon.c:885 src/summaryview.c:3494
+#: src/summaryview.c:3512 src/summaryview.c:3551
 msgid "(No From)"
 msgstr "(Sin remite)"
 
-#: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
+#: src/headerview.c:208 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:888 src/summaryview.c:3553
-#: src/summaryview.c:3556
+#: src/plugins/notification/notification_trayicon.c:888 src/summaryview.c:3563
+#: src/summaryview.c:3566
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/image_viewer.c:127
+#: src/image_viewer.c:100
 msgid "Error:"
 msgstr "Error:"
 
-#: src/image_viewer.c:316 src/mimeview.c:2672
-#: src/plugins/att_remover/att_remover.c:307
+#: src/image_viewer.c:314 src/mimeview.c:2586
+#: src/plugins/att_remover/att_remover.c:306
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Nombre del fichero:"
 
-#: src/image_viewer.c:321
+#: src/image_viewer.c:319
 msgid "Filesize:"
 msgstr "Tamaño:"
 
-#: src/image_viewer.c:366
+#: src/image_viewer.c:364
 msgid "Load Image"
 msgstr "Cargar imagen"
 
@@ -6009,8 +6095,8 @@ msgid "SASL error"
 msgstr "error de SASL"
 
 #: src/imap.c:751
-msgid "SSL/TLS error"
-msgstr "error de SSL/TLS"
+msgid "TLS error"
+msgstr "error de TLS"
 
 #: src/imap.c:755
 #, c-format
@@ -6077,151 +6163,162 @@ msgstr ""
 "Las autenticaciones con LOGIN sólo funcionarán si libetpan ha sido compilada "
 "con soporte SASL y el módulo LOGIN de SASL está instalado."
 
-#: src/imap.c:999
+#: src/imap.c:998
+msgid ""
+"\n"
+"\n"
+"OAuth2 error. Check and correct your OAuth2 account preferences."
+msgstr ""
+"\n"
+"\n"
+"Error OAuth2. Compruebe y corrija las preferencias de su cuenta "
+"OAuth2."
+
+#: src/imap.c:1004
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Falló la conexión con %s: autenticación rechazada.%s"
 
-#: src/imap.c:1003
+#: src/imap.c:1008
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Falló la conexión con %s: autenticación rechazada.%s\n"
 
-#: src/imap.c:1021
+#: src/imap.c:1026
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Falló la conexión con %s"
 
-#: src/imap.c:1028 src/imap.c:1031
+#: src/imap.c:1033 src/imap.c:1036
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La conexión IMAP con %s se ha desconectado. Reconectando...\n"
 
-#: src/imap.c:1061 src/imap.c:3736 src/imap.c:4395 src/imap.c:4489
-#: src/imap.c:4667 src/imap.c:5478
+#: src/imap.c:1066 src/imap.c:3743 src/imap.c:4402 src/imap.c:4496
+#: src/imap.c:4674 src/imap.c:5485
 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."
 
-#: src/imap.c:1171 src/inc.c:881 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1176 src/inc.c:883 src/news.c:402 src/send_message.c:287
 msgid "Insecure connection"
 msgstr "Conexión insegura"
 
-#: src/imap.c:1172 src/inc.c:882 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1177 src/inc.c:884 src/news.c:403 src/send_message.c:288
 msgid ""
-"This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
-"not available in this build of Claws Mail. \n"
+"This connection is configured to be secured using TLS, but TLS is not "
+"available in this build of Claws Mail. \n"
 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
-"Esta conexión esta configurada para ser segura usando SSL/TLS, pero el "
-"soporte para SSL/TLS no está disponible en este binario de Claws Mail.\n"
+"Esta conexión esta configurada para ser segura usando TLS, pero el "
+"soporte para TLS no está disponible en este binario de Claws Mail.\n"
 "\n"
 "¿Quiere seguir conectando con este servidor? La comunicación no sería segura."
 
-#: src/imap.c:1178 src/inc.c:888 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1183 src/inc.c:890 src/news.c:409 src/send_message.c:294
 msgid "Con_tinue connecting"
 msgstr "Seguir conec_tando"
 
-#: src/imap.c:1187
+#: src/imap.c:1192
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Cuenta «%s»: Conectando al servidor IMAP: %s:%d..."
 
-#: src/imap.c:1252
+#: src/imap.c:1257
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "No se puede conectar al servidor IMAP: %s:%d"
 
-#: src/imap.c:1255
+#: src/imap.c:1260
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "No se puede conectar al servidor IMAP: %s:%d\n"
 
-#: src/imap.c:1287 src/imap.c:4157
+#: src/imap.c:1292 src/imap.c:4164
 msgid "Can't start STARTTLS session.\n"
 msgstr "No se puede iniciar la sesión STARTTLS.\n"
 
-#: src/imap.c:1359
+#: src/imap.c:1364
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "No se puede entrar al servidor IMAP %s.\n"
 
-#: src/imap.c:1362
+#: src/imap.c:1367
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "No se puede entrar al servidor IMAP %s."
 
-#: src/imap.c:1790
+#: src/imap.c:1795
 msgid "Adding messages..."
 msgstr "Añadiendo mensajes..."
 
-#: src/imap.c:1995 src/mh.c:530
+#: src/imap.c:2000 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Copiando mensajes..."
 
-#: src/imap.c:2521
+#: src/imap.c:2526
 msgid "Search failed due to server error."
 msgstr "La búsqueda falló debido a un error del servidor."
 
-#: src/imap.c:2605
+#: src/imap.c:2610
 msgid "can't set deleted flags\n"
 msgstr "no se pueden establecer los flags «borrado»\n"
 
-#: src/imap.c:2612 src/imap.c:5108
+#: src/imap.c:2617 src/imap.c:5115
 msgid "can't expunge\n"
 msgstr "no puedo purgar\n"
 
-#: src/imap.c:2987
+#: src/imap.c:2992
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscando carpetas no suscritas en %s..."
 
-#: src/imap.c:2990
+#: src/imap.c:2995
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscando subcarpetas de %s..."
 
-#: src/imap.c:3278
+#: src/imap.c:3286
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 
-#: src/imap.c:3291
+#: src/imap.c:3299
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 
-#: src/imap.c:3422
+#: src/imap.c:3429
 #, 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:3535
+#: src/imap.c:3542
 msgid "can't delete mailbox\n"
 msgstr "no se puede borrar el buzón\n"
 
-#: src/imap.c:3814
+#: src/imap.c:3821
 msgid "LIST failed\n"
 msgstr "LIST falló\n"
 
-#: src/imap.c:3899
+#: src/imap.c:3906
 msgid "Flagging messages..."
 msgstr "Etiquetando mensajes..."
 
-#: src/imap.c:4002
+#: src/imap.c:4009
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: src/imap.c:4154
+#: src/imap.c:4161
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "El servidor necesita STARTTLS para acceder a él.\n"
 
-#: src/imap.c:4164
+#: src/imap.c:4171
 msgid "Can't refresh capabilities.\n"
 msgstr "No se pueden refrescar las capacidades.\n"
 
-#: src/imap.c:4169
+#: src/imap.c:4176
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6230,20 +6327,20 @@ msgstr ""
 "La conexión con %s falló: el servidor necesita STARTTLS, pero Claws Mail ha "
 "sido compilado sin soporte para STARTTLS.\n"
 
-#: src/imap.c:4177
+#: src/imap.c:4184
 msgid "Server logins are disabled.\n"
 msgstr "Los accesos al servidor están deshabilitados.\n"
 
-#: src/imap.c:4400
+#: src/imap.c:4407
 msgid "Fetching message..."
 msgstr "Recuperando mensaje..."
 
-#: src/imap.c:5101
+#: src/imap.c:5108
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no se pueden establecer los flags 'borrado': %d\n"
 
-#: src/imap.c:6136
+#: src/imap.c:6143
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -6325,22 +6422,22 @@ 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:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:420 src/plugins/rssyl/rssyl_cb_menu.c:196
-#: src/plugins/vcalendar/vcal_folder.c:2060
+#: src/imap_gtk.c:259 src/mh_gtk.c:253 src/news_gtk.c:293
+#: src/plugins/mailmbox/plugin_gtk.c:422 src/plugins/rssyl/rssyl_cb_menu.c:234
+#: src/plugins/vcalendar/vcal_folder.c:2096
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Introduzca el nuevo nombre para «%s»:"
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:421
-#: src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2061
+#: src/imap_gtk.c:261 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:423
+#: src/plugins/rssyl/rssyl_cb_menu.c:235
+#: src/plugins/vcalendar/vcal_folder.c:2097
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:451 src/plugins/rssyl/rssyl_cb_menu.c:220
-#: src/plugins/vcalendar/vcal_folder.c:2081
+#: src/imap_gtk.c:290 src/mh_gtk.c:281 src/news_gtk.c:315
+#: src/plugins/mailmbox/plugin_gtk.c:453 src/plugins/rssyl/rssyl_cb_menu.c:258
+#: src/plugins/vcalendar/vcal_folder.c:2117
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6348,17 +6445,17 @@ msgstr ""
 "No se puede renombrar la carpeta.\n"
 "El nuevo nombre no está permitido."
 
-#: src/imap_gtk.c:317 src/mh_gtk.c:307 src/plugins/mailmbox/plugin_gtk.c:373
+#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:375
 #, c-format
 msgid "Select folder to move folder '%s' to"
 msgstr "Seleccionar la carpeta a la que mover la carpeta «%s»"
 
-#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:393
+#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:395
 #, c-format
 msgid "Select folder to copy folder '%s' to"
 msgstr "Seleccionar la carpeta a la que copiar la carpeta «%s»"
 
-#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:153
+#: src/imap_gtk.c:365 src/mh_gtk.c:203
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6371,44 +6468,44 @@ msgstr ""
 "\n"
 "¿Está seguro de que quiere borrarlos?"
 
-#: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:348
-#: src/plugins/rssyl/rssyl_cb_menu.c:172
-#: src/plugins/vcalendar/vcal_folder.c:2014
+#: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:350
+#: src/plugins/rssyl/rssyl_cb_menu.c:210
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No se puede eliminar la carpeta «%s»."
 
-#: src/imap_gtk.c:506
+#: src/imap_gtk.c:507
 #, 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:509
+#: src/imap_gtk.c:510
 msgid "Search recursively"
 msgstr "Buscar recursivamente"
 
-#: src/imap_gtk.c:514 src/imap_gtk.c:573
+#: src/imap_gtk.c:515 src/imap_gtk.c:575
 msgid "Subscriptions"
 msgstr "Suscripciones"
 
-#: src/imap_gtk.c:515
+#: src/imap_gtk.c:516
 msgid "_Search"
 msgstr "_Buscar"
 
-#: src/imap_gtk.c:525
+#: src/imap_gtk.c:527
 #, 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:536 src/mainwindow.c:683
+#: src/imap_gtk.c:538 src/mainwindow.c:684
 msgid "Subscribe"
 msgstr "Suscribir"
 
-#: src/imap_gtk.c:538 src/imap_gtk.c:540
+#: src/imap_gtk.c:540 src/imap_gtk.c:542
 msgid "All of them"
 msgstr "Todas ellas"
 
-#: src/imap_gtk.c:556
+#: src/imap_gtk.c:558
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -6420,33 +6517,33 @@ 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:565
+#: src/imap_gtk.c:567
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "¿Quiere %s la carpeta «%s»?"
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:568
 msgid "subscribe"
 msgstr "suscribir"
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:568
 msgid "unsubscribe"
 msgstr "desuscribir"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1514 src/prefs_folder_item.c:1542
-#: src/prefs_folder_item.c:1570
+#: src/imap_gtk.c:570 src/prefs_folder_item.c:1590 src/prefs_folder_item.c:1618
+#: src/prefs_folder_item.c:1646
 msgid "Apply to subfolders"
 msgstr "Aplicar a subcarpetas"
 
-#: src/imap_gtk.c:574
+#: src/imap_gtk.c:576
 msgid "_Subscribe"
 msgstr "_Suscribir"
 
-#: src/imap_gtk.c:574 src/news_gtk.c:252
+#: src/imap_gtk.c:576 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr "Des_uscribir"
 
-#: src/import.c:112 src/import.c:203
+#: src/import.c:112 src/import.c:206
 msgid "Import mbox file"
 msgstr "Importar fichero mbox"
 
@@ -6458,11 +6555,11 @@ msgstr "Busque el fichero mbox e indique la carpeta de destino."
 msgid "Destination folder:"
 msgstr "Carpeta de destino:"
 
-#: src/import.c:198
+#: src/import.c:201
 msgid "Source mbox filename can't be left empty."
 msgstr "El nombre de fichero mbox de origen no puede estar vacío."
 
-#: src/import.c:203
+#: src/import.c:207
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
@@ -6470,19 +6567,19 @@ msgstr ""
 "No se indicó una carpeta de destino.\n"
 "¿Importar el fichero mbox en la carpeta Entrada?"
 
-#: src/import.c:225
+#: src/import.c:228
 msgid "Can't find the destination folder."
 msgstr "No se puede encontrar carpeta de destino."
 
-#: src/import.c:230
+#: src/import.c:233
 msgid "Importing mbox file..."
 msgstr "Importando fichero mbox..."
 
-#: src/import.c:252
+#: src/import.c:255
 msgid "Select importing file"
 msgstr "Seleccionar fichero a importar"
 
-#: src/import.c:270
+#: src/import.c:273
 msgid "Select folder to import to"
 msgstr "Seleccionar carpeta a la que importar"
 
@@ -6510,11 +6607,11 @@ msgstr "Debe proporcionar un nombre de agenda de direcciones."
 msgid "LDIF file imported successfully."
 msgstr "Fichero LDIF importado con éxito."
 
-#: src/importldif.c:465
+#: src/importldif.c:467
 msgid "Select LDIF File"
 msgstr "Seleccionar fichero LDIF"
 
-#: src/importldif.c:549
+#: src/importldif.c:551
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
@@ -6522,43 +6619,43 @@ msgstr ""
 "Especifique el nombre para la agenda que será creada a partir de los datos "
 "del fichero LDIF."
 
-#: src/importldif.c:553
+#: src/importldif.c:555
 msgid "File Name"
 msgstr "Nombre del fichero"
 
-#: src/importldif.c:563
+#: src/importldif.c:565
 msgid "The full file specification of the LDIF file to import."
 msgstr "La especificación completa del fichero LDIF a importar."
 
-#: src/importldif.c:569
+#: src/importldif.c:571
 msgid "Select the LDIF file to import."
 msgstr "Seleccione el fichero LDIF a importar."
 
-#: src/importldif.c:700
+#: src/importldif.c:702
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:705 src/summaryview.c:461
+#: src/importldif.c:707 src/summaryview.c:462
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:711
+#: src/importldif.c:713
 msgid "LDIF Field Name"
 msgstr "Nombre de campo LDIF"
 
-#: src/importldif.c:716
+#: src/importldif.c:718
 msgid "Attribute Name"
 msgstr "Nombre de atributo"
 
-#: src/importldif.c:734
+#: src/importldif.c:736
 msgid "LDIF Field"
 msgstr "Campo LDIF"
 
-#: src/importldif.c:745
+#: src/importldif.c:747
 msgid "Attribute"
 msgstr "Atributo"
 
-#: src/importldif.c:756
+#: src/importldif.c:758
 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 "
@@ -6576,35 +6673,35 @@ 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:772
+#: src/importldif.c:774
 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:775
+#: src/importldif.c:777
 msgid "Select for Import"
 msgstr "Seleccionar para importar"
 
-#: src/importldif.c:779
+#: src/importldif.c:781
 msgid "Select the LDIF field for import into the address book."
 msgstr "Seleccionar el campo LDIF para importarlo a la agenda."
 
-#: src/importldif.c:781
+#: src/importldif.c:783
 msgid " Modify "
 msgstr " Modificar "
 
-#: src/importldif.c:785
+#: src/importldif.c:787
 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:855
+#: src/importldif.c:857
 msgid "Records Imported:"
 msgstr "Registros importados :"
 
-#: src/importldif.c:887
+#: src/importldif.c:889
 msgid "Import LDIF file into Address Book"
 msgstr "Importar fichero LDIF a la agenda"
 
-#: src/importldif.c:925
+#: src/importldif.c:927
 msgid "Proceed"
 msgstr "Proceder"
 
@@ -6676,16 +6773,16 @@ msgstr "Hecho (no hay mensajes nuevos)"
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:717 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:717 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Autorización fallida"
 
-#: src/inc.c:724 src/prefs_matcher.c:406 src/prefs_summaries.c:645
-#: src/prefs_summary_column.c:87 src/summaryview.c:2884 src/summaryview.c:6544
+#: src/inc.c:724 src/prefs_matcher.c:406 src/prefs_summaries.c:647
+#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6561
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:734 src/plugins/spamassassin/spamassassin_gtk.c:389
+#: src/inc.c:734
 msgid "Timeout"
 msgstr "Tiempo límite"
 
@@ -6700,78 +6797,78 @@ msgstr[1] "Finalizado (%d mensajes nuevos)"
 msgid "Finished (no new messages)"
 msgstr "Finalizado (no hay mensajes nuevos)"
 
-#: src/inc.c:865
+#: src/inc.c:867
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando nuevos mensajes"
 
-#: src/inc.c:894
+#: src/inc.c:896
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Cuenta «%s»: Conectando al servidor POP3: %s:%d..."
 
-#: src/inc.c:928
+#: src/inc.c:930
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "No se puede conectar al servidor POP3: %s:%d"
 
-#: src/inc.c:932
+#: src/inc.c:934
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servidor POP3: %s:%d\n"
 
-#: src/inc.c:1012 src/plugins/managesieve/managesieve.c:424
+#: src/inc.c:1014 src/plugins/managesieve/managesieve.c:426
 #: src/send_message.c:519
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
-#: src/inc.c:1014
+#: src/inc.c:1016
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Obteniendo mensajes de %s (%s)..."
 
-#: src/inc.c:1020
+#: src/inc.c:1022
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
 
-#: src/inc.c:1024
+#: src/inc.c:1026
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obteniendo el número de nuevos mensajes (LAST)..."
 
-#: src/inc.c:1028
+#: src/inc.c:1030
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
 
-#: src/inc.c:1032
+#: src/inc.c:1034
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obteniendo el tamaño de los mensajes (LIST)..."
 
-#: src/inc.c:1039 src/send_message.c:537
+#: src/inc.c:1041 src/send_message.c:537
 msgid "Quitting"
 msgstr "Saliendo"
 
-#: src/inc.c:1064
+#: src/inc.c:1066
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:1077
+#: src/inc.c:1079
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Recuperando (%d mensaje (%s) recibido)"
 msgstr[1] "Recuperando (%d mensajes (%s) recibidos)"
 
-#: src/inc.c:1232
+#: src/inc.c:1234
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Ha fallado la conexión con %s:%d."
 
-#: src/inc.c:1237
+#: src/inc.c:1239
 msgid "Error occurred while processing mail."
 msgstr "Ocurrió un error mientras se procesaba el correo."
 
-#: src/inc.c:1243
+#: src/inc.c:1245
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6780,37 +6877,37 @@ msgstr ""
 "Ocurrió un error mientras se procesaba el correo:\n"
 "%s"
 
-#: src/inc.c:1249
+#: src/inc.c:1251
 msgid "No disk space left."
 msgstr "No hay espacio libre en disco."
 
-#: src/inc.c:1254
+#: src/inc.c:1256
 msgid "Can't write file."
 msgstr "No se puede escribir el fichero."
 
-#: src/inc.c:1259
+#: src/inc.c:1261
 msgid "Socket error."
 msgstr "Error de conector."
 
-#: src/inc.c:1262
+#: src/inc.c:1264
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Error de conector conectando con %s:%d."
 
-#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
+#: src/inc.c:1269 src/send_message.c:448 src/send_message.c:711
 msgid "Connection closed by the remote host."
 msgstr "Conexión cerrada por la máquina remota."
 
-#: src/inc.c:1270
+#: src/inc.c:1272
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Conexión con %s:%d cerrada por la máquina remota."
 
-#: src/inc.c:1275
+#: src/inc.c:1277
 msgid "Mailbox is locked."
 msgstr "El buzón está bloqueado."
 
-#: src/inc.c:1279
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6819,11 +6916,11 @@ msgstr ""
 "El buzón está bloqueado:\n"
 "%s"
 
-#: src/inc.c:1285 src/send_message.c:696
+#: src/inc.c:1287 src/send_message.c:696
 msgid "Authentication failed."
 msgstr "La autenticación falló."
 
-#: src/inc.c:1291 src/send_message.c:699
+#: src/inc.c:1293 src/send_message.c:699
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6832,7 +6929,7 @@ msgstr ""
 "La autenticación falló:\n"
 "%s"
 
-#: src/inc.c:1296 src/send_message.c:715
+#: src/inc.c:1298 src/send_message.c:715
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6840,46 +6937,46 @@ msgstr ""
 "La sesión ha expirado. Puede ser capaz de recuperarla incrementando el "
 "tiempo límite de la sesión en «Preferencias/Otras/Miscelánea»."
 
-#: src/inc.c:1301
+#: src/inc.c:1303
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "La conexión con %s:%d excedió el límite de tiempo."
 
-#: src/inc.c:1339
+#: src/inc.c:1341
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1631 src/plugins/notification/notification_prefs.c:1071
-#: src/plugins/notification/notification_prefs.c:1362
-#: src/plugins/notification/notification_prefs.c:1668
+#: src/inc.c:1636 src/plugins/notification/notification_prefs.c:1064
+#: src/plugins/notification/notification_prefs.c:1355
+#: src/plugins/notification/notification_prefs.c:1661
 #: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1834
-#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:551
+#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:553
 msgid "seconds"
 msgstr "segundos"
 
-#: src/inc.c:1641 src/inc.c:1651
+#: src/inc.c:1646 src/inc.c:1656
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: src/inc.c:1644
+#: src/inc.c:1649
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: src/inc.c:1656
+#: src/inc.c:1661
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%sEstá trabajando sin conexión. ¿Ignorarlo durante %d %s?"
 
-#: src/inc.c:1662
+#: src/inc.c:1667
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sEstá trabajando sin conexión ¿Ignorar?"
 
-#: src/inc.c:1669
+#: src/inc.c:1674
 msgid "On_ly once"
 msgstr "Só_lo una vez"
 
@@ -6888,8 +6985,8 @@ msgstr "Só_lo una vez"
 msgid "LDAP error (search): for attribute '%s': %d (%s)\n"
 msgstr "Error LDAP (search): para el atributo '%s': %d (%s)\n"
 
-#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1289
-#: src/ldapupdate.c:1330
+#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1290
+#: src/ldapupdate.c:1331
 #, c-format
 msgid "LDAP error (modify): for DN '%s': %d (%s)\n"
 msgstr "Error LDAP (modify): para el DN '%s': %d (%s)\n"
@@ -6912,11 +7009,11 @@ msgstr "LDAP (search): con éxito\n"
 msgid "LDAP error (search): %d (%s)\n"
 msgstr "Error LDAP (search): %d (%s)\n"
 
-#: src/ldif.c:759
+#: src/ldif.c:763
 msgid "Nick Name"
 msgstr "Apodo"
 
-#: src/main.c:251
+#: src/main.c:253
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6925,7 +7022,7 @@ msgstr ""
 "El fichero «%s» ya existe.\n"
 "No se puede crear la carpeta."
 
-#: src/main.c:381
+#: src/main.c:383
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6934,7 +7031,7 @@ msgstr ""
 "Encontrada configuración para %s.\n"
 "¿Desea migrar esta configuración?"
 
-#: src/main.c:383
+#: src/main.c:387
 #, c-format
 msgid ""
 "\n"
@@ -6947,11 +7044,11 @@ msgstr ""
 "Sus reglas de filtrado de Sylpheed se pueden convertir\n"
 "con un script que encontrará en %s."
 
-#: src/main.c:395
+#: src/main.c:400
 msgid "Keep old configuration"
 msgstr "Conservar la configuración antigua"
 
-#: src/main.c:398
+#: src/main.c:403
 msgid ""
 "Keeping a backup will allow you to go back to an older version, but may take "
 "a while if you have cached IMAP or News data, and will take some extra room "
@@ -6961,31 +7058,27 @@ msgstr ""
 "pero puede tardar cierto tiempo si tiene datos de Noticias o IMAP cacheados "
 "y ocupará espacio adicional en el disco."
 
-#: src/main.c:406
+#: src/main.c:411
 msgid "Migration of configuration"
 msgstr "Migración de la configuración"
 
-#: src/main.c:417
+#: src/main.c:422
 msgid "Copying configuration... This may take a while..."
 msgstr "Copiando configuración... Esto puede tardar un rato..."
 
-#: src/main.c:426
+#: src/main.c:431
 msgid "Migration failed!"
 msgstr "¡La migración falló!"
 
-#: src/main.c:435
+#: src/main.c:440
 msgid "Migrating configuration..."
 msgstr "Migrando la configuración..."
 
-#: src/main.c:1130
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread no está soportado por glib.\n"
-
-#: src/main.c:1150 src/main.c:1154 src/main.c:1158
+#: src/main.c:1194 src/main.c:1198 src/main.c:1202
 msgid "(or older)"
 msgstr "(o anterior)"
 
-#: src/main.c:1499
+#: src/main.c:1540
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -7004,7 +7097,7 @@ msgstr[1] ""
 "de los módulos para más información:\n"
 "%s"
 
-#: src/main.c:1541
+#: src/main.c:1582
 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 "
@@ -7014,7 +7107,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:1547
+#: src/main.c:1588
 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 "
@@ -7024,76 +7117,76 @@ 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:1791
+#: src/main.c:1828
 msgid "Missing filename\n"
 msgstr "Falta el nombre de fichero\n"
 
-#: src/main.c:1798
+#: src/main.c:1835
 msgid "Cannot open filename for reading\n"
 msgstr "No se puede abrir el fichero para lectura\n"
 
-#: src/main.c:1809
+#: src/main.c:1846
 msgid "Malformed header\n"
 msgstr "Cabecera mal formada\n"
 
-#: src/main.c:1816
+#: src/main.c:1853
 msgid "Duplicated 'To:' header\n"
 msgstr "Cabecera «To:» duplicada\n"
 
-#: src/main.c:1827
+#: src/main.c:1864
 msgid "Missing required 'To:' header\n"
 msgstr "Falta la cabecera «To:» obligatoria\n"
 
-#: src/main.c:1853
+#: src/main.c:1888
 #, c-format
 msgid "%s. Try -h or --help for usage.\n"
 msgstr "%s. Intente -h o --help para el uso.\n"
 
-#: src/main.c:1880 src/main.c:1943
+#: src/main.c:1917 src/main.c:1980
 #, c-format
 msgid "Missing file argument for option %s"
 msgstr "La opción %s necesita un parámetro fichero"
 
-#: src/main.c:1902
+#: src/main.c:1939
 #, c-format
 msgid "Missing or empty uri argument for option %s"
 msgstr "La opción %s necesita un parámetro URI no vacío"
 
-#: src/main.c:1905
+#: src/main.c:1942
 #, c-format
 msgid "Missing uri argument for option %s"
 msgstr "La opción %s necesita un parámetro URI"
 
-#: src/main.c:1938
+#: src/main.c:1975
 #, c-format
 msgid "Missing at least one non-empty file argument for option %s"
 msgstr "La opción %s necesita al menos un parámetro fichero no vacío"
 
-#: src/main.c:2007
+#: src/main.c:2044
 #, c-format
 msgid "Missing folder, type and request arguments for option %s"
 msgstr "La opción %s necesita los parámetros carpeta, tipo y petición"
 
-#: src/main.c:2010
+#: src/main.c:2047
 #, c-format
 msgid "Missing type and request arguments for option %s"
 msgstr "La opción %s necesita los parámetros tipo y petición"
 
-#: src/main.c:2013
+#: src/main.c:2050
 #, c-format
 msgid "Missing request argument for option %s"
 msgstr "La opción %s necesita un parámetro petición"
 
-#: src/main.c:2029
+#: src/main.c:2066
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:2031
+#: src/main.c:2068
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre la ventana de edición"
 
-#: src/main.c:2032
+#: src/main.c:2069
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -7111,11 +7204,11 @@ msgstr ""
 "vacía,\n"
 "                         después el cuerpo hasta fin de fichero."
 
-#: src/main.c:2037
+#: src/main.c:2074
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr "  --subscribe uri        suscribirse a la URI dada si es posible"
 
-#: src/main.c:2038
+#: src/main.c:2075
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7125,7 +7218,7 @@ msgstr ""
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados como adjuntos"
 
-#: src/main.c:2041
+#: src/main.c:2078
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7135,23 +7228,23 @@ msgstr ""
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados insertados"
 
-#: src/main.c:2044
+#: src/main.c:2081
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recibe los mensajes nuevos"
 
-#: src/main.c:2045
+#: src/main.c:2082
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe mensajes nuevos de todas las cuentas"
 
-#: src/main.c:2046
+#: src/main.c:2083
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     cancela la recepción de mensajes en curso"
 
-#: src/main.c:2047
+#: src/main.c:2084
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       cancela el envío de mensajes en curso"
 
-#: src/main.c:2048
+#: src/main.c:2085
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -7171,15 +7264,15 @@ msgstr ""
 "                         recursivo: falso si parám. empieza por: 0, n, N, f "
 "o F"
 
-#: src/main.c:2055
+#: src/main.c:2092
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todos los mensajes en la cola"
 
-#: src/main.c:2056
+#: src/main.c:2093
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  muestra el número total de mensajes"
 
-#: src/main.c:2057
+#: src/main.c:2094
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -7187,15 +7280,15 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         muestra el estado de cada carpeta"
 
-#: src/main.c:2059
+#: src/main.c:2096
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           muestra las estadísticas de la sesión"
 
-#: src/main.c:2060
+#: src/main.c:2097
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     reinicializa las estadísticas de la sesión"
 
-#: src/main.c:2061
+#: src/main.c:2098
 msgid ""
 "  --select folder[/msg]  jump to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder', a "
@@ -7206,46 +7299,46 @@ msgstr ""
 "subcarpeta»,\n"
 "                         una URI que empieza por file:// o una ruta absoluta"
 
-#: src/main.c:2063
+#: src/main.c:2100
 msgid "  --online               switch to online mode"
 msgstr "  --online               cambiar a modo de trabajo con conexión"
 
-#: src/main.c:2064
+#: src/main.c:2101
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              cambiar a modo de trabajo sin conexión"
 
-#: src/main.c:2065
+#: src/main.c:2102
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       salir de Claws Mail"
 
-#: src/main.c:2066
+#: src/main.c:2103
 msgid "  --debug -d             debug mode"
 msgstr "  --debug -d             modo de depuración"
 
-#: src/main.c:2067
+#: src/main.c:2104
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         activa o desactiva el modo de depuración"
 
-#: src/main.c:2068
+#: src/main.c:2105
 msgid "  --help -h              display this help"
 msgstr "  --help -h              visualiza esta ayuda"
 
-#: src/main.c:2069
+#: src/main.c:2106
 msgid "  --version -v           output version information"
 msgstr "  --version -v           muestra información de la versión"
 
-#: src/main.c:2070
+#: src/main.c:2107
 msgid ""
 "  --version-full -V      output version and built-in features information"
 msgstr ""
 "  --version-full -V      muestra información de la versión y características "
 "incluidas"
 
-#: src/main.c:2071
+#: src/main.c:2108
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           muestra el directorio del configuración"
 
-#: src/main.c:2072
+#: src/main.c:2109
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -7253,7 +7346,7 @@ msgstr ""
 "  --alternate-config-dir directorio\n"
 "                         usa el directorio del configuración especificado"
 
-#: src/main.c:2074
+#: src/main.c:2111
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
@@ -7261,865 +7354,874 @@ msgstr ""
 "  --geometry -geometry [ANxAL][+X+Y]\n"
 "                         establece la geometría de la ventana principal"
 
-#: src/main.c:2091
+#: src/main.c:2128
 #, c-format
 msgid "Missing directory argument for option %s"
 msgstr "La opción %s necesita un parámetro directorio"
 
-#: src/main.c:2099
+#: src/main.c:2136
 #, c-format
 msgid "Missing geometry argument for option %s"
 msgstr "La opción %s necesita un parámetro geometría"
 
-#: src/main.c:2110
+#: src/main.c:2147
 #, c-format
 msgid "Missing folder argument for option %s"
 msgstr "La opción %s necesita un parámetro carpeta"
 
-#: src/main.c:2143 src/main.c:2146
+#: src/main.c:2180 src/main.c:2183
 #, c-format
 msgid "Unknown option %s"
 msgstr "Opción desconocida %s"
 
-#: src/main.c:2162
+#: src/main.c:2199
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Procesando (%s)..."
 
-#: src/main.c:2165
+#: src/main.c:2202
 msgid "top level folder"
 msgstr "carpeta superior"
 
-#: src/main.c:2247
+#: src/main.c:2284
 msgid "Queued messages"
 msgstr "Mensajes en cola"
 
-#: src/main.c:2248
+#: src/main.c:2285
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
 
-#: src/main.c:3010
+#: src/main.c:3052
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: la red está conectada.\n"
 
-#: src/main.c:3016
+#: src/main.c:3058
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: la red está desconectada.\n"
 
-#: src/mainwindow.c:516 src/messageview.c:211
+#: src/mainwindow.c:517 src/messageview.c:212
 msgid "_File"
 msgstr "_Fichero"
 
-#: src/mainwindow.c:518 src/messageview.c:213 src/summaryview.c:442
+#: src/mainwindow.c:519 src/messageview.c:214 src/summaryview.c:443
 msgid "_View"
 msgstr "_Ver"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:522
 msgid "_Configuration"
 msgstr "_Configuración"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:526
 msgid "_Add mailbox"
 msgstr "_Añadir buzón"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:527
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:530
 msgid "Change mailbox order..."
 msgstr "Reorganizar buzones..."
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:533
 msgid "_Import mbox file..."
 msgstr "_Importar fichero mbox..."
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:534
 msgid "_Export to mbox file..."
 msgstr "_Exportar a fichero mbox..."
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:535
 msgid "_Export selected to mbox file..."
 msgstr "_Exportar la selección a un fichero mbox..."
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:537
 msgid "Empty all _Trash folders"
 msgstr "Vaciar _todas las papeleras"
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:540 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "_Guardar mensaje como..."
 
-#: src/mainwindow.c:540 src/messageview.c:221
+#: src/mainwindow.c:541 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "_Guardar parte como..."
 
-#: src/mainwindow.c:543 src/messageview.c:222
+#: src/mainwindow.c:544 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Configurar página..."
 
-#: src/mainwindow.c:544 src/messageview.c:223
+#: src/mainwindow.c:545 src/messageview.c:224
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:547
 msgid "Synchronise folders"
 msgstr "Sincronizar carpetas"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:549
 msgid "E_xit"
 msgstr "_Salir"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:554
 msgid "Select _thread"
 msgstr "Seleccionar _hilo"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:556
 msgid "_Find in current message..."
 msgstr "_Buscar en el mensaje actual..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:558
 msgid "_Quick search"
 msgstr "Búsqueda _rápida"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:561
 msgid "Show or hi_de"
 msgstr "Mostrar u o_cultar"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:562
 msgid "_Toolbar"
 msgstr "_Barra de herramientas"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:564
 msgid "Set displayed _columns"
 msgstr "Establecer _columnas visibles"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:565
 msgid "In _folder list..."
 msgstr "En la lista de _carpetas..."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:566
 msgid "In _message list..."
 msgstr "En la lista de _mensajes..."
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:571
 msgid "La_yout"
 msgstr "_Aspecto"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:573
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:575
 msgid "_Attract by subject"
 msgstr "_Atraer por asunto"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:577
 msgid "E_xpand all threads"
 msgstr "E_xpandir todos los hilos"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:578
 msgid "Co_llapse all threads"
 msgstr "Co_lapsar todos los hilos"
 
-#: src/mainwindow.c:579 src/messageview.c:234
+#: src/mainwindow.c:580 src/messageview.c:235
 msgid "_Go to"
 msgstr "_Ir a"
 
-#: src/mainwindow.c:580 src/messageview.c:235
+#: src/mainwindow.c:581 src/messageview.c:236
 msgid "_Previous message"
 msgstr "Mensaje _anterior"
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:582 src/messageview.c:237
 msgid "_Next message"
 msgstr "Mensaje _siguiente"
 
-#: src/mainwindow.c:583 src/messageview.c:238
+#: src/mainwindow.c:584 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "Mensaje a_nterior no leído"
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:585 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "Mensaje s_iguiente no leído"
 
-#: src/mainwindow.c:586 src/messageview.c:241
+#: src/mainwindow.c:587 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "Mensaje nue_vo anterior"
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:588 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "Mensaje nuev_o siguiente"
 
-#: src/mainwindow.c:589 src/messageview.c:244
+#: src/mainwindow.c:590 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "Mensaje _marcado anterior"
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:591 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "Mensaje m_arcado siguiente"
 
-#: src/mainwindow.c:592 src/messageview.c:247
+#: src/mainwindow.c:593 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Mensaje _etiquetado anterior"
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:594 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Mensaje e_tiquetado siguiente"
 
-#: src/mainwindow.c:595 src/messageview.c:250
-msgid "Previous opened message"
-msgstr "Mensaje abierto anterior"
+#: src/mainwindow.c:596
+msgid "Previously opened message"
+msgstr "Mensaje abierto previamente"
 
-#: src/mainwindow.c:596 src/messageview.c:251
+#: src/mainwindow.c:597 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Mensaje abierto siguiente"
 
-#: src/mainwindow.c:598 src/messageview.c:253
+#: src/mainwindow.c:599 src/messageview.c:254
 msgid "Parent message"
 msgstr "Mensaje padre"
 
-#: src/mainwindow.c:600 src/messageview.c:255
+#: src/mainwindow.c:601 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "Siguiente _carpeta sin leer"
 
-#: src/mainwindow.c:601 src/messageview.c:256
+#: src/mainwindow.c:602 src/messageview.c:257
 msgid "F_older..."
 msgstr "_Carpeta..."
 
-#: src/mainwindow.c:603 src/messageview.c:258 src/mimeview.c:230
+#: src/mainwindow.c:604 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "Parte siguiente"
 
-#: src/mainwindow.c:604 src/messageview.c:259 src/mimeview.c:231
+#: src/mainwindow.c:605 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Parte anterior"
 
-#: src/mainwindow.c:607 src/messageview.c:260
+#: src/mainwindow.c:608 src/messageview.c:261
 msgid "Message scroll"
 msgstr "Desplazamiento del mensaje"
 
-#: src/mainwindow.c:608 src/messageview.c:261
+#: src/mainwindow.c:609 src/messageview.c:262
 msgid "Previous line"
 msgstr "Línea anterior"
 
-#: src/mainwindow.c:609 src/messageview.c:262
+#: src/mainwindow.c:610 src/messageview.c:263
 msgid "Next line"
 msgstr "Línea siguiente"
 
-#: src/mainwindow.c:610 src/messageview.c:263 src/printing.c:482
+#: src/mainwindow.c:611 src/messageview.c:264 src/printing.c:482
 msgid "Previous page"
 msgstr "Página anterior"
 
-#: src/mainwindow.c:611 src/messageview.c:264 src/printing.c:488
+#: src/mainwindow.c:612 src/messageview.c:265 src/printing.c:488
 msgid "Next page"
 msgstr "Página siguiente"
 
-#: src/mainwindow.c:629 src/messageview.c:282
+#: src/mainwindow.c:630 src/messageview.c:283
 msgid "Decode"
 msgstr "Decodificar"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:637
 msgid "Open in new _window"
 msgstr "Abrir en ventana _nueva"
 
-#: src/mainwindow.c:637 src/messageview.c:289
+#: src/mainwindow.c:638 src/messageview.c:290
 msgid "Mess_age source"
 msgstr "Fuente del mens_aje"
 
-#: src/mainwindow.c:639 src/messageview.c:290
+#: src/mainwindow.c:640 src/messageview.c:291
 msgid "Message part"
 msgstr "Parte del mensaje"
 
-#: src/mainwindow.c:640 src/messageview.c:291
+#: src/mainwindow.c:641 src/messageview.c:292
 msgid "View as text"
 msgstr "Mostrar como texto"
 
-#: src/mainwindow.c:641 src/messageview.c:292 src/toolbar.c:494
+#: src/mainwindow.c:642 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "Abrir"
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:644 src/messageview.c:295
 msgid "Open with..."
 msgstr "Abrir con..."
 
-#: src/mainwindow.c:647 src/messageview.c:297
+#: src/mainwindow.c:648 src/messageview.c:298
 msgid "Quotes"
 msgstr "Citas"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:650
 msgid "_Update summary"
 msgstr "_Actualizar resumen"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:653
 msgid "Recei_ve"
 msgstr "Reci_bir"
 
-#: src/mainwindow.c:653
+#: src/mainwindow.c:654
 msgid "Get from _current account"
 msgstr "De la cuenta _actual"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:655
 msgid "Get from _all accounts"
 msgstr "De _todas las cuentas"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:656
 msgid "Cancel receivin_g"
 msgstr "Cancelar re_cepción"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:659
 msgid "_Send queued messages"
 msgstr "_Enviar mensajes en la cola"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:664
 msgid "Compose a_n email message"
 msgstr "Compo_ner un mensaje de correo"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:665
 msgid "Compose a news message"
 msgstr "Componer un mensaje de noticias"
 
-#: src/mainwindow.c:666 src/messageview.c:303
-#: src/plugins/notification/notification_banner.c:97 src/summaryview.c:426
+#: src/mainwindow.c:667 src/messageview.c:304
+#: src/plugins/notification/notification_banner.c:96 src/summaryview.c:427
 msgid "_Reply"
 msgstr "_Responder"
 
-#: src/mainwindow.c:667 src/messageview.c:304 src/summaryview.c:427
+#: src/mainwindow.c:668 src/messageview.c:305 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "Respon_der a"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/summaryview.c:430
+#: src/mainwindow.c:671 src/messageview.c:308 src/summaryview.c:431
 msgid "Mailing _list"
 msgstr "_Lista-Correo"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:672
 msgid "Follow-up and reply to"
 msgstr "Seguir y responder a"
 
-#: src/mainwindow.c:674 src/messageview.c:310 src/summaryview.c:432
-#: src/toolbar.c:2449
+#: src/mainwindow.c:675 src/messageview.c:311 src/summaryview.c:433
+#: src/toolbar.c:2491
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: src/mainwindow.c:675 src/messageview.c:311 src/summaryview.c:433
-#: src/toolbar.c:2450
+#: src/mainwindow.c:676 src/messageview.c:312 src/summaryview.c:434
+#: src/toolbar.c:2492
 msgid "For_ward as attachment"
 msgstr "Reen_viar como adjunto"
 
-#: src/mainwindow.c:676 src/messageview.c:312 src/summaryview.c:434
-#: src/toolbar.c:2451
+#: src/mainwindow.c:677 src/messageview.c:313 src/summaryview.c:435
+#: src/toolbar.c:2493
 msgid "Redirec_t"
 msgstr "Redirigi_r"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:679
 msgid "Mailing-_List"
 msgstr "Lista-Correo"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:680
 msgid "Post"
 msgstr "Postear"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:682
+msgid "Help"
+msgstr "Ayuda"
+
+#: src/mainwindow.c:686
 msgid "Unsubscribe"
 msgstr "Desuscribir"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:688
 msgid "View archive"
 msgstr "Ver archivo"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:690
 msgid "Contact owner"
 msgstr "Contactar proprietario"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:694
 msgid "M_ove..."
 msgstr "M_over..."
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:695
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:696
 msgid "Move to _trash"
 msgstr "Mover a la p_apelera"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:697
 msgid "_Delete..."
 msgstr "_Borrar..."
 
-#: src/mainwindow.c:697
+#: src/mainwindow.c:698
 msgid "Move thread to tr_ash"
 msgstr "Mover hilo a la p_apelera"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:699
 msgid "Delete t_hread"
 msgstr "Borrar _hilo"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:700
 msgid "Cancel a news message"
 msgstr "Cancelar una noticia"
 
-#: src/mainwindow.c:702 src/mainwindow.c:703 src/summaryview.c:435
+#: src/mainwindow.c:703 src/mainwindow.c:704 src/summaryview.c:436
 msgid "_Mark"
 msgstr "_Marcar"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:705
 msgid "_Unmark"
 msgstr "_Desmarcar"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:708
 msgid "Mark as rea_d"
 msgstr "Marcar como _leído"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:709
 msgid "Mark as unr_ead"
 msgstr "Marcar como _no leído"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:711
 msgid "Mark all read in folder"
 msgstr "Marcar todos como leídos en la carpeta"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:712
 msgid "Mark all unread in folder"
 msgstr "Marcar todos como no leídos en la carpeta"
 
-#: src/mainwindow.c:713 src/prefs_filtering_action.c:191 src/toolbar.c:242
-#: src/toolbar.c:503
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:191 src/toolbar.c:245
+#: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Ignorar hilo"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:715
 msgid "Unignore thread"
 msgstr "Dejar de ignorar hilo"
 
-#: src/mainwindow.c:715 src/prefs_filtering_action.c:192 src/toolbar.c:243
-#: src/toolbar.c:504
+#: src/mainwindow.c:716 src/prefs_filtering_action.c:192 src/toolbar.c:246
+#: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Observar hilo"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:717
 msgid "Unwatch thread"
 msgstr "Dejar de observar hilo"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:720
 msgid "Mark as _spam"
 msgstr "Marcar como ba_sura"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:721
 msgid "Mark as _ham"
 msgstr "Marcar como _bueno"
 
-#: src/mainwindow.c:723 src/prefs_filtering_action.c:175 src/toolbar.c:507
+#: src/mainwindow.c:724 src/prefs_filtering_action.c:175 src/toolbar.c:517
 msgid "Lock"
 msgstr "Bloquear"
 
-#: src/mainwindow.c:724 src/prefs_filtering_action.c:176 src/toolbar.c:508
+#: src/mainwindow.c:725 src/prefs_filtering_action.c:176 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: src/mainwindow.c:726 src/summaryview.c:436
+#: src/mainwindow.c:727 src/summaryview.c:437
 msgid "Color la_bel"
 msgstr "Etiqueta de co_lor"
 
-#: src/mainwindow.c:727 src/summaryview.c:437
+#: src/mainwindow.c:728 src/summaryview.c:438
 msgid "Ta_gs"
 msgstr "Eti_quetas"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:731
 msgid "Re-_edit"
 msgstr "Re_editar"
 
-#: src/mainwindow.c:733 src/messageview.c:313 src/mimeview.c:1051
+#: src/mainwindow.c:734 src/messageview.c:314 src/mimeview.c:1052
 msgid "Check signature"
 msgstr "Verificar firma"
 
-#: src/mainwindow.c:738 src/messageview.c:317
+#: src/mainwindow.c:739 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "Añadir _remitente a la agenda"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:741
 msgid "C_ollect addresses"
 msgstr "Rec_olectar direcciones"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:742
 msgid "From current _folder..."
 msgstr "De la _carpeta actual..."
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:743
 msgid "From selected _messages..."
 msgstr "De los _mensajes seleccionados..."
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:746
 msgid "_Filter all messages in folder"
 msgstr "_Filtrar todos los mensajes en la carpeta"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:747
 msgid "Filter _selected messages"
 msgstr "_Filtrar los mensajes seleccionados"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:748
 msgid "Run folder pr_ocessing rules"
 msgstr "Ejecutar reglas de procesamiento de la carpeta"
 
-#: src/mainwindow.c:749 src/messageview.c:320
+#: src/mainwindow.c:750 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "Crear regla de f_iltrado"
 
-#: src/mainwindow.c:750 src/mainwindow.c:756 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:751 src/mainwindow.c:758 src/messageview.c:322
+#: src/messageview.c:329
 msgid "_Automatically"
 msgstr "_Automático"
 
-#: src/mainwindow.c:751 src/mainwindow.c:757 src/mainwindow.c:864
-#: src/messageview.c:322 src/messageview.c:328
+#: src/mainwindow.c:752 src/mainwindow.c:759 src/mainwindow.c:867
+#: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "Por el _Desde"
 
-#: src/mainwindow.c:752 src/mainwindow.c:758 src/mainwindow.c:865
-#: src/messageview.c:323 src/messageview.c:329
+#: src/mainwindow.c:753 src/mainwindow.c:760 src/mainwindow.c:868
+#: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "Por el _Para"
 
-#: src/mainwindow.c:753 src/mainwindow.c:759 src/messageview.c:324
-#: src/messageview.c:330
+#: src/mainwindow.c:754 src/mainwindow.c:761 src/messageview.c:325
+#: src/messageview.c:332
 msgid "By _Subject"
 msgstr "Por el A_sunto"
 
-#: src/mainwindow.c:755 src/messageview.c:326 src/summaryview.c:440
+#: src/mainwindow.c:755 src/mainwindow.c:762 src/messageview.c:326
+#: src/messageview.c:333
+msgid "By S_ender"
+msgstr "Por R_emitente"
+
+#: src/mainwindow.c:757 src/messageview.c:328 src/summaryview.c:441
 msgid "Create processing rule"
 msgstr "Crear regla de procesamiento"
 
-#: src/mainwindow.c:762 src/messageview.c:333
+#: src/mainwindow.c:765 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "Listar _URLs..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "Ch_eck for new messages in all folders"
 msgstr "Comprobar m_ensajes nuevos en todas las carpetas"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "Delete du_plicated messages"
 msgstr "Borrar los mensajes re_petidos"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "In selected folder"
 msgstr "En la carpeta seleccionada"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "In all folders"
 msgstr "En todas las carpetas"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "E_xecute"
 msgstr "E_jecutar"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "Exp_unge"
 msgstr "P_urgar"
 
-#: src/mainwindow.c:779
-msgid "SSL/TLS cer_tificates"
-msgstr "Cer_tificados SSL/TLS"
-
 #: src/mainwindow.c:782
+msgid "TLS cer_tificates"
+msgstr "Cer_tificados TLS"
+
+#: src/mainwindow.c:785
 msgid "Filtering Lo_g"
 msgstr "Traza de f_iltrado"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:786
 msgid "Network _Log"
 msgstr "Tra_za de red"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:788
 msgid "Debug _Log"
 msgstr "Traza de _depuración"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:791
 msgid "_Forget all session passwords"
 msgstr "_Olvidar todas las contraseñas de sesión"
 
-#: src/mainwindow.c:790
-msgid "Forget _master passphrase"
-msgstr "Olvidar la contraseña _maestra"
+#: src/mainwindow.c:793
+msgid "Forget _primary passphrase"
+msgstr "Olvidar la contraseña _primaria"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:797
 msgid "C_hange current account"
 msgstr "_Cambiar cuenta actual"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:799
 msgid "_Preferences for current account..."
 msgstr "_Preferencias de la cuenta actual..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:800
 msgid "Create _new account..."
 msgstr "Crear _nueva cuenta..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:801
 msgid "_Edit accounts..."
 msgstr "_Editar cuentas..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:804
 msgid "P_references..."
 msgstr "P_referencias..."
 
-#: src/mainwindow.c:802
+#: src/mainwindow.c:805
 msgid "Pre-pr_ocessing..."
 msgstr "Pre-pr_ocesamiento..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:806
 msgid "Post-pro_cessing..."
 msgstr "Post-pro_cesamiento..."
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:807
 msgid "_Filtering..."
 msgstr "_Filtrado..."
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:808
 msgid "_Templates..."
 msgstr "_Plantillas..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:809
 msgid "_Actions..."
 msgstr "_Acciones..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:810
 msgid "Tag_s..."
 msgstr "Etiqueta_s..."
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:812
 msgid "Plu_gins..."
 msgstr "_Módulos..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:815
 msgid "_Manual"
 msgstr "_Manual"
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:816
 msgid "_Online User-contributed FAQ"
 msgstr "P_F de usuarios en línea (FAQ)"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:817
 msgid "Icon _Legend"
 msgstr "_Leyenda de iconos"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:819
 msgid "Set as default client"
 msgstr "Establecer como cliente predeterminado"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:826
 msgid "Offline _mode"
 msgstr "_Modo sin conexión"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:827
 msgid "Men_ubar"
 msgstr "Barra de men_u"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:828
 msgid "_Message view"
 msgstr "Vista de _mensaje"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:830
 msgid "Status _bar"
 msgstr "_Barra de estado"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:832
 msgid "Column headers"
 msgstr "Cabeceras de columna"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:833
 msgid "Th_read view"
 msgstr "_Vista jerárquica"
 
-#: src/mainwindow.c:831 src/prefs_summaries.c:667
+#: src/mainwindow.c:834 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Ocultar los hilos leídos"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:835
 msgid "_Hide read messages"
 msgstr "_Ocultar los mensajes leídos"
 
-#: src/mainwindow.c:833 src/prefs_summaries.c:673
+#: src/mainwindow.c:836 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Ocultar los mensajes borrados"
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:837
 msgid "_Fullscreen"
 msgstr "Pantalla _completa"
 
-#: src/mainwindow.c:835 src/messageview.c:345
+#: src/mainwindow.c:838 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Mostrar todas las ca_beceras"
 
-#: src/mainwindow.c:836 src/messageview.c:346
+#: src/mainwindow.c:839 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "Co_lapsar todos"
 
-#: src/mainwindow.c:837 src/messageview.c:347
+#: src/mainwindow.c:840 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "Colapsar desde el nivel _2"
 
-#: src/mainwindow.c:838 src/messageview.c:348
+#: src/mainwindow.c:841 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Colapsar desde el nivel _3"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:845
 msgid "Text _below icons"
 msgstr "Texto _bajo los iconos"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:846
 msgid "Text be_side icons"
 msgstr "Texto _junto a los iconos"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:847
 msgid "_Icons only"
 msgstr "Sólo _iconos"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:848
 msgid "_Text only"
 msgstr "Sólo _texto"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:855
 msgid "_Standard"
 msgstr "_Estándar"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:856
 msgid "_Three columns"
 msgstr "_Tres columnas"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:857
 msgid "_Wide message"
 msgstr "Mensaje _ancho"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:858
 msgid "W_ide message list"
 msgstr "L_ista de mensajes ancha"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:859
 msgid "S_mall screen"
 msgstr "_Pantalla pequeña"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:863
 msgid "By _number"
 msgstr "Por _número"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:864
 msgid "By s_ize"
 msgstr "Por _tamaño"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:865
 msgid "By _date"
 msgstr "Por _fecha"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:866
 msgid "By thread date"
 msgstr "Por fecha del hilo"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:869
 msgid "By s_ubject"
 msgstr "Por el as_unto"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:870
 msgid "By _color label"
 msgstr "Por el _color"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:871
 msgid "By tag"
 msgstr "Por la etiqueta"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:872
 msgid "By _mark"
 msgstr "Por _marca"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:873
 msgid "By _status"
 msgstr "Por e_stado"
 
-#: src/mainwindow.c:871
+#: src/mainwindow.c:874
 msgid "By a_ttachment"
 msgstr "Por adjun_to"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:875
 msgid "By score"
 msgstr "Por puntuación"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:876
 msgid "By locked"
 msgstr "Por bloqueado"
 
-#: src/mainwindow.c:874
+#: src/mainwindow.c:877
 msgid "D_on't sort"
 msgstr "N_o ordenar"
 
-#: src/mainwindow.c:878 src/prefs_summaries.c:654
+#: src/mainwindow.c:881 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: src/mainwindow.c:879 src/prefs_summaries.c:655
+#: src/mainwindow.c:882 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "Descendente"
 
-#: src/mainwindow.c:921 src/messageview.c:390
+#: src/mainwindow.c:924 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "_Auto detectar"
 
-#: src/mainwindow.c:1299 src/summaryview.c:6472
-msgid "Apply tags..."
-msgstr "Aplicar etiquetas..."
+#: src/mainwindow.c:1299 src/summaryview.c:6489
+msgid "Modify tags..."
+msgstr "Modificar etiquetas..."
 
-#: src/mainwindow.c:1940
+#: src/mainwindow.c:1924
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Ocurrió algún error. Pulse aquí para ver la traza registrada."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1955
 msgid "You are online. Click the icon to go offline"
 msgstr "Esta conectado. Pulse en el icono para desconectarse"
 
-#: src/mainwindow.c:1962
+#: src/mainwindow.c:1958
 msgid "You are offline. Click the icon to go online"
 msgstr "Esta desconectado. Pulse en el icono para conectarse"
 
-#: src/mainwindow.c:1976
+#: src/mainwindow.c:1972
 msgid "Select account"
 msgstr "Seleccionar cuenta"
 
-#: src/mainwindow.c:2003 src/prefs_logging.c:136
+#: src/mainwindow.c:1999 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Traza del protocolo"
 
-#: src/mainwindow.c:2007
+#: src/mainwindow.c:2003
 msgid "Filtering/Processing debug log"
 msgstr "Traza de depuración de filtrado/procesamiento"
 
-#: src/mainwindow.c:2026 src/prefs_logging.c:378
+#: src/mainwindow.c:2022 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "traza de filtrado activada\n"
 
-#: src/mainwindow.c:2028 src/prefs_logging.c:380
+#: src/mainwindow.c:2024 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "traza de filtrado desactivada\n"
 
-#: src/mainwindow.c:2449 src/mainwindow.c:2456 src/mainwindow.c:2499
-#: src/mainwindow.c:2532 src/mainwindow.c:2564 src/mainwindow.c:2609
+#: src/mainwindow.c:2453 src/mainwindow.c:2460 src/mainwindow.c:2503
+#: src/mainwindow.c:2536 src/mainwindow.c:2568 src/mainwindow.c:2613
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1075
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1136
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/mainwindow.c:2610 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2614 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:2867 src/mainwindow.c:2872
+#: src/mainwindow.c:2871 src/mainwindow.c:2876
 msgid "Delete all messages in trash folders?"
 msgstr "¿Borrar todos los mensajes de las papeleras?"
 
-#: src/mainwindow.c:2868
+#: src/mainwindow.c:2872
 msgid "Don't quit"
 msgstr "No salir"
 
-#: src/mainwindow.c:2899 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: src/mainwindow.c:2900
+#: src/mainwindow.c:2904
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8133,18 +8235,18 @@ msgstr ""
 "Si especifica la ubicación de un buzón existente éste se\n"
 "escaneará automáticamente."
 
-#: src/mainwindow.c:2908 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
-#: src/mainwindow.c:2913 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
-#: src/wizard.c:742
+#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:2918 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8154,58 +8256,58 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:3385
+#: src/mainwindow.c:3389
 msgid "No posting allowed"
 msgstr "No esta permitido enviar"
 
-#: src/mainwindow.c:3940
+#: src/mainwindow.c:3949
 msgid "Mbox import has failed."
 msgstr "La importación de mbox ha fallado."
 
-#: src/mainwindow.c:3949 src/mainwindow.c:3958
+#: src/mainwindow.c:3958 src/mainwindow.c:3967
 msgid "Export to mbox has failed."
 msgstr "La exportación a mbox ha fallado."
 
-#: src/mainwindow.c:3999 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:3999 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "¿Salir de Claws Mail?"
 
-#: src/mainwindow.c:4000
+#: src/mainwindow.c:4009
 msgid "_Quit"
 msgstr "_Salir"
 
-#: src/mainwindow.c:4200
+#: src/mainwindow.c:4210
 msgid "Folder synchronisation"
 msgstr "Sincronización de carpeta"
 
-#: src/mainwindow.c:4201
+#: src/mainwindow.c:4211
 msgid "Do you want to synchronise your folders now?"
 msgstr "¿Quiere sincronizar sus carpetas ahora?"
 
-#: src/mainwindow.c:4202
+#: src/mainwindow.c:4212
 msgid "_Synchronise"
 msgstr "_Sincronizar"
 
-#: src/mainwindow.c:4680
+#: src/mainwindow.c:4695
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/mainwindow.c:4690
+#: src/mainwindow.c:4705
 msgid "No duplicate message found in selected folder.\n"
 msgstr "No se encontró ningún mensaje duplicado en la carpeta seleccionada.\n"
 
-#: src/mainwindow.c:4696
+#: src/mainwindow.c:4711
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
 msgstr[0] "Borrado %d mensaje repetido en la carpeta seleccionada.\n"
 msgstr[1] "Borrados %d mensajes repetidos en la carpeta seleccionada.\n"
 
-#: src/mainwindow.c:4700
+#: src/mainwindow.c:4715
 #, c-format
 msgid "Marked %d duplicate message for deletion in selected folder.\n"
 msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
@@ -8214,117 +8316,117 @@ msgstr[0] ""
 msgstr[1] ""
 "Marcados para borrar %d mensajes duplicados en la carpeta seleccionada.\n"
 
-#: src/mainwindow.c:4738
+#: src/mainwindow.c:4753
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Borrando los mensajes duplicados en todas las carpetas..."
 
-#: src/mainwindow.c:4744
+#: src/mainwindow.c:4759
 #, 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:4749
+#: src/mainwindow.c:4764
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "No se encontró ningún mensaje duplicado en %d carpetas.\n"
 
-#: src/mainwindow.c:4911 src/messageview.c:2631
+#: src/mainwindow.c:4926 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Seleccionar la carpeta a la que ir"
 
-#: src/mainwindow.c:5012 src/summaryview.c:5913
+#: src/mainwindow.c:5029 src/summaryview.c:5932
 msgid "Processing rules to apply before folder rules"
 msgstr "Reglas de procesamiento a aplicar antes de las de las carpetas"
 
-#: src/mainwindow.c:5020
+#: src/mainwindow.c:5037
 msgid "Processing rules to apply after folder rules"
 msgstr "Reglas de procesamiento a aplicar después de las de las carpetas"
 
-#: src/mainwindow.c:5028 src/summaryview.c:5924
+#: src/mainwindow.c:5045 src/summaryview.c:5943
 msgid "Filtering configuration"
 msgstr "Configuración de filtrado"
 
-#: src/mainwindow.c:5143
+#: src/mainwindow.c:5158
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "No se puede registrar como cliente predeterminado: imposible obtener la ruta "
 "al ejecutable."
 
-#: src/mainwindow.c:5202
+#: src/mainwindow.c:5249
 msgid "Claws Mail has been registered as default client."
 msgstr "Se ha registrado Claws Mail como cliente predeterminado."
 
-#: src/mainwindow.c:5204
+#: src/mainwindow.c:5251
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "No se puede registrar como cliente predeterminado: imposible escribir en el "
 "registro."
 
-#: src/mainwindow.c:5218 src/setup.c:91
+#: src/mainwindow.c:5265 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Revisando carpeta %s%c%s..."
 
-#: src/mainwindow.c:5362
+#: src/mainwindow.c:5409
 #, 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:217 src/matcher.c:218 src/matcher.c:219 src/matcher.c:220
-#: src/matcher.c:221 src/matcher.c:222 src/matcher.c:223 src/matcher.c:224
+#: src/matcher.c:216 src/matcher.c:217 src/matcher.c:218 src/matcher.c:219
+#: src/matcher.c:220 src/matcher.c:221 src/matcher.c:222 src/matcher.c:223
 #, c-format
 msgid "%s header"
 msgstr "cabecera %s"
 
-#: src/matcher.c:225
+#: src/matcher.c:224
 msgid "header"
 msgstr "cabecera"
 
-#: src/matcher.c:226
+#: src/matcher.c:225
 msgid "header line"
 msgstr "línea de cabecera"
 
-#: src/matcher.c:227
+#: src/matcher.c:226
 msgid "body line"
 msgstr "línea de cuerpo"
 
-#: src/matcher.c:228
+#: src/matcher.c:227
 msgid "tag"
 msgstr "etiqueta"
 
-#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
+#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
 #: src/message_search.c:215 src/prefs_matcher.c:748 src/summary_search.c:458
 msgid "Case sensitive"
 msgstr "Sensible a mayús./minús."
 
-#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
+#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
 msgid "Case insensitive"
 msgstr "Ignorar mayús./minús."
 
-#: src/matcher.c:1903
+#: src/matcher.c:1902
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "comprobando si el mensaje coincide [ %s ]\n"
 
-#: src/matcher.c:1976 src/matcher.c:1995 src/matcher.c:2008
+#: src/matcher.c:1975 src/matcher.c:1994 src/matcher.c:2007
 msgid "message matches\n"
 msgstr "el mensaje coincide\n"
 
-#: src/matcher.c:1983 src/matcher.c:2001 src/matcher.c:2010
+#: src/matcher.c:1982 src/matcher.c:2000 src/matcher.c:2009
 msgid "message does not match\n"
 msgstr "el mensaje no coincide\n"
 
-#: src/matcher.c:2275 src/matcher.c:2276 src/matcher.c:2277 src/matcher.c:2278
-#: src/matcher.c:2279 src/matcher.c:2280 src/matcher.c:2281 src/matcher.c:2282
+#: src/matcher.c:2274 src/matcher.c:2275 src/matcher.c:2276 src/matcher.c:2277
+#: src/matcher.c:2278 src/matcher.c:2279 src/matcher.c:2280 src/matcher.c:2281
 msgid "(none)"
 msgstr "(ninguna)"
 
-#: src/mbox.c:98
+#: src/mbox.c:94
 #, c-format
 msgid ""
 "Could not stat mbox file:\n"
@@ -8333,7 +8435,7 @@ msgstr ""
 "No se puede leer el fichero mbox:\n"
 "%s\n"
 
-#: src/mbox.c:104
+#: src/mbox.c:100
 #, c-format
 msgid ""
 "Could not open mbox file:\n"
@@ -8342,26 +8444,26 @@ msgstr ""
 "No se puede abrir el fichero mbox:\n"
 "%s\n"
 
-#: src/mbox.c:142
+#: src/mbox.c:138
 #, c-format
 msgid "Importing from mbox... (%ld MB imported)"
 msgid_plural "Importing from mbox... (%ld MB imported)"
 msgstr[0] "Importando desde mbox... (%ld MB importado)"
 msgstr[1] "Importando desde mbox... (%ld MB importados)"
 
-#: src/mbox.c:550
+#: src/mbox.c:547
 msgid "Overwrite mbox file"
 msgstr "Sobreescribir fichero mbox"
 
-#: src/mbox.c:551
+#: src/mbox.c:548
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Este fichero ya existe. ¿Desea sobreescribir su contenido?"
 
-#: src/mbox.c:552 src/mimeview.c:1905 src/prefs_themes.c:596
+#: src/mbox.c:549 src/mimeview.c:1818 src/prefs_themes.c:600
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: src/mbox.c:561
+#: src/mbox.c:558
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
@@ -8370,7 +8472,7 @@ msgstr ""
 "No se puede crear el fichero mbox:\n"
 "%s\n"
 
-#: src/mbox.c:565
+#: src/mbox.c:562
 msgid "Exporting to mbox..."
 msgstr "Exportar a mbox..."
 
@@ -8398,23 +8500,27 @@ msgstr "Se llegó al principio del mensaje. ¿Seguir desde el final?"
 msgid "End of message reached; continue from beginning?"
 msgstr "Se llegó al final del mensaje. ¿Seguir desde el principio?"
 
-#: src/message_search.c:334 src/summary_search.c:795
+#: src/message_search.c:334 src/summary_search.c:796
 msgid "Search finished"
 msgstr "Búsqueda concluida"
 
-#: src/messageview.c:300 src/textview.c:225
+#: src/messageview.c:251
+msgid "Previous opened message"
+msgstr "Mensaje abierto anterior"
+
+#: src/messageview.c:301 src/textview.c:248
 msgid "Compose _new message"
 msgstr "Componer un mensaje _nuevo"
 
-#: src/messageview.c:711 src/messageview.c:1433 src/messageview.c:1584
+#: src/messageview.c:717 src/messageview.c:1442 src/messageview.c:1593
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Vista de mensaje"
 
-#: src/messageview.c:842
+#: src/messageview.c:848
 msgid "<No Return-Path found>"
 msgstr "<No se encontró Return-Path>"
 
-#: src/messageview.c:849
+#: src/messageview.c:855
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8429,35 +8535,35 @@ msgstr ""
 "Dirección de retorno: %s\n"
 "Se recomienda no enviar el acuse de recibo."
 
-#: src/messageview.c:856
+#: src/messageview.c:862
 msgid "_Don't Send"
 msgstr "_No enviar"
 
-#: src/messageview.c:1363
+#: src/messageview.c:1372
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Recuperando mensaje (%s)..."
 
-#: src/messageview.c:1399 src/procmime.c:996
+#: src/messageview.c:1408 src/procmime.c:1026
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "No se puede descifrar: %s"
 
-#: src/messageview.c:1480 src/messageview.c:1488
+#: src/messageview.c:1489 src/messageview.c:1497
 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:1865
+#: src/messageview.c:1881
 #, c-format
 msgid "Show all %s."
 msgstr "Mostrar todo %s."
 
-#: src/messageview.c:1867
+#: src/messageview.c:1883
 msgid "Only the first megabyte of text is shown."
 msgstr "Mostrar sólo el primer megabyte de texto."
 
-#: src/messageview.c:1898
+#: src/messageview.c:1914
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8465,19 +8571,19 @@ msgstr ""
 "Recibió un acuse de recibo en este mensaje: éste ha sido visualizado por el "
 "destinatario."
 
-#: src/messageview.c:1901
+#: src/messageview.c:1917
 msgid "You asked for a return receipt in this message."
 msgstr "Usted solicitó acuse de recibo en este mensaje."
 
-#: src/messageview.c:1907
+#: src/messageview.c:1923
 msgid "This message asks for a return receipt."
 msgstr "Este mensaje solicita acuse de recibo."
 
-#: src/messageview.c:1908
+#: src/messageview.c:1924
 msgid "Send receipt"
 msgstr "Enviar acuse de recibo"
 
-#: src/messageview.c:1951
+#: src/messageview.c:1967
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8485,7 +8591,7 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente,\n"
 "y ha sido eliminado del servidor."
 
-#: src/messageview.c:1957
+#: src/messageview.c:1973
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8494,15 +8600,15 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s."
 
-#: src/messageview.c:1961 src/messageview.c:1983
+#: src/messageview.c:1977 src/messageview.c:1999
 msgid "Mark for download"
 msgstr "Marcar para descargar"
 
-#: src/messageview.c:1962 src/messageview.c:1974
+#: src/messageview.c:1978 src/messageview.c:1990
 msgid "Mark for deletion"
 msgstr "Marcar para eliminar"
 
-#: src/messageview.c:1967
+#: src/messageview.c:1983
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8511,12 +8617,12 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s y será descargado."
 
-#: src/messageview.c:1972 src/messageview.c:1985
-#: src/prefs_filtering_action.c:174 src/toolbar.c:506
+#: src/messageview.c:1988 src/messageview.c:2001
+#: src/prefs_filtering_action.c:174 src/toolbar.c:516
 msgid "Unmark"
 msgstr "Desmarca"
 
-#: src/messageview.c:1978
+#: src/messageview.c:1994
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8525,7 +8631,7 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s y será eliminado."
 
-#: src/messageview.c:2055
+#: src/messageview.c:2071
 #, c-format
 msgctxt "'%s' stands for 'To' then 'Cc'"
 msgid ""
@@ -8539,15 +8645,15 @@ msgstr ""
 "oficialmente dirigido a usted.\n"
 "Se recomienda no enviar el acuse de recibo."
 
-#: src/messageview.c:2063 src/messageview.c:2071
+#: src/messageview.c:2079 src/messageview.c:2086
 msgid "Return Receipt Notification"
 msgstr "Notificación de acuse de recibo"
 
-#: src/messageview.c:2065 src/messageview.c:2076
+#: src/messageview.c:2080 src/messageview.c:2091
 msgid "_Send Notification"
 msgstr "_Enviar notificación"
 
-#: src/messageview.c:2072
+#: src/messageview.c:2087
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8559,11 +8665,11 @@ msgstr ""
 "Por favor, elija la cuenta que desea utilizar para enviar la notificación de "
 "acuse de recibo:"
 
-#: src/messageview.c:2168 src/messageview.c:2187
+#: src/messageview.c:2183 src/messageview.c:2202
 msgid "Cannot print: the message doesn't contain text."
 msgstr "No se puede imprimir: el mensaje no contiene texto."
 
-#: src/messageview.c:2941
+#: src/messageview.c:2958
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8571,7 +8677,7 @@ msgstr ""
 "\n"
 "  No hay mensajes en esta carpeta"
 
-#: src/messageview.c:2949
+#: src/messageview.c:2966
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8579,7 +8685,7 @@ msgstr ""
 "\n"
 "  El mensaje se ha borrado"
 
-#: src/messageview.c:2950
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8587,8 +8693,8 @@ msgstr ""
 "\n"
 "  El mensaje se ha borrado o movido a otra carpeta"
 
-#: src/messageview.c:2983 src/messageview.c:2989 src/summaryview.c:4394
-#: src/summaryview.c:7271
+#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4404
+#: src/summaryview.c:7290
 msgid "An error happened while learning.\n"
 msgstr "Ocurrió un error mientras se aprendía.\n"
 
@@ -8596,7 +8702,7 @@ msgstr "Ocurrió un error mientras se aprendía.\n"
 msgid "Moving messages..."
 msgstr "Moviendo mensajes..."
 
-#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:836
 msgid "Deleting messages..."
 msgstr "Borrando mensajes..."
 
@@ -8604,7 +8710,7 @@ msgstr "Borrando mensajes..."
 msgid "Remove _mailbox..."
 msgstr "Eliminar _buzón..."
 
-#: src/mh_gtk.c:222
+#: src/mh_gtk.c:223
 #, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
@@ -8615,7 +8721,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/mh_gtk.c:372 src/plugins/mailmbox/plugin_gtk.c:299
+#: src/mh_gtk.c:373 src/plugins/mailmbox/plugin_gtk.c:299
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
@@ -8624,10 +8730,14 @@ msgstr ""
 "¿Eliminar realmente el buzón «%s»?\n"
 "(Los mensajes NO serán borrados del disco)"
 
-#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 msgid "Remove mailbox"
 msgstr "Eliminar buzón"
 
+#: src/mimeview.c:221
+msgid "_Open"
+msgstr "_Abrir"
+
 #: src/mimeview.c:223
 msgid "Open _with..."
 msgstr "Abrir _con..."
@@ -8656,21 +8766,21 @@ msgstr "Gu_ardar todo..."
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: src/mimeview.c:1056 src/mimeview.c:1061 src/mimeview.c:1066
-#: src/mimeview.c:1071
+#: src/mimeview.c:1057 src/mimeview.c:1062 src/mimeview.c:1067
+#: src/mimeview.c:1072
 msgid "View full information"
 msgstr "Ver la información completa"
 
-#: src/mimeview.c:1077
+#: src/mimeview.c:1079
 msgid "Check again"
 msgstr "Verificar de nuevo"
 
-#: src/mimeview.c:1089
+#: src/mimeview.c:1092
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Pulse en el icono para comprobarla."
 
-#: src/mimeview.c:1091
+#: src/mimeview.c:1094
 #, 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."
@@ -8688,27 +8798,38 @@ msgstr ""
 "Expiró el tiempo comprobando la firma. Pulse en el icono o la tecla «%s» "
 "para reintentarlo."
 
-#: src/mimeview.c:1348
+#: src/mimeview.c:1110
+msgid "Error checking the signature. Click the icon to try again."
+msgstr "Error comprobando la firma. Pulse en el icono para reintentarlo."
+
+#: src/mimeview.c:1112
+#, c-format
+msgid "Error checking the signature. Click the icon or hit '%s' to try again."
+msgstr ""
+"Error comprobando la firma. Pulse en el icono o la tecla «%s» para "
+"reintentarlo."
+
+#: src/mimeview.c:1231
 msgid "Checking signature..."
 msgstr "Verificando firma..."
 
-#: src/mimeview.c:1389
+#: src/mimeview.c:1286
 msgid "Go back to email"
 msgstr "Volver al correo"
 
-#: src/mimeview.c:1823 src/mimeview.c:1915 src/mimeview.c:2157
-#: src/mimeview.c:2193 src/mimeview.c:2305 src/plugins/fancy/fancy_viewer.c:501
-#: src/plugins/fancy/fancy_viewer.c:530
+#: src/mimeview.c:1736 src/mimeview.c:1828 src/mimeview.c:2070
+#: src/mimeview.c:2106 src/mimeview.c:2218 src/plugins/fancy/fancy_viewer.c:509
+#: src/plugins/fancy/fancy_viewer.c:538
 #, 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:1902
+#: src/mimeview.c:1815
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "¿Sobreescribir el fichero existente «%s»?"
 
-#: src/mimeview.c:1926
+#: src/mimeview.c:1839
 #, c-format
 msgid ""
 "An error has occurred while saving message part #%d. Do you want to cancel "
@@ -8717,59 +8838,59 @@ msgstr ""
 "Ha ocurrido un error al guardar la parte del mensaje n.º %d. ¿Desea cancelar "
 "la operación o ignorar el error y continuar?"
 
-#: src/mimeview.c:1929
+#: src/mimeview.c:1842
 msgid "Error saving all message parts"
 msgstr "Error guardando todas las partes del mensaje"
 
-#: src/mimeview.c:1930
+#: src/mimeview.c:1843
 msgid "Skip"
 msgstr "Ignorar"
 
-#: src/mimeview.c:1930
+#: src/mimeview.c:1843
 msgid "Skip all"
 msgstr "Ignorar todos"
 
-#: src/mimeview.c:1940
+#: src/mimeview.c:1853
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] "%d fichero guardado con éxito."
 msgstr[1] "%d ficheros guardados con éxito."
 
-#: src/mimeview.c:1948
+#: src/mimeview.c:1861
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] "%d fichero guardado con éxito"
 msgstr[1] "%d ficheros guardados con éxito"
 
-#: src/mimeview.c:1953
+#: src/mimeview.c:1866
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s, %d fichero falló."
 msgstr[1] "%s, %d ficheros fallaron."
 
-#: src/mimeview.c:1986 src/plugins/archive/archiver_prefs.c:142
+#: src/mimeview.c:1899 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Seleccionar carpeta destino"
 
-#: src/mimeview.c:1993 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1906 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "«%s» no es un directorio."
 
-#: src/mimeview.c:2110 src/plugins/fancy/fancy_viewer.c:800
-#: src/summaryview.c:5006
+#: src/mimeview.c:2023 src/plugins/fancy/fancy_viewer.c:812
+#: src/summaryview.c:5017
 msgid "Save as"
 msgstr "Guardar como"
 
-#: src/mimeview.c:2240 src/mimeview.c:2247
+#: src/mimeview.c:2153 src/mimeview.c:2160
 msgid "Open with"
 msgstr "Abrir con"
 
-#: src/mimeview.c:2241 src/mimeview.c:2248
+#: src/mimeview.c:2154 src/mimeview.c:2161
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8778,7 +8899,7 @@ msgstr ""
 "Teclee la orden para abrir el fichero:\n"
 "(«%s» será sustituido por el fichero)"
 
-#: src/mimeview.c:2343
+#: src/mimeview.c:2256
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8789,11 +8910,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2351
+#: src/mimeview.c:2264
 msgid "Execute untrusted binary?"
 msgstr "¿Ejecutar binario no fiable?"
 
-#: src/mimeview.c:2352
+#: src/mimeview.c:2265
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8805,22 +8926,22 @@ msgstr ""
 "\n"
 "¿Desea ejecutar este fichero?"
 
-#: src/mimeview.c:2356
+#: src/mimeview.c:2269
 msgid "Run binary"
 msgstr "Ejecutar programa"
 
-#: src/mimeview.c:2657 src/plugins/att_remover/att_remover.c:305
+#: src/mimeview.c:2571 src/plugins/att_remover/att_remover.c:304
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/mimeview.c:2658 src/plugins/att_remover/att_remover.c:306
-#: src/plugins/pdf_viewer/poppler_viewer.c:706 src/summaryview.c:2778
+#: src/mimeview.c:2572 src/plugins/att_remover/att_remover.c:305
+#: src/plugins/pdf_viewer/poppler_viewer.c:706 src/summaryview.c:2784
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: src/mimeview.c:2672 src/plugins/vcalendar/vcalendar.c:1243
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1618
+#: src/mimeview.c:2586 src/plugins/vcalendar/vcalendar.c:1244
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
 msgstr "Descripción:"
 
@@ -8870,34 +8991,34 @@ msgstr ""
 msgid "couldn't select group: %s\n"
 msgstr "no se pudo seleccionar el grupo: %s\n"
 
-#: src/news.c:1067 src/news.c:1253
+#: src/news.c:1068 src/news.c:1254
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "no se pudo establecer el grupo: %s\n"
 
-#: src/news.c:1076
+#: src/news.c:1077
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rango de artículos inválido: %d - %d\n"
 
-#: src/news.c:1154 src/news.c:1181 src/news.c:1208
+#: src/news.c:1155 src/news.c:1182 src/news.c:1209
 msgid "couldn't get xhdr\n"
 msgstr "no se pudo obtener xhdr\n"
 
-#: src/news.c:1246
+#: src/news.c:1247
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obteniendo xover %d - %d en %s...\n"
 
-#: src/news.c:1261
+#: src/news.c:1262
 msgid "couldn't get xover\n"
 msgstr "no se pudo obtener xover\n"
 
-#: src/news.c:1278
+#: src/news.c:1279
 msgid "invalid xover line\n"
 msgstr "línea xover inválida\n"
 
-#: src/news.c:1480
+#: src/news.c:1481
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -8927,73 +9048,83 @@ msgstr "¿Desuscribirse realmente del grupo «%s»?"
 msgid "Unsubscribe newsgroup"
 msgstr "Desuscribir grupo de noticias"
 
-#: src/news_gtk.c:291
+#: src/news_gtk.c:294
 msgid "Rename newsgroup folder"
 msgstr "Renombrar carpeta de grupo de noticias"
 
-#: src/oauth2.c:238
-msgid "OAuth2 missing authentication code\n"
-msgstr "Falta el código de autenticación de OAuth2\n"
+#: src/oauth2.c:239
+msgid "OAuth2 missing authorization code\n"
+msgstr "Falta el código de autorización de OAuth2\n"
 
-#: src/oauth2.c:244 src/oauth2.c:359
+#: src/oauth2.c:245 src/oauth2.c:398
 msgid "OAuth2 connection error\n"
 msgstr "Error de conexión OAuth2\n"
 
-#: src/oauth2.c:253 src/oauth2.c:367
-msgid "OAuth2 SSL connection error\n"
-msgstr "Error de conexión OAuth2 SSL/TLS\n"
+#: src/oauth2.c:255 src/oauth2.c:407
+msgid "OAuth2 TLS connection error\n"
+msgstr "Error de conexión OAuth2 TLS\n"
 
-#: src/oauth2.c:311 src/oauth2.c:418
+#: src/oauth2.c:346 src/oauth2.c:480
 msgid "OAuth2 access token obtained\n"
 msgstr "Se obtuvo el token de acceso de OAuth2\n"
 
-#: src/oauth2.c:313 src/oauth2.c:420 src/oauth2.c:546
+#: src/oauth2.c:348 src/oauth2.c:482 src/oauth2.c:658
 msgid "OAuth2 access token not obtained\n"
 msgstr "No se obtuvo el token de acceso de OAuth2\n"
 
-#: src/oauth2.c:320
+#: src/oauth2.c:355
 msgid "OAuth2 refresh token obtained\n"
 msgstr "Se obtuvo el token de refresco de OAuth2\n"
 
-#: src/oauth2.c:322
+#: src/oauth2.c:357
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "No se obtuvo el token de refresco de OAuth2\n"
 
-#: src/oauth2.c:452
+#: src/oauth2.c:489
+msgid "OAuth2 replacement refresh token provided\n"
+msgstr "Se obtuvo el reemplazo del token de refresco de OAuth2\n"
+
+#: src/oauth2.c:491
+msgid "OAuth2 replacement refresh token not provided\n"
+msgstr "No se obtuvo el reemplazo del token de refresco de OAuth2\n"
+
+#: src/oauth2.c:522
 msgid "OAuth2 socket write error\n"
 msgstr "Error de escritura en el conector de OAuth2\n"
 
-#: src/oauth2.c:472
-msgid "OAuth2 socket timeout error \n"
+#: src/oauth2.c:544
+msgid "OAuth2 socket timeout error\n"
 msgstr "Tiempo de espera agotado en el conector de OAuth2\n"
 
-#: src/oauth2.c:528
+#: src/oauth2.c:638
 msgid "OAuth2 access token still fresh\n"
 msgstr "El token de acceso de OAuth2 está fresco todavía\n"
 
-#: src/oauth2.c:534
+#: src/oauth2.c:645
 msgid "OAuth2 obtaining access token using refresh token\n"
 msgstr "Obteniendo token de acceso usando el token de refresco de OAuth2\n"
 
-#: src/oauth2.c:538
-msgid "OAuth2 trying for fresh access token with auth code\n"
-msgstr "Intentando un nuevo token de acceso OAuth2 con el código de autenticación\n"
+#: src/oauth2.c:649
+msgid "OAuth2 trying for fresh access token with authorization code\n"
+msgstr ""
+"Intentando un nuevo token de acceso OAuth2 con el código de "
+"autorización\n"
 
-#: src/oauth2.c:552
-msgid "OAuth2 access token updated\n"
-msgstr "Se actualizó el token de acceso OAuth2\n"
+#: src/oauth2.c:666
+msgid "OAuth2 access and refresh token updated\n"
+msgstr "Se actualizaron los tokens de acceso y de refresco de OAuth2\n"
 
-#: src/oauth2.c:583
+#: src/oauth2.c:698
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "Original OAuth2: %s\n"
 
-#: src/oauth2.c:584
+#: src/oauth2.c:699
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "Codificado OAuth2: %s\n"
 
-#: src/oauth2.c:585
+#: src/oauth2.c:700
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -9003,51 +9134,52 @@ msgstr ""
 "\n"
 
 #: src/password.c:128 src/password.c:129
-msgid "Input master passphrase"
-msgstr "Introduzca la contraseña maestra"
+msgid "Input primary passphrase"
+msgstr "Introduzca la contraseña primaria"
 
 #: src/password.c:141
-msgid "Incorrect master passphrase."
-msgstr "Contraseña maestra incorrecta."
+msgid "Incorrect primary passphrase."
+msgstr "Contraseña primaria incorrecta."
 
 #: src/password_gtk.c:66
 msgid "New passphrases do not match, try again."
 msgstr "Las nuevas contraseñas no coinciden, inténtelo de nuevo."
 
 #: src/password_gtk.c:79
-msgid "Incorrect old master passphrase entered, try again."
+msgid "Incorrect old primary passphrase entered, try again."
 msgstr ""
-"Se introdujo una contraseña maestra antigua incorrecta, inténtelo de nuevo."
+"Se introdujo una contraseña primaria antigua incorrecta, inténtelo de "
+"nuevo."
 
-#: src/password_gtk.c:144
-msgid "Changing master passphrase"
-msgstr "Cambiando contraseña maestra"
+#: src/password_gtk.c:143
+msgid "Changing primary passphrase"
+msgstr "Cambiando la contraseña primaria"
 
-#: src/password_gtk.c:165
+#: src/password_gtk.c:164
 msgid ""
-"If a master passphrase is currently active, it\n"
+"If a primary passphrase is currently active, it\n"
 "needs to be entered."
 msgstr ""
-"Si una contraseña maestra está activa actualmente\n"
+"Si una contraseña primaria está activa actualmente\n"
 "es necesario que la introduzca."
 
-#: src/password_gtk.c:175
+#: src/password_gtk.c:174
 msgid "Old passphrase:"
 msgstr "Contraseña antigua:"
 
-#: src/password_gtk.c:189
+#: src/password_gtk.c:188
 msgid "New passphrase:"
 msgstr "Contraseña nueva:"
 
-#: src/password_gtk.c:200
+#: src/password_gtk.c:199
 msgid "Confirm passphrase:"
 msgstr "Confirmar contraseña:"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:55
+#: src/plugins/acpi_notifier/acpi_notifier.c:54
 msgid "Acpi Notifier"
 msgstr "Notificador ACPI"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:71
+#: src/plugins/acpi_notifier/acpi_notifier.c:70
 msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
@@ -9055,7 +9187,7 @@ msgstr ""
 "Asegúrese de que el módulo del núcleo «acerhk» está cargado.\n"
 "Puede obtenerlo de http://www.cakey.de/acerhk/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:73
+#: src/plugins/acpi_notifier/acpi_notifier.c:72
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
@@ -9063,19 +9195,19 @@ msgstr ""
 "Asegúrese de que el módulo del núcleo «acer_acpi» está cargado.\n"
 "Puede obtenerlo de http://code.google.com/p/aceracpi/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:75
+#: src/plugins/acpi_notifier/acpi_notifier.c:74
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
 msgstr "Asegúrese de que el módulo del núcleo «asus_laptop» está cargado."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:76
+#: src/plugins/acpi_notifier/acpi_notifier.c:75
 msgid "Make sure that the kernel module 'asus_acpi' is loaded."
 msgstr "Asegúrese de que el módulo del núcleo «asus_acpi» está cargado."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:77
+#: src/plugins/acpi_notifier/acpi_notifier.c:76
 msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
 msgstr "Asegúrese de que el módulo del núcleo «ibm_acpi» está cargado."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:78
+#: src/plugins/acpi_notifier/acpi_notifier.c:77
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
@@ -9083,78 +9215,79 @@ msgstr ""
 "Asegúrese de que tiene apanelc instalado.\n"
 "Puede obtenerlo de http://apanel.sourceforge.net/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:211
-#: src/plugins/acpi_notifier/acpi_notifier.c:217
-#: src/plugins/acpi_notifier/acpi_notifier.c:419
+#: src/plugins/acpi_notifier/acpi_notifier.c:210
+#: src/plugins/acpi_notifier/acpi_notifier.c:216
+#: src/plugins/acpi_notifier/acpi_notifier.c:418
 msgid "Control file doesn't exist."
 msgstr "El fichero de control no existe."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:300
+#: src/plugins/acpi_notifier/acpi_notifier.c:299
 msgid " : no new or unread mail"
 msgstr " : no hay correo nuevo o sin leer"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:301
+#: src/plugins/acpi_notifier/acpi_notifier.c:300
 msgid " : unread mail"
 msgstr " : mensajes sin leer"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:302
+#: src/plugins/acpi_notifier/acpi_notifier.c:301
 msgid " : new mail"
 msgstr " : mensajes nuevos"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:304
-#: src/plugins/acpi_notifier/acpi_notifier.c:310
-#: src/plugins/acpi_notifier/acpi_notifier.c:316
+#: src/plugins/acpi_notifier/acpi_notifier.c:303
+#: src/plugins/acpi_notifier/acpi_notifier.c:309
+#: src/plugins/acpi_notifier/acpi_notifier.c:315
 msgid "off"
 msgstr "apagado"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:306
-#: src/plugins/acpi_notifier/acpi_notifier.c:312
-#: src/plugins/acpi_notifier/acpi_notifier.c:318
+#: src/plugins/acpi_notifier/acpi_notifier.c:305
+#: src/plugins/acpi_notifier/acpi_notifier.c:311
+#: src/plugins/acpi_notifier/acpi_notifier.c:317
 msgid "blinking"
 msgstr "parpadeante"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:308
-#: src/plugins/acpi_notifier/acpi_notifier.c:314
-#: src/plugins/acpi_notifier/acpi_notifier.c:320
+#: src/plugins/acpi_notifier/acpi_notifier.c:307
+#: src/plugins/acpi_notifier/acpi_notifier.c:313
+#: src/plugins/acpi_notifier/acpi_notifier.c:319
 msgid "on"
 msgstr "encendido"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:341
-#: src/plugins/acpi_notifier/acpi_notifier.c:350
-#: src/plugins/acpi_notifier/acpi_notifier.c:365
+#: src/plugins/acpi_notifier/acpi_notifier.c:340
+#: src/plugins/acpi_notifier/acpi_notifier.c:349
+#: src/plugins/acpi_notifier/acpi_notifier.c:364
 msgid "LED "
 msgstr "LED "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:380
+#: src/plugins/acpi_notifier/acpi_notifier.c:379
 msgid "ACPI type: "
 msgstr "Tipo de ACPI: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:389
+#: src/plugins/acpi_notifier/acpi_notifier.c:388
 msgid "ACPI file: "
 msgstr "Fichero ACPI: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:400
+#: src/plugins/acpi_notifier/acpi_notifier.c:399
 msgid "values - On: "
 msgstr "valores - Encendido: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:405
+#: src/plugins/acpi_notifier/acpi_notifier.c:404
 msgid " - Off: "
 msgstr " - Apagado: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:427
+#: src/plugins/acpi_notifier/acpi_notifier.c:426
 msgid "Blink when user interaction is required"
 msgstr "Parpadear cuando sea necesaria la intervención del usuario"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:853
+#: src/plugins/acpi_notifier/acpi_notifier.c:852
 msgid "This plugin handles various ACPI mail LEDs."
 msgstr "Este módulo controla algunos LEDs de notificación de correo ACPI."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:874
+#: src/plugins/acpi_notifier/acpi_notifier.c:873
 msgid "Laptop LED"
 msgstr "LED del portátil"
 
 #: src/plugins/address_keeper/address_keeper.c:252
 #: src/plugins/attachwarner/attachwarner.c:252
+#: src/plugins/keyword_warner/keyword_warner.c:230
 msgid "Failed to register check before send hook"
 msgstr "Falló el registro de la función de comprobar antes de enviar"
 
@@ -9183,7 +9316,7 @@ msgstr "Ruta en la agenda donde se guardarán las direcciones"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:126
 #: src/plugins/bogofilter/bogofilter_gtk.c:262
-#: src/plugins/bsfilter/bsfilter_gtk.c:201
+#: src/plugins/bsfilter/bsfilter_gtk.c:200
 #: src/plugins/spamassassin/spamassassin_gtk.c:458
 #: src/prefs_filtering_action.c:548 src/prefs_filtering_action.c:555
 #: src/prefs_matcher.c:688
@@ -9209,7 +9342,7 @@ msgstr ""
 "Excluir direcciones que coincidan con alguna de las siguientes expresiones "
 "regulares (una por cada línea)"
 
-#: src/plugins/archive/archiver.c:45 src/plugins/archive/archiver_prefs.c:107
+#: src/plugins/archive/archiver.c:45 src/plugins/archive/archiver_prefs.c:106
 msgid "Mail Archiver"
 msgstr "Archivado de correos"
 
@@ -9416,17 +9549,17 @@ msgstr "Nivel de compresión"
 #: src/plugins/archive/archiver_gtk.c:837
 #: src/plugins/archive/archiver_gtk.c:845
 #: src/plugins/archive/archiver_gtk.c:853
-#: src/plugins/pdf_viewer/poppler_viewer.c:725 src/prefs_folder_item.c:533
-#: src/prefs_folder_item.c:1180 src/prefs_folder_item.c:1210
+#: src/plugins/pdf_viewer/poppler_viewer.c:725 src/prefs_folder_item.c:534
+#: src/prefs_folder_item.c:1242 src/prefs_folder_item.c:1273
 msgid "Yes"
 msgstr "Sí"
 
 #: src/plugins/archive/archiver_gtk.c:837
 #: src/plugins/archive/archiver_gtk.c:845
 #: src/plugins/archive/archiver_gtk.c:853
-#: src/plugins/pdf_viewer/poppler_viewer.c:728 src/prefs_folder_item.c:532
-#: src/prefs_folder_item.c:1179 src/prefs_folder_item.c:1209
-#: src/prefs_summaries.c:409
+#: src/plugins/pdf_viewer/poppler_viewer.c:728 src/prefs_folder_item.c:533
+#: src/prefs_folder_item.c:1241 src/prefs_folder_item.c:1272
+#: src/prefs_summaries.c:407
 msgid "No"
 msgstr "No"
 
@@ -9443,7 +9576,7 @@ msgid "Delete selected files"
 msgstr "Borrar los ficheros seleccionados"
 
 #: src/plugins/archive/archiver_gtk.c:865
-#: src/plugins/archive/archiver_gtk.c:1330
+#: src/plugins/archive/archiver_gtk.c:1327
 msgid "Select mails before"
 msgstr "Seleccionar correos antes de"
 
@@ -9451,104 +9584,104 @@ msgstr "Seleccionar correos antes de"
 msgid "Select folder to archive"
 msgstr "Seleccionar carpeta a archivar"
 
-#: src/plugins/archive/archiver_gtk.c:942
+#: src/plugins/archive/archiver_gtk.c:941
 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:990
+#: src/plugins/archive/archiver_gtk.c:987
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld de %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/archive/archiver_gtk.c:1040
 msgid "Create Archive"
 msgstr "Crear un archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1058
+#: src/plugins/archive/archiver_gtk.c:1055
 msgid "Enter Archiver arguments"
 msgstr "Parámetros de archivado"
 
-#: src/plugins/archive/archiver_gtk.c:1072
+#: src/plugins/archive/archiver_gtk.c:1069
 msgid "Folder to archive"
 msgstr "Carpeta a archivar"
 
-#: src/plugins/archive/archiver_gtk.c:1079
+#: src/plugins/archive/archiver_gtk.c:1076
 msgid "Folder which is the root of the archive"
 msgstr "Carpeta raíz del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1084
+#: src/plugins/archive/archiver_gtk.c:1081
 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:1090
+#: src/plugins/archive/archiver_gtk.c:1087
 msgid "Name for archive"
 msgstr "Nombre del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1096
+#: src/plugins/archive/archiver_gtk.c:1093
 msgid "Archive location and name"
 msgstr "Ubicación y nombre del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1098
-#: src/plugins/archive/archiver_prefs.c:225
-#: src/plugins/pgpcore/select-keys.c:494
+#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_prefs.c:224
+#: src/plugins/pgpcore/select-keys.c:498
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: src/plugins/archive/archiver_gtk.c:1101
+#: src/plugins/archive/archiver_gtk.c:1098
 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:1103
+#: src/plugins/archive/archiver_gtk.c:1100
 msgid "Choose compression"
 msgstr "Elija la compresión"
 
-#: src/plugins/archive/archiver_gtk.c:1115
-#: src/plugins/archive/archiver_gtk.c:1121
-#: src/plugins/archive/archiver_gtk.c:1127
-#: src/plugins/archive/archiver_gtk.c:1134
-#: src/plugins/archive/archiver_gtk.c:1140
-#: src/plugins/archive/archiver_gtk.c:1148
-#: src/plugins/archive/archiver_gtk.c:1156
-#: src/plugins/archive/archiver_gtk.c:1162
-#: src/plugins/archive/archiver_gtk.c:1168
-#: src/plugins/archive/archiver_gtk.c:1176
-#: src/plugins/archive/archiver_gtk.c:1183
+#: src/plugins/archive/archiver_gtk.c:1112
+#: src/plugins/archive/archiver_gtk.c:1118
+#: src/plugins/archive/archiver_gtk.c:1124
+#: src/plugins/archive/archiver_gtk.c:1131
+#: src/plugins/archive/archiver_gtk.c:1137
+#: src/plugins/archive/archiver_gtk.c:1145
+#: src/plugins/archive/archiver_gtk.c:1153
+#: src/plugins/archive/archiver_gtk.c:1159
+#: src/plugins/archive/archiver_gtk.c:1165
+#: src/plugins/archive/archiver_gtk.c:1173
+#: src/plugins/archive/archiver_gtk.c:1180
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr "Elija esta opción para usar la compresión %s en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1232
+#: src/plugins/archive/archiver_gtk.c:1229
 msgid "Choose format"
 msgstr "Elegir formato"
 
-#: src/plugins/archive/archiver_gtk.c:1244
-#: src/plugins/archive/archiver_gtk.c:1250
-#: src/plugins/archive/archiver_gtk.c:1256
-#: src/plugins/archive/archiver_gtk.c:1262
+#: src/plugins/archive/archiver_gtk.c:1241
+#: src/plugins/archive/archiver_gtk.c:1247
+#: src/plugins/archive/archiver_gtk.c:1253
+#: src/plugins/archive/archiver_gtk.c:1259
 #, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr "Elija esto para usar el formato %s en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1282
+#: src/plugins/archive/archiver_gtk.c:1279
 msgid "Miscellaneous options"
 msgstr "Opciones adicionales"
 
-#: src/plugins/archive/archiver_gtk.c:1291
+#: src/plugins/archive/archiver_gtk.c:1288
 msgid "_Recursive"
 msgstr "_Recursivo"
 
-#: src/plugins/archive/archiver_gtk.c:1295
+#: src/plugins/archive/archiver_gtk.c:1292
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Incluir las subcarpetas en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1297
+#: src/plugins/archive/archiver_gtk.c:1294
 msgid "_MD5sum"
 msgstr "Suma de control _MD5"
 
-#: src/plugins/archive/archiver_gtk.c:1301
+#: src/plugins/archive/archiver_gtk.c:1298
 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"
@@ -9558,12 +9691,12 @@ msgstr ""
 "Cuidado: esta opción incrementa dramáticamente el tiempo que se tardará\n"
 "en crear el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1305
+#: src/plugins/archive/archiver_gtk.c:1302
 msgid "R_ename"
 msgstr "R_enombrar"
 
-#: src/plugins/archive/archiver_gtk.c:1309
-#: src/plugins/archive/archiver_prefs.c:427
+#: src/plugins/archive/archiver_gtk.c:1306
+#: src/plugins/archive/archiver_prefs.c:426
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
 "The naming scheme: date_from at to@subject.\n"
@@ -9573,7 +9706,7 @@ msgstr ""
 "El esquema de nombrado es: fecha_desde at para@asunto.\n"
 "Los nombres se truncarán a un máximo de 96 caracteres."
 
-#: src/plugins/archive/archiver_gtk.c:1317
+#: src/plugins/archive/archiver_gtk.c:1314
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9581,11 +9714,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:1321
+#: src/plugins/archive/archiver_gtk.c:1318
 msgid "Selection options"
 msgstr "Opciones de selección"
 
-#: src/plugins/archive/archiver_gtk.c:1337
+#: src/plugins/archive/archiver_gtk.c:1334
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9593,60 +9726,60 @@ msgstr ""
 "Seleccionar correos antes de una fecha dada\n"
 "El formato de fecha debe ser ISO-8601 (AAAA-MM-DD)"
 
-#: src/plugins/archive/archiver_prefs.c:217
+#: src/plugins/archive/archiver_prefs.c:216
 msgid "Default save folder"
 msgstr "Directorio de destino predeterminado"
 
-#: src/plugins/archive/archiver_prefs.c:229
+#: src/plugins/archive/archiver_prefs.c:228
 msgid "Click this button to select the default location for saving archives"
 msgstr ""
 "Pulse este botón para seleccionar la ubicación predeterminada para guardar "
 "los archivos"
 
-#: src/plugins/archive/archiver_prefs.c:238
+#: src/plugins/archive/archiver_prefs.c:237
 msgid "Default compression"
 msgstr "Compresión predeterminada"
 
-#: src/plugins/archive/archiver_prefs.c:249
-#: src/plugins/archive/archiver_prefs.c:255
-#: src/plugins/archive/archiver_prefs.c:261
-#: src/plugins/archive/archiver_prefs.c:268
-#: src/plugins/archive/archiver_prefs.c:274
-#: src/plugins/archive/archiver_prefs.c:282
-#: src/plugins/archive/archiver_prefs.c:290
-#: src/plugins/archive/archiver_prefs.c:296
-#: src/plugins/archive/archiver_prefs.c:302
-#: src/plugins/archive/archiver_prefs.c:310
-#: src/plugins/archive/archiver_prefs.c:317
+#: src/plugins/archive/archiver_prefs.c:248
+#: src/plugins/archive/archiver_prefs.c:254
+#: src/plugins/archive/archiver_prefs.c:260
+#: src/plugins/archive/archiver_prefs.c:267
+#: src/plugins/archive/archiver_prefs.c:273
+#: src/plugins/archive/archiver_prefs.c:281
+#: src/plugins/archive/archiver_prefs.c:289
+#: src/plugins/archive/archiver_prefs.c:295
+#: src/plugins/archive/archiver_prefs.c:301
+#: src/plugins/archive/archiver_prefs.c:309
+#: src/plugins/archive/archiver_prefs.c:316
 #, c-format
 msgid "Choose this option to use %s compression by default"
 msgstr "Elija esta opción para usar la compresión %s de manera predeterminada"
 
-#: src/plugins/archive/archiver_prefs.c:363
+#: src/plugins/archive/archiver_prefs.c:362
 msgid "Default format"
 msgstr "Formato predeterminado"
 
-#: src/plugins/archive/archiver_prefs.c:374
-#: src/plugins/archive/archiver_prefs.c:380
-#: src/plugins/archive/archiver_prefs.c:386
-#: src/plugins/archive/archiver_prefs.c:392
+#: src/plugins/archive/archiver_prefs.c:373
+#: src/plugins/archive/archiver_prefs.c:379
+#: src/plugins/archive/archiver_prefs.c:385
+#: src/plugins/archive/archiver_prefs.c:391
 #, c-format
 msgid "Choose this option to use the %s as format by default"
 msgstr "Elija esta opción para usar el formato %s de manera predeterminada"
 
-#: src/plugins/archive/archiver_prefs.c:409
+#: src/plugins/archive/archiver_prefs.c:408
 msgid "Default miscellaneous options"
 msgstr "Opciones adicionales predeterminadas"
 
-#: src/plugins/archive/archiver_prefs.c:418
+#: src/plugins/archive/archiver_prefs.c:417
 msgid "Choose this option to include subfolders in the archives by default"
 msgstr "Incluir las subcarpetas en los archivos de manera predeterminada"
 
-#: src/plugins/archive/archiver_prefs.c:419
+#: src/plugins/archive/archiver_prefs.c:418
 msgid "MD5sum"
 msgstr "Suma de control MD5"
 
-#: src/plugins/archive/archiver_prefs.c:421
+#: src/plugins/archive/archiver_prefs.c:420
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archives by "
 "default.\n"
@@ -9658,33 +9791,33 @@ msgstr ""
 "Tenga en cuenta que esto incrementará dramáticamente el tiempo\n"
 "necesario para crear los archivos"
 
-#: src/plugins/archive/archiver_prefs.c:425
+#: src/plugins/archive/archiver_prefs.c:424
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/plugins/archive/archiver_prefs.c:433
+#: src/plugins/archive/archiver_prefs.c:432
 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:338
+#: src/plugins/att_remover/att_remover.c:337
 msgid "Remove attachments"
 msgstr "Eliminar adjuntos"
 
-#: src/plugins/att_remover/att_remover.c:364
+#: src/plugins/att_remover/att_remover.c:363
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:337
 msgid "Remove"
 msgstr "Eliminar"
 
-#: src/plugins/att_remover/att_remover.c:372 src/prefs_summaries.c:643
-#: src/prefs_summary_column.c:79 src/summaryview.c:2872
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:645
+#: src/prefs_summary_column.c:79 src/summaryview.c:2878
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: src/plugins/att_remover/att_remover.c:426
+#: src/plugins/att_remover/att_remover.c:425
 msgid "Destroy attachments"
 msgstr "Destruir adjuntos"
 
-#: src/plugins/att_remover/att_remover.c:427
+#: src/plugins/att_remover/att_remover.c:426
 msgid ""
 "Do you really want to remove all attachments from the selected messages?\n"
 "\n"
@@ -9695,34 +9828,34 @@ msgstr ""
 "\n"
 "Los datos borrados no se podrán recuperar."
 
-#: src/plugins/att_remover/att_remover.c:470
+#: src/plugins/att_remover/att_remover.c:469
 msgid "The selected messages don't have any attachments."
 msgstr "El mensaje seleccionado no tiene ningún adjunto."
 
-#: src/plugins/att_remover/att_remover.c:473
+#: src/plugins/att_remover/att_remover.c:472
 #, c-format
 msgid "Attachments removed from %d of the %d selected messages."
 msgstr "Adjuntos eliminados de %d de los %d mensajes seleccionados."
 
-#: src/plugins/att_remover/att_remover.c:476
+#: src/plugins/att_remover/att_remover.c:475
 #, c-format
 msgid "Attachments removed from all %d selected messages."
 msgstr "Adjuntos eliminados los %d mensajes seleccionados."
 
-#: src/plugins/att_remover/att_remover.c:505
+#: src/plugins/att_remover/att_remover.c:504
 msgid "This message doesn't have any attachments."
 msgstr "Este mensaje no tiene ningún adjunto"
 
-#: src/plugins/att_remover/att_remover.c:518
+#: src/plugins/att_remover/att_remover.c:517
 msgid "Remove attachments..."
 msgstr "Eliminar adjuntos..."
 
-#: src/plugins/att_remover/att_remover.c:530
-#: src/plugins/att_remover/att_remover.c:590
+#: src/plugins/att_remover/att_remover.c:529
+#: src/plugins/att_remover/att_remover.c:589
 msgid "AttRemover"
 msgstr "Eliminador de adjuntos"
 
-#: src/plugins/att_remover/att_remover.c:595
+#: src/plugins/att_remover/att_remover.c:594
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -9734,11 +9867,11 @@ msgstr ""
 "Aviso: esta operación es completamente irreversible y los adjuntos borrados "
 "se perderán para siempre jamás."
 
-#: src/plugins/att_remover/att_remover.c:619
+#: src/plugins/att_remover/att_remover.c:618
 msgid "Attachment handling"
 msgstr "Gestión de adjuntos"
 
-#: src/plugins/attachwarner/attachwarner.c:210
+#: src/plugins/attachwarner/attachwarner.c:211
 #, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
@@ -9752,14 +9885,14 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/attachwarner/attachwarner.c:216
+#: src/plugins/attachwarner/attachwarner.c:217
 msgid "Attachment warning"
 msgstr "Aviso de adjuntos"
 
-#: src/plugins/attachwarner/attachwarner.c:245
 #: src/plugins/attachwarner/attachwarner.c:282
 #: src/plugins/attachwarner/attachwarner.c:334
-msgid "Attach warner"
+#: src/plugins/attachwarner/attachwarner_prefs.c:235
+msgid "AttachWarner"
 msgstr "Aviso de adjuntos"
 
 #: src/plugins/attachwarner/attachwarner.c:292
@@ -9775,25 +9908,32 @@ msgid "attach"
 msgstr "adjunt"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
-msgid "One of the following regular expressions is matched (one per line)"
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:83
+msgid ""
+"Warn when one of the following regular expressions is matched (one per line)"
 msgstr ""
-"Alguna de las siguientes expresiones regulares coincide (una por línea)"
+"Avisar cuando alguna de las siguientes expresiones regulares coincide "
+"(una por línea)"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:88
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:88
 msgid "Expressions are case sensitive"
 msgstr "Expresiones diferencian mayúsculas y minúsculas"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:94
+#: src/plugins/attachwarner/attachwarner_prefs.c:95
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:95
 msgid "Case sensitive when matching for the regular expressions in the list"
 msgstr ""
 "Sensible a mayús./minús. cuando se busca con las expresiones regulares de la "
 "lista"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:116
+#: src/plugins/attachwarner/attachwarner_prefs.c:117
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:117
 msgid "Lines starting with quotation marks"
 msgstr "Líneas que comienzan con marcas de citación"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:123
+#: src/plugins/attachwarner/attachwarner_prefs.c:125
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:125
 msgid ""
 "Exclude quoted lines from checking for the regular expressions above. Note "
 "that handmade quotes cannot be distinguished from quotes generated by "
@@ -9803,20 +9943,24 @@ msgstr ""
 "anteriores. Nota: las citaciones hechas manualmente no se pueden distinguir "
 "de las generadas al responder."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:126
+#: src/plugins/attachwarner/attachwarner_prefs.c:130
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:130
 msgid "Forwarded or redirected messages"
 msgstr "Mensajes reenviados o redirigidos"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:133
+#: src/plugins/attachwarner/attachwarner_prefs.c:138
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr "No comprueba si faltan adjuntos al reenviar o redirigir mensajes"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:136 src/prefs_msg_colors.c:308
+#: src/plugins/attachwarner/attachwarner_prefs.c:141
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:141
+#: src/prefs_msg_colors.c:305
 msgid "Signatures"
 msgstr "Firmas"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:143
+#: src/plugins/attachwarner/attachwarner_prefs.c:148
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:148
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
@@ -9824,49 +9968,42 @@ msgstr ""
 "Excluye las líneas a partir del primer separador de firma de la comprobación "
 "con las expresiones regulares anteriores"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:149
-msgid "Warn when"
-msgstr "Avisar cuando"
-
-#: src/plugins/attachwarner/attachwarner_prefs.c:153
-msgid "Excluding"
-msgstr "Excluyendo"
+#: src/plugins/attachwarner/attachwarner_prefs.c:157
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:157
+msgid "Exclude"
+msgstr "Excluir"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:231
-msgid "Attach Warner"
-msgstr "Aviso de adjuntos"
-
-#: src/plugins/bogofilter/bogofilter.c:82
+#: src/plugins/bogofilter/bogofilter.c:80
 #: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:108
+#: src/plugins/bogofilter/bogofilter.c:106
 #: src/plugins/bogofilter/bogofilter_gtk.c:258
 #: src/plugins/bogofilter/bogofilter_gtk.c:331
 #: src/plugins/bogofilter/bogofilter_gtk.c:408
-#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
-#: src/plugins/bsfilter/bsfilter_gtk.c:266
-#: src/plugins/bsfilter/bsfilter_gtk.c:326
+#: src/plugins/bsfilter/bsfilter.c:104 src/plugins/bsfilter/bsfilter_gtk.c:196
+#: src/plugins/bsfilter/bsfilter_gtk.c:265
+#: src/plugins/bsfilter/bsfilter_gtk.c:325
 #: src/plugins/spamassassin/spamassassin.c:118
 #: src/plugins/spamassassin/spamassassin_gtk.c:454
 #: src/plugins/spamassassin/spamassassin_gtk.c:503
 #: src/plugins/spamassassin/spamassassin_gtk.c:630 src/prefs_matcher.c:684
-#: src/prefs_matcher.c:715 src/prefs_matcher.c:1656 src/prefs_matcher.c:1663
-#: src/prefs_matcher.c:1671 src/prefs_matcher.c:1673 src/prefs_matcher.c:2580
-#: src/prefs_matcher.c:2584
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1658 src/prefs_matcher.c:1665
+#: src/prefs_matcher.c:1673 src/prefs_matcher.c:1675 src/prefs_matcher.c:2586
+#: src/prefs_matcher.c:2590
 msgid "Any"
 msgstr "Cualquiera"
 
-#: src/plugins/bogofilter/bogofilter.c:457
+#: src/plugins/bogofilter/bogofilter.c:456
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: recuperando cuerpos..."
 
-#: src/plugins/bogofilter/bogofilter.c:470
+#: src/plugins/bogofilter/bogofilter.c:469
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtrando mensajes..."
 
-#: src/plugins/bogofilter/bogofilter.c:586
+#: src/plugins/bogofilter/bogofilter.c:585
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -9878,7 +10015,7 @@ msgstr ""
 "Utilice «/Marcar/Marcar como correo basura» y «/Marcar/Marcar como bueno» "
 "para entrenar a Bogofilter con unos pocos cientos de mensajes de ambos tipos."
 
-#: src/plugins/bogofilter/bogofilter.c:593
+#: src/plugins/bogofilter/bogofilter.c:592
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -9892,7 +10029,7 @@ msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: aprendiendo del mensaje..."
 
 #: src/plugins/bogofilter/bogofilter.c:753
-#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:486
+#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:485
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Aprendizaje fallido; «%s» devolvió el estado %d."
@@ -9940,39 +10077,39 @@ msgstr ""
 "Las opciones se encuentran en «/Configuración/Preferencias/Módulos/"
 "Bogofilter»"
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:643
+#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:648
+#: src/plugins/spamassassin/spamassassin.c:647
 msgid "Spam detection"
 msgstr "Detección de correo basura"
 
-#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:650
-#: src/plugins/spamassassin/spamassassin.c:644
+#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:649
+#: src/plugins/spamassassin/spamassassin.c:648
 msgid "Spam learning"
 msgstr "Aprendizaje de correo basura"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
-#: src/plugins/bsfilter/bsfilter_gtk.c:143
+#: src/plugins/bsfilter/bsfilter_gtk.c:142
 #: src/plugins/spamassassin/spamassassin_gtk.c:411
 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/bsfilter/bsfilter_gtk.c:150
 #: src/plugins/spamassassin/spamassassin_gtk.c:369
 msgid "Maximum size"
 msgstr "Tamaño máximo"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
-#: src/plugins/bsfilter/bsfilter_gtk.c:160
+#: src/plugins/bsfilter/bsfilter_gtk.c:159
 #: src/plugins/spamassassin/spamassassin_gtk.c:378
 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/bsfilter/bsfilter_gtk.c:162
 #: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1684
-msgid "KB"
-msgstr "kB"
+msgid "KiB"
+msgstr "KiB"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:192
 msgid "Delete spam"
@@ -9987,7 +10124,7 @@ msgid "Only mark as spam"
 msgstr "Solo marcar como basura"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:211
-#: src/plugins/bsfilter/bsfilter_gtk.c:179
+#: src/plugins/bsfilter/bsfilter_gtk.c:178
 #: src/plugins/spamassassin/spamassassin_gtk.c:427
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
@@ -9996,7 +10133,7 @@ msgstr ""
 "la Papelera."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:217
-#: src/plugins/bsfilter/bsfilter_gtk.c:185
+#: src/plugins/bsfilter/bsfilter_gtk.c:184
 #: src/plugins/spamassassin/spamassassin_gtk.c:433
 msgid "Click this button to select a folder for storing spam"
 msgstr ""
@@ -10029,13 +10166,13 @@ msgid "Only done for messages in MH folders"
 msgstr "Sólo se realiza para mensajes en carpetas MH"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
-#: src/plugins/bsfilter/bsfilter_gtk.c:191
+#: src/plugins/bsfilter/bsfilter_gtk.c:190
 #: src/plugins/spamassassin/spamassassin_gtk.c:448
 msgid "Whitelist senders found in address book/folder"
 msgstr "Permitir los remitentes presentes en la agenda/carpeta"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:256
-#: src/plugins/bsfilter/bsfilter_gtk.c:195
+#: src/plugins/bsfilter/bsfilter_gtk.c:194
 #: src/plugins/spamassassin/spamassassin_gtk.c:452
 msgid ""
 "Messages coming from your address book contacts will be received in the "
@@ -10045,7 +10182,7 @@ msgstr ""
 "recibidos en la carpeta normal aunque se detecten como correo basura"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:266
-#: src/plugins/bsfilter/bsfilter_gtk.c:205
+#: src/plugins/bsfilter/bsfilter_gtk.c:204
 #: src/plugins/spamassassin/spamassassin_gtk.c:462
 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
@@ -10053,7 +10190,7 @@ msgstr ""
 "direcciones"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:268
-#: src/plugins/bsfilter/bsfilter_gtk.c:207
+#: src/plugins/bsfilter/bsfilter_gtk.c:206
 msgid "Learn whitelisted emails as ham"
 msgstr "Aprender como buenos los correos en la lista blanca"
 
@@ -10074,24 +10211,24 @@ msgid "Path to bogofilter executable"
 msgstr "Ruta al ejecutable bogofilter"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:293
-#: src/plugins/bsfilter/bsfilter_gtk.c:232
+#: src/plugins/bsfilter/bsfilter_gtk.c:231
 #: src/plugins/spamassassin/spamassassin_gtk.c:440
 msgid "Mark spam as read"
 msgstr "Marcar correo basura como leído"
 
-#: src/plugins/bsfilter/bsfilter.c:82 src/plugins/bsfilter/bsfilter_gtk.c:401
+#: src/plugins/bsfilter/bsfilter.c:79 src/plugins/bsfilter/bsfilter_gtk.c:400
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter.c:273
+#: src/plugins/bsfilter/bsfilter.c:271
 msgid "Bsfilter: fetching body..."
 msgstr "Bsfilter: recuperando cuerpos..."
 
-#: src/plugins/bsfilter/bsfilter.c:282
+#: src/plugins/bsfilter/bsfilter.c:280
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: filtrando mensajes..."
 
-#: src/plugins/bsfilter/bsfilter.c:367
+#: src/plugins/bsfilter/bsfilter.c:365
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -10103,7 +10240,7 @@ msgstr ""
 "Utilice «/Marcar/Marcar como correo basura» y «/Marcar/Marcar como bueno» "
 "para entrenar a Bsfilter con unos pocos cientos de mensajes de ambos tipos."
 
-#: src/plugins/bsfilter/bsfilter.c:374
+#: src/plugins/bsfilter/bsfilter.c:372
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
@@ -10112,11 +10249,11 @@ msgstr ""
 "El módulo Bsfilter no pudo filtrar un mensaje. La orden «%s» no se pudo "
 "ejecutar."
 
-#: src/plugins/bsfilter/bsfilter.c:475
+#: src/plugins/bsfilter/bsfilter.c:474
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: aprendiendo del mensaje..."
 
-#: src/plugins/bsfilter/bsfilter.c:616
+#: src/plugins/bsfilter/bsfilter.c:615
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -10145,12 +10282,12 @@ msgstr ""
 "\n"
 "Las opciones se encuentran en «/Configuración/Preferencias/Módulos/Bsfilter»"
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:171
+#: src/plugins/bsfilter/bsfilter_gtk.c:170
 #: src/plugins/spamassassin/spamassassin_gtk.c:419
 msgid "Save spam in"
 msgstr "Guardar correo basura en"
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:209
+#: src/plugins/bsfilter/bsfilter_gtk.c:208
 msgid ""
 "If Bsfilter thought an email was spam or unsure, but it was whitelisted, "
 "learn it as ham."
@@ -10158,11 +10295,11 @@ msgstr ""
 "Aprender como buenos los correos permitidos, aunque Bsfilter crea que es un "
 "correo basura o no esté seguro."
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:218
+#: src/plugins/bsfilter/bsfilter_gtk.c:217
 msgid "Bsfilter call"
 msgstr "Llamada a Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:226
+#: src/plugins/bsfilter/bsfilter_gtk.c:225
 msgid "Path to bsfilter executable"
 msgstr "Ruta al ejecutable bsfilter"
 
@@ -10191,12 +10328,12 @@ msgstr ""
 "Clamd no responde al ping.\n"
 "¿Está clamd ejecutándose?"
 
-#: src/plugins/clamd/clamav_plugin.c:119
+#: src/plugins/clamd/clamav_plugin.c:120
 #, c-format
 msgid "Detected %s virus."
 msgstr "Detectado virus %s."
 
-#: src/plugins/clamd/clamav_plugin.c:135
+#: src/plugins/clamd/clamav_plugin.c:137
 #, c-format
 msgid ""
 "Scanning error:\n"
@@ -10205,20 +10342,20 @@ msgstr ""
 "Error verificando:\n"
 "%s"
 
-#: src/plugins/clamd/clamav_plugin.c:146
+#: src/plugins/clamd/clamav_plugin.c:148
 #, c-format
 msgid "File: %s. Size (%d) greater than limit (%d)\n"
 msgstr "Fichero: %s. Tamaño (%d) mayor que el límite (%d)\n"
 
-#: src/plugins/clamd/clamav_plugin.c:174
+#: src/plugins/clamd/clamav_plugin.c:177
 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: verificando mensaje..."
 
-#: src/plugins/clamd/clamav_plugin.c:280
+#: src/plugins/clamd/clamav_plugin.c:283
 msgid "Failed to register mail filtering hook"
 msgstr "Falló el registro de la función de filtrado de correo"
 
-#: src/plugins/clamd/clamav_plugin.c:298
+#: src/plugins/clamd/clamav_plugin.c:301
 msgid ""
 "Init\n"
 "No socket information.\n"
@@ -10228,7 +10365,7 @@ msgstr ""
 "No hay información de conector.\n"
 "Antivirus desactivado."
 
-#: src/plugins/clamd/clamav_plugin.c:302
+#: src/plugins/clamd/clamav_plugin.c:305
 msgid ""
 "Init\n"
 "Clamd does not respond to ping.\n"
@@ -10238,7 +10375,7 @@ msgstr ""
 "Clamd no responde al ping.\n"
 "¿Está ejecutándose clamd?"
 
-#: src/plugins/clamd/clamav_plugin.c:333
+#: src/plugins/clamd/clamav_plugin.c:336
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
@@ -10281,7 +10418,7 @@ msgstr ""
 "Las opciones se encuentran en «/Configuración/Preferencias/Módulos/Antivirus "
 "Clam»"
 
-#: src/plugins/clamd/clamav_plugin.c:372
+#: src/plugins/clamd/clamav_plugin.c:375
 msgid "Virus detection"
 msgstr "Detección de virus"
 
@@ -10358,6 +10495,10 @@ msgstr "Pulse este botón para seleccionar la ruta completa a «clamd.conf»"
 msgid "Check permission for folders and adjust if necessary"
 msgstr "Compruebe los permisos de las carpetas y ajústelos si es necesario"
 
+#: src/plugins/clamd/clamav_plugin_gtk.c:348
+msgid "Find and _Replace"
+msgstr "Buscar y _reemplazar"
+
 #: src/plugins/clamd/clamav_plugin_gtk.c:353
 msgid "Click this button to check and adjust folder permissions"
 msgstr "Pulse este botón para comprobar y ajustar los permisos de las carpetas"
@@ -10395,7 +10536,7 @@ msgstr ""
 "Clamd no responde al ping.\n"
 "¿Está ejecutándose clamd?"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:122
+#: src/plugins/clamd/libclamd/clamd-plugin.c:121
 #, c-format
 msgid ""
 "%s: Unable to open\n"
@@ -10404,7 +10545,7 @@ msgstr ""
 "%s: No se puede abrir\n"
 "Se desactivará clamd"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:217
+#: src/plugins/clamd/libclamd/clamd-plugin.c:210
 #, c-format
 msgid ""
 "%s: Not able to find required information\n"
@@ -10413,44 +10554,44 @@ msgstr ""
 "%s: No se puede encontrar la información requerida\n"
 "Se desactivará clamd"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:251
+#: src/plugins/clamd/libclamd/clamd-plugin.c:244
 msgid "Could not create socket"
 msgstr "No se pudo crear el conector"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:442
+#: src/plugins/clamd/libclamd/clamd-plugin.c:435
 msgid ": File does not exist"
 msgstr ": El fichero no existe"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:455
+#: src/plugins/clamd/libclamd/clamd-plugin.c:448
 msgid ": Unable to open"
 msgstr ": No se puede abrir"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:474
-#: src/plugins/clamd/libclamd/clamd-plugin.c:479
-#: src/plugins/clamd/libclamd/clamd-plugin.c:493
+#: src/plugins/clamd/libclamd/clamd-plugin.c:467
+#: src/plugins/clamd/libclamd/clamd-plugin.c:472
+#: src/plugins/clamd/libclamd/clamd-plugin.c:486
 msgid "Socket write error"
 msgstr "Error de escritura en el conector"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:486
+#: src/plugins/clamd/libclamd/clamd-plugin.c:479
 #, c-format
 msgid "%s: Error reading"
 msgstr "%s: Error leyendo"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:500
+#: src/plugins/clamd/libclamd/clamd-plugin.c:493
 msgid "Socket read error"
 msgstr "Error de lectura en el conector"
 
-#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:100
+#: src/plugins/demo/demo.c:33 src/plugins/demo/demo.c:102
 msgid "Demo"
 msgstr "Demostración"
 
-#: src/plugins/demo/demo.c:52
+#: src/plugins/demo/demo.c:54
 msgid "Failed to register log text hook"
 msgstr "Falló el registro del enlace de traza de texto"
 
-#: src/plugins/demo/demo.c:76
+#: src/plugins/demo/demo.c:78
 msgid ""
-"This Plugin is only a demo of how to write plugins for Claws Mail. It "
+"This plugin is only a demo of how to write plugins for Claws Mail. It "
 "installs a hook for new log output and writes it to stdout.\n"
 "\n"
 "It is not really useful."
@@ -10501,8 +10642,8 @@ msgstr "Abrir en el visor (el contenido remoto está activado)"
 msgid "Do nothing (remote content is disabled)"
 msgstr "No hacer nada (el contenido remoto está desactivado)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4256
-#: src/prefs_proxy.c:235
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4254
+#: src/prefs_proxy.c:237
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -10551,9 +10692,9 @@ msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "Las CSS en este fichero se aplicarán a todas las partes HTML"
 
 #: src/plugins/fancy/fancy_prefs.c:310
-#: src/plugins/notification/notification_prefs.c:1341
+#: src/plugins/notification/notification_prefs.c:1334
 #: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1587 src/prefs_account.c:1706 src/prefs_account.c:2474
+#: src/prefs_account.c:1587 src/prefs_account.c:1706 src/prefs_account.c:2475
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "E_xplorar"
@@ -10562,89 +10703,86 @@ msgstr "E_xplorar"
 msgid "Select stylesheet"
 msgstr "Seleccionar estilos"
 
-#: src/plugins/fancy/fancy_viewer.c:469
+#: src/plugins/fancy/fancy_viewer.c:477
 msgid "Remote content loading is disabled."
 msgstr "Carga de contenidos remotos desactivada."
 
-#: src/plugins/fancy/fancy_viewer.c:578
+#: src/plugins/fancy/fancy_viewer.c:586
 msgid "Load images"
 msgstr "Cargar imágenes"
 
-#: src/plugins/fancy/fancy_viewer.c:580
+#: src/plugins/fancy/fancy_viewer.c:588
 msgid "Enable remote content"
 msgstr "Activar contenidos remotos"
 
-#: src/plugins/fancy/fancy_viewer.c:582
+#: src/plugins/fancy/fancy_viewer.c:590
 msgid "Enable Javascript"
 msgstr "Activar Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:584
+#: src/plugins/fancy/fancy_viewer.c:592
 msgid "Enable Plugins"
 msgstr "Activar módulos"
 
-#: src/plugins/fancy/fancy_viewer.c:586
+#: src/plugins/fancy/fancy_viewer.c:594
 msgid "Enable Java"
 msgstr "Activar Java"
 
-#: src/plugins/fancy/fancy_viewer.c:588
+#: src/plugins/fancy/fancy_viewer.c:596
 msgid "Open links with external browser"
 msgstr "Abrir enlaces con el navegador externo"
 
-#: src/plugins/fancy/fancy_viewer.c:780
+#: src/plugins/fancy/fancy_viewer.c:792
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ocurrió un error: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:840
+#: src/plugins/fancy/fancy_viewer.c:852
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s es un canal mal formado o no soportado"
 
-#: src/plugins/fancy/fancy_viewer.c:851
-msgid "Search the Web"
-msgstr "Buscar en la web"
-
-#: src/plugins/fancy/fancy_viewer.c:862
+#: src/plugins/fancy/fancy_viewer.c:874
 msgid "Open in Viewer"
 msgstr "Abrir en el visor"
 
-#: src/plugins/fancy/fancy_viewer.c:871
+#: src/plugins/fancy/fancy_viewer.c:883
 msgid "Open in Browser"
 msgstr "Abrir con el navegador"
 
-#: src/plugins/fancy/fancy_viewer.c:881
+#: src/plugins/fancy/fancy_viewer.c:893
 msgid "Open Image"
 msgstr "Abrir imagen"
 
-#: src/plugins/fancy/fancy_viewer.c:890
+#: src/plugins/fancy/fancy_viewer.c:902
 msgid "Copy Link"
 msgstr "Copiar enlace"
 
-#: src/plugins/fancy/fancy_viewer.c:894
+#: src/plugins/fancy/fancy_viewer.c:907
 msgid "Download Link"
 msgstr "Descargar enlace"
 
-#: src/plugins/fancy/fancy_viewer.c:905
+#: src/plugins/fancy/fancy_viewer.c:918
 msgid "Save Image As"
 msgstr "Guardar imagen como"
 
-#: src/plugins/fancy/fancy_viewer.c:915
+#: src/plugins/fancy/fancy_viewer.c:928
 msgid "Copy Image"
 msgstr "Copiar imagen"
 
-#: src/plugins/fancy/fancy_viewer.c:953
+#: src/plugins/fancy/fancy_viewer.c:966
 msgid "Import feed"
 msgstr "Importar canal"
 
-#: src/plugins/fancy/fancy_viewer.c:1245
+#: src/plugins/fancy/fancy_viewer.c:1259
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1273
+#. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
+#: src/plugins/fancy/fancy_viewer.c:1287
 msgid "Fancy HTML Viewer"
 msgstr "Visor HTML Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1278
+#: src/plugins/fancy/fancy_viewer.c:1292
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10655,17 +10793,22 @@ msgstr ""
 "Por defecto todos los contenidos remotos están bloqueados. Las opciones se "
 "encuentran en /Configuración/Preferencias/Módulos/Fancy"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:161
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:194
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:160
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:193
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:182
 msgid "Fetchinfo"
 msgstr "Fetchinfo"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:167
+#. TRANSLATORS: Possible error message during plugin load
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:166
 msgid "Failed to register mail receive hook"
 msgstr "Falló el registro de la función de recepción de correo"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:203
+#. TRANSLATORS: Description seen in plugins dialog.
+#. * Translation of "Plugins" part of preferences path should to be
+#. * the same as translation of "Plugins" string in Claws Mail message
+#. * catalog.
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:202
 msgid ""
 "This plugin modifies the downloaded messages. It inserts headers containing "
 "some download information: UIDL, Claws Mail account name, POP server, user "
@@ -10679,10 +10822,12 @@ msgstr ""
 "\n"
 "Puede encontrar las opciones en /Configuración/Preferencias/Módulos/Fetchinfo"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:230
+#. TRANSLATORS: Description of functionality added by this plugin
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:229
 msgid "Mail marking"
 msgstr "Marcado de correo"
 
+#. TRANSLATORS: Heading of a preferences section determining which headers to add
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:92
 msgid "Add fetchinfo headers"
 msgstr "Añadir cabeceras de fetchinfo"
@@ -10691,10 +10836,7 @@ msgstr "Añadir cabeceras de fetchinfo"
 msgid "Headers to be added"
 msgstr "Cabeceras que se añadirán"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
-msgid "UIDL"
-msgstr "UIDL"
-
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid ""
 "Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
@@ -10702,6 +10844,7 @@ msgstr ""
 "Agrega la cabecera X-FETCH-UIDL con el ID exclusivo de listado del mensaje "
 "(POP3)"
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Account name"
 msgstr "Nombre de cuenta"
@@ -10710,6 +10853,7 @@ msgstr "Nombre de cuenta"
 msgid "Adds the X-FETCH-ACCOUNT header with the account name"
 msgstr "Agrega la cabecera X-FETCH-ACCOUNT con el nombre de la cuenta"
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Receive server"
 msgstr "Servidor de recepción"
@@ -10718,6 +10862,7 @@ msgstr "Servidor de recepción"
 msgid "Adds the X-FETCH-SERVER header with the receive server"
 msgstr "Agrega la cabecera X-FETCH-SERVER con el servidor de recepción"
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "UserID"
 msgstr "Id. de usuario"
@@ -10726,6 +10871,7 @@ msgstr "Id. de usuario"
 msgid "Adds the X-FETCH-USERID header with the user ID"
 msgstr "Agrega la cabecera X-FETCH-USERID con el ID de usuario"
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid "Fetch time"
 msgstr "Momento de obtención"
@@ -10877,7 +11023,7 @@ msgid "Authentication"
 msgstr "Autenticación"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:86
-#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1570
+#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1580
 msgid "Username:"
 msgstr "Usuario:"
 
@@ -10924,6 +11070,41 @@ msgstr ""
 msgid "GData integration"
 msgstr "Integración con GData"
 
+#: src/plugins/keyword_warner/keyword_warner.c:189
+#, c-format
+msgid ""
+"A keyword is used in the mail you are sending. The keyword appears on line "
+"%d, which begins with the text: %s\n"
+"\n"
+"%s"
+msgstr ""
+"Se menciona una palabra clave en el correo que está a punto de enviar. "
+"La mención aparece en la línea %d, que comienza con el texto: %s\n"
+"\n"
+"%s"
+
+#: src/plugins/keyword_warner/keyword_warner.c:195
+msgid "Keyword warning"
+msgstr "Aviso de palabra clave"
+
+#: src/plugins/keyword_warner/keyword_warner.c:260
+#: src/plugins/keyword_warner/keyword_warner.c:313
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:235
+msgid "Keyword Warner"
+msgstr "Aviso de palabras clave"
+
+#: src/plugins/keyword_warner/keyword_warner.c:270
+msgid ""
+"Shows a warning when sending or queueing a message and a reference to one or "
+"more keywords is found in the message text."
+msgstr ""
+"Muestra un aviso al enviar o poner en la cola un mensaje y hay alguna "
+"referencia a una o más palabras clave en el texto del mismo."
+
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:138
+msgid "Don't check for keywords when forwarding or redirecting messages"
+msgstr "No comprobar palabras clave al reenviar o redirigir mensajes"
+
 #: src/plugins/libravatar/libravatar.c:334
 #: src/plugins/libravatar/libravatar.c:399
 #: src/plugins/libravatar/libravatar.c:459
@@ -11054,7 +11235,7 @@ msgid "Cache refresh interval"
 msgstr "Intervalo de refresco de la caché"
 
 #: src/plugins/libravatar/libravatar_prefs.c:238
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1663
+#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1663
 #: src/prefs_account.c:1820 src/prefs_matcher.c:339 src/prefs_receive.c:180
 msgid "hours"
 msgstr "horas"
@@ -11199,15 +11380,15 @@ msgstr ""
 msgid "Size of image cache in megabytes"
 msgstr "Tamaño de la caché de imágenes en megabytes"
 
-#: src/plugins/litehtml_viewer/lh_prefs.c:149
+#: src/plugins/litehtml_viewer/lh_prefs.c:150
 msgid "Default font"
 msgstr "Tipografía predeterminada"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:92
+#: src/plugins/litehtml_viewer/lh_widget.cpp:95
 msgid "Open Link"
 msgstr "Abrir enlace"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:96
+#: src/plugins/litehtml_viewer/lh_widget.cpp:99
 msgid "Copy Link Location"
 msgstr "Copiar ubicación del enlace"
 
@@ -11223,15 +11404,15 @@ msgstr ""
 "Módulo para visualizar correos HTML utilizando la biblioteca litehtml "
 "(http://www.litehtml.com/)"
 
-#: src/plugins/mailmbox/plugin.c:58
+#: src/plugins/mailmbox/plugin.c:57
 msgid "mailmbox folder"
 msgstr "carpeta mailmbox"
 
-#: src/plugins/mailmbox/plugin.c:63
+#: src/plugins/mailmbox/plugin.c:62
 msgid "This is a plugin to handle mailboxes in mbox format."
 msgstr "Este módulo permite gestionar buzones en formato mbox."
 
-#: src/plugins/mailmbox/plugin.c:84
+#: src/plugins/mailmbox/plugin.c:83
 msgid "MBOX"
 msgstr "MBOX"
 
@@ -11245,7 +11426,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:332
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be deleted.\n"
@@ -11254,71 +11435,71 @@ msgstr ""
 "Se borrarán todas las carpetas y mensajes bajo «%s».\n"
 "¿Está seguro de que quiere borrarlos?"
 
-#: src/plugins/managesieve/managesieve.c:436
+#: src/plugins/managesieve/managesieve.c:438
 msgid "No Sieve auth method available\n"
 msgstr "Ningún método de autenticación Sieve disponible\n"
 
-#: src/plugins/managesieve/managesieve.c:440
+#: src/plugins/managesieve/managesieve.c:442
 msgid "Selected Sieve auth method not available\n"
 msgstr ""
 "El método para la autenticación Sieve seleccionado no está disponible\n"
 
-#: src/plugins/managesieve/managesieve.c:673
+#: src/plugins/managesieve/managesieve.c:675
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: src/plugins/managesieve/managesieve.c:677
+#: src/plugins/managesieve/managesieve.c:679
 #, c-format
 msgid "Disconnected: %s"
 msgstr "Desconectado: %s"
 
-#: src/plugins/managesieve/managesieve.c:726
-#: src/plugins/managesieve/managesieve.c:871
+#: src/plugins/managesieve/managesieve.c:728
+#: src/plugins/managesieve/managesieve.c:873
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr "mensaje desconocido en la sesión de Sieve: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:733
+#: src/plugins/managesieve/managesieve.c:735
 msgid "STARTTLS failed"
 msgstr "STARTTLS falló"
 
-#: src/plugins/managesieve/managesieve.c:798
-#: src/plugins/managesieve/managesieve.c:814
-#: src/plugins/managesieve/managesieve.c:841
-#: src/plugins/managesieve/managesieve.c:923
-#: src/plugins/managesieve/managesieve.c:941
+#: src/plugins/managesieve/managesieve.c:800
+#: src/plugins/managesieve/managesieve.c:816
+#: src/plugins/managesieve/managesieve.c:843
+#: src/plugins/managesieve/managesieve.c:925
+#: src/plugins/managesieve/managesieve.c:943
 msgid "error occurred on SIEVE session\n"
 msgstr "hubo un error en la sesión Sieve\n"
 
-#: src/plugins/managesieve/managesieve.c:867
+#: src/plugins/managesieve/managesieve.c:869
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr "hubo un error en la sesión Sieve. data: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:876
+#: src/plugins/managesieve/managesieve.c:878
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "mensaje desconocido en la sesión de Sieve: %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1153
+#: src/plugins/managesieve/managesieve.c:1160
 msgid "Sieve: retrying auth\n"
 msgstr "Sieve: reintentar autenticación\n"
 
-#: src/plugins/managesieve/managesieve.c:1155
+#: src/plugins/managesieve/managesieve.c:1162
 msgid "Auth method not available"
 msgstr "Método de autenticación no disponible"
 
-#: src/plugins/managesieve/managesieve.c:1172
+#: src/plugins/managesieve/managesieve.c:1179
 #, c-format
 msgid "sending error on Sieve session: %s\n"
 msgstr "enviando error en la sesión de Sieve: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5805
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5824
 msgid "_Filter"
 msgstr "_Filtrar"
 
 #: src/plugins/managesieve/sieve_editor.c:86
-#: src/plugins/managesieve/sieve_editor.c:632
+#: src/plugins/managesieve/sieve_editor.c:633
 msgid "Chec_k Syntax"
 msgstr "Comprobar sinta_xis"
 
@@ -11327,7 +11508,7 @@ msgid "Re_vert"
 msgstr "Re_vertir"
 
 #: src/plugins/managesieve/sieve_editor.c:296
-#: src/plugins/managesieve/sieve_editor.c:724
+#: src/plugins/managesieve/sieve_editor.c:725
 #: src/plugins/managesieve/sieve_manager.c:183
 msgid "Unable to get script contents"
 msgstr "No se puede obtener el contenido del script"
@@ -11348,29 +11529,29 @@ msgstr "Este script ha sido modificado. ¿Revertir los cambios no guardados?"
 msgid "_Revert"
 msgstr "_Revertir"
 
-#: src/plugins/managesieve/sieve_editor.c:353
+#: src/plugins/managesieve/sieve_editor.c:354
 msgid "Script saved successfully."
 msgstr "Script guardado correctamente."
 
-#: src/plugins/managesieve/sieve_editor.c:370
+#: src/plugins/managesieve/sieve_editor.c:371
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: src/plugins/managesieve/sieve_editor.c:399
+#: src/plugins/managesieve/sieve_editor.c:400
 msgid "Checking syntax..."
 msgstr "Comprobando la sintaxis..."
 
-#: src/plugins/managesieve/sieve_editor.c:433
+#: src/plugins/managesieve/sieve_editor.c:434
 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:695
+#: src/plugins/managesieve/sieve_editor.c:696
 #, c-format
 msgid "%s - Sieve Filter%s"
 msgstr "%s - Sieve Filtro%s"
 
-#: src/plugins/managesieve/sieve_editor.c:744
-#: src/plugins/pdf_viewer/poppler_viewer.c:1326
+#: src/plugins/managesieve/sieve_editor.c:745
+#: src/plugins/pdf_viewer/poppler_viewer.c:1331
 msgid "Loading..."
 msgstr "Cargando..."
 
@@ -11420,24 +11601,24 @@ msgstr "Conectando..."
 msgid "Manage Sieve Filters"
 msgstr "Gestionar filtros Sieve"
 
-#: src/plugins/managesieve/sieve_manager.c:771
+#: src/plugins/managesieve/sieve_manager.c:772
 msgid "_Rename"
 msgstr "_Renombrar"
 
-#: src/plugins/managesieve/sieve_manager.c:806
+#: src/plugins/managesieve/sieve_manager.c:807
 msgid "To use Sieve, enable it in an account's preferences."
 msgstr "Para usar el Sieve, habilitarlo en las preferencias de la cuenta."
 
-#: src/plugins/managesieve/sieve_plugin.c:36
-#: src/plugins/managesieve/sieve_plugin.c:154
+#: src/plugins/managesieve/sieve_plugin.c:38
+#: src/plugins/managesieve/sieve_plugin.c:156
 msgid "ManageSieve"
 msgstr "Gestionar Sieve"
 
-#: src/plugins/managesieve/sieve_plugin.c:46
+#: src/plugins/managesieve/sieve_plugin.c:48
 msgid "Manage Sieve Filters..."
 msgstr "Gestionar filtros Sieve..."
 
-#: src/plugins/managesieve/sieve_plugin.c:114
+#: src/plugins/managesieve/sieve_plugin.c:116
 msgid "Manage sieve filters on a server using the ManageSieve protocol."
 msgstr ""
 "Gestionar los filtros de Sieve en un servidor usando el protocolo "
@@ -11485,7 +11666,7 @@ msgid "Require STARTTLS"
 msgstr "Requerir STARTTLS"
 
 #: src/plugins/managesieve/sieve_prefs.c:202
-#: src/plugins/rssyl/rssyl_feed_props.c:268
+#: src/plugins/rssyl/rssyl_feed_props.c:267
 msgid "No authentication"
 msgstr "Sin autenticación"
 
@@ -11498,19 +11679,18 @@ msgid "Specify authentication"
 msgstr "Especificar autenticación"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
-#: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1432
+#: src/plugins/vcalendar/vcal_prefs.c:392
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1432
 #: src/prefs_account.c:2037
 msgid "User ID"
 msgstr "Usuario"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
-#: src/plugins/rssyl/rssyl_feed_props.c:383
-#: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1437
-#: src/prefs_account.c:2060 src/prefs_account.c:2997 src/prefs_account.c:3025
-#: src/prefs_account.c:3220 src/prefs_proxy.c:132 src/wizard.c:1222
-#: src/wizard.c:1652
+#: src/plugins/rssyl/rssyl_feed_props.c:382
+#: src/plugins/vcalendar/vcal_prefs.c:400
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1437
+#: src/prefs_account.c:2060 src/prefs_account.c:2998 src/prefs_account.c:3026
+#: src/prefs_account.c:3221 src/prefs_proxy.c:134
 msgid "Password"
 msgstr "Contraseña"
 
@@ -11521,7 +11701,7 @@ msgstr "Método de autenticación"
 
 #: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1755
 #: src/prefs_account.c:2017 src/prefs_send.c:261 src/prefs_send.c:328
-#: src/prefs_themes.c:1116
+#: src/prefs_themes.c:1219
 msgid "Automatic"
 msgstr "Automático"
 
@@ -11537,20 +11717,20 @@ msgstr "No se especificó el servidor Sieve."
 msgid "Sieve"
 msgstr "Sieve"
 
-#: src/plugins/newmail/newmail.c:107 src/plugins/newmail/newmail.c:150
+#: src/plugins/newmail/newmail.c:108 src/plugins/newmail/newmail.c:151
 msgid "NewMail"
 msgstr "Registro de correo nuevo"
 
-#: src/plugins/newmail/newmail.c:112
+#: src/plugins/newmail/newmail.c:113
 msgid "Failed to register newmail hook"
 msgstr "Falló el registro de la función de registro de correo nuevo"
 
-#: src/plugins/newmail/newmail.c:129
+#: src/plugins/newmail/newmail.c:130
 #, 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:142
+#: src/plugins/newmail/newmail.c:143
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -11567,11 +11747,11 @@ msgstr ""
 "\n"
 "El registro actual esta en %s"
 
-#: src/plugins/newmail/newmail.c:176
+#: src/plugins/newmail/newmail.c:177
 msgid "Log file"
 msgstr "Fichero de registro"
 
-#: src/plugins/notification/notification_banner.c:358
+#: src/plugins/notification/notification_banner.c:360
 msgid "Folder:"
 msgstr "Carpeta:"
 
@@ -11579,7 +11759,7 @@ msgstr "Carpeta:"
 msgid "Select folder(s)"
 msgstr "Seleccionar carpeta(s)"
 
-#: src/plugins/notification/notification_foldercheck.c:583
+#: src/plugins/notification/notification_foldercheck.c:581
 msgid "select recursively"
 msgstr "seleccionar recursivamente"
 
@@ -11588,70 +11768,66 @@ msgid "No new messages"
 msgstr "No hay mensajes nuevos"
 
 #: src/plugins/notification/notification_plugin.c:220
-#: src/plugins/notification/notification_plugin.c:424
-#: src/plugins/notification/notification_prefs.c:404
-#: src/plugins/notification/notification_prefs.c:420
-#: src/plugins/notification/notification_prefs.c:439
-#: src/plugins/notification/notification_prefs.c:457
-#: src/plugins/notification/notification_prefs.c:475
-#: src/plugins/notification/notification_prefs.c:493
-#: src/plugins/notification/notification_prefs.c:511
-#: src/plugins/notification/notification_prefs.c:529
+#: src/plugins/notification/notification_plugin.c:418
+#: src/plugins/notification/notification_prefs.c:402
+#: src/plugins/notification/notification_prefs.c:418
+#: src/plugins/notification/notification_prefs.c:437
+#: src/plugins/notification/notification_prefs.c:455
+#: src/plugins/notification/notification_prefs.c:473
+#: src/plugins/notification/notification_prefs.c:491
+#: src/plugins/notification/notification_prefs.c:509
+#: src/plugins/notification/notification_prefs.c:527
 msgid "Notification"
 msgstr "Notificación"
 
-#: src/plugins/notification/notification_plugin.c:225
-msgid "The Notification plugin needs threading support."
-msgstr "El módulo de notificación necesita soporte de hilos."
-
-#: src/plugins/notification/notification_plugin.c:232
+#: src/plugins/notification/notification_plugin.c:226
 msgid "Failed to register folder item update hook in the Notification plugin"
 msgstr ""
 "Falló el registro del enlace de actualización de elementos de carpeta en el "
 "módulo de notificación"
 
-#: src/plugins/notification/notification_plugin.c:240
+#: src/plugins/notification/notification_plugin.c:234
 msgid "Failed to register folder update hook in the Notification plugin"
 msgstr ""
 "Falló el registro del enlace de actualización de carpetas en el módulo de "
 "notificación"
 
-#: src/plugins/notification/notification_plugin.c:250
+#: src/plugins/notification/notification_plugin.c:244
 msgid "Failed to register msginfo update hook in the Notification plugin"
 msgstr ""
 "Falló el registro del enlace de actualización de información de mensajes en "
 "el módulo de notificación"
 
-#: src/plugins/notification/notification_plugin.c:260
+#: src/plugins/notification/notification_plugin.c:254
 msgid "Failed to register offline switch hook in the Notification plugin"
 msgstr ""
 "Falló el registro del enlace de cambio a modo sin conexión en el módulo de "
 "notificación"
 
-#: src/plugins/notification/notification_plugin.c:271
+#: src/plugins/notification/notification_plugin.c:265
 msgid "Failed to register main window close hook in the Notification plugin"
 msgstr ""
 "Falló el registro del enlace de cierre de la ventana principal en el módulo "
 "de notificación"
 
-#: src/plugins/notification/notification_plugin.c:284
+#: src/plugins/notification/notification_plugin.c:278
 msgid "Failed to register got iconified hook in the Notification plugin"
 msgstr ""
 "Falló el registro del enlace del estado de iconización en el módulo de "
 "notificación"
 
-#: src/plugins/notification/notification_plugin.c:297
+#: src/plugins/notification/notification_plugin.c:291
 msgid "Failed to register account list changed hook in the Notification plugin"
 msgstr ""
 "Falló el registro del enlace de cambio en la lista de cuentas en el módulo "
 "de notificación"
 
-#: src/plugins/notification/notification_plugin.c:310
+#: src/plugins/notification/notification_plugin.c:304
 msgid "Failed to register theme change hook in the Notification plugin"
 msgstr ""
 "Falló el registro del enlace de cambio de tema en el módulo de notificación"
 
-#: src/plugins/notification/notification_plugin.c:429
+#: src/plugins/notification/notification_plugin.c:423
 msgid ""
 "This plugin provides various ways to notify the user of new and unread "
 "email.\n"
@@ -11667,7 +11843,7 @@ msgstr ""
 "\n"
 "Comentarios acerca del mismo para <berndth at gmx.de> son bienvenidos."
 
-#: src/plugins/notification/notification_plugin.c:454
+#: src/plugins/notification/notification_plugin.c:448
 msgid "Various tools"
 msgstr "Varias herramientas"
 
@@ -11760,249 +11936,249 @@ msgid_plural "%d new messages"
 msgstr[0] "%d mensaje nuevo"
 msgstr[1] "%d mensajes nuevos"
 
-#: src/plugins/notification/notification_prefs.c:421
+#: src/plugins/notification/notification_prefs.c:419
 msgid "Hotkeys"
 msgstr "Atajos de teclado"
 
-#: src/plugins/notification/notification_prefs.c:440
+#: src/plugins/notification/notification_prefs.c:438
 msgid "Banner"
 msgstr "Panel"
 
-#: src/plugins/notification/notification_prefs.c:458
+#: src/plugins/notification/notification_prefs.c:456
 msgid "Popup"
 msgstr "Emergente"
 
-#: src/plugins/notification/notification_prefs.c:476 src/prefs_actions.c:262
+#: src/plugins/notification/notification_prefs.c:474 src/prefs_actions.c:264
 #: src/prefs_receive.c:155
 msgid "Command"
 msgstr "Orden"
 
-#: src/plugins/notification/notification_prefs.c:494
+#: src/plugins/notification/notification_prefs.c:492
 msgid "LCD"
 msgstr "Pantalla LCD"
 
-#: src/plugins/notification/notification_prefs.c:512
+#: src/plugins/notification/notification_prefs.c:510
 msgid "SysTrayicon"
 msgstr "Bandeja del sistema"
 
-#: src/plugins/notification/notification_prefs.c:530
+#: src/plugins/notification/notification_prefs.c:528
 msgid "Indicator"
 msgstr "Indicador"
 
-#: src/plugins/notification/notification_prefs.c:613
+#: src/plugins/notification/notification_prefs.c:611
 msgid "Include folder types"
 msgstr "Incluir tipos de carpetas"
 
-#: src/plugins/notification/notification_prefs.c:622
+#: src/plugins/notification/notification_prefs.c:620
 msgid "Mail folders"
 msgstr "Carpetas de correo"
 
-#: src/plugins/notification/notification_prefs.c:630
+#: src/plugins/notification/notification_prefs.c:628
 msgid "News folders"
 msgstr "Carpetas de noticias"
 
-#: src/plugins/notification/notification_prefs.c:638
+#: src/plugins/notification/notification_prefs.c:636
 msgid "RSSyl folders"
 msgstr "Carpetas RSSyl"
 
-#: src/plugins/notification/notification_prefs.c:646
+#: src/plugins/notification/notification_prefs.c:644
 msgid "vCalendar folders"
 msgstr "Carpetas de vCalendar"
 
-#: src/plugins/notification/notification_prefs.c:654
+#: src/plugins/notification/notification_prefs.c:652
 msgid "These settings override folder-specific selections."
 msgstr ""
 "Esta configuración sobreescribe la seleccionada específicamente para cada "
 "carpeta."
 
-#: src/plugins/notification/notification_prefs.c:665
+#: src/plugins/notification/notification_prefs.c:663
 msgid "Global notification settings"
 msgstr "Configuración global de notificación"
 
-#: src/plugins/notification/notification_prefs.c:674
+#: src/plugins/notification/notification_prefs.c:672
 msgid "Set window manager urgency hint when new messages exist"
 msgstr ""
 "Establecer el consejo de urgente en el gestor de ventanas cuando existen "
 "mensajes nuevos"
 
-#: src/plugins/notification/notification_prefs.c:683
+#: src/plugins/notification/notification_prefs.c:681
 msgid "Set window manager urgency hint when unread messages exist"
 msgstr ""
 "Establecer el consejo de urgente en el gestor de ventanas cuando existen "
 "mensajes sin leer"
 
-#: src/plugins/notification/notification_prefs.c:693
+#: src/plugins/notification/notification_prefs.c:691
 msgid "Use sound theme"
 msgstr "Usar tema de sonido"
 
-#: src/plugins/notification/notification_prefs.c:765
+#: src/plugins/notification/notification_prefs.c:763
 msgid "Show banner"
 msgstr "Mostrar panel"
 
-#: src/plugins/notification/notification_prefs.c:770
-#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:148
+#: src/plugins/notification/notification_prefs.c:768
+#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:334
 #: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Nunca"
 
-#: src/plugins/notification/notification_prefs.c:772 src/prefs_receive.c:229
-#: src/prefs_summaries.c:523 src/prefs_summaries.c:576
+#: src/plugins/notification/notification_prefs.c:770 src/prefs_receive.c:229
+#: src/prefs_summaries.c:525 src/prefs_summaries.c:578
 msgid "Always"
 msgstr "Siempre"
 
-#: src/plugins/notification/notification_prefs.c:774
+#: src/plugins/notification/notification_prefs.c:772
 msgid "Only when not empty"
 msgstr "Sólo si no está vacío"
 
-#: src/plugins/notification/notification_prefs.c:793
+#: src/plugins/notification/notification_prefs.c:791
 msgid "Banner speed"
 msgstr "Velocidad del panel"
 
-#: src/plugins/notification/notification_prefs.c:830
+#: src/plugins/notification/notification_prefs.c:828
 msgid "Maximum number of messages"
 msgstr "Número máximo de mensajes"
 
-#: src/plugins/notification/notification_prefs.c:836
+#: src/plugins/notification/notification_prefs.c:834
 msgid "Limit the number of messages shown, use 0 for unlimited"
 msgstr "Limita el número máximo de mensajes, 0 significa sin límite"
 
-#: src/plugins/notification/notification_prefs.c:845
+#: src/plugins/notification/notification_prefs.c:843
 msgid "Banner width"
 msgstr "Anchura del panel"
 
-#: src/plugins/notification/notification_prefs.c:851
+#: src/plugins/notification/notification_prefs.c:849
 msgid "Limit the size of banner, use 0 for screen width"
 msgstr "Limitar el tamaño del panel, utilice 0 para el ancho de la pantalla"
 
-#: src/plugins/notification/notification_prefs.c:853
+#: src/plugins/notification/notification_prefs.c:851
 msgid "pixel(s)"
 msgstr "píxel(s)"
 
-#: src/plugins/notification/notification_prefs.c:862
+#: src/plugins/notification/notification_prefs.c:860
 msgid "Include unread mails in banner"
 msgstr "Incluir los correos no leídos en el panel"
 
-#: src/plugins/notification/notification_prefs.c:870
+#: src/plugins/notification/notification_prefs.c:868
 msgid "Make banner sticky"
 msgstr "Hacer el panel persistente"
 
-#: src/plugins/notification/notification_prefs.c:880
-#: src/plugins/notification/notification_prefs.c:1080
-#: src/plugins/notification/notification_prefs.c:1371
-#: src/plugins/notification/notification_prefs.c:1606
+#: src/plugins/notification/notification_prefs.c:878
+#: src/plugins/notification/notification_prefs.c:1073
+#: src/plugins/notification/notification_prefs.c:1364
+#: src/plugins/notification/notification_prefs.c:1599
 msgid "Only include selected folders"
 msgstr "Sólo incluir carpetas seleccionadas"
 
-#: src/plugins/notification/notification_prefs.c:889
-#: src/plugins/notification/notification_prefs.c:1089
-#: src/plugins/notification/notification_prefs.c:1380
-#: src/plugins/notification/notification_prefs.c:1615
+#: src/plugins/notification/notification_prefs.c:887
+#: src/plugins/notification/notification_prefs.c:1082
+#: src/plugins/notification/notification_prefs.c:1373
+#: src/plugins/notification/notification_prefs.c:1608
 msgid "Select folders..."
 msgstr "Seleccionar carpetas..."
 
-#: src/plugins/notification/notification_prefs.c:901
+#: src/plugins/notification/notification_prefs.c:899
 msgid "Banner colors"
 msgstr "Colores del panel"
 
-#: src/plugins/notification/notification_prefs.c:905
-#: src/plugins/notification/notification_prefs.c:1121
+#: src/plugins/notification/notification_prefs.c:903
+#: src/plugins/notification/notification_prefs.c:1114
 msgid "Use custom colors"
 msgstr "Usar colores propios"
 
-#: src/plugins/notification/notification_prefs.c:920
-#: src/plugins/notification/notification_prefs.c:1135
+#: src/plugins/notification/notification_prefs.c:918
+#: src/plugins/notification/notification_prefs.c:1128
 msgid "Foreground"
 msgstr "Primer plano"
 
-#: src/plugins/notification/notification_prefs.c:926
-#: src/plugins/notification/notification_prefs.c:1141
+#: src/plugins/notification/notification_prefs.c:922
+#: src/plugins/notification/notification_prefs.c:1134
 msgid "Foreground color"
 msgstr "Color de primer plano"
 
-#: src/plugins/notification/notification_prefs.c:931
-#: src/plugins/notification/notification_prefs.c:1147
-#: src/prefs_msg_colors.c:258 src/prefs_msg_colors.c:271
-#: src/prefs_msg_colors.c:284
+#: src/plugins/notification/notification_prefs.c:927
+#: src/plugins/notification/notification_prefs.c:1140
+#: src/prefs_msg_colors.c:251 src/prefs_msg_colors.c:265
+#: src/prefs_msg_colors.c:279
 msgid "Background"
 msgstr "Fondo"
 
-#: src/plugins/notification/notification_prefs.c:937
-#: src/plugins/notification/notification_prefs.c:1153
+#: src/plugins/notification/notification_prefs.c:931
+#: src/plugins/notification/notification_prefs.c:1146
 msgid "Background color"
 msgstr "Color de fondo"
 
-#: src/plugins/notification/notification_prefs.c:1044
-#: src/plugins/notification/notification_prefs.c:1641
+#: src/plugins/notification/notification_prefs.c:1037
+#: src/plugins/notification/notification_prefs.c:1634
 msgid "Enable popup"
 msgstr "Activar emergente"
 
-#: src/plugins/notification/notification_prefs.c:1061
-#: src/plugins/notification/notification_prefs.c:1659
+#: src/plugins/notification/notification_prefs.c:1054
+#: src/plugins/notification/notification_prefs.c:1652
 msgid "Popup timeout"
 msgstr "Tiempo límite del emergente"
 
-#: src/plugins/notification/notification_prefs.c:1100
+#: src/plugins/notification/notification_prefs.c:1093
 msgid "Make popup sticky"
 msgstr "Hacer el emergente persistente"
 
-#: src/plugins/notification/notification_prefs.c:1110
+#: src/plugins/notification/notification_prefs.c:1103
 msgid "Set popup window width and position"
 msgstr "Anchura y posición de la ventana emergente"
 
-#: src/plugins/notification/notification_prefs.c:1115
+#: src/plugins/notification/notification_prefs.c:1108
 msgid "(the window manager is free to ignore this)"
 msgstr "(el gestor de ventanas podría ignorar esto)"
 
-#: src/plugins/notification/notification_prefs.c:1165
-#: src/plugins/notification/notification_prefs.c:1671
+#: src/plugins/notification/notification_prefs.c:1158
+#: src/plugins/notification/notification_prefs.c:1664
 msgid "Display folder name"
 msgstr "Mostrar nombre de carpeta"
 
-#: src/plugins/notification/notification_prefs.c:1224
+#: src/plugins/notification/notification_prefs.c:1217
 msgid "Sample popup window"
 msgstr "Ejemplo de ventana emergente"
 
-#: src/plugins/notification/notification_prefs.c:1230
+#: src/plugins/notification/notification_prefs.c:1223
 msgid "Done"
 msgstr "Hecho"
 
-#: src/plugins/notification/notification_prefs.c:1288
+#: src/plugins/notification/notification_prefs.c:1281
 msgid "Select command"
 msgstr "Selecciona orden"
 
-#: src/plugins/notification/notification_prefs.c:1317
+#: src/plugins/notification/notification_prefs.c:1310
 msgid "Enable command"
 msgstr "Activar orden"
 
-#: src/plugins/notification/notification_prefs.c:1334 src/prefs_receive.c:268
+#: src/plugins/notification/notification_prefs.c:1327 src/prefs_receive.c:268
 msgid "Command to execute"
 msgstr "Orden a ejecutar"
 
-#: src/plugins/notification/notification_prefs.c:1352
+#: src/plugins/notification/notification_prefs.c:1345
 msgid "Block command after execution for"
 msgstr "Bloquear la orden después de la ejecución durante"
 
-#: src/plugins/notification/notification_prefs.c:1459
+#: src/plugins/notification/notification_prefs.c:1452
 msgid "Enable LCD"
 msgstr "Activar pantalla LCD"
 
-#: src/plugins/notification/notification_prefs.c:1478
+#: src/plugins/notification/notification_prefs.c:1471
 msgid "Hostname:Port of LCDd server"
 msgstr "Nombre:Puerto del servidor LCDd"
 
-#: src/plugins/notification/notification_prefs.c:1563
+#: src/plugins/notification/notification_prefs.c:1556
 msgid "Enable Trayicon"
 msgstr "Activar icono en bandeja"
 
-#: src/plugins/notification/notification_prefs.c:1579
+#: src/plugins/notification/notification_prefs.c:1572
 msgid "Hide at start-up"
 msgstr "Ocultar al inicio"
 
-#: src/plugins/notification/notification_prefs.c:1587
+#: src/plugins/notification/notification_prefs.c:1580
 msgid "Close to tray"
 msgstr "Cerrar a la bandeja"
 
-#: src/plugins/notification/notification_prefs.c:1595
+#: src/plugins/notification/notification_prefs.c:1588
 msgid "Hide when iconified"
 msgstr "Ocultar al iconizarse"
 
@@ -12012,36 +12188,36 @@ msgstr "Ocultar al iconizarse"
 #. for that, go for something along the lines of "passive popup"
 #. instead.See also
 #. http://en.wikipedia.org/wiki/Toast_(computing)
-#: src/plugins/notification/notification_prefs.c:1632
+#: src/plugins/notification/notification_prefs.c:1625
 msgid "Passive toaster popup"
 msgstr "Burbuja de notificación"
 
-#: src/plugins/notification/notification_prefs.c:1796
+#: src/plugins/notification/notification_prefs.c:1789
 msgid "Add to Indicator Applet"
 msgstr "Añadir al applet indicador"
 
-#: src/plugins/notification/notification_prefs.c:1810
+#: src/plugins/notification/notification_prefs.c:1803
 msgid "Hide mainwindow when minimized"
 msgstr "Ocultar ventana principal al minimizar"
 
-#: src/plugins/notification/notification_prefs.c:1863
+#: src/plugins/notification/notification_prefs.c:1856
 msgid "Enable global hotkeys"
 msgstr "Activar atajos de teclado globales"
 
-#: src/plugins/notification/notification_prefs.c:1877
+#: src/plugins/notification/notification_prefs.c:1870
 #, c-format
 msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
 msgstr "Entre ejemplos de atajos se incluyen <b>%s</b> y <b>%s</b>"
 
-#: src/plugins/notification/notification_prefs.c:1877
+#: src/plugins/notification/notification_prefs.c:1870
 msgid "<control><shift>F11"
 msgstr "<control><shift>F11"
 
-#: src/plugins/notification/notification_prefs.c:1877
+#: src/plugins/notification/notification_prefs.c:1870
 msgid "<alt>N"
 msgstr "<alt>N"
 
-#: src/plugins/notification/notification_prefs.c:1889
+#: src/plugins/notification/notification_prefs.c:1882
 msgid "Toggle minimize"
 msgstr "Cambiar minimizar"
 
@@ -12156,95 +12332,95 @@ msgstr "Formato:"
 msgid "Optimized:"
 msgstr "Optimizado:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1228
+#: src/plugins/pdf_viewer/poppler_viewer.c:1233
 msgid "PDF properties"
 msgstr "Propiedades del PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1377
+#: src/plugins/pdf_viewer/poppler_viewer.c:1382
 msgid "Enter password"
 msgstr "Introducir contraseña"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1378
+#: src/plugins/pdf_viewer/poppler_viewer.c:1383
 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:1393
+#: src/plugins/pdf_viewer/poppler_viewer.c:1398
 #, c-format
 msgid "%s Document"
 msgstr "%s documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1399
+#: src/plugins/pdf_viewer/poppler_viewer.c:1404
 #, c-format
 msgid "of %d"
 msgstr "de %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1415
+#: src/plugins/pdf_viewer/poppler_viewer.c:1420
 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:1787
-#: src/plugins/pdf_viewer/poppler_viewer.c:1996
+#: src/plugins/pdf_viewer/poppler_viewer.c:1795
+#: src/plugins/pdf_viewer/poppler_viewer.c:2007
 msgid "Document Index"
 msgstr "Índice del documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "First Page"
 msgstr "Primera página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Previous Page"
 msgstr "Página anterior"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1978
 msgid "Next Page"
 msgstr "Página siguiente"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1981
 msgid "Last Page"
 msgstr "Última página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1973
+#: src/plugins/pdf_viewer/poppler_viewer.c:1984
 msgid "Zoom In"
 msgstr "Aumentar"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1986
 msgid "Zoom Out"
 msgstr "Disminuir"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1989
 msgid "Fit Page"
 msgstr "Ajustar página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1992
 msgid "Fit Page Width"
 msgstr "Ajustar ancho"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Rotate Left"
 msgstr "Rotar izquierda"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:1998
 msgid "Rotate Right"
 msgstr "Rotar derecha"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:2001
 msgid "Print Document"
 msgstr "Imprimir documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1993
+#: src/plugins/pdf_viewer/poppler_viewer.c:2004
 msgid "Document Info"
 msgstr "Información del documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1998
+#: src/plugins/pdf_viewer/poppler_viewer.c:2009
 msgid "Page Number"
 msgstr "Número de página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2000
+#: src/plugins/pdf_viewer/poppler_viewer.c:2011
 msgid "Zoom Factor"
 msgstr "Factor de aumento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2111
+#: src/plugins/pdf_viewer/poppler_viewer.c:2122
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -12257,13 +12433,13 @@ msgstr ""
 "\n"
 "Cualquier comentario será bienvenido: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2117
-#: src/plugins/pdf_viewer/poppler_viewer.c:2125
-#: src/plugins/pdf_viewer/poppler_viewer.c:2145
+#: src/plugins/pdf_viewer/poppler_viewer.c:2128
+#: src/plugins/pdf_viewer/poppler_viewer.c:2136
+#: src/plugins/pdf_viewer/poppler_viewer.c:2156
 msgid "PDF Viewer"
 msgstr "Visor PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2121
+#: src/plugins/pdf_viewer/poppler_viewer.c:2132
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -12278,7 +12454,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/perl/perl_gtk.c:50
+#: src/plugins/perl/perl_gtk.c:48
 msgid "Edit perl filter rules (ext)..."
 msgstr "Editar reglas de filtrado perl (ext)..."
 
@@ -12295,32 +12471,32 @@ msgid "[no user id]"
 msgstr "[sin id usuario]"
 
 #: src/plugins/pgpcore/passphrase.c:260
-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
 msgid "Passphrases did not match.\n"
 msgstr "Las contraseñas no coinciden.\n"
 
-#: src/plugins/pgpcore/passphrase.c:267
+#: 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:265
 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:272
-msgid "Please enter the passphrase for:"
-msgstr "Por favor, introduzca la contraseña para:"
-
-#: src/plugins/pgpcore/passphrase.c:275
+#: src/plugins/pgpcore/passphrase.c:269
 msgid "Bad passphrase.\n"
 msgstr "Contraseña errónea.\n"
 
+#: src/plugins/pgpcore/passphrase.c:270
+msgid "Please enter the passphrase for:"
+msgstr "Por favor, introduzca la contraseña para:"
+
 #: src/plugins/pgpcore/pgp_viewer.c:179
 msgid "Key import"
 msgstr "Importar clave"
 
 #: src/plugins/pgpcore/pgp_viewer.c:180
 msgid ""
-"This key is not in your keyring. Do you want Claws Mail to try and import it?"
+"This key is not in your keyring. Do you want Claws Mail to try to import it?"
 msgstr ""
 "Esta clave no esta en su anillo de claves. ¿Desea que Claws Mail intente "
 "importarla?"
@@ -12329,7 +12505,7 @@ msgstr ""
 msgid "from keyserver"
 msgstr "desde un servidor de claves"
 
-#: src/plugins/pgpcore/pgp_viewer.c:182
+#: src/plugins/pgpcore/pgp_viewer.c:183
 msgid "from Web Key Directory"
 msgstr "desde un directorio web de claves (WKD)"
 
@@ -12454,7 +12630,7 @@ msgstr "Caduca después de"
 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:182 src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:463
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1827
 #: src/prefs_account.c:2126 src/prefs_receive.c:190
 msgid "minutes"
@@ -12516,8 +12692,8 @@ msgstr "Generar un nuevo par de claves"
 msgid "GPG"
 msgstr "GPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:38
-#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:920
+#: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:35
+#: src/plugins/smime/smime.c:1078
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -12531,54 +12707,54 @@ 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:231 src/plugins/pgpcore/sgpgme.c:146
+#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:332
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:150
-#: src/plugins/pgpcore/sgpgme.c:166
+#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:336
+#: src/plugins/pgpcore/sgpgme.c:352
 msgid "Marginal"
 msgstr "Marginal"
 
-#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:154
-#: src/plugins/pgpcore/sgpgme.c:170
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:340
+#: src/plugins/pgpcore/sgpgme.c:356
 msgid "Ultimate"
 msgstr "Absoluta"
 
-#: src/plugins/pgpcore/select-keys.c:408
+#: src/plugins/pgpcore/select-keys.c:412
 msgid "Select Keys"
 msgstr "Seleccione claves"
 
-#: src/plugins/pgpcore/select-keys.c:458
+#: src/plugins/pgpcore/select-keys.c:462
 msgid "Key ID"
 msgstr "ID de clave"
 
-#: src/plugins/pgpcore/select-keys.c:476
+#: src/plugins/pgpcore/select-keys.c:480
 msgid "Trust"
 msgstr "Confianza"
 
-#: src/plugins/pgpcore/select-keys.c:495
+#: src/plugins/pgpcore/select-keys.c:499
 msgid "_Other"
 msgstr "_Otras"
 
-#: src/plugins/pgpcore/select-keys.c:496
+#: src/plugins/pgpcore/select-keys.c:500
 msgid "Do_n't encrypt"
 msgstr "_No cifrar"
 
-#: src/plugins/pgpcore/select-keys.c:677
+#: src/plugins/pgpcore/select-keys.c:681
 msgid "Add key"
 msgstr "Añadir clave"
 
-#: src/plugins/pgpcore/select-keys.c:678
+#: src/plugins/pgpcore/select-keys.c:682
 msgid "Enter another user or key ID:"
 msgstr "Teclee otro usuario o ID-clave:"
 
-#: src/plugins/pgpcore/select-keys.c:700
+#: src/plugins/pgpcore/select-keys.c:704
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Cifrar para %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:701
+#: src/plugins/pgpcore/select-keys.c:705
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -12597,181 +12773,180 @@ msgstr ""
 "\n"
 "¿Es suficientemente fiable como para usarla de todas maneras?"
 
-#: src/plugins/pgpcore/sgpgme.c:84 src/privacy.c:249 src/privacy.c:253
-#: src/privacy.c:270 src/privacy.c:274
+#: src/plugins/pgpcore/sgpgme.c:270 src/privacy.c:281 src/privacy.c:286
 msgid "No signature found"
 msgstr "No se encontró firma"
 
-#: src/plugins/pgpcore/sgpgme.c:164
+#: src/plugins/pgpcore/sgpgme.c:350
 msgid "Untrusted"
 msgstr "No fiable"
 
-#: src/plugins/pgpcore/sgpgme.c:238 src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:424 src/plugins/pgpcore/sgpgme.c:443
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "La firma no se puede comprobar - %s"
 
-#: src/plugins/pgpcore/sgpgme.c:242 src/plugins/pgpcore/sgpgme.c:246
+#: src/plugins/pgpcore/sgpgme.c:428 src/plugins/pgpcore/sgpgme.c:432
 msgid "The signature has not been checked."
 msgstr "La firma no ha sido comprobada."
 
-#: src/plugins/pgpcore/sgpgme.c:252
+#: src/plugins/pgpcore/sgpgme.c:438
 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:270
+#: src/plugins/pgpcore/sgpgme.c:456
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Firma válida de \"%s\" [ultimate]"
 
-#: src/plugins/pgpcore/sgpgme.c:273
+#: src/plugins/pgpcore/sgpgme.c:459
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Firma válida de \"%s\" [full]"
 
-#: src/plugins/pgpcore/sgpgme.c:276
+#: src/plugins/pgpcore/sgpgme.c:462
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Firma válida de \"%s\" [marginal]"
 
-#: src/plugins/pgpcore/sgpgme.c:283
+#: src/plugins/pgpcore/sgpgme.c:469
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma válida de \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:303
+#: src/plugins/pgpcore/sgpgme.c:471 src/plugins/pgpcore/sgpgme.c:489
 #, 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:291
+#: src/plugins/pgpcore/sgpgme.c:477
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:294
+#: src/plugins/pgpcore/sgpgme.c:480
 #, 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:297
+#: src/plugins/pgpcore/sgpgme.c:483
 #, 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:300
+#: src/plugins/pgpcore/sgpgme.c:486
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Firma inválida de \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:307
+#: src/plugins/pgpcore/sgpgme.c:493
 msgid "The signature has not been checked"
 msgstr "La firma no ha sido comprobada"
 
-#: src/plugins/pgpcore/sgpgme.c:330
+#: src/plugins/pgpcore/sgpgme.c:516
 msgid "Error checking signature: no status\n"
 msgstr "Error verificando la firma digital: no hay estado\n"
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:535
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Error verificando la firma digital: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:553
 #, 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:372
+#: src/plugins/pgpcore/sgpgme.c:559
 #, 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:377
+#: src/plugins/pgpcore/sgpgme.c:564
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "UID de clave caducado «%s»\n"
 
-#: src/plugins/pgpcore/sgpgme.c:382
+#: src/plugins/pgpcore/sgpgme.c:569
 #, 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:387
+#: src/plugins/pgpcore/sgpgme.c:574
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "UID de clave revocado «%s»\n"
 
-#: src/plugins/pgpcore/sgpgme.c:392
+#: src/plugins/pgpcore/sgpgme.c:579
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Firma INVÁLIDA de «%s»\n"
 
-#: src/plugins/pgpcore/sgpgme.c:405
+#: src/plugins/pgpcore/sgpgme.c:591
 #, 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:407
+#: src/plugins/pgpcore/sgpgme.c:593
 msgid "Revoked"
 msgstr "Revocado"
 
-#: src/plugins/pgpcore/sgpgme.c:412
+#: src/plugins/pgpcore/sgpgme.c:598
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Confianza del propietario: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:413
+#: src/plugins/pgpcore/sgpgme.c:599
 msgid "No key!"
 msgstr "¡No hay clave!"
 
-#: src/plugins/pgpcore/sgpgme.c:415
+#: src/plugins/pgpcore/sgpgme.c:601
 msgid "Primary key fingerprint:"
 msgstr "Huella de clave primaria:"
 
-#: src/plugins/pgpcore/sgpgme.c:433
+#: src/plugins/pgpcore/sgpgme.c:619
 #, 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:439
+#: src/plugins/pgpcore/sgpgme.c:625
 #, 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:473
+#: src/plugins/pgpcore/sgpgme.c:660
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "No se puede obtener datos del mensaje, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:489
+#: src/plugins/pgpcore/sgpgme.c:676
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "No se puede inicializar datos, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:666
+#: src/plugins/pgpcore/sgpgme.c:855
 msgid "Secret key specification is ambiguous"
 msgstr "La especificación de clave secreta es ambigua"
 
-#: src/plugins/pgpcore/sgpgme.c:676
+#: src/plugins/pgpcore/sgpgme.c:865
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Clave secreta no encontrada (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:689
+#: src/plugins/pgpcore/sgpgme.c:878
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Error estableciendo clave secreta: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:782
+#: src/plugins/pgpcore/sgpgme.c:971
 #, 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:788
+#: src/plugins/pgpcore/sgpgme.c:977
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12780,12 +12955,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:796
+#: src/plugins/pgpcore/sgpgme.c:985
 #, 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:812
+#: src/plugins/pgpcore/sgpgme.c:1001
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12793,7 +12968,7 @@ msgstr ""
 "GnuPG no esta adecuadamente instalado o necesita actualizarse.\n"
 "Soporte de OpenPGP deshabilitado."
 
-#: src/plugins/pgpcore/sgpgme.c:889
+#: src/plugins/pgpcore/sgpgme.c:1078
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12801,11 +12976,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:894
+#: src/plugins/pgpcore/sgpgme.c:1083
 msgid "No PGP key found"
 msgstr "No se encontró ninguna clave PGP"
 
-#: src/plugins/pgpcore/sgpgme.c:895
+#: src/plugins/pgpcore/sgpgme.c:1084
 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"
@@ -12815,12 +12990,12 @@ msgstr ""
 "capaz de firmar correos o recibir correos cifrados.\n"
 "¿Quiere crear un nuevo par de claves ahora?"
 
-#: src/plugins/pgpcore/sgpgme.c:984 src/plugins/pgpcore/sgpgme.c:1006
+#: src/plugins/pgpcore/sgpgme.c:1174 src/plugins/pgpcore/sgpgme.c:1196
 #, 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:994
+#: src/plugins/pgpcore/sgpgme.c:1184
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12828,11 +13003,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:1012
+#: src/plugins/pgpcore/sgpgme.c:1202
 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:1016
+#: src/plugins/pgpcore/sgpgme.c:1206
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12845,62 +13020,41 @@ msgstr ""
 "\n"
 "¿Desea exportarla a un servidor de claves?"
 
-#: src/plugins/pgpcore/sgpgme.c:1020
+#: src/plugins/pgpcore/sgpgme.c:1210
 msgid "Key generated"
 msgstr "Clave generada"
 
-#: src/plugins/pgpcore/sgpgme.c:1096
+#: src/plugins/pgpcore/sgpgme.c:1286
 msgid "Key exported."
 msgstr "Clave exportada."
 
-#: src/plugins/pgpcore/sgpgme.c:1098
+#: src/plugins/pgpcore/sgpgme.c:1288
 msgid "Couldn't export key."
 msgstr "No se pudo exportar la clave."
 
-#: src/plugins/pgpinline/pgpinline.c:156
-msgid "Incorrect part"
-msgstr "Parte incorrecta"
-
-#: src/plugins/pgpinline/pgpinline.c:160
-msgid "Not a text part"
-msgstr "No es una parte de texto"
+#: src/plugins/pgpinline/pgpinline.c:385
+msgid "Couldn't parse mime part."
+msgstr "No se puede procesar la parte mime."
 
-#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
+#: src/plugins/pgpinline/pgpinline.c:392
 msgid "Couldn't get text data."
 msgstr "No se puede obtener el texto."
 
-#: src/plugins/pgpinline/pgpinline.c:189
-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:197 src/plugins/pgpinline/pgpinline.c:519
-#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpinline/pgpinline.c:714
-#: src/plugins/pgpmime/pgpmime.c:184 src/plugins/pgpmime/pgpmime.c:330
-#: src/plugins/pgpmime/pgpmime.c:512 src/plugins/pgpmime/pgpmime.c:656
-#: src/plugins/smime/smime.c:418
-#, c-format
-msgid "Couldn't initialize GPG context, %s"
-msgstr "No se pudo inicializar el contexto GPG, %s"
-
-#: src/plugins/pgpinline/pgpinline.c:316
-msgid "Couldn't parse mime part."
-msgstr "No se puede procesar la parte mime."
-
-#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:353
+#: src/plugins/pgpinline/pgpinline.c:423 src/plugins/pgpmime/pgpmime.c:262
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "No se puede abrir el fichero descifrado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
-#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
-#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
-#: src/plugins/pgpmime/pgpmime.c:364 src/plugins/pgpmime/pgpmime.c:378
+#: src/plugins/pgpinline/pgpinline.c:442 src/plugins/pgpinline/pgpinline.c:451
+#: src/plugins/pgpinline/pgpinline.c:460 src/plugins/pgpinline/pgpinline.c:468
+#: src/plugins/pgpinline/pgpinline.c:478 src/plugins/pgpinline/pgpinline.c:487
+#: src/plugins/pgpmime/pgpmime.c:274 src/plugins/pgpmime/pgpmime.c:289
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "No se puede escribir al fichero descifrado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
-#: src/plugins/pgpinline/pgpinline.c:379
+#: src/plugins/pgpinline/pgpinline.c:456 src/plugins/pgpinline/pgpinline.c:457
+#: src/plugins/pgpinline/pgpinline.c:458
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -12908,53 +13062,61 @@ msgstr ""
 "\n"
 "--- Inicio de los datos cifrados PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
-#: src/plugins/pgpinline/pgpinline.c:397
+#: src/plugins/pgpinline/pgpinline.c:474 src/plugins/pgpinline/pgpinline.c:475
+#: src/plugins/pgpinline/pgpinline.c:476
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Fin de los datos cifrados PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:390
+#: src/plugins/pgpinline/pgpinline.c:497 src/plugins/pgpmime/pgpmime.c:302
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "No se puede cerrar el fichero descifrado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:428
+#: src/plugins/pgpinline/pgpinline.c:509
 msgid "Couldn't scan decrypted file."
 msgstr "No se puede escanear el fichero descifrado."
 
-#: src/plugins/pgpinline/pgpinline.c:436
+#: src/plugins/pgpinline/pgpinline.c:518
 msgid "Couldn't scan decrypted file parts."
 msgstr "No se pueden escanear las partes del fichero descifrado ."
 
-#: src/plugins/pgpinline/pgpinline.c:493 src/plugins/pgpinline/pgpinline.c:685
+#: src/plugins/pgpinline/pgpinline.c:575 src/plugins/pgpinline/pgpinline.c:770
 msgid "Malformed message"
 msgstr "Mensaje mal formado"
 
-#: src/plugins/pgpinline/pgpinline.c:504 src/plugins/pgpinline/pgpinline.c:696
-#: src/plugins/pgpmime/pgpmime.c:696
+#: src/plugins/pgpinline/pgpinline.c:586 src/plugins/pgpinline/pgpinline.c:784
+#: src/plugins/pgpmime/pgpmime.c:614
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "No se puede crear el fichero temporal, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:543 src/plugins/pgpmime/pgpmime.c:539
+#: src/plugins/pgpinline/pgpinline.c:601 src/plugins/pgpinline/pgpinline.c:740
+#: src/plugins/pgpinline/pgpinline.c:805 src/plugins/pgpmime/pgpmime.c:230
+#: src/plugins/pgpmime/pgpmime.c:425 src/plugins/pgpmime/pgpmime.c:569
+#: src/plugins/smime/smime.c:559
+#, c-format
+msgid "Couldn't initialize GPG context, %s"
+msgstr "No se pudo inicializar el contexto GPG, %s"
+
+#: src/plugins/pgpinline/pgpinline.c:625 src/plugins/pgpmime/pgpmime.c:452
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Falló la firma de los datos, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:566
+#: src/plugins/pgpinline/pgpinline.c:643 src/plugins/pgpmime/pgpmime.c:479
 #, 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:570 src/plugins/pgpmime/pgpmime.c:575
+#: src/plugins/pgpinline/pgpinline.c:652 src/plugins/pgpmime/pgpmime.c:488
 msgid "Data signing failed, no results."
 msgstr "Falló la firma de los datos, no hay resultados."
 
-#: src/plugins/pgpinline/pgpinline.c:580 src/plugins/pgpmime/pgpmime.c:586
+#: src/plugins/pgpinline/pgpinline.c:662 src/plugins/pgpmime/pgpmime.c:499
 msgid "Data signing failed, no contents."
 msgstr "Falló la firma de los datos, no hay contenido."
 
-#: src/plugins/pgpinline/pgpinline.c:624
+#: src/plugins/pgpinline/pgpinline.c:706
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
@@ -12962,17 +13124,17 @@ 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:668 src/plugins/pgpmime/pgpmime.c:666
+#: src/plugins/pgpinline/pgpinline.c:751 src/plugins/pgpmime/pgpmime.c:580
 #, 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:727 src/plugins/pgpmime/pgpmime.c:724
+#: src/plugins/pgpinline/pgpinline.c:823 src/plugins/pgpmime/pgpmime.c:649
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Falló el cifrado, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:796
+#: src/plugins/pgpinline/pgpinline.c:892
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
@@ -13006,28 +13168,24 @@ msgstr ""
 "\n"
 "GPGME es copyright 2001 por Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:204
-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:499
+#: src/plugins/pgpmime/pgpmime.c:314 src/plugins/smime/smime.c:653
 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:506
+#: src/plugins/pgpmime/pgpmime.c:322 src/plugins/smime/smime.c:661
 msgid "Couldn't parse decrypted file parts."
 msgstr "No se pueden interpretar las partes del fichero."
 
-#: src/plugins/pgpmime/pgpmime.c:457 src/plugins/pgpmime/pgpmime.c:496
+#: src/plugins/pgpmime/pgpmime.c:369 src/plugins/pgpmime/pgpmime.c:408
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "No se puede crear el fichero temporal: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:599
+#: src/plugins/pgpmime/pgpmime.c:513
 msgid "OpenPGP digital signature"
 msgstr "Firma digital OpenPGP"
 
-#: src/plugins/pgpmime/pgpmime.c:622
+#: src/plugins/pgpmime/pgpmime.c:536
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -13035,7 +13193,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:798
+#: src/plugins/pgpmime/pgpmime.c:723
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -13077,26 +13235,26 @@ msgid "Show Python console..."
 msgstr "Mostrar la consola de Python..."
 
 #: src/plugins/python/python_plugin.c:525
-#: src/plugins/rssyl/rssyl_feed_props.c:471
+#: src/plugins/rssyl/rssyl_feed_props.c:470
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:2986
-#: src/prefs_account.c:3014 src/prefs_account.c:3442 src/wizard.c:1212
-#: src/wizard.c:1642
+#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:2987
+#: src/prefs_account.c:3015 src/prefs_account.c:3444 src/wizard.c:1217
+#: src/wizard.c:1659
 msgid "Browse"
 msgstr "Explorar"
 
-#: src/plugins/python/python_plugin.c:673
-#: src/plugins/python/python_plugin.c:760
+#: src/plugins/python/python_plugin.c:635
+#: src/plugins/python/python_plugin.c:722
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:682
+#: src/plugins/python/python_plugin.c:644
 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:765
+#: src/plugins/python/python_plugin.c:727
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -13185,11 +13343,11 @@ msgstr ""
 "\n"
 "Comentarios para <berndth at gmx.de> serán bienvenidos."
 
-#: src/plugins/python/python_plugin.c:816
+#: src/plugins/python/python_plugin.c:778
 msgid "Python integration"
 msgstr "Integración con Python"
 
-#: src/plugins/rssyl/old_feeds.c:90
+#: src/plugins/rssyl/old_feeds.c:92
 #, c-format
 msgid ""
 "Couldn't read contents of old feeds.xml file:\n"
@@ -13255,40 +13413,53 @@ msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(vacío)"
 
-#: src/plugins/rssyl/rssyl.c:157 src/plugins/rssyl/rssyl.c:169
+#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:168
 msgid "Refresh all feeds"
 msgstr "Refrescar todos los canales"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:66
+#: src/plugins/rssyl/rssyl_cb_menu.c:99
 msgid "Subscribe feed"
 msgstr "Suscribir canal"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:67
+#: src/plugins/rssyl/rssyl_cb_menu.c:100
 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:99
+#: src/plugins/rssyl/rssyl_cb_menu.c:136
 #, 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:248 src/plugins/rssyl/rssyl_cb_menu.c:295
+#: src/plugins/rssyl/rssyl_cb_menu.c:190
+#, c-format
+msgid ""
+"All folders and messages under '%s' will be permanently deleted.\n"
+"Recovery will not be possible.\n"
+"\n"
+"Do you really want to delete?"
+msgstr ""
+"Se borrarán permanentemente todas las carpetas y mensajes bajo «%s».\n"
+"La recuperación no será posible.\n"
+"\n"
+"¿Está seguro de que quiere borrarlos?"
+
+#: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
 #: src/plugins/rssyl/rssyl_feed_props.c:201
 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:321
+#: src/plugins/rssyl/rssyl_cb_menu.c:359
 #, 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:322
+#: src/plugins/rssyl/rssyl_cb_menu.c:360
 msgid "Remove feed tree"
 msgstr "Eliminar árbol de canales"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/plugins/rssyl/rssyl_cb_menu.c:395
 msgid "Select an OPML file"
 msgstr "Seleccionar un fichero OPML"
 
@@ -13334,51 +13505,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:270
+#: src/plugins/rssyl/rssyl_feed_props.c:269
 msgid "HTTP Basic authentication"
 msgstr "Usar autenticación HTTP básica"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:292
+#: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
 msgstr "Usar el intervalo de refresco predeterminado"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:304
+#: src/plugins/rssyl/rssyl_feed_props.c:303
 msgid "Keep old items"
 msgstr "Guardar elementos antiguos"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:310
+#: src/plugins/rssyl/rssyl_feed_props.c:309
 msgid "_Trim"
 msgstr "Recor_tar"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:312
+#: src/plugins/rssyl/rssyl_feed_props.c:311
 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:315
+#: src/plugins/rssyl/rssyl_feed_props.c:314
 msgid "Fetch comments if possible"
 msgstr "Recuperar los comentarios si es posible"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:335
+#: src/plugins/rssyl/rssyl_feed_props.c:334
 msgid "Always mark it as new"
 msgstr "Marcarlo siempre como nuevo"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:337
+#: src/plugins/rssyl/rssyl_feed_props.c:336
 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:339
+#: src/plugins/rssyl/rssyl_feed_props.c:338
 msgid "Never mark it as new"
 msgstr "Nunca marcarlo como nuevo"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:344
+#: src/plugins/rssyl/rssyl_feed_props.c:343
 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:351
+#: src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "Ignore title rename"
 msgstr "Ignorar el renombrado del título"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:355
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -13386,50 +13557,50 @@ 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:360
-#: src/plugins/vcalendar/vcal_prefs.c:593
-msgid "Verify SSL/TLS certificate validity"
-msgstr "Verificar la validez del certificado SSL/TLS"
+#: src/plugins/rssyl/rssyl_feed_props.c:359
+#: src/plugins/vcalendar/vcal_prefs.c:594
+msgid "Verify TLS certificate validity"
+msgstr "Verificar la validez del certificado TLS"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:380
+#: src/plugins/rssyl/rssyl_feed_props.c:379
 msgid "User name"
 msgstr "Nombre de usuario"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:393
+#: src/plugins/rssyl/rssyl_feed_props.c:392
 msgid "Source URL"
 msgstr "URL de origen"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:406
+#: src/plugins/rssyl/rssyl_feed_props.c:405
 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:414
-#: src/plugins/vcalendar/day-view.c:612 src/plugins/vcalendar/month-view.c:710
-#: src/prefs_account.c:1653 src/prefs_folder_item.c:572 src/prefs_matcher.c:340
+#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
+#: src/prefs_account.c:1653 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr "días"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:415
+#: src/plugins/rssyl/rssyl_feed_props.c:414
 msgid "Set to -1 to fetch all comments"
 msgstr "Establecer a -1 para recuperarlos todos"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:439
+#: src/plugins/rssyl/rssyl_feed_props.c:438
 msgid "If an item changes"
 msgstr "Si un elemento cambia"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:444
+#: src/plugins/rssyl/rssyl_feed_props.c:443
 msgid "Items"
 msgstr "Elementos"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:457
+#: src/plugins/rssyl/rssyl_feed_props.c:456
 msgid "Refresh interval"
 msgstr "Intervalo de refresco"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:465
+#: src/plugins/rssyl/rssyl_feed_props.c:464
 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:517
+#: src/plugins/rssyl/rssyl_feed_props.c:496
 msgid "Set feed properties"
 msgstr "Establecer las propiedades del canal"
 
@@ -13500,9 +13671,9 @@ msgid "Refresh all feeds on application start"
 msgstr "Refrescar todos los canales al iniciar la aplicación"
 
 #: src/plugins/rssyl/rssyl_prefs.c:170
-msgid "Verify SSL/TLS certificates validity for new feeds"
+msgid "Verify TLS certificates validity for new feeds"
 msgstr ""
-"Verificar la validez de los certificados SSL/TLS para los canales nuevos"
+"Verificar la validez de los certificados TLS para los canales nuevos"
 
 #: src/plugins/rssyl/rssyl_prefs.c:177
 msgid "Path to cookies file"
@@ -13545,13 +13716,13 @@ msgstr ""
 msgid "_Edit feed properties after subscribing"
 msgstr "_Editar propiedades del canal después de suscribirse"
 
-#: src/plugins/rssyl/rssyl_update_comments.c:107
+#: src/plugins/rssyl/rssyl_update_comments.c:109
 #, c-format
 msgid "Updating comments for '%s'..."
 msgstr "Actualizando comentarios para «%s»..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1624
+#: src/plugins/vcalendar/vcal_folder.c:1628
 msgid "401 (Authorisation required)"
 msgstr "401 (Se requiere autorización)"
 
@@ -13560,7 +13731,7 @@ msgid "403 (Forbidden)"
 msgstr "403 (No autorizado)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1630
+#: src/plugins/vcalendar/vcal_folder.c:1634
 msgid "404 (Not found)"
 msgstr "404 (No encontrado)"
 
@@ -13632,7 +13803,7 @@ msgstr ""
 "suceder. Por favor informe de esto, con la información de depuración "
 "adjunta.\n"
 
-#: src/plugins/smime/plugin.c:59
+#: src/plugins/smime/plugin.c:61
 msgid ""
 "This plugin handles S/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"
@@ -13668,24 +13839,24 @@ msgstr ""
 "\n"
 "GPGME es copyright 2001 por Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:426
+#: src/plugins/smime/smime.c:567
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "No se pudo establecer el protocolo GPG, %s"
 
-#: src/plugins/smime/smime.c:454
+#: src/plugins/smime/smime.c:603
 msgid "Couldn't open temporary file"
 msgstr "No se pudo abrir el fichero temporal"
 
-#: src/plugins/smime/smime.c:465 src/plugins/smime/smime.c:480
+#: src/plugins/smime/smime.c:615 src/plugins/smime/smime.c:631
 msgid "Couldn't write to temporary file"
 msgstr "No se pudo escribir en el fichero temporal"
 
-#: src/plugins/smime/smime.c:491
+#: src/plugins/smime/smime.c:643
 msgid "Couldn't close temporary file"
 msgstr "No se pudo cerrar el fichero temporal"
 
-#: src/plugins/smime/smime.c:714
+#: src/plugins/smime/smime.c:867
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
@@ -13693,21 +13864,21 @@ msgstr ""
 "Por favor, tenga en cuenta que las cabeceras de correo, como el Asunto, no "
 "serán cifradas por el sistema S/MIME."
 
-#: src/plugins/spam_report/spam_report.c:307
+#: src/plugins/spam_report/spam_report.c:312
 msgid "Reporting spam..."
 msgstr "Informando de correo basura..."
 
-#: src/plugins/spam_report/spam_report.c:342
+#: src/plugins/spam_report/spam_report.c:347
 msgid "Report spam online..."
 msgstr "Informar de correo basura en línea..."
 
-#: src/plugins/spam_report/spam_report.c:353
-#: src/plugins/spam_report/spam_report.c:391
+#: src/plugins/spam_report/spam_report.c:358
+#: src/plugins/spam_report/spam_report.c:396
 #: src/plugins/spam_report/spam_report_prefs.c:83
 msgid "SpamReport"
 msgstr "Informe de correo basura"
 
-#: src/plugins/spam_report/spam_report.c:396
+#: src/plugins/spam_report/spam_report.c:401
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -13723,7 +13894,7 @@ msgstr ""
 " * spamcop.net\n"
 " * sistema de nominación de lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:421
+#: src/plugins/spam_report/spam_report.c:426
 msgid "Spam reporting"
 msgstr "Informe de correo basura"
 
@@ -13735,7 +13906,8 @@ msgstr "Habilitado"
 msgid "Forward to:"
 msgstr "Reenviar a:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1583
+#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1227
+#: src/wizard.c:1595 src/wizard.c:1669
 msgid "Password:"
 msgstr "Contraseña:"
 
@@ -13778,17 +13950,17 @@ msgstr ""
 "Claws Mail necesita acceso a la red para enviar este correo al programa de "
 "aprendizaje remoto."
 
-#: src/plugins/spamassassin/spamassassin.c:561
+#: src/plugins/spamassassin/spamassassin.c:565
 msgid "Failed to get username"
 msgstr "Fallo al obtener en nombre de usuario"
 
-#: src/plugins/spamassassin/spamassassin.c:578
+#: src/plugins/spamassassin/spamassassin.c:582
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "El módulo SpamAssassin esta cargado pero deshabilitado por sus "
 "preferencias.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:612
+#: src/plugins/spamassassin/spamassassin.c:616
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "
@@ -13893,29 +14065,29 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/tnef_parse/tnef_parse.c:131
-#: src/plugins/tnef_parse/tnef_parse.c:138
+#: src/plugins/tnef_parse/tnef_parse.c:134
+#: src/plugins/tnef_parse/tnef_parse.c:142
 msgid "Failed to write the part data."
 msgstr "Falló la escritura de la parte de datos."
 
-#: src/plugins/tnef_parse/tnef_parse.c:183
+#: src/plugins/tnef_parse/tnef_parse.c:187
 msgid "Failed to parse VCalendar data."
 msgstr "Falló la interpretación de los datos VCalendar."
 
-#: src/plugins/tnef_parse/tnef_parse.c:222
+#: src/plugins/tnef_parse/tnef_parse.c:226
 msgid "Failed to parse VTask data."
 msgstr "Falló la interpretación de los datos VTask."
 
-#: src/plugins/tnef_parse/tnef_parse.c:274
+#: src/plugins/tnef_parse/tnef_parse.c:278
 msgid "Failed to parse VCard data."
 msgstr "Falló la interpretación de los datos VCard."
 
-#: src/plugins/tnef_parse/tnef_parse.c:414
-#: src/plugins/tnef_parse/tnef_parse.c:438
+#: src/plugins/tnef_parse/tnef_parse.c:418
+#: src/plugins/tnef_parse/tnef_parse.c:442
 msgid "TNEF Parser"
 msgstr "Lector TNEF"
 
-#: src/plugins/tnef_parse/tnef_parse.c:443
+#: src/plugins/tnef_parse/tnef_parse.c:447
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
@@ -13928,115 +14100,115 @@ msgstr ""
 "El módulo usa la biblioteca Ytnef, que tiene Copyright 2002-2007 por Randall "
 "Hand <yerase at yerot.com>"
 
-#: src/plugins/vcalendar/common-views.c:62
+#: src/plugins/vcalendar/common-views.c:61
 msgid "_Edit this meeting..."
 msgstr "_Editar esta reunión..."
 
-#: src/plugins/vcalendar/common-views.c:63
+#: src/plugins/vcalendar/common-views.c:62
 msgid "_Cancel this meeting..."
 msgstr "_Cancelar esta reunión..."
 
-#: src/plugins/vcalendar/common-views.c:65
+#: src/plugins/vcalendar/common-views.c:64
 msgid "_Create new meeting..."
 msgstr "_Crear nueva reunión..."
 
-#: src/plugins/vcalendar/common-views.c:67
+#: src/plugins/vcalendar/common-views.c:66
 msgid "_Go to today"
 msgstr "_Ir a hoy"
 
-#: src/plugins/vcalendar/day-view.c:591 src/plugins/vcalendar/month-view.c:689
+#: src/plugins/vcalendar/day-view.c:599 src/plugins/vcalendar/month-view.c:688
 msgid "Start"
 msgstr "Inicio"
 
-#: src/plugins/vcalendar/day-view.c:604 src/plugins/vcalendar/month-view.c:702
+#: src/plugins/vcalendar/day-view.c:612 src/plugins/vcalendar/month-view.c:701
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/plugins/vcalendar/month-view.c:109
+#: src/plugins/vcalendar/month-view.c:108
 msgid "Monday"
 msgstr "Lunes"
 
-#: src/plugins/vcalendar/month-view.c:110
+#: src/plugins/vcalendar/month-view.c:109
 msgid "Tuesday"
 msgstr "Martes"
 
-#: src/plugins/vcalendar/month-view.c:111
+#: src/plugins/vcalendar/month-view.c:110
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: src/plugins/vcalendar/month-view.c:112
+#: src/plugins/vcalendar/month-view.c:111
 msgid "Thursday"
 msgstr "Jueves"
 
-#: src/plugins/vcalendar/month-view.c:113
+#: src/plugins/vcalendar/month-view.c:112
 msgid "Friday"
 msgstr "Viernes"
 
-#: src/plugins/vcalendar/month-view.c:114
+#: src/plugins/vcalendar/month-view.c:113
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/plugins/vcalendar/month-view.c:115
+#: src/plugins/vcalendar/month-view.c:114
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/plugins/vcalendar/month-view.c:118
+#: src/plugins/vcalendar/month-view.c:117
 msgid "January"
 msgstr "Enero"
 
-#: src/plugins/vcalendar/month-view.c:119
+#: src/plugins/vcalendar/month-view.c:118
 msgid "February"
 msgstr "Febrero"
 
-#: src/plugins/vcalendar/month-view.c:120
+#: src/plugins/vcalendar/month-view.c:119
 msgid "March"
 msgstr "Marzo"
 
-#: src/plugins/vcalendar/month-view.c:121
+#: src/plugins/vcalendar/month-view.c:120
 msgid "April"
 msgstr "Abril"
 
-#: src/plugins/vcalendar/month-view.c:122
+#: src/plugins/vcalendar/month-view.c:121
 msgid "May"
 msgstr "Mayo"
 
-#: src/plugins/vcalendar/month-view.c:123
+#: src/plugins/vcalendar/month-view.c:122
 msgid "June"
 msgstr "Junio"
 
-#: src/plugins/vcalendar/month-view.c:124
+#: src/plugins/vcalendar/month-view.c:123
 msgid "July"
 msgstr "Julio"
 
-#: src/plugins/vcalendar/month-view.c:125
+#: src/plugins/vcalendar/month-view.c:124
 msgid "August"
 msgstr "Agosto"
 
-#: src/plugins/vcalendar/month-view.c:126
+#: src/plugins/vcalendar/month-view.c:125
 msgid "September"
 msgstr "Septiembre"
 
-#: src/plugins/vcalendar/month-view.c:127
+#: src/plugins/vcalendar/month-view.c:126
 msgid "October"
 msgstr "Octubre"
 
-#: src/plugins/vcalendar/month-view.c:128
+#: src/plugins/vcalendar/month-view.c:127
 msgid "November"
 msgstr "Noviembre"
 
-#: src/plugins/vcalendar/month-view.c:129
+#: src/plugins/vcalendar/month-view.c:128
 msgid "December"
 msgstr "Diciembre"
 
-#: src/plugins/vcalendar/month-view.c:790
+#: src/plugins/vcalendar/month-view.c:789
 msgid "Week number"
 msgstr "N.º de semana"
 
-#: src/plugins/vcalendar/month-view.c:875
+#: src/plugins/vcalendar/month-view.c:874
 msgid "Previous month"
 msgstr "Mes anterior"
 
-#: src/plugins/vcalendar/month-view.c:894
+#: src/plugins/vcalendar/month-view.c:893
 msgid "Next month"
 msgstr "Mes siguiente"
 
@@ -14110,7 +14282,7 @@ msgstr "Tiene un elemento pendiente."
 
 #: src/plugins/vcalendar/vcalendar.c:474 src/plugins/vcalendar/vcalendar.c:481
 #: src/plugins/vcalendar/vcalendar.c:486 src/plugins/vcalendar/vcalendar.c:494
-#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:715
+#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:712
 msgid "Details follow:"
 msgstr "Los detalles son los siguientes:"
 
@@ -14134,15 +14306,15 @@ msgstr "Se le ha enviado una cita."
 msgid "(this event recurs)"
 msgstr "(este evento es recurrente)"
 
-#: src/plugins/vcalendar/vcalendar.c:563
+#: src/plugins/vcalendar/vcalendar.c:562
 msgid "(this event is part of a recurring event)"
 msgstr "(este evento es parte de un evento recurrente)"
 
-#: src/plugins/vcalendar/vcalendar.c:714
+#: src/plugins/vcalendar/vcalendar.c:711
 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:718
+#: src/plugins/vcalendar/vcalendar.c:715
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -14151,35 +14323,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:797
+#: src/plugins/vcalendar/vcalendar.c:796
 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:804
+#: src/plugins/vcalendar/vcalendar.c:803
 msgid "Error - no calendar part found."
 msgstr "Error - no se encontró la parte del calendario."
 
-#: src/plugins/vcalendar/vcalendar.c:818
+#: src/plugins/vcalendar/vcalendar.c:817
 msgid "Error - Unknown calendar component type."
 msgstr "Error - Tipo de componente de calendario desconocido."
 
-#: src/plugins/vcalendar/vcalendar.c:950
+#: src/plugins/vcalendar/vcalendar.c:951
 msgid "Send a notification to the attendees"
 msgstr "Enviar una notificación a los asistentes"
 
-#: src/plugins/vcalendar/vcalendar.c:959
+#: src/plugins/vcalendar/vcalendar.c:960
 msgid "Cancel meeting"
 msgstr "Cancelar reunión"
 
-#: src/plugins/vcalendar/vcalendar.c:960
+#: src/plugins/vcalendar/vcalendar.c:961
 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:1055
+#: src/plugins/vcalendar/vcalendar.c:1056
 msgid "No account found"
 msgstr "No se encontró ninguna cuenta"
 
-#: src/plugins/vcalendar/vcalendar.c:1056
+#: src/plugins/vcalendar/vcalendar.c:1057
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -14187,68 +14359,68 @@ msgstr ""
 "No tiene ninguna cuenta que coincida con algún convocado.\n"
 "¿Desea responder de todas maneras?"
 
-#: src/plugins/vcalendar/vcalendar.c:1058
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid "Reply anyway"
 msgstr "Responder igualmente"
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Answer"
 msgstr "Responder"
 
-#: src/plugins/vcalendar/vcalendar.c:1192
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Edit meeting..."
 msgstr "Editar reunión..."
 
-#: src/plugins/vcalendar/vcalendar.c:1193
+#: src/plugins/vcalendar/vcalendar.c:1194
 msgid "Cancel meeting..."
 msgstr "Cancelar reunión..."
 
-#: src/plugins/vcalendar/vcalendar.c:1194
+#: src/plugins/vcalendar/vcalendar.c:1195
 msgid "Launch website"
 msgstr "Abrir página web"
 
-#: src/plugins/vcalendar/vcalendar.c:1198
+#: src/plugins/vcalendar/vcalendar.c:1199
 msgid "You are already busy at this time."
 msgstr "Usted ya está ocupado a esa hora."
 
-#: src/plugins/vcalendar/vcalendar.c:1237
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1626
+#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1630
 msgid "Event:"
 msgstr "Evento:"
 
-#: src/plugins/vcalendar/vcalendar.c:1238
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1615
+#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1619
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: src/plugins/vcalendar/vcalendar.c:1239
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1607
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
+#: src/plugins/vcalendar/vcalendar.c:1240
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1611
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1621
 msgid "Location:"
 msgstr "Ubicación:"
 
-#: src/plugins/vcalendar/vcalendar.c:1240
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1616
+#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1620
 msgid "Summary:"
 msgstr "Resumen:"
 
-#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcalendar.c:1242
 msgid "Starting:"
 msgstr "Comienza:"
 
-#: src/plugins/vcalendar/vcalendar.c:1242
+#: src/plugins/vcalendar/vcalendar.c:1243
 msgid "Ending:"
 msgstr "Finaliza:"
 
-#: src/plugins/vcalendar/vcalendar.c:1244
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1619
+#: src/plugins/vcalendar/vcalendar.c:1245
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1623
 msgid "Attendees:"
 msgstr "Convocados:"
 
-#: src/plugins/vcalendar/vcalendar.c:1246
+#: src/plugins/vcalendar/vcalendar.c:1247
 msgid "Action:"
 msgstr "Acción:"
 
@@ -14288,27 +14460,27 @@ msgstr "Vista _mensual"
 msgid "Meetings"
 msgstr "Reuniones"
 
-#: src/plugins/vcalendar/vcal_folder.c:1502
+#: src/plugins/vcalendar/vcal_folder.c:1503
 msgid "in the past"
 msgstr "en el pasado"
 
-#: src/plugins/vcalendar/vcal_folder.c:1505
+#: src/plugins/vcalendar/vcal_folder.c:1506
 msgid "today"
 msgstr "hoy"
 
-#: src/plugins/vcalendar/vcal_folder.c:1508
+#: src/plugins/vcalendar/vcal_folder.c:1509
 msgid "tomorrow"
 msgstr "mañana"
 
-#: src/plugins/vcalendar/vcal_folder.c:1511
+#: src/plugins/vcalendar/vcal_folder.c:1512
 msgid "this week"
 msgstr "esta semana"
 
-#: src/plugins/vcalendar/vcal_folder.c:1514
+#: src/plugins/vcalendar/vcal_folder.c:1515
 msgid "later"
 msgstr "más tarde"
 
-#: src/plugins/vcalendar/vcal_folder.c:1518
+#: src/plugins/vcalendar/vcal_folder.c:1519
 #, c-format
 msgid ""
 "\n"
@@ -14317,21 +14489,21 @@ msgstr ""
 "\n"
 "Estos son los eventos planificados %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1615
+#: src/plugins/vcalendar/vcal_folder.c:1619
 #, 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:1627
+#: src/plugins/vcalendar/vcal_folder.c:1631
 msgid "403 (Unauthorised)"
 msgstr "403 (No autorizado)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1633
+#: src/plugins/vcalendar/vcal_folder.c:1637
 #, c-format
 msgid "Error %ld"
 msgstr "Error %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1815
+#: src/plugins/vcalendar/vcal_folder.c:1813
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14344,7 +14516,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1846
+#: src/plugins/vcalendar/vcal_folder.c:1844
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14355,49 +14527,49 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1877
-#: src/plugins/vcalendar/vcal_folder.c:1880
+#: src/plugins/vcalendar/vcal_folder.c:1875
+#: src/plugins/vcalendar/vcal_folder.c:1878
 #, c-format
 msgid "Could not create directory %s"
 msgstr "No se puede crear el directorio %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1918
 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:1931
+#: src/plugins/vcalendar/vcal_folder.c:1929
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Recuperando calendario para %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1932
+#: src/plugins/vcalendar/vcal_folder.c:1930
 msgid "new subscription"
 msgstr "nueva suscripción"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1941
 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:1955
+#: src/plugins/vcalendar/vcal_folder.c:1986
 msgid "Subscribe to Webcal"
 msgstr "Suscribirse a un calendario web"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1986
 msgid "Enter the Webcal URL:"
 msgstr "Introduzca la URL del calendario web (Webcal):"
 
-#: src/plugins/vcalendar/vcal_folder.c:1967
+#: src/plugins/vcalendar/vcal_folder.c:2002
 msgid "Could not parse the URL."
 msgstr "No se pudo procesar la URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1995
+#: src/plugins/vcalendar/vcal_folder.c:2030
 msgid "Do you really want to unsubscribe?"
 msgstr "¿Desea realmente desuscribirse?"
 
-#: src/plugins/vcalendar/vcal_folder.c:1996
+#: src/plugins/vcalendar/vcal_folder.c:2031
 msgid "Delete subscription"
 msgstr "Borrar suscripción"
 
@@ -14613,7 +14785,7 @@ msgid "available"
 msgstr "disponible"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:848
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1101
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1105
 msgid "Free/busy retrieval failed"
 msgstr "Falló la recuperación de libre/ocupado"
 
@@ -14625,27 +14797,27 @@ msgstr "No todos están disponibles"
 msgid "Send anyway"
 msgstr "Enviar igualmente"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:942
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:943
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr ""
 "No todos están disponibles. Vea las notas flotantes para más información..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1083
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "Recuperando la planificación para %s..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1110
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1114
 msgid "Available"
 msgstr "Disponible"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1123
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1130
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1138
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1127
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1134
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1142
 msgid "Everyone is available."
 msgstr "Todos están disponibles."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1139
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1143
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
@@ -14653,7 +14825,7 @@ msgstr ""
 "Todos parecen estar disponibles, pero no se pudo recuperar alguna "
 "información de libre/ocupado."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1311
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1315
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -14661,61 +14833,61 @@ msgstr ""
 "No se pudo enviar la invitación de reunión.\n"
 "Compruebe los destinatarios."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1389
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1393
 msgid "Save & Send"
 msgstr "Guardar y enviar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1390
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1394
 msgid "Check availability"
 msgstr "Comprobar disponibilidad"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1484
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1488
 msgid "Starts at:"
 msgstr "Comienza a las:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1490
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1514 src/prefs_matcher.c:768
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1494
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1518 src/prefs_matcher.c:768
 msgid "on:"
 msgstr "en:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1508
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1512
 msgid "Ends at:"
 msgstr "Finaliza a las:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1549
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1553
 msgid "New meeting"
 msgstr "Nueva reunión"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1551
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1555
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Editar reunión"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1630
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1610
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1634
 msgid "Time:"
 msgstr "Hora:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1753
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1757
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1756
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1760
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1767
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Evento inminente: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1768
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1772
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -14732,120 +14904,120 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1785
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1789
 #, c-format
 msgid "Remind me in %d minute"
 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:1911
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1915
 msgid "Empty calendar"
 msgstr "Calendario vacío"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1912
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1916
 msgid "There is nothing to export."
 msgstr "No hay nada que exportar."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1952
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1956
 msgid "Could not export the calendar."
 msgstr "No se puede exportar el calendario."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1969
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1979
 msgid "Export calendar to ICS"
 msgstr "Exportar calendario a ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1992
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1996
 #, 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:2108
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2112
 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:2140
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2144
 #, 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:300
+#: src/plugins/vcalendar/vcal_prefs.c:301
 msgid "Reminders"
 msgstr "Recordatorios"
 
-#: src/plugins/vcalendar/vcal_prefs.c:309
+#: src/plugins/vcalendar/vcal_prefs.c:310
 msgid "Alert me"
 msgstr "Avisarme"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
+#: src/plugins/vcalendar/vcal_prefs.c:339
 msgid "minutes before an event"
 msgstr "minutos antes de un evento"
 
-#: src/plugins/vcalendar/vcal_prefs.c:361
+#: src/plugins/vcalendar/vcal_prefs.c:362
 msgid "Calendar export"
 msgstr "Exportación de calendario"
 
-#: src/plugins/vcalendar/vcal_prefs.c:372
+#: src/plugins/vcalendar/vcal_prefs.c:373
 msgid "Automatically export calendar to"
 msgstr "Exportar automáticamente el calendario a"
 
-#: src/plugins/vcalendar/vcal_prefs.c:381
-#: src/plugins/vcalendar/vcal_prefs.c:500
+#: src/plugins/vcalendar/vcal_prefs.c:382
+#: src/plugins/vcalendar/vcal_prefs.c:501
 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:383
+#: src/plugins/vcalendar/vcal_prefs.c:384
 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:413
+#: src/plugins/vcalendar/vcal_prefs.c:414
 msgid "Include Webcal subscriptions in export"
 msgstr "Incluir las suscripciones Webcal en la exportación"
 
-#: src/plugins/vcalendar/vcal_prefs.c:423
+#: src/plugins/vcalendar/vcal_prefs.c:424
 msgid "Command to run after calendar export"
 msgstr "Orden a ejecutar tras la exportación del calendario"
 
-#: src/plugins/vcalendar/vcal_prefs.c:452
+#: src/plugins/vcalendar/vcal_prefs.c:453
 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:454
+#: src/plugins/vcalendar/vcal_prefs.c:455
 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:467
+#: src/plugins/vcalendar/vcal_prefs.c:468
 msgid "Export as GNOME shell calendar server"
 msgstr "Exportar como servidor de calendario del shell de GNOME"
 
-#: src/plugins/vcalendar/vcal_prefs.c:469
+#: src/plugins/vcalendar/vcal_prefs.c:470
 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:479
+#: src/plugins/vcalendar/vcal_prefs.c:480
 msgid "Free/Busy information"
 msgstr "Información libre/ocupado"
 
-#: src/plugins/vcalendar/vcal_prefs.c:491
+#: src/plugins/vcalendar/vcal_prefs.c:492
 msgid "Automatically export free/busy status to"
 msgstr "Exportar automáticamente el estado de libre/ocupado a"
 
-#: src/plugins/vcalendar/vcal_prefs.c:502
+#: src/plugins/vcalendar/vcal_prefs.c:503
 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:532
+#: src/plugins/vcalendar/vcal_prefs.c:533
 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:559
+#: src/plugins/vcalendar/vcal_prefs.c:560
 msgid "Get free/busy status of others from"
 msgstr "Obtener el estado de libre/ocupado de otros desde"
 
-#: src/plugins/vcalendar/vcal_prefs.c:567
+#: src/plugins/vcalendar/vcal_prefs.c:568
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -14854,9 +15026,9 @@ 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:581
-msgid "SSL/TLS options"
-msgstr "Opciones SSL/TLS"
+#: src/plugins/vcalendar/vcal_prefs.c:582
+msgid "TLS options"
+msgstr "Opciones TLS"
 
 #: src/pop.c:153
 msgid "Required APOP timestamp not found in greeting\n"
@@ -14909,12 +15081,12 @@ msgstr "hubo un error en la sesión POP\n"
 msgid "TOP command unsupported\n"
 msgstr "orden TOP no soportada\n"
 
-#: src/prefs_account.c:395 src/prefs_account.c:1596 src/prefs_account.c:2914
+#: src/prefs_account.c:395 src/prefs_account.c:1596 src/prefs_account.c:2915
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:396 src/prefs_account.c:1739 src/prefs_account.c:2929
-#: src/wizard.c:1509
+#: src/prefs_account.c:396 src/prefs_account.c:1739 src/prefs_account.c:2930
+#: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
@@ -14922,7 +15094,7 @@ msgstr "IMAP"
 msgid "News (NNTP)"
 msgstr "Noticias (NNTP)"
 
-#: src/prefs_account.c:398 src/wizard.c:1510
+#: src/prefs_account.c:398 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "Fichero mbox local"
 
@@ -14950,11 +15122,11 @@ msgstr "Nombre completo"
 msgid "Mail address"
 msgstr "Dirección de correo"
 
-#: src/prefs_account.c:1294 src/wizard.c:1532
+#: src/prefs_account.c:1294 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Configuración automática"
 
-#: src/prefs_account.c:1296 src/wizard.c:1533
+#: src/prefs_account.c:1296 src/wizard.c:1541
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -15048,7 +15220,7 @@ msgstr ""
 "Los mensajes que sobrepasen este límite serán recuperados parcialmente. Al "
 "seleccionarlos podrá descargarlos por completo o borrarlos."
 
-#: src/prefs_account.c:1715 src/prefs_account.c:2944
+#: src/prefs_account.c:1715 src/prefs_account.c:2945
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -15112,7 +15284,7 @@ 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:1963 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:633 src/prefs_matcher.c:2009 src/prefs_matcher.c:2037
+#: src/prefs_matcher.c:633 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
 msgid "Header"
 msgstr "Cabecera"
 
@@ -15184,178 +15356,178 @@ msgstr "Copiar enlace"
 msgid "Authorization code"
 msgstr "Código de autorización"
 
-#: src/prefs_account.c:2323
-msgid "Paste complete URL from browser or the provided auth token"
+#: src/prefs_account.c:2324
+msgid "Paste complete URL from browser or the provided authorization token"
 msgstr ""
-"Pegar la URL completa del navegador o el token de autenticación proporcionado"
+"Pegar la URL completa del navegador o el token de autorización proporcionado"
 
-#: src/prefs_account.c:2330
+#: src/prefs_account.c:2331
 msgid "Complete authorization"
 msgstr "Completar autorización"
 
-#: src/prefs_account.c:2334
+#: src/prefs_account.c:2335
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: src/prefs_account.c:2420 src/prefs_account.c:2466
+#: src/prefs_account.c:2421 src/prefs_account.c:2467
 msgid "Signature"
 msgstr "Firma"
 
-#: src/prefs_account.c:2423
+#: src/prefs_account.c:2424
 msgid "Automatically insert signature"
 msgstr "Insertar la firma automáticamente"
 
-#: src/prefs_account.c:2428
+#: src/prefs_account.c:2429
 msgid "Signature separator"
 msgstr "Separador de la firma"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2454
 msgid "Command output"
 msgstr "Salida de la orden"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2487
 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
-#: src/prefs_account.c:2535
+#: src/prefs_account.c:2536
 msgid "Spell check dictionaries"
 msgstr "Diccionarios de corrección ortográfica"
 
-#: src/prefs_account.c:2545 src/prefs_folder_item.c:1101
-#: src/prefs_spelling.c:162
+#: src/prefs_account.c:2546 src/prefs_folder_item.c:1162
+#: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Diccionario predeterminado"
 
-#: src/prefs_account.c:2557 src/prefs_folder_item.c:1132
-#: src/prefs_spelling.c:171
+#: src/prefs_account.c:2558 src/prefs_folder_item.c:1193
+#: src/prefs_spelling.c:158
 msgid "Default alternate dictionary"
 msgstr "Diccionario alternativo predeterminado"
 
-#: src/prefs_account.c:2642 src/prefs_account.c:4108
-#: src/prefs_compose_writing.c:364 src/prefs_folder_item.c:1516
-#: src/prefs_folder_item.c:1891 src/prefs_quote.c:119 src/prefs_quote.c:237
-#: src/prefs_spelling.c:324 src/prefs_wrapping.c:152
+#: src/prefs_account.c:2643 src/prefs_account.c:4116
+#: src/prefs_compose_writing.c:364 src/prefs_folder_item.c:1592
+#: src/prefs_folder_item.c:1957 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_spelling.c:308 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Componer"
 
-#: src/prefs_account.c:2657 src/prefs_folder_item.c:1544 src/prefs_quote.c:134
-#: src/toolbar.c:490
+#: src/prefs_account.c:2658 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/toolbar.c:500
 msgid "Reply"
 msgstr "Responder"
 
-#: src/prefs_account.c:2672 src/prefs_filtering_action.c:183
-#: src/prefs_folder_item.c:1572 src/prefs_quote.c:149 src/toolbar.c:495
+#: src/prefs_account.c:2673 src/prefs_filtering_action.c:183
+#: src/prefs_folder_item.c:1648 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/prefs_account.c:2719
+#: src/prefs_account.c:2720
 msgid "Default privacy system"
 msgstr "Sistema de privacidad predeterminado"
 
-#: src/prefs_account.c:2748 src/prefs_folder_item.c:1168
+#: src/prefs_account.c:2749 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "Firmar siempre los mensajes"
 
-#: src/prefs_account.c:2750 src/prefs_folder_item.c:1198
+#: src/prefs_account.c:2751 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "Cifrar siempre los mensajes"
 
-#: src/prefs_account.c:2752
+#: src/prefs_account.c:2753
 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:2755
+#: src/prefs_account.c:2756
 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:2758
+#: src/prefs_account.c:2759
 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 la del "
 "destinatario"
 
-#: src/prefs_account.c:2760
+#: src/prefs_account.c:2761
 msgid "Save sent encrypted messages as clear text"
 msgstr "Guardar en claro los mensajes enviados cifrados"
 
-#: src/prefs_account.c:2918 src/prefs_account.c:2933 src/prefs_account.c:2947
-msgid "Don't use SSL/TLS"
-msgstr "No usar SSL/TLS"
+#: src/prefs_account.c:2919 src/prefs_account.c:2934 src/prefs_account.c:2948
+msgid "Don't use TLS"
+msgstr "No usar TLS"
 
-#: src/prefs_account.c:2921 src/prefs_account.c:2936 src/prefs_account.c:2956
-#: src/prefs_account.c:2967
-msgid "Use SSL/TLS"
-msgstr "Usar SSL/TLS"
+#: src/prefs_account.c:2922 src/prefs_account.c:2937 src/prefs_account.c:2957
+#: src/prefs_account.c:2968
+msgid "Use TLS"
+msgstr "Usar TLS"
 
-#: src/prefs_account.c:2924 src/prefs_account.c:2939 src/prefs_account.c:2970
+#: src/prefs_account.c:2925 src/prefs_account.c:2940 src/prefs_account.c:2971
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Usar la orden STARTTLS para abrir la sesión cifrada"
 
-#: src/prefs_account.c:2960
+#: src/prefs_account.c:2961
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account.c:2964
-msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
-msgstr "No usar SSL/TLS (pero usar STARTTLS si es necesario)"
+#: src/prefs_account.c:2965
+msgid "Don't use TLS (but, if necessary, use STARTTLS)"
+msgstr "No usar TLS (pero usar STARTTLS si es necesario)"
 
-#: src/prefs_account.c:2975
+#: src/prefs_account.c:2976
 msgid "Client certificates"
 msgstr "Certificados de cliente"
 
-#: src/prefs_account.c:2983
+#: src/prefs_account.c:2984
 msgid "Certificate for receiving"
 msgstr "Certificado para recepción"
 
-#: src/prefs_account.c:2988 src/prefs_account.c:2990 src/prefs_account.c:3016
-#: src/prefs_account.c:3018
+#: src/prefs_account.c:2989 src/prefs_account.c:2991 src/prefs_account.c:3017
+#: src/prefs_account.c:3019
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Certificado de cliente como fichero PKCS12 o PEM"
 
-#: src/prefs_account.c:3011
+#: src/prefs_account.c:3012
 msgid "Certificate for sending"
 msgstr "Certificado para envío"
 
-#: src/prefs_account.c:3051
-msgid "Automatically accept valid SSL/TLS certificates"
-msgstr "Aceptar automáticamente los certificados SSL/TLS válidos"
+#: src/prefs_account.c:3052
+msgid "Automatically accept valid TLS certificates"
+msgstr "Aceptar automáticamente los certificados TLS válidos"
 
-#: src/prefs_account.c:3054
-msgid "Use non-blocking SSL/TLS"
-msgstr "Usar SSL/TLS no-bloqueante"
+#: src/prefs_account.c:3055
+msgid "Use non-blocking TLS"
+msgstr "Usar TLS no-bloqueante"
 
-#: src/prefs_account.c:3066
-msgid "Turn this off if you have SSL/TLS connection problems"
-msgstr "Desactive esto si tiene problemas de conexión con SSL/TLS"
+#: src/prefs_account.c:3067
+msgid "Turn this off if you have TLS connection problems"
+msgstr "Desactive esto si tiene problemas de conexión con TLS"
 
-#: src/prefs_account.c:3158 src/prefs_proxy.c:73
+#: src/prefs_account.c:3159 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Usar servidor proxy"
 
-#: src/prefs_account.c:3167
+#: src/prefs_account.c:3168
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr " Usar configuración predeterminada"
 
-#: src/prefs_account.c:3169
+#: src/prefs_account.c:3170
 msgid "Use global proxy server settings"
 msgstr "Utilizar la configuración global del proxy"
 
-#: src/prefs_account.c:3206 src/prefs_proxy.c:115 src/wizard.c:1118
+#: src/prefs_account.c:3207 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "Usar autenticación"
 
-#: src/prefs_account.c:3211 src/prefs_proxy.c:123
+#: src/prefs_account.c:3212 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Usuario"
 
-#: src/prefs_account.c:3240
+#: src/prefs_account.c:3241
 msgid "Use proxy server for sending"
 msgstr "Usar el servidor proxy para enviar"
 
-#: src/prefs_account.c:3242
+#: src/prefs_account.c:3243
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15364,27 +15536,27 @@ msgstr ""
 "con el servidor de salida configurado, ignorando cualquier servidor proxy "
 "configurado."
 
-#: src/prefs_account.c:3352
+#: src/prefs_account.c:3354
 msgid "SMTP port"
 msgstr "Puerto SMTP"
 
-#: src/prefs_account.c:3359
+#: src/prefs_account.c:3361
 msgid "POP port"
 msgstr "Puerto POP"
 
-#: src/prefs_account.c:3366
+#: src/prefs_account.c:3368
 msgid "IMAP port"
 msgstr "Puerto IMAP"
 
-#: src/prefs_account.c:3373
+#: src/prefs_account.c:3375
 msgid "NNTP port"
 msgstr "Puerto NNTP"
 
-#: src/prefs_account.c:3379
+#: src/prefs_account.c:3381
 msgid "Domain name"
 msgstr "Nombre de dominio"
 
-#: src/prefs_account.c:3382
+#: src/prefs_account.c:3384
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15392,236 +15564,252 @@ 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:3396
+#: src/prefs_account.c:3398
 msgid "Use command to communicate with server"
 msgstr "Usar orden para comunicarse con el servidor"
 
-#: src/prefs_account.c:3405
+#: src/prefs_account.c:3407
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar los mensajes cruzados como leídos y de color:"
 
-#: src/prefs_account.c:3454
+#: src/prefs_account.c:3456
 msgid "Put sent messages in"
 msgstr "Poner mensajes enviados en"
 
-#: src/prefs_account.c:3456
+#: src/prefs_account.c:3458
 msgid "Put queued messages in"
 msgstr "Poner mensajes para la cola en"
 
-#: src/prefs_account.c:3458
+#: src/prefs_account.c:3460
 msgid "Put draft messages in"
 msgstr "Poner borradores de mensajes en"
 
-#: src/prefs_account.c:3460
+#: src/prefs_account.c:3462
 msgid "Put deleted messages in"
 msgstr "Poner mensajes borrados en"
 
-#: src/prefs_account.c:3517
+#: src/prefs_account.c:3519
 msgid "Account name is not entered."
 msgstr "No se especificó el nombre de la cuenta."
 
-#: src/prefs_account.c:3521
+#: src/prefs_account.c:3523
 msgid "Mail address is not entered."
 msgstr "No se especificó la dirección de correo."
 
-#: src/prefs_account.c:3529
+#: src/prefs_account.c:3531
 msgid "SMTP server is not entered."
 msgstr "No se especificó el servidor SMTP."
 
-#: src/prefs_account.c:3534
+#: src/prefs_account.c:3536
 msgid "User ID is not entered."
 msgstr "No se especificó el usuario."
 
-#: src/prefs_account.c:3539
+#: src/prefs_account.c:3541
 msgid "POP server is not entered."
 msgstr "No se especificó el servidor POP."
 
-#: src/prefs_account.c:3559
+#: src/prefs_account.c:3561
 msgid "The default Inbox folder doesn't exist."
 msgstr "La carpeta de entrada predeterminada no existe."
 
-#: src/prefs_account.c:3565
+#: src/prefs_account.c:3567
 msgid "IMAP server is not entered."
 msgstr "No se especificó el servidor IMAP."
 
-#: src/prefs_account.c:3570
+#: src/prefs_account.c:3572
 msgid "NNTP server is not entered."
 msgstr "No se especificó el servidor NNTP."
 
-#: src/prefs_account.c:3576
+#: src/prefs_account.c:3578
 msgid "local mailbox filename is not entered."
 msgstr "no se especificó el nombre de fichero del buzón local."
 
-#: src/prefs_account.c:3582
+#: src/prefs_account.c:3584
 msgid "mail command is not entered."
 msgstr "no se especificó el mandato de correo."
 
-#: src/prefs_account.c:3592
+#: src/prefs_account.c:3594
 msgid "User ID cannot contain a newline character."
 msgstr "El identificador de usuario no puede contener retornos de carro."
 
-#: src/prefs_account.c:3597
+#: src/prefs_account.c:3601
 msgid "Password cannot contain a newline character."
 msgstr "La contraseña no puede contener retornos de carro."
 
-#: src/prefs_account.c:3628
+#: src/prefs_account.c:3636
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "El identificador de usuario SMTP no puede contener retornos de carro."
 
-#: src/prefs_account.c:3633
+#: src/prefs_account.c:3641
 msgid "SMTP password cannot contain a newline character."
 msgstr "La contraseña SMTP no puede contener retornos de carro."
 
-#: src/prefs_account.c:3725
+#: src/prefs_account.c:3733
 msgid "domain is not specified."
 msgstr "no se especificó el dominio."
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3738
 msgid "sent folder is not selected."
 msgstr "no se seleccionó la carpeta de enviados."
 
-#: src/prefs_account.c:3735
+#: src/prefs_account.c:3743
 msgid "queue folder is not selected."
 msgstr "no se seleccionó la carpeta de la cola."
 
-#: src/prefs_account.c:3740
+#: src/prefs_account.c:3748
 msgid "draft folder is not selected."
 msgstr "no se seleccionó la carpeta de borradores."
 
-#: src/prefs_account.c:3745
+#: src/prefs_account.c:3753
 msgid "trash folder is not selected."
 msgstr "no se seleccionó la carpeta de la papelera."
 
-#: src/prefs_account.c:4054
+#: src/prefs_account.c:4062
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account.c:4090
+#: src/prefs_account.c:4098
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4126 src/prefs_folder_item.c:1907 src/prefs_quote.c:238
+#: src/prefs_account.c:4134 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Plantillas"
 
-#: src/prefs_account.c:4144
+#: src/prefs_account.c:4152
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: src/prefs_account.c:4274
+#: src/prefs_account.c:4272
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/prefs_account.c:4629
+#: src/prefs_account.c:4632
 msgid "Preferences for new account"
 msgstr "Preferencias para una nueva cuenta"
 
-#: src/prefs_account.c:4631
+#: src/prefs_account.c:4634
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferencias de la cuenta"
 
-#: src/prefs_account.c:4743 src/wizard.c:1399
+#: src/prefs_account.c:4746 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Falló (dirección errónea)"
 
-#: src/prefs_account.c:4828
+#: src/prefs_account.c:4831
 msgid "Select signature file"
 msgstr "Seleccionar fichero de firma"
 
-#: src/prefs_account.c:4846 src/prefs_account.c:4863 src/wizard.c:1066
+#: src/prefs_account.c:4849 src/prefs_account.c:4866 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Seleccionar fichero del certificado"
 
-#: src/prefs_account.c:4959
+#: src/prefs_account.c:4962
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/prefs_account.c:5279
+#: src/prefs_account.c:5282
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (módulo no cargado)"
 
-#: src/prefs_actions.c:224
+#: src/prefs_actions.c:226
 msgid "Actions configuration"
 msgstr "Configuración de acciones"
 
-#: src/prefs_actions.c:251
+#: src/prefs_actions.c:253
 msgid "Menu name"
 msgstr "Nombre de menú"
 
-#: src/prefs_actions.c:280
+#: src/prefs_actions.c:282
 msgid "Shell command"
 msgstr "Orden del intérprete"
 
-#: src/prefs_actions.c:290
+#: src/prefs_actions.c:292
 msgid "Filter action"
 msgstr "Acción de filtrado"
 
-#: src/prefs_actions.c:296
+#: src/prefs_actions.c:298
 msgid "Edit filter action"
 msgstr "Editar acción de filtrado"
 
-#: src/prefs_actions.c:324
+#: src/prefs_actions.c:326
 msgid "Append the new action above to the list"
 msgstr "Añadir la nueva acción de arriba a la lista"
 
-#: src/prefs_actions.c:332
+#: src/prefs_actions.c:334
 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:340
+#: src/prefs_actions.c:342
 msgid "Delete the selected action from the list"
 msgstr "Borrar la acción seleccionada de la lista"
 
-#: src/prefs_actions.c:348 src/prefs_filtering.c:485 src/prefs_template.c:330
+#: src/prefs_actions.c:350 src/prefs_filtering.c:485 src/prefs_template.c:330
 msgid "Clear all the input fields in the dialog"
 msgstr "Limpiar todos los campos de entrada en el diálogo"
 
-#: src/prefs_actions.c:356
+#: src/prefs_actions.c:358
 msgid "Show information on configuring actions"
 msgstr "Muestra información sobre la configuración de las acciones"
 
-#: src/prefs_actions.c:387
+#: src/prefs_actions.c:383 src/prefs_filtering.c:510 src/prefs_template.c:356
+msgid "_Top"
+msgstr "En la _cima"
+
+#: src/prefs_actions.c:389
+msgid "Move the selected action to the top"
+msgstr "Mover la acción seleccionada encima de todas"
+
+#: src/prefs_actions.c:399
 msgid "Move the selected action up"
 msgstr "Mover arriba la acción seleccionada"
 
-#: src/prefs_actions.c:395
+#: src/prefs_actions.c:407
 msgid "Move selected action down"
 msgstr "Mover abajo la acción seleccionada"
 
-#: src/prefs_actions.c:528 src/prefs_filtering_action.c:678
-#: src/prefs_filtering.c:820 src/prefs_filtering.c:822
-#: src/prefs_filtering.c:823 src/prefs_filtering.c:933 src/prefs_matcher.c:918
+#: src/prefs_actions.c:411 src/prefs_filtering.c:558 src/prefs_template.c:384
+msgid "_Bottom"
+msgstr "Al _fondo"
+
+#: src/prefs_actions.c:417
+msgid "Move the selected action to the bottom"
+msgstr "Mover la acción seleccionada al fondo"
+
+#: src/prefs_actions.c:550 src/prefs_filtering_action.c:678
+#: src/prefs_filtering.c:822 src/prefs_filtering.c:824
+#: src/prefs_filtering.c:825 src/prefs_filtering.c:935 src/prefs_matcher.c:918
 #: src/prefs_template.c:465
 msgid "(New)"
 msgstr "(Nueva)"
 
-#: src/prefs_actions.c:593
+#: src/prefs_actions.c:615
 msgid "Menu name is not set."
 msgstr "No se estableció el nombre del menú."
 
-#: src/prefs_actions.c:598
+#: src/prefs_actions.c:620
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "No se permite «/» al inicio del nombre del menú."
 
-#: src/prefs_actions.c:603
+#: src/prefs_actions.c:625
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "No se permite «:» (dos puntos) en el nombre del menú."
 
-#: src/prefs_actions.c:622
+#: src/prefs_actions.c:644
 msgid "Menu name is too long."
 msgstr "El nombre del menú es demasiado largo."
 
-#: src/prefs_actions.c:631
+#: src/prefs_actions.c:653
 msgid "Command-line not set."
 msgstr "No se especificó la orden a ejecutar."
 
-#: src/prefs_actions.c:636
+#: src/prefs_actions.c:658
 msgid "Menu name and command are too long."
 msgstr "El nombre del menú y la orden son demasiado largos."
 
-#: src/prefs_actions.c:642
+#: src/prefs_actions.c:664
 #, c-format
 msgid ""
 "The command\n"
@@ -15632,139 +15820,140 @@ msgstr ""
 "%s\n"
 "tiene errores sintácticos."
 
-#: src/prefs_actions.c:700
+#: src/prefs_actions.c:722
 msgid "Delete action"
 msgstr "Borrar acción"
 
-#: src/prefs_actions.c:701
+#: src/prefs_actions.c:723
 msgid "Do you really want to delete this action?"
 msgstr "¿Realmente quiere borrar esta acción?"
 
-#: src/prefs_actions.c:721
+#: src/prefs_actions.c:744
 msgid "Delete all actions"
 msgstr "Borrar todas las acciones"
 
-#: src/prefs_actions.c:722
+#: src/prefs_actions.c:745
 msgid "Do you really want to delete all the actions?"
 msgstr "¿Realmente quiere borrar todas las acciones?"
 
-#: src/prefs_actions.c:885 src/prefs_actions.c:916 src/prefs_filtering.c:1485
-#: src/prefs_filtering.c:1507 src/prefs_matcher.c:2160 src/prefs_template.c:565
+#: src/prefs_actions.c:913 src/prefs_actions.c:944 src/prefs_filtering.c:1491
+#: src/prefs_filtering.c:1514 src/prefs_matcher.c:2165 src/prefs_template.c:565
 #: src/prefs_template.c:590
 msgid "Entry not saved"
 msgstr "Entrada no guardada"
 
-#: src/prefs_actions.c:886 src/prefs_actions.c:917 src/prefs_filtering.c:1486
-#: src/prefs_filtering.c:1508 src/prefs_template.c:566 src/prefs_template.c:591
+#: src/prefs_actions.c:914 src/prefs_actions.c:945 src/prefs_filtering.c:1492
+#: src/prefs_filtering.c:1515 src/prefs_template.c:566 src/prefs_template.c:591
 msgid "The entry was not saved. Close anyway?"
 msgstr "La entrada no fue guardada. ¿Cerrar igualmente?"
 
-#: src/prefs_actions.c:887 src/prefs_actions.c:892 src/prefs_actions.c:918
-#: src/prefs_filtering.c:1465 src/prefs_filtering.c:1487
-#: src/prefs_filtering.c:1509 src/prefs_matcher.c:2163 src/prefs_template.c:567
-#: src/prefs_template.c:592 src/prefs_template.c:597
+#: src/prefs_actions.c:915 src/prefs_actions.c:920 src/prefs_actions.c:946
+#: src/prefs_actions.c:1315 src/prefs_filtering.c:1469
+#: src/prefs_filtering.c:1493 src/prefs_filtering.c:1516
+#: src/prefs_matcher.c:2168 src/prefs_template.c:567 src/prefs_template.c:592
+#: src/prefs_template.c:597
 msgid "_Continue editing"
 msgstr "_Seguir editando"
 
-#: src/prefs_actions.c:890
+#: src/prefs_actions.c:918
 msgid "Actions list not saved"
 msgstr "Lista de acciones no guardada"
 
-#: src/prefs_actions.c:891
+#: src/prefs_actions.c:919
 msgid "The actions list has been modified. Close anyway?"
 msgstr "La lista de acciones no fue guardada. ¿Cerrar igualmente?"
 
-#: src/prefs_actions.c:961
+#: src/prefs_actions.c:989
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Nombre de menú:</span>"
 
-#: src/prefs_actions.c:962
+#: src/prefs_actions.c:990
 msgid "Use / in menu name to make submenus."
 msgstr "Utilice / en el nombre de menú para crear sub-menús."
 
-#: src/prefs_actions.c:964
+#: src/prefs_actions.c:992
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Línea de orden:</span>"
 
-#: src/prefs_actions.c:965
+#: src/prefs_actions.c:993
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Comenzar con:</span>"
 
-#: src/prefs_actions.c:966
+#: src/prefs_actions.c:994
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "para enviar el mensaje o la selección a la entrada estándar de la orden"
 
-#: src/prefs_actions.c:967
+#: src/prefs_actions.c:995
 msgid "to send user provided text to command's standard input"
 msgstr "para enviar el texto de usuario a la entrada estándar de la orden"
 
-#: src/prefs_actions.c:968
+#: src/prefs_actions.c:996
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "para enviar el texto de usuario oculto a la entrada estándar de la orden"
 
-#: src/prefs_actions.c:969
+#: src/prefs_actions.c:997
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Finalizar con:</span>"
 
-#: src/prefs_actions.c:970
+#: src/prefs_actions.c:998
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "para reemplazar el mensaje o selección con la salida estándar de la orden"
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:999
 msgid "to insert command's standard output without replacing old text"
 msgstr "para insertar la salida estándar de la orden sin reemplazar el texto"
 
-#: src/prefs_actions.c:972
+#: src/prefs_actions.c:1000
 msgid "to run command asynchronously"
 msgstr "para ejecutar la orden de manera asíncrona"
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:1001
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Usar:</span>"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:1002
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "para el fichero del mensaje seleccionado en formato RFC822/2822 "
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:1003
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 "para la lista de nombres de los mensajes seleccionados en formato RFC822/2822"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:1004
 msgid "for the file of the selected decoded message MIME part"
 msgstr "para el fichero de la parte MIME seleccionada del mensaje decodificada"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:1005
 msgid "for a user provided argument"
 msgstr "para un parámetro introducido por el usuario"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:1006
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr ""
 "para un parámetro introducido por el usuario y oculto (p.ej. contraseña)"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:1007
 msgid "for the text selection"
 msgstr "para la parte seleccionada del texto"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:1008
 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplicar acciones de filtrado entre {} a los mensajes seleccionados"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:1009
 msgid "for a literal %"
 msgstr "para un carácter %"
 
-#: src/prefs_actions.c:991 src/prefs_themes.c:1092
+#: src/prefs_actions.c:1019 src/prefs_themes.c:1191
 msgid "Actions"
 msgstr "Acciones"
 
-#: src/prefs_actions.c:992
+#: src/prefs_actions.c:1020
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
@@ -15772,29 +15961,41 @@ msgstr ""
 "Las acciones son una forma de que el usuario pueda lanzar órdenes externas "
 "que procesen un fichero de mensaje o alguna de sus partes."
 
-#: src/prefs_actions.c:1079 src/prefs_filtering.c:1683
+#: src/prefs_actions.c:1107 src/prefs_filtering.c:1691
 #: src/prefs_template.c:1107
 msgid "D_uplicate"
 msgstr "D_uplicar"
 
-#: src/prefs_actions.c:1197
+#: src/prefs_actions.c:1225
 msgid "Current actions"
 msgstr "Acciones actuales"
 
-#: src/prefs_actions.c:1296 src/prefs_filtering.c:1060
-#: src/prefs_filtering.c:1118
+#: src/prefs_actions.c:1312
+msgid "Entry was modified"
+msgstr "La entrada fue modificada"
+
+#: src/prefs_actions.c:1313
+msgid ""
+"Opening the filter action dialog will clear current modifications of the "
+"command-line."
+msgstr ""
+"Al abrir el diálogo de filtrado de acciones se borrarán las "
+"modificaciones actuales de la linea de órdenes."
+
+#: src/prefs_actions.c:1324 src/prefs_filtering.c:1062
+#: src/prefs_filtering.c:1120
 msgid "Action string is not valid."
 msgstr "La cadena de la acción no es válida."
 
-#: src/prefs_common.c:239 src/prefs_quote.c:69
+#: src/prefs_common.c:238 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hola,\\n"
 
-#: src/prefs_common.c:317
+#: src/prefs_common.c:316
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "El %d\\n%f escribió:\\n%q\\n%X"
 
-#: src/prefs_common.c:323 src/prefs_quote.c:85
+#: src/prefs_common.c:322 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -15802,7 +16003,7 @@ msgstr ""
 "\\n\\nInicio del mensaje redirigido:\\n\\n?d{Fecha: %d\\n}?f{Desde: %f\\n}?"
 "t{Para: %t\\n}?c{Cc: %c\\n}?n{Grupos: %n\\n}?s{Asunto: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:458
+#: src/prefs_common.c:457
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15851,8 +16052,8 @@ msgid "Warn when inserting a file larger than"
 msgstr "Avisar al insertar un fichero mayor de"
 
 #: src/prefs_compose_writing.c:205
-msgid "KB into message body "
-msgstr "KB en el cuerpo del mensaje"
+msgid "KiB into message body "
+msgstr "KiB en el cuerpo del mensaje"
 
 #: src/prefs_compose_writing.c:211
 msgid "Replying"
@@ -15887,11 +16088,11 @@ msgstr "Al soltar ficheros en la ventana de composición"
 msgid "Ask"
 msgstr "Preguntar"
 
-#: src/prefs_compose_writing.c:240 src/toolbar.c:522
+#: src/prefs_compose_writing.c:240 src/toolbar.c:533
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/prefs_compose_writing.c:241 src/toolbar.c:523
+#: src/prefs_compose_writing.c:241 src/toolbar.c:534
 msgid "Attach"
 msgstr "Adjuntar"
 
@@ -15904,7 +16105,7 @@ msgid "Custom header configuration"
 msgstr "Configuración de cabeceras de usuario"
 
 #: src/prefs_customheader.c:494 src/prefs_display_header.c:588
-#: src/prefs_matcher.c:1632 src/prefs_matcher.c:1647
+#: src/prefs_matcher.c:1634 src/prefs_matcher.c:1649
 msgid "Header name is not set."
 msgstr "No se estableció el nombre de cabecera."
 
@@ -15965,7 +16166,7 @@ msgstr "Borrar cabecera"
 msgid "Do you really want to delete this header?"
 msgstr "¿Quiere borrar realmente esta cabecera?"
 
-#: src/prefs_customheader.c:865
+#: src/prefs_customheader.c:866
 msgid "Current custom headers"
 msgstr "Cabeceras de usuario actuales"
 
@@ -16026,7 +16227,7 @@ 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:273 src/prefs_image_viewer.c:173
+#: src/prefs_ext_prog.c:273 src/prefs_image_viewer.c:172
 #: src/prefs_message.c:362
 msgid "Message View"
 msgstr "Vista de mensaje"
@@ -16050,8 +16251,8 @@ msgstr "Ocultar"
 msgid "Message flags"
 msgstr "Marcas de mensaje"
 
-#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:641
-#: src/prefs_summary_column.c:77 src/summaryview.c:2878 src/toolbar.c:505
+#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:643
+#: src/prefs_summary_column.c:77 src/summaryview.c:2884 src/toolbar.c:515
 msgid "Mark"
 msgstr "Marca"
 
@@ -16072,11 +16273,11 @@ msgid "Mark as ham"
 msgstr "Marcar como bueno"
 
 #: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:1395
-#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2468
+#: src/toolbar.c:241 src/toolbar.c:509 src/toolbar.c:2510
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:639
+#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:641
 msgid "Color label"
 msgstr "Color"
 
@@ -16091,8 +16292,8 @@ msgstr "Redirigir"
 
 #: src/prefs_filtering_action.c:186 src/prefs_filtering_action.c:187
 #: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:639
-#: src/prefs_summaries.c:644 src/prefs_summary_column.c:86
-#: src/summaryview.c:469
+#: src/prefs_summaries.c:646 src/prefs_summary_column.c:86
+#: src/summaryview.c:470
 msgid "Score"
 msgstr "Puntos"
 
@@ -16106,7 +16307,7 @@ msgstr "Establecer puntos"
 
 #: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
 #: src/prefs_filtering_action.c:190 src/prefs_matcher.c:643
-#: src/prefs_summary_column.c:88 src/summaryview.c:471
+#: src/prefs_summary_column.c:88 src/summaryview.c:472
 msgid "Tags"
 msgstr "Etiquetas"
 
@@ -16134,7 +16335,7 @@ msgstr "Detener filtro"
 msgid "Action configuration"
 msgstr "Configuración de la acción"
 
-#: src/prefs_filtering_action.c:416 src/prefs_filtering.c:1874
+#: src/prefs_filtering_action.c:416 src/prefs_filtering.c:1882
 #: src/prefs_matcher.c:595
 msgid "Rule"
 msgstr "Regla"
@@ -16175,25 +16376,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:1220 src/prefs_matcher.c:2207
+#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2213
 #: src/quote_fmt.c:78
 msgid "literal %"
 msgstr "carácter %"
 
-#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2216
+#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2222
 msgid "filename (should not be modified)"
 msgstr "nombre de fichero (no debe modificarse)"
 
-#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2217
+#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2223
 #: src/quote_fmt.c:86
 msgid "new line"
 msgstr "nueva línea"
 
-#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2218
+#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2224
 msgid "escape character for quotes"
 msgstr "carácter de escape para citas"
 
-#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2219
+#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2225
 msgid "quote character"
 msgstr "carácter de cita"
 
@@ -16235,8 +16436,8 @@ msgstr "Lista actual de acciones"
 msgid "Filtering/Processing configuration"
 msgstr "Configuración de filtrado/procesamiento"
 
-#: src/prefs_filtering.c:265 src/prefs_filtering.c:851
-#: src/prefs_filtering.c:967
+#: src/prefs_filtering.c:265 src/prefs_filtering.c:853
+#: src/prefs_filtering.c:969
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Cualquiera"
@@ -16297,51 +16498,51 @@ msgstr "Mover la regla seleccionada una página hacia abajo"
 msgid "Move the selected rule to the bottom"
 msgstr "Mover la regla seleccionada al fondo"
 
-#: src/prefs_filtering.c:1024 src/prefs_filtering.c:1110
+#: src/prefs_filtering.c:1026 src/prefs_filtering.c:1112
 msgid "Condition string is not valid."
 msgstr "La cadena de condición no es válida."
 
-#: src/prefs_filtering.c:1097
+#: src/prefs_filtering.c:1099
 msgid "Condition string is empty."
 msgstr "La cadena de condición esta vacía."
 
-#: src/prefs_filtering.c:1103
+#: src/prefs_filtering.c:1105
 msgid "Action string is empty."
 msgstr "La cadena de la acción esta vacía."
 
-#: src/prefs_filtering.c:1192
+#: src/prefs_filtering.c:1194
 msgid "Delete rule"
 msgstr "Borrar regla"
 
-#: src/prefs_filtering.c:1193
+#: src/prefs_filtering.c:1195
 msgid "Do you really want to delete this rule?"
 msgstr "¿Quiere borrar realmente esta regla?"
 
-#: src/prefs_filtering.c:1211
+#: src/prefs_filtering.c:1214
 msgid "Delete all rules"
 msgstr "Borrar todas las reglas"
 
-#: src/prefs_filtering.c:1212
+#: src/prefs_filtering.c:1215
 msgid "Do you really want to delete all the rules?"
 msgstr "¿Quiere borrar realmente todas las reglas?"
 
-#: src/prefs_filtering.c:1463
+#: src/prefs_filtering.c:1467
 msgid "Filtering rules not saved"
 msgstr "Reglas de filtrado no guardadas"
 
-#: src/prefs_filtering.c:1464
+#: src/prefs_filtering.c:1468
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "La lista de reglas de filtrado ha sido modificada. ¿Cerrar igualmente?"
 
-#: src/prefs_filtering.c:1686
+#: src/prefs_filtering.c:1694
 msgid "Move one page up"
 msgstr "Mover una página arriba"
 
-#: src/prefs_filtering.c:1687
+#: src/prefs_filtering.c:1695
 msgid "Move one page down"
 msgstr "Mover una página abajo"
 
-#: src/prefs_filtering.c:1842
+#: src/prefs_filtering.c:1850
 msgid "Enable"
 msgstr "Activar"
 
@@ -16361,17 +16562,17 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Columnas ocultas"
 
-#: src/prefs_folder_column.c:300 src/prefs_summaries.c:386
-#: src/prefs_summaries.c:451 src/prefs_summary_column.c:314
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:384
+#: src/prefs_summaries.c:453 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr "Columnas visibles"
 
-#: src/prefs_folder_column.c:333 src/prefs_msg_colors.c:462
-#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1015
+#: src/prefs_folder_column.c:333 src/prefs_msg_colors.c:474
+#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1016
 msgid " Use default "
 msgstr " Usar configuración inicial "
 
-#: src/prefs_folder_item.c:214
+#: src/prefs_folder_item.c:216
 msgid ""
 "These preferences will not be saved as this folder is a top-level folder.\n"
 "However, you can set them for the whole mailbox tree by using \"Apply to "
@@ -16381,7 +16582,7 @@ msgstr ""
 "Sin embargo puede establecerlas en todo el árbol de carpetas del buzón "
 "usando «Aplicar a subcarpetas»."
 
-#: src/prefs_folder_item.c:294 src/prefs_folder_item.c:900
+#: src/prefs_folder_item.c:300 src/prefs_folder_item.c:936
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -16389,41 +16590,41 @@ msgstr ""
 "Aplicar a\n"
 "subcarpetas"
 
-#: src/prefs_folder_item.c:317
+#: src/prefs_folder_item.c:323
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:319
+#: src/prefs_folder_item.c:325
 msgid "Outbox"
 msgstr "Salida"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:336
 msgid "Folder type"
 msgstr "Tipo de carpeta"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:360
 msgid "Simplify Subject RegExp"
 msgstr "Expr. reg. para simplificar asunto"
 
-#: src/prefs_folder_item.c:384
+#: src/prefs_folder_item.c:387
 msgid "Test string"
 msgstr "Texto de prueba"
 
-#: src/prefs_folder_item.c:405
+#: src/prefs_folder_item.c:408
 msgid "Result"
 msgstr "Resultado"
 
-#: src/prefs_folder_item.c:423
+#: src/prefs_folder_item.c:426
 msgid "Folder chmod"
 msgstr "Permisos de la carpeta"
 
-#: src/prefs_folder_item.c:451
+#: src/prefs_folder_item.c:454
 msgid "Folder color"
 msgstr "Color de la carpeta"
 
-#: src/prefs_folder_item.c:462 src/prefs_folder_item.c:1745
+#: src/prefs_folder_item.c:464 src/prefs_folder_item.c:468
 msgid "Pick color for folder"
-msgstr "Elegir color para la carpeta"
+msgstr "Elegir el color para la carpeta"
 
 #: src/prefs_folder_item.c:480
 msgid "Run Processing rules at start-up"
@@ -16445,11 +16646,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:523
+#: src/prefs_folder_item.c:524
 msgid "Select the HTML part of multipart messages"
 msgstr "Seleccionar la parte HTML en mensajes multiparte"
 
-#: src/prefs_folder_item.c:538
+#: src/prefs_folder_item.c:539
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
@@ -16457,68 +16658,81 @@ msgstr ""
 "«Por omisión» obedecerá las preferencias globales (que se encuentran en /"
 "Preferencias/Vista de mensaje/Opciones de texto)"
 
-#: src/prefs_folder_item.c:546
+#: src/prefs_folder_item.c:549
+msgid "Skip folder when searching for unread or new messages"
+msgstr "Saltar la carpeta al buscar mensajes nuevos o sin leer"
+
+#: src/prefs_folder_item.c:551
+msgid ""
+"Turn this option on if you want this folder to be ignored when searching for "
+"unread or new messages"
+msgstr ""
+"Active esta opción si desea que esta carpeta se ignore al buscar "
+"mensajes nuevos o no leídos."
+
+#: src/prefs_folder_item.c:563
 msgid "Synchronise for offline use"
 msgstr "Sincronizar para uso sin conexión"
 
-#: src/prefs_folder_item.c:564
+#: src/prefs_folder_item.c:582
 msgid "Fetch message bodies from the last"
 msgstr "Recuperar cuerpos de mensaje desde el último"
 
-#: src/prefs_folder_item.c:569
+#: src/prefs_folder_item.c:587
 msgid "0: all bodies"
 msgstr "0: todos los cuerpos"
 
-#: src/prefs_folder_item.c:576
+#: src/prefs_folder_item.c:594
 msgid "Remove older messages bodies"
 msgstr "Eliminar cuerpos de mensaje antiguos"
 
-#: src/prefs_folder_item.c:593
+#: src/prefs_folder_item.c:612
 msgid "Discard folder cache"
 msgstr "Descartar la caché de la carpeta"
 
-#: src/prefs_folder_item.c:907
+#: src/prefs_folder_item.c:943
 msgid "Request Return Receipt"
 msgstr "Solicitar acuse de recibo"
 
-#: src/prefs_folder_item.c:918
+#: src/prefs_folder_item.c:954
 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:929 src/prefs_folder_item.c:979
-#: src/prefs_folder_item.c:1004 src/prefs_folder_item.c:1029
+#: src/prefs_folder_item.c:965 src/prefs_folder_item.c:990
+#: src/prefs_folder_item.c:1040 src/prefs_folder_item.c:1065
+#: src/prefs_folder_item.c:1090
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s"
 msgstr "Cabecera %s predeterminada"
 
-#: src/prefs_folder_item.c:954
+#: src/prefs_folder_item.c:1015
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s for replies"
 msgstr "Cabecera %s para respuestas"
 
-#: src/prefs_folder_item.c:1053
+#: src/prefs_folder_item.c:1114
 msgid "Default account"
 msgstr "Cuenta primaria"
 
-#: src/prefs_folder_item.c:1185 src/prefs_folder_item.c:1215
+#: src/prefs_folder_item.c:1247 src/prefs_folder_item.c:1278
 msgid "\"Default\" will follow the applicable account preference"
 msgstr "«Predeterminada» seguirá la preferencia de cuenta correspondiente"
 
-#: src/prefs_folder_item.c:1758
+#: src/prefs_folder_item.c:1824
 msgid "Discard cache"
 msgstr "Descartar caché"
 
-#: src/prefs_folder_item.c:1759
+#: src/prefs_folder_item.c:1825
 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:1874
+#: src/prefs_folder_item.c:1940
 msgid "General"
 msgstr "Genéricas"
 
-#: src/prefs_folder_item.c:1953
+#: src/prefs_folder_item.c:2019
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Propiedades de la carpeta %s"
@@ -16527,7 +16741,7 @@ msgstr "Propiedades de la carpeta %s"
 msgid "Folder and Message Lists"
 msgstr "Carpeta y listas de mensajes"
 
-#: src/prefs_fonts.c:96 src/prefs_matcher.c:2081
+#: src/prefs_fonts.c:96 src/prefs_matcher.c:2086
 msgid "Message"
 msgstr "Mensaje"
 
@@ -16553,8 +16767,8 @@ msgstr "Usar una tipografía distinta para imprimir"
 msgid "Message Printing"
 msgstr "Impresión de mensajes"
 
-#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:752 src/prefs_summaries.c:869
-#: src/prefs_themes.c:422
+#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:876
+#: src/prefs_themes.c:426
 msgid "Display"
 msgstr "Ver"
 
@@ -16562,47 +16776,47 @@ msgstr "Ver"
 msgid "Fonts"
 msgstr "Tipografías"
 
-#: src/prefs_gtk.c:910 src/toolbar.c:256 src/toolbar.c:517
+#: src/prefs_gtk.c:910 src/toolbar.c:260 src/toolbar.c:528
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: src/prefs_image_viewer.c:77
+#: src/prefs_image_viewer.c:76
 msgid "Automatically display attached images"
 msgstr "Mostrar las imágenes adjuntas automáticamente"
 
-#: src/prefs_image_viewer.c:81
+#: src/prefs_image_viewer.c:80
 msgid "Resize attached images by default"
 msgstr "Redimensionar las imágenes adjuntas de manera predeterminada"
 
-#: src/prefs_image_viewer.c:84
+#: src/prefs_image_viewer.c:83
 msgid "Clicking image toggles scaling"
 msgstr "Pulsando en la imagen (des)activa el escalado"
 
-#: src/prefs_image_viewer.c:93
+#: src/prefs_image_viewer.c:92
 msgid "Fit image"
 msgstr "Ajustar imagen"
 
-#: src/prefs_image_viewer.c:97
+#: src/prefs_image_viewer.c:96
 msgid "Right-clicking image toggles fitting height/width"
 msgstr "Pulsando en la imagen (des)activa el ajuste de alto/ancho"
 
-#: src/prefs_image_viewer.c:100
+#: src/prefs_image_viewer.c:99
 msgid "Height"
 msgstr "Altura"
 
-#: src/prefs_image_viewer.c:106
+#: src/prefs_image_viewer.c:105
 msgid "Width"
 msgstr "Anchura"
 
-#: src/prefs_image_viewer.c:111
+#: src/prefs_image_viewer.c:110
 msgid "Display images inline"
 msgstr "Mostrar las imágenes con el texto"
 
-#: src/prefs_image_viewer.c:115
+#: src/prefs_image_viewer.c:114
 msgid "Print images"
 msgstr "Imprimir imágenes"
 
-#: src/prefs_image_viewer.c:174
+#: src/prefs_image_viewer.c:173
 msgid "Image Viewer"
 msgstr "Visor de imágenes"
 
@@ -16723,7 +16937,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:410 src/prefs_msg_colors.c:151 src/prefs_other.c:785
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:143 src/prefs_other.c:785
 msgid "Other"
 msgstr "Otras"
 
@@ -16776,12 +16990,12 @@ msgid "bytes"
 msgstr "bytes"
 
 #: src/prefs_matcher.c:363
-msgid "kilobytes"
-msgstr "kilobytes"
+msgid "kibibytes"
+msgstr "kibibytes"
 
 #: src/prefs_matcher.c:364
-msgid "megabytes"
-msgstr "megabytes"
+msgid "mebibytes"
+msgstr "mebibytes"
 
 #: src/prefs_matcher.c:368
 msgid "contains"
@@ -16807,11 +17021,11 @@ msgstr "sección cuerpo"
 msgid "whole message"
 msgstr "mensaje completo"
 
-#: src/prefs_matcher.c:402 src/summaryview.c:6534
+#: src/prefs_matcher.c:402 src/summaryview.c:6551
 msgid "Marked"
 msgstr "Marcado"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6532
+#: src/prefs_matcher.c:403 src/summaryview.c:6549
 msgid "Deleted"
 msgstr "Borrado"
 
@@ -16819,12 +17033,12 @@ msgstr "Borrado"
 msgid "Replied"
 msgstr "Respondido"
 
-#: src/prefs_matcher.c:405 src/summaryview.c:6526
+#: src/prefs_matcher.c:405 src/summaryview.c:6543
 msgid "Forwarded"
 msgstr "Reenviado"
 
-#: src/prefs_matcher.c:407 src/summaryview.c:6516 src/toolbar.c:515
-#: src/toolbar.c:988 src/toolbar.c:2342
+#: src/prefs_matcher.c:407 src/summaryview.c:6533 src/toolbar.c:526
+#: src/toolbar.c:1005 src/toolbar.c:2384
 msgid "Spam"
 msgstr "Basura"
 
@@ -16832,7 +17046,7 @@ msgstr "Basura"
 msgid "Has attachment"
 msgstr "Tiene adjunto"
 
-#: src/prefs_matcher.c:409 src/summaryview.c:6552
+#: src/prefs_matcher.c:409 src/summaryview.c:6569
 msgid "Signed"
 msgstr "Firmado"
 
@@ -16916,7 +17130,7 @@ msgstr "Frase"
 msgid "Flags"
 msgstr "Marcas"
 
-#: src/prefs_matcher.c:637 src/prefs_msg_colors.c:378
+#: src/prefs_matcher.c:637 src/prefs_msg_colors.c:380
 msgid "Color labels"
 msgstr "Colores"
 
@@ -16940,8 +17154,8 @@ msgstr ""
 "Utilize el selector de la derecha para elegir el nombre de la cabecera. "
 "Escriba el nombre de la cabecera si no está disponible en la lista."
 
-#: src/prefs_matcher.c:715 src/prefs_matcher.c:1653 src/prefs_matcher.c:1668
-#: src/prefs_matcher.c:2577
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1655 src/prefs_matcher.c:1670
+#: src/prefs_matcher.c:2583
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Todos"
@@ -16966,32 +17180,32 @@ msgstr "todas"
 msgid "of above rules"
 msgstr "las reglas anteriores"
 
-#: src/prefs_matcher.c:1560 src/prefs_matcher.c:1637
+#: src/prefs_matcher.c:1561 src/prefs_matcher.c:1639
 msgid "Search pattern is not set."
 msgstr "No se estableció el patrón de búsqueda."
 
-#: src/prefs_matcher.c:1574
+#: src/prefs_matcher.c:1575
 msgid "Invalid hour."
 msgstr "Hora inválida."
 
-#: src/prefs_matcher.c:1583
+#: src/prefs_matcher.c:1585
 msgid "Test command is not set."
 msgstr "No se estableció la orden de prueba."
 
-#: src/prefs_matcher.c:1654
+#: src/prefs_matcher.c:1656
 msgid "all addresses in all headers"
 msgstr "todas las direcciones en todas las cabeceras"
 
-#: src/prefs_matcher.c:1657
+#: src/prefs_matcher.c:1659
 msgid "any address in any header"
 msgstr "cualquier dirección en cualquier cabecera"
 
-#: src/prefs_matcher.c:1659
+#: src/prefs_matcher.c:1661
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "la(s) dirección(es) en la cabecera «%s»"
 
-#: src/prefs_matcher.c:1660
+#: src/prefs_matcher.c:1662
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -17004,87 +17218,87 @@ 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:1879
+#: src/prefs_matcher.c:1884
 msgid "Headers part"
 msgstr "Sección cabeceras"
 
-#: src/prefs_matcher.c:1883
+#: src/prefs_matcher.c:1888
 msgid "Headers values"
 msgstr "Valores de cabeceras"
 
-#: src/prefs_matcher.c:1887
+#: src/prefs_matcher.c:1892
 msgid "Body part"
 msgstr "Sección cuerpo"
 
-#: src/prefs_matcher.c:1891
+#: src/prefs_matcher.c:1896
 msgid "Whole message"
 msgstr "Mensaje completo"
 
-#: src/prefs_matcher.c:2008 src/prefs_matcher.c:2054
+#: src/prefs_matcher.c:2013 src/prefs_matcher.c:2059
 msgid "in"
 msgstr "en"
 
-#: src/prefs_matcher.c:2010
+#: src/prefs_matcher.c:2015
 msgid "content is"
 msgstr "contenido es"
 
-#: src/prefs_matcher.c:2014
+#: src/prefs_matcher.c:2019
 msgid "Date is"
 msgstr "La fecha es"
 
-#: src/prefs_matcher.c:2025
+#: src/prefs_matcher.c:2030
 msgid "Age is"
 msgstr "La edad es"
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2035
 msgid "Flag"
 msgstr "Marca"
 
-#: src/prefs_matcher.c:2031 src/prefs_matcher.c:2045
+#: src/prefs_matcher.c:2036 src/prefs_matcher.c:2050
 msgid "is"
 msgstr "es"
 
-#: src/prefs_matcher.c:2036
+#: src/prefs_matcher.c:2041
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/prefs_matcher.c:2044
+#: src/prefs_matcher.c:2049
 msgid "Label"
 msgstr "Etiqueta"
 
-#: src/prefs_matcher.c:2049
+#: src/prefs_matcher.c:2054
 msgid "Value:"
 msgstr "Valor:"
 
-#: src/prefs_matcher.c:2064
+#: src/prefs_matcher.c:2069
 msgid "Score is"
 msgstr "Puntuación es"
 
-#: src/prefs_matcher.c:2065
+#: src/prefs_matcher.c:2070
 msgid "points"
 msgstr "puntos"
 
-#: src/prefs_matcher.c:2075
+#: src/prefs_matcher.c:2080
 msgid "Size is"
 msgstr "Tamaño es"
 
-#: src/prefs_matcher.c:2080
+#: src/prefs_matcher.c:2085
 msgid "Scope:"
 msgstr "Alcance:"
 
-#: src/prefs_matcher.c:2082
+#: src/prefs_matcher.c:2087
 msgid "tags"
 msgstr "etiquetas"
 
-#: src/prefs_matcher.c:2087
+#: src/prefs_matcher.c:2092
 msgid "type is"
 msgstr "tipo es"
 
-#: src/prefs_matcher.c:2091
+#: src/prefs_matcher.c:2096
 msgid "Program returns"
 msgstr "El programa devuelve"
 
-#: src/prefs_matcher.c:2161
+#: src/prefs_matcher.c:2166
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -17092,11 +17306,11 @@ msgstr ""
 "La entrada no fue guardada.\n"
 "¿Cerrar igualmente?"
 
-#: src/prefs_matcher.c:2228
+#: src/prefs_matcher.c:2234
 msgid "Match Type: 'Test'"
 msgstr "Tipo de coincidencia: «Probar»"
 
-#: src/prefs_matcher.c:2229
+#: src/prefs_matcher.c:2235
 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"
@@ -17108,7 +17322,7 @@ msgstr ""
 "\n"
 "Se pueden usar los siguientes símbolos:"
 
-#: src/prefs_matcher.c:2328
+#: src/prefs_matcher.c:2334
 msgid "Current condition rules"
 msgstr "Reglas de condición actuales"
 
@@ -17225,118 +17439,117 @@ msgstr ""
 msgid "Configuration warning"
 msgstr "Aviso de configuración"
 
-#: src/prefs_msg_colors.c:153
+#: src/prefs_msg_colors.c:145
 msgid "Message view"
 msgstr "Vista de mensaje"
 
-#: src/prefs_msg_colors.c:160
+#: src/prefs_msg_colors.c:152
 msgid "Enable coloration of message text"
 msgstr "Permitir colores en el texto del mensaje"
 
-#: src/prefs_msg_colors.c:168
+#: src/prefs_msg_colors.c:160
 msgid "Quote"
 msgstr "Cita"
 
-#: src/prefs_msg_colors.c:180
+#: src/prefs_msg_colors.c:172
 msgid "Cycle quote colors"
 msgstr "Reutilizar colores de citación"
 
-#: src/prefs_msg_colors.c:184
+#: src/prefs_msg_colors.c:176
 msgid "If there are more than 3 quote levels, the colors will be reused"
 msgstr "Si hay más de 3 niveles de cita se reutilizarán los colores"
 
-#: src/prefs_msg_colors.c:190
+#: src/prefs_msg_colors.c:182
 msgid "1st Level"
 msgstr "Primer nivel"
 
-#: src/prefs_msg_colors.c:196 src/prefs_msg_colors.c:214
-#: src/prefs_msg_colors.c:232
+#: src/prefs_msg_colors.c:188 src/prefs_msg_colors.c:206
+#: src/prefs_msg_colors.c:224
 msgid "Text"
 msgstr "Texto"
 
-#: src/prefs_msg_colors.c:200
+#: src/prefs_msg_colors.c:192
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text"
 msgstr "Elegir el color para el texto de primer nivel"
 
-#: src/prefs_msg_colors.c:208
+#: src/prefs_msg_colors.c:200
 msgid "2nd Level"
 msgstr "Segundo nivel"
 
-#: src/prefs_msg_colors.c:218
+#: src/prefs_msg_colors.c:210
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text"
 msgstr "Elegir el color para el texto de segundo nivel"
 
-#: src/prefs_msg_colors.c:226
+#: src/prefs_msg_colors.c:218
 msgid "3rd Level"
 msgstr "Tercer nivel"
 
-#: src/prefs_msg_colors.c:236
+#: src/prefs_msg_colors.c:228
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text"
 msgstr "Elegir el color para el texto de tercer nivel"
 
-#: src/prefs_msg_colors.c:245
+#: src/prefs_msg_colors.c:237
 msgid "Enable coloration of text background"
 msgstr "Habilitar el color en el fondo del texto"
 
-#: src/prefs_msg_colors.c:254
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:247
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 1st level text background"
-msgstr "Elegir el color para el fondo del texto de primer nivel"
+msgstr "Elegir el color para el fondo del texto de 1º nivel"
 
-#: src/prefs_msg_colors.c:267
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:261
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 2nd level text background"
-msgstr "Elegir el color para el fondo del texto de segundo nivel"
+msgstr "Elegir el color para el fondo del texto de 2º nivel"
 
-#: src/prefs_msg_colors.c:280
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:275
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 3rd level text background"
-msgstr "Elegir el color para el fondo del texto de tercer nivel"
+msgstr "Elegir el color para el fondo del texto de 3º nivel"
 
-#: src/prefs_msg_colors.c:292
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:288
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for links"
 msgstr "Elegir el color para los enlaces"
 
-#: src/prefs_msg_colors.c:296
+#: src/prefs_msg_colors.c:292
 msgid "URI link"
 msgstr "Enlace URI"
 
-#: src/prefs_msg_colors.c:304
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:301
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for signatures"
 msgstr "Elegir el color para las firmas"
 
 #. TRANSLATORS: A patch is a text file listing the differences between 2 or more different
 #. versions of the same text file
-#: src/prefs_msg_colors.c:314
+#: src/prefs_msg_colors.c:311
 msgid "Patch messages and attachments"
 msgstr "Mensajes con parches y adjuntos"
 
-#: src/prefs_msg_colors.c:322
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:320
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for inserted lines"
 msgstr "Elegir el color para las líneas insertadas"
 
-#: src/prefs_msg_colors.c:324
+#: src/prefs_msg_colors.c:322
 msgid "Inserted lines"
 msgstr "Líneas insertadas"
 
-#: src/prefs_msg_colors.c:331
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:330
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for removed lines"
 msgstr "Elegir el color para las líneas eliminadas"
 
-#: src/prefs_msg_colors.c:334
+#: src/prefs_msg_colors.c:333
 msgid "Removed lines"
 msgstr "Líneas eliminadas"
 
-#. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
 #: src/prefs_msg_colors.c:342
-msgctxt "Tooltip"
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for hunk lines"
 msgstr "Elegir el color para las líneas de bloque"
 
@@ -17345,36 +17558,40 @@ msgstr "Elegir el color para las líneas de bloque"
 msgid "Hunk lines"
 msgstr "Líneas de bloque"
 
-#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:380
+#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:378
 msgid "Folder list"
 msgstr "Lista de carpetas"
 
-#: src/prefs_msg_colors.c:355
-msgctxt "Tooltip"
-msgid ""
-"Pick color for Target folder. Target folder is used when the option 'Execute "
-"immediately when moving or deleting messages' is turned off"
-msgstr ""
-"Elegir color para la carpeta de destino. La carpeta de destino se usa cuando "
-"la opción «Ejecutar inmediatamente movimientos o borrados de mensajes» está "
-"desactivada"
+#: src/prefs_msg_colors.c:356
+msgctxt "Tooltip and Dialog title"
+msgid "Pick color for Target folder."
+msgstr "Elegir el color de la carpeta destino."
 
-#: src/prefs_msg_colors.c:360
+#: src/prefs_msg_colors.c:357
 msgid "Target folder"
 msgstr "Carpeta de destino"
 
-#: src/prefs_msg_colors.c:367
+#: src/prefs_msg_colors.c:359
 msgctxt "Tooltip"
+msgid ""
+"Target folder is used when the option 'Execute immediately when moving or "
+"deleting messages' is turned off"
+msgstr ""
+"La carpeta de destino se usa cuando la opción «Ejecutar inmediatamente "
+"movimientos o borrados de mensajes» está desactivada"
+
+#: src/prefs_msg_colors.c:370
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for folders containing new messages"
-msgstr "Elegir el color para las carpetas que contiene mensajes nuevos"
+msgstr "Elegir el color para las carpetas que contienen mensajes nuevos"
 
-#: src/prefs_msg_colors.c:371
+#: src/prefs_msg_colors.c:373
 msgid "Folder containing new messages"
 msgstr "Carpeta que contiene mensajes nuevos"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:396 src/prefs_msg_colors.c:428
+#: src/prefs_msg_colors.c:398 src/prefs_msg_colors.c:435
 #, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
@@ -17382,85 +17599,18 @@ msgstr "Seleccionar el color para el «color %d»"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:400 src/prefs_msg_colors.c:432
+#: src/prefs_msg_colors.c:402 src/prefs_msg_colors.c:439
 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "Establecer la etiqueta para el «color %d»"
 
-#: src/prefs_msg_colors.c:527
-msgctxt "Dialog title"
-msgid "Pick color for 1st level text"
-msgstr "Elegir color del texto de primer nivel"
-
-#: src/prefs_msg_colors.c:529
-msgctxt "Dialog title"
-msgid "Pick color for 2nd level text"
-msgstr "Elegir color del texto de segundo nivel"
-
-#: src/prefs_msg_colors.c:531
-msgctxt "Dialog title"
-msgid "Pick color for 3rd level text"
-msgstr "Elegir color del texto de tercer nivel"
-
-#: src/prefs_msg_colors.c:533
-msgctxt "Dialog title"
-msgid "Pick color for 1st level text background"
-msgstr "Elegir color de fondo del texto de primer nivel"
-
-#: src/prefs_msg_colors.c:535
-msgctxt "Dialog title"
-msgid "Pick color for 2nd level text background"
-msgstr "Elegir color de fondo del texto de segundo nivel"
-
-#: src/prefs_msg_colors.c:537
-msgctxt "Dialog title"
-msgid "Pick color for 3rd level text background"
-msgstr "Elegir color de fondo del texto de tercer nivel"
-
-#: src/prefs_msg_colors.c:539
-msgctxt "Dialog title"
-msgid "Pick color for links"
-msgstr "Elegir color para «color %d»"
-
-#: src/prefs_msg_colors.c:541
-msgctxt "Dialog title"
-msgid "Pick color for target folder"
-msgstr "Elegir color de la carpeta destino"
-
-#: src/prefs_msg_colors.c:543
-msgctxt "Dialog title"
-msgid "Pick color for signatures"
-msgstr "Elegir color de las firmas"
-
-#: src/prefs_msg_colors.c:545
-msgctxt "Dialog title"
-msgid "Pick color for folder"
-msgstr "Elegir color para «color %d»"
-
-#: src/prefs_msg_colors.c:547
-msgctxt "Dialog title"
-msgid "Pick color for inserted lines"
-msgstr "Elegir color para las líneas insertadas"
-
-#: src/prefs_msg_colors.c:549
-msgctxt "Dialog title"
-msgid "Pick color for removed lines"
-msgstr "Elegir color para las líneas eliminadas"
-
-#: src/prefs_msg_colors.c:551
-msgctxt "Dialog title"
-msgid "Pick color for hunk lines"
-msgstr "Elegir color para las líneas de bloque"
-
-#. TRANSLATORS: 'color %d' refers to the filtering/processing
-#. rule name and should not be translated
-#: src/prefs_msg_colors.c:574
+#: src/prefs_msg_colors.c:411 src/prefs_msg_colors.c:448
 #, c-format
 msgctxt "Dialog title"
 msgid "Pick color for 'color %d'"
 msgstr "Elegir el color para el «color %d»"
 
-#: src/prefs_msg_colors.c:753
+#: src/prefs_msg_colors.c:582
 msgid "Colors"
 msgstr "Colores"
 
@@ -17585,30 +17735,30 @@ msgid "Synchronise offline folders as soon as possible"
 msgstr "Sincronizar carpetas sin conexión tan pronto como sea posible"
 
 #: src/prefs_other.c:604
-msgid "Master passphrase"
-msgstr "Contraseña maestra"
+msgid "Primary passphrase"
+msgstr "Contraseña primaria"
 
 #: src/prefs_other.c:607
-msgid "Use a master passphrase"
-msgstr "Utilizar una contraseña maestra"
+msgid "Use a primary passphrase"
+msgstr "Utilizar una contraseña primaria"
 
 #: src/prefs_other.c:610
 msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"passphrase. If no master passphrase is set, you will be prompted to set one."
+"If checked, your saved account passwords will be protected by a primary "
+"passphrase. If no primary passphrase is set, you will be prompted to set one."
 msgstr ""
 "Si se activa, las contraseñas guardadas de sus cuentas estarán protegidas "
-"por una contraseña maestra. Si no se establece ninguna se le solicitará una."
+"por una contraseña primaria. Si no se establece ninguna se le solicitará una."
 
 #: src/prefs_other.c:615
-msgid "Change master passphrase"
-msgstr "Cambiar la contraseña maestra"
+msgid "Change primary passphrase"
+msgstr "Cambiar la contraseña primaria"
 
 #: src/prefs_other.c:786
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
-#: src/prefs_proxy.c:234 src/prefs_receive.c:415 src/prefs_send.c:411
+#: src/prefs_proxy.c:236 src/prefs_receive.c:415 src/prefs_send.c:411
 msgid "Mail Handling"
 msgstr "Manejo de correo"
 
@@ -17854,252 +18004,260 @@ msgstr ""
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/prefs_spelling.c:80
-msgid "Pick color for misspelled word"
-msgstr "Elegir color de las palabras incorrectas"
-
-#: src/prefs_spelling.c:128
+#: src/prefs_spelling.c:115
 msgid "Enable spell checker"
 msgstr "Habilitar el corrector ortográfico"
 
-#: src/prefs_spelling.c:133
+#: src/prefs_spelling.c:120
 msgid "Enable alternate dictionary"
 msgstr "Habilitar un diccionario alternativo"
 
-#: src/prefs_spelling.c:138
+#: src/prefs_spelling.c:125
 msgid "Faster switching with last used dictionary"
 msgstr "Cambio más rápido con el último diccionario usado"
 
-#: src/prefs_spelling.c:140
+#: src/prefs_spelling.c:127
 msgid "Automatic spell checking"
 msgstr "Comprobación ortográfica automática"
 
-#: src/prefs_spelling.c:148
+#: src/prefs_spelling.c:135
 msgid "Re-check message when changing dictionary"
 msgstr "Recomprobar el mensaje al cambiar de diccionario"
 
-#: src/prefs_spelling.c:152
+#: src/prefs_spelling.c:139
 msgid "Dictionary"
 msgstr "Diccionario"
 
-#: src/prefs_spelling.c:181
+#: src/prefs_spelling.c:168
 msgid "Check with both dictionaries"
 msgstr "Comprobar con ambos diccionarios"
 
-#: src/prefs_spelling.c:187
+#: src/prefs_spelling.c:174
 msgid "Get more dictionaries..."
 msgstr "Obtener más diccionarios..."
 
-#: src/prefs_spelling.c:196
+#: src/prefs_spelling.c:182
 msgid "Misspelled word color"
 msgstr "Color de las faltas ortográficas"
 
-#: src/prefs_spelling.c:208
+#: src/prefs_spelling.c:192
+msgid "Pick color for misspelled word"
+msgstr "Elegir el color de las palabras incorrectas"
+
+#: src/prefs_spelling.c:197
 msgid "Pick color for misspelled word. Use black to underline"
-msgstr "Elegir color de los fallos ortográficos. Usar negro para subrayar"
+msgstr "Elegir el color de los fallos ortográficos. Usar negro para subrayar"
 
-#: src/prefs_spelling.c:325
+#: src/prefs_spelling.c:309
 msgid "Spell Checking"
 msgstr "Corrección ortográfica"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:164
 msgid "the abbreviated weekday name"
 msgstr "el día la semana abreviado"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:165
 msgid "the full weekday name"
 msgstr "el día de la semana completo"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:166
 msgid "the abbreviated month name"
 msgstr "el nombre del mes abreviado"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:167
 msgid "the full month name"
 msgstr "el nombre del mes completo"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:168
 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:172
+#: src/prefs_summaries.c:169
 msgid "the century number (year/100)"
 msgstr "el número de siglo (año/100)"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:170
 msgid "the day of the month as a decimal number"
 msgstr "el día del mes como número decimal"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:171
 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:175
+#: src/prefs_summaries.c:172
 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:176
+#: src/prefs_summaries.c:173
 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:177
+#: src/prefs_summaries.c:174
 msgid "the month as a decimal number"
 msgstr "el mes como número decimal"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:175
 msgid "the minute as a decimal number"
 msgstr "el minuto como número decimal"
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:176
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_summaries.c:180
+#: src/prefs_summaries.c:177
 msgid "the second as a decimal number"
 msgstr "el segundo como número decimal"
 
-#: src/prefs_summaries.c:181
+#: src/prefs_summaries.c:178
 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:182
+#: src/prefs_summaries.c:179
 msgid "the preferred date for the current locale"
 msgstr "la fecha preferida para la localización actual"
 
-#: src/prefs_summaries.c:183
+#: src/prefs_summaries.c:180
 msgid "the last two digits of a year"
 msgstr "los dos últimos dígitos del año"
 
-#: src/prefs_summaries.c:184
+#: src/prefs_summaries.c:181
 msgid "the year as a decimal number"
 msgstr "el año como número decimal"
 
-#: src/prefs_summaries.c:185
+#: src/prefs_summaries.c:182
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria o nombre o abreviatura"
 
-#: src/prefs_summaries.c:206 src/prefs_summaries.c:255
-#: src/prefs_summaries.c:486
+#: src/prefs_summaries.c:203 src/prefs_summaries.c:252
+#: src/prefs_summaries.c:488
 msgid "Date format"
 msgstr "Formato de fecha"
 
-#: src/prefs_summaries.c:231
+#: src/prefs_summaries.c:228
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_summaries.c:273
+#: src/prefs_summaries.c:270
 msgid "Example"
 msgstr "Ejemplo"
 
-#: src/prefs_summaries.c:400
+#: src/prefs_summaries.c:398
 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:410
+#: src/prefs_summaries.c:408
 msgid "Unread messages"
 msgstr "Mensajes sin leer"
 
-#: src/prefs_summaries.c:411
+#: src/prefs_summaries.c:409
 msgid "Unread and Total messages"
 msgstr "Mensajes sin leer y totales"
 
-#: src/prefs_summaries.c:417
+#: src/prefs_summaries.c:415
 msgid "Open last opened folder at start-up"
 msgstr "Abrir la última carpeta abierta al inicio"
 
-#: src/prefs_summaries.c:424
+#: src/prefs_summaries.c:419
+msgid ""
+"Run processing rules before marking all messages in a folder as read or "
+"unread"
+msgstr ""
+"Ejecutar las reglas de procesamiento antes de marcar todos los "
+"mensajes en una carpeta como leídos o no leídos"
+
+#: src/prefs_summaries.c:426
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abreviar nombres de grupo con más de"
 
-#: src/prefs_summaries.c:437
+#: src/prefs_summaries.c:439
 msgid "letters"
 msgstr "letras"
 
-#: src/prefs_summaries.c:445
+#: src/prefs_summaries.c:447
 msgid "Message list"
 msgstr "Lista de mensajes"
 
-#: src/prefs_summaries.c:462
+#: src/prefs_summaries.c:464
 msgid "Lock column headers"
 msgstr "Bloquear cabeceras de columna"
 
-#: src/prefs_summaries.c:468
+#: src/prefs_summaries.c:470
 msgid "Displayed in From column"
 msgstr "Mostrado en la columna Desde"
 
-#: src/prefs_summaries.c:479
+#: src/prefs_summaries.c:481
 msgid "Name and Address"
 msgstr "Nombre y dirección"
 
-#: src/prefs_summaries.c:505
+#: src/prefs_summaries.c:507
 msgid "Date format help"
 msgstr "Ayuda del formato de fecha"
 
-#: src/prefs_summaries.c:511
+#: src/prefs_summaries.c:513
 msgid "Set message selection when entering a folder"
 msgstr "Establecer que mensaje se selecciona al entrar en una carpeta"
 
-#: src/prefs_summaries.c:520
+#: src/prefs_summaries.c:522
 msgid "Open message when selected"
 msgstr "Abrir el mensaje cuando se seleccione"
 
-#: src/prefs_summaries.c:525
+#: src/prefs_summaries.c:527
 msgid "When opening a folder"
 msgstr "Al abrir una carpeta"
 
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:529
 msgid "When displaying search results"
 msgstr "Al mostrar los resultados de una búsqueda"
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:531
 msgid "When selecting next or previous message using shortcuts"
 msgstr "Al seleccionar el mensaje anterior o siguiente usando atajos"
 
-#: src/prefs_summaries.c:531
+#: src/prefs_summaries.c:533
 msgid "When deleting or moving messages"
 msgstr "Al borrar o mover mensajes"
 
-#: src/prefs_summaries.c:533
+#: src/prefs_summaries.c:535
 msgid "When using directional keys"
 msgstr "Al usar las teclas de dirección"
 
-#: src/prefs_summaries.c:535
+#: src/prefs_summaries.c:537
 msgid "Mark message as read"
 msgstr "Marcar el mensaje como leído"
 
-#: src/prefs_summaries.c:538
+#: src/prefs_summaries.c:540
 msgid "when selected, after"
 msgstr "al seleccionarlo, después de"
 
-#: src/prefs_summaries.c:557
+#: src/prefs_summaries.c:559
 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:567
+#: src/prefs_summaries.c:569
 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:577
+#: src/prefs_summaries.c:579
 msgid "Assume 'Yes'"
 msgstr "Asumir «Sí»"
 
-#: src/prefs_summaries.c:578
+#: src/prefs_summaries.c:580
 msgid "Assume 'No'"
 msgstr "Asumir «No»"
 
-#: src/prefs_summaries.c:584
+#: src/prefs_summaries.c:586
 msgid "Display sender using address book"
 msgstr "Mostrar remitente usando la agenda"
 
-#: src/prefs_summaries.c:588
+#: src/prefs_summaries.c:590
 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:592
+#: src/prefs_summaries.c:594
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
 
-#: src/prefs_summaries.c:594
+#: src/prefs_summaries.c:596
 msgid ""
 "When unchecked moving, copying and deleting of messages is deferred until "
 "you use 'Tools/Execute'"
@@ -18107,55 +18265,55 @@ msgstr ""
 "Si está desmarcado pospone el movimiento, la copia y el borrado de mensajes "
 "hasta que se utilice la opción «Herramientas/Ejecutar»"
 
-#: src/prefs_summaries.c:599
+#: src/prefs_summaries.c:601
 msgid "Confirm when marking all messages as read or unread"
 msgstr "Confirmar antes de marcar todos los mensajes como leídos o no leídos"
 
-#: src/prefs_summaries.c:602
+#: src/prefs_summaries.c:604
 msgid "Confirm when changing color labels"
 msgstr "Confirmar al cambiar las etiquetas de los colores"
 
-#: src/prefs_summaries.c:606
+#: src/prefs_summaries.c:608
 msgid "Show tooltips"
 msgstr "Mostrar ayudas de herramienta"
 
-#: src/prefs_summaries.c:616 src/quote_fmt.c:541
+#: src/prefs_summaries.c:618 src/quote_fmt.c:541
 msgid "Defaults"
 msgstr "Predeterminados"
 
-#: src/prefs_summaries.c:618
+#: src/prefs_summaries.c:620
 msgid "New folders"
 msgstr "Carpetas nuevas"
 
-#: src/prefs_summaries.c:624
+#: src/prefs_summaries.c:626
 msgid "Sort by"
 msgstr "Ordenar por"
 
-#: src/prefs_summaries.c:632 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:634 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr "Número"
 
-#: src/prefs_summaries.c:635
+#: src/prefs_summaries.c:637
 msgid "Thread date"
 msgstr "Fecha del hilo"
 
-#: src/prefs_summaries.c:646
+#: src/prefs_summaries.c:648
 msgid "Don't sort"
 msgstr "No ordenar"
 
-#: src/prefs_summaries.c:661
+#: src/prefs_summaries.c:663
 msgid "Thread view"
 msgstr "Vista jerárquica"
 
-#: src/prefs_summaries.c:664
+#: src/prefs_summaries.c:666
 msgid "Collapse all threads"
 msgstr "Colapsar todos los hilos"
 
-#: src/prefs_summaries.c:670
+#: src/prefs_summaries.c:672
 msgid "Hide read messages"
 msgstr "Ocultar los mensajes leídos"
 
-#: src/prefs_summaries.c:870
+#: src/prefs_summaries.c:877
 msgid "Summaries"
 msgstr "Resúmenes"
 
@@ -18335,29 +18493,29 @@ msgstr "Plantillas actuales"
 msgid "Template"
 msgstr "Plantilla"
 
-#: src/prefs_themes.c:401 src/prefs_themes.c:841
+#: src/prefs_themes.c:405 src/prefs_themes.c:939
 msgid "Default internal theme"
 msgstr "Tema interno predeterminado"
 
-#: src/prefs_themes.c:423
+#: src/prefs_themes.c:427
 msgid "Themes"
 msgstr "Temas"
 
-#: src/prefs_themes.c:500
+#: src/prefs_themes.c:504
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "Eliminar el tema global «%s»"
 
-#: src/prefs_themes.c:502
+#: src/prefs_themes.c:506
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Eliminar tema «%s»"
 
-#: src/prefs_themes.c:507
+#: src/prefs_themes.c:511
 msgid "Are you sure you want to remove this theme?"
 msgstr "¿Está seguro de que quiere borrar este tema?"
 
-#: src/prefs_themes.c:517
+#: src/prefs_themes.c:521
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18366,24 +18524,24 @@ msgstr ""
 "Error en el fichero %s\n"
 "al eliminar el tema."
 
-#: src/prefs_themes.c:521
+#: src/prefs_themes.c:525
 msgid "Removing theme directory failed."
 msgstr "Falló la eliminación del directorio del tema."
 
-#: src/prefs_themes.c:524
+#: src/prefs_themes.c:528
 msgid "Theme removed successfully"
 msgstr "Tema eliminado con éxito"
 
-#: src/prefs_themes.c:544
+#: src/prefs_themes.c:548
 msgid "Select theme folder"
 msgstr "Seleccionar carpeta del tema"
 
-#: src/prefs_themes.c:559
+#: src/prefs_themes.c:563
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Instalar tema «%s»"
 
-#: src/prefs_themes.c:562
+#: src/prefs_themes.c:566
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
@@ -18391,15 +18549,15 @@ msgstr ""
 "Esta carpeta no parece la carpeta de un tema.\n"
 "¿Instalar de todas maneras?"
 
-#: src/prefs_themes.c:572
+#: src/prefs_themes.c:576
 msgid "Do you want to install theme for all users?"
 msgstr "¿Quiere instalar el tema para todos los usuarios?"
 
-#: src/prefs_themes.c:592
+#: src/prefs_themes.c:596
 msgid "Theme exists"
 msgstr "El tema ya existe"
 
-#: src/prefs_themes.c:593
+#: src/prefs_themes.c:597
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -18411,25 +18569,25 @@ msgstr ""
 "\n"
 "¿Desea reemplazarlo?"
 
-#: src/prefs_themes.c:600
+#: src/prefs_themes.c:604
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "No se puede borrar el tema existente en %s."
 
-#: src/prefs_themes.c:609
+#: src/prefs_themes.c:613
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "No se puede crear el directorio de destino %s."
 
-#: src/prefs_themes.c:623
+#: src/prefs_themes.c:627
 msgid "Theme installed successfully."
 msgstr "Tema instalado con éxito."
 
-#: src/prefs_themes.c:630
+#: src/prefs_themes.c:634
 msgid "Failed installing theme"
 msgstr "Error al instalar el tema"
 
-#: src/prefs_themes.c:633
+#: src/prefs_themes.c:637
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18438,74 +18596,82 @@ msgstr ""
 "Error en el fichero %s\n"
 "al instalar el tema."
 
-#: src/prefs_themes.c:803
+#: src/prefs_themes.c:686
+msgid "View all theme icons"
+msgstr "Ver todos los iconos del tema"
+
+#: src/prefs_themes.c:901
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "Disponibles %d temas (%d de usuario, %d globales, 1 interno)"
 
-#: src/prefs_themes.c:844
+#: src/prefs_themes.c:942
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "El tema interno tiene %d iconos"
 
-#: src/prefs_themes.c:850
+#: src/prefs_themes.c:948
 msgid "No info file available for this theme"
 msgstr "No hay fichero de información para este tema"
 
-#: src/prefs_themes.c:868
+#: src/prefs_themes.c:966
 msgid "Error: couldn't get theme status"
 msgstr "Error: no se pudo obtener el estado del tema"
 
-#: src/prefs_themes.c:898
+#: src/prefs_themes.c:996
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d ficheros (%d iconos), tamaño: %s"
 
-#: src/prefs_themes.c:956
+#: src/prefs_themes.c:1055
 msgid "Selector"
 msgstr "Selector"
 
-#: src/prefs_themes.c:967
+#: src/prefs_themes.c:1066
 msgid "Install new..."
 msgstr "Instalar nuevo..."
 
-#: src/prefs_themes.c:972
+#: src/prefs_themes.c:1071
 msgid "Get more..."
 msgstr "Obtener más..."
 
-#: src/prefs_themes.c:984
+#: src/prefs_themes.c:1083
 msgid "Information"
 msgstr "Información"
 
-#: src/prefs_themes.c:999
+#: src/prefs_themes.c:1098
 msgid "Author"
 msgstr "Autor"
 
-#: src/prefs_themes.c:1005
+#: src/prefs_themes.c:1104
 msgid "URL"
 msgstr "URL"
 
-#: src/prefs_themes.c:1043
+#: src/prefs_themes.c:1142
 msgid "Preview"
 msgstr "Apariencia"
 
-#: src/prefs_themes.c:1107
+#: src/prefs_themes.c:1205
+msgid "View all"
+msgstr "Ver todos"
+
+#: src/prefs_themes.c:1210
 msgid "SVG rendering"
 msgstr "Procesamiento de SVG"
 
-#: src/prefs_themes.c:1114
+#: src/prefs_themes.c:1217
 msgid "Enable alpha channel"
 msgstr "Habilitar el canal alfa"
 
-#: src/prefs_themes.c:1115
+#: src/prefs_themes.c:1218
 msgid "Force scaling"
 msgstr "Forzar escalado"
 
-#: src/prefs_themes.c:1121
+#: src/prefs_themes.c:1224
 msgid "Pixels per inch (PPI)"
 msgstr "Píxeles por pulgada (PPP)"
 
-#: src/prefs_toolbar.c:186
+#: src/prefs_toolbar.c:187
 msgid ""
 "Selected Action already set.\n"
 "Please choose another Action from List"
@@ -18513,71 +18679,71 @@ msgstr ""
 "La acción seleccionada ya está establecida.\n"
 "Por favor, elija otra acción de la lista"
 
-#: src/prefs_toolbar.c:187
+#: src/prefs_toolbar.c:188
 msgid "Item has no icon defined."
 msgstr "El elemento no tiene un icono definido."
 
-#: src/prefs_toolbar.c:188
+#: src/prefs_toolbar.c:189
 msgid "Item has no text defined."
 msgstr "El elemento no tiene un texto definido."
 
-#: src/prefs_toolbar.c:896
+#: src/prefs_toolbar.c:897
 msgid "Toolbar item"
 msgstr "Ítem de la barra de herramientas"
 
-#: src/prefs_toolbar.c:913
+#: src/prefs_toolbar.c:914
 msgid "Item type"
 msgstr "Tipo de ítem"
 
-#: src/prefs_toolbar.c:921
+#: src/prefs_toolbar.c:922
 msgid "Internal Function"
 msgstr "Función interna"
 
-#: src/prefs_toolbar.c:922
+#: src/prefs_toolbar.c:923
 msgid "User Action"
 msgstr "Acción de usuario"
 
-#: src/prefs_toolbar.c:924 src/toolbar.c:279
+#: src/prefs_toolbar.c:925 src/toolbar.c:283
 msgid "Separator"
 msgstr "Separador"
 
-#: src/prefs_toolbar.c:929
+#: src/prefs_toolbar.c:930
 msgid "Event executed on click"
 msgstr "Evento ejecutado al pulsar"
 
-#: src/prefs_toolbar.c:948
+#: src/prefs_toolbar.c:949
 msgid "Toolbar text"
 msgstr "Texto asociado"
 
-#: src/prefs_toolbar.c:961 src/prefs_toolbar.c:1336
+#: src/prefs_toolbar.c:962 src/prefs_toolbar.c:1338
 msgid "Icon"
 msgstr "Icono"
 
-#: src/prefs_toolbar.c:1215 src/prefs_toolbar.c:1229 src/prefs_toolbar.c:1243
+#: src/prefs_toolbar.c:1216 src/prefs_toolbar.c:1230 src/prefs_toolbar.c:1244
 msgid "Toolbars"
 msgstr "Barras de herramientas"
 
-#: src/prefs_toolbar.c:1216
+#: src/prefs_toolbar.c:1217
 msgid "Main Window"
 msgstr "Ventana principal"
 
-#: src/prefs_toolbar.c:1230
+#: src/prefs_toolbar.c:1231
 msgid "Message Window"
 msgstr "Ventana de mensaje"
 
-#: src/prefs_toolbar.c:1244
+#: src/prefs_toolbar.c:1245
 msgid "Compose Window"
 msgstr "Ventana de composición"
 
-#: src/prefs_toolbar.c:1359
+#: src/prefs_toolbar.c:1361
 msgid "Icon text"
 msgstr "Texto del icono"
 
-#: src/prefs_toolbar.c:1368
+#: src/prefs_toolbar.c:1370
 msgid "Mapped event"
 msgstr "Evento mapeado"
 
-#: src/prefs_toolbar.c:1675
+#: src/prefs_toolbar.c:1677
 msgid "Toolbar item icon"
 msgstr "Icono de ítem de herramientas"
 
@@ -18638,40 +18804,40 @@ msgstr "Disminuir"
 msgid "Page %d"
 msgstr "Página %d"
 
-#: src/privacy.c:255 src/privacy.c:276
+#: src/privacy.c:289 src/privacy.c:293
 msgid "No information available"
 msgstr "No hay información disponible"
 
-#: src/privacy.c:490
+#: src/privacy.c:507
 msgid "No recipient keys defined."
 msgstr "No se definió ninguna clave para el destinatario."
 
-#: src/procmime.c:402 src/procmime.c:404 src/procmime.c:405
+#: src/procmime.c:414 src/procmime.c:416 src/procmime.c:417
 msgid "[Error decoding BASE64]\n"
 msgstr "[Error decodificando BASE64]\n"
 
-#: src/procmime.c:2797
+#: src/procmime.c:2836
 msgid "Could not decode part"
 msgstr "No se pudo decodificar la parte"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:961 src/procmsg.c:964
 msgid "Already trying to send."
 msgstr "Ya se está intentando enviar."
 
-#: src/procmsg.c:1563 src/procmsg.c:1624
+#: src/procmsg.c:1588 src/procmsg.c:1649
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "No se puede abrir el fichero %s."
 
-#: src/procmsg.c:1634
+#: src/procmsg.c:1659
 msgid "Queued message header is broken."
 msgstr "La cabecera del mensaje en cola está corrupta."
 
-#: src/procmsg.c:1654
+#: src/procmsg.c:1679
 msgid "An error happened during SMTP session."
 msgstr "Hubo algún error durante la sesión SMTP."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1693
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -18679,7 +18845,7 @@ msgstr ""
 "No se encontró una cuenta específica para enviar, y hubo un error durante la "
 "sesión SMTP."
 
-#: src/procmsg.c:1676
+#: src/procmsg.c:1701
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -18687,20 +18853,20 @@ msgstr ""
 "No se pudo determinar la información de envío. Quizás el correo no se generó "
 "con Claws Mail."
 
-#: src/procmsg.c:1699
+#: src/procmsg.c:1724
 msgid "Couldn't create temporary file for news sending."
 msgstr "No se pudo crear el fichero temporal para enviar noticias."
 
-#: src/procmsg.c:1712
+#: src/procmsg.c:1737
 msgid "Error when writing temporary file for news sending."
 msgstr "Error al escribir el fichero temporal para enviar noticias."
 
-#: src/procmsg.c:1726
+#: src/procmsg.c:1751
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Ocurrió un error mientras se enviaba el mensaje a %s."
 
-#: src/procmsg.c:2286
+#: src/procmsg.c:2311
 msgid "Filtering messages...\n"
 msgstr "Filtrando mensajes...\n"
 
@@ -19122,11 +19288,11 @@ msgstr ""
 "si ya lo tiene.\n"
 "Si no está seguro, seleccione Aceptar."
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Fuente del mensaje"
 
-#: src/sourcewindow.c:161
+#: src/sourcewindow.c:162
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Fuente"
@@ -19136,14 +19302,14 @@ msgid "Expiry"
 msgstr "Expiración"
 
 #: src/ssl_manager.c:195
-msgid "Saved SSL/TLS certificates"
-msgstr "Certificados SSL/TLS guardados"
+msgid "Saved TLS certificates"
+msgstr "Certificados TLS guardados"
 
-#: src/ssl_manager.c:446
+#: src/ssl_manager.c:451
 msgid "Delete certificate"
 msgstr "Eliminar certificado"
 
-#: src/ssl_manager.c:447
+#: src/ssl_manager.c:452
 msgid "Do you really want to delete this certificate?"
 msgstr "¿Quiere borrar realmente este certificado?"
 
@@ -19171,80 +19337,80 @@ msgstr "Condición:"
 msgid "Find _all"
 msgstr "Encontrar _todos"
 
-#: src/summary_search.c:696 src/summaryview.c:1134 src/summaryview.c:1397
+#: src/summary_search.c:696 src/summaryview.c:1138 src/summaryview.c:1402
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Buscando en %s...\n"
 
-#: src/summary_search.c:791
+#: src/summary_search.c:792
 msgid "Beginning of list reached; continue from end?"
 msgstr "Se llegó al principio de la lista, ¿seguir desde el final?"
 
-#: src/summary_search.c:793
+#: src/summary_search.c:794
 msgid "End of list reached; continue from beginning?"
 msgstr "Se terminó la lista, ¿comenzar desde el principio?"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "Re-edit"
 msgstr "Re-editar"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "Create _filter rule"
 msgstr "Crear regla de _filtrado"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "_Set displayed columns"
 msgstr "E_stablecer columnas visibles"
 
-#: src/summaryview.c:456
+#: src/summaryview.c:457
 msgid "_Lock column headers"
 msgstr "B_loquear cabeceras de columna"
 
-#: src/summaryview.c:593
+#: src/summaryview.c:595
 msgid "Toggle quick search bar"
 msgstr "Conmutar barra de búsqueda rápida"
 
-#: src/summaryview.c:630
+#: src/summaryview.c:632
 msgid "Toggle multiple selection"
 msgstr "Commutar la selección múltiple"
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1329
 msgid "Process mark"
 msgstr "Procesar marcas"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1330
 msgid "Some marks are left. Process them?"
 msgstr "Quedan algunas marcas. ¿Procesarlas?"
 
-#: src/summaryview.c:1376
+#: src/summaryview.c:1381
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:1937 src/summaryview.c:1985
+#: src/summaryview.c:1935 src/summaryview.c:1984
 msgid "No more unread messages"
 msgstr "No hay más mensajes sin leer"
 
-#: src/summaryview.c:1938
+#: src/summaryview.c:1936
 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1950 src/summaryview.c:1998 src/summaryview.c:2035
-#: src/summaryview.c:2083 src/summaryview.c:2150
+#: src/summaryview.c:1949 src/summaryview.c:1998 src/summaryview.c:2036
+#: src/summaryview.c:2085 src/summaryview.c:2154
 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:1962
+#: src/summaryview.c:1961
 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 
-#: src/summaryview.c:1986
+#: src/summaryview.c:1985
 msgid "No unread message found. Go to next folder?"
 msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:2022 src/summaryview.c:2070
+#: src/summaryview.c:2022 src/summaryview.c:2071
 msgid "No more new messages"
 msgstr "No hay más mensajes nuevos"
 
@@ -19252,237 +19418,237 @@ msgstr "No hay más mensajes nuevos"
 msgid "No new message found. Search from the end?"
 msgstr "No hay mensajes nuevos. ¿Buscar desde el final?"
 
-#: src/summaryview.c:2047
+#: src/summaryview.c:2048
 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 
-#: src/summaryview.c:2071
+#: src/summaryview.c:2072
 msgid "No new message found. Go to next folder?"
 msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:2104 src/summaryview.c:2137
+#: src/summaryview.c:2106 src/summaryview.c:2140
 msgid "No more marked messages"
 msgstr "No hay más mensajes marcados"
 
-#: src/summaryview.c:2105
+#: src/summaryview.c:2107
 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:2114
+#: src/summaryview.c:2117
 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 
-#: src/summaryview.c:2138
+#: src/summaryview.c:2141
 msgid "No marked message found. Go to next folder?"
 msgstr "No hay mensajes marcados. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:2171 src/summaryview.c:2200
+#: src/summaryview.c:2175 src/summaryview.c:2205
 msgid "No more labeled messages"
 msgstr "No hay más mensajes etiquetados"
 
-#: src/summaryview.c:2172
+#: src/summaryview.c:2176
 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:2181 src/summaryview.c:2214
+#: src/summaryview.c:2186 src/summaryview.c:2220
 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 
-#: src/summaryview.c:2201
+#: src/summaryview.c:2206
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:2524
+#: src/summaryview.c:2530
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por el asunto..."
 
-#: src/summaryview.c:2712
+#: src/summaryview.c:2718
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrado(s)"
 
-#: src/summaryview.c:2716
+#: src/summaryview.c:2722
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:2717 src/summaryview.c:2724
+#: src/summaryview.c:2723 src/summaryview.c:2730
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2722
+#: src/summaryview.c:2728
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:2736
+#: src/summaryview.c:2742
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " elemento seleccionado"
 msgstr[1] " elementos seleccionados"
 
-#: src/summaryview.c:2754 src/summaryview.c:2799
+#: src/summaryview.c:2760 src/summaryview.c:2805
 #, 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:2774
+#: src/summaryview.c:2780
 msgid "Message summary"
 msgstr "Resumen de mensajes"
 
-#: src/summaryview.c:2775
+#: src/summaryview.c:2781
 msgid "New:"
 msgstr "Nuevos:"
 
-#: src/summaryview.c:2776
+#: src/summaryview.c:2782
 msgid "Unread:"
 msgstr "Sin leer:"
 
-#: src/summaryview.c:2777
+#: src/summaryview.c:2783
 msgid "Total:"
 msgstr "Total:"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2785
 msgid "Marked:"
 msgstr "Marcados:"
 
-#: src/summaryview.c:2780
+#: src/summaryview.c:2786
 msgid "Replied:"
 msgstr "Respondidos:"
 
-#: src/summaryview.c:2781
+#: src/summaryview.c:2787
 msgid "Forwarded:"
 msgstr "Reenviados:"
 
-#: src/summaryview.c:2782
+#: src/summaryview.c:2788
 msgid "Locked:"
 msgstr "Bloqueados:"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 msgid "Ignored:"
 msgstr "ignorados:"
 
-#: src/summaryview.c:2784
+#: src/summaryview.c:2790
 msgid "Watched:"
 msgstr "Observados:"
 
-#: src/summaryview.c:2794
+#: src/summaryview.c:2800
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d seleccionados (%s/%s), %d sin leer"
 
-#: src/summaryview.c:3082
+#: src/summaryview.c:3088
 msgid "Sorting summary..."
 msgstr "Ordenando el resumen..."
 
-#: src/summaryview.c:3250
+#: src/summaryview.c:3260
 msgid "Setting summary from message data..."
 msgstr "Estableciendo el resumen de los mensajes..."
 
-#: src/summaryview.c:3456
+#: src/summaryview.c:3466
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
-#: src/summaryview.c:3513
+#: src/summaryview.c:3523
 msgid "(No Recipient)"
 msgstr "(Sin destinatario)"
 
-#: src/summaryview.c:3561
+#: src/summaryview.c:3571
 #, c-format
 msgid "From: %s, on %s"
 msgstr "Desde: %s, en %s"
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3580
 #, c-format
 msgid "To: %s, on %s"
 msgstr "Para: %s, en %s"
 
-#: src/summaryview.c:4455
+#: src/summaryview.c:4465
 msgid "You're not the author of the article."
 msgstr "Usted no es el autor del artículo."
 
-#: src/summaryview.c:4545
+#: src/summaryview.c:4555
 #, 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:4548
+#: src/summaryview.c:4558
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Borrar mensaje"
 msgstr[1] "Borrar mensajes"
 
-#: src/summaryview.c:4712
+#: src/summaryview.c:4722
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:4767
+#: src/summaryview.c:4777
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Seleccionar la carpeta a la que mover el mensaje seleccionado"
 msgstr[1] "Seleccionar la carpeta a la que mover los mensajes seleccionados"
 
-#: src/summaryview.c:4818
+#: src/summaryview.c:4828
 msgid "Destination to copy is same as current folder."
 msgstr "El destino de copia es la carpeta actual."
 
-#: src/summaryview.c:4852
+#: src/summaryview.c:4862
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Seleccionar la carpeta a la que copiar el mensaje seleccionado"
 msgstr[1] "Seleccionar la carpeta a la que copiar los mensajes seleccionados"
 
-#: src/summaryview.c:5010
+#: src/summaryview.c:5026
 msgid "Append or Overwrite"
 msgstr "Añadir o sobreescribir"
 
-#: src/summaryview.c:5011
+#: src/summaryview.c:5027
 msgid "Append or overwrite existing file?"
 msgstr "¿Añadir o sobreescribir el fichero existente?"
 
-#: src/summaryview.c:5012
+#: src/summaryview.c:5028
 msgid "_Append"
 msgstr "_Añadir"
 
-#: src/summaryview.c:5012
+#: src/summaryview.c:5028
 msgid "_Overwrite"
 msgstr "S_obreescribir"
 
-#: src/summaryview.c:5023 src/summaryview.c:5026 src/summaryview.c:5041
+#: src/summaryview.c:5039 src/summaryview.c:5042 src/summaryview.c:5057
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "No se pudo guardar el fichero «%s»."
 
-#: src/summaryview.c:5061
+#: src/summaryview.c:5080
 #, 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:5519
+#: src/summaryview.c:5538
 msgid "Building threads..."
 msgstr "Construyendo jerarquía..."
 
-#: src/summaryview.c:5767
+#: src/summaryview.c:5786
 msgid "Skip these rules"
 msgstr "Saltarse estas reglas"
 
-#: src/summaryview.c:5770
+#: src/summaryview.c:5789
 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:5773
+#: src/summaryview.c:5792
 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:5802
+#: src/summaryview.c:5821
 msgid "Filtering"
 msgstr "Filtrando"
 
-#: src/summaryview.c:5803
+#: src/summaryview.c:5822
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19490,73 +19656,73 @@ msgstr ""
 "Hay ciertas reglas de filtrado que pertenecen a una cuenta.\n"
 "Por favor seleccione que quiere hacer con ellas:"
 
-#: src/summaryview.c:5835
+#: src/summaryview.c:5854
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:5918
+#: src/summaryview.c:5937
 msgid "Processing configuration"
 msgstr "Configuración de procesamiento"
 
-#: src/summaryview.c:6068
+#: src/summaryview.c:6087
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr ""
 "¿Quiere realmente reiniciar el color de todos los mensajes seleccionados?"
 
-#: src/summaryview.c:6070
+#: src/summaryview.c:6089
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr ""
 "¿Quiere realmente aplicar este color a todos los mensajes seleccionados?"
 
-#: src/summaryview.c:6071
+#: src/summaryview.c:6090
 msgid "Reset color label"
 msgstr "Reiniciar color"
 
-#: src/summaryview.c:6071
+#: src/summaryview.c:6090
 msgid "Set color label"
 msgstr "Establecer color"
 
-#: src/summaryview.c:6512
+#: src/summaryview.c:6529
 msgid "Ignored thread"
 msgstr "Hilo ignorado"
 
-#: src/summaryview.c:6514
+#: src/summaryview.c:6531
 msgid "Watched thread"
 msgstr "Hilo observado"
 
-#: src/summaryview.c:6522
+#: src/summaryview.c:6539
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Respondido y también reenviado - pulse para ver la respuesta"
 
-#: src/summaryview.c:6524
+#: src/summaryview.c:6541
 msgid "Replied - click to see reply"
 msgstr "Respondido - pulse para ver la respuesta"
 
-#: src/summaryview.c:6536
+#: src/summaryview.c:6553
 msgid "To be moved"
 msgstr "Será movido"
 
-#: src/summaryview.c:6538
+#: src/summaryview.c:6555
 msgid "To be copied"
 msgstr "Será copiado"
 
-#: src/summaryview.c:6550
+#: src/summaryview.c:6567
 msgid "Signed, has attachment(s)"
 msgstr "Firmado, tiene adjunto(s)"
 
-#: src/summaryview.c:6554
+#: src/summaryview.c:6571
 msgid "Encrypted, has attachment(s)"
 msgstr "Cifrado, tiene adjunto(s)"
 
-#: src/summaryview.c:6556
+#: src/summaryview.c:6573
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: src/summaryview.c:6558
+#: src/summaryview.c:6575
 msgid "Has attachment(s)"
 msgstr "Tiene adjunto(s)"
 
-#: src/summaryview.c:8269
+#: src/summaryview.c:8298
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19565,45 +19731,45 @@ msgstr ""
 "Error en la expresión regular (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8372
+#: src/summaryview.c:8401
 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:8377
+#: src/summaryview.c:8406
 msgid "Go back to the folder list"
 msgstr "Volver a la lista de carpetas"
 
-#: src/textview.c:218
+#: src/textview.c:241
 msgid "_Open in web browser"
 msgstr "_Abrir con el navegador web"
 
-#: src/textview.c:219
+#: src/textview.c:242
 msgid "Copy this _link"
 msgstr "_Copiar el enlace"
 
-#: src/textview.c:226
+#: src/textview.c:249
 msgid "_Reply to this address"
 msgstr "_Responder a esta dirección"
 
-#: src/textview.c:227
+#: src/textview.c:250
 msgid "Add to _Address book"
 msgstr "Añadir a la _agenda"
 
-#: src/textview.c:228
+#: src/textview.c:251
 msgid "Copy this add_ress"
 msgstr "Copiar esta di_rección"
 
-#: src/textview.c:666
+#: src/textview.c:708
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bytes)]"
 
-#: src/textview.c:669
+#: src/textview.c:711
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 
-#: src/textview.c:839
+#: src/textview.c:881
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -19617,68 +19783,68 @@ msgstr ""
 "\n"
 "  Utilice "
 
-#: src/textview.c:844
+#: src/textview.c:886
 msgid "'Network Log'"
 msgstr "«Traza de red»"
 
-#: src/textview.c:845
+#: src/textview.c:887
 msgid " in the Tools menu for more information."
 msgstr " en el menú Herramientas para más información."
 
-#: src/textview.c:911
+#: src/textview.c:953
 msgid "  The following can be performed on this part\n"
 msgstr "  Puede efectuar las siguientes acciones en esta parte haciendo\n"
 
-#: src/textview.c:913
+#: src/textview.c:955
 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:917
+#: src/textview.c:959
 msgid "     - To save, select "
 msgstr "     - Para guardar, seleccione "
 
-#: src/textview.c:918
+#: src/textview.c:960
 msgid "'Save as...'"
 msgstr "«Guardar como...»"
 
 # NOTE: closing quote is within and untranslated string
-#: src/textview.c:920 src/textview.c:932 src/textview.c:944 src/textview.c:954
+#: src/textview.c:962 src/textview.c:974 src/textview.c:986 src/textview.c:996
 msgid " (Shortcut key: '"
 msgstr " (Atajo de teclado: '"
 
-#: src/textview.c:928
+#: src/textview.c:970
 msgid "     - To display as text, select "
 msgstr "     - Para mostrar como texto, seleccione "
 
-#: src/textview.c:929
+#: src/textview.c:971
 msgid "'Display as text'"
 msgstr "«Mostrar como texto»"
 
-#: src/textview.c:940
+#: src/textview.c:982
 msgid "     - To open with an external program, select "
 msgstr "     - Para abrir con un programa externo, seleccione "
 
-#: src/textview.c:941
+#: src/textview.c:983
 msgid "'Open'"
 msgstr "«Abrir»"
 
-#: src/textview.c:949
+#: src/textview.c:991
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativamente doble clic, o clic con el botón "
 
-#: src/textview.c:950
+#: src/textview.c:992
 msgid "mouse button)\n"
 msgstr "central del ratón)\n"
 
-#: src/textview.c:952
+#: src/textview.c:994
 msgid "     - Or use "
 msgstr "     - O utilice "
 
-#: src/textview.c:953
+#: src/textview.c:995
 msgid "'Open with...'"
 msgstr "«Abrir con...»"
 
-#: src/textview.c:1075
+#: src/textview.c:1118
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -19689,432 +19855,468 @@ msgstr ""
 "    %s\n"
 "Código de salida %d\n"
 
-#: src/textview.c:2159
+#: src/textview.c:2229
 msgid "Tags: "
 msgstr "Etiquetas: "
 
-#: src/textview.c:2876
+#: src/textview.c:2714
+msgid "Zoom _In"
+msgstr "_Aumentar"
+
+#: src/textview.c:2723
+msgid "Zoom _Out"
+msgstr "_Disminuir"
+
+#: src/textview.c:2732
+msgid "Reset _zoom"
+msgstr "_Reiniciar"
+
+#: src/textview.c:3101
+msgid "Copy it anyway?"
+msgstr "¿Copiarla de todas formas?"
+
+#: src/textview.c:3101
+msgid "Open it anyway?"
+msgstr "¿Abrirla de todas formas?"
+
+#: src/textview.c:3102
+msgid "Co_py URL"
+msgstr "Co_piar URL"
+
+#: src/textview.c:3102
+msgid "_Open URL"
+msgstr "_Abrir URL"
+
+#: src/textview.c:3108
 msgid "The real URL is different from the displayed URL."
 msgstr "La URL real es distinta de la URL mostrada."
 
-#: src/textview.c:2877
+#: src/textview.c:3109
 msgid "Displayed URL:"
 msgstr "URL mostrada:"
 
-#: src/textview.c:2878
+#: src/textview.c:3110
 msgid "Real URL:"
 msgstr "URL real:"
 
-#: src/textview.c:2879
-msgid "Open it anyway?"
-msgstr "¿Abrirla de todas formas?"
-
-#: src/textview.c:2880
+#: src/textview.c:3112
 msgid "Phishing attempt warning"
 msgstr "Aviso de intento de «phishing»"
 
-#: src/textview.c:2881
-msgid "_Open URL"
-msgstr "_Abrir URL"
-
-#: src/toolbar.c:224 src/toolbar.c:2294
+#: src/toolbar.c:227 src/toolbar.c:2336
 msgid "Receive Mail from all Accounts"
 msgstr "Recibir correo para todas las cuentas"
 
-#: src/toolbar.c:225 src/toolbar.c:2299
+#: src/toolbar.c:228 src/toolbar.c:2341
 msgid "Receive Mail from current Account"
 msgstr "Recibir correo para la cuenta actual"
 
-#: src/toolbar.c:226 src/toolbar.c:2303
+#: src/toolbar.c:229 src/toolbar.c:2345
 msgid "Send Queued Messages"
 msgstr "Enviar mensajes en la cola"
 
-#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2321 src/toolbar.c:2332
+#: src/toolbar.c:230 src/toolbar.c:976 src/toolbar.c:2363 src/toolbar.c:2374
 msgid "Compose Email"
 msgstr "Componer correo"
 
-#: src/toolbar.c:228
+#: src/toolbar.c:231
 msgid "Compose News"
 msgstr "Componer noticia"
 
-#: src/toolbar.c:229 src/toolbar.c:2376 src/toolbar.c:2386
+#: src/toolbar.c:232 src/toolbar.c:2418 src/toolbar.c:2428
 msgid "Reply to Message"
 msgstr "Responder al mensaje"
 
-#: src/toolbar.c:230 src/toolbar.c:2393 src/toolbar.c:2403
+#: src/toolbar.c:233 src/toolbar.c:2435 src/toolbar.c:2445
 msgid "Reply to Sender"
 msgstr "Responder al remitente"
 
-#: src/toolbar.c:231 src/toolbar.c:2410 src/toolbar.c:2420
+#: src/toolbar.c:234 src/toolbar.c:2452 src/toolbar.c:2462
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: src/toolbar.c:232 src/toolbar.c:2427 src/toolbar.c:2437
+#: src/toolbar.c:235 src/toolbar.c:2469 src/toolbar.c:2479
 msgid "Reply to Mailing-list"
 msgstr "Responder a la lista de correo"
 
-#: src/toolbar.c:233 src/toolbar.c:2315
+#: src/toolbar.c:236 src/toolbar.c:2357
 msgid "Open email"
 msgstr "Abrir correo"
 
-#: src/toolbar.c:234 src/toolbar.c:2444 src/toolbar.c:2455
+#: src/toolbar.c:237 src/toolbar.c:2486 src/toolbar.c:2497
 msgid "Forward Message"
 msgstr "Reenviar mensaje"
 
-#: src/toolbar.c:235 src/toolbar.c:2460
+#: src/toolbar.c:238 src/toolbar.c:2502
 msgid "Trash Message"
 msgstr "Mensaje a la papelera"
 
-#: src/toolbar.c:236 src/toolbar.c:2464
+#: src/toolbar.c:239 src/toolbar.c:2506
 msgid "Delete Message"
 msgstr "Borrar mensaje"
 
-#: src/toolbar.c:237
+#: src/toolbar.c:240
 msgid "Delete duplicate messages"
 msgstr "Borrar los mensajes duplicados"
 
-#: src/toolbar.c:239 src/toolbar.c:2472
+#: src/toolbar.c:242 src/toolbar.c:2514
 msgid "Go to Previous Unread Message"
 msgstr "Ir al mensaje anterior no leído"
 
-#: src/toolbar.c:240 src/toolbar.c:2476
+#: src/toolbar.c:243 src/toolbar.c:2518
 msgid "Go to Next Unread Message"
 msgstr "Ir al mensaje siguiente no leído"
 
-#: src/toolbar.c:244
+#: src/toolbar.c:247
 msgid "Mark Message"
 msgstr "Marcar mensaje"
 
-#: src/toolbar.c:245
+#: src/toolbar.c:248
 msgid "Unmark Message"
 msgstr "Desmarcar mensaje"
 
-#: src/toolbar.c:246
+#: src/toolbar.c:249
 msgid "Lock Message"
 msgstr "Bloquear mensaje"
 
-#: src/toolbar.c:247
+#: src/toolbar.c:250
 msgid "Unlock Message"
 msgstr "Desbloquear mensaje"
 
-#: src/toolbar.c:248
+#: src/toolbar.c:251
 msgid "Mark all Messages as read"
 msgstr "Marcar todos los mensajes como leídos"
 
-#: src/toolbar.c:249
+#: src/toolbar.c:252
 msgid "Mark all Messages as unread"
 msgstr "Marcar todos los mensajes como no leídos"
 
-#: src/toolbar.c:250
+#: src/toolbar.c:253
 msgid "Mark Message as read"
 msgstr "Marcar el mensaje como leído"
 
-#: src/toolbar.c:251
+#: src/toolbar.c:254
 msgid "Mark Message as unread"
 msgstr "Marcar el mensaje como no leído"
 
-#: src/toolbar.c:253 src/toolbar.c:514
+#: src/toolbar.c:255
+msgid "Run folder processing rules"
+msgstr "Ejecutar reglas de procesamiento de la carpeta"
+
+#: src/toolbar.c:257 src/toolbar.c:525
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/toolbar.c:254
+#: src/toolbar.c:258
 msgid "Learn Spam or Ham"
 msgstr "Aprender correo basura o bueno"
 
-#: src/toolbar.c:255
+#: src/toolbar.c:259
 msgid "Open folder/Go to folder list"
 msgstr "Abrir carpeta/Ir a la lista de carpetas"
 
-#: src/toolbar.c:258 src/toolbar.c:2482
+#: src/toolbar.c:262 src/toolbar.c:2524
 msgid "Send Message"
 msgstr "Enviar mensaje"
 
-#: src/toolbar.c:259 src/toolbar.c:2486
+#: src/toolbar.c:263 src/toolbar.c:2528
 msgid "Put into queue folder and send later"
 msgstr "Poner en la cola y enviar después"
 
-#: src/toolbar.c:260 src/toolbar.c:2490
+#: src/toolbar.c:264 src/toolbar.c:2532
 msgid "Save to draft folder"
 msgstr "Guardar como borrador"
 
-#: src/toolbar.c:261 src/toolbar.c:2494
+#: src/toolbar.c:265 src/toolbar.c:2536
 msgid "Insert file"
 msgstr "Insertar fichero"
 
-#: src/toolbar.c:262 src/toolbar.c:2498
+#: src/toolbar.c:266 src/toolbar.c:2540
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
-#: src/toolbar.c:263 src/toolbar.c:2502
+#: src/toolbar.c:267 src/toolbar.c:2544
 msgid "Insert signature"
 msgstr "Insertar firma"
 
-#: src/toolbar.c:264 src/toolbar.c:2506
+#: src/toolbar.c:268 src/toolbar.c:2548
 msgid "Replace signature"
 msgstr "Reemplazar firma"
 
-#: src/toolbar.c:265 src/toolbar.c:2510
+#: src/toolbar.c:269 src/toolbar.c:2552
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/toolbar.c:266 src/toolbar.c:2514
+#: src/toolbar.c:270 src/toolbar.c:2556
 msgid "Wrap long lines of current paragraph"
 msgstr "Cortar líneas largas del párrafo actual"
 
-#: src/toolbar.c:267 src/toolbar.c:2518
+#: src/toolbar.c:271 src/toolbar.c:2560
 msgid "Wrap all long lines"
 msgstr "Cortar todas las líneas largas"
 
-#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2527
+#: src/toolbar.c:274 src/toolbar.c:542 src/toolbar.c:2569
 msgid "Check spelling"
 msgstr "Verificar ortografía"
 
-#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2532
+#: src/toolbar.c:276 src/toolbar.c:544 src/toolbar.c:2574
 msgid "Sign"
 msgstr "Firmar"
 
-#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2540
+#: src/toolbar.c:277 src/toolbar.c:545 src/toolbar.c:2582
 msgid "Encrypt"
 msgstr "Cifrar"
 
-#: src/toolbar.c:274
+#: src/toolbar.c:278
 msgid "Claws Mail Actions Feature"
 msgstr "Acciones de Claws Mail"
 
-#: src/toolbar.c:275 src/toolbar.c:2559
+#: src/toolbar.c:279 src/toolbar.c:2601
 msgid "Cancel receiving"
 msgstr "Cancelar recepción"
 
-#: src/toolbar.c:277 src/toolbar.c:2567
+#: src/toolbar.c:281 src/toolbar.c:2609
 msgid "Cancel receiving/sending"
 msgstr "Cancelar recepción/envío"
 
-#: src/toolbar.c:278 src/toolbar.c:2307
+#: src/toolbar.c:282 src/toolbar.c:2349
 msgid "Close window"
 msgstr "Cerrar ventana"
 
-#: src/toolbar.c:280
+#: src/toolbar.c:284
 msgid "Claws Mail Plugins"
 msgstr "Módulos de Claws Mail"
 
-#: src/toolbar.c:445 src/toolbar.c:496
+#: src/toolbar.c:450 src/toolbar.c:506
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/toolbar.c:485
+#: src/toolbar.c:495
 msgid "Get Mail"
 msgstr "Recibir correo"
 
-#: src/toolbar.c:486
+#: src/toolbar.c:496
 msgid "Get"
 msgstr "Recibir"
 
-#: src/toolbar.c:488 src/toolbar.c:489
+#: src/toolbar.c:498 src/toolbar.c:499
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Componer"
 
-#: src/toolbar.c:491
+#: src/toolbar.c:501
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "Remitente"
 
-#: src/toolbar.c:492
+#: src/toolbar.c:502
 msgid "All"
 msgstr "Todo"
 
-#: src/toolbar.c:493
+#: src/toolbar.c:503
 msgid "List"
 msgstr "Lista"
 
-#: src/toolbar.c:498 src/toolbar.c:2360 src/toolbar.c:2369
+#: src/toolbar.c:508 src/toolbar.c:2402 src/toolbar.c:2411
 msgid "Delete duplicates"
 msgstr "Borrar duplicados"
 
-#: src/toolbar.c:500
+#: src/toolbar.c:510
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/toolbar.c:501
+#: src/toolbar.c:511
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/toolbar.c:509
+#: src/toolbar.c:519
 msgid "All read"
 msgstr "Todos leídos"
 
-#: src/toolbar.c:510
+#: src/toolbar.c:520
 msgid "All unread"
 msgstr "Todos no leídos"
 
-#: src/toolbar.c:511
+#: src/toolbar.c:521
 msgid "Read"
 msgstr "Leído"
 
-#: src/toolbar.c:516
+#: src/toolbar.c:523
+msgid "Run proc. rules"
+msgstr "Ejecutar reglas proc."
+
+#: src/toolbar.c:527
 msgid "Folders"
 msgstr "Carpetas"
 
-#: src/toolbar.c:521
+#: src/toolbar.c:532
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/toolbar.c:524
+#: src/toolbar.c:535
 msgid "Insert sig."
 msgstr "Insertar firma"
 
-#: src/toolbar.c:525
+#: src/toolbar.c:536
 msgid "Replace sig."
 msgstr "Reemplazar firma"
 
-#: src/toolbar.c:526
+#: src/toolbar.c:537
 msgid "Edit"
 msgstr "Editar"
 
-#: src/toolbar.c:527
+#: src/toolbar.c:538
 msgid "Wrap para."
 msgstr "Recorta párr."
 
-#: src/toolbar.c:528
+#: src/toolbar.c:539
 msgid "Wrap all"
 msgstr "Recorta todo"
 
-#: src/toolbar.c:536 src/toolbar.c:537
+#: src/toolbar.c:547 src/toolbar.c:548
 msgid "Stop"
 msgstr "Detener"
 
-#: src/toolbar.c:538
+#: src/toolbar.c:549
 msgid "Stop all"
 msgstr "Detener todo"
 
-#: src/toolbar.c:951
+#: src/toolbar.c:968
 msgid "Compose News message"
 msgstr "Componer un mensaje _nuevo"
 
-#: src/toolbar.c:990
+#: src/toolbar.c:1007
 msgid "Learn spam"
 msgstr "Aprender correo basura"
 
-#: src/toolbar.c:999
+#: src/toolbar.c:1016
 msgid "Ham"
 msgstr "Bueno"
 
-#: src/toolbar.c:1001
+#: src/toolbar.c:1018
 msgid "Learn ham"
 msgstr "Aprender correo bueno"
 
-#: src/toolbar.c:1916
+#: src/toolbar.c:1956
 msgid "Message will be signed"
 msgstr "El mensaje será firmado"
 
-#: src/toolbar.c:1918
+#: src/toolbar.c:1958
 msgid "Message will not be signed"
 msgstr "El mensaje no será firmado"
 
-#: src/toolbar.c:1937
+#: src/toolbar.c:1977
 msgid "Message will be encrypted"
 msgstr "El mensaje será cifrado"
 
-#: src/toolbar.c:1939
+#: src/toolbar.c:1979
 msgid "Message will not be encrypted"
 msgstr "El mensaje no será cifrado"
 
-#: src/toolbar.c:2289
+#: src/toolbar.c:2331
 msgid "Go to folder list"
 msgstr "Ir a la lista de carpetas"
 
-#: src/toolbar.c:2295
+#: src/toolbar.c:2337
 msgid "Receive Mail from selected Account"
 msgstr "Recibir correo para la cuenta seleccionada"
 
-#: src/toolbar.c:2311
+#: src/toolbar.c:2353
 msgid "Open preferences"
 msgstr "Abrir preferencias"
 
-#: src/toolbar.c:2322
+#: src/toolbar.c:2364
 msgid "Compose with selected Account"
 msgstr "Componer correo con la cuenta seleccionada"
 
-#: src/toolbar.c:2343
+#: src/toolbar.c:2385
 msgid "Learn as..."
 msgstr "Aprender como..."
 
-#: src/toolbar.c:2353
+#: src/toolbar.c:2395
 msgid "Learn as _Spam"
 msgstr "Aprender como correo basura"
 
-#: src/toolbar.c:2354
+#: src/toolbar.c:2396
 msgid "Learn as _Ham"
 msgstr "Aprender como bueno"
 
-#: src/toolbar.c:2361
+#: src/toolbar.c:2403
 msgid "Delete duplicates options"
 msgstr "Opciones de borrado de duplicados"
 
-#: src/toolbar.c:2365
+#: src/toolbar.c:2407
 msgid "Delete duplicates in selected folder"
 msgstr "Borrar duplicados en la carpeta seleccionada"
 
-#: src/toolbar.c:2366
+#: src/toolbar.c:2408
 msgid "Delete duplicates in all folders"
 msgstr "Borrar duplicados en todas las carpetas"
 
-#: src/toolbar.c:2377
+#: src/toolbar.c:2419
 msgid "Reply to Message options"
 msgstr "Opciones de responder al mensaje"
 
-#: src/toolbar.c:2381 src/toolbar.c:2398 src/toolbar.c:2415 src/toolbar.c:2432
+#: src/toolbar.c:2423 src/toolbar.c:2440 src/toolbar.c:2457 src/toolbar.c:2474
 msgid "_Reply with quote"
 msgstr "Responder con _cita"
 
-#: src/toolbar.c:2382 src/toolbar.c:2399 src/toolbar.c:2416 src/toolbar.c:2433
+#: src/toolbar.c:2424 src/toolbar.c:2441 src/toolbar.c:2458 src/toolbar.c:2475
 msgid "Reply without _quote"
 msgstr "_Responder sin cita"
 
-#: src/toolbar.c:2394
+#: src/toolbar.c:2436
 msgid "Reply to Sender options"
 msgstr "Opciones de responder al remitente"
 
-#: src/toolbar.c:2411
+#: src/toolbar.c:2453
 msgid "Reply to All options"
 msgstr "Opciones de responder a todos"
 
-#: src/toolbar.c:2428
+#: src/toolbar.c:2470
 msgid "Reply to Mailing-list options"
 msgstr "Opciones de responder a la lista de correo"
 
-#: src/toolbar.c:2445
+#: src/toolbar.c:2487
 msgid "Forward Message options"
 msgstr "Opciones de reenviar mensaje"
 
-#: src/uri_opener.c:85
+#: src/uri_opener.c:70
+msgid "C_opy URL"
+msgstr "C_opiar URL"
+
+#: src/uri_opener.c:101
 msgid "There are no URLs in this email."
 msgstr "No hay URLs en este correo."
 
-#: src/uri_opener.c:113
-msgid "Available URLs:"
-msgstr "URLs disponibles:"
+#: src/uri_opener.c:129
+msgid "Included URLs:"
+msgstr "URLs incluidas:"
 
-#: src/uri_opener.c:187
+#: src/uri_opener.c:209
 msgctxt "Dialog title"
 msgid "Open URLs"
 msgstr "Abrir URLs"
 
-#: src/uri_opener.c:215
-msgid "Please select the URL to open."
-msgstr "Por favor seleccione la URL a abrir."
+#: src/uri_opener.c:225
+msgid "Open in browser"
+msgstr "Abrir en el navegador"
 
-#: src/uri_opener.c:223
+#: src/uri_opener.c:237
+msgid "Any phishing URLs are shown in red, followed by the actual URL."
+msgstr "Las URLs de «phishing» se muestran en rojo, seguidas de la URL real."
+
+#: src/uri_opener.c:245
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/wizard.c:523
+#: src/wizard.c:522
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Bienvenido a Claws Mail"
 
-#: src/wizard.c:546
+#: src/wizard.c:545
 #, c-format
 msgid ""
 "\n"
@@ -20206,47 +20408,47 @@ msgstr ""
 "hacerlo en «%s».\n"
 "\n"
 
-#: src/wizard.c:621
+#: src/wizard.c:620
 msgid "Please enter the mailbox name."
 msgstr "Por favor introduzca el nombre del buzón."
 
-#: src/wizard.c:649
+#: src/wizard.c:648
 msgid "Please enter your name and email address."
 msgstr "Por favor introduzca su nombre y dirección de correo."
 
-#: src/wizard.c:660
+#: src/wizard.c:659
 msgid "Please enter your receiving server and username."
 msgstr "Por favor introduzca su servidor de recepción y nombre de usuario."
 
-#: src/wizard.c:670
+#: src/wizard.c:669
 msgid "Please enter your username."
 msgstr "Por favor introduzca su nombre de usuario."
 
-#: src/wizard.c:680
+#: src/wizard.c:679
 msgid "Please enter your SMTP server."
 msgstr "Por favor introduzca su servidor SMTP."
 
-#: src/wizard.c:691
+#: src/wizard.c:690
 msgid "Please enter your SMTP username."
 msgstr "Por favor introduzca su nombre de usuario SMTP."
 
-#: src/wizard.c:974
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "Su nombre:"
 
-#: src/wizard.c:986
+#: src/wizard.c:981
 msgid "Your email address:"
 msgstr "Su dirección de correo:"
 
-#: src/wizard.c:998
+#: src/wizard.c:994
 msgid "Your organization:"
 msgstr "Su organización:"
 
-#: src/wizard.c:1032
+#: src/wizard.c:1029
 msgid "Mailbox name:"
 msgstr "Nombre del buzón:"
 
-#: src/wizard.c:1039
+#: src/wizard.c:1036
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -20254,7 +20456,7 @@ msgstr ""
 "Puede especificar también una ruta absoluta, por ejemplo: «/home/usuario/"
 "Documentos/Correo»"
 
-#: src/wizard.c:1109
+#: src/wizard.c:1106
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -20262,51 +20464,55 @@ msgstr ""
 "Puede especificar el número de puerto añadiéndolo al final: «correo.ejemplo."
 "com:25»"
 
-#: src/wizard.c:1112
+#: src/wizard.c:1109
 msgid "SMTP server address:"
 msgstr "Dirección del servidor SMTP:"
 
-#: src/wizard.c:1127
+#: src/wizard.c:1124
 msgid "(empty to use the same as receive)"
 msgstr "(vacío para usar el mismo que en la recepción)"
 
-#: src/wizard.c:1142
+#: src/wizard.c:1139
 msgid "SMTP username:"
 msgstr "Usuario SMTP:"
 
-#: src/wizard.c:1154
+#: src/wizard.c:1153
 msgid "SMTP password:"
 msgstr "Contraseña SMTP:"
 
 #: src/wizard.c:1169
-msgid "Use SSL/TLS to connect to SMTP server"
-msgstr "Usar SSL/TLS para conectar al servidor SMTP"
+msgid "Use TLS to connect to SMTP server"
+msgstr "Usar TLS para conectar al servidor SMTP"
 
-#: src/wizard.c:1180 src/wizard.c:1609
+#: src/wizard.c:1180 src/wizard.c:1623
 msgid "Use STARTTLS command to start encryption"
 msgstr "Usar la orden STARTTLS para abrir la sesión cifrada"
 
-#: src/wizard.c:1192 src/wizard.c:1622
-msgid "Client SSL/TLS certificate (optional)"
-msgstr "Certificado SSL/TLS de cliente (opcional)"
+#: src/wizard.c:1192 src/wizard.c:1636
+msgid "Client TLS certificate (optional)"
+msgstr "Certificado TLS de cliente (opcional)"
+
+#: src/wizard.c:1201 src/wizard.c:1646
+msgid "File:"
+msgstr "Fichero:"
 
-#: src/wizard.c:1267 src/wizard.c:1299 src/wizard.c:1552
+#: src/wizard.c:1274 src/wizard.c:1306 src/wizard.c:1560
 msgid "Server address:"
 msgstr "Dirección del servidor:"
 
-#: src/wizard.c:1331
+#: src/wizard.c:1338
 msgid "Local mailbox:"
 msgstr "Buzón local:"
 
-#: src/wizard.c:1499
+#: src/wizard.c:1506
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/wizard.c:1508
+#: src/wizard.c:1515
 msgid "POP3"
 msgstr "POP3"
 
-#: src/wizard.c:1563
+#: src/wizard.c:1573
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -20314,19 +20520,19 @@ msgstr ""
 "Puede especificar el número de puerto añadiéndolo al final: «correo.ejemplo."
 "com:110»"
 
-#: src/wizard.c:1598
-msgid "Use SSL/TLS to connect to receiving server"
-msgstr "Usar SSL/TLS para conectar al servidor de recepción"
+#: src/wizard.c:1612
+msgid "Use TLS to connect to receiving server"
+msgstr "Usar TLS para conectar al servidor de recepción"
 
-#: src/wizard.c:1671
+#: src/wizard.c:1690
 msgid "IMAP server directory:"
 msgstr "Directorio del servidor IMAP:"
 
-#: src/wizard.c:1682
+#: src/wizard.c:1701
 msgid "Show only subscribed folders"
 msgstr "Mostrar sólo las carpetas suscritas"
 
-#: src/wizard.c:1690
+#: src/wizard.c:1709
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -20334,15 +20540,15 @@ msgstr ""
 "Aviso: esta versión de Claws Mail\n"
 "se construyó sin soporte IMAP."
 
-#: src/wizard.c:1809
+#: src/wizard.c:1828
 msgid "Claws Mail Setup Wizard"
 msgstr "Ayudante de configuración de Claws Mail"
 
-#: src/wizard.c:1843
+#: src/wizard.c:1862
 msgid "Welcome to Claws Mail"
 msgstr "Bienvenido a Claws Mail "
 
-#: src/wizard.c:1850
+#: src/wizard.c:1869
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -20356,31 +20562,31 @@ msgstr ""
 "correo más comunes de manera que pueda comenzar a usar Claws Mail en menos "
 "de cinco minutos."
 
-#: src/wizard.c:1863
+#: src/wizard.c:1882
 msgid "About You"
 msgstr "Sobre usted"
 
-#: src/wizard.c:1870 src/wizard.c:1884 src/wizard.c:1898 src/wizard.c:1913
+#: src/wizard.c:1889 src/wizard.c:1903 src/wizard.c:1917 src/wizard.c:1932
 msgid "Bold fields must be completed"
 msgstr "Los campos en etiquetados en negrilla deben ser completados"
 
-#: src/wizard.c:1877
+#: src/wizard.c:1896
 msgid "Receiving mail"
 msgstr "Recibiendo correo"
 
-#: src/wizard.c:1891
+#: src/wizard.c:1910
 msgid "Sending mail"
 msgstr "Enviando correo"
 
-#: src/wizard.c:1906
+#: src/wizard.c:1925
 msgid "Saving mail on disk"
 msgstr "Guardando el correo en el disco"
 
-#: src/wizard.c:1921
+#: src/wizard.c:1940
 msgid "Configuration finished"
 msgstr "Configuración finalizada."
 
-#: src/wizard.c:1928
+#: src/wizard.c:1947
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list