[Commits] [SCM] claws branch, master, updated. 3.10.1-175-gc77e9c8

claws at claws-mail.org claws at claws-mail.org
Mon Oct 20 20:46:27 CEST 2014


The branch, master has been updated
       via  c77e9c8d6bc7e88be9e1e64b368dd999c0c3cf10 (commit)
      from  4f476b7b7b75d3de0d6c745d7262df97c66360a5 (commit)

Summary of changes:
 po/bg.po    | 6570 +++++++++++++++++++++++--------------------------
 po/de.po    | 4005 ++++++++++++++++--------------
 po/eo.po    | 7812 ++++++++++++++++++++++++++++-------------------------------
 po/es.po    | 4158 ++++++++++++++++---------------
 po/fi.po    | 4032 ++++++++++++++++--------------
 po/he.po    | 1019 ++++----
 po/lt.po    | 4089 ++++++++++++++++---------------
 po/nl.po    | 3906 ++++++++++++++++--------------
 po/pt_BR.po | 3943 ++++++++++++++++--------------
 po/sk.po    | 4020 ++++++++++++++++--------------
 po/sv.po    | 3935 ++++++++++++++++--------------
 11 files changed, 24335 insertions(+), 23154 deletions(-)


- Log -----------------------------------------------------------------
commit c77e9c8d6bc7e88be9e1e64b368dd999c0c3cf10
Author: Paul <paul at claws-mail.org>
Date:   Mon Oct 20 19:46:19 2014 +0100

    updated translations
    
    submitted by Yasen Pramatarov, Thomas Bellmann, Sian Mountbatten, Ricardo Mones Lastra,
    Flammie Pirinen, "Genghis Khan", Mindaugas, Marcel Pol, Frederico Goncalves Guimaraes,
    Slavko, and Andreas Rönnquist

diff --git a/po/bg.po b/po/bg.po
index 9fee682..7d20b92 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3,69 +3,212 @@
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
+#
 # Miroslav B. Iordanov <m_iordo at yahoo.com>, 2002.
 # George Danchev <danchev at spnet.net>, 2002.
 # Todor Vachkov <vachkov at mail.math.tu-berlin.de>, 2007.
-# Yasen Pramatarov <yasen at lindeas.com>, 2006, 2007. 2008, 2009.
-#
+# Yasen Pramatarov <yasen at lindeas.com>, 2006, 2007. 2008, 2009, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.7.2\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2014-06-13 03:15+0400\n"
-"PO-Revision-Date: 2009-07-02 23:32+0300\n"
+"POT-Creation-Date: 2014-10-13 09:04+0100\n"
+"PO-Revision-Date: 2014-10-19 16:48+0300\n"
 "Last-Translator: Yasen Pramatarov <yasen at lindeas.com>\n"
-"Language-Team: Bulgarian <dict at fsa-bg.org>\n"
+"Language-Team: Bulgarian <dict at ludost.net>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.5\n"
 
-#: ../claws-mail.appdata.xml.in.h:1
-msgid "Claws Mail is a fast, powerful and very extensible email client."
+#: ../claws-mail.desktop.in.h:1
+msgid "E-mail client"
+msgstr "Пощенски клиент"
+
+#: ../claws-mail.desktop.in.h:2
+msgid "Lightweight and Fast GTK+ based Mail Client"
+msgstr "Лек и бърз пощенски клиент"
+
+#: ../claws-mail.desktop.in.h:3
+msgid "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
 msgstr ""
+"lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;лек;бърз;"
+"поща"
+
+#: ../appdata/claws-mail.appdata.xml.in.h:1
+msgid "Claws Mail is a fast, powerful and very extensible email client."
+msgstr "Claws Mail е бърз, мощен и настройваем пощенски клиент."
 
-#: ../claws-mail.appdata.xml.in.h:2
+#: ../appdata/claws-mail.appdata.xml.in.h:2
 msgid ""
 "It is highly configurable and handles hundreds of thousands of emails "
 "easily. Messages are managed in an open format, and are easy to interact "
 "with."
 msgstr ""
 
-#: ../claws-mail.appdata.xml.in.h:3
+#: ../appdata/claws-mail.appdata.xml.in.h:3
 msgid ""
 "Lots of extra functionality is provided by plugins, such as PGP signatures "
 "and encryption, an RSS aggregator, a calendar, powerful spam filtering, Perl "
 "and Python interactions, HTML and PDF rendering, and more."
 msgstr ""
 
-#: ../claws-mail.desktop.in.h:1
-msgid "E-mail client"
+#: ../appdata/claws-mail-acpi_notifier.metainfo.xml.in.h:1
+msgid "Enables mail notification via LEDs on some laptops"
 msgstr ""
 
-#: ../claws-mail.desktop.in.h:2
-msgid "Lightweight and Fast GTK+ based Mail Client"
+#: ../appdata/claws-mail-address_keeper.metainfo.xml.in.h:1
+msgid ""
+"Allows saving outgoing addresses to a designated folder in the address book"
+msgstr "Позволява запазване на изходящите адреси в указана папка в адресник"
+
+#: ../appdata/claws-mail-archive.metainfo.xml.in.h:1
+msgid "Allows to make tars or zips of old folders"
+msgstr "Позволява създаване на архиви на старите папки"
+
+#: ../appdata/claws-mail-att_remover.metainfo.xml.in.h:1
+msgid "Lets you remove attachments from emails"
+msgstr "Премахване на прикрепени файлове от писмата"
+
+#: ../appdata/claws-mail-attachwarner.metainfo.xml.in.h:1
+msgid ""
+"Warns when a message mentioning an attachment in the message body without "
+"attaching any files"
+msgstr ""
+
+#: ../appdata/claws-mail-bogofilter.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using Bogofilter"
+msgstr ""
+
+#: ../appdata/claws-mail-bsfilter.metainfo.xml.in.h:1
+msgid ""
+"Check all messages that are received from an IMAP, LOCAL or POP account for "
+"spam using Bsfilter"
+msgstr ""
+
+#: ../appdata/claws-mail-clamd.metainfo.xml.in.h:1
+msgid ""
+"Scans all messages that are received from an IMAP, LOCAL or POP account "
+"using clamd (Clam AV)"
+msgstr ""
+
+#: ../appdata/claws-mail-fancy.metainfo.xml.in.h:1
+msgid "Renders HTML e-mail using the WebKit library"
+msgstr ""
+
+#: ../appdata/claws-mail-fetchinfo.metainfo.xml.in.h:1
+msgid ""
+"Inserts headers containing: UIDL, Claws' account name, POP server, user ID "
+"and retrieval time"
+msgstr ""
+
+#: ../appdata/claws-mail-gdata.metainfo.xml.in.h:1
+msgid "Provides an interface to Google services"
+msgstr "Осигуряване на връзка с услугите на Гугъл"
+
+#: ../appdata/claws-mail-geolocation.metainfo.xml.in.h:1
+msgid "Provides GeoLocation functionality"
+msgstr "Осигуряване на възможност за геолокация"
+
+#: ../appdata/claws-mail-libravatar.metainfo.xml.in.h:1
+msgid ""
+"Displays libravatar/gravatar profiles' images or a dynamically generated or "
+"predefined alternative"
+msgstr ""
+
+#: ../appdata/claws-mail-mailmbox.metainfo.xml.in.h:1
+msgid "Direct support for mailboxes in mbox format"
+msgstr ""
+
+#: ../appdata/claws-mail-newmail.metainfo.xml.in.h:1
+msgid ""
+"Writes a msg header summary to a log file on arrival of new mail after "
+"sorting"
+msgstr ""
+
+#: ../appdata/claws-mail-notification.metainfo.xml.in.h:1
+msgid "Provides various ways to notify the user of new and unread email"
+msgstr ""
+
+#: ../appdata/claws-mail-pdf_viewer.metainfo.xml.in.h:1
+msgid ""
+"Enables the viewing of PDF and PostScript attachments using the Poppler "
+"library and GhostScript"
+msgstr ""
+
+#: ../appdata/claws-mail-perl.metainfo.xml.in.h:1
+msgid "Allowing the use of full Perl power in email filters"
+msgstr ""
+
+#: ../appdata/claws-mail-pgpcore.metainfo.xml.in.h:1
+msgid ""
+"Handles core PGP functions and is a dependency of both the PGP/Inline and "
+"PGP/MIME plugins."
+msgstr ""
+
+#: ../appdata/claws-mail-pgpinline.metainfo.xml.in.h:1
+msgid "Handles PGP/Inline signed and/or encrypted mails"
+msgstr ""
+
+#: ../appdata/claws-mail-pgpmime.metainfo.xml.in.h:1
+msgid "Handles PGP/MIME signed and/or encrypted mails"
+msgstr ""
+
+#: ../appdata/claws-mail-python.metainfo.xml.in.h:1
+msgid ""
+"Offers a Python scripting. Code can be entered into an embedded Python "
+"console or stored"
+msgstr ""
+
+#: ../appdata/claws-mail-rssyl.metainfo.xml.in.h:1
+msgid "Read your RSS favourite newsfeeds"
+msgstr ""
+
+#: ../appdata/claws-mail-smime.metainfo.xml.in.h:1
+msgid "Handles S/MIME signed and/or encrypted mails"
+msgstr ""
+
+#: ../appdata/claws-mail-spam_report.metainfo.xml.in.h:1
+msgid "Reports spam to various places"
+msgstr "Докладване за спам на различни места"
+
+#: ../appdata/claws-mail-spamassassin.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using SpamAssassin"
+msgstr ""
+
+#: ../appdata/claws-mail-tnef_parse.metainfo.xml.in.h:1
+msgid "Enables reading application/ms-tnef attachments"
+msgstr ""
+
+#: ../appdata/claws-mail-vcalendar.metainfo.xml.in.h:1
+msgid ""
+"Enables vCalendar message handling and handles webCal subscriptions. "
+"Provides a calendar import"
 msgstr ""
 
-#: ../src/account.c:392
+#: ../src/account.c:392 ../src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
+"Please close all the composing windows before editing accounts."
 msgstr ""
-"Има отворени прозорци за създаване на ново писмо.\n"
-"Затворете ги преди да продължите с редактирането на сметките."
+"Има отворени прозорци за писане на ново писмо.\n"
+"Затворете ги, преди да продължите с редактирането на сметките."
 
 #: ../src/account.c:437
 msgid "Can't create folder."
 msgstr "Папката не може да бъде създадена."
 
-#: ../src/account.c:717
+#: ../src/account.c:724
 msgid "Edit accounts"
 msgstr "Редактиране на сметките"
 
-#: ../src/account.c:734
+#: ../src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -75,44 +218,44 @@ msgstr ""
 "последователност. Отметката показва кои сметки да бъдат проверени. "
 "Удебеленният ред показва сметката по подразбиране."
 
-#: ../src/account.c:805
+#: ../src/account.c:812
 msgid " _Set as default account "
 msgstr "Сметка по по_дразбиране"
 
-#: ../src/account.c:897
+#: ../src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Сметки с отдалечени папки не могат да се копират."
 
 #. copy fields
-#: ../src/account.c:904
+#: ../src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Копие на %s"
 
-#: ../src/account.c:1064
+#: ../src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Наистина ли искате да изтриете сметката \"%s\"?"
 
-#: ../src/account.c:1066
+#: ../src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Неозаглавено)"
 
-#: ../src/account.c:1067
+#: ../src/account.c:1074
 msgid "Delete account"
 msgstr "Изтриване на сметка"
 
-#: ../src/account.c:1537
+#: ../src/account.c:1544
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: ../src/account.c:1543
+#: ../src/account.c:1550
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Провери поща' изтегля писмата от избраните сметки."
 
-#: ../src/account.c:1550 ../src/addrduplicates.c:471 ../src/addressadd.c:215
-#: ../src/addressbook.c:125 ../src/compose.c:7144 ../src/editaddress.c:1263
+#: ../src/account.c:1557 ../src/addrduplicates.c:471 ../src/addressadd.c:215
+#: ../src/addressbook.c:125 ../src/compose.c:7148 ../src/editaddress.c:1263
 #: ../src/editaddress.c:1320 ../src/editaddress.c:1340
 #: ../src/editaddress_other_attributes_ldap.c:302
 #: ../src/editaddress_other_attributes_ldap.c:350 ../src/editbook.c:170
@@ -120,16 +263,16 @@ msgstr "'Провери поща' изтегля писмата от избра
 #: ../src/editvcard.c:173 ../src/importmutt.c:223 ../src/importpine.c:222
 #: ../src/mimeview.c:275 ../src/plugins/pdf_viewer/poppler_viewer.c:1797
 #: ../src/plugins/pgpcore/select-keys.c:396 ../src/prefs_filtering.c:384
-#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:78
+#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:79
 msgid "Name"
 msgstr "Име"
 
-#: ../src/account.c:1558 ../src/prefs_account.c:1103
+#: ../src/account.c:1565 ../src/prefs_account.c:1103
 #: ../src/prefs_account.c:4058
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../src/account.c:1566 ../src/ssl_manager.c:102
+#: ../src/account.c:1573 ../src/ssl_manager.c:102
 msgid "Server"
 msgstr "Сървър"
 
@@ -177,13 +320,13 @@ msgid ""
 "%s\n"
 "%s"
 msgstr ""
-"Грешка при създавенето на процеса за изпълнение на следната команда:\n"
+"Грешка при създаването на процеса за изпълнение на следната команда:\n"
 "%s\n"
 "%s"
 
 #: ../src/action.c:990 ../src/ldaputil.c:326
-#: ../src/plugins/bogofilter/bogofilter.c:876 ../src/plugins/rssyl/feed.c:1739
-#: ../src/plugins/rssyl/feed.c:1743 ../src/plugins/tnef_parse/tnef_parse.c:67
+#: ../src/plugins/bogofilter/bogofilter.c:876
+#: ../src/plugins/tnef_parse/tnef_parse.c:67
 #: ../src/plugins/vcalendar/vcal_folder.c:1803
 #: ../src/plugins/vcalendar/vcal_folder.c:1807
 #: ../src/plugins/vcalendar/vcal_folder.c:1818
@@ -241,19 +384,18 @@ msgstr "Потребителски аргументи на действието"
 
 #: ../src/addrclip.c:479
 msgid "Cannot copy a folder to itself or to its sub-structure."
-msgstr ""
+msgstr "Не може да копирате папката в самата нея или нейна под-папка."
 
 #: ../src/addrclip.c:502
-#, fuzzy
 msgid "Cannot copy an address book to itself."
-msgstr "Поставянето е невъзможно. Целевия адресник не може да бъде променян."
+msgstr "Не може адресник да се копира в самия него."
 
 #: ../src/addrclip.c:593
 msgid "Cannot move a folder to itself or to its sub-structure."
-msgstr ""
+msgstr "Не може да преместите папката в самата нея или нейна под-папка."
 
 #. that's a group
-#: ../src/addr_compl.c:620 ../src/addressbook.c:4866
+#: ../src/addr_compl.c:685 ../src/addressbook.c:4866
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "Група"
@@ -328,14 +470,14 @@ msgstr ""
 
 #: ../src/addrcustomattr.c:212 ../src/addressbook.c:435
 #: ../src/addressbook.c:463 ../src/addressbook.c:480 ../src/edittags.c:272
-#: ../src/plugins/archive/archiver_gtk.c:1193 ../src/prefs_actions.c:1090
-#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1099
+#: ../src/plugins/archive/archiver_gtk.c:1194 ../src/prefs_actions.c:1090
+#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1119
 msgid "_Delete"
 msgstr "_Изтриване"
 
 #: ../src/addrcustomattr.c:213 ../src/edittags.c:273
 #: ../src/prefs_actions.c:1091 ../src/prefs_filtering.c:1694
-#: ../src/prefs_template.c:1100
+#: ../src/prefs_template.c:1120
 msgid "Delete _all"
 msgstr "Изтриване на _всички"
 
@@ -350,7 +492,7 @@ msgstr "Не е указано име за атрибута."
 #: ../src/addrcustomattr.c:462
 msgctxt "Dialog title"
 msgid "Edit attribute names"
-msgstr ""
+msgstr "Редактиране имената на атрибути"
 
 #: ../src/addrcustomattr.c:476
 msgid "New attribute name:"
@@ -433,7 +575,7 @@ msgid "Select Address Book Folder"
 msgstr "Изберете папка от адресника"
 
 #: ../src/addressadd.c:485 ../src/editaddress.c:1582 ../src/headerview.c:281
-#: ../src/textview.c:2064
+#: ../src/textview.c:2043
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -464,17 +606,17 @@ msgstr "_Адресник"
 
 #. {"Address/---",			NULL, "---", NULL, NULL, NULL },
 #: ../src/addressbook.c:403 ../src/addressbook.c:434 ../src/addressbook.c:462
-#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:504
+#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:506
 #: ../src/messageview.c:210
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:507
+#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:509
 #: ../src/messageview.c:213
 msgid "_Tools"
 msgstr "И_нструменти"
 
-#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:509
+#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:511
 #: ../src/messageview.c:214
 msgid "_Help"
 msgstr "_Помощ"
@@ -532,7 +674,7 @@ msgstr "И_зрязване"
 
 #. Edit menu
 #: ../src/addressbook.c:431 ../src/addressbook.c:470 ../src/addressbook.c:486
-#: ../src/compose.c:610 ../src/mainwindow.c:538 ../src/messageview.c:226
+#: ../src/compose.c:610 ../src/mainwindow.c:540 ../src/messageview.c:226
 msgid "_Copy"
 msgstr "_Копиране"
 
@@ -588,7 +730,7 @@ msgid "Edit custom attributes..."
 msgstr ""
 
 #. Help menu
-#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:801
+#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:803
 #: ../src/messageview.c:339
 msgid "_About"
 msgstr "_Относно"
@@ -598,9 +740,10 @@ msgid "_Browse Entry"
 msgstr "_Преглед на записа"
 
 #. then add the appointment
-#: ../src/addressbook.c:504 ../src/crash.c:454 ../src/crash.c:473
+#: ../src/addressbook.c:504 ../src/crash.c:457 ../src/crash.c:476
 #: ../src/importldif.c:115 ../src/plugins/pgpcore/select-keys.c:251
-#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/vcalendar/day-view.c:402
+#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/pgpcore/sgpgme.c:168
+#: ../src/plugins/vcalendar/day-view.c:402
 #: ../src/plugins/vcalendar/month-view.c:428 ../src/prefs_themes.c:707
 #: ../src/prefs_themes.c:739 ../src/prefs_themes.c:740
 msgid "Unknown"
@@ -706,7 +849,7 @@ msgstr "Изисква се по-сигурно удостоверяване"
 msgid "Sources"
 msgstr "Източници"
 
-#: ../src/addressbook.c:914 ../src/prefs_matcher.c:629
+#: ../src/addressbook.c:914 ../src/prefs_matcher.c:632
 #: ../src/prefs_other.c:475 ../src/toolbar.c:225 ../src/toolbar.c:2142
 msgid "Address book"
 msgstr "Адресник"
@@ -729,17 +872,16 @@ msgstr ""
 
 #: ../src/addressbook.c:2190
 msgid "Cannot paste. Target address book is readonly."
-msgstr "Поставянето е невъзможно. Целевия адресник не може да бъде променян."
+msgstr "Поставянето е невъзможно. Целевия адресник не е само за четене."
 
 #: ../src/addressbook.c:2200
 msgid "Cannot paste into an address group."
 msgstr "Поставянето в адресна група е невъзможно."
 
 #: ../src/addressbook.c:2906
-#, fuzzy, c-format
+#, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
-msgstr ""
-"Наистина ли искате да изтриете резултатите от търсенето и адресите в '%s' ?"
+msgstr "Искате ли да изтриете резултатите от търсенето и адресите в \"%s\"?"
 
 #: ../src/addressbook.c:2909 ../src/addressbook.c:2935
 #: ../src/addressbook.c:2942 ../src/plugins/archive/archiver_prefs.c:337
@@ -748,17 +890,17 @@ msgid "Delete"
 msgstr "Изтриване"
 
 #: ../src/addressbook.c:2918
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
 "contains will be moved into the parent folder."
 msgstr ""
-"Наистина ли искате да изтриете \"%s\"? Ако изтриете само папката, адресите "
+"Да се изтрие ли \"%s\"? Ако изтриете само папката, адресите "
 "от нея ще бъдат преместени в родителската папка."
 
 #: ../src/addressbook.c:2921 ../src/imap_gtk.c:363 ../src/mh_gtk.c:202
 #: ../src/plugins/mailmbox/plugin_gtk.c:324
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:236
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:152
 #: ../src/plugins/vcalendar/vcal_folder.c:1966
 msgid "Delete folder"
 msgstr "Изтриване на папка"
@@ -922,10 +1064,10 @@ msgstr "LDAP-заявка"
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:443
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:490
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:613
-#: ../src/prefs_matcher.c:672 ../src/prefs_matcher.c:707
-#: ../src/prefs_matcher.c:1607 ../src/prefs_matcher.c:1614
-#: ../src/prefs_matcher.c:1622 ../src/prefs_matcher.c:1624
-#: ../src/prefs_matcher.c:2504 ../src/prefs_matcher.c:2508
+#: ../src/prefs_matcher.c:675 ../src/prefs_matcher.c:710
+#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:1626
+#: ../src/prefs_matcher.c:1634 ../src/prefs_matcher.c:1636
+#: ../src/prefs_matcher.c:2524 ../src/prefs_matcher.c:2528
 msgid "Any"
 msgstr "Произволен"
 
@@ -934,9 +1076,8 @@ msgid "Please specify name for address book."
 msgstr "Въведете име за адресника"
 
 #: ../src/addrgather.c:179
-#, fuzzy
 msgid "No available address book."
-msgstr "Налични адреси"
+msgstr "Няма налични адресници."
 
 #: ../src/addrgather.c:200
 msgid "Please select the mail headers to search."
@@ -949,7 +1090,7 @@ msgstr "Събиране на адреси..."
 
 #: ../src/addrgather.c:247
 msgid "address added by claws-mail"
-msgstr ""
+msgstr "адресът е добавен от claws-mail"
 
 #: ../src/addrgather.c:275
 msgid "Addresses collected successfully."
@@ -1030,21 +1171,21 @@ msgstr "Адрес (-и) в групата"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Грешка при актуализацията. Промените не бяха записани в директорията."
 
-#: ../src/alertpanel.c:146 ../src/compose.c:9293
+#: ../src/alertpanel.c:146 ../src/compose.c:9324
 msgid "Notice"
 msgstr "Бележка"
 
 #: ../src/alertpanel.c:159 ../src/compose.c:5656 ../src/compose.c:6133
-#: ../src/compose.c:11662 ../src/file_checker.c:78 ../src/file_checker.c:100
+#: ../src/compose.c:11670 ../src/file_checker.c:78 ../src/file_checker.c:100
 #: ../src/messageview.c:853 ../src/messageview.c:866
-#: ../src/plugins/pgpcore/sgpgme.c:719
+#: ../src/plugins/pgpcore/sgpgme.c:717
 #: ../src/plugins/vcalendar/vcalendar.c:125 ../src/summaryview.c:4863
 msgid "Warning"
 msgstr "Предупреждение"
 
 #: ../src/alertpanel.c:172 ../src/alertpanel.c:195 ../src/compose.c:5597
 #: ../src/inc.c:669 ../src/plugins/pgpcore/sgpgme.c:152
-#: ../src/plugins/pgpcore/sgpgme.c:249
+#: ../src/plugins/pgpcore/sgpgme.c:253
 msgid "Error"
 msgstr "Грешка"
 
@@ -1056,14 +1197,9 @@ msgstr "_Преглед на журналния файл"
 msgid "Show this message next time"
 msgstr "Показване на това съобщение следващия път"
 
-#: ../src/avatars.c:97
-msgid "Internal avatars rendering already initialized"
-msgstr ""
-
 #: ../src/avatars.c:102
-#, fuzzy
 msgid "Failed to register avatars internal rendering hook"
-msgstr "Грешка при създаване на папката"
+msgstr ""
 
 #: ../src/browseldap.c:218
 msgid "Browse Directory Entry"
@@ -1138,11 +1274,8 @@ msgid "Failed to allocate memory for Plugin"
 msgstr "Грешка при заделянето на памет за приставка"
 
 #: ../src/common/plugin.c:481
-#, fuzzy
 msgid "This module is not licensed under a GPL v3 or later compatible license."
-msgstr ""
-"Тази приставка не е лицензирана под лиценз, съвместим с GPL версия 2 или по-"
-"нова."
+msgstr "Тази приставка не е лицензирана под лиценз, съвместим с GPL версия 3."
 
 #: ../src/common/plugin.c:490
 msgid "This module is for Claws Mail GTK1."
@@ -1174,19 +1307,17 @@ msgstr "Вашата версия на Claws Mail е прекалено стар
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Вашата версия на Claws Mail е прекалено стара за приставката."
 
-#: ../src/common/session.c:177 ../src/imap.c:1171
+#: ../src/common/session.c:177 ../src/imap.c:1177
 msgid "SSL handshake failed\n"
 msgstr "SSL-връзката е неуспешна\n"
 
 #: ../src/common/smtp.c:180
-#, fuzzy
 msgid "No SMTP AUTH method available\n"
-msgstr "SMTP AUTH не е налична\n"
+msgstr "Няма наличен SMTP AUTH метод\n"
 
 #: ../src/common/smtp.c:183
-#, fuzzy
 msgid "Selected SMTP AUTH method not available\n"
-msgstr "SMTP AUTH не е налична\n"
+msgstr "Избраният SMTP AUTH метод не е наличен\n"
 
 #: ../src/common/smtp.c:525 ../src/common/smtp.c:579
 msgid "bad SMTP response\n"
@@ -1210,14 +1341,12 @@ msgid "couldn't start TLS session\n"
 msgstr "грешка при стартирането на TLS сесията\n"
 
 #: ../src/common/socket.c:573
-#, fuzzy
 msgid "Socket IO timeout.\n"
-msgstr "Сесията изтече\n"
+msgstr "Просрочен вход-изход на сокет.\n"
 
 #: ../src/common/socket.c:602
-#, fuzzy
 msgid "Connection timed out.\n"
-msgstr "Грешка при свързване"
+msgstr "Просрочена връзка.\n"
 
 #: ../src/common/socket.c:630
 #, c-format
@@ -1225,19 +1354,19 @@ msgid "%s: host lookup timed out.\n"
 msgstr ""
 
 #: ../src/common/socket.c:643
-#, fuzzy, c-format
+#, c-format
 msgid "%s: unknown host.\n"
-msgstr "Непозната настройка\n"
+msgstr "%s: непознат хост.\n"
 
 #: ../src/common/socket.c:831
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d: connection failed (%s).\n"
-msgstr "Грешка при свързване"
+msgstr "%s:%d: грешка при свързване (%s).\n"
 
 #: ../src/common/socket.c:1071
 #, c-format
 msgid "%s:%d: unknown host.\n"
-msgstr ""
+msgstr "%s:%d: непознат хост.\n"
 
 #: ../src/common/socket.c:1166
 #, c-format
@@ -1265,9 +1394,8 @@ msgid "Cannot import P12 certificate file (%s)\n"
 msgstr ""
 
 #: ../src/common/ssl_certificate.c:630
-#, fuzzy
 msgid "Internal error"
-msgstr "Вградена тема по подразбиране"
+msgstr "Вътрешна грешка"
 
 #: ../src/common/ssl_certificate.c:635
 msgid "Uncheckable"
@@ -1287,22 +1415,22 @@ msgstr "Не е открит издателят на сертификата"
 
 #: ../src/common/ssl_certificate.c:646
 msgid "Certificate issuer is not a CA"
-msgstr ""
+msgstr "Издателят на сертификата не е CA"
 
 #: ../src/common/ssl_certificate.c:871
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open certificate file %s: %s\n"
-msgstr "Грешка при отваряне на файла %s."
+msgstr "Грешка при отваряне на файла за сертификат %s (%s)\n"
 
 #: ../src/common/ssl_certificate.c:875
-#, fuzzy, c-format
+#, c-format
 msgid "Certificate file %s missing (%s)\n"
-msgstr "Сертификат за изпращане"
+msgstr "Файлът на сертификат %s липсва (%s)\n"
 
 #: ../src/common/ssl_certificate.c:894
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open key file %s (%s)\n"
-msgstr "Грешка при отваряне на файла %s."
+msgstr "Грешка при отваряне на файла с ключ %s (%s)\n"
 
 #: ../src/common/ssl_certificate.c:898
 #, c-format
@@ -1310,9 +1438,9 @@ msgid "Key file %s missing (%s)\n"
 msgstr ""
 
 #: ../src/common/ssl_certificate.c:1046
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to read P12 certificate file %s\n"
-msgstr "Изберете файл със сертификат"
+msgstr "Грешка при четене на файл за сертификат P12 %s\n"
 
 #: ../src/common/ssl_certificate.c:1049
 #, c-format
@@ -1320,9 +1448,9 @@ msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr ""
 
 #: ../src/common/ssl_certificate.c:1053
-#, fuzzy, c-format
+#, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
-msgstr "Сертификат за изпращане"
+msgstr "Файл P12 на сертификат %s липсва (%s)\n"
 
 #: ../src/common/ssl_certificate.c:1078 ../src/gtk/sslcertwindow.c:85
 #: ../src/gtk/sslcertwindow.c:92 ../src/gtk/sslcertwindow.c:107
@@ -1355,212 +1483,212 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: ../src/common/utils.c:4967
+#: ../src/common/utils.c:5000
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
-msgstr "Неделя"
+msgstr "неделя"
 
-#: ../src/common/utils.c:4968
+#: ../src/common/utils.c:5001
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
-msgstr "Понеделник"
+msgstr "понеделник"
 
-#: ../src/common/utils.c:4969
+#: ../src/common/utils.c:5002
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
-msgstr "Вторник"
+msgstr "вторник"
 
-#: ../src/common/utils.c:4970
+#: ../src/common/utils.c:5003
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
-msgstr "Сряда"
+msgstr "сряда"
 
-#: ../src/common/utils.c:4971
+#: ../src/common/utils.c:5004
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
-msgstr "Четвъртък"
+msgstr "четвъртък"
 
-#: ../src/common/utils.c:4972
+#: ../src/common/utils.c:5005
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
-msgstr "Петък"
+msgstr "петък"
 
-#: ../src/common/utils.c:4973
+#: ../src/common/utils.c:5006
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
-msgstr "Събота"
+msgstr "събота"
 
-#: ../src/common/utils.c:4975
+#: ../src/common/utils.c:5008
 msgctxt "Complete month name for use by strftime"
 msgid "January"
-msgstr "Януари"
+msgstr "януари"
 
-#: ../src/common/utils.c:4976
+#: ../src/common/utils.c:5009
 msgctxt "Complete month name for use by strftime"
 msgid "February"
-msgstr "Февруари"
+msgstr "февруари"
 
-#: ../src/common/utils.c:4977
+#: ../src/common/utils.c:5010
 msgctxt "Complete month name for use by strftime"
 msgid "March"
-msgstr "Март"
+msgstr "март"
 
-#: ../src/common/utils.c:4978
+#: ../src/common/utils.c:5011
 msgctxt "Complete month name for use by strftime"
 msgid "April"
-msgstr "Април"
+msgstr "април"
 
-#: ../src/common/utils.c:4979
+#: ../src/common/utils.c:5012
 msgctxt "Complete month name for use by strftime"
 msgid "May"
-msgstr "Май"
+msgstr "май"
 
-#: ../src/common/utils.c:4980
+#: ../src/common/utils.c:5013
 msgctxt "Complete month name for use by strftime"
 msgid "June"
-msgstr "Юни"
+msgstr "юни"
 
-#: ../src/common/utils.c:4981
+#: ../src/common/utils.c:5014
 msgctxt "Complete month name for use by strftime"
 msgid "July"
-msgstr "Юли"
+msgstr "юли"
 
-#: ../src/common/utils.c:4982
+#: ../src/common/utils.c:5015
 msgctxt "Complete month name for use by strftime"
 msgid "August"
-msgstr "Август"
+msgstr "август"
 
-#: ../src/common/utils.c:4983
+#: ../src/common/utils.c:5016
 msgctxt "Complete month name for use by strftime"
 msgid "September"
-msgstr "Септември"
+msgstr "септември"
 
-#: ../src/common/utils.c:4984
+#: ../src/common/utils.c:5017
 msgctxt "Complete month name for use by strftime"
 msgid "October"
-msgstr "Октомври"
+msgstr "октомври"
 
-#: ../src/common/utils.c:4985
+#: ../src/common/utils.c:5018
 msgctxt "Complete month name for use by strftime"
 msgid "November"
-msgstr "Ноември"
+msgstr "ноември"
 
-#: ../src/common/utils.c:4986
+#: ../src/common/utils.c:5019
 msgctxt "Complete month name for use by strftime"
 msgid "December"
-msgstr "Декември"
+msgstr "декември"
 
-#: ../src/common/utils.c:4988
+#: ../src/common/utils.c:5021
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Нд"
 
-#: ../src/common/utils.c:4989
+#: ../src/common/utils.c:5022
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Пн"
 
-#: ../src/common/utils.c:4990
+#: ../src/common/utils.c:5023
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Вт"
 
-#: ../src/common/utils.c:4991
+#: ../src/common/utils.c:5024
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Ср"
 
-#: ../src/common/utils.c:4992
+#: ../src/common/utils.c:5025
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Чт"
 
-#: ../src/common/utils.c:4993
+#: ../src/common/utils.c:5026
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Пт"
 
-#: ../src/common/utils.c:4994
+#: ../src/common/utils.c:5027
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Сб"
 
-#: ../src/common/utils.c:4996
+#: ../src/common/utils.c:5029
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Яну"
 
-#: ../src/common/utils.c:4997
+#: ../src/common/utils.c:5030
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Фев"
 
-#: ../src/common/utils.c:4998
+#: ../src/common/utils.c:5031
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Мар"
 
-#: ../src/common/utils.c:4999
+#: ../src/common/utils.c:5032
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Апр"
 
-#: ../src/common/utils.c:5000
+#: ../src/common/utils.c:5033
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Май"
 
-#: ../src/common/utils.c:5001
+#: ../src/common/utils.c:5034
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Юни"
 
-#: ../src/common/utils.c:5002
+#: ../src/common/utils.c:5035
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Юли"
 
-#: ../src/common/utils.c:5003
+#: ../src/common/utils.c:5036
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Авг"
 
-#: ../src/common/utils.c:5004
+#: ../src/common/utils.c:5037
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Сеп"
 
-#: ../src/common/utils.c:5005
+#: ../src/common/utils.c:5038
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Окт"
 
-#: ../src/common/utils.c:5006
+#: ../src/common/utils.c:5039
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Ное"
 
-#: ../src/common/utils.c:5007
+#: ../src/common/utils.c:5040
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Дек"
 
-#: ../src/common/utils.c:5018
+#: ../src/common/utils.c:5051
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "пр. обяд"
 
-#: ../src/common/utils.c:5019
+#: ../src/common/utils.c:5052
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "сл. обяд"
 
-#: ../src/common/utils.c:5020
+#: ../src/common/utils.c:5053
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "пр. обяд"
 
-#: ../src/common/utils.c:5021
+#: ../src/common/utils.c:5054
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "сл. обяд"
@@ -1571,7 +1699,7 @@ msgstr "_Добавяне..."
 
 #: ../src/compose.c:571 ../src/mh_gtk.c:361
 #: ../src/plugins/mailmbox/plugin_gtk.c:293
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:140
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:307
 msgid "_Remove"
 msgstr "_Премахване"
 
@@ -1580,7 +1708,7 @@ msgid "_Properties..."
 msgstr "_Настройки..."
 
 #. menus
-#: ../src/compose.c:580 ../src/mainwindow.c:506 ../src/messageview.c:212
+#: ../src/compose.c:580 ../src/mainwindow.c:508 ../src/messageview.c:212
 msgid "_Message"
 msgstr "_Писмо"
 
@@ -1614,16 +1742,14 @@ msgid "Insert si_gnature"
 msgstr "Добавяне на по_дпис"
 
 #: ../src/compose.c:596
-#, fuzzy
 msgid "_Replace signature"
-msgstr "Проверка на подписа"
+msgstr "_Замяна на подписа"
 
 #. COMPOSE_KEEP_EDITING
 #. {"Message/---",		NULL, "---" },
 #: ../src/compose.c:600
-#, fuzzy
 msgid "_Print"
-msgstr "Отпечатване"
+msgstr "_Печат"
 
 #. Edit menu
 #: ../src/compose.c:605
@@ -1639,26 +1765,22 @@ msgid "Cu_t"
 msgstr "И_зрязване"
 
 #: ../src/compose.c:613
-#, fuzzy
 msgid "_Special paste"
-msgstr "Поставяне като"
+msgstr "_Специално вмъкване"
 
 #: ../src/compose.c:614
-#, fuzzy
 msgid "As _quotation"
-msgstr "като _цитат"
+msgstr "Като _цитат"
 
 #: ../src/compose.c:615
-#, fuzzy
 msgid "_Wrapped"
-msgstr "_загърнато"
+msgstr "_Загърнато"
 
 #: ../src/compose.c:616
-#, fuzzy
 msgid "_Unwrapped"
-msgstr "_незагърнато"
+msgstr "_Незагърнато"
 
-#: ../src/compose.c:618 ../src/mainwindow.c:539
+#: ../src/compose.c:618 ../src/mainwindow.c:541
 msgid "Select _all"
 msgstr "_Избиране на всичко"
 
@@ -1790,48 +1912,48 @@ msgstr "_Приоритет"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
 #. {"View/Scroll/---",          NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:666 ../src/mainwindow.c:603 ../src/messageview.c:265
+#: ../src/compose.c:666 ../src/mainwindow.c:605 ../src/messageview.c:265
 msgid "Character _encoding"
 msgstr "Кодиране на _символите"
 
-#: ../src/compose.c:671 ../src/mainwindow.c:608 ../src/messageview.c:270
+#: ../src/compose.c:671 ../src/mainwindow.c:610 ../src/messageview.c:270
 msgid "Western European"
 msgstr "Западноевропейско"
 
-#: ../src/compose.c:672 ../src/mainwindow.c:609 ../src/messageview.c:271
+#: ../src/compose.c:672 ../src/mainwindow.c:611 ../src/messageview.c:271
 msgid "Baltic"
 msgstr "Балтийско"
 
-#: ../src/compose.c:673 ../src/mainwindow.c:610 ../src/messageview.c:272
+#: ../src/compose.c:673 ../src/mainwindow.c:612 ../src/messageview.c:272
 msgid "Hebrew"
 msgstr "Еврейски"
 
-#: ../src/compose.c:674 ../src/mainwindow.c:611 ../src/messageview.c:273
+#: ../src/compose.c:674 ../src/mainwindow.c:613 ../src/messageview.c:273
 msgid "Arabic"
 msgstr "Арабско"
 
-#: ../src/compose.c:675 ../src/mainwindow.c:612 ../src/messageview.c:274
+#: ../src/compose.c:675 ../src/mainwindow.c:614 ../src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Кирилица"
 
-#: ../src/compose.c:676 ../src/mainwindow.c:613 ../src/messageview.c:275
+#: ../src/compose.c:676 ../src/mainwindow.c:615 ../src/messageview.c:275
 msgid "Japanese"
 msgstr "Японско"
 
-#: ../src/compose.c:677 ../src/mainwindow.c:614 ../src/messageview.c:276
+#: ../src/compose.c:677 ../src/mainwindow.c:616 ../src/messageview.c:276
 msgid "Chinese"
 msgstr "Китайско"
 
-#: ../src/compose.c:678 ../src/mainwindow.c:615 ../src/messageview.c:277
+#: ../src/compose.c:678 ../src/mainwindow.c:617 ../src/messageview.c:277
 msgid "Korean"
 msgstr "Корейско"
 
-#: ../src/compose.c:679 ../src/mainwindow.c:616 ../src/messageview.c:278
+#: ../src/compose.c:679 ../src/mainwindow.c:618 ../src/messageview.c:278
 msgid "Thai"
 msgstr "Тайландско"
 
 #. Tools menu
-#: ../src/compose.c:682 ../src/mainwindow.c:723 ../src/messageview.c:314
+#: ../src/compose.c:682 ../src/mainwindow.c:725 ../src/messageview.c:314
 msgid "_Address book"
 msgstr "_Адресник"
 
@@ -1840,7 +1962,7 @@ msgid "_Template"
 msgstr "_Шаблон"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:686 ../src/mainwindow.c:751 ../src/messageview.c:335
+#: ../src/compose.c:686 ../src/mainwindow.c:753 ../src/messageview.c:335
 msgid "Actio_ns"
 msgstr "_Действия"
 
@@ -1870,9 +1992,8 @@ msgstr "Искане на _разписка за получаване"
 
 #. TOGGLE
 #: ../src/compose.c:700
-#, fuzzy
 msgid "Remo_ve references"
-msgstr "/_Настройки/_Късане на нишката"
+msgstr ""
 
 #. TOGGLE
 #: ../src/compose.c:701
@@ -1885,13 +2006,13 @@ msgid "_Normal"
 msgstr "_Нормален режим"
 
 #. RADIO compose_reply_change_mode_cb
-#: ../src/compose.c:707 ../src/mainwindow.c:657 ../src/messageview.c:303
+#: ../src/compose.c:707 ../src/mainwindow.c:659 ../src/messageview.c:303
 msgid "_All"
 msgstr "_Всички"
 
 #. RADIO compose_reply_change_mode_cb
 #. COMPOSE_REPLY_TO_ALL
-#: ../src/compose.c:708 ../src/mainwindow.c:658 ../src/messageview.c:304
+#: ../src/compose.c:708 ../src/mainwindow.c:660 ../src/messageview.c:304
 msgid "_Sender"
 msgstr "По_дател"
 
@@ -1919,19 +2040,19 @@ msgstr "_Ниско"
 msgid "_Lowest"
 msgstr "Най-ни_ско"
 
-#: ../src/compose.c:723 ../src/mainwindow.c:865 ../src/messageview.c:352
+#: ../src/compose.c:723 ../src/mainwindow.c:868 ../src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Автоматично"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:724 ../src/mainwindow.c:866 ../src/messageview.c:353
+#: ../src/compose.c:724 ../src/mainwindow.c:869 ../src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7-битов ascii (US-ASC_II)"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:725 ../src/mainwindow.c:867 ../src/messageview.c:354
+#: ../src/compose.c:725 ../src/mainwindow.c:870 ../src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Уникод (_UTF-8)"
 
@@ -1943,7 +2064,7 @@ msgstr "Уникод (_UTF-8)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:729 ../src/mainwindow.c:871 ../src/messageview.c:358
+#: ../src/compose.c:729 ../src/mainwindow.c:874 ../src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Централноевропейско (ISO-8859-_2)"
 
@@ -1953,7 +2074,7 @@ msgstr "Централноевропейско (ISO-8859-_2)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:732 ../src/mainwindow.c:874 ../src/messageview.c:361
+#: ../src/compose.c:732 ../src/mainwindow.c:877 ../src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Гръцко (ISO-8859-_7)"
 
@@ -1967,7 +2088,7 @@ msgstr "Гръцко (ISO-8859-_7)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:737 ../src/mainwindow.c:879 ../src/messageview.c:366
+#: ../src/compose.c:737 ../src/mainwindow.c:882 ../src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Турско (ISO-8859-_9)"
 
@@ -2021,33 +2142,33 @@ msgstr "Препратено: няколко писма"
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "В текста на шаблона за пренасочване има грешка на ред %d."
 
-#: ../src/compose.c:2591 ../src/gtk/headers.h:13
+#: ../src/compose.c:2591 ../src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Копие:"
 
-#: ../src/compose.c:2594 ../src/gtk/headers.h:14
+#: ../src/compose.c:2594 ../src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Скрито копие:"
 
-#: ../src/compose.c:2597 ../src/gtk/headers.h:11
+#: ../src/compose.c:2597 ../src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
 #: ../src/compose.c:2600 ../src/compose.c:4911 ../src/compose.c:4913
-#: ../src/gtk/headers.h:32
+#: ../src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Новинарски групи:"
 
-#: ../src/compose.c:2603 ../src/gtk/headers.h:33
+#: ../src/compose.c:2603 ../src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Followup-To:"
 
-#: ../src/compose.c:2606 ../src/gtk/headers.h:16
+#: ../src/compose.c:2606 ../src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "В отговор на:"
 
 #: ../src/compose.c:2610 ../src/compose.c:4908 ../src/compose.c:4916
-#: ../src/gtk/headers.h:12 ../src/summary_search.c:433
+#: ../src/gtk/headers.h:13 ../src/summary_search.c:433
 msgid "To:"
 msgstr "До:"
 
@@ -2076,22 +2197,22 @@ msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Знаците за цитиране в шаблона са неправилни."
 
 #: ../src/compose.c:3588
-#, fuzzy, c-format
+#, c-format
 msgid "Could not get size of file '%s'."
-msgstr "Грешка при изтеглянето на файла за писмо %d"
+msgstr "Грешка при определяне размера на файла \"%s\"."
 
 #: ../src/compose.c:3599
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
-msgstr "Последователно изпечатване на %d писма. Искате ли да продължите?"
+msgstr ""
 
 #: ../src/compose.c:3602
 msgid "Are you sure?"
-msgstr ""
+msgstr "Сигурни ли сте?"
 
-#: ../src/compose.c:3603 ../src/compose.c:11144
+#: ../src/compose.c:3603 ../src/compose.c:11152
 msgid "+_Insert"
 msgstr "+_Вмъкване"
 
@@ -2101,14 +2222,12 @@ msgid "File %s is empty."
 msgstr "Файлът \"%s\" е празен."
 
 #: ../src/compose.c:3718
-#, fuzzy
 msgid "Empty file"
-msgstr "Внасяне на mbox-файл"
+msgstr "Празен файл"
 
 #: ../src/compose.c:3719
-#, fuzzy
 msgid "+_Attach anyway"
-msgstr "Прикрепяне на файл"
+msgstr "+ _Прикрепяне"
 
 #: ../src/compose.c:3728
 #, c-format
@@ -2120,16 +2239,16 @@ msgstr "Грешка при четенето на %s."
 msgid "Message: %s"
 msgstr "Писмо: %s"
 
-#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:432
+#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr "[Редактирано]"
 
-#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:435
+#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Писане на ново писмо%s"
 
-#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:438
+#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[без Относно] - Писане на ново писмо%s"
@@ -2138,7 +2257,7 @@ msgstr "[без Относно] - Писане на ново писмо%s"
 #. * This partly duplicates functionality in compose.c::compose_set_title().
 #. * While it's nice to not have to modify Claws Mail for this to work,
 #. * it would be cleaner to export that function in Claws Mail.
-#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:426
+#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Писане на ново писмо"
 
@@ -2198,7 +2317,7 @@ msgstr "Да се постави в опашката въпреки това?"
 msgid "Send later"
 msgstr "По-късно"
 
-#: ../src/compose.c:5134 ../src/compose.c:9719
+#: ../src/compose.c:5134 ../src/compose.c:9750
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2208,7 +2327,7 @@ msgstr ""
 "\n"
 "Преобразуването на кодовата таблица е неуспешно."
 
-#: ../src/compose.c:5137 ../src/compose.c:9722
+#: ../src/compose.c:5137 ../src/compose.c:9753
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2218,7 +2337,7 @@ msgstr ""
 "\n"
 "Не е получен ключът на получателя за шифриране."
 
-#: ../src/compose.c:5143 ../src/compose.c:9716
+#: ../src/compose.c:5143 ../src/compose.c:9747
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2295,7 +2414,7 @@ msgstr ""
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr ""
 
-#: ../src/compose.c:6133 ../src/mainwindow.c:648 ../src/toolbar.c:231
+#: ../src/compose.c:6133 ../src/mainwindow.c:650 ../src/toolbar.c:231
 #: ../src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Отмяна на изпращането"
@@ -2313,34 +2432,34 @@ msgstr ""
 msgid "Add to address _book"
 msgstr "Добавяне към _адресника"
 
-#: ../src/compose.c:6908
+#: ../src/compose.c:6912
 msgid "Delete entry contents"
 msgstr "Изтриване съдържанието на записа"
 
-#: ../src/compose.c:6912 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: ../src/compose.c:6916 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Натиснете <tab> за автоматично вмъкване от адресника"
 
-#: ../src/compose.c:7132
+#: ../src/compose.c:7136
 msgid "Mime type"
 msgstr "Вид по MIME"
 
 #. S_COL_DATE
-#: ../src/compose.c:7138 ../src/mimeview.c:274
-#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:627
+#: ../src/compose.c:7142 ../src/mimeview.c:274
+#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:630
 #: ../src/prefs_summary_column.c:85 ../src/summaryview.c:445
 msgid "Size"
 msgstr "Размер"
 
 #. Save Message to folder
-#: ../src/compose.c:7201
+#: ../src/compose.c:7205
 msgid "Save Message to "
 msgstr "Запазване на писмото в "
 
-#: ../src/compose.c:7238 ../src/editjpilot.c:276 ../src/editldap.c:520
+#: ../src/compose.c:7242 ../src/editjpilot.c:276 ../src/editldap.c:520
 #: ../src/editvcard.c:192 ../src/export.c:164 ../src/import.c:163
 #: ../src/importmutt.c:239 ../src/importpine.c:238
-#: ../src/plugins/archive/archiver_gtk.c:1028
+#: ../src/plugins/archive/archiver_gtk.c:1029
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:188
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:208
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:181
@@ -2349,24 +2468,23 @@ msgstr "Запазване на писмото в "
 msgid "_Browse"
 msgstr "_Разгледай"
 
-#: ../src/compose.c:7710
+#: ../src/compose.c:7714
 msgid "Hea_der"
 msgstr "_Заглавна част"
 
-#: ../src/compose.c:7715
+#: ../src/compose.c:7719
 msgid "_Attachments"
 msgstr "_Прикрепени файлове"
 
-#: ../src/compose.c:7729
+#: ../src/compose.c:7733
 msgid "Othe_rs"
 msgstr "_Други"
 
-#: ../src/compose.c:7744 ../src/gtk/headers.h:18
-#: ../src/plugins/pdf_viewer/poppler_viewer.c:702 ../src/summary_search.c:440
-msgid "Subject:"
-msgstr "Относно:"
+#: ../src/compose.c:7748
+msgid "_Subject:"
+msgstr "_Относно:"
 
-#: ../src/compose.c:7966
+#: ../src/compose.c:7970
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2375,20 +2493,20 @@ msgstr ""
 "Грешка при стартирането на проверката на правописа.\n"
 "%s"
 
-#: ../src/compose.c:8072
+#: ../src/compose.c:8076
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "От: <i>%s</i>"
 
-#: ../src/compose.c:8106
+#: ../src/compose.c:8119
 msgid "Account to use for this email"
 msgstr "Сметката, която искате да използвате за това писмо"
 
-#: ../src/compose.c:8108
+#: ../src/compose.c:8121
 msgid "Sender address to be used"
 msgstr "Използван адрес на подателя"
 
-#: ../src/compose.c:8272
+#: ../src/compose.c:8285
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2397,64 +2515,68 @@ msgstr ""
 "Грешка при зареждането на системата за поверителност '%s'. Вие няма да "
 "можете да подпишете или кодирате това писмо."
 
-#: ../src/compose.c:8372 ../src/plugins/archive/archiver_gtk.c:1082
+#: ../src/compose.c:8385 ../src/plugins/archive/archiver_gtk.c:1083
 msgid "_None"
 msgstr "_Без"
 
-#: ../src/compose.c:8473 ../src/prefs_template.c:753
+#: ../src/compose.c:8486 ../src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "В текста на шаблона има грешка на ред %d."
 
-#: ../src/compose.c:8589
+#: ../src/compose.c:8602
 msgid "Template From format error."
 msgstr ""
 
-#: ../src/compose.c:8607
+#: ../src/compose.c:8620
 msgid "Template To format error."
 msgstr ""
 
-#: ../src/compose.c:8625
+#: ../src/compose.c:8638
 msgid "Template Cc format error."
 msgstr ""
 
-#: ../src/compose.c:8643
+#: ../src/compose.c:8656
 msgid "Template Bcc format error."
 msgstr ""
 
-#: ../src/compose.c:8662
+#: ../src/compose.c:8674
+msgid "Template Reply-To format error."
+msgstr ""
+
+#: ../src/compose.c:8693
 msgid "Template subject format error."
 msgstr ""
 
-#: ../src/compose.c:8930
+#: ../src/compose.c:8961
 msgid "Invalid MIME type."
 msgstr "Неправилен вид по MIME"
 
-#: ../src/compose.c:8945
+#: ../src/compose.c:8976
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен."
 
-#: ../src/compose.c:9019
+#: ../src/compose.c:9050
 msgid "Properties"
 msgstr "Атрибути"
 
-#: ../src/compose.c:9036
+#: ../src/compose.c:9067
 msgid "MIME type"
 msgstr "Вид по MIME"
 
-#: ../src/compose.c:9077
+#: ../src/compose.c:9108
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: ../src/compose.c:9097
+#: ../src/compose.c:9128
 msgid "Path"
 msgstr "Път"
 
-#: ../src/compose.c:9098
+#: ../src/compose.c:9129
 msgid "File name"
 msgstr "Име на файла"
 
-#: ../src/compose.c:9290
+#: ../src/compose.c:9321
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2462,15 +2584,15 @@ msgid ""
 "process group id: %d"
 msgstr ""
 
-#: ../src/compose.c:9685 ../src/messageview.c:1095
+#: ../src/compose.c:9716 ../src/messageview.c:1095
 msgid "Claws Mail needs network access in order to send this email."
-msgstr ""
+msgstr "Claws Mail има нужда от достъп до мрежата, за да изпрати това писмо."
 
-#: ../src/compose.c:9711
+#: ../src/compose.c:9742
 msgid "Could not queue message."
 msgstr "Грешка при поставяне на писмото в изчакване."
 
-#: ../src/compose.c:9713
+#: ../src/compose.c:9744
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2481,116 +2603,116 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../src/compose.c:9891
+#: ../src/compose.c:9922
 msgid "Could not save draft."
 msgstr "Грешка при запис на черновата."
 
-#: ../src/compose.c:9895
+#: ../src/compose.c:9926
 msgid "Could not save draft"
 msgstr "Грешка при запис на черновата"
 
-#: ../src/compose.c:9896
+#: ../src/compose.c:9927
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
 msgstr ""
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Cancel exit"
 msgstr "_Отказ от излизане"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Discard email"
 msgstr "_Отхвърляне на писмото"
 
-#: ../src/compose.c:10058 ../src/compose.c:10072
+#: ../src/compose.c:10089 ../src/compose.c:10103
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: ../src/compose.c:10086
+#: ../src/compose.c:10117
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Файлът \"%s\" не може да бъде прочетен."
 
-#: ../src/compose.c:10088
+#: ../src/compose.c:10119
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 "for the current encoding, insertion may be incorrect."
 msgstr ""
 
-#: ../src/compose.c:10175
+#: ../src/compose.c:10206
 msgid "Discard message"
 msgstr "Отхвърляне на писмо"
 
-#: ../src/compose.c:10176
+#: ../src/compose.c:10207
 msgid "This message has been modified. Discard it?"
 msgstr "Писмото е променено. Да бъде ли отхвърлено?"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Discard"
 msgstr "_Отхвърляне"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Save to Drafts"
 msgstr "_Запазване в чернови"
 
-#: ../src/compose.c:10179
+#: ../src/compose.c:10210
 msgid "Save changes"
 msgstr "Запазване на промените"
 
-#: ../src/compose.c:10180
+#: ../src/compose.c:10211
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Писмото е променено. Да се запазят ли последните промени?"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "_Don't save"
 msgstr "_Да не се запазва"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "+_Save to Drafts"
 msgstr "+_Запазване в чернови"
 
-#: ../src/compose.c:10251
-#, fuzzy, c-format
+#: ../src/compose.c:10282
+#, c-format
 msgid "Do you want to apply the template '%s'?"
-msgstr "Наистина ли искате да приложите шаблона \"%s\"?"
+msgstr "Да се приложи ли шаблонът \"%s\"?"
 
-#: ../src/compose.c:10253
+#: ../src/compose.c:10284
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: ../src/compose.c:10254 ../src/prefs_actions.c:329
+#: ../src/compose.c:10285 ../src/prefs_actions.c:329
 #: ../src/prefs_filtering_action.c:610 ../src/prefs_filtering.c:477
-#: ../src/prefs_matcher.c:772 ../src/prefs_template.c:309
+#: ../src/prefs_matcher.c:775 ../src/prefs_template.c:311
 #: ../src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Замяна"
 
-#: ../src/compose.c:10254
+#: ../src/compose.c:10285
 msgid "_Insert"
 msgstr "_Вмъкване"
 
-#: ../src/compose.c:11141
+#: ../src/compose.c:11149
 msgid "Insert or attach?"
 msgstr "Вмъкване или прикрепяне?"
 
-#: ../src/compose.c:11142
+#: ../src/compose.c:11150
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr ""
 
-#: ../src/compose.c:11144
+#: ../src/compose.c:11152
 msgid "_Attach"
 msgstr "_Прикрепяне"
 
-#: ../src/compose.c:11361
+#: ../src/compose.c:11369
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Грешка при форматирането на кавички на ред %d."
 
-#: ../src/compose.c:11656
+#: ../src/compose.c:11664
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2692,7 +2814,7 @@ msgstr "Редактиране на личните данни"
 
 #: ../src/editaddress.c:785
 msgid "Choose a picture"
-msgstr "Избор на изображени"
+msgstr "Избор на изображение"
 
 #: ../src/editaddress.c:804
 #, c-format
@@ -2825,15 +2947,15 @@ msgstr "Редактиране на папка"
 msgid "Input the new name of folder:"
 msgstr "Въведете новото име на папката:"
 
-#: ../src/editgroup.c:556 ../src/foldersel.c:581 ../src/imap_gtk.c:195
+#: ../src/editgroup.c:556 ../src/foldersel.c:585 ../src/imap_gtk.c:195
 #: ../src/mh_gtk.c:145 ../src/plugins/mailmbox/plugin_gtk.c:239
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:89
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "New folder"
 msgstr "Нова папка"
 
-#: ../src/editgroup.c:557 ../src/foldersel.c:582 ../src/mh_gtk.c:146
+#: ../src/editgroup.c:557 ../src/foldersel.c:586 ../src/mh_gtk.c:146
 #: ../src/plugins/mailmbox/plugin_gtk.c:240
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:90
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Input the name of new folder:"
 msgstr "Въведете име за новата папка:"
 
@@ -3103,7 +3225,7 @@ msgstr "Наистина ли искате да изтриете всички е
 
 #: ../src/edittags.c:416
 msgid "You entered a reserved tag name, please choose another instead."
-msgstr ""
+msgstr "Въвели сте запазено име на етикет, моля използвайте друго."
 
 #: ../src/edittags.c:458
 msgid "Tag is not set."
@@ -3112,7 +3234,7 @@ msgstr "Етикетът не е указан."
 #: ../src/edittags.c:523
 msgctxt "Dialog title"
 msgid "Apply tags"
-msgstr ""
+msgstr "Прилагане на етикети"
 
 #: ../src/edittags.c:537
 msgid "New tag:"
@@ -3155,7 +3277,7 @@ msgid "File exported successfully."
 msgstr "Файлът е изнесен успешно."
 
 #: ../src/exphtmldlg.c:177
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The HTML output directory '%s'\n"
 "does not exist. Do you want to create it?"
@@ -3164,9 +3286,8 @@ msgstr ""
 "не съществува. Да бъде ли създадена?"
 
 #: ../src/exphtmldlg.c:180
-#, fuzzy
 msgid "Create directory"
-msgstr "Създаване на директория"
+msgstr "Създаване на папка"
 
 #: ../src/exphtmldlg.c:189
 #, c-format
@@ -3212,9 +3333,9 @@ msgstr "Стил"
 #. * can always get back the SummaryView pointer.
 #: ../src/exphtmldlg.c:453 ../src/gtk/colorlabel.c:406
 #: ../src/gtk/gtkaspell.c:1571 ../src/gtk/gtkaspell.c:2231
-#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1174
+#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1177
 #: ../src/plugins/archive/archiver_prefs.c:241
-#: ../src/plugins/libravatar/libravatar_prefs.c:187 ../src/prefs_account.c:949
+#: ../src/plugins/libravatar/libravatar_prefs.c:206 ../src/prefs_account.c:949
 #: ../src/prefs_toolbar.c:780 ../src/prefs_toolbar.c:1465
 #: ../src/summaryview.c:6008
 msgid "None"
@@ -3226,7 +3347,7 @@ msgid "Default"
 msgstr "По подразбиране"
 
 #: ../src/exphtmldlg.c:455 ../src/plugins/pgpcore/select-keys.c:244
-#: ../src/plugins/pgpcore/sgpgme.c:148
+#: ../src/plugins/pgpcore/sgpgme.c:148 ../src/plugins/pgpcore/sgpgme.c:164
 msgid "Full"
 msgstr "Пълно"
 
@@ -3411,7 +3532,7 @@ msgstr ""
 
 #: ../src/expldifdlg.c:558
 msgid "Exclude record if no Email Address"
-msgstr ""
+msgstr "Пропускане на записи без адреси на е-поща"
 
 #: ../src/expldifdlg.c:563
 msgid ""
@@ -3427,7 +3548,7 @@ msgstr "Изнасяне на адресника в LDIF-файл"
 msgid "Distinguished Name"
 msgstr "Характерно име (dn)"
 
-#: ../src/export.c:113 ../src/summaryview.c:8117
+#: ../src/export.c:113 ../src/summaryview.c:8120
 msgid "Export to mbox file"
 msgstr "Изнасяне в mbox-файл"
 
@@ -3464,7 +3585,7 @@ msgid "Full Name"
 msgstr "Пълно име"
 
 #: ../src/exporthtml.c:771 ../src/importldif.c:1022
-#: ../src/plugins/archive/archiver_gtk.c:736
+#: ../src/plugins/archive/archiver_gtk.c:737
 msgid "Attributes"
 msgstr "Атрибути"
 
@@ -3494,9 +3615,9 @@ msgid "The file %s is missing! Do you want to use the backup file from %s?"
 msgstr ""
 
 #: ../src/file_checker.c:84 ../src/file_checker.c:106
-#, fuzzy, c-format
+#, c-format
 msgid "Could not copy %s to %s"
-msgstr "Грешка при свързването към сървъра"
+msgstr "Грешка при копиране на %s в %s"
 
 #: ../src/file_checker.c:98
 #, c-format
@@ -3581,7 +3702,7 @@ msgstr ""
 
 #: ../src/filtering.c:773
 msgid "action could not apply\n"
-msgstr ""
+msgstr "действието не може да се приложи\n"
 
 #: ../src/filtering.c:775
 #, c-format
@@ -3589,9 +3710,9 @@ msgid "no further processing after action [ %s ]\n"
 msgstr ""
 
 #: ../src/filtering.c:826
-#, fuzzy, c-format
+#, c-format
 msgid "processing rule '%s' [ %s ]\n"
-msgstr "Изпълнение правилата за обработка"
+msgstr "правило за обработка '%s' [ %s ]\n"
 
 #: ../src/filtering.c:830
 #, c-format
@@ -3609,34 +3730,28 @@ msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr ""
 
 #: ../src/filtering.c:890
-#, fuzzy
 msgid "undetermined"
-msgstr "Неопределено"
+msgstr "неопределено"
 
 #: ../src/filtering.c:894
-#, fuzzy
 msgid "incorporation"
-msgstr "Настройка на действия за филтриране"
+msgstr "вмъкване"
 
 #: ../src/filtering.c:898
-#, fuzzy
 msgid "manually"
-msgstr "_Наръчник"
+msgstr "ръчно"
 
 #: ../src/filtering.c:902
-#, fuzzy
 msgid "folder processing"
-msgstr "При_лагане правилата за обработка"
+msgstr "обработка на папка"
 
 #: ../src/filtering.c:906
-#, fuzzy
 msgid "pre-processing"
-msgstr "Обработка пре_ди..."
+msgstr "обработка преди"
 
 #: ../src/filtering.c:910
-#, fuzzy
 msgid "post-processing"
-msgstr "Обработка _след..."
+msgstr "обработка след"
 
 #: ../src/filtering.c:927
 #, c-format
@@ -3651,7 +3766,7 @@ msgstr ""
 
 #: ../src/filtering.c:929 ../src/filtering.c:938
 msgid ": "
-msgstr ""
+msgstr ": "
 
 #: ../src/filtering.c:936
 #, c-format
@@ -3716,38 +3831,37 @@ msgstr ""
 msgid "Select folder"
 msgstr "Избор на папка"
 
-#: ../src/foldersel.c:583 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
+#: ../src/foldersel.c:587 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
 #: ../src/plugins/mailmbox/plugin_gtk.c:241
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: ../src/foldersel.c:591 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
+#: ../src/foldersel.c:595 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
 #: ../src/imap_gtk.c:272 ../src/imap_gtk.c:277 ../src/mh_gtk.c:155
 #: ../src/mh_gtk.c:259 ../src/news_gtk.c:315
 #: ../src/plugins/mailmbox/plugin_gtk.c:249
 #: ../src/plugins/mailmbox/plugin_gtk.c:416
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:97
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:339
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
 #: ../src/plugins/vcalendar/vcal_folder.c:2040
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "\"%c\" не може да присъства в име на папка."
 
-#: ../src/foldersel.c:601 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
+#: ../src/foldersel.c:605 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
 #: ../src/mh_gtk.c:165 ../src/mh_gtk.c:266 ../src/news_gtk.c:322
 #: ../src/plugins/mailmbox/plugin_gtk.c:261
 #: ../src/plugins/mailmbox/plugin_gtk.c:425
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:107
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:346
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:211
 #: ../src/plugins/vcalendar/vcal_folder.c:2047
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Папката \"%s\" вече съществува."
 
-#: ../src/foldersel.c:608 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
+#: ../src/foldersel.c:612 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
 #: ../src/plugins/mailmbox/plugin_gtk.c:268
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:113
+#: ../src/plugins/rssyl/opml_import.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:121
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Грешка при създаване на папката \"%s\"."
@@ -3760,7 +3874,7 @@ msgstr "Отбелязване на всички като про_четени"
 msgid "R_un processing rules"
 msgstr "Изпълнение правилата за обработка"
 
-#: ../src/folderview.c:233 ../src/mainwindow.c:544
+#: ../src/folderview.c:233 ../src/mainwindow.c:546
 msgid "_Search folder..."
 msgstr "_Търсене в папката..."
 
@@ -3779,7 +3893,7 @@ msgstr "Изпращане на _чакащите..."
 #. F_COL_FOLDER
 #: ../src/folderview.c:380 ../src/folderview.c:427
 #: ../src/plugins/notification/notification_lcdproc.c:141
-#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:388
+#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:391
 #: ../src/summaryview.c:6284
 msgid "New"
 msgstr "Нови"
@@ -3787,7 +3901,7 @@ msgstr "Нови"
 #. F_COL_NEW
 #: ../src/folderview.c:381 ../src/folderview.c:428
 #: ../src/plugins/notification/notification_lcdproc.c:145
-#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:387
+#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:390
 #: ../src/summaryview.c:6286
 msgid "Unread"
 msgstr "Непрочетени"
@@ -3809,27 +3923,26 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Задаване данни за папката..."
 
-#: ../src/folderview.c:823 ../src/summaryview.c:4117 ../src/summaryview.c:4119
+#: ../src/folderview.c:823 ../src/summaryview.c:4119 ../src/summaryview.c:4121
 msgid "Mark all as read"
 msgstr "Отбелязване на всички като прочетени"
 
-#: ../src/folderview.c:824 ../src/summaryview.c:4118
-#, fuzzy
+#: ../src/folderview.c:824 ../src/summaryview.c:4120
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 "Наистина ли искате да отбележите всички писма в тази папка като прочетени?"
 
-#: ../src/folderview.c:982 ../src/imap.c:4528 ../src/mainwindow.c:5134
+#: ../src/folderview.c:982 ../src/imap.c:4574 ../src/mainwindow.c:5157
 #: ../src/setup.c:91
-#, fuzzy, c-format
+#, c-format
 msgid "Scanning folder %s%c%s..."
-msgstr "Претърсване на папка %s%c%s·..."
+msgstr "Претърсване на папка %s%c%s..."
 
-#: ../src/folderview.c:986 ../src/imap.c:4533 ../src/mainwindow.c:5139
+#: ../src/folderview.c:986 ../src/imap.c:4579 ../src/mainwindow.c:5162
 #: ../src/setup.c:96
-#, fuzzy, c-format
+#, c-format
 msgid "Scanning folder %s..."
-msgstr "Претърсване на папка %s ..."
+msgstr "Претърсване на папка %s..."
 
 #: ../src/folderview.c:1017
 msgid "Rebuild folder tree"
@@ -3859,60 +3972,60 @@ msgstr "Папката %s не може да бъде претърсена\n"
 msgid "Checking for new messages in all folders..."
 msgstr "Проверка за нови писма във всички папки..."
 
-#: ../src/folderview.c:2005
-#, fuzzy, c-format
+#: ../src/folderview.c:2046
+#, c-format
 msgid "Closing folder %s..."
 msgstr "Затваряне на папка %s..."
 
 #. Open Folder
 #. TODO: wwp: avoid displaying (null) in the status bar
-#: ../src/folderview.c:2100
-#, fuzzy, c-format
+#: ../src/folderview.c:2141
+#, c-format
 msgid "Opening folder %s..."
 msgstr "Отваряне на папка %s..."
 
-#: ../src/folderview.c:2118
+#: ../src/folderview.c:2159
 msgid "Folder could not be opened."
 msgstr "Папката не може да бъде отворена."
 
-#: ../src/folderview.c:2261 ../src/mainwindow.c:2877 ../src/mainwindow.c:2881
+#: ../src/folderview.c:2302 ../src/mainwindow.c:2887 ../src/mainwindow.c:2891
 msgid "Empty trash"
 msgstr "Изчистване на кошчето"
 
-#: ../src/folderview.c:2262
+#: ../src/folderview.c:2303
 msgid "Delete all messages in trash?"
 msgstr "Да се изтрият ли всички писма от кошчето?"
 
-#: ../src/folderview.c:2263
+#: ../src/folderview.c:2304
 msgid "+_Empty trash"
 msgstr "+_Изчистване на кошчето"
 
-#: ../src/folderview.c:2307 ../src/inc.c:1540 ../src/toolbar.c:2607
+#: ../src/folderview.c:2348 ../src/inc.c:1540 ../src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Предупреждение за изключен режим"
 
-#: ../src/folderview.c:2308 ../src/toolbar.c:2608
+#: ../src/folderview.c:2349 ../src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Работите в изключен режим. Да се превключи ли?"
 
-#: ../src/folderview.c:2319 ../src/toolbar.c:2627
+#: ../src/folderview.c:2360 ../src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Изпращане на чакащите писма"
 
-#: ../src/folderview.c:2320 ../src/toolbar.c:2628
+#: ../src/folderview.c:2361 ../src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Да се изпратят ли всички писма от опашката?"
 
-#: ../src/folderview.c:2321 ../src/messageview.c:854 ../src/messageview.c:871
+#: ../src/folderview.c:2362 ../src/messageview.c:854 ../src/messageview.c:871
 #: ../src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Изпращане"
 
-#: ../src/folderview.c:2329 ../src/toolbar.c:2647
+#: ../src/folderview.c:2370 ../src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Грешка при изпращането на чакащите писма."
 
-#: ../src/folderview.c:2332 ../src/main.c:2714 ../src/toolbar.c:2650
+#: ../src/folderview.c:2373 ../src/main.c:2714 ../src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3921,65 +4034,65 @@ msgstr ""
 "Грешка при изпращането на чакащите писма:\n"
 "%s"
 
-#: ../src/folderview.c:2409
-#, fuzzy, c-format
+#: ../src/folderview.c:2450
+#, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Наистина ли искате да копирате папката \"%s\" в \"%s\"?"
 
-#: ../src/folderview.c:2410
-#, fuzzy, c-format
+#: ../src/folderview.c:2451
+#, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Наистина ли искате да направите \"%s\" подпапка на \"%s\"?"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Copy folder"
 msgstr "Копиране на папка"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Move folder"
 msgstr "Преместване на папка"
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Копиране на %s в %s..."
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Преместване на %s в %s..."
 
-#: ../src/folderview.c:2454
+#: ../src/folderview.c:2495
 msgid "Source and destination are the same."
-msgstr ""
+msgstr "Източникът и целта са едни и същи."
 
-#: ../src/folderview.c:2457
+#: ../src/folderview.c:2498
 msgid "Can't copy a folder to one of its children."
-msgstr ""
+msgstr "Не можете да копирате папка в нейна дъщерна."
 
-#: ../src/folderview.c:2458
+#: ../src/folderview.c:2499
 msgid "Can't move a folder to one of its children."
-msgstr ""
+msgstr "Не можете да премествате папка в нейна дъщерна."
 
-#: ../src/folderview.c:2461
+#: ../src/folderview.c:2502
 msgid "A folder cannot be moved between different mailboxes."
-msgstr ""
+msgstr "Не можете да премествате папки между различни пощенски кутии."
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Copy failed!"
 msgstr "Грешка при копирането!"
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Move failed!"
 msgstr "Грешка при преместването!"
 
-#: ../src/folderview.c:2515
+#: ../src/folderview.c:2556
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Обработка на настройките за папка \"%s\""
 
-#: ../src/folderview.c:2943 ../src/summaryview.c:4558
-#: ../src/summaryview.c:4657
+#: ../src/folderview.c:2984 ../src/summaryview.c:4560
+#: ../src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Целевата папка може да съдържа само подпапки."
 
@@ -4054,7 +4167,6 @@ msgid ""
 msgstr ""
 
 #: ../src/gtk/about.c:143
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -4074,6 +4186,11 @@ msgid ""
 "The Claws Mail Team\n"
 " and Hiroyuki Yamamoto"
 msgstr ""
+"\n"
+"\n"
+"Copyright (C) 1999-2014\n"
+"Екипът на Claws Mail\n"
+" и Hiroyuki Yamamoto"
 
 #: ../src/gtk/about.c:162
 msgid ""
@@ -4153,22 +4270,23 @@ msgstr "Компилирани възможности\n"
 #: ../src/gtk/about.c:421
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
-msgstr ""
+msgstr "добавяне на поддръжка за заглавката X-Face\n"
 
 #: ../src/gtk/about.c:431
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
-msgstr ""
+msgstr "добавяне на поддръжка за проверка на правописа\n"
 
 #: ../src/gtk/about.c:441
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
-msgstr ""
+msgstr "добавяне на поддръжка за шифрирани връзки към сървърите\n"
 
 #: ../src/gtk/about.c:451
 msgctxt "IPv6"
 msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
 msgstr ""
+"добавяне на поддръжка за IPv6 адреси, новият протокол за адреси в Интернет\n"
 
 #: ../src/gtk/about.c:462
 msgctxt "iconv"
@@ -4178,27 +4296,27 @@ msgstr ""
 #: ../src/gtk/about.c:472
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
-msgstr ""
+msgstr "добавяне на поддръжка за адресници на PalmOS\n"
 
 #: ../src/gtk/about.c:482
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
-msgstr ""
+msgstr "добавяне на поддръжка за споделени адресници в LDAP\n"
 
 #: ../src/gtk/about.c:492
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
-msgstr ""
+msgstr "добавяне на поддръжка за сървъри IMAP и NNTP\n"
 
 #: ../src/gtk/about.c:502
 msgctxt "libSM"
 msgid "adds support for session handling\n"
-msgstr ""
+msgstr "добавяне на поддръжка за управление на сесиите\n"
 
 #: ../src/gtk/about.c:512
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
-msgstr ""
+msgstr "добавяне на поддръжка за откриване на промени в свързаността\n"
 
 #: ../src/gtk/about.c:544
 msgid ""
@@ -4208,6 +4326,11 @@ msgid ""
 "version.\n"
 "\n"
 msgstr ""
+"Тази програма е свободен софтуер. Можете да я разпространявате и/или "
+"променяте под условията на Общия публичен лиценз на GNU (GNU GPL), както е "
+"публикуван от Фондацията за свободен софтуер — версия 3 на лиценза или (по "
+"ваше решение) по-късна версия.\n"
+"\n"
 
 #: ../src/gtk/about.c:550
 msgid ""
@@ -4217,12 +4340,18 @@ msgid ""
 "more details.\n"
 "\n"
 msgstr ""
+"Тази програма се разпространява с надеждата, че ще бъде полезна, но БЕЗ "
+"НИКАКВИ ГАРАНЦИИ, дори и косвените за ПРОДАЖБА или СЪОТВЕТСТВИЕ С КАКВАТО И "
+"ДА Е УПОТРЕБА. За подробности погледнете Общия публичен лиценз на GNU.\n"
+"\n"
 
 #: ../src/gtk/about.c:568
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see <"
 msgstr ""
+"Трябва да сте получили копие от Общия публичен лиценз на GNU (GNU GPL) "
+"заедно с тази програма Ако не сте, погледнете <"
 
 #: ../src/gtk/about.c:573
 msgid ""
@@ -4233,50 +4362,50 @@ msgstr ""
 "\n"
 
 #: ../src/gtk/about.c:699 ../src/main.c:2538
-#, fuzzy, c-format
+#, c-format
 msgid "Session statistics\n"
-msgstr "Сесията изтече\n"
+msgstr "Статистика на сесия\n"
 
 #: ../src/gtk/about.c:709 ../src/gtk/about.c:712 ../src/main.c:2548
 #: ../src/main.c:2551
-#, fuzzy, c-format
+#, c-format
 msgid "Started: %s\n"
-msgstr "пиши в fd%d: %s\n"
+msgstr "Започнато: %s\n"
 
 #: ../src/gtk/about.c:719 ../src/main.c:2557
 #, c-format
 msgid "Incoming traffic\n"
-msgstr ""
+msgstr "Входящ трафик\n"
 
 #: ../src/gtk/about.c:722 ../src/main.c:2560
-#, fuzzy, c-format
+#, c-format
 msgid "Received messages: %d\n"
-msgstr "изтрити писма"
+msgstr "Получени писма: %d\n"
 
 #: ../src/gtk/about.c:729 ../src/main.c:2566
 #, c-format
 msgid "Outgoing traffic\n"
-msgstr ""
+msgstr "Изходящ трафик\n"
 
 #: ../src/gtk/about.c:732 ../src/main.c:2569
-#, fuzzy, c-format
+#, c-format
 msgid "New/redirected messages: %d\n"
-msgstr "Филтриране на из_браните писма"
+msgstr "Нови и препратени писма: %d\n"
 
 #: ../src/gtk/about.c:737 ../src/main.c:2573
-#, fuzzy, c-format
+#, c-format
 msgid "Replied messages: %d\n"
-msgstr "изтрити писма"
+msgstr "Отговорени писма: %d\n"
 
 #: ../src/gtk/about.c:742 ../src/main.c:2577
-#, fuzzy, c-format
+#, c-format
 msgid "Forwarded messages: %d\n"
-msgstr "препратени писма"
+msgstr "Препратени писма: %d\n"
 
 #: ../src/gtk/about.c:747 ../src/main.c:2581
-#, fuzzy, c-format
+#, c-format
 msgid "Total outgoing messages: %d\n"
-msgstr "Филтриране на писмата...\n"
+msgstr "Общо изходящи писма: %d\n"
 
 #: ../src/gtk/about.c:774
 msgid "About Claws Mail"
@@ -4288,6 +4417,9 @@ msgid ""
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
+"Copyright (C) 1999-2014\n"
+"Екипът на Claws Mail\n"
+"и Hiroyuki Yamamoto"
 
 #: ../src/gtk/about.c:846
 msgid "_Info"
@@ -4311,7 +4443,7 @@ msgstr "_Бележки по изданието"
 
 #: ../src/gtk/about.c:878
 msgid "_Statistics"
-msgstr ""
+msgstr "_Статистика"
 
 #: ../src/gtk/colorlabel.c:38 ../src/prefs_common.c:360
 msgid "Orange"
@@ -4371,40 +4503,37 @@ msgstr "Яркозелено"
 
 #: ../src/gtk/colorlabel.c:52 ../src/prefs_common.c:416
 msgid "Magenta"
-msgstr ""
+msgstr "Пурпурно"
 
 #: ../src/gtk/foldersort.c:156
-#, fuzzy
 msgid "Set mailbox order"
-msgstr "Задаване реда на подреждане на папките"
+msgstr "Подреждане на папките"
 
 #: ../src/gtk/foldersort.c:190
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
 
 #: ../src/gtk/foldersort.c:216
-#, fuzzy
 msgid "Mailboxes"
-msgstr "Пощенска кутия"
+msgstr "Пощенски кутии"
 
 #: ../src/gtk/gtkaspell.c:341 ../src/gtk/gtkaspell.c:660
 msgid "No dictionary selected."
 msgstr "Не е избран речник"
 
 #: ../src/gtk/gtkaspell.c:365 ../src/gtk/gtkaspell.c:395
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't initialize %s speller."
-msgstr "Грешка при отваряне на файла %s."
+msgstr ""
 
 #: ../src/gtk/gtkaspell.c:707
-#, fuzzy
 msgid "Couldn't initialize Enchant broker."
-msgstr "Грешка при отваряне на файла %s."
+msgstr ""
 
 #: ../src/gtk/gtkaspell.c:713
 #, c-format
 msgid "Couldn't initialize %s dictionary:"
-msgstr "Грешка при цареждане на речника %s:"
+msgstr "Грешка при зареждане на речника %s:"
 
 #: ../src/gtk/gtkaspell.c:1070
 msgid "No misspelled word found."
@@ -4426,9 +4555,8 @@ msgid ""
 msgstr ""
 
 #: ../src/gtk/gtkaspell.c:1800
-#, fuzzy
 msgid "Change to..."
-msgstr "Промяна на оценката"
+msgstr "Промяна на..."
 
 #: ../src/gtk/gtkaspell.c:1811 ../src/gtk/gtkaspell.c:1949
 msgid "More..."
@@ -4498,92 +4626,91 @@ msgstr ""
 
 #: ../src/gtk/gtkutils.c:1907
 msgid "Failed."
-msgstr ""
+msgstr "Неуспех."
 
 #: ../src/gtk/gtkutils.c:1970
-#, fuzzy
 msgid "Configuring..."
-msgstr "_Настройки"
+msgstr "Настройване..."
 
 #. RFC2822
 #. S_COL_TO
 #. date expression
 #. S_COL_TO
-#: ../src/gtk/headers.h:8 ../src/prefs_filtering_action.c:1259
-#: ../src/prefs_matcher.c:2158 ../src/prefs_summary_column.c:84
+#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1259
+#: ../src/prefs_matcher.c:2174 ../src/prefs_summary_column.c:84
 #: ../src/quote_fmt.c:49 ../src/summaryview.c:444
 msgid "Date"
 msgstr "Дата"
 
-#: ../src/gtk/headers.h:8
+#: ../src/gtk/headers.h:9
 msgid "Date:"
 msgstr "Дата:"
 
 #. S_COL_SUBJECT
 #. date
 #. S_COL_SUBJECT
-#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1256
-#: ../src/prefs_matcher.c:2155 ../src/prefs_summary_column.c:82
+#: ../src/gtk/headers.h:10 ../src/prefs_filtering_action.c:1256
+#: ../src/prefs_matcher.c:2171 ../src/prefs_summary_column.c:82
 #: ../src/quote_fmt.c:50 ../src/summaryview.c:442
 msgid "From"
 msgstr "От"
 
-#: ../src/gtk/headers.h:9 ../src/summary_search.c:426
+#: ../src/gtk/headers.h:10 ../src/summary_search.c:426
 msgid "From:"
 msgstr "От:"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender"
 msgstr "Подател"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender:"
 msgstr "Подател:"
 
-#: ../src/gtk/headers.h:11
+#: ../src/gtk/headers.h:12
 msgid "Reply-To"
 msgstr "Отговор на"
 
 #. S_COL_FROM
 #. subject
 #. S_COL_FROM
-#: ../src/gtk/headers.h:12 ../src/prefs_filtering_action.c:1257
-#: ../src/prefs_matcher.c:2156 ../src/prefs_summary_column.c:83
+#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1257
+#: ../src/prefs_matcher.c:2172 ../src/prefs_summary_column.c:83
 #: ../src/quote_fmt.c:57 ../src/summaryview.c:443
 msgid "To"
 msgstr "До"
 
 #. to
-#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1258
-#: ../src/prefs_matcher.c:2157 ../src/quote_fmt.c:58
+#: ../src/gtk/headers.h:14 ../src/prefs_filtering_action.c:1258
+#: ../src/prefs_matcher.c:2173 ../src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Копие"
 
-#: ../src/gtk/headers.h:14
+#: ../src/gtk/headers.h:15
 msgid "Bcc"
 msgstr "Скрито копие"
 
 #. references
-#: ../src/gtk/headers.h:15 ../src/prefs_filtering_action.c:1260
-#: ../src/prefs_matcher.c:2159 ../src/quote_fmt.c:61
+#: ../src/gtk/headers.h:16 ../src/prefs_filtering_action.c:1260
+#: ../src/prefs_matcher.c:2175 ../src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Message-ID"
 
-#: ../src/gtk/headers.h:15
+#: ../src/gtk/headers.h:16
 msgid "Message-ID:"
 msgstr "Message-ID:"
 
-#: ../src/gtk/headers.h:16
+#: ../src/gtk/headers.h:17
 msgid "In-Reply-To"
 msgstr "В отговор на:"
 
 #. newsgroups
-#: ../src/gtk/headers.h:17 ../src/prefs_filtering_action.c:1262
-#: ../src/prefs_matcher.c:2161 ../src/quote_fmt.c:60
+#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1262
+#: ../src/prefs_matcher.c:2177 ../src/quote_fmt.c:60
 msgid "References"
 msgstr ""
 
-#: ../src/gtk/headers.h:17
+#: ../src/gtk/headers.h:18
 msgid "References:"
 msgstr "References:"
 
@@ -4591,328 +4718,333 @@ msgstr "References:"
 #. initial of sender
 #. S_COL_STATUS
 #. S_COL_MIME
-#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1255
-#: ../src/prefs_matcher.c:2154 ../src/prefs_summary_column.c:81
+#: ../src/gtk/headers.h:19 ../src/prefs_filtering_action.c:1255
+#: ../src/prefs_matcher.c:2170 ../src/prefs_summary_column.c:81
 #: ../src/quote_fmt.c:56 ../src/summaryview.c:441
 msgid "Subject"
 msgstr "Относно"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:19 ../src/plugins/pdf_viewer/poppler_viewer.c:702
+#: ../src/summary_search.c:440
+msgid "Subject:"
+msgstr "Относно:"
+
+#: ../src/gtk/headers.h:20
 msgid "Comments"
 msgstr "Коментари"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:20
 msgid "Comments:"
 msgstr "Коментари:"
 
-#: ../src/gtk/headers.h:20
+#: ../src/gtk/headers.h:21
 msgid "Keywords"
 msgstr "Ключови думи"
 
-#: ../src/gtk/headers.h:20 ../src/plugins/pdf_viewer/poppler_viewer.c:704
+#: ../src/gtk/headers.h:21 ../src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Keywords:"
 msgstr "Ключови думи:"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date"
 msgstr "Resent-Date"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date:"
 msgstr "Resent-Date:"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From"
 msgstr "Resent-From"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From:"
 msgstr "Resent-From:"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender"
 msgstr "Resent-Sender"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender:"
 msgstr "Resent-Sender:"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To"
 msgstr "Resent-To"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To:"
 msgstr "Resent-To:"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc"
 msgstr "Resent-Cc"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc:"
 msgstr "Resent-Cc:"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc"
 msgstr "Resent-Bcc"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc:"
 msgstr "Resent-Bcc:"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID"
 msgstr "Resent-Message-ID"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID:"
 msgstr "Resent-Message-ID:"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path"
 msgstr "Return-Path"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path:"
 msgstr "Return-Path:"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received"
 msgstr "Получено"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received:"
 msgstr "Получено:"
 
 #. more
 #. cc
-#: ../src/gtk/headers.h:32 ../src/prefs_filtering_action.c:1261
-#: ../src/prefs_matcher.c:2160 ../src/quote_fmt.c:59
+#: ../src/gtk/headers.h:33 ../src/prefs_filtering_action.c:1261
+#: ../src/prefs_matcher.c:2176 ../src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Новинарски групи"
 
-#: ../src/gtk/headers.h:33
+#: ../src/gtk/headers.h:34
 msgid "Followup-To"
 msgstr "Followup-To"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To"
 msgstr "Delivered-To"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To:"
 msgstr "Delivered-To:"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen"
 msgstr "Seen"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen:"
 msgstr "Seen:"
 
 #. S_COL_MARK
-#: ../src/gtk/headers.h:36 ../src/gtk/progressdialog.c:149
+#: ../src/gtk/headers.h:37 ../src/gtk/progressdialog.c:149
 #: ../src/gtk/sslcertwindow.c:164 ../src/prefs_summary_column.c:79
 #: ../src/summaryview.c:2793
 msgid "Status"
 msgstr "Състояние"
 
-#: ../src/gtk/headers.h:36 ../src/prefs_themes.c:906
+#: ../src/gtk/headers.h:37 ../src/prefs_themes.c:906
 msgid "Status:"
 msgstr "Състояние:"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face"
 msgstr "Лице"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face:"
 msgstr "Лице:"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To"
 msgstr "Disposition-Notification-To"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To:"
 msgstr "Disposition-Notification-To:"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To"
 msgstr "Return-Receipt-To"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To:"
 msgstr "Return-Receipt-To:"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent"
 msgstr "User-Agent"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent:"
 msgstr "User-Agent:"
 
-#: ../src/gtk/headers.h:41
+#: ../src/gtk/headers.h:42
 msgid "Content-Type"
 msgstr "Content-Type"
 
-#: ../src/gtk/headers.h:41 ../src/image_viewer.c:327
+#: ../src/gtk/headers.h:42 ../src/image_viewer.c:327
 msgid "Content-Type:"
 msgstr "Content-Type:"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding"
 msgstr "Content-Transfer-Encoding"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding:"
 msgstr "Content-Transfer-Encoding:"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version"
 msgstr "Версия по MIME"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version:"
 msgstr "Версия по MIME:"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence"
 msgstr "Precedence"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence:"
 msgstr "Precedence:"
 
-#: ../src/gtk/headers.h:45 ../src/prefs_account.c:1073
+#: ../src/gtk/headers.h:46 ../src/prefs_account.c:1073
 msgid "Organization"
 msgstr "Организация"
 
-#: ../src/gtk/headers.h:45
+#: ../src/gtk/headers.h:46
 msgid "Organization:"
 msgstr "Организация:"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List"
 msgstr "Mailing-List"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List:"
 msgstr "Mailing-List:"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post"
 msgstr "List-Post"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post:"
 msgstr "List-Post:"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe"
 msgstr "List-Subscribe"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe:"
 msgstr "List-Subscribe:"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe"
 msgstr "List-Unsubscribe"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe:"
 msgstr "List-Unsubscribe:"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help"
 msgstr "List-Help"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help:"
 msgstr "List-Help:"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive"
 msgstr "List-Archive"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive:"
 msgstr "List-Archive:"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner"
 msgstr "List-Owner"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner:"
 msgstr "List-Owner:"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label"
 msgstr "X-Label"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label:"
 msgstr "X-Label:"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer"
 msgstr "X-Mailer"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer:"
 msgstr "X-Mailer:"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status"
 msgstr "X-Status"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status:"
 msgstr "X-Status:"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face"
 msgstr "X-Face"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face:"
 msgstr "X-Face:"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive"
 msgstr "X-No-Archive"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive:"
 msgstr "X-No-Archive:"
 
 #. some common logical names referring to real header names
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to"
 msgstr "В отговор на"
 
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to:"
 msgstr "В отговор на:"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc"
 msgstr "До или Копие"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc:"
 msgstr "До или Копие:"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject"
 msgstr "От, До или Относно"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject:"
 msgstr "От, До или Относно:"
 
@@ -4934,9 +5066,8 @@ msgid "Message has been forwarded"
 msgstr "Писмото е препратено"
 
 #: ../src/gtk/icon_legend.c:68
-#, fuzzy
 msgid "Message has been forwarded and replied to"
-msgstr "На писмото е отговорено"
+msgstr "На писмото е отговорено и е препратено"
 
 #: ../src/gtk/icon_legend.c:69
 msgid "Message is in an ignored thread"
@@ -5099,10 +5230,10 @@ msgstr ""
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:457
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:400
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:550
-#: ../src/plugins/fancy/fancy_prefs.c:109
+#: ../src/plugins/fancy/fancy_prefs.c:114
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:178
 #: ../src/plugins/gdata/cm_gdata_prefs.c:145
-#: ../src/plugins/libravatar/libravatar_prefs.c:399
+#: ../src/plugins/libravatar/libravatar_prefs.c:439
 #: ../src/plugins/notification/notification_prefs.c:396
 #: ../src/plugins/notification/notification_prefs.c:410
 #: ../src/plugins/notification/notification_prefs.c:428
@@ -5112,9 +5243,9 @@ msgstr ""
 #: ../src/plugins/notification/notification_prefs.c:496
 #: ../src/plugins/notification/notification_prefs.c:513
 #: ../src/plugins/pgpcore/prefs_gpg.c:569
-#: ../src/plugins/rssyl/rssyl_prefs.c:65
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
+#: ../src/plugins/rssyl/rssyl_prefs.c:69
 #: ../src/plugins/spam_report/spam_report_prefs.c:79
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
 #: ../src/plugins/vcalendar/vcal_prefs.c:680 ../src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Приставки"
@@ -5154,7 +5285,7 @@ msgstr "Заредени приставки"
 msgid "Page Index"
 msgstr ""
 
-#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:828
+#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:831
 msgid "_Hide"
 msgstr "С_криване"
 
@@ -5167,75 +5298,74 @@ msgstr "С_криване"
 msgid "Account"
 msgstr "Сметка"
 
-#: ../src/gtk/quicksearch.c:452
+#: ../src/gtk/quicksearch.c:451
 msgid "all messages"
 msgstr "всички писма"
 
-#: ../src/gtk/quicksearch.c:453
-#, fuzzy
+#: ../src/gtk/quicksearch.c:452
 msgid "messages whose age is greater than # days"
-msgstr "писма, по-стари от #"
+msgstr "писма, по-стари от # дни"
 
-#: ../src/gtk/quicksearch.c:454
-#, fuzzy
+#: ../src/gtk/quicksearch.c:453
 msgid "messages whose age is less than # days"
-msgstr "писма, по-нови от #"
+msgstr "писма, по-нови от # дни"
 
-#: ../src/gtk/quicksearch.c:455
-#, fuzzy
+#: ../src/gtk/quicksearch.c:454
 msgid "messages whose age is greater than # hours"
-msgstr "писма, по-стари от #"
+msgstr "писма, по-стари от # часа"
 
-#: ../src/gtk/quicksearch.c:456
-#, fuzzy
+#: ../src/gtk/quicksearch.c:455
 msgid "messages whose age is less than # hours"
-msgstr "писма, по-нови от #"
+msgstr "писма, по-нови от # часа"
 
-#: ../src/gtk/quicksearch.c:457
+#: ../src/gtk/quicksearch.c:456
 msgid "messages which contain S in the message body"
 msgstr "писма, съдържащи S в текста"
 
-#: ../src/gtk/quicksearch.c:458
+#: ../src/gtk/quicksearch.c:457
 msgid "messages which contain S in the whole message"
 msgstr "писма, съдържащи S в цялото съобщение"
 
-#: ../src/gtk/quicksearch.c:459
+#: ../src/gtk/quicksearch.c:458
 msgid "messages carbon-copied to S"
 msgstr "писма с копие до S"
 
-#: ../src/gtk/quicksearch.c:460
+#: ../src/gtk/quicksearch.c:459
 msgid "message is either to: or cc: to S"
 msgstr "писма с копие или скрито копие до S"
 
-#: ../src/gtk/quicksearch.c:461
+#: ../src/gtk/quicksearch.c:460
 msgid "deleted messages"
 msgstr "изтрити писма"
 
 #. * how I can filter deleted messages *
-#: ../src/gtk/quicksearch.c:462
+#: ../src/gtk/quicksearch.c:461
 msgid "messages which contain S in the Sender field"
 msgstr "писма, съдържащи S в полето за подател"
 
-#: ../src/gtk/quicksearch.c:463
+#: ../src/gtk/quicksearch.c:462
 msgid "true if execute \"S\" succeeds"
 msgstr ""
 
-#: ../src/gtk/quicksearch.c:464
+#: ../src/gtk/quicksearch.c:463
 msgid "messages originating from user S"
 msgstr "писма, изпратени от потребител S"
 
-#: ../src/gtk/quicksearch.c:465
+#: ../src/gtk/quicksearch.c:464
 msgid "forwarded messages"
 msgstr "препратени писма"
 
-#: ../src/gtk/quicksearch.c:466
-#, fuzzy
+#: ../src/gtk/quicksearch.c:465
 msgid "messages which have attachments"
-msgstr "писма, които имат етикет(и)"
+msgstr "писма, които имат прикрепки"
+
+#: ../src/gtk/quicksearch.c:466
+msgid "messages which contain S in any header name or value"
+msgstr "писма, съдържащи S в името или стойността на която и да е заглавка"
 
 #: ../src/gtk/quicksearch.c:467
-msgid "messages which contain header S"
-msgstr "писма, съдържащи заглавка S"
+msgid "messages which contain S in the value of any header"
+msgstr "писма, съдържащи S в стойността на която и да е заглавка"
 
 #: ../src/gtk/quicksearch.c:468
 msgid "messages which contain S in Message-ID header"
@@ -5270,9 +5400,8 @@ msgid "incomplete messages (not entirely downloaded)"
 msgstr "непълни писма (частично изтеглени)"
 
 #: ../src/gtk/quicksearch.c:476
-#, fuzzy
 msgid "messages which you have replied to"
-msgstr "писма, на които е било отговорено"
+msgstr "писма, на които сте отговорили"
 
 #: ../src/gtk/quicksearch.c:477
 msgid "read messages"
@@ -5283,34 +5412,28 @@ msgid "messages which contain S in subject"
 msgstr "писма, съдържащи S в полето за заглавие"
 
 #: ../src/gtk/quicksearch.c:479
-#, fuzzy
 msgid "messages whose score is equal to # points"
-msgstr "писма с размер, равен на #"
+msgstr "писма с размер, равен на # точки"
 
 #: ../src/gtk/quicksearch.c:480
-#, fuzzy
 msgid "messages whose score is greater than # points"
-msgstr "писма, чиято оценка е по-голяма от #"
+msgstr "писма, чиято оценка е по-голяма от # точки"
 
 #: ../src/gtk/quicksearch.c:481
-#, fuzzy
 msgid "messages whose score is lower than # points"
-msgstr "писма, чиято оценка е по-голяма от #"
+msgstr "писма, чиято оценка е по-голяма от # точки"
 
 #: ../src/gtk/quicksearch.c:482
-#, fuzzy
 msgid "messages whose size is equal to # bytes"
-msgstr "писма с размер, равен на #"
+msgstr "писма с размер, равен на # байта"
 
 #: ../src/gtk/quicksearch.c:483
-#, fuzzy
 msgid "messages whose size is greater than # bytes"
-msgstr "писма с размер, по-голям от #"
+msgstr "писма с размер, по-голям от # байта"
 
 #: ../src/gtk/quicksearch.c:484
-#, fuzzy
 msgid "messages whose size is smaller than # bytes"
-msgstr "писма с размер, по-малък от #"
+msgstr "писма с размер, по-малък от # байта"
 
 #: ../src/gtk/quicksearch.c:485
 msgid "messages which have been sent to S"
@@ -5382,7 +5505,7 @@ msgstr ""
 
 #: ../src/gtk/quicksearch.c:610
 msgid "Something went wrong during search. Please check your logs."
-msgstr ""
+msgstr "Получи се грешка при търсенето. Проверете журналните файлове."
 
 #: ../src/gtk/quicksearch.c:676
 msgid "From/To/Subject/Tag"
@@ -5417,20 +5540,18 @@ msgid "Information about extended symbols"
 msgstr "Подробности за допълнителните символи"
 
 #: ../src/gtk/quicksearch.c:817 ../src/gtk/quicksearch.c:832
-#, fuzzy
 msgid "_Information"
-msgstr "Данни"
+msgstr "_Данни"
 
 #: ../src/gtk/quicksearch.c:818 ../src/gtk/quicksearch.c:833
 msgid "E_dit"
-msgstr ""
+msgstr "Ре_дактиране"
 
 #: ../src/gtk/quicksearch.c:819 ../src/gtk/quicksearch.c:834
 #: ../src/prefs_actions.c:347 ../src/prefs_filtering.c:495
-#: ../src/prefs_template.c:328
-#, fuzzy
+#: ../src/prefs_template.c:330
 msgid "C_lear"
-msgstr "Изчистване"
+msgstr "_Изчистване"
 
 #: ../src/gtk/sslcertwindow.c:157 ../src/gtk/sslcertwindow.c:348
 #: ../src/gtk/sslcertwindow.c:398 ../src/gtk/sslcertwindow.c:462
@@ -5484,13 +5605,13 @@ msgid ""
 msgstr ""
 
 #: ../src/gtk/sslcertwindow.c:338
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
 "%sDo you want to accept it?"
 msgstr ""
 "Сертификатът за %s е непознат.\n"
-"Да бъде ли приет?"
+"%sДа бъде ли приет?"
 
 #: ../src/gtk/sslcertwindow.c:350 ../src/gtk/sslcertwindow.c:400
 #: ../src/gtk/sslcertwindow.c:464
@@ -5503,14 +5624,12 @@ msgid "_View certificate"
 msgstr "_Преглед на сертификата"
 
 #: ../src/gtk/sslcertwindow.c:364
-#, fuzzy
 msgid "SSL certificate is invalid"
-msgstr "SSL-сертификати"
+msgstr "SSL сертификатът е неправилен"
 
 #: ../src/gtk/sslcertwindow.c:366
-#, fuzzy
 msgid "SSL certificate is unknown"
-msgstr "SSL-сертификати"
+msgstr "SSL сертификатът е непознат"
 
 #: ../src/gtk/sslcertwindow.c:369 ../src/gtk/sslcertwindow.c:419
 #: ../src/gtk/sslcertwindow.c:481
@@ -5522,22 +5641,21 @@ msgid "_Accept and save"
 msgstr "_Приемане и записване"
 
 #: ../src/gtk/sslcertwindow.c:387
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Certificate for %s is expired.\n"
 "%sDo you want to continue?"
 msgstr ""
 "Сертификатът за %s е изтекъл.\n"
-"Да се продължи ли?"
+"%sДа се продължи ли?"
 
 #: ../src/gtk/sslcertwindow.c:414
 msgid "SSL certificate is invalid and expired"
-msgstr ""
+msgstr "SSL сертификатът е неправилен и изтекъл"
 
 #: ../src/gtk/sslcertwindow.c:416
-#, fuzzy
 msgid "SSL certificate is expired"
-msgstr "SSL-сертификати"
+msgstr "SSL сертификатът е изтекъл"
 
 #: ../src/gtk/sslcertwindow.c:419
 msgid "_Accept"
@@ -5552,25 +5670,25 @@ msgid "Known certificate:"
 msgstr "Познат сертификат:"
 
 #: ../src/gtk/sslcertwindow.c:451
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Certificate for %s has changed.\n"
 "%sDo you want to accept it?"
-msgstr "Сертификатът за %s е променен. Да бъде ли приет?"
+msgstr ""
+"Сертификатът за %s е променен.\n"
+"%sДа бъде ли приет?"
 
 #: ../src/gtk/sslcertwindow.c:472
 msgid "_View certificates"
 msgstr "_Преглед на сертификатите"
 
 #: ../src/gtk/sslcertwindow.c:477
-#, fuzzy
 msgid "SSL certificate changed and is invalid"
-msgstr "SSL-сертификат за %s"
+msgstr "SSL сертификатът е променен и неправилен"
 
 #: ../src/gtk/sslcertwindow.c:479
-#, fuzzy
 msgid "SSL certificate changed"
-msgstr "SSL-сертификати"
+msgstr "SSL сертификатът е променен"
 
 #: ../src/headerview.c:96
 msgid "Tags:"
@@ -5580,8 +5698,8 @@ msgstr "Етикети:"
 #: ../src/plugins/notification/notification_popup.c:316
 #: ../src/plugins/notification/notification_popup.c:621
 #: ../src/plugins/notification/notification_trayicon.c:851
-#: ../src/summaryview.c:3351 ../src/summaryview.c:3369
-#: ../src/summaryview.c:3390
+#: ../src/summaryview.c:3353 ../src/summaryview.c:3371
+#: ../src/summaryview.c:3392
 msgid "(No From)"
 msgstr "(липсва подател)"
 
@@ -5589,7 +5707,7 @@ msgstr "(липсва подател)"
 #: ../src/plugins/notification/notification_popup.c:318
 #: ../src/plugins/notification/notification_popup.c:625
 #: ../src/plugins/notification/notification_trayicon.c:854
-#: ../src/summaryview.c:3403 ../src/summaryview.c:3407
+#: ../src/summaryview.c:3405 ../src/summaryview.c:3409
 msgid "(No Subject)"
 msgstr "(липсва \"относно\")"
 
@@ -5597,7 +5715,7 @@ msgstr "(липсва \"относно\")"
 msgid "Error:"
 msgstr "Грешка: "
 
-#: ../src/image_viewer.c:299 ../src/mimeview.c:2544
+#: ../src/image_viewer.c:299 ../src/mimeview.c:2545
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:698
 msgid "Filename:"
 msgstr "Име на файла:"
@@ -5610,31 +5728,31 @@ msgstr "Размер на файла:"
 msgid "Load Image"
 msgstr "Зареждане на изображение"
 
-#: ../src/imap.c:577
+#: ../src/imap.c:583
 msgid "IMAP4 connection broken\n"
 msgstr "Разпадане на връзката по IMAP4\n"
 
-#: ../src/imap.c:616
+#: ../src/imap.c:622
 #, c-format
 msgid "IMAP error on %s: authenticated\n"
 msgstr "Грешка в IMAP към %s: автентикация е получена\n"
 
-#: ../src/imap.c:619
+#: ../src/imap.c:625
 #, c-format
 msgid "IMAP error on %s: not authenticated\n"
 msgstr "Грешка в IMAP към %s: автентикация не е получена\n"
 
-#: ../src/imap.c:622
+#: ../src/imap.c:628
 #, c-format
 msgid "IMAP error on %s: bad state\n"
 msgstr "Грешка в IMAP към %s: неправилно състояние\n"
 
-#: ../src/imap.c:625
+#: ../src/imap.c:631
 #, c-format
 msgid "IMAP error on %s: stream error\n"
 msgstr "Грешка в IMAP към %s: грешка в потока\n"
 
-#: ../src/imap.c:628
+#: ../src/imap.c:634
 #, c-format
 msgid ""
 "IMAP error on %s: parse error (very probably non-RFC compliance from the "
@@ -5643,22 +5761,22 @@ msgstr ""
 "Грешка в IMAP към %s: грешка при обработката (вероятно сървърна "
 "несъвместимост с RFC)\n"
 
-#: ../src/imap.c:632
+#: ../src/imap.c:638
 #, c-format
 msgid "IMAP error on %s: connection refused\n"
 msgstr "Грешка в IMAP към %s: свързването е отказано\n"
 
-#: ../src/imap.c:635
+#: ../src/imap.c:641
 #, c-format
 msgid "IMAP error on %s: memory error\n"
 msgstr "Грешка в IMAP към %s: грешка в паметта\n"
 
-#: ../src/imap.c:638
+#: ../src/imap.c:644
 #, c-format
 msgid "IMAP error on %s: fatal error\n"
 msgstr "Грешка в IMAP към %s: критична грешка\n"
 
-#: ../src/imap.c:641
+#: ../src/imap.c:647
 #, c-format
 msgid ""
 "IMAP error on %s: protocol error(very probably non-RFC compliance from the "
@@ -5667,172 +5785,172 @@ msgstr ""
 "Грешка в IMAP към %s: протоколна грешка (вероятно сървърна несъвместимост с "
 "RFC)\n"
 
-#: ../src/imap.c:645
+#: ../src/imap.c:651
 #, c-format
 msgid "IMAP error on %s: connection not accepted\n"
 msgstr "Грешка в IMAP към %s: свързването не е прието\n"
 
-#: ../src/imap.c:648
+#: ../src/imap.c:654
 #, c-format
 msgid "IMAP error on %s: APPEND error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата APPEND\n"
 
-#: ../src/imap.c:651
+#: ../src/imap.c:657
 #, c-format
 msgid "IMAP error on %s: NOOP error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата NOOP\n"
 
-#: ../src/imap.c:654
+#: ../src/imap.c:660
 #, c-format
 msgid "IMAP error on %s: LOGOUT error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата LOGOUT\n"
 
-#: ../src/imap.c:657
+#: ../src/imap.c:663
 #, c-format
 msgid "IMAP error on %s: CAPABILITY error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата CAPABILITY\n"
 
-#: ../src/imap.c:660
+#: ../src/imap.c:666
 #, c-format
 msgid "IMAP error on %s: CHECK error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата CHECK\n"
 
-#: ../src/imap.c:663
+#: ../src/imap.c:669
 #, c-format
 msgid "IMAP error on %s: CLOSE error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата CLOSE\n"
 
-#: ../src/imap.c:666
+#: ../src/imap.c:672
 #, c-format
 msgid "IMAP error on %s: EXPUNGE error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата EXPUNGE\n"
 
-#: ../src/imap.c:669
+#: ../src/imap.c:675
 #, c-format
 msgid "IMAP error on %s: COPY error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата COPY\n"
 
-#: ../src/imap.c:672
+#: ../src/imap.c:678
 #, c-format
 msgid "IMAP error on %s: UID COPY error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата UID COPY\n"
 
-#: ../src/imap.c:675
+#: ../src/imap.c:681
 #, c-format
 msgid "IMAP error on %s: CREATE error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата CREATE\n"
 
-#: ../src/imap.c:678
+#: ../src/imap.c:684
 #, c-format
 msgid "IMAP error on %s: DELETE error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата DELETE\n"
 
-#: ../src/imap.c:681
+#: ../src/imap.c:687
 #, c-format
 msgid "IMAP error on %s: EXAMINE error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата EXAMINE\n"
 
-#: ../src/imap.c:684
+#: ../src/imap.c:690
 #, c-format
 msgid "IMAP error on %s: FETCH error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата FETCH\n"
 
-#: ../src/imap.c:687
+#: ../src/imap.c:693
 #, c-format
 msgid "IMAP error on %s: UID FETCH error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата UID FETCH\n"
 
-#: ../src/imap.c:690
+#: ../src/imap.c:696
 #, c-format
 msgid "IMAP error on %s: LIST error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата LIST\n"
 
-#: ../src/imap.c:693
+#: ../src/imap.c:699
 #, c-format
 msgid "IMAP error on %s: LOGIN error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата LOGIN\n"
 
-#: ../src/imap.c:696
+#: ../src/imap.c:702
 #, c-format
 msgid "IMAP error on %s: LSUB error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата LSUB\n"
 
-#: ../src/imap.c:699
+#: ../src/imap.c:705
 #, c-format
 msgid "IMAP error on %s: RENAME error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата RENAME\n"
 
-#: ../src/imap.c:702
+#: ../src/imap.c:708
 #, c-format
 msgid "IMAP error on %s: SEARCH error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата SEARCH\n"
 
-#: ../src/imap.c:705
+#: ../src/imap.c:711
 #, c-format
 msgid "IMAP error on %s: UID SEARCH error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата UID SEARCH\n"
 
-#: ../src/imap.c:708
+#: ../src/imap.c:714
 #, c-format
 msgid "IMAP error on %s: SELECT error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата SELECT\n"
 
-#: ../src/imap.c:711
+#: ../src/imap.c:717
 #, c-format
 msgid "IMAP error on %s: STATUS error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата STATUS\n"
 
-#: ../src/imap.c:714
+#: ../src/imap.c:720
 #, c-format
 msgid "IMAP error on %s: STORE error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата STORE\n"
 
-#: ../src/imap.c:717
+#: ../src/imap.c:723
 #, c-format
 msgid "IMAP error on %s: UID STORE error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата UID STORE\n"
 
-#: ../src/imap.c:720
+#: ../src/imap.c:726
 #, c-format
 msgid "IMAP error on %s: SUBSCRIBE error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата SUBSCRIBE\n"
 
-#: ../src/imap.c:723
+#: ../src/imap.c:729
 #, c-format
 msgid "IMAP error on %s: UNSUBSCRIBE error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата UNSUBSCRIBE\n"
 
-#: ../src/imap.c:726
+#: ../src/imap.c:732
 #, c-format
 msgid "IMAP error on %s: STARTTLS error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата STARTTLS\n"
 
-#: ../src/imap.c:729
+#: ../src/imap.c:735
 #, c-format
 msgid "IMAP error on %s: INVAL error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата INVAL\n"
 
-#: ../src/imap.c:732
+#: ../src/imap.c:738
 #, c-format
 msgid "IMAP error on %s: EXTENSION error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата EXTENSION\n"
 
-#: ../src/imap.c:735
+#: ../src/imap.c:741
 #, c-format
 msgid "IMAP error on %s: SASL error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата SASL\n"
 
-#: ../src/imap.c:739
+#: ../src/imap.c:745
 #, c-format
 msgid "IMAP error on %s: SSL error\n"
 msgstr "Грешка в IMAP към %s: грешка при командата SSL\n"
 
-#: ../src/imap.c:743
+#: ../src/imap.c:749
 #, c-format
 msgid "IMAP error on %s: Unknown error [%d]\n"
 msgstr "Грешка в IMAP към %s: непозната грешка [%d]\n"
 
-#: ../src/imap.c:928
+#: ../src/imap.c:934
 msgid ""
 "\n"
 "\n"
@@ -5840,7 +5958,7 @@ msgid ""
 "and the CRAM-MD5 SASL plugin is installed."
 msgstr ""
 
-#: ../src/imap.c:934
+#: ../src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5848,37 +5966,37 @@ msgid ""
 "and the DIGEST-MD5 SASL plugin is installed."
 msgstr ""
 
-#: ../src/imap.c:941
+#: ../src/imap.c:947
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Връзката с %s неуспешна: достъпът е отказан.%s"
 
-#: ../src/imap.c:945
+#: ../src/imap.c:951
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Връзката с %s е неуспешна: достъпът е отказан.%s\n"
 
-#: ../src/imap.c:963
+#: ../src/imap.c:969
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Грешка при свързването към %s"
 
-#: ../src/imap.c:970 ../src/imap.c:973
+#: ../src/imap.c:976 ../src/imap.c:979
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Връзката по IMAP4 с %s е прекъсната. Повторно свързване...\n"
 
-#: ../src/imap.c:1003 ../src/imap.c:3583 ../src/imap.c:4242 ../src/imap.c:4339
-#: ../src/imap.c:4517 ../src/imap.c:5314
+#: ../src/imap.c:1009 ../src/imap.c:3619 ../src/imap.c:4278 ../src/imap.c:4375
+#: ../src/imap.c:4555 ../src/imap.c:5364
 msgid "Claws Mail needs network access in order to access the IMAP server."
-msgstr ""
+msgstr "Claws Mail има нужда от достъп до мрежата, за да достъпи IMAP-сървъра."
 
-#: ../src/imap.c:1112 ../src/inc.c:818 ../src/news.c:387
+#: ../src/imap.c:1118 ../src/inc.c:818 ../src/news.c:387
 #: ../src/send_message.c:278
 msgid "Insecure connection"
 msgstr "Несигурна връзка"
 
-#: ../src/imap.c:1113 ../src/inc.c:819 ../src/news.c:388
+#: ../src/imap.c:1119 ../src/inc.c:819 ../src/news.c:388
 #: ../src/send_message.c:279
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
@@ -5888,130 +6006,129 @@ msgid ""
 "not be secure."
 msgstr ""
 
-#: ../src/imap.c:1119 ../src/inc.c:825 ../src/news.c:394
+#: ../src/imap.c:1125 ../src/inc.c:825 ../src/news.c:394
 #: ../src/send_message.c:285
 msgid "Con_tinue connecting"
 msgstr "Про_дължаване на свързването"
 
-#: ../src/imap.c:1129
-#, fuzzy, c-format
+#: ../src/imap.c:1135
+#, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
-msgstr "Свързване към IMAP4 сървър: %s..."
+msgstr "Сметка \"%s\": Свързване към сървър IMAP4: %s:%d..."
 
-#: ../src/imap.c:1177
+#: ../src/imap.c:1183
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Грешка при свързване с IMAP4-сървъра: %s:%d"
 
-#: ../src/imap.c:1180
+#: ../src/imap.c:1186
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Грешка при свързване с IMAP4-сървъра: %s:%d\n"
 
-#: ../src/imap.c:1213 ../src/imap.c:4004
+#: ../src/imap.c:1219 ../src/imap.c:4040
 msgid "Can't start TLS session.\n"
 msgstr "Грешка при започването на TLS-сесията\n"
 
-#: ../src/imap.c:1276
+#: ../src/imap.c:1282
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Грешка при свързване към IMAP-сървър %s.\n"
 
-#: ../src/imap.c:1279
+#: ../src/imap.c:1285
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Грешка при свързване към IMAP-сървър: %s."
 
-#: ../src/imap.c:1679
+#: ../src/imap.c:1703
 msgid "Adding messages..."
 msgstr "Добавяне на писма..."
 
-#: ../src/imap.c:1883 ../src/mh.c:520
+#: ../src/imap.c:1908 ../src/mh.c:526
 msgid "Copying messages..."
 msgstr "Копиране на писмата..."
 
-#: ../src/imap.c:2465
+#: ../src/imap.c:2492
 msgid "can't set deleted flags\n"
 msgstr ""
 
-#: ../src/imap.c:2472 ../src/imap.c:4944
+#: ../src/imap.c:2499 ../src/imap.c:4994
 msgid "can't expunge\n"
 msgstr ""
 
-#: ../src/imap.c:2823
+#: ../src/imap.c:2850
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Търсене на отписани папки в %s..."
 
-#: ../src/imap.c:2826
+#: ../src/imap.c:2853
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Търсене на подпапки на %s..."
 
-#: ../src/imap.c:3123
+#: ../src/imap.c:3159
 msgid "can't create mailbox: LIST failed\n"
 msgstr "грешка при създаване на кутията: неуспешна команда LIST\n"
 
-#: ../src/imap.c:3138
+#: ../src/imap.c:3174
 msgid "can't create mailbox\n"
 msgstr "грешка при създаване на кутията\n"
 
-#: ../src/imap.c:3229
+#: ../src/imap.c:3265
 msgid "New folder name must not contain the namespace path separator"
 msgstr "Името на новата папка не може да съдържа знак за разделител на пътя"
 
-#: ../src/imap.c:3269
+#: ../src/imap.c:3305
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "грешка при преименуване на кутията: %s в %s\n"
 
-#: ../src/imap.c:3382
+#: ../src/imap.c:3418
 msgid "can't delete mailbox\n"
 msgstr "грешка при изтриване на кутията\n"
 
-#: ../src/imap.c:3661
+#: ../src/imap.c:3697
 msgid "LIST failed\n"
 msgstr "Грешка при команда LIST\n"
 
-#: ../src/imap.c:3746
-#, fuzzy
+#: ../src/imap.c:3782
 msgid "Flagging messages..."
-msgstr "Филтриране на писмата...\n"
+msgstr "Отбелязване на писмата..."
 
-#: ../src/imap.c:3849
+#: ../src/imap.c:3885
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "папката не може да бъде избрана: %s\n"
 
-#: ../src/imap.c:4001
+#: ../src/imap.c:4037
 msgid "Server requires TLS to log in.\n"
 msgstr "Сървърът изисква TLS за влизане.\n"
 
-#: ../src/imap.c:4011
+#: ../src/imap.c:4047
 msgid "Can't refresh capabilities.\n"
 msgstr ""
 
-#: ../src/imap.c:4016
+#: ../src/imap.c:4052
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without OpenSSL support.\n"
 msgstr ""
 
-#: ../src/imap.c:4024
+#: ../src/imap.c:4060
 msgid "Server logins are disabled.\n"
 msgstr ""
 
-#: ../src/imap.c:4247
+#: ../src/imap.c:4283
 msgid "Fetching message..."
 msgstr "Изтегляне на писмо..."
 
-#: ../src/imap.c:4937
+#: ../src/imap.c:4987
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr ""
 
-#: ../src/imap.c:5973
+#: ../src/imap.c:6023
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6041,7 +6158,7 @@ msgid "Cop_y folder..."
 msgstr "_Копиране на папка..."
 
 #: ../src/imap_gtk.c:69 ../src/mh_gtk.c:59
-#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:61
+#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:55
 msgid "_Delete folder..."
 msgstr "_Изтриване на папка..."
 
@@ -6099,7 +6216,7 @@ msgstr "Наследяване нстройките от родителскат
 
 #: ../src/imap_gtk.c:261 ../src/mh_gtk.c:249 ../src/news_gtk.c:306
 #: ../src/plugins/mailmbox/plugin_gtk.c:405
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:331
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:196
 #: ../src/plugins/vcalendar/vcal_folder.c:2032
 #, c-format
 msgid "Input new name for '%s':"
@@ -6107,14 +6224,14 @@ msgstr "Въведете ново име за \"%s\":"
 
 #: ../src/imap_gtk.c:263 ../src/mh_gtk.c:251
 #: ../src/plugins/mailmbox/plugin_gtk.c:406
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:332
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:197
 #: ../src/plugins/vcalendar/vcal_folder.c:2033
 msgid "Rename folder"
 msgstr "Преименуване на папка"
 
 #: ../src/imap_gtk.c:292 ../src/mh_gtk.c:274 ../src/news_gtk.c:328
 #: ../src/plugins/mailmbox/plugin_gtk.c:433
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:352
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:217
 #: ../src/plugins/vcalendar/vcal_folder.c:2053
 msgid ""
 "The folder could not be renamed.\n"
@@ -6122,7 +6239,7 @@ msgid ""
 msgstr ""
 
 #: ../src/imap_gtk.c:360 ../src/mh_gtk.c:199
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:233
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:149
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6133,7 +6250,7 @@ msgstr ""
 
 #: ../src/imap_gtk.c:381 ../src/mh_gtk.c:220 ../src/news_gtk.c:281
 #: ../src/plugins/mailmbox/plugin_gtk.c:341
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:254
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:170
 #: ../src/plugins/vcalendar/vcal_folder.c:1986
 #, c-format
 msgid "Can't remove the folder '%s'."
@@ -6161,7 +6278,7 @@ msgstr "+_Търсене"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr ""
 
-#: ../src/imap_gtk.c:537 ../src/mainwindow.c:672
+#: ../src/imap_gtk.c:537 ../src/mainwindow.c:674
 msgid "Subscribe"
 msgstr "Записване"
 
@@ -6208,9 +6325,8 @@ msgid "Import mbox file"
 msgstr "Внасяне на mbox-файл"
 
 #: ../src/import.c:131
-#, fuzzy
 msgid "Locate the mbox file and specify the destination folder."
-msgstr "Папката не може да бъде намерена."
+msgstr ""
 
 #: ../src/import.c:148
 msgid "Destination folder:"
@@ -6221,11 +6337,12 @@ msgid "Source mbox filename can't be left empty."
 msgstr ""
 
 #: ../src/import.c:207
-#, fuzzy
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
-msgstr "Изходната и целевата папки на копиране съвпадат."
+msgstr ""
+"Не е указана целева папка.\n"
+"Да се внесе ли mbox файлът в папката за входящи?"
 
 #: ../src/import.c:229
 msgid "Can't find the destination folder."
@@ -6423,7 +6540,7 @@ msgid "Auth failed"
 msgstr "Грешка при влизането"
 
 #. S_COL_SCORE
-#: ../src/inc.c:662 ../src/prefs_matcher.c:393
+#: ../src/inc.c:662 ../src/prefs_matcher.c:396
 #: ../src/prefs_summary_column.c:88 ../src/summaryview.c:2789
 #: ../src/summaryview.c:6310
 msgid "Locked"
@@ -6451,9 +6568,9 @@ msgid "%s: Retrieving new messages"
 msgstr "%s: Изтегляне на новите писма"
 
 #: ../src/inc.c:832
-#, fuzzy, c-format
+#, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
-msgstr "Свързване към POP3 сървър: %s..."
+msgstr "Сметка \"%s\": Свързване към сървър POP3: %s:%d..."
 
 #: ../src/inc.c:850
 #, c-format
@@ -6471,9 +6588,9 @@ msgid "Authenticating..."
 msgstr "Автентификация..."
 
 #: ../src/inc.c:936
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieving messages from %s (%s)..."
-msgstr "Изтегляне на писмата от %s (%s) ..."
+msgstr "Изтегляне на писмата от %s (%s)..."
 
 #: ../src/inc.c:942
 msgid "Getting the number of new messages (STAT)..."
@@ -6607,24 +6724,10 @@ msgstr "%s%sВ изключен режим сте. Да се пренебрег
 msgid "On_ly once"
 msgstr "Само _веднъж"
 
-#: ../src/ldapupdate.c:189
-#, c-format
-msgid "ldapsvr_retrieve_item_person->Unknown status: %d"
-msgstr ""
-
-#: ../src/ldapupdate.c:472
-msgid "ldapsvr_update_book: Could not clean cache\n"
-msgstr ""
-
 #: ../src/ldapupdate.c:1056
 msgid "Some SN"
 msgstr ""
 
-#: ../src/ldapupdate.c:1440
-#, c-format
-msgid "ldapsvr_update_book->Unknown status: %s\n"
-msgstr ""
-
 #: ../src/ldif.c:776
 msgid "Nick Name"
 msgstr "Псевдоним"
@@ -6736,25 +6839,23 @@ msgstr ""
 
 #: ../src/main.c:1726
 msgid "Missing filename\n"
-msgstr ""
+msgstr "Липсва име на файл\n"
 
 #: ../src/main.c:1733
 msgid "Cannot open filename for reading\n"
-msgstr ""
+msgstr "Грешка при отваряне на файл за четене\n"
 
 #: ../src/main.c:1744
-#, fuzzy
 msgid "Malformed header\n"
-msgstr "Изтриване на заглавка"
+msgstr "Лошо форматирана заглавна част\n"
 
 #: ../src/main.c:1751
 msgid "Duplicated 'To:' header\n"
 msgstr ""
 
 #: ../src/main.c:1762
-#, fuzzy
 msgid "Missing required 'To:' header\n"
-msgstr "Липсват задължителни данни"
+msgstr "Липсват задължителна заглавка \"To:\"\n"
 
 #: ../src/main.c:1905
 #, c-format
@@ -6800,14 +6901,12 @@ msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          получаване на новата поща за всички сметки"
 
 #: ../src/main.c:1919
-#, fuzzy
 msgid "  --cancel-receiving     cancel receiving of messages"
-msgstr "  --receive              получаване на новата поща"
+msgstr "  --cancel-receiving              отмяна получаването на писма"
 
 #: ../src/main.c:1920
-#, fuzzy
 msgid "  --cancel-sending       cancel sending of messages"
-msgstr "  --receive              получаване на новата поща"
+msgstr "  --cancel-sending              отмяна изпращането на писма"
 
 #: ../src/main.c:1921
 msgid ""
@@ -6838,7 +6937,7 @@ msgstr ""
 
 #: ../src/main.c:1932
 msgid "  --statistics           show session statistics"
-msgstr ""
+msgstr "  --statistics           показване на статистики за сесията"
 
 #: ../src/main.c:1933
 msgid "  --reset-statistics     reset session statistics"
@@ -6870,9 +6969,9 @@ msgid "  --debug                debug mode"
 msgstr "  --debug                режим на проследяване за грешки"
 
 #: ../src/main.c:1940
-#, fuzzy
 msgid "  --toggle-debug         toggle debug mode"
-msgstr "  --debug                режим на проследяване за грешки"
+msgstr ""
+"  --toggle-debug                превключва режима на проследяване за грешки"
 
 #: ../src/main.c:1941
 msgid "  --help -h              display this help and exit"
@@ -6922,355 +7021,339 @@ msgstr "Чакащи писма"
 
 #: ../src/main.c:2100
 msgid "Some unsent messages are queued. Exit now?"
-msgstr ""
+msgstr "Има неизпратени писма в опашката. Да се излезе ли от програмата?"
 
 #: ../src/main.c:2843
 msgid "NetworkManager: network is online.\n"
-msgstr ""
+msgstr "NetworkManager: свързан към мрежа.\n"
 
 #: ../src/main.c:2849
 msgid "NetworkManager: network is offline.\n"
-msgstr ""
+msgstr "NetworkManager: няма връзка към мрежа.\n"
 
 #. menus
-#: ../src/mainwindow.c:503 ../src/messageview.c:209
+#: ../src/mainwindow.c:505 ../src/messageview.c:209
 msgid "_File"
 msgstr "_Файл"
 
-#: ../src/mainwindow.c:505 ../src/messageview.c:211 ../src/summaryview.c:434
+#: ../src/mainwindow.c:507 ../src/messageview.c:211 ../src/summaryview.c:434
 msgid "_View"
 msgstr "_Изглед"
 
-#: ../src/mainwindow.c:508
+#: ../src/mainwindow.c:510
 msgid "_Configuration"
 msgstr "_Настройки"
 
 #. File menu
-#: ../src/mainwindow.c:512
+#: ../src/mainwindow.c:514
 msgid "_Add mailbox"
 msgstr "Добавяне на _пощенска кутия"
 
-#: ../src/mainwindow.c:513
+#: ../src/mainwindow.c:515
 msgid "MH..."
 msgstr "MH..."
 
-#: ../src/mainwindow.c:516
-#, fuzzy
+#: ../src/mainwindow.c:518
 msgid "Change mailbox order..."
-msgstr "Промяна реда на папките..."
+msgstr "Промяна реда на кутиите..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:519
+#: ../src/mainwindow.c:521
 msgid "_Import mbox file..."
 msgstr "Внасяне на _mbox-файл..."
 
-#: ../src/mainwindow.c:520
+#: ../src/mainwindow.c:522
 msgid "_Export to mbox file..."
 msgstr "Изнасяне в _mbox-файл..."
 
-#: ../src/mainwindow.c:521
+#: ../src/mainwindow.c:523
 msgid "_Export selected to mbox file..."
 msgstr "И_знасяне на избраните в mbox-файл..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:523
+#: ../src/mainwindow.c:525
 msgid "Empty all _Trash folders"
 msgstr "Изчистване на всички ко_шчета"
 
 #. {"File/---",				NULL, "---" },
 #. File menu
-#: ../src/mainwindow.c:526 ../src/messageview.c:218
-#, fuzzy
+#: ../src/mainwindow.c:528 ../src/messageview.c:218
 msgid "_Save email as..."
-msgstr "_Запазване като..."
+msgstr "_Запазване на писмото като..."
 
-#: ../src/mainwindow.c:527 ../src/messageview.c:219
-#, fuzzy
+#: ../src/mainwindow.c:529 ../src/messageview.c:219
 msgid "_Save part as..."
-msgstr "_Запазване като..."
+msgstr "_Запазване на частта като..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:530 ../src/messageview.c:220
+#: ../src/mainwindow.c:532 ../src/messageview.c:220
 msgid "Page setup..."
 msgstr "Настройки на страницата..."
 
-#: ../src/mainwindow.c:531 ../src/messageview.c:221
+#: ../src/mainwindow.c:533 ../src/messageview.c:221
 msgid "_Print..."
 msgstr "От_печатване..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:533
+#: ../src/mainwindow.c:535
 msgid "Synchronise folders"
 msgstr "Синхронизиране на папките"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:535
+#: ../src/mainwindow.c:537
 msgid "E_xit"
 msgstr "_Спиране на програмата"
 
-#: ../src/mainwindow.c:540
+#: ../src/mainwindow.c:542
 msgid "Select _thread"
 msgstr "Избиране на _нишката"
 
-#: ../src/mainwindow.c:541
+#: ../src/mainwindow.c:543
 msgid "_Delete thread"
 msgstr "_Изтриване на тема"
 
-#: ../src/mainwindow.c:543
+#: ../src/mainwindow.c:545
 msgid "_Find in current message..."
 msgstr "_Търсене в текущото писмо..."
 
-#: ../src/mainwindow.c:545
+#: ../src/mainwindow.c:547
 msgid "_Quick search"
 msgstr "_Бързо търсене"
 
 #. View menu
-#: ../src/mainwindow.c:548
+#: ../src/mainwindow.c:550
 msgid "Show or hi_de"
 msgstr "Показване и с_криване"
 
-#: ../src/mainwindow.c:549
+#: ../src/mainwindow.c:551
 msgid "_Toolbar"
 msgstr "_Лентата с инструменти"
 
-#: ../src/mainwindow.c:551
+#: ../src/mainwindow.c:553
 msgid "Set displayed _columns"
 msgstr "_Задаване на видимите колони"
 
-#: ../src/mainwindow.c:552
-#, fuzzy
+#: ../src/mainwindow.c:554
 msgid "In _folder list..."
-msgstr "в списъка с _папки..."
+msgstr "В списъка с _папки..."
 
-#: ../src/mainwindow.c:553
-#, fuzzy
+#: ../src/mainwindow.c:555
 msgid "In _message list..."
-msgstr "в списъка с пис_мата..."
+msgstr "В списъка с пис_мата..."
 
-#: ../src/mainwindow.c:558
+#: ../src/mainwindow.c:560
 msgid "La_yout"
 msgstr "_Подреждане"
 
-#: ../src/mainwindow.c:561
+#: ../src/mainwindow.c:563
 msgid "_Sort"
 msgstr "_Подреждане"
 
-#: ../src/mainwindow.c:563
+#: ../src/mainwindow.c:565
 msgid "_Attract by subject"
 msgstr "_Групиране по теми"
 
-#: ../src/mainwindow.c:565
+#: ../src/mainwindow.c:567
 msgid "E_xpand all threads"
 msgstr "_Разгъване на всички нишки"
 
-#: ../src/mainwindow.c:566
+#: ../src/mainwindow.c:568
 msgid "Co_llapse all threads"
 msgstr "_Свиване на всички нишки"
 
 #. View menu
-#: ../src/mainwindow.c:568 ../src/messageview.c:232
+#: ../src/mainwindow.c:570 ../src/messageview.c:232
 msgid "_Go to"
 msgstr "П_реход"
 
-#: ../src/mainwindow.c:569 ../src/messageview.c:233
+#: ../src/mainwindow.c:571 ../src/messageview.c:233
 msgid "_Previous message"
 msgstr "Към п_редишното писмо"
 
-#: ../src/mainwindow.c:570 ../src/messageview.c:234
+#: ../src/mainwindow.c:572 ../src/messageview.c:234
 msgid "_Next message"
 msgstr "_Следващо писмо"
 
-#: ../src/mainwindow.c:572 ../src/messageview.c:236
+#: ../src/mainwindow.c:574 ../src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "Преди_шно непрочетено писмо"
 
-#: ../src/mainwindow.c:573 ../src/messageview.c:237
+#: ../src/mainwindow.c:575 ../src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Следва_що непрочетено писмо"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:575 ../src/messageview.c:239
+#: ../src/mainwindow.c:577 ../src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "_Към предишното ново писмо"
 
-#: ../src/mainwindow.c:576 ../src/messageview.c:240
+#: ../src/mainwindow.c:578 ../src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Следващо но_во писмо"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:578 ../src/messageview.c:242
+#: ../src/mainwindow.c:580 ../src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Към пре_дишното отбелязано писмо"
 
-#: ../src/mainwindow.c:579 ../src/messageview.c:243
+#: ../src/mainwindow.c:581 ../src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Следващо отбеля_зано писмо"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:581 ../src/messageview.c:245
+#: ../src/mainwindow.c:583 ../src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Към _предишното писмо с етикет"
 
-#: ../src/mainwindow.c:582 ../src/messageview.c:246
+#: ../src/mainwindow.c:584 ../src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Следващо _етикирано писмо"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:584 ../src/messageview.c:248
-#, fuzzy
+#: ../src/mainwindow.c:586 ../src/messageview.c:248
 msgid "Previous opened message"
-msgstr "_Към предишното ново писмо"
+msgstr "Предишно отворено писмо"
 
-#: ../src/mainwindow.c:585 ../src/messageview.c:249
-#, fuzzy
+#: ../src/mainwindow.c:587 ../src/messageview.c:249
 msgid "Next opened message"
-msgstr "Следващо но_во писмо"
+msgstr "Следващо отворено писмо"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:587 ../src/messageview.c:251
+#: ../src/mainwindow.c:589 ../src/messageview.c:251
 msgid "Parent message"
 msgstr "Родителско писмо"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:589 ../src/messageview.c:253
+#: ../src/mainwindow.c:591 ../src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "К_ъм следващата папка с непрочетено писмо"
 
-#: ../src/mainwindow.c:590 ../src/messageview.c:254
+#: ../src/mainwindow.c:592 ../src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Друга папка..."
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:592 ../src/messageview.c:256 ../src/mimeview.c:201
-#, fuzzy
+#: ../src/mainwindow.c:594 ../src/messageview.c:256 ../src/mimeview.c:201
 msgid "Next part"
-msgstr "Следваща част (a)"
+msgstr "Следваща част"
 
-#: ../src/mainwindow.c:593 ../src/messageview.c:257 ../src/mimeview.c:202
-#, fuzzy
+#: ../src/mainwindow.c:595 ../src/messageview.c:257 ../src/mimeview.c:202
 msgid "Previous part"
-msgstr "Предишна страница"
+msgstr "Предишна част"
 
 #. {"View/Scroll/---",                  NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:596 ../src/messageview.c:258
-#, fuzzy
+#: ../src/mainwindow.c:598 ../src/messageview.c:258
 msgid "Message scroll"
-msgstr "Писма"
+msgstr "Прелистване на писмо"
 
-#: ../src/mainwindow.c:597 ../src/messageview.c:259
-#, fuzzy
+#: ../src/mainwindow.c:599 ../src/messageview.c:259
 msgid "Previous line"
-msgstr "Предишна страница"
+msgstr "Предишен ред"
 
-#: ../src/mainwindow.c:598 ../src/messageview.c:260
-#, fuzzy
+#: ../src/mainwindow.c:600 ../src/messageview.c:260
 msgid "Next line"
-msgstr "нов ред"
+msgstr "Следващ ред"
 
-#: ../src/mainwindow.c:599 ../src/messageview.c:261 ../src/printing.c:481
+#: ../src/mainwindow.c:601 ../src/messageview.c:261 ../src/printing.c:481
 msgid "Previous page"
 msgstr "Предишна страница"
 
-#: ../src/mainwindow.c:600 ../src/messageview.c:262 ../src/printing.c:488
+#: ../src/mainwindow.c:602 ../src/messageview.c:262 ../src/printing.c:488
 msgid "Next page"
 msgstr "Следваща страница"
 
-#: ../src/mainwindow.c:618 ../src/messageview.c:280
+#: ../src/mainwindow.c:620 ../src/messageview.c:280
 msgid "Decode"
 msgstr "Разкодиране"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:625
+#: ../src/mainwindow.c:627
 msgid "Open in new _window"
 msgstr "Отваряне в _нов прозорец"
 
-#: ../src/mainwindow.c:626 ../src/messageview.c:287
+#: ../src/mainwindow.c:628 ../src/messageview.c:287
 msgid "Mess_age source"
 msgstr "_Код на писмото"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:628 ../src/messageview.c:288
-#, fuzzy
+#: ../src/mainwindow.c:630 ../src/messageview.c:288
 msgid "Message part"
-msgstr "Списък с писмата"
+msgstr "Част със съобщение"
 
-#: ../src/mainwindow.c:629 ../src/messageview.c:289
-#, fuzzy
+#: ../src/mainwindow.c:631 ../src/messageview.c:289
 msgid "View as text"
-msgstr "\"Показване като текст\""
+msgstr "Показване като текст"
 
-#: ../src/mainwindow.c:630 ../src/messageview.c:290 ../src/toolbar.c:403
+#: ../src/mainwindow.c:632 ../src/messageview.c:290 ../src/toolbar.c:403
 msgid "Open"
 msgstr "Отваряне"
 
-#: ../src/mainwindow.c:632 ../src/messageview.c:292
-#, fuzzy
+#: ../src/mainwindow.c:634 ../src/messageview.c:292
 msgid "Open with..."
-msgstr "\"Отваряне с...\""
+msgstr "Отваряне с..."
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:636 ../src/messageview.c:295
+#: ../src/mainwindow.c:638 ../src/messageview.c:295
 msgid "Quotes"
 msgstr "Цитати"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:638
+#: ../src/mainwindow.c:640
 msgid "_Update summary"
 msgstr "_Обновяване на извадките"
 
 #. Message menu
-#: ../src/mainwindow.c:641
+#: ../src/mainwindow.c:643
 msgid "Recei_ve"
 msgstr "Полу_чаване"
 
-#: ../src/mainwindow.c:642
+#: ../src/mainwindow.c:644
 msgid "Get from _current account"
 msgstr "Получаване от _текущата сметка"
 
-#: ../src/mainwindow.c:643
+#: ../src/mainwindow.c:645
 msgid "Get from _all accounts"
 msgstr "Получаване от _всички сметки"
 
-#: ../src/mainwindow.c:644
+#: ../src/mainwindow.c:646
 msgid "Cancel receivin_g"
 msgstr "_Отмяна на получаването"
 
-#: ../src/mainwindow.c:647
+#: ../src/mainwindow.c:649
 msgid "_Send queued messages"
 msgstr "Изпращане на _чакащите писма"
 
-#: ../src/mainwindow.c:652
+#: ../src/mainwindow.c:654
 msgid "Compose a_n email message"
 msgstr "Писане на _писмо"
 
-#: ../src/mainwindow.c:653
+#: ../src/mainwindow.c:655
 msgid "Compose a news message"
 msgstr "Писане на в новинарска група"
 
-#: ../src/mainwindow.c:655 ../src/messageview.c:301
+#: ../src/mainwindow.c:657 ../src/messageview.c:301
 #: ../src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Отговор"
 
 #. COMPOSE_REPLY
-#: ../src/mainwindow.c:656 ../src/messageview.c:302 ../src/summaryview.c:426
+#: ../src/mainwindow.c:658 ../src/messageview.c:302 ../src/summaryview.c:426
 msgid "Repl_y to"
 msgstr "Отговор _до"
 
 #. COMPOSE_REPLY_TO_SENDER
-#: ../src/mainwindow.c:659 ../src/messageview.c:305
-#, fuzzy
+#: ../src/mainwindow.c:661 ../src/messageview.c:305
 msgid "Mailing _list"
-msgstr "по_щенски списък"
+msgstr "Пощенски _списък"
 
 #. COMPOSE_REPLY_TO_LIST
-#: ../src/mainwindow.c:660
+#: ../src/mainwindow.c:662
 msgid "Follow-up and reply to"
 msgstr ""
 
@@ -7278,181 +7361,177 @@ msgstr ""
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REPLY_TO_LIST
 #. {"Message/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:663 ../src/messageview.c:308 ../src/toolbar.c:2069
+#: ../src/mainwindow.c:665 ../src/messageview.c:308 ../src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Препращане"
 
 #. COMPOSE_FORWARD_INLINE
-#: ../src/mainwindow.c:664 ../src/messageview.c:309 ../src/toolbar.c:2070
+#: ../src/mainwindow.c:666 ../src/messageview.c:309 ../src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "Преп_ращане като прикрепен файл"
 
 #. COMPOSE_FORWARD_AS_ATTACH
-#: ../src/mainwindow.c:665 ../src/messageview.c:310 ../src/toolbar.c:2071
+#: ../src/mainwindow.c:667 ../src/messageview.c:310 ../src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Пренасо_чване"
 
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:667
+#: ../src/mainwindow.c:669
 msgid "Mailing-_List"
-msgstr ""
+msgstr "Пощенски _списък"
 
-#: ../src/mainwindow.c:668
+#: ../src/mainwindow.c:670
 msgid "Post"
 msgstr ""
 
-#: ../src/mainwindow.c:670
+#: ../src/mainwindow.c:672
 msgid "Help"
 msgstr "Помощ"
 
-#: ../src/mainwindow.c:674
+#: ../src/mainwindow.c:676
 msgid "Unsubscribe"
 msgstr "Отписване"
 
-#: ../src/mainwindow.c:676
+#: ../src/mainwindow.c:678
 msgid "View archive"
 msgstr "Преглед на архива"
 
-#: ../src/mainwindow.c:678
+#: ../src/mainwindow.c:680
 msgid "Contact owner"
 msgstr "Свързване със собственика"
 
 #. separation
-#: ../src/mainwindow.c:682
+#: ../src/mainwindow.c:684
 msgid "M_ove..."
 msgstr "Пре_местване..."
 
-#: ../src/mainwindow.c:683
+#: ../src/mainwindow.c:685
 msgid "_Copy..."
 msgstr "_Копиране..."
 
-#: ../src/mainwindow.c:684
+#: ../src/mainwindow.c:686
 msgid "Move to _trash"
 msgstr "Изхвърляне в _кошчето"
 
-#: ../src/mainwindow.c:685
+#: ../src/mainwindow.c:687
 msgid "_Delete..."
 msgstr "_Изтриване..."
 
-#: ../src/mainwindow.c:686
+#: ../src/mainwindow.c:688
 msgid "Cancel a news message"
 msgstr "Отмяна на писмо до група"
 
 #. separation
-#: ../src/mainwindow.c:689 ../src/mainwindow.c:690 ../src/summaryview.c:427
+#: ../src/mainwindow.c:691 ../src/mainwindow.c:692 ../src/summaryview.c:427
 msgid "_Mark"
 msgstr "_Отбелязване"
 
-#: ../src/mainwindow.c:691
+#: ../src/mainwindow.c:693
 msgid "_Unmark"
 msgstr "_Размаркиране"
 
-#: ../src/mainwindow.c:694
+#: ../src/mainwindow.c:696
 msgid "Mark as unr_ead"
 msgstr "Отбелязано като _непрочетено"
 
-#: ../src/mainwindow.c:695
+#: ../src/mainwindow.c:697
 msgid "Mark as rea_d"
 msgstr "Отбелязано като про_четено"
 
 #. separation
-#: ../src/mainwindow.c:697
+#: ../src/mainwindow.c:699
 msgid "Mark all read"
 msgstr "Отбелязване на всички като прочетени"
 
 #. separation
-#: ../src/mainwindow.c:699 ../src/prefs_filtering_action.c:199
+#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:199
 #: ../src/toolbar.c:208 ../src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Пренебрегване на нишката"
 
-#: ../src/mainwindow.c:700
+#: ../src/mainwindow.c:702
 msgid "Unignore thread"
 msgstr "Пренебрегване на нишката"
 
-#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:200
+#: ../src/mainwindow.c:703 ../src/prefs_filtering_action.c:200
 #: ../src/toolbar.c:209 ../src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Наблюдаване на нишката"
 
-#: ../src/mainwindow.c:702
+#: ../src/mainwindow.c:704
 msgid "Unwatch thread"
 msgstr "Спиране наблюдаването на нишката"
 
 #. separation
-#: ../src/mainwindow.c:705
-#, fuzzy
+#: ../src/mainwindow.c:707
 msgid "Mark as _spam"
-msgstr "Отбелязване като нежелана поща"
+msgstr "Отбелязване като не_желано"
 
-#: ../src/mainwindow.c:706
-#, fuzzy
+#: ../src/mainwindow.c:708
 msgid "Mark as _ham"
-msgstr "Отбелязване като нормална поща"
+msgstr "Отбелязване като _нормално"
 
 #. separation
-#: ../src/mainwindow.c:709 ../src/prefs_filtering_action.c:181
+#: ../src/mainwindow.c:711 ../src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Заключване"
 
-#: ../src/mainwindow.c:710 ../src/prefs_filtering_action.c:182
+#: ../src/mainwindow.c:712 ../src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Отключване"
 
-#: ../src/mainwindow.c:712 ../src/summaryview.c:428
+#: ../src/mainwindow.c:714 ../src/summaryview.c:428
 msgid "Color la_bel"
 msgstr "_Цветен етикет"
 
-#: ../src/mainwindow.c:713 ../src/summaryview.c:429
+#: ../src/mainwindow.c:715 ../src/summaryview.c:429
 msgid "Ta_gs"
 msgstr "Ети_кети"
 
 #. {"Message/---",			NULL, "---" },
-#: ../src/mainwindow.c:716
+#: ../src/mainwindow.c:718
 msgid "Re-_edit"
 msgstr "По_вторно редактиране"
 
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:719 ../src/messageview.c:311 ../src/mimeview.c:1027
+#: ../src/mainwindow.c:721 ../src/messageview.c:311 ../src/mimeview.c:1027
 msgid "Check signature"
 msgstr "Проверка на подписа"
 
-#: ../src/mainwindow.c:724 ../src/messageview.c:315
+#: ../src/mainwindow.c:726 ../src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "Добавяне на подателя в _адресника"
 
-#: ../src/mainwindow.c:726
+#: ../src/mainwindow.c:728
 msgid "C_ollect addresses"
 msgstr "_Събиране на адреси"
 
-#: ../src/mainwindow.c:727
-#, fuzzy
+#: ../src/mainwindow.c:729
 msgid "From current _folder..."
-msgstr "от _текущата папка..."
+msgstr "От _текущата папка..."
 
-#: ../src/mainwindow.c:728
-#, fuzzy
+#: ../src/mainwindow.c:730
 msgid "From selected _messages..."
-msgstr "от и_збраните писма..."
+msgstr "От и_збраните писма..."
 
-#: ../src/mainwindow.c:731
+#: ../src/mainwindow.c:733
 msgid "_Filter all messages in folder"
 msgstr "Фи_лтриране на всички писма в папката"
 
-#: ../src/mainwindow.c:732
+#: ../src/mainwindow.c:734
 msgid "Filter _selected messages"
 msgstr "Филтриране на из_браните писма"
 
-#: ../src/mainwindow.c:733
+#: ../src/mainwindow.c:735
 msgid "Run folder pr_ocessing rules"
 msgstr "При_лагане правилата за обработка"
 
-#: ../src/mainwindow.c:735 ../src/messageview.c:318
+#: ../src/mainwindow.c:737 ../src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "Създаване на правило за _филтриране"
 
-#: ../src/mainwindow.c:736 ../src/mainwindow.c:742 ../src/messageview.c:319
+#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/messageview.c:319
 #: ../src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Автоматично"
@@ -7460,7 +7539,7 @@ msgstr "_Автоматично"
 #. FILTER_BY_AUTO
 #. radio SORT_BY_THREAD_DATE
 #. FILTER_BY_AUTO
-#: ../src/mainwindow.c:737 ../src/mainwindow.c:743 ../src/mainwindow.c:845
+#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/mainwindow.c:848
 #: ../src/messageview.c:320 ../src/messageview.c:326
 msgid "By _From"
 msgstr "По по_дател"
@@ -7468,420 +7547,409 @@ msgstr "По по_дател"
 #. FILTER_BY_FROM
 #. radio SORT_BY_FROM
 #. FILTER_BY_FROM
-#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/mainwindow.c:846
+#: ../src/mainwindow.c:740 ../src/mainwindow.c:746 ../src/mainwindow.c:849
 #: ../src/messageview.c:321 ../src/messageview.c:327
 msgid "By _To"
 msgstr "По _получател"
 
 #. FILTER_BY_TO
-#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/messageview.c:322
+#: ../src/mainwindow.c:741 ../src/mainwindow.c:747 ../src/messageview.c:322
 #: ../src/messageview.c:328
 msgid "By _Subject"
 msgstr "По _относно"
 
 #. FILTER_BY_SUBJECT
-#: ../src/mainwindow.c:741 ../src/messageview.c:324 ../src/summaryview.c:432
+#: ../src/mainwindow.c:743 ../src/messageview.c:324 ../src/summaryview.c:432
 msgid "Create processing rule"
 msgstr "Създаване на правило за обработка"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:748 ../src/messageview.c:332
+#: ../src/mainwindow.c:750 ../src/messageview.c:332
 msgid "List _URLs..."
 msgstr "Списък с _URL-адреси..."
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:755
+#: ../src/mainwindow.c:757
 msgid "Ch_eck for new messages in all folders"
 msgstr "Проверка за _нови писма във всички папки"
 
-#: ../src/mainwindow.c:756
+#: ../src/mainwindow.c:758
 msgid "Delete du_plicated messages"
 msgstr "Изтриване на повтарящите се _писма"
 
-#: ../src/mainwindow.c:757
+#: ../src/mainwindow.c:759
 msgid "In selected folder"
 msgstr "В избраната папка"
 
-#: ../src/mainwindow.c:758
+#: ../src/mainwindow.c:760
 msgid "In all folders"
 msgstr "Във всички папки"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:761
+#: ../src/mainwindow.c:763
 msgid "E_xecute"
 msgstr "И_зпълнение"
 
-#: ../src/mainwindow.c:762
+#: ../src/mainwindow.c:764
 msgid "Exp_unge"
 msgstr ""
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:765
+#: ../src/mainwindow.c:767
 msgid "SSL cer_tificates"
 msgstr "SSL-сертификати"
 
-#: ../src/mainwindow.c:769
+#: ../src/mainwindow.c:771
 msgid "Filtering Lo_g"
 msgstr "Дневник на _филтрирането"
 
-#: ../src/mainwindow.c:771
+#: ../src/mainwindow.c:773
 msgid "Network _Log"
 msgstr "Мрежов _дневник"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:773
+#: ../src/mainwindow.c:775
 msgid "_Forget all session passwords"
 msgstr "_Забравяне на всички пароли за сесията"
 
 #. Configuration menu
-#: ../src/mainwindow.c:776
+#: ../src/mainwindow.c:778
 msgid "C_hange current account"
 msgstr "_Смяна на текущата сметка"
 
-#: ../src/mainwindow.c:778
+#: ../src/mainwindow.c:780
 msgid "_Preferences for current account..."
 msgstr "Настройки на _текущата сметка..."
 
-#: ../src/mainwindow.c:779
+#: ../src/mainwindow.c:781
 msgid "Create _new account..."
 msgstr "Създаване на _нова сметка..."
 
-#: ../src/mainwindow.c:780
+#: ../src/mainwindow.c:782
 msgid "_Edit accounts..."
 msgstr "Редактиране на _сметките..."
 
-#: ../src/mainwindow.c:783
+#: ../src/mainwindow.c:785
 msgid "P_references..."
 msgstr "_Настройки..."
 
-#: ../src/mainwindow.c:784
+#: ../src/mainwindow.c:786
 msgid "Pre-pr_ocessing..."
 msgstr "Обработка пре_ди..."
 
-#: ../src/mainwindow.c:785
+#: ../src/mainwindow.c:787
 msgid "Post-pro_cessing..."
 msgstr "Обработка _след..."
 
-#: ../src/mainwindow.c:786
+#: ../src/mainwindow.c:788
 msgid "_Filtering..."
 msgstr "_Филтриране..."
 
-#: ../src/mainwindow.c:787
+#: ../src/mainwindow.c:789
 msgid "_Templates..."
 msgstr "_Шаблони..."
 
-#: ../src/mainwindow.c:788
+#: ../src/mainwindow.c:790
 msgid "_Actions..."
 msgstr "_Действия..."
 
-#: ../src/mainwindow.c:789
+#: ../src/mainwindow.c:791
 msgid "Tag_s..."
 msgstr "Ети_кети..."
 
 #. {"Configuration/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:791
+#: ../src/mainwindow.c:793
 msgid "Plu_gins..."
 msgstr "При_ставки"
 
 #. Help menu
-#: ../src/mainwindow.c:794
+#: ../src/mainwindow.c:796
 msgid "_Manual"
 msgstr "_Наръчник"
 
-#: ../src/mainwindow.c:795
+#: ../src/mainwindow.c:797
 msgid "_Online User-contributed FAQ"
 msgstr "_Потребителски препоръки в мрежата"
 
-#: ../src/mainwindow.c:796
+#: ../src/mainwindow.c:798
 msgid "Icon _Legend"
 msgstr "О_бяснение на иконите"
 
-#: ../src/mainwindow.c:798
+#: ../src/mainwindow.c:800
 msgid "Set as default client"
 msgstr "Задаване като клиент по подразбиране"
 
-#: ../src/mainwindow.c:805
+#: ../src/mainwindow.c:807
 msgid "Offline _mode"
 msgstr "Из_ключен режим"
 
 #. toggle
-#: ../src/mainwindow.c:806
+#: ../src/mainwindow.c:808
+msgid "Men_ubar"
+msgstr "Лента за _меню"
+
+#. toggle
+#: ../src/mainwindow.c:809
 msgid "_Message view"
-msgstr ""
+msgstr "_Изглед на писмо"
 
-#: ../src/mainwindow.c:808
+#: ../src/mainwindow.c:811
 msgid "Status _bar"
 msgstr "Лента за _състояние"
 
-#: ../src/mainwindow.c:810
+#: ../src/mainwindow.c:813
 msgid "Column headers"
 msgstr "Заглавия на колоните"
 
 #. toggle
-#: ../src/mainwindow.c:811
+#: ../src/mainwindow.c:814
 msgid "Th_read view"
 msgstr "Ни_шков изглед"
 
 #. toggle
-#: ../src/mainwindow.c:812
-#, fuzzy
+#: ../src/mainwindow.c:815
 msgid "Hide read threads"
-msgstr "_Скриване на прочетените писма"
+msgstr "Скриване на прочетените нишки"
 
 #. toggle
-#: ../src/mainwindow.c:813
+#: ../src/mainwindow.c:816
 msgid "_Hide read messages"
 msgstr "_Скриване на прочетените писма"
 
 #. toggle
-#: ../src/mainwindow.c:814
+#: ../src/mainwindow.c:817
 msgid "Hide deleted messages"
 msgstr "Скриване на изтритите писма"
 
 #. toggle
-#: ../src/mainwindow.c:815
+#: ../src/mainwindow.c:818
 msgid "_Fullscreen"
 msgstr "_Пълен екран"
 
 #. toggle
-#: ../src/mainwindow.c:816 ../src/messageview.c:344
+#: ../src/mainwindow.c:819 ../src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Показване на всички _заглавки"
 
 #. toggle
-#: ../src/mainwindow.c:817 ../src/messageview.c:345
-#, fuzzy
+#: ../src/mainwindow.c:820 ../src/messageview.c:345
 msgid "_Collapse all"
-msgstr "_Свиване на всички нишки"
+msgstr "_Свиване на всички"
 
 #. 1 toggle
-#: ../src/mainwindow.c:818 ../src/messageview.c:346
-#, fuzzy
+#: ../src/mainwindow.c:821 ../src/messageview.c:346
 msgid "Collapse from level _2"
-msgstr "Сгъване след ниво _2"
+msgstr "Свиване след ниво _2"
 
 #. 2 toggle
-#: ../src/mainwindow.c:819 ../src/messageview.c:347
-#, fuzzy
+#: ../src/mainwindow.c:822 ../src/messageview.c:347
 msgid "Collapse from level _3"
-msgstr "Сгъване след ниво _3"
+msgstr "Свиване след ниво _3"
 
 #. toggle_toolbar_cb
-#: ../src/mainwindow.c:823
+#: ../src/mainwindow.c:826
 msgid "Text _below icons"
 msgstr "Текст _под иконите"
 
 #. radio TOOLBAR_BOTH
-#: ../src/mainwindow.c:824
+#: ../src/mainwindow.c:827
 msgid "Text be_side icons"
 msgstr "Текст _до иконите"
 
 #. radio TOOLBAR_BOTH_HORIZ
-#: ../src/mainwindow.c:825
+#: ../src/mainwindow.c:828
 msgid "_Icons only"
 msgstr "Само _икони"
 
 #. radio TOOLBAR_ICON
-#: ../src/mainwindow.c:826
+#: ../src/mainwindow.c:829
 msgid "_Text only"
 msgstr "Само _текст"
 
 #. set_layout_cb
-#: ../src/mainwindow.c:833
+#: ../src/mainwindow.c:836
 msgid "_Standard"
 msgstr "_Стандартно"
 
 #. radio NORMAL_LAYOUT
-#: ../src/mainwindow.c:834
+#: ../src/mainwindow.c:837
 msgid "_Three columns"
 msgstr "В _три колони"
 
 #. radio VERTICAL_LAYOUT
-#: ../src/mainwindow.c:835
+#: ../src/mainwindow.c:838
 msgid "_Wide message"
 msgstr "_Широко писмо"
 
 #. radio WIDE_LAYOUT
-#: ../src/mainwindow.c:836
+#: ../src/mainwindow.c:839
 msgid "W_ide message list"
 msgstr "Широк _списък с писмата"
 
 #. radio WIDE_MSGLIST_LAYOUT
-#: ../src/mainwindow.c:837
+#: ../src/mainwindow.c:840
 msgid "S_mall screen"
 msgstr "_Малък екран"
 
 #. sort_summary_cb
-#: ../src/mainwindow.c:841
-#, fuzzy
+#: ../src/mainwindow.c:844
 msgid "By _number"
-msgstr "по _брой"
+msgstr "По _брой"
 
 #. radio SORT_BY_NUMBER
-#: ../src/mainwindow.c:842
-#, fuzzy
+#: ../src/mainwindow.c:845
 msgid "By s_ize"
-msgstr "по _размер"
+msgstr "По _размер"
 
 #. radio SORT_BY_SIZE
-#: ../src/mainwindow.c:843
+#: ../src/mainwindow.c:846
 msgid "By _date"
-msgstr ""
+msgstr "По _дата"
 
 #. radio SORT_BY_DATE
-#: ../src/mainwindow.c:844
-#, fuzzy
+#: ../src/mainwindow.c:847
 msgid "By thread date"
-msgstr "по дата на нишката"
+msgstr "По дата на нишката"
 
 #. radio SORT_BY_TO
-#: ../src/mainwindow.c:847
-#, fuzzy
+#: ../src/mainwindow.c:850
 msgid "By s_ubject"
 msgstr "По _относно"
 
 #. radio SORT_BY_SUBJECT
-#: ../src/mainwindow.c:848
-#, fuzzy
+#: ../src/mainwindow.c:851
 msgid "By _color label"
-msgstr "по _цветен етикет"
+msgstr "По _цветен етикет"
 
 #. radio SORT_BY_LABEL
-#: ../src/mainwindow.c:849
-#, fuzzy
+#: ../src/mainwindow.c:852
 msgid "By tag"
-msgstr "Които и да са етикети"
+msgstr "По етикет"
 
 #. radio SORT_BY_TAGS
-#: ../src/mainwindow.c:850
-#, fuzzy
+#: ../src/mainwindow.c:853
 msgid "By _mark"
-msgstr "_Размаркиране"
+msgstr "По _маркиране"
 
 #. radio SORT_BY_MARK
-#: ../src/mainwindow.c:851
-#, fuzzy
+#: ../src/mainwindow.c:854
 msgid "By _status"
-msgstr "по _състояние"
+msgstr "По _състояние"
 
 #. radio SORT_BY_STATUS
-#: ../src/mainwindow.c:852
-#, fuzzy
+#: ../src/mainwindow.c:855
 msgid "By a_ttachment"
-msgstr "по п_рикрепки"
+msgstr "По п_рикрепки"
 
 #. radio SORT_BY_MIME
-#: ../src/mainwindow.c:853
-#, fuzzy
+#: ../src/mainwindow.c:856
 msgid "By score"
-msgstr "по оценка"
+msgstr "По оценка"
 
 #. radio SORT_BY_SCORE
-#: ../src/mainwindow.c:854
-#, fuzzy
+#: ../src/mainwindow.c:857
 msgid "By locked"
-msgstr "по заключване"
+msgstr "По заключване"
 
 #. radio SORT_BY_LOCKED
-#: ../src/mainwindow.c:855
+#: ../src/mainwindow.c:858
 msgid "D_on't sort"
 msgstr "Да не се _подрежда"
 
 #. sort_summary_type_cb
-#: ../src/mainwindow.c:859
+#: ../src/mainwindow.c:862
 msgid "Ascending"
 msgstr "Възходящо"
 
 #. radio SORT_ASCENDING
-#: ../src/mainwindow.c:860
+#: ../src/mainwindow.c:863
 msgid "Descending"
 msgstr "Низходящо"
 
-#: ../src/mainwindow.c:901 ../src/messageview.c:388
+#: ../src/mainwindow.c:904 ../src/messageview.c:388
 msgid "_Auto detect"
 msgstr "_Автоматично откриване"
 
-#: ../src/mainwindow.c:1298 ../src/summaryview.c:6236
+#: ../src/mainwindow.c:1301 ../src/summaryview.c:6236
 msgid "Apply tags..."
 msgstr "Прилагане на етикетите..."
 
-#: ../src/mainwindow.c:1936
+#: ../src/mainwindow.c:1943
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 
-#: ../src/mainwindow.c:1951
+#: ../src/mainwindow.c:1958
 msgid "You are online. Click the icon to go offline"
-msgstr ""
+msgstr "Включени сте към мрежата Натиснете иконата за изключване"
 
-#: ../src/mainwindow.c:1954
+#: ../src/mainwindow.c:1961
 msgid "You are offline. Click the icon to go online"
-msgstr ""
+msgstr "Изключени сте от мрежата. Натиснете иконата за свързване"
 
-#: ../src/mainwindow.c:1968
+#: ../src/mainwindow.c:1975
 msgid "Select account"
 msgstr "Избор на сметка"
 
 #. init log instances data before creating log views
 #. Protocol log
-#: ../src/mainwindow.c:1995 ../src/prefs_logging.c:140
+#: ../src/mainwindow.c:2002 ../src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Мрежов дневник"
 
-#: ../src/mainwindow.c:1999
-#, fuzzy
+#: ../src/mainwindow.c:2006
 msgid "Filtering/Processing debug log"
-msgstr "Настройка на филтрирането и обработката"
+msgstr ""
 
-#: ../src/mainwindow.c:2018 ../src/prefs_logging.c:392
+#: ../src/mainwindow.c:2025 ../src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr ""
 
-#: ../src/mainwindow.c:2020 ../src/prefs_logging.c:394
+#: ../src/mainwindow.c:2027 ../src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr ""
 
-#: ../src/mainwindow.c:2460 ../src/mainwindow.c:2467 ../src/mainwindow.c:2510
-#: ../src/mainwindow.c:2543 ../src/mainwindow.c:2575 ../src/mainwindow.c:2620
+#: ../src/mainwindow.c:2470 ../src/mainwindow.c:2477 ../src/mainwindow.c:2520
+#: ../src/mainwindow.c:2553 ../src/mainwindow.c:2585 ../src/mainwindow.c:2630
 #: ../src/plugins/notification/notification_trayicon.c:360
-#: ../src/prefs_folder_item.c:1065
+#: ../src/plugins/rssyl/opml_import.c:73 ../src/prefs_folder_item.c:1065
 msgid "Untitled"
 msgstr "Неозаглавено"
 
-#: ../src/mainwindow.c:2621 ../src/prefs_summary_open.c:114
+#: ../src/mainwindow.c:2631 ../src/prefs_summary_open.c:114
 msgid "none"
 msgstr "без"
 
-#: ../src/mainwindow.c:2878 ../src/mainwindow.c:2882
+#: ../src/mainwindow.c:2888 ../src/mainwindow.c:2892
 msgid "Delete all messages in trash folders?"
 msgstr "Да се изтрият ли всички писма от кошчетата?"
 
-#: ../src/mainwindow.c:2879
+#: ../src/mainwindow.c:2889
 msgid "Don't quit"
 msgstr "Да не се излиза"
 
-#: ../src/mainwindow.c:2908 ../src/plugins/mailmbox/plugin_gtk.c:189
+#: ../src/mainwindow.c:2918 ../src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Добавяне на пощенска кутия"
 
-#: ../src/mainwindow.c:2909
+#: ../src/mainwindow.c:2919
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
 
-#: ../src/mainwindow.c:2915 ../src/plugins/mailmbox/plugin_gtk.c:196
-#: ../src/plugins/rssyl/rssyl_gtk.c:158
+#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:196
+#: ../src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Пощенска кутия \"%s\" вече съществува."
 
-#: ../src/mainwindow.c:2920 ../src/plugins/mailmbox/plugin_gtk.c:202
+#: ../src/mainwindow.c:2930 ../src/plugins/mailmbox/plugin_gtk.c:202
 #: ../src/setup.c:52 ../src/wizard.c:741
 msgid "Mailbox"
 msgstr "Пощенска кутия"
 
-#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:209
+#: ../src/mainwindow.c:2935 ../src/plugins/mailmbox/plugin_gtk.c:209
 #: ../src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
@@ -7889,134 +7957,137 @@ msgid ""
 "there."
 msgstr ""
 
-#: ../src/mainwindow.c:3377
+#: ../src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "Не е разрешено изпращането"
 
-#: ../src/mainwindow.c:3955
+#: ../src/mainwindow.c:3965
 msgid "Mbox import has failed."
 msgstr "Грешка при внасяне на mbox-файла."
 
-#: ../src/mainwindow.c:3964 ../src/mainwindow.c:3973
+#: ../src/mainwindow.c:3974 ../src/mainwindow.c:3983
 msgid "Export to mbox has failed."
 msgstr "Грешка при изнасяне в mbox-файл."
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit"
 msgstr "Спиране на програмата"
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit Claws Mail?"
 msgstr "Да се спре ли Claws Mail?"
 
-#: ../src/mainwindow.c:4205
+#: ../src/mainwindow.c:4215
 msgid "Folder synchronisation"
 msgstr "Синхронизиране на папките"
 
-#: ../src/mainwindow.c:4206
+#: ../src/mainwindow.c:4216
 msgid "Do you want to synchronise your folders now?"
 msgstr "Искате да синхронизирате папките си сега?"
 
-#: ../src/mainwindow.c:4207
+#: ../src/mainwindow.c:4217
 msgid "+_Synchronise"
 msgstr "+_Синхронизиране"
 
-#: ../src/mainwindow.c:4636
+#: ../src/mainwindow.c:4659
 msgid "Deleting duplicated messages..."
 msgstr "Изтриване на повтарящите се писма..."
 
-#: ../src/mainwindow.c:4673
+#: ../src/mainwindow.c:4696
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Изтрито е %d повтарящо се писмо в %d папки.\n"
 msgstr[1] "Изтрити са %d повтарящи се писма в %d папки.\n"
 
-#: ../src/mainwindow.c:4928 ../src/summaryview.c:5725
+#: ../src/mainwindow.c:4951 ../src/summaryview.c:5725
 msgid "Processing rules to apply before folder rules"
 msgstr ""
 
-#: ../src/mainwindow.c:4936
+#: ../src/mainwindow.c:4959
 msgid "Processing rules to apply after folder rules"
 msgstr ""
 
-#: ../src/mainwindow.c:4944 ../src/summaryview.c:5736
+#: ../src/mainwindow.c:4967 ../src/summaryview.c:5736
 msgid "Filtering configuration"
 msgstr "Настройка на филтрирането"
 
-#: ../src/mainwindow.c:5059
+#: ../src/mainwindow.c:5082
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
+"Грешка при настройване като клиент по подразбиране: не се открива път до "
+"програмата."
 
-#: ../src/mainwindow.c:5118
+#: ../src/mainwindow.c:5141
 msgid "Claws Mail has been registered as default client."
-msgstr ""
+msgstr "Claws Mail е настроен като клиент по подразбиране."
 
-#: ../src/mainwindow.c:5120
+#: ../src/mainwindow.c:5143
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
+"Грешка при настройване като клиент по подразбиране: не може да се запише в "
+"регистъра."
 
-#: ../src/mainwindow.c:5278
+#: ../src/mainwindow.c:5301
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/matcher.c:209 ../src/matcher.c:210 ../src/matcher.c:211
-#: ../src/matcher.c:212 ../src/matcher.c:213 ../src/matcher.c:214
-#: ../src/matcher.c:215
+#: ../src/matcher.c:211 ../src/matcher.c:212 ../src/matcher.c:213
+#: ../src/matcher.c:214 ../src/matcher.c:215 ../src/matcher.c:216
+#: ../src/matcher.c:217
 #, c-format
 msgid "%s header"
 msgstr "Заглавка %s"
 
-#: ../src/matcher.c:216
+#: ../src/matcher.c:218
 msgid "header"
 msgstr "заглавка"
 
-#: ../src/matcher.c:217
+#: ../src/matcher.c:219
 msgid "header line"
 msgstr ""
 
-#: ../src/matcher.c:218
+#: ../src/matcher.c:220
 msgid "body line"
 msgstr ""
 
-#: ../src/matcher.c:219
-#, fuzzy
+#: ../src/matcher.c:221
 msgid "tag"
-msgstr "етикети"
+msgstr "етикет"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553 ../src/message_search.c:205 ../src/prefs_matcher.c:739
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555 ../src/message_search.c:205 ../src/prefs_matcher.c:742
 #: ../src/summary_search.c:466
 msgid "Case sensitive"
 msgstr "Чувствителност към регистъра"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555
 msgid "Case insensitive"
 msgstr "Чувствителност към регистъра"
 
-#: ../src/matcher.c:1818
+#: ../src/matcher.c:1843
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr ""
 
-#: ../src/matcher.c:1887 ../src/matcher.c:1906 ../src/matcher.c:1919
+#: ../src/matcher.c:1912 ../src/matcher.c:1931 ../src/matcher.c:1944
 msgid "message matches\n"
 msgstr ""
 
-#: ../src/matcher.c:1894 ../src/matcher.c:1912 ../src/matcher.c:1921
+#: ../src/matcher.c:1919 ../src/matcher.c:1937 ../src/matcher.c:1946
 msgid "message does not match\n"
 msgstr ""
 
-#: ../src/matcher.c:2184 ../src/matcher.c:2185 ../src/matcher.c:2186
-#: ../src/matcher.c:2187 ../src/matcher.c:2188 ../src/matcher.c:2189
-#: ../src/matcher.c:2190 ../src/matcher.c:2191
+#: ../src/matcher.c:2209 ../src/matcher.c:2210 ../src/matcher.c:2211
+#: ../src/matcher.c:2212 ../src/matcher.c:2213 ../src/matcher.c:2214
+#: ../src/matcher.c:2215 ../src/matcher.c:2216
 msgid "(none)"
 msgstr "(без)"
 
@@ -8033,8 +8104,8 @@ msgstr ""
 #, c-format
 msgid "Importing from mbox... (%d mail imported)"
 msgid_plural "Importing from mbox... (%d mails imported)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Внасяне от mbox... (внесено %d писмо)"
+msgstr[1] "Внасяне от mbox... (внесени %d писма)"
 
 #: ../src/mbox.c:554
 msgid "Overwrite mbox file"
@@ -8044,8 +8115,8 @@ msgstr "Презаписване на mbox-файла"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Файлът вече съществува. Да се презапише ли?"
 
-#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1843
-#: ../src/prefs_themes.c:555 ../src/textview.c:3075
+#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1844
+#: ../src/prefs_themes.c:555 ../src/textview.c:3054
 msgid "Overwrite"
 msgstr "Презаписване"
 
@@ -8131,7 +8202,7 @@ msgstr ""
 msgid "Fetching message (%s)..."
 msgstr "Изтегляне на писмо (%s)..."
 
-#: ../src/messageview.c:1357 ../src/procmime.c:1004
+#: ../src/messageview.c:1357 ../src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Грешка при дешифриране: %s"
@@ -8139,10 +8210,11 @@ msgstr "Грешка при дешифриране: %s"
 #: ../src/messageview.c:1438 ../src/messageview.c:1446
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
+"Съобщението не отговаря на стандарта MIME. Може да не се показва правилно."
 
-#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1996
-#: ../src/plugins/fancy/fancy_viewer.c:667 ../src/summaryview.c:4808
-#: ../src/summaryview.c:4811 ../src/textview.c:3063
+#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1997
+#: ../src/plugins/fancy/fancy_viewer.c:669 ../src/summaryview.c:4808
+#: ../src/summaryview.c:4811 ../src/textview.c:3042
 msgid "Save as"
 msgstr "Запазване като"
 
@@ -8163,7 +8235,7 @@ msgstr "Показване на всички %s."
 
 #: ../src/messageview.c:1910
 msgid "Only the first megabyte of text is shown."
-msgstr ""
+msgstr "Показва се само първият мегабайт от текста."
 
 #: ../src/messageview.c:1941
 msgid ""
@@ -8244,7 +8316,7 @@ msgid ""
 "notification:"
 msgstr ""
 
-#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_gtk.c:494
+#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_feed_props.c:533
 msgid "_Cancel"
 msgstr "_Отказ"
 
@@ -8257,41 +8329,44 @@ msgid "Cannot print: the message doesn't contain text."
 msgstr "Не може да се отпечата, защото писмото не съдържа текст."
 
 #: ../src/messageview.c:2929
-#, fuzzy
 msgid ""
 "\n"
 "  There are no messages in this folder"
-msgstr "Да се изтрият ли всички писма от кошчетата?"
+msgstr ""
+"\n"
+"  Няма писма в тази папка"
 
 #: ../src/messageview.c:2937
-#, fuzzy
 msgid ""
 "\n"
 "  Message has been deleted"
-msgstr "На писмото е отговорено"
+msgstr ""
+"\n"
+"  Писмото е изтрито"
 
 #: ../src/messageview.c:2938
-#, fuzzy
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
-msgstr "На писмото е отговорено"
+msgstr ""
+"\n"
+"  Писмото е изтрито или преместено в друга папка"
 
 #: ../src/messageview.c:2971 ../src/messageview.c:2977
-#: ../src/summaryview.c:4191 ../src/summaryview.c:6964
+#: ../src/summaryview.c:4193 ../src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "Грешка по време на обучение.\n"
 
-#: ../src/mh.c:432
+#: ../src/mh.c:438
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "грешка при копиране на писмото %s в %s\n"
 
-#: ../src/mh.c:518
+#: ../src/mh.c:524
 msgid "Moving messages..."
 msgstr "Преместване на писмата..."
 
-#: ../src/mh.c:662 ../src/plugins/mailmbox/mailmbox_folder.c:839
+#: ../src/mh.c:668 ../src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Изтриване на писмата..."
 
@@ -8301,7 +8376,7 @@ msgid "Remove _mailbox..."
 msgstr "Премахване на _кутията..."
 
 #: ../src/mh_gtk.c:358 ../src/plugins/mailmbox/plugin_gtk.c:290
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
 "(The messages are NOT deleted from the disk)"
@@ -8314,24 +8389,20 @@ msgid "Remove mailbox"
 msgstr "Премахване на кутията"
 
 #: ../src/mimeview.c:193
-#, fuzzy
 msgid "_Open"
-msgstr "Отваряне"
+msgstr "_Отваряне"
 
 #: ../src/mimeview.c:195
-#, fuzzy
 msgid "Open _with..."
-msgstr "\"Отваряне с...\""
+msgstr "Отваряне _с..."
 
 #: ../src/mimeview.c:197
-#, fuzzy
 msgid "Send to..."
-msgstr "Изпращане на _чакащите..."
+msgstr "Изпращане на…"
 
 #: ../src/mimeview.c:198
-#, fuzzy
 msgid "_Display as text"
-msgstr "\"Показване като текст\""
+msgstr "_Показване като текст"
 
 #: ../src/mimeview.c:199
 msgid "_Save as..."
@@ -8366,13 +8437,14 @@ msgstr ""
 
 #: ../src/mimeview.c:1077
 msgid "Timeout checking the signature. Click the icon to try again."
-msgstr ""
+msgstr "Просрочена проверка на подписа. Натиснете иконата за опит отново."
 
 #: ../src/mimeview.c:1079
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
+"Просрочена проверка на подписа. Натиснете иконата или \"%s\" за опит отново."
 
 #: ../src/mimeview.c:1319
 msgid "Checking signature..."
@@ -8382,47 +8454,45 @@ msgstr "Проверка на подписа..."
 msgid "Go back to email"
 msgstr "Връщане към писмото"
 
-#: ../src/mimeview.c:1762 ../src/mimeview.c:1851 ../src/mimeview.c:2043
-#: ../src/mimeview.c:2079 ../src/mimeview.c:2191
-#: ../src/plugins/fancy/fancy_viewer.c:420
+#: ../src/mimeview.c:1763 ../src/mimeview.c:1852 ../src/mimeview.c:2044
+#: ../src/mimeview.c:2080 ../src/mimeview.c:2192
+#: ../src/plugins/fancy/fancy_viewer.c:422
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Грешка при записване на част от многосъставно писмо: %s"
 
-#: ../src/mimeview.c:1840 ../src/textview.c:3073
+#: ../src/mimeview.c:1841 ../src/textview.c:3052
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Да се презапише ле съществуващия файл \"%s\"?"
 
-#: ../src/mimeview.c:1882 ../src/plugins/archive/archiver_prefs.c:128
-#, fuzzy
+#: ../src/mimeview.c:1883 ../src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
-msgstr "Избор на папка"
+msgstr "Избиране на папка за запазване"
 
-#: ../src/mimeview.c:1889 ../src/plugins/archive/archiver_prefs.c:134
+#: ../src/mimeview.c:1890 ../src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "\"%s\" не е директория."
 
-#: ../src/mimeview.c:2126 ../src/mimeview.c:2133 ../src/textview.c:2994
+#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2973
 msgid "Open with"
 msgstr "Отваряне с"
 
-#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2995
-#, fuzzy, c-format
+#: ../src/mimeview.c:2128 ../src/mimeview.c:2135 ../src/textview.c:2974
+#, c-format
 msgid ""
 "Enter the command-line to open file:\n"
 "('%s' will be replaced with file name)"
 msgstr ""
-"Въведете аргументите за следното действие:\n"
-"('%%h' ще бъде заместен с аргумента)\n"
-"  %s"
+"Въведете команда за отваряне на файл:\n"
+"(\"%s\" ще се замести с името на файла)"
 
-#: ../src/mimeview.c:2225
+#: ../src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr ""
 
-#: ../src/mimeview.c:2226
+#: ../src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8430,41 +8500,38 @@ msgid ""
 "Do you want to run this file?"
 msgstr ""
 
-#: ../src/mimeview.c:2230
+#: ../src/mimeview.c:2231
 msgid "Run binary"
 msgstr ""
 
-#: ../src/mimeview.c:2529
-#, fuzzy
+#: ../src/mimeview.c:2530
 msgid "Type:"
-msgstr "Вид"
+msgstr "Вид:"
 
-#: ../src/mimeview.c:2530 ../src/plugins/pdf_viewer/poppler_viewer.c:699
-#, fuzzy
+#: ../src/mimeview.c:2531 ../src/plugins/pdf_viewer/poppler_viewer.c:699
 msgid "Size:"
-msgstr "Размер"
+msgstr "Размер:"
 
-#: ../src/mimeview.c:2544 ../src/plugins/vcalendar/vcalendar.c:1271
+#: ../src/mimeview.c:2545 ../src/plugins/vcalendar/vcalendar.c:1271
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1722
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1732
-#, fuzzy
 msgid "Description:"
-msgstr "Описание"
+msgstr "Описание:"
 
 #: ../src/news.c:302
-#, fuzzy, c-format
+#, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
-msgstr "Връзката по IMAP4 с %s е прекъсната. Повторно свързване...\n"
+msgstr "Връзката по NNTP към %s:%d е прекъсната.\n"
 
 #: ../src/news.c:335
-#, fuzzy, c-format
+#, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
-msgstr "Свързване към SMTP сървър: %s..."
+msgstr "Сметка \"%s\": Свързване към сървър NNTP: %s:%d...\n"
 
 #: ../src/news.c:356
-#, fuzzy, c-format
+#, c-format
 msgid "Error logging in to %s:%d...\n"
-msgstr "Грешка при свързване към %s:%d ...\n"
+msgstr "Грешка при свързване към %s:%d...\n"
 
 #.
 #. FIX ME when libetpan implements 480 to indicate authorization
@@ -8497,28 +8564,29 @@ msgstr ""
 
 #. An error state bail out
 #: ../src/news.c:450
-#, fuzzy, c-format
+#, c-format
 msgid "Error creating session with %s:%d\n"
-msgstr "Грешка при свързване към %s:%d ...\n"
+msgstr "Грешка при създаване на сесия към %s:%d...\n"
 
 #: ../src/news.c:465
-#, fuzzy, c-format
+#, c-format
 msgid "Error authenticating to %s:%d...\n"
-msgstr "Грешка при автентификацията към %s:%d·...\n"
+msgstr "Грешка при автентикацията към %s:%d...\n"
 
 #: ../src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
+"Claws Mail има нужда от достъп до мрежата, за да достъпи новинарския сървър."
 
 #: ../src/news.c:861
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't select group: %s\n"
-msgstr "Грешка при дешифриране: %s"
+msgstr "грешка при избиране на група: %s\n"
 
 #: ../src/news.c:1050 ../src/news.c:1220
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't set group: %s\n"
-msgstr "Грешка при дешифриране: %s"
+msgstr "грешка при задаване на група: %s\n"
 
 #: ../src/news.c:1059
 #, c-format
@@ -8535,14 +8603,12 @@ msgid "getting xover %d - %d in %s...\n"
 msgstr ""
 
 #: ../src/news.c:1228
-#, fuzzy
 msgid "couldn't get xover\n"
-msgstr "Грешка при изнасяне на ключа."
+msgstr "грешка при получаване на xover\n"
 
 #: ../src/news.c:1243
-#, fuzzy
 msgid "invalid xover line\n"
-msgstr "неправилен UIDL отговор: %s\n"
+msgstr "неправилен ред xover\n"
 
 #: ../src/news.c:1445
 msgid ""
@@ -8562,109 +8628,107 @@ msgid "_Unsubscribe newsgroup"
 msgstr "_Отписване от новинарската група"
 
 #: ../src/news_gtk.c:266
-#, fuzzy, c-format
+#, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
-msgstr "Отписване от новинарската група"
+msgstr "Наистина ли да се отпише от новинарската група \"%s\"?"
 
 #: ../src/news_gtk.c:267
 msgid "Unsubscribe newsgroup"
 msgstr "Отписване от новинарската група"
 
-#: ../src/news_gtk.c:268 ../src/plugins/rssyl/rssyl_gtk.c:695
+#: ../src/news_gtk.c:268
 msgid "_Unsubscribe"
 msgstr "_Отписване"
 
 #: ../src/news_gtk.c:307
-#, fuzzy
 msgid "Rename newsgroup folder"
-msgstr "Преименуване на папка"
+msgstr "Преименуване на папка с новини"
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:51
-#, fuzzy
 msgid "Acpi Notifier"
-msgstr "оповестител"
+msgstr "Уведомяване през Acpi"
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:67
 msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
 msgstr ""
+"Уверете се, че е зареден модулът на ядрото \"acerhk\".\n"
+"Можете да го вземете от http://www.cakey.de/acerhk/"
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:69
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
 msgstr ""
+"Уверете се, че е зареден модулът на ядрото \"acer_acpi\".\n"
+"Можете да го вземете от http://code.google.com/p/aceracpi/"
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:71
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
-msgstr ""
+msgstr "Уверете се, че е зареден модулът на ядрото \"asus_laptop\"."
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:72
 msgid "Make sure that the kernel module 'asus_acpi' is loaded."
-msgstr ""
+msgstr "Уверете се, че е зареден модулът на ядрото \"asus_acpi\"."
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:73
 msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
-msgstr ""
+msgstr "Уверете се, че е зареден модулът на ядрото \"ibm_acpi\"."
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:74
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
 msgstr ""
+"Уверете се, че е инсталиран apanelc.\n"
+"Можете да го вземете от http://apanel.sourceforge.net/"
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:207
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:213
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:425
-#, fuzzy
 msgid "Control file doesn't exist."
-msgstr "Подразбиращата се папка за входящи не съществува."
+msgstr "Контролният файл не съществува."
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:305
-#, fuzzy
 msgid " : no new or unread mail"
-msgstr "към първото непрочетено писмо"
+msgstr " : без нова или непрочетена поща"
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:306
-#, fuzzy
 msgid " : unread mail"
-msgstr "към първото непрочетено писмо"
+msgstr " : непрочетена поща"
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:307
-#, fuzzy
 msgid " : new mail"
-msgstr "Претърсване за нова поща"
+msgstr " : нова поща"
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:309
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:315
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:321
 msgid "off"
-msgstr ""
+msgstr "изключено"
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:311
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:317
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:323
 msgid "blinking"
-msgstr ""
+msgstr "мигане"
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:313
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:319
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:325
-#, fuzzy
 msgid "on"
-msgstr "Пн"
+msgstr "вкл"
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:347
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:356
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:371
 msgid "LED "
-msgstr ""
+msgstr "LED "
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:386
-#, fuzzy
 msgid "ACPI type: "
-msgstr "Вид по MIME"
+msgstr "Вид ACPI:"
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:395
 msgid "ACPI file: "
@@ -8692,26 +8756,22 @@ msgstr ""
 
 #: ../src/plugins/address_keeper/address_keeper.c:254
 #: ../src/plugins/attachwarner/attachwarner.c:252
-#, fuzzy
 msgid "Failed to register check before send hook"
-msgstr "Грешка при създаване на папката"
+msgstr ""
 
 #: ../src/plugins/address_keeper/address_keeper.c:294
-#, fuzzy
 msgid "Keeps all recipient addresses in an addressbook folder."
-msgstr "Показване на подателя според адресника"
+msgstr "Запазване на всички адреси на получатели в папка в адресник."
 
 #: ../src/plugins/address_keeper/address_keeper.c:335
 #: ../src/plugins/address_keeper/address_keeper.h:34
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:249
-#, fuzzy
 msgid "Address Keeper"
-msgstr "Адреси"
+msgstr "Запазване на адреси"
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:104
-#, fuzzy
 msgid "Keep to folder"
-msgstr "Изтриване на папка"
+msgstr "Запазване в папка"
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:112
 msgid "Address book path where addresses are kept"
@@ -8722,55 +8782,47 @@ msgstr ""
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:201
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:447
 #: ../src/prefs_filtering_action.c:573 ../src/prefs_filtering_action.c:580
-#: ../src/prefs_matcher.c:676
-#, fuzzy
+#: ../src/prefs_matcher.c:679
 msgid "Select..."
-msgstr "Избиране ..."
+msgstr "Избор..."
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:130
-#, fuzzy
 msgid "Keep 'To' addresses"
-msgstr "Лични адреси"
+msgstr "Запазване на адреси \"To\""
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:135
-#, fuzzy
 msgid "Keep addresses which appear in 'To' headers"
-msgstr "всички адреси от всички заглавки"
+msgstr "Запазване на всички адреси, срещащи се в полето \"To\""
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:140
-#, fuzzy
 msgid "Keep 'Cc' addresses"
-msgstr "_Събиране на адреси"
+msgstr "Запазване на адреси \"Cc\""
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:145
-#, fuzzy
 msgid "Keep addresses which appear in 'Cc' headers"
-msgstr "всички адреси от всички заглавки"
+msgstr "Запазване на всички адреси, срещащи се в полето \"Cc\""
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:150
-#, fuzzy
 msgid "Keep 'Bcc' addresses"
-msgstr "_Събиране на адреси"
+msgstr "Запазване на адреси \"Bcc\""
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:155
-#, fuzzy
 msgid "Keep addresses which appear in 'Bcc' headers"
-msgstr "всички адреси от всички заглавки"
+msgstr "Запазване на всички адреси, срещащи се в полето \"Bcc\""
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:160
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line):"
-msgstr ""
+msgstr "Изключване на адреси, съвпадащи с регулярен израз (по един на ред):"
 
 #: ../src/plugins/archive/archiver.c:43
 #: ../src/plugins/archive/archiver_prefs.c:93
-#, fuzzy
 msgid "Mail Archiver"
-msgstr "List-Archive"
+msgstr "Архивиране на поща"
 
 #: ../src/plugins/archive/archiver.c:54
 msgid "Create Archive..."
-msgstr ""
+msgstr "Създаване на архив..."
 
 #: ../src/plugins/archive/archiver.c:126
 #, c-format
@@ -8802,69 +8854,65 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/archive/archiver.c:156
-#, fuzzy
 msgid "Archiver"
-msgstr "List-Archive"
+msgstr "Архиватор"
 
 #: ../src/plugins/archive/archiver_gtk.c:104
-#, fuzzy
 msgid "Archiving"
-msgstr "Получаване"
+msgstr "Архивиране"
 
 #: ../src/plugins/archive/archiver_gtk.c:122
 msgid "Press Cancel button to stop archiving"
-msgstr ""
+msgstr "Натиснете бутона за отказ за спиране на архивирането"
 
 #: ../src/plugins/archive/archiver_gtk.c:138
-#, fuzzy
 msgid "Archiving:"
-msgstr "Получаване"
+msgstr "Архивиране:"
 
-#: ../src/plugins/archive/archiver_gtk.c:506
-#, fuzzy
+#: ../src/plugins/archive/archiver_gtk.c:507
 msgid "Folder and archive must be selected"
-msgstr "Удебелените полета са засължителни"
+msgstr "Трябва да изберете папка и архив"
 
-#: ../src/plugins/archive/archiver_gtk.c:515
+#: ../src/plugins/archive/archiver_gtk.c:516
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:518
+#: ../src/plugins/archive/archiver_gtk.c:519
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:521
+#: ../src/plugins/archive/archiver_gtk.c:522
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:524
+#: ../src/plugins/archive/archiver_gtk.c:525
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:527
+#: ../src/plugins/archive/archiver_gtk.c:528
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:564
+#: ../src/plugins/archive/archiver_gtk.c:565
 #, c-format
 msgid ""
 "Not a valid file name:\n"
 "%s."
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:577
+#: ../src/plugins/archive/archiver_gtk.c:578
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
 "%s."
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:606
+#: ../src/plugins/archive/archiver_gtk.c:607
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -8874,206 +8922,190 @@ msgid ""
 "Continue anyway?"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:710
+#: ../src/plugins/archive/archiver_gtk.c:711
 msgid "Archive result"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:740
-#, fuzzy
+#: ../src/plugins/archive/archiver_gtk.c:741
 msgid "Values"
-msgstr "Стойност"
+msgstr "Стойности"
 
-#: ../src/plugins/archive/archiver_gtk.c:749
-#, fuzzy
+#: ../src/plugins/archive/archiver_gtk.c:750
 msgid "Archive"
-msgstr "List-Archive"
+msgstr "Архив"
 
-#: ../src/plugins/archive/archiver_gtk.c:755
-#, fuzzy
+#: ../src/plugins/archive/archiver_gtk.c:756
 msgid "Archive format"
-msgstr "Формат на датата"
+msgstr "Формат на архива"
 
-#: ../src/plugins/archive/archiver_gtk.c:762
+#: ../src/plugins/archive/archiver_gtk.c:763
 msgid "Compression method"
-msgstr ""
+msgstr "Метод на компресия"
 
-#: ../src/plugins/archive/archiver_gtk.c:770
+#: ../src/plugins/archive/archiver_gtk.c:771
 msgid "Number of files"
-msgstr ""
+msgstr "Брой файлове"
 
-#: ../src/plugins/archive/archiver_gtk.c:778
+#: ../src/plugins/archive/archiver_gtk.c:779
 msgid "Archive Size"
-msgstr ""
+msgstr "Размер на архива"
 
-#: ../src/plugins/archive/archiver_gtk.c:786
-#, fuzzy
+#: ../src/plugins/archive/archiver_gtk.c:787
 msgid "Folder Size"
-msgstr "Вид папка"
+msgstr "Размер на папка"
 
-#: ../src/plugins/archive/archiver_gtk.c:795
+#: ../src/plugins/archive/archiver_gtk.c:796
 msgid "Compression level"
-msgstr ""
+msgstr "Ниво на компресия"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:718
 #: ../src/prefs_folder_item.c:514
-#, fuzzy
 msgid "Yes"
-msgstr "да"
+msgstr "Да"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:721
 #: ../src/prefs_folder_item.c:513 ../src/prefs_summaries.c:369
 msgid "No"
 msgstr "Не"
 
-#: ../src/plugins/archive/archiver_gtk.c:803
+#: ../src/plugins/archive/archiver_gtk.c:804
 msgid "MD5 checksum"
-msgstr ""
+msgstr "Контролна сума MD5"
 
-#: ../src/plugins/archive/archiver_gtk.c:811
-#, fuzzy
+#: ../src/plugins/archive/archiver_gtk.c:812
 msgid "Descriptive names"
-msgstr "Описание"
+msgstr "Описателни имена"
 
-#: ../src/plugins/archive/archiver_gtk.c:819
-#, fuzzy
+#: ../src/plugins/archive/archiver_gtk.c:820
 msgid "Delete selected files"
-msgstr "Изберете файл"
+msgstr "Изтриване на избраните файлове"
 
-#: ../src/plugins/archive/archiver_gtk.c:828
-#: ../src/plugins/archive/archiver_gtk.c:1210
-#, fuzzy
+#: ../src/plugins/archive/archiver_gtk.c:829
+#: ../src/plugins/archive/archiver_gtk.c:1211
 msgid "Select mails before"
-msgstr "Избор на файл"
+msgstr "Избор на писма преди"
 
-#: ../src/plugins/archive/archiver_gtk.c:904
+#: ../src/plugins/archive/archiver_gtk.c:905
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:952
+#: ../src/plugins/archive/archiver_gtk.c:953
 #, c-format
 msgid "%ld of %ld"
-msgstr ""
+msgstr "%ld от %ld"
 
-#: ../src/plugins/archive/archiver_gtk.c:991
-#, fuzzy
+#: ../src/plugins/archive/archiver_gtk.c:992
 msgid "Create Archive"
-msgstr "List-Archive"
+msgstr "Създаване на архив"
 
-#: ../src/plugins/archive/archiver_gtk.c:1006
-#, fuzzy
+#: ../src/plugins/archive/archiver_gtk.c:1007
 msgid "Enter Archiver arguments"
-msgstr "Потребителски аргументи на действието"
+msgstr "Въведете аргументи за архиватора"
 
-#: ../src/plugins/archive/archiver_gtk.c:1019
-#, fuzzy
+#: ../src/plugins/archive/archiver_gtk.c:1020
 msgid "Folder to archive"
-msgstr "Вид папка"
+msgstr "Папка за архивиране"
 
-#: ../src/plugins/archive/archiver_gtk.c:1026
+#: ../src/plugins/archive/archiver_gtk.c:1027
 msgid "Folder which is the root of the archive"
-msgstr ""
+msgstr "Родителска папка за архива"
 
-#: ../src/plugins/archive/archiver_gtk.c:1031
+#: ../src/plugins/archive/archiver_gtk.c:1032
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1037
-#, fuzzy
+#: ../src/plugins/archive/archiver_gtk.c:1038
 msgid "Name for archive"
-msgstr "Преглед на архива"
+msgstr "Име на архива"
 
-#: ../src/plugins/archive/archiver_gtk.c:1043
+#: ../src/plugins/archive/archiver_gtk.c:1044
 msgid "Archive location and name"
-msgstr ""
+msgstr "Местоположение и име на архива"
 
-#: ../src/plugins/archive/archiver_gtk.c:1045
+#: ../src/plugins/archive/archiver_gtk.c:1046
 #: ../src/plugins/archive/archiver_prefs.c:198
 #: ../src/plugins/pgpcore/select-keys.c:422
 msgid "_Select"
 msgstr "_Избиране"
 
-#: ../src/plugins/archive/archiver_gtk.c:1048
+#: ../src/plugins/archive/archiver_gtk.c:1049
 msgid "Click this button to select a name and location for the archive"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1050
-#, fuzzy
+#: ../src/plugins/archive/archiver_gtk.c:1051
 msgid "Choose compression"
-msgstr "Писане на ново писмо"
+msgstr "Избор на компресия"
 
-#: ../src/plugins/archive/archiver_gtk.c:1063
+#: ../src/plugins/archive/archiver_gtk.c:1064
 msgid "Choose this option to use ZIP compression for the archive"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1070
+#: ../src/plugins/archive/archiver_gtk.c:1071
 msgid "Choose this option to use BZIP2 compression for the archive"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1078
+#: ../src/plugins/archive/archiver_gtk.c:1079
 msgid "Choose this to use Compress compression for your archive"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1086
+#: ../src/plugins/archive/archiver_gtk.c:1087
 msgid "Choose this option to disable compression for the archive"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1108
-#, fuzzy
+#: ../src/plugins/archive/archiver_gtk.c:1109
 msgid "Choose format"
-msgstr "Формат на датата"
+msgstr "Избор на формат"
 
-#: ../src/plugins/archive/archiver_gtk.c:1121
+#: ../src/plugins/archive/archiver_gtk.c:1122
 msgid "Choose this option to use TAR as format for the archive"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1128
+#: ../src/plugins/archive/archiver_gtk.c:1129
 msgid "Choose this to use SHAR as format for the archive"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1135
+#: ../src/plugins/archive/archiver_gtk.c:1136
 msgid "Choose this option to use CPIO as format for the archive"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1142
+#: ../src/plugins/archive/archiver_gtk.c:1143
 msgid "Choose this option to use PAX as format for the archive"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1162
+#: ../src/plugins/archive/archiver_gtk.c:1163
 msgid "Miscellaneous options"
-msgstr ""
+msgstr "Други опции"
 
-#: ../src/plugins/archive/archiver_gtk.c:1171
-#, fuzzy
+#: ../src/plugins/archive/archiver_gtk.c:1172
 msgid "_Recursive"
-msgstr "Рекурсивно"
+msgstr "_Рекурсивно"
 
-#: ../src/plugins/archive/archiver_gtk.c:1175
+#: ../src/plugins/archive/archiver_gtk.c:1176
 msgid "Choose this option to include subfolders in the archive"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1177
+#: ../src/plugins/archive/archiver_gtk.c:1178
 msgid "_MD5sum"
-msgstr ""
+msgstr "_MD5sum"
 
-#: ../src/plugins/archive/archiver_gtk.c:1181
+#: ../src/plugins/archive/archiver_gtk.c:1182
 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"
 "will take to create the archive"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1185
-#, fuzzy
+#: ../src/plugins/archive/archiver_gtk.c:1186
 msgid "R_ename"
-msgstr "Пре_именуване на папка..."
+msgstr "_Преименуване"
 
-#: ../src/plugins/archive/archiver_gtk.c:1189
+#: ../src/plugins/archive/archiver_gtk.c:1190
 #: ../src/plugins/archive/archiver_prefs.c:333
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9081,36 +9113,33 @@ msgid ""
 "Names will be truncated to max 96 characters"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1197
+#: ../src/plugins/archive/archiver_gtk.c:1198
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1201
-#, fuzzy
+#: ../src/plugins/archive/archiver_gtk.c:1202
 msgid "Selection options"
-msgstr "Настройки за отговор до подателя"
+msgstr "Настройки за избирането"
 
-#: ../src/plugins/archive/archiver_gtk.c:1217
+#: ../src/plugins/archive/archiver_gtk.c:1218
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
 msgstr ""
 
 #: ../src/plugins/archive/archiver_prefs.c:190
-#, fuzzy
 msgid "Default save folder"
-msgstr "Изтриване на папка"
+msgstr "Подразбираща се папка за запис"
 
 #: ../src/plugins/archive/archiver_prefs.c:202
 msgid "Click this button to select the default location for saving archives"
 msgstr ""
 
 #: ../src/plugins/archive/archiver_prefs.c:211
-#, fuzzy
 msgid "Default compression"
-msgstr "Речник по подразбиране"
+msgstr "Компресия по подразбиране"
 
 #: ../src/plugins/archive/archiver_prefs.c:223
 msgid "Choose this option to use ZIP compression by default"
@@ -9129,9 +9158,8 @@ msgid "Choose this option to disable compression by default"
 msgstr ""
 
 #: ../src/plugins/archive/archiver_prefs.c:265
-#, fuzzy
 msgid "Default format"
-msgstr "Формат на датата"
+msgstr "Формат по подразбиране"
 
 #: ../src/plugins/archive/archiver_prefs.c:277
 msgid "Choose this option to use the TAR format by default"
@@ -9155,11 +9183,11 @@ msgstr ""
 
 #: ../src/plugins/archive/archiver_prefs.c:324
 msgid "Choose this option to include subfolders in the archives by default"
-msgstr ""
+msgstr "Изберете това за включване по подразбиране на под-папките в архивите"
 
 #: ../src/plugins/archive/archiver_prefs.c:325
 msgid "MD5sum"
-msgstr ""
+msgstr "MD5 сума"
 
 #: ../src/plugins/archive/archiver_prefs.c:327
 msgid ""
@@ -9170,35 +9198,95 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/archive/archiver_prefs.c:331
-#, fuzzy
 msgid "Rename"
-msgstr "Пре_именуване на папка..."
+msgstr "Преименуване"
 
 #: ../src/plugins/archive/archiver_prefs.c:339
 msgid "Choose this option to delete mails after archiving"
-msgstr ""
+msgstr "Изберете това за изтриване на пощата след архивиране"
 
-#: ../src/plugins/attachwarner/attachwarner.c:216
-#, c-format
-msgid ""
-"An attachment is mentioned in the mail you're sending, but no file was "
-"attached. Mention appears on line %d, which begins with text: <span weight="
-"\"bold\">%.20s</span>...\n"
-"\n"
-"%s it anyway?"
-msgstr ""
+#: ../src/plugins/att_remover/att_remover.c:299
+msgid "<b>Type: </b>"
+msgstr "<b>Вид: </b>"
 
-#: ../src/plugins/attachwarner/attachwarner.c:220
-#, fuzzy
-msgid "Attachment warning"
-msgstr "Прикрепка"
+#: ../src/plugins/att_remover/att_remover.c:300
+msgid "<b>Size: </b>"
+msgstr "<b>Размер: </b>"
 
-#: ../src/plugins/attachwarner/attachwarner.c:245
+#: ../src/plugins/att_remover/att_remover.c:301
+msgid "<b>Filename: </b>"
+msgstr "<b>Име на файл: </b>"
+
+#: ../src/plugins/att_remover/att_remover.c:332
+msgid "Remove attachments"
+msgstr "Премахване на прикрепените файлове"
+
+#: ../src/plugins/att_remover/att_remover.c:357
+#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
+msgid "Remove"
+msgstr "Премахване"
+
+#. S_COL_STATUS
+#: ../src/plugins/att_remover/att_remover.c:365
+#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
+msgid "Attachment"
+msgstr "Прикрепка"
+
+#: ../src/plugins/att_remover/att_remover.c:417
+msgid "Destroy attachments"
+msgstr "Премахване на прикрепките"
+
+#: ../src/plugins/att_remover/att_remover.c:418
+msgid ""
+"Do you really want to remove all attachments from the selected messages?\n"
+"\n"
+"The deleted data will be unrecoverable."
+msgstr ""
+
+#: ../src/plugins/att_remover/att_remover.c:479
+msgid "This message doesn't have any attachments."
+msgstr "Това писмо няма прикрепки."
+
+#: ../src/plugins/att_remover/att_remover.c:494
+msgid "Remove attachments..."
+msgstr "Премахване на прикрепените файлове..."
+
+#: ../src/plugins/att_remover/att_remover.c:506
+#: ../src/plugins/att_remover/att_remover.c:566
+msgid "AttRemover"
+msgstr "Премахване на прикрепки"
+
+#: ../src/plugins/att_remover/att_remover.c:571
+msgid ""
+"This plugin removes attachments from mails.\n"
+"\n"
+"Warning: this operation will be completely un-cancellable and the deleted "
+"attachments will be lost forever, and ever, and ever."
+msgstr ""
+
+#: ../src/plugins/att_remover/att_remover.c:595
+msgid "Attachment handling"
+msgstr "Обработка на прикрепките"
+
+#: ../src/plugins/attachwarner/attachwarner.c:216
+#, c-format
+msgid ""
+"An attachment is mentioned in the mail you're sending, but no file was "
+"attached. Mention appears on line %d, which begins with text: <span weight="
+"\"bold\">%.20s</span>...\n"
+"\n"
+"%s it anyway?"
+msgstr ""
+
+#: ../src/plugins/attachwarner/attachwarner.c:220
+msgid "Attachment warning"
+msgstr "Предупреждение за прикрепки"
+
+#: ../src/plugins/attachwarner/attachwarner.c:245
 #: ../src/plugins/attachwarner/attachwarner.c:282
 #: ../src/plugins/attachwarner/attachwarner.c:334
-#, fuzzy
 msgid "Attach warner"
-msgstr "Прикрепяне на файл"
+msgstr "Предупреждение за прикрепки"
 
 #: ../src/plugins/attachwarner/attachwarner.c:292
 msgid ""
@@ -9207,9 +9295,8 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:54
-#, fuzzy
 msgid "attach"
-msgstr "Прикрепяне"
+msgstr "прикрепяне"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:85
 msgid "One of the following regular expressions is matched (one per line):"
@@ -9217,7 +9304,7 @@ msgstr ""
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:89
 msgid "Expressions are case sensitive"
-msgstr ""
+msgstr "Изразите са чувствителни към малки и големи букви"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:96
 msgid "Case sensitive when matching for the regular expressions in the list"
@@ -9235,9 +9322,8 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:124
-#, fuzzy
 msgid "Forwarded or redirected messages"
-msgstr "препратени писма"
+msgstr "Препратени или пренасочени писма"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:131
 msgid ""
@@ -9256,89 +9342,16 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:147
-#, fuzzy
 msgid "Warn when"
-msgstr "Предупреждение"
+msgstr "Предупреждение при"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:151
-#, fuzzy
 msgid "Excluding"
-msgstr "Кодиране"
+msgstr "Изключване на"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:229
-#, fuzzy
 msgid "Attach Warner"
-msgstr "Прикрепяне на файл"
-
-#: ../src/plugins/att_remover/att_remover.c:299
-msgid "<b>Type: </b>"
-msgstr ""
-
-#: ../src/plugins/att_remover/att_remover.c:300
-msgid "<b>Size: </b>"
-msgstr ""
-
-#: ../src/plugins/att_remover/att_remover.c:301
-#, fuzzy
-msgid "<b>Filename: </b>"
-msgstr "Име на файла:"
-
-#: ../src/plugins/att_remover/att_remover.c:332
-#, fuzzy
-msgid "Remove attachments"
-msgstr "Пренебрегване на прикачения файл"
-
-#: ../src/plugins/att_remover/att_remover.c:357
-#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
-msgid "Remove"
-msgstr "Премахване"
-
-#. S_COL_STATUS
-#: ../src/plugins/att_remover/att_remover.c:365
-#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
-msgid "Attachment"
-msgstr "Прикрепка"
-
-#: ../src/plugins/att_remover/att_remover.c:417
-#, fuzzy
-msgid "Destroy attachments"
-msgstr "Има прикрепени файлове"
-
-#: ../src/plugins/att_remover/att_remover.c:418
-msgid ""
-"Do you really want to remove all attachments from the selected messages?\n"
-"\n"
-"The deleted data will be unrecoverable."
-msgstr ""
-
-#: ../src/plugins/att_remover/att_remover.c:479
-#, fuzzy
-msgid "This message doesn't have any attachments."
-msgstr "писма, които имат етикет(и)"
-
-#: ../src/plugins/att_remover/att_remover.c:494
-#, fuzzy
-msgid "Remove attachments..."
-msgstr "Пренебрегване на прикачения файл"
-
-#: ../src/plugins/att_remover/att_remover.c:506
-#: ../src/plugins/att_remover/att_remover.c:566
-#, fuzzy
-msgid "AttRemover"
-msgstr "Премахване"
-
-#: ../src/plugins/att_remover/att_remover.c:571
-msgid ""
-"This plugin removes attachments from mails.\n"
-"\n"
-"Warning: this operation will be completely un-cancellable and the deleted "
-"attachments will be lost forever, and ever, and ever."
-msgstr ""
-
-#: ../src/plugins/att_remover/att_remover.c:595
-#, fuzzy
-msgid "Attachment handling"
-msgstr "Прикрепка"
+msgstr "Предупреждение за прикрепки"
 
 #: ../src/plugins/bogofilter/bogofilter.c:81
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:458
@@ -9467,7 +9480,7 @@ msgstr ""
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:198
 msgid "When unsure, move to"
-msgstr ""
+msgstr "При несигурност, преместване в"
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:206
 msgid ""
@@ -9484,16 +9497,14 @@ msgid "Insert X-Bogosity header"
 msgstr ""
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:218
-#, fuzzy
 msgid "Only done for messages in MH folders"
-msgstr "/И_нструменти/Про_верка за нова поща във всички папки"
+msgstr "Прави се само за писма в MH папки"
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:224
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:191
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:437
-#, fuzzy
 msgid "Whitelist senders found in address book/folder"
-msgstr "Показване на подателя според адресника"
+msgstr "Бял списък за податели от адресник или папка"
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:228
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:195
@@ -9536,19 +9547,16 @@ msgstr "Отбелязване нежеланата поща като проче
 
 #: ../src/plugins/bsfilter/bsfilter.c:82
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:401
-#, fuzzy
 msgid "Bsfilter"
-msgstr "Bogofilter"
+msgstr "Bsfilter"
 
 #: ../src/plugins/bsfilter/bsfilter.c:299
-#, fuzzy
 msgid "Bsfilter: fetching body..."
-msgstr "Bogofilter: извличане на текстовете..."
+msgstr "Bsfilter: извличане на текст..."
 
 #: ../src/plugins/bsfilter/bsfilter.c:308
-#, fuzzy
 msgid "Bsfilter: filtering message..."
-msgstr "Bogofilter: филтриране на писмата..."
+msgstr "Bsfilter: филтриране на писмо..."
 
 #: ../src/plugins/bsfilter/bsfilter.c:393
 #, c-format
@@ -9567,9 +9575,8 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/bsfilter/bsfilter.c:501
-#, fuzzy
 msgid "Bsfilter: learning from message..."
-msgstr "Bogofilter: обучаване от писмата..."
+msgstr "Bsfilter: обучаване от писмо..."
 
 #: ../src/plugins/bsfilter/bsfilter.c:641
 msgid ""
@@ -9594,19 +9601,17 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:218
-#, fuzzy
 msgid "Bsfilter call"
-msgstr "Извикване на Bogofilter"
+msgstr "Извикване на Bsfilter"
 
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:226
-#, fuzzy
 msgid "Path to bsfilter executable"
-msgstr "Път до програмата bogofilter"
+msgstr "Път до програмата Bsfilter"
 
 #: ../src/plugins/clamd/clamav_plugin.c:47
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:551
 msgid "Clam AntiVirus"
-msgstr ""
+msgstr "Антивирус Clam"
 
 #: ../src/plugins/clamd/clamav_plugin.c:107
 msgid ""
@@ -9625,14 +9630,16 @@ msgstr ""
 #: ../src/plugins/clamd/clamav_plugin.c:119
 #, c-format
 msgid "Detected %s virus."
-msgstr ""
+msgstr "Открит вирус %s."
 
 #: ../src/plugins/clamd/clamav_plugin.c:135
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Scanning error:\n"
 "%s"
-msgstr "Претърсване на папка %s ..."
+msgstr ""
+"Грешка при претърсване:\n"
+"%s"
 
 #: ../src/plugins/clamd/clamav_plugin.c:146
 #, c-format
@@ -9640,14 +9647,12 @@ msgid "File: %s. Size (%d) greater than limit (%d)\n"
 msgstr ""
 
 #: ../src/plugins/clamd/clamav_plugin.c:174
-#, fuzzy
 msgid "ClamAV: scanning message..."
-msgstr "Филтриране на писмата...\n"
+msgstr "ClamAV: претърсване на писмо..."
 
 #: ../src/plugins/clamd/clamav_plugin.c:275
-#, fuzzy
 msgid "Failed to register mail filtering hook"
-msgstr "Грешка при създаване на папката"
+msgstr ""
 
 #: ../src/plugins/clamd/clamav_plugin.c:293
 msgid ""
@@ -9687,33 +9692,29 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/clamd/clamav_plugin.c:367
-#, fuzzy
 msgid "Virus detection"
-msgstr "Засичане на нежелана поща"
+msgstr "Засичане на вируси"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:247
 msgid "Enable virus scanning"
-msgstr ""
+msgstr "Включване на откриването на вируси"
 
 #. SET_TOGGLE_SENSITIVITY (enable_arc, hbox1);
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:257
-#, fuzzy
 msgid "Maximum attachment size"
-msgstr "Максимален размер"
+msgstr "Максимален размер на прикрепка"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:268
-#, fuzzy
 msgid "Message attachments larger than this will not be scanned"
-msgstr "Писма с по-голям размер няма да бъдат проверявани"
+msgstr "Прикрепки с по-голям размер няма да бъдат проверявани"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:272
 msgid "MB"
-msgstr ""
+msgstr "MB"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:281
-#, fuzzy
 msgid "Save infected mail in"
-msgstr "Запазване на писмата на диска"
+msgstr "Запазване на заразените писма в"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:285
 msgid "Save mail that contains viruses"
@@ -9729,9 +9730,8 @@ msgid "Click this button to select a folder for storing infected mail"
 msgstr ""
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:309
-#, fuzzy
 msgid "Automatic configuration"
-msgstr "Настройка на действията"
+msgstr "Автоматична настройка"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:314
 msgid "Should configuration be done automatic or manual"
@@ -9739,7 +9739,7 @@ msgstr ""
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:322
 msgid "Where is clamd.conf"
-msgstr ""
+msgstr "Къде е clamd.conf"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:330
 msgid ""
@@ -9748,9 +9748,8 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:334
-#, fuzzy
 msgid "Br_owse"
-msgstr "Преглед"
+msgstr "П_реглед"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:338
 msgid "Click this button to select full path to clamd.conf"
@@ -9765,9 +9764,8 @@ msgid "Click this button to check and adjust folder permissions"
 msgstr ""
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:367
-#, fuzzy
 msgid "Remote Host"
-msgstr "Премахване след"
+msgstr "Отдалечен хост"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:375
 msgid "Hostname or IP for remote host running clamav daemon"
@@ -9809,47 +9807,40 @@ msgstr ""
 
 #. g_error("%s: Not able to find required information", path);
 #: ../src/plugins/clamd/libclamd/clamd-plugin.c:249
-#, fuzzy
 msgid "Could not create socket"
-msgstr ""
-"Грешка при създаване на mbox-файла:\n"
-"%s\n"
+msgstr "Грешка при създаване на сокет"
 
 #: ../src/plugins/clamd/libclamd/clamd-plugin.c:421
-#, fuzzy
 msgid ": File does not exist"
-msgstr "Подразбиращата се папка за входящи не съществува."
+msgstr ": Файлът не съществува"
 
 #. g_error("%s: Unable to open", path);
 #: ../src/plugins/clamd/libclamd/clamd-plugin.c:434
 msgid ": Unable to open"
-msgstr ""
+msgstr ": Грешка при отваряне"
 
 #: ../src/plugins/clamd/libclamd/clamd-plugin.c:454
 #: ../src/plugins/clamd/libclamd/clamd-plugin.c:459
 #: ../src/plugins/clamd/libclamd/clamd-plugin.c:473
-#, fuzzy
 msgid "Socket write error"
-msgstr "Грешка в сокет."
+msgstr "Грешка при писане в сокет"
 
 #: ../src/plugins/clamd/libclamd/clamd-plugin.c:466
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Error reading"
-msgstr "Грешка при четене на файл"
+msgstr "%s: Грешка при четене"
 
 #: ../src/plugins/clamd/libclamd/clamd-plugin.c:480
-#, fuzzy
 msgid "Socket read error"
-msgstr "Грешка в сокет."
+msgstr "Грешка при четене от сокет"
 
 #: ../src/plugins/demo/demo.c:31 ../src/plugins/demo/demo.c:100
 msgid "Demo"
 msgstr "Демонстрация"
 
 #: ../src/plugins/demo/demo.c:52
-#, fuzzy
 msgid "Failed to register log text hook"
-msgstr "Грешка при създаване на папката"
+msgstr ""
 
 #: ../src/plugins/demo/demo.c:76
 msgid ""
@@ -9859,67 +9850,63 @@ msgid ""
 "It is not really useful."
 msgstr ""
 
-#: ../src/plugins/fancy/fancy_prefs.c:141
-#, fuzzy
+#: ../src/plugins/fancy/fancy_prefs.c:146
 msgid "Display images"
-msgstr "\"Показване като текст\""
+msgstr "Показване на изображения"
 
-#: ../src/plugins/fancy/fancy_prefs.c:142
-#, fuzzy
+#: ../src/plugins/fancy/fancy_prefs.c:147
 msgid "Display embedded images"
-msgstr "Показвани заглавки"
+msgstr "Показване на вградените изображения"
 
-#: ../src/plugins/fancy/fancy_prefs.c:146
+#: ../src/plugins/fancy/fancy_prefs.c:151
 msgid "Execute javascript"
-msgstr ""
+msgstr "Изпълнение на javascript"
 
-#: ../src/plugins/fancy/fancy_prefs.c:147
+#: ../src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute embedded javascript"
-msgstr ""
+msgstr "Изпълнение на вграден javascript"
 
-#: ../src/plugins/fancy/fancy_prefs.c:151
+#: ../src/plugins/fancy/fancy_prefs.c:156
 msgid "Execute Java applets"
-msgstr ""
+msgstr "Изпълнение на Java аплети"
 
-#: ../src/plugins/fancy/fancy_prefs.c:152
+#: ../src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute embedded Java applets"
-msgstr ""
+msgstr "Изпълнение на вградени Java аплети"
 
-#: ../src/plugins/fancy/fancy_prefs.c:156
+#: ../src/plugins/fancy/fancy_prefs.c:161
 msgid "Render objects using plugins"
 msgstr ""
 
-#: ../src/plugins/fancy/fancy_prefs.c:157
+#: ../src/plugins/fancy/fancy_prefs.c:162
 msgid "Render embedded objects using plugins"
 msgstr ""
 
-#: ../src/plugins/fancy/fancy_prefs.c:164
+#: ../src/plugins/fancy/fancy_prefs.c:169
 msgid "Open in viewer (remote content is enabled)"
-msgstr ""
+msgstr "Отваряне в четец (отдалеченото съдържание е позволено)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:167
+#: ../src/plugins/fancy/fancy_prefs.c:172
 msgid "Do nothing (remote content is disabled)"
 msgstr ""
 
-#: ../src/plugins/fancy/fancy_prefs.c:200
+#: ../src/plugins/fancy/fancy_prefs.c:209
 msgid "Proxy"
-msgstr ""
+msgstr "Посредник"
 
-#: ../src/plugins/fancy/fancy_prefs.c:202
+#: ../src/plugins/fancy/fancy_prefs.c:211
 msgid "Use GNOME's proxy settings"
-msgstr ""
+msgstr "Използване настройките за посредник на GNOME"
 
-#: ../src/plugins/fancy/fancy_prefs.c:210
-#, fuzzy
+#: ../src/plugins/fancy/fancy_prefs.c:219
 msgid "Use proxy:"
-msgstr "Приложи регулярен израз"
+msgstr "Използване на сървър-посредник:"
 
-#: ../src/plugins/fancy/fancy_prefs.c:228
-#, fuzzy
+#: ../src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
-msgstr "/_Настройки/_Късане на нишката"
+msgstr "Отдалечени ресурси"
 
-#: ../src/plugins/fancy/fancy_prefs.c:229
+#: ../src/plugins/fancy/fancy_prefs.c:238
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -9928,122 +9915,124 @@ msgid ""
 "in the email."
 msgstr ""
 
-#: ../src/plugins/fancy/fancy_prefs.c:235
-#, fuzzy
+#: ../src/plugins/fancy/fancy_prefs.c:244
 msgid "Enable loading of remote content"
-msgstr "Включване на оцветяването на писмата"
+msgstr "Включване на зареждането на отдалечено съдържание"
 
-#: ../src/plugins/fancy/fancy_prefs.c:267
+#: ../src/plugins/fancy/fancy_prefs.c:276
 msgid "When clicking on a link, by default:"
 msgstr ""
 
-#: ../src/plugins/fancy/fancy_prefs.c:275
-#, fuzzy
+#: ../src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
-msgstr "_Отваряне с уеб-четец"
+msgstr "Отваряне във външен браузър"
 
-#: ../src/plugins/fancy/fancy_viewer.c:391
-msgid "Remote content loading is disabled."
+#: ../src/plugins/fancy/fancy_prefs.c:298
+msgid "The CSS in this file will be applied to all HTML parts"
 msgstr ""
 
-#: ../src/plugins/fancy/fancy_viewer.c:468
-#, fuzzy
-msgid "Load images"
-msgstr "Зареждане на изображение"
+#: ../src/plugins/fancy/fancy_prefs.c:300
+msgid "Stylesheet:"
+msgstr "Стил:"
+
+#: ../src/plugins/fancy/fancy_prefs.c:308 ../src/prefs_account.c:1442
+#: ../src/prefs_account.c:1531 ../src/prefs_account.c:1991
+#: ../src/prefs_customheader.c:237
+msgid "Bro_wse"
+msgstr "П_реглед"
+
+#: ../src/plugins/fancy/fancy_prefs.c:350
+msgid "Select stylesheet"
+msgstr "Избор на стил"
+
+#: ../src/plugins/fancy/fancy_viewer.c:393
+msgid "Remote content loading is disabled."
+msgstr "Отдалеченото съдържание е изключено."
 
 #: ../src/plugins/fancy/fancy_viewer.c:470
-#, fuzzy
-msgid "Enable remote content"
-msgstr "Изтриване съдържанието на записа"
+msgid "Load images"
+msgstr "Зареждане на изображения"
 
 #: ../src/plugins/fancy/fancy_viewer.c:472
-msgid "Enable Javascript"
-msgstr ""
+msgid "Enable remote content"
+msgstr "Включване на отдалечено съдържание"
 
 #: ../src/plugins/fancy/fancy_viewer.c:474
-#, fuzzy
-msgid "Enable Plugins"
-msgstr "Приставки"
+msgid "Enable Javascript"
+msgstr "Включване на Javascript"
 
 #: ../src/plugins/fancy/fancy_viewer.c:476
-#, fuzzy
-msgid "Enable Java"
-msgstr "Включване"
+msgid "Enable Plugins"
+msgstr "Включване на приставките"
 
 #: ../src/plugins/fancy/fancy_viewer.c:478
-#, fuzzy
+msgid "Enable Java"
+msgstr "Включване на Java"
+
+#: ../src/plugins/fancy/fancy_viewer.c:480
 msgid "Open links with external browser"
-msgstr "_Отваряне с уеб-четец"
+msgstr "Отваряне на препратките във външен браузър"
 
-#: ../src/plugins/fancy/fancy_viewer.c:647
-#, fuzzy, c-format
+#: ../src/plugins/fancy/fancy_viewer.c:649
+#, c-format
 msgid "An error occurred: %d\n"
-msgstr "грешка по време на SMTP сесията\n"
+msgstr "Появи се грешка: %d\n"
 
-#: ../src/plugins/fancy/fancy_viewer.c:703
+#: ../src/plugins/fancy/fancy_viewer.c:705
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr ""
 
-#: ../src/plugins/fancy/fancy_viewer.c:714
-#, fuzzy
+#: ../src/plugins/fancy/fancy_viewer.c:716
 msgid "Search the Web"
-msgstr "Основа на търсенето"
+msgstr "Търсене в Интернет"
 
-#: ../src/plugins/fancy/fancy_viewer.c:726
-#, fuzzy
+#: ../src/plugins/fancy/fancy_viewer.c:728
 msgid "Open in Viewer"
-msgstr "_Отваряне с уеб-четец"
+msgstr "Отваряне в четец"
 
-#: ../src/plugins/fancy/fancy_viewer.c:728
+#: ../src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer (enable remote content)"
-msgstr ""
+msgstr "Отваряне в четец (включване на отдалечено съдържание)"
 
-#: ../src/plugins/fancy/fancy_viewer.c:737
-#, fuzzy
+#: ../src/plugins/fancy/fancy_viewer.c:739
 msgid "Open in Browser"
-msgstr "_Отваряне с уеб-четец"
+msgstr "Отваряне в браузър"
 
-#: ../src/plugins/fancy/fancy_viewer.c:747
-#, fuzzy
+#: ../src/plugins/fancy/fancy_viewer.c:749
 msgid "Open Image"
-msgstr "_Отваряне на изображението"
+msgstr "Отваряне на изображението"
 
-#: ../src/plugins/fancy/fancy_viewer.c:756
-#, fuzzy
+#: ../src/plugins/fancy/fancy_viewer.c:758
 msgid "Copy Link"
-msgstr "Копиране на тази п_репратка"
+msgstr "Копиране на препратката"
 
-#: ../src/plugins/fancy/fancy_viewer.c:760
+#: ../src/plugins/fancy/fancy_viewer.c:762
 msgid "Download Link"
 msgstr ""
 
-#: ../src/plugins/fancy/fancy_viewer.c:771
-#, fuzzy
+#: ../src/plugins/fancy/fancy_viewer.c:773
 msgid "Save Image As"
-msgstr "Запазване на промените"
+msgstr "Запис на изображението като"
 
-#: ../src/plugins/fancy/fancy_viewer.c:781
-#, fuzzy
+#: ../src/plugins/fancy/fancy_viewer.c:783
 msgid "Copy Image"
-msgstr "Зареждане на изображение"
+msgstr "Копиране на изображението"
 
-#: ../src/plugins/fancy/fancy_viewer.c:799
-#, fuzzy
+#: ../src/plugins/fancy/fancy_viewer.c:801
 msgid "Import feed"
-msgstr "Внасяне на mbox-файл"
+msgstr "Внасяне на емисия"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1012
+#: ../src/plugins/fancy/fancy_viewer.c:1014
 msgid "Fancy"
 msgstr ""
 
 #. i18n: 'Fancy' here is name of the plugin, not the english word.
-#: ../src/plugins/fancy/fancy_viewer.c:1040
-#, fuzzy
+#: ../src/plugins/fancy/fancy_viewer.c:1042
 msgid "Fancy HTML Viewer"
-msgstr "Преглед на HTML с Dillo"
+msgstr "HTML четец Fancy"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1045
+#: ../src/plugins/fancy/fancy_viewer.c:1047
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10064,9 +10053,8 @@ msgstr ""
 
 #. i18n: Possible error message during plugin load
 #: ../src/plugins/fetchinfo/fetchinfo_plugin.c:173
-#, fuzzy
 msgid "Failed to register mail receive hook"
-msgstr "Грешка при създаване на папката"
+msgstr ""
 
 #. i18n: Description seen in plugins dialog.
 #. * Translation of "Plugins" part of preferences path should to be
@@ -10083,38 +10071,33 @@ msgstr ""
 
 #. i18n: Description of functionality added by this plugin
 #: ../src/plugins/fetchinfo/fetchinfo_plugin.c:236
-#, fuzzy
 msgid "Mail marking"
-msgstr "Обработка на писмата"
+msgstr "Отбелязване на писмата"
 
 #. i18n: Heading of a preferences section determining which headers to add
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:94
-#, fuzzy
 msgid "Add fetchinfo headers"
-msgstr "Скрити заглавки"
+msgstr ""
 
 #. i18n: Description of a header to be added
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:101
 msgid "UIDL"
-msgstr ""
+msgstr "UIDL"
 
 #. i18n: Description of a header to be added
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:103
-#, fuzzy
 msgid "Account name"
-msgstr "Сметка"
+msgstr "Име на сметката"
 
 #. i18n: Description of a header to be added
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:105
-#, fuzzy
 msgid "Receive server"
-msgstr "Получаване"
+msgstr "Сървър за получаване"
 
 #. i18n: Description of a header to be added
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:107
-#, fuzzy
 msgid "UserID"
-msgstr "Потребител"
+msgstr "UserID"
 
 #. i18n: Description of a header to be added
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:109
@@ -10181,9 +10164,8 @@ msgstr "Автентификация"
 
 #: ../src/plugins/gdata/cm_gdata_prefs.c:84
 #: ../src/plugins/spam_report/spam_report_prefs.c:152
-#, fuzzy
 msgid "Username:"
-msgstr "Име на файла:"
+msgstr "Потребителско име:"
 
 #: ../src/plugins/gdata/cm_gdata_prefs.c:91
 #: ../src/plugins/spam_report/spam_report_prefs.c:165 ../src/wizard.c:1557
@@ -10195,9 +10177,8 @@ msgid "Polling interval (seconds):"
 msgstr ""
 
 #: ../src/plugins/gdata/cm_gdata_prefs.c:110
-#, fuzzy
 msgid "Maximum number of results:"
-msgstr "Максимален брой статии за изтегляне"
+msgstr "Максимален брой резултати:"
 
 #: ../src/plugins/gdata/cm_gdata_prefs.c:146
 #: ../src/plugins/gdata/gdata_plugin.c:101
@@ -10216,9 +10197,8 @@ msgid "Failed to register address completion hook in the GData plugin"
 msgstr ""
 
 #: ../src/plugins/gdata/gdata_plugin.c:114
-#, fuzzy
 msgid "Failed to register offline switch hook in the GData plugin"
-msgstr "Грешка при създаване на папката"
+msgstr ""
 
 #: ../src/plugins/gdata/gdata_plugin.c:161
 msgid ""
@@ -10239,7 +10219,7 @@ msgstr ""
 #: ../src/plugins/geolocation/geolocation_plugin.c:349
 #, c-format
 msgid "Found location: (%.2f,%.2f)"
-msgstr ""
+msgstr "Открито местоположение: (%.2f,%.2f)"
 
 #. TRANSLATORS: The country name is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:369
@@ -10248,1010 +10228,989 @@ msgstr ""
 
 #. TRANSLATORS: The IP address is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:373
-#, fuzzy
 msgid "Could not resolve location of IP address "
-msgstr "Грешка при четене индекса на адресите"
+msgstr "Грешка при откриване местоположението на IP адреса"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:512
-#, fuzzy
 msgid "Try to locate sender"
-msgstr "малко име на подателя"
+msgstr "Опит за локализиране на подателя"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:528
 msgid "Andorra"
-msgstr ""
+msgstr "Андора"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:529
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Обединени арабски емирства"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:530
 msgid "Afghanistan"
-msgstr ""
+msgstr "Афганистан"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:531
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "Антигуа и Барбадос"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:532
 msgid "Anguilla"
-msgstr ""
+msgstr "Ангила"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:533
 msgid "Albania"
-msgstr ""
+msgstr "Албания"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:534
 msgid "Armenia"
-msgstr ""
+msgstr "Армения"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:535
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Холандски Антили"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:536
 msgid "Angola"
-msgstr ""
+msgstr "Ангола"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:537
 msgid "Antarctica"
-msgstr ""
+msgstr "Антарктика"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:538
 msgid "Argentina"
-msgstr ""
+msgstr "Аржентина"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:539
 msgid "American Samoa"
-msgstr ""
+msgstr "Американска Самоа"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:540
 msgid "Austria"
-msgstr ""
+msgstr "Австрия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:541
 msgid "Australia"
-msgstr ""
+msgstr "Австралия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:542
 msgid "Aruba"
-msgstr ""
+msgstr "Аруба"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:543
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Азербайджан"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:544
 msgid "Bosnia And Herzegovina"
-msgstr ""
+msgstr "Босна и Херцеговина"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:545
 msgid "Barbados"
-msgstr ""
+msgstr "Барбадос"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:546
 msgid "Bangladesh"
-msgstr ""
+msgstr "Бангладеш"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:547
 msgid "Belgium"
-msgstr ""
+msgstr "Белгия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:548
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Буркина Фасо"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:549
 msgid "Bulgaria"
-msgstr ""
+msgstr "България"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:550
 msgid "Bahrain"
-msgstr ""
+msgstr "Бахрейн"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:551
 msgid "Burundi"
-msgstr ""
+msgstr "Бурунди"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:552
 msgid "Benin"
-msgstr ""
+msgstr "Бенин"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:553
 msgid "Bermuda"
-msgstr ""
+msgstr "Бермуда"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:554
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Бруней Даруссалам"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:555
 msgid "Bolivia"
-msgstr ""
+msgstr "Боливия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:556
 msgid "Brazil"
-msgstr ""
+msgstr "Бразилия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:557
 msgid "Bahamas"
-msgstr ""
+msgstr "Бахамски острови"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:558
 msgid "Bhutan"
-msgstr ""
+msgstr "Бутан"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:559
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Острови Буве"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:560
 msgid "Botswana"
-msgstr ""
+msgstr "Ботсвана"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:561
 msgid "Belarus"
-msgstr ""
+msgstr "Беларус"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:562
 msgid "Belize"
-msgstr ""
+msgstr "Белиз"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:563
 msgid "Canada"
-msgstr ""
+msgstr "Канада"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:564
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Кокосови острови"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:565
 msgid "Central African Republic"
-msgstr ""
+msgstr "Централноафриканска република"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:566
 msgid "Congo"
-msgstr ""
+msgstr "Конго"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:567
 msgid "Switzerland"
-msgstr ""
+msgstr "Швейцария"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:568
 msgid "Cote D'Ivoire"
-msgstr ""
+msgstr "Кот Д'Ивоар"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:569
 msgid "Cook Islands"
-msgstr ""
+msgstr "Острови Кук"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:570
 msgid "Chile"
-msgstr ""
+msgstr "Чили"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:571
 msgid "Cameroon"
-msgstr ""
+msgstr "Камерун"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:572
-#, fuzzy
 msgid "China"
-msgstr "Китайско"
+msgstr "Китай"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:573
-#, fuzzy
 msgid "Colombia"
-msgstr "Оцветяване"
+msgstr "Колумбия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:574
 msgid "Costa Rica"
-msgstr ""
+msgstr "Коста Рика"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:575
 msgid "Cuba"
-msgstr ""
+msgstr "Куба"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:576
 msgid "Cape Verde"
-msgstr ""
+msgstr "Зелени нос"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:577
 msgid "Christmas Island"
-msgstr ""
+msgstr "Остров Рождество"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:578
 msgid "Cyprus"
-msgstr ""
+msgstr "Кипър"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:579
 msgid "Czech Republic"
-msgstr ""
+msgstr "Чешка република"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:580
 msgid "Germany"
-msgstr ""
+msgstr "Германия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:581
 msgid "Djibouti"
-msgstr ""
+msgstr "Джибути"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:582
-#, fuzzy
 msgid "Denmark"
-msgstr "Размаркиране"
+msgstr "Дания"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:583
 msgid "Dominica"
-msgstr ""
+msgstr "Доминика"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:584
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Доминиканска република"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:585
 msgid "Algeria"
-msgstr ""
+msgstr "Алжир"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:586
 msgid "Ecuador"
-msgstr ""
+msgstr "Еквадор"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:587
 msgid "Estonia"
-msgstr ""
+msgstr "Естония"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:588
 msgid "Egypt"
-msgstr ""
+msgstr "Египет"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:589
-#, fuzzy
 msgid "Western Sahara"
-msgstr "Западноевропейско"
+msgstr "Западна Сахара"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:590
 msgid "Eritrea"
-msgstr ""
+msgstr "Еритрея"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:591
 msgid "Spain"
-msgstr ""
+msgstr "Испания"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:592
 msgid "Ethiopia"
-msgstr ""
+msgstr "Етиопия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:593
 msgid "Finland"
-msgstr ""
+msgstr "Финландия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:594
 msgid "Fiji"
-msgstr ""
+msgstr "Фиджи"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:595
 msgid "Falkland Islands (Malvinas)"
-msgstr ""
+msgstr "Фолклендски (Малвински) о-ви"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:596
 msgid "Micronesia, Federated States Of"
-msgstr ""
+msgstr "Микронезия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:597
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Фарьорски острови"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:598
-#, fuzzy
 msgid "France"
-msgstr "_Отказ"
+msgstr "Франция"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:599
 msgid "France, Metropolitan"
-msgstr ""
+msgstr "Франция, метрополия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:600
 msgid "Gabon"
-msgstr ""
+msgstr "Габон"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:601
 #: ../src/plugins/geolocation/geolocation_plugin.c:747
 msgid "United Kingdom"
-msgstr ""
+msgstr "Великобритания"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:602
 msgid "Grenada"
-msgstr ""
+msgstr "Гренада"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:603
 msgid "Georgia"
-msgstr ""
+msgstr "Грузия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:604
 msgid "French Guiana"
-msgstr ""
+msgstr "Френска Гвиана"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:605
 msgid "Ghana"
-msgstr ""
+msgstr "Гана"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:606
 msgid "Gibraltar"
-msgstr ""
+msgstr "Гибралтар"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:607
-#, fuzzy
 msgid "Greenland"
-msgstr "Зелено"
+msgstr "Гренландия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:608
 msgid "Gambia"
-msgstr ""
+msgstr "Гамбия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:609
 msgid "Guinea"
-msgstr ""
+msgstr "Гвинея"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:610
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Гваделупа"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:611
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Екваториална Гвинея"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:612
-#, fuzzy
 msgid "Greece"
-msgstr "Зелено"
+msgstr "Гърция"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:613
 msgid "South Georgia And The South Sandwich Islands"
-msgstr ""
+msgstr "Южна Джорджия и Южни Сандвичеви о-ви"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:614
 msgid "Guatemala"
-msgstr ""
+msgstr "Гватемала"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:615
 msgid "Guam"
-msgstr ""
+msgstr "Гуам"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:616
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Гвинея-Бисау"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:617
 msgid "Guyana"
-msgstr ""
+msgstr "Гвиана"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:618
 msgid "Hong Kong"
-msgstr ""
+msgstr "Хонгконг"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:619
 msgid "Heard Island And Mcdonald Islands"
-msgstr ""
+msgstr "Остров Хърд и Острови Макдоналд"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:620
 msgid "Honduras"
-msgstr ""
+msgstr "Хондурас"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:621
 msgid "Croatia"
-msgstr ""
+msgstr "Хърватска"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:622
 msgid "Haiti"
-msgstr ""
+msgstr "Хаити"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:623
 msgid "Hungary"
-msgstr ""
+msgstr "Унгария"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:624
 msgid "Indonesia"
-msgstr ""
+msgstr "Индонезия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:625
 msgid "Ireland"
-msgstr ""
+msgstr "Ирландия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:626
 msgid "Israel"
-msgstr ""
+msgstr "Израел"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:627
 msgid "India"
-msgstr ""
+msgstr "Индия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:628
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Британска територия в Индийския океан"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:629
 msgid "Iraq"
-msgstr ""
+msgstr "Ирак"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:630
 msgid "Iran, Islamic Republic Of"
-msgstr ""
+msgstr "Иран"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:631
 msgid "Iceland"
-msgstr ""
+msgstr "Исландия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:632
 msgid "Italy"
-msgstr ""
+msgstr "Италия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:633
 msgid "Jamaica"
-msgstr ""
+msgstr "Ямайка"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:634
 msgid "Jordan"
-msgstr ""
+msgstr "Йордания"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:635
-#, fuzzy
 msgid "Japan"
-msgstr "Японско"
+msgstr "Япония"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:636
 msgid "Kenya"
-msgstr ""
+msgstr "Кения"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:637
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Киргизстан"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:638
 msgid "Cambodia"
-msgstr ""
+msgstr "Камбоджа"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:639
 msgid "Kiribati"
-msgstr ""
+msgstr "Кирибати"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:640
 msgid "Comoros"
-msgstr ""
+msgstr "Коморски острови"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:641
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "Сейнт Китс и Невис"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:642
 msgid "Korea, Democratic People'S Republic Of"
-msgstr ""
+msgstr "Корея, Демократична Република"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:643
 msgid "Korea, Republic Of"
-msgstr ""
+msgstr "Република Корея"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:644
 msgid "Kuwait"
-msgstr ""
+msgstr "Кувейт"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:645
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Кайманови острови"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:646
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Казахстан"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:647
 msgid "Lao People'S Democratic Republic"
-msgstr ""
+msgstr "Народна демократична република Лаос"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:648
 msgid "Lebanon"
-msgstr ""
+msgstr "Ливан"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:649
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Санта Лучия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:650
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Лихтенщайн"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:651
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Шри Ланка"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:652
 msgid "Liberia"
-msgstr ""
+msgstr "Либерия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:653
 msgid "Lesotho"
-msgstr ""
+msgstr "Лесото"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:654
 msgid "Lithuania"
-msgstr ""
+msgstr "Литва"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:655
 msgid "Luxembourg"
-msgstr ""
+msgstr "Люксембург"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:656
 msgid "Latvia"
-msgstr ""
+msgstr "Латвия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:657
 msgid "Libyan Arab Jamahiriya"
-msgstr ""
+msgstr "Либия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:658
 msgid "Morocco"
-msgstr ""
+msgstr "Мароко"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:659
 msgid "Monaco"
-msgstr ""
+msgstr "Монако"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:660
 msgid "Moldova, Republic Of"
-msgstr ""
+msgstr "Молдова"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:661
 msgid "Madagascar"
-msgstr ""
+msgstr "Мадагаскар"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:662
-#, fuzzy
 msgid "Marshall Islands"
-msgstr "Отбелязване на всички като прочетени"
+msgstr "Маршалски острови"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:663
 msgid "Macedonia, The Former Yugoslav Republic Of"
-msgstr ""
+msgstr "Македония"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:664
 msgid "Mali"
-msgstr ""
+msgstr "Мали"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:665
-#, fuzzy
 msgid "Myanmar"
-msgstr "Размаркиране"
+msgstr "Мианмар"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:666
 msgid "Mongolia"
-msgstr ""
+msgstr "Монголия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:667
 msgid "Macao"
-msgstr ""
+msgstr "Макао"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:668
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Северни Мариански острови"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:669
 msgid "Martinique"
-msgstr ""
+msgstr "Мартиника"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:670
 msgid "Mauritania"
-msgstr ""
+msgstr "Мавритания"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:671
 msgid "Montserrat"
-msgstr ""
+msgstr "Монсерат"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:672
 msgid "Malta"
-msgstr ""
+msgstr "Малта"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:673
 msgid "Mauritius"
-msgstr ""
+msgstr "Мавриций"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:674
 msgid "Maldives"
-msgstr ""
+msgstr "Малдиви"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:675
 msgid "Malawi"
-msgstr ""
+msgstr "Малави"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:676
 msgid "Mexico"
-msgstr ""
+msgstr "Мексико"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:677
 msgid "Malaysia"
-msgstr ""
+msgstr "Малайзия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:678
 msgid "Mozambique"
-msgstr ""
+msgstr "Мозамбик"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:679
 msgid "Namibia"
-msgstr ""
+msgstr "Намибия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:680
-#, fuzzy
 msgid "New Caledonia"
-msgstr "Нов контакт"
+msgstr "Нова Каледония"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:681
 msgid "Niger"
-msgstr ""
+msgstr "Нигер"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:682
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Остров Норфолк"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:683
 msgid "Nigeria"
-msgstr ""
+msgstr "Нигерия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:684
 msgid "Nicaragua"
-msgstr ""
+msgstr "Никарагуа"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:685
 msgid "Netherlands"
-msgstr ""
+msgstr "Холандия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:686
-#, fuzzy
 msgid "Norway"
-msgstr "Препращане"
+msgstr "Норвегия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:687
 msgid "Nepal"
-msgstr ""
+msgstr "Непал"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:688
 msgid "Nauru"
-msgstr ""
+msgstr "Науру"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:689
 msgid "Niue"
-msgstr ""
+msgstr "Ниуе"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:690
 msgid "New Zealand"
-msgstr ""
+msgstr "Нова Зеландия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:691
 msgid "Oman"
-msgstr ""
+msgstr "Оман"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:692
 msgid "Panama"
-msgstr ""
+msgstr "Панама"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:693
 msgid "Peru"
-msgstr ""
+msgstr "Перу"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:694
 msgid "French Polynesia"
-msgstr ""
+msgstr "Френска Полинезия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:695
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Папуа Нова Гвинея"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:696
-#, fuzzy
 msgid "Philippines"
-msgstr "редове"
+msgstr "Филипини"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:697
 msgid "Pakistan"
-msgstr ""
+msgstr "Пакистан"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:698
 msgid "Poland"
-msgstr ""
+msgstr "Полша"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:699
 msgid "Saint Pierre And Miquelon"
-msgstr ""
+msgstr "Сент Пиер и Микелон"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:700
 msgid "Pitcairn"
-msgstr ""
+msgstr "Остров Питкерн"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:701
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Пуерто Рико"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:702
-#, fuzzy
 msgid "Portugal"
-msgstr "Порт"
+msgstr "Португалия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:703
 msgid "Palau"
-msgstr ""
+msgstr "Палау"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:704
 msgid "Paraguay"
-msgstr ""
+msgstr "Парагвай"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:705
 msgid "Qatar"
-msgstr ""
+msgstr "Катар"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:706
 msgid "Reunion"
-msgstr ""
+msgstr "Остров Реюнион"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:707
 msgid "Romania"
-msgstr ""
+msgstr "Румъния"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:708
 msgid "Russian Federation"
-msgstr ""
+msgstr "Руска федерация"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:709
 msgid "Rwanda"
-msgstr ""
+msgstr "Руанда"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:710
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Саудитска Арабия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:711
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Соломонови острови"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:712
 msgid "Seychelles"
-msgstr ""
+msgstr "Сейшелски острови"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:713
 msgid "Sudan"
-msgstr ""
+msgstr "Судан"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:714
 msgid "Sweden"
-msgstr ""
+msgstr "Швеция"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:715
 msgid "Singapore"
-msgstr ""
+msgstr "Сингапур"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:716
 msgid "Saint Helena"
-msgstr ""
+msgstr "Света Елена"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:717
 msgid "Slovenia"
-msgstr ""
+msgstr "Словения"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:718
 msgid "Svalbard And Jan Mayen"
-msgstr ""
+msgstr "Сволборд и Йан Майен"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:719
 msgid "Slovakia"
-msgstr ""
+msgstr "Словакия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:720
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Сиера Леоне"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:721
 msgid "San Marino"
-msgstr ""
+msgstr "Сан Марино"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:722
 msgid "Senegal"
-msgstr ""
+msgstr "Сенегал"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:723
 msgid "Somalia"
-msgstr ""
+msgstr "Сомалия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:724
-#, fuzzy
 msgid "Suriname"
-msgstr "Прякор"
+msgstr "Суринам"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:725
 msgid "Sao Tome And Principe"
-msgstr ""
+msgstr "Сан Томе и Принципи"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:726
 msgid "El Salvador"
-msgstr ""
+msgstr "Ел Салвадор"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:727
 msgid "Syrian Arab Republic"
-msgstr ""
+msgstr "Сирия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:728
 msgid "Swaziland"
-msgstr ""
+msgstr "Свазиленд"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:729
 msgid "Turks And Caicos Islands"
-msgstr ""
+msgstr "Острови Търкс и Кайкос"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:730
 msgid "Chad"
-msgstr ""
+msgstr "Чад"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:731
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Френски южни територии"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:732
 msgid "Togo"
-msgstr ""
+msgstr "Того"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:733
-#, fuzzy
 msgid "Thailand"
-msgstr "Тайландско"
+msgstr "Тайланд"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:734
 msgid "Tajikistan"
-msgstr ""
+msgstr "Таджикистан"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:735
 msgid "Tokelau"
-msgstr ""
+msgstr "Токелау"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:736
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Туркменистан"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:737
 msgid "Tunisia"
-msgstr ""
+msgstr "Тунис"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:738
 msgid "Tonga"
-msgstr ""
+msgstr "Тонга"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:739
 msgid "East Timor"
-msgstr ""
+msgstr "Източен Тимор"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:740
 msgid "Turkey"
-msgstr ""
+msgstr "Турция"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:741
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "Тринидат и Тобаго"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:742
 msgid "Tuvalu"
-msgstr ""
+msgstr "Тувалу"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:743
 msgid "Taiwan, Province Of China"
-msgstr ""
+msgstr "Тайван"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:744
 msgid "Tanzania, United Republic Of"
-msgstr ""
+msgstr "Танзания"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:745
 msgid "Ukraine"
-msgstr ""
+msgstr "Украйна"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:746
 msgid "Uganda"
-msgstr ""
+msgstr "Уганда"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:748
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "Малки острови, прилежащи към САЩ"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:749
 msgid "United States"
-msgstr ""
+msgstr "САЩ"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:750
 msgid "Uruguay"
-msgstr ""
+msgstr "Уругвай"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:751
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Узбекистан"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:752
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Ватикана"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:753
 msgid "Saint Vincent And The Grenadines"
-msgstr ""
+msgstr "Сейнт Винсент и Гренадини"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:754
 msgid "Venezuela"
-msgstr ""
+msgstr "Венецуела"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:755
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "Британски Вирджински острови"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:756
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "Американски Вирджински острови"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:757
-#, fuzzy
 msgid "Viet Nam"
-msgstr "Име на файла"
+msgstr "Виетнам"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:758
 msgid "Vanuatu"
-msgstr ""
+msgstr "Вануату"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:759
 msgid "Wallis And Futuna"
-msgstr ""
+msgstr "Уолис и Футуна"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:760
 msgid "Samoa"
-msgstr ""
+msgstr "Самоа"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:761
 msgid "Yemen"
-msgstr ""
+msgstr "Йемен"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:762
 msgid "Mayotte"
-msgstr ""
+msgstr "Майот"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:763
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "Сърбия и Черна гора"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:764
 msgid "South Africa"
-msgstr ""
+msgstr "Южна Африка"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:765
 msgid "Zambia"
-msgstr ""
+msgstr "Замбия"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:766
 msgid "Democratic Republic Of The Congo"
-msgstr ""
+msgstr "Демократична република Конго"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:767
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Зимбабве"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:777
 #: ../src/plugins/geolocation/geolocation_plugin.c:862
-#, fuzzy
 msgid "GeoLocation"
-msgstr "Местоположение:"
+msgstr "Геолокация"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:782
-#, fuzzy, c-format
+#, c-format
 msgid "Could not initialize clutter"
-msgstr "Грешка при отваряне на файла %s."
+msgstr ""
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:788
 #: ../src/plugins/geolocation/geolocation_plugin.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create regular expression: %s\n"
-msgstr "Грешка при създаване на временен файл: %s"
+msgstr "Грешка при създаване на регулярен израз: %s\n"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:803
-#, fuzzy
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-msgstr "Грешка при създаване на папката"
+msgstr ""
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:867
 msgid ""
@@ -11271,37 +11230,33 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:900
-#, fuzzy
 msgid "GeoLocation integration"
-msgstr "Настройки"
+msgstr "Включване на геолокация"
 
-#: ../src/plugins/libravatar/libravatar.c:374
-#: ../src/plugins/libravatar/libravatar.c:445
-#: ../src/plugins/libravatar/libravatar.c:505
-#: ../src/plugins/libravatar/libravatar_prefs.c:400
+#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:452
+#: ../src/plugins/libravatar/libravatar.c:512
+#: ../src/plugins/libravatar/libravatar_prefs.c:440
 msgid "Libravatar"
-msgstr ""
+msgstr "Libravatar"
 
-#: ../src/plugins/libravatar/libravatar.c:381
-#, fuzzy
+#: ../src/plugins/libravatar/libravatar.c:388
 msgid "Failed to register avatar header update hook"
-msgstr "Грешка при създаване на папката"
+msgstr ""
 
-#: ../src/plugins/libravatar/libravatar.c:389
-#, fuzzy
+#: ../src/plugins/libravatar/libravatar.c:396
 msgid "Failed to register avatar image render hook"
-msgstr "Грешка при създаване на папката"
+msgstr ""
 
-#: ../src/plugins/libravatar/libravatar.c:394
-#, fuzzy
+#: ../src/plugins/libravatar/libravatar.c:401
 msgid "Failed to create avatar image cache directory"
-msgstr "Грешка при създаване на папката"
+msgstr ""
 
-#: ../src/plugins/libravatar/libravatar.c:403
+#: ../src/plugins/libravatar/libravatar.c:410
 msgid "Failed to load missing items cache"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar.c:455
+#: ../src/plugins/libravatar/libravatar.c:462
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -11317,118 +11272,128 @@ msgid ""
 "Feedback to <ricardo at mones.org> is welcome.\n"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:112
-#, fuzzy
+#: ../src/plugins/libravatar/libravatar_prefs.c:138
 msgid "_Use cached icons"
-msgstr "Използване на идентификация"
+msgstr "_Използване на запомнени икони"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:113
+#: ../src/plugins/libravatar/libravatar_prefs.c:139
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:121
-#, fuzzy
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
 msgid "Cache refresh interval"
-msgstr "Вградена тема по подразбиране"
+msgstr "Време за обновяване на кеша"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:123
-#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:333
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
+#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:335
 msgid "hours"
 msgstr "часа"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:188
+#: ../src/plugins/libravatar/libravatar_prefs.c:207
 msgid "Mystery man"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:189
-#, fuzzy
+#: ../src/plugins/libravatar/libravatar_prefs.c:208
 msgid "Identicon"
-msgstr "Автентификация"
+msgstr "Идентикон"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:190
-#, fuzzy
+#: ../src/plugins/libravatar/libravatar_prefs.c:209
 msgid "MonsterID"
-msgstr "Потребител"
+msgstr "MonsterID"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:191
+#: ../src/plugins/libravatar/libravatar_prefs.c:210
 msgid "Wavatar"
-msgstr ""
+msgstr "Wavatar"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:192
+#: ../src/plugins/libravatar/libravatar_prefs.c:211
 msgid "Retro"
-msgstr ""
+msgstr "Ретро"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:193
-#, fuzzy
+#: ../src/plugins/libravatar/libravatar_prefs.c:212
 msgid "Custom URL"
-msgstr "Потребителско"
+msgstr "Потребителски URL"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:196
+#: ../src/plugins/libravatar/libravatar_prefs.c:215
 msgid "A blank image"
-msgstr ""
+msgstr "Празно изображение"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:197
+#: ../src/plugins/libravatar/libravatar_prefs.c:216
 msgid "The unobtrusive low-contrast greyish silhouette"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:198
+#: ../src/plugins/libravatar/libravatar_prefs.c:217
 msgid "A generated geometric pattern"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:199
+#: ../src/plugins/libravatar/libravatar_prefs.c:218
 msgid "A generated full-body monster"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:200
+#: ../src/plugins/libravatar/libravatar_prefs.c:219
 msgid "A generated almost unique face"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:201
+#: ../src/plugins/libravatar/libravatar_prefs.c:220
 msgid "A generated 8-bit arcade-style pixelated image"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:202
-#, fuzzy
+#: ../src/plugins/libravatar/libravatar_prefs.c:221
 msgid "Redirect to a user provided URL"
-msgstr "Потребителски аргументи на действието"
+msgstr "Пренасочване към зададения URL-адрес"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:229 ../src/prefs_themes.c:878
+#: ../src/plugins/libravatar/libravatar_prefs.c:248 ../src/prefs_themes.c:878
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:256
+#: ../src/plugins/libravatar/libravatar_prefs.c:276
 msgid "_Allow redirects to other sites"
-msgstr ""
+msgstr "_Позволяване пренасочването към други сайтове"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:257
+#: ../src/plugins/libravatar/libravatar_prefs.c:277
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:266
+#: ../src/plugins/libravatar/libravatar_prefs.c:286
 msgid "_Enable federated servers"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:267
+#: ../src/plugins/libravatar/libravatar_prefs.c:287
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:312
-#, fuzzy
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+msgid "Request timeout"
+msgstr "Просрочена заявка"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+#: ../src/plugins/notification/notification_prefs.c:1028
+#: ../src/plugins/notification/notification_prefs.c:1300
+#: ../src/plugins/notification/notification_prefs.c:1608
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
+#: ../src/prefs_summaries.c:496
+msgid "seconds"
+msgstr "секунди"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:305
+msgid ""
+"Set to 0 to use global socket I/O timeout. Maximum value must be also less "
+"than global socket I/O timeout."
+msgstr ""
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:349
 msgid "Icon cache"
-msgstr "Текст"
+msgstr "Кеш за икони"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:316
-#, fuzzy
+#: ../src/plugins/libravatar/libravatar_prefs.c:353
 msgid "Default missing icon mode"
-msgstr "Речник по подразбиране"
+msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:320
-#, fuzzy
+#: ../src/plugins/libravatar/libravatar_prefs.c:357
 msgid "Network"
-msgstr "Мрежов дневник"
+msgstr "Мрежови"
 
 #: ../src/plugins/mailmbox/plugin.c:58
 msgid "mailmbox folder (etPan!)"
@@ -11436,15 +11401,15 @@ msgstr ""
 
 #: ../src/plugins/mailmbox/plugin.c:63
 msgid "This is a plugin to handle mailboxes in mbox format."
-msgstr ""
+msgstr "Приставка за работа с пощенски кутии във формат mbox."
 
 #: ../src/plugins/mailmbox/plugin.c:84
 msgid "MBOX"
-msgstr ""
+msgstr "MBOX"
 
 #: ../src/plugins/mailmbox/plugin_gtk.c:86
 msgid "mbox (etPan!)..."
-msgstr ""
+msgstr "mbox (etPan!)..."
 
 #: ../src/plugins/mailmbox/plugin_gtk.c:190
 msgid ""
@@ -11461,21 +11426,17 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/newmail/newmail.c:111 ../src/plugins/newmail/newmail.c:162
-#, fuzzy
 msgid "NewMail"
-msgstr "Провери поща"
+msgstr "НоваПоща"
 
 #: ../src/plugins/newmail/newmail.c:116
-#, fuzzy
 msgid "Failed to register newmail hook"
-msgstr "Грешка при създаване на папката"
+msgstr ""
 
 #: ../src/plugins/newmail/newmail.c:137 ../src/plugins/newmail/newmail.c:140
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open log file %s: %s\n"
-msgstr ""
-"Грешка при четене на mbox-файла:\n"
-"%s\n"
+msgstr "Грешка при отваряне на журналния файл %s: %s:\n"
 
 #: ../src/plugins/newmail/newmail.c:154
 #, c-format
@@ -11489,30 +11450,25 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/newmail/newmail.c:188
-#, fuzzy
 msgid "Log file"
-msgstr "Ниво на записите"
+msgstr "Журнален файл"
 
 #: ../src/plugins/notification/notification_banner.c:356
-#, fuzzy
 msgid "Folder:"
-msgstr "Папка"
+msgstr "Папка:"
 
 #: ../src/plugins/notification/notification_foldercheck.c:478
-#, fuzzy
 msgid "Select folder(s)"
-msgstr "Избор на папка"
+msgstr "Избор на папка(-и)"
 
 #. recursive
 #: ../src/plugins/notification/notification_foldercheck.c:579
-#, fuzzy
 msgid "select recursively"
-msgstr "Рекурсивно търсене"
+msgstr "рекурсивно избиране"
 
 #: ../src/plugins/notification/notification_lcdproc.c:155
-#, fuzzy
 msgid "No new messages"
-msgstr "Няма нови писма."
+msgstr "Няма нови писма"
 
 #: ../src/plugins/notification/notification_plugin.c:216
 #: ../src/plugins/notification/notification_plugin.c:417
@@ -11524,9 +11480,8 @@ msgstr "Няма нови писма."
 #: ../src/plugins/notification/notification_prefs.c:480
 #: ../src/plugins/notification/notification_prefs.c:497
 #: ../src/plugins/notification/notification_prefs.c:514
-#, fuzzy
 msgid "Notification"
-msgstr "_Връщане на разписка за получаването"
+msgstr "Уведомяване"
 
 #: ../src/plugins/notification/notification_plugin.c:221
 msgid "The Notification plugin needs threading support."
@@ -11561,9 +11516,8 @@ msgid "Failed to register account list changed hook in the Notification plugin"
 msgstr ""
 
 #: ../src/plugins/notification/notification_plugin.c:306
-#, fuzzy
 msgid "Failed to register theme change hook in the Notification plugin"
-msgstr "Грешка при създаване на папката"
+msgstr ""
 
 #: ../src/plugins/notification/notification_plugin.c:422
 msgid ""
@@ -11577,36 +11531,32 @@ msgstr ""
 
 #: ../src/plugins/notification/notification_plugin.c:447
 msgid "Various tools"
-msgstr ""
+msgstr "Различни инструменти"
 
 #: ../src/plugins/notification/notification_popup.c:314
-#, fuzzy
 msgid "New Mail message"
 msgstr "Ново писмо"
 
 #: ../src/plugins/notification/notification_popup.c:335
 msgid "New News post"
-msgstr ""
+msgstr "Нова новинарска публикация"
 
 #: ../src/plugins/notification/notification_popup.c:336
-#, fuzzy
 msgid "A new message arrived"
-msgstr "нови писма"
+msgstr "Пристигна ново писмо"
 
 #: ../src/plugins/notification/notification_popup.c:339
-#, fuzzy
 msgid "New Calendar message"
-msgstr "Следващо _етикирано писмо"
+msgstr "Ново календарно съобщение"
 
 #: ../src/plugins/notification/notification_popup.c:340
 #: ../src/plugins/notification/notification_trayicon.c:872
-#, fuzzy
 msgid "A new calendar message arrived"
-msgstr "Отбелязване на писмата като прочетени"
+msgstr "Пристигна ново календарно съобщение"
 
 #: ../src/plugins/notification/notification_popup.c:343
 msgid "New RSS feed article"
-msgstr ""
+msgstr "Нова статия в RSS емисия"
 
 #: ../src/plugins/notification/notification_popup.c:344
 #: ../src/plugins/notification/notification_trayicon.c:875
@@ -11614,42 +11564,37 @@ msgid "A new article in a RSS feed arrived"
 msgstr ""
 
 #: ../src/plugins/notification/notification_popup.c:347
-#, fuzzy
 msgid "New unknown message"
-msgstr "Ново писмо"
+msgstr "Ново непознато съобщение"
 
 #: ../src/plugins/notification/notification_popup.c:348
 msgid "Unknown message type arrived"
-msgstr ""
+msgstr "Пристигна съобщение от непознат вид"
 
 #: ../src/plugins/notification/notification_popup.c:381
 #: ../src/plugins/notification/notification_trayicon.c:644
-#, fuzzy
 msgid "Present main window"
-msgstr "Отваряне в _нов прозорец"
+msgstr ""
 
 #: ../src/plugins/notification/notification_popup.c:491
-#, fuzzy
 msgid "Mail message"
-msgstr "всички писма"
+msgstr "Писмо"
 
 #: ../src/plugins/notification/notification_popup.c:492
 #: ../src/plugins/notification/notification_popup.c:498
-#, fuzzy, c-format
+#, c-format
 msgid "%d new message arrived"
 msgid_plural "%d new messages arrived"
-msgstr[0] "нови писма"
-msgstr[1] "нови писма"
+msgstr[0] "пристигна %d ново писмо"
+msgstr[1] "пристигнаха %d нови писма"
 
 #: ../src/plugins/notification/notification_popup.c:497
-#, fuzzy
 msgid "News message"
-msgstr "Ново писмо"
+msgstr "Новинарско съобщение"
 
 #: ../src/plugins/notification/notification_popup.c:503
-#, fuzzy
 msgid "Calendar message"
-msgstr "Отбелязано писмо"
+msgstr "Календарно съобщение"
 
 #: ../src/plugins/notification/notification_popup.c:504
 #: ../src/plugins/notification/notification_trayicon.c:909
@@ -11661,7 +11606,7 @@ msgstr[1] ""
 
 #: ../src/plugins/notification/notification_popup.c:509
 msgid "RSS news feed"
-msgstr ""
+msgstr "RSS емисия"
 
 #: ../src/plugins/notification/notification_popup.c:510
 #, c-format
@@ -11671,15 +11616,15 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/plugins/notification/notification_popup.c:572
-#, fuzzy, c-format
+#, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
-msgstr[0] "нови писма"
-msgstr[1] "нови писма"
+msgstr[0] "%d ново писмо"
+msgstr[1] "%d нови писма"
 
 #: ../src/plugins/notification/notification_prefs.c:412
 msgid "Hotkeys"
-msgstr ""
+msgstr "Бързи клавиши"
 
 #: ../src/plugins/notification/notification_prefs.c:430
 msgid "Banner"
@@ -11696,16 +11641,15 @@ msgstr "Команда"
 
 #: ../src/plugins/notification/notification_prefs.c:481
 msgid "LCD"
-msgstr ""
+msgstr "LCD"
 
 #: ../src/plugins/notification/notification_prefs.c:498
-#, fuzzy
 msgid "SysTrayicon"
-msgstr "Икона в системния панел"
+msgstr ""
 
 #: ../src/plugins/notification/notification_prefs.c:515
 msgid "Indicator"
-msgstr ""
+msgstr "Индикатор"
 
 #: ../src/plugins/notification/notification_prefs.c:570
 msgid ""
@@ -11715,33 +11659,28 @@ msgstr ""
 
 #. Frame
 #: ../src/plugins/notification/notification_prefs.c:597
-#, fuzzy
 msgid "Include folder types"
-msgstr "Включване на под-папките"
+msgstr "Включване вида на папките"
 
 #. Include mail folders
 #: ../src/plugins/notification/notification_prefs.c:607
-#, fuzzy
 msgid "Mail folders"
-msgstr "Във всички папки"
+msgstr "Пощенски папки"
 
 #. Include news folders
 #: ../src/plugins/notification/notification_prefs.c:615
-#, fuzzy
 msgid "News folders"
-msgstr "Нова папка"
+msgstr "Новинарски папки"
 
 #. Include RSS folders
 #: ../src/plugins/notification/notification_prefs.c:623
-#, fuzzy
 msgid "RSS folders"
-msgstr "папки"
+msgstr "Папки с емисии"
 
 #. Include calendar folders
 #: ../src/plugins/notification/notification_prefs.c:631
-#, fuzzy
 msgid "Calendar folders"
-msgstr "Преименуване на папка"
+msgstr "Календарни папки"
 
 #. Warning-Label
 #: ../src/plugins/notification/notification_prefs.c:639
@@ -11751,7 +11690,7 @@ msgstr ""
 #. Frame
 #: ../src/plugins/notification/notification_prefs.c:650
 msgid "Global notification settings"
-msgstr ""
+msgstr "Общи настройки за уведомяване"
 
 #. urgency hint new
 #: ../src/plugins/notification/notification_prefs.c:660
@@ -11766,12 +11705,11 @@ msgstr ""
 #. canberra
 #: ../src/plugins/notification/notification_prefs.c:679
 msgid "Use sound theme"
-msgstr ""
+msgstr "Използване на звуци"
 
 #: ../src/plugins/notification/notification_prefs.c:741
-#, fuzzy
 msgid "Show banner"
-msgstr "Показване на _линийка"
+msgstr ""
 
 #: ../src/plugins/notification/notification_prefs.c:746
 #: ../src/plugins/pgpcore/select-keys.c:238
@@ -11788,24 +11726,23 @@ msgstr "Винаги"
 
 #: ../src/plugins/notification/notification_prefs.c:750
 msgid "Only when not empty"
-msgstr ""
+msgstr "Само когато не е празно"
 
 #: ../src/plugins/notification/notification_prefs.c:768
 msgid "slow"
-msgstr ""
+msgstr "бавно"
 
 #: ../src/plugins/notification/notification_prefs.c:772
 msgid "fast"
-msgstr ""
+msgstr "бързо"
 
 #: ../src/plugins/notification/notification_prefs.c:776
 msgid "Banner speed"
 msgstr ""
 
 #: ../src/plugins/notification/notification_prefs.c:794
-#, fuzzy
 msgid "Maximum number of messages (0 means unlimited)"
-msgstr "Максимален брой статии за изтегляне"
+msgstr "Максимален брой съобщения (0 значи без ограничение)"
 
 #: ../src/plugins/notification/notification_prefs.c:808
 msgid "Banner width in pixels (0 means screen size)"
@@ -11825,37 +11762,32 @@ msgstr ""
 #: ../src/plugins/notification/notification_prefs.c:1037
 #: ../src/plugins/notification/notification_prefs.c:1309
 #: ../src/plugins/notification/notification_prefs.c:1544
-#, fuzzy
 msgid "Only include selected folders"
-msgstr "В избраната папка"
+msgstr "Включване само на избраните папки"
 
 #: ../src/plugins/notification/notification_prefs.c:848
 #: ../src/plugins/notification/notification_prefs.c:1046
 #: ../src/plugins/notification/notification_prefs.c:1318
 #: ../src/plugins/notification/notification_prefs.c:1553
-#, fuzzy
 msgid "Select folders..."
-msgstr "Избор на папка"
+msgstr "Избор на папки..."
 
 #. Check box for enabling custom colors
 #: ../src/plugins/notification/notification_prefs.c:858
 #: ../src/plugins/notification/notification_prefs.c:1078
-#, fuzzy
 msgid "Use custom colors"
-msgstr "Повтаряне на цветовете за цитиране"
+msgstr "Потребителски цветове"
 
 #. foreground
 #: ../src/plugins/notification/notification_prefs.c:871
 #: ../src/plugins/notification/notification_prefs.c:1091
-#, fuzzy
 msgid "Foreground"
-msgstr "Фон"
+msgstr "Текст"
 
 #: ../src/plugins/notification/notification_prefs.c:877
 #: ../src/plugins/notification/notification_prefs.c:1097
-#, fuzzy
 msgid "Foreground color"
-msgstr "Цвят на папката"
+msgstr "Цвят на текста"
 
 #. background
 #: ../src/plugins/notification/notification_prefs.c:882
@@ -11867,29 +11799,18 @@ msgstr "Фон"
 
 #: ../src/plugins/notification/notification_prefs.c:888
 #: ../src/plugins/notification/notification_prefs.c:1108
-#, fuzzy
 msgid "Background color"
-msgstr "Фон"
+msgstr "Цвят на фона"
 
 #. Enable popup
 #: ../src/plugins/notification/notification_prefs.c:1001
-#, fuzzy
 msgid "Enable popup"
-msgstr "Включване"
+msgstr ""
 
 #: ../src/plugins/notification/notification_prefs.c:1018
 #: ../src/plugins/notification/notification_prefs.c:1599
-#, fuzzy
 msgid "Popup timeout:"
-msgstr "Сесията изтече\n"
-
-#: ../src/plugins/notification/notification_prefs.c:1028
-#: ../src/plugins/notification/notification_prefs.c:1300
-#: ../src/plugins/notification/notification_prefs.c:1608
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
-#: ../src/prefs_summaries.c:496
-msgid "seconds"
-msgstr "секунди"
+msgstr ""
 
 #. Sticky check button
 #: ../src/plugins/notification/notification_prefs.c:1057
@@ -11906,29 +11827,25 @@ msgstr ""
 
 #: ../src/plugins/notification/notification_prefs.c:1120
 #: ../src/plugins/notification/notification_prefs.c:1611
-#, fuzzy
 msgid "Display folder name"
-msgstr "Отхвърляне на писмо"
+msgstr "Показване името на папката"
 
 #: ../src/plugins/notification/notification_prefs.c:1185
 msgid "Sample popup window"
 msgstr ""
 
 #: ../src/plugins/notification/notification_prefs.c:1191
-#, fuzzy
 msgid "Done"
-msgstr "Готово."
+msgstr "Готово"
 
 #. Enable command
 #: ../src/plugins/notification/notification_prefs.c:1260
-#, fuzzy
 msgid "Enable command"
-msgstr "Изпълнение на команда"
+msgstr "Включване на команда"
 
 #: ../src/plugins/notification/notification_prefs.c:1277
-#, fuzzy
 msgid "Command to execute:"
-msgstr "Изход от командата"
+msgstr "Команда за изпълнение:"
 
 #: ../src/plugins/notification/notification_prefs.c:1290
 msgid "Block command after execution for"
@@ -11936,20 +11853,17 @@ msgstr ""
 
 #. Enable lcdproc
 #: ../src/plugins/notification/notification_prefs.c:1397
-#, fuzzy
 msgid "Enable LCD"
-msgstr "Включване"
+msgstr "Включване на LCD"
 
 #: ../src/plugins/notification/notification_prefs.c:1416
-#, fuzzy
 msgid "Hostname:Port of LCDd server:"
-msgstr "Име на хост или IP-адрес на spamd-сървъра"
+msgstr ""
 
 #. Enable trayicon
 #: ../src/plugins/notification/notification_prefs.c:1501
-#, fuzzy
 msgid "Enable Trayicon"
-msgstr "Икона в системния панел"
+msgstr ""
 
 #. Hide at startup
 #: ../src/plugins/notification/notification_prefs.c:1517
@@ -11979,9 +11893,8 @@ msgstr ""
 
 #. Enable popup for the tray icon
 #: ../src/plugins/notification/notification_prefs.c:1581
-#, fuzzy
 msgid "Enable Popup"
-msgstr "Приставки"
+msgstr ""
 
 #. Enable indicator
 #: ../src/plugins/notification/notification_prefs.c:1799
@@ -11995,28 +11908,26 @@ msgstr ""
 
 #. register
 #: ../src/plugins/notification/notification_prefs.c:1819
-#, fuzzy
 msgid "Register Claws Mail"
-msgstr "Да се спре ли Claws Mail?"
+msgstr "Регистриране на Claws Mail"
 
 #. Enable hotkeys
 #: ../src/plugins/notification/notification_prefs.c:1880
-#, fuzzy
 msgid "Enable global hotkeys"
-msgstr "Включване на правописната проверка"
+msgstr "Включване на общите бързи клавиши"
 
 #: ../src/plugins/notification/notification_prefs.c:1894
 #, c-format
 msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
-msgstr ""
+msgstr "Примери за бързи клавиши са <b>%s</b> и <b>%s</b>"
 
 #: ../src/plugins/notification/notification_prefs.c:1894
 msgid "<control><shift>F11"
-msgstr ""
+msgstr "<control><shift>F11"
 
 #: ../src/plugins/notification/notification_prefs.c:1894
 msgid "<alt>N"
-msgstr ""
+msgstr "<alt>N"
 
 #. toggle mainwindow
 #: ../src/plugins/notification/notification_prefs.c:1905
@@ -12048,9 +11959,8 @@ msgid "_Work Offline"
 msgstr "_Работа в изключен режим"
 
 #: ../src/plugins/notification/notification_trayicon.c:126
-#, fuzzy
 msgid "Show Trayicon Notifications"
-msgstr "_Връщане на разписка за получаването"
+msgstr ""
 
 #. Tooltip
 #: ../src/plugins/notification/notification_trayicon.c:269
@@ -12059,27 +11969,24 @@ msgid "New %d, Unread: %d, Total: %d"
 msgstr "Нови %d, Непрочетени: %d, Общо: %d"
 
 #: ../src/plugins/notification/notification_trayicon.c:822
-#, fuzzy
 msgid "New mail message"
 msgstr "Ново писмо"
 
 #: ../src/plugins/notification/notification_trayicon.c:824
 msgid "New news post"
-msgstr ""
+msgstr "Нова новинарска публикация"
 
 #: ../src/plugins/notification/notification_trayicon.c:826
-#, fuzzy
 msgid "New calendar message"
-msgstr "Следващо _етикирано писмо"
+msgstr "Ново календарно съобщение"
 
 #: ../src/plugins/notification/notification_trayicon.c:828
 msgid "New article in RSS feed"
-msgstr ""
+msgstr "Нова статия в RSS емисия"
 
 #: ../src/plugins/notification/notification_trayicon.c:831
-#, fuzzy
 msgid "New messages arrived"
-msgstr "Ново писмо"
+msgstr "Пристигнаха нови съобщения"
 
 #: ../src/plugins/notification/notification_trayicon.c:887
 #, c-format
@@ -12104,58 +12011,54 @@ msgstr[1] ""
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Title:"
-msgstr ""
+msgstr "Заглавие:"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:703
-#, fuzzy
 msgid "Author:"
 msgstr "Автор:"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Creator:"
-msgstr ""
+msgstr "Създател:"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:706
 msgid "Producer:"
-msgstr ""
+msgstr "Производител:"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:709
 msgid "Created:"
-msgstr ""
+msgstr "Създадено:"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:713
 msgid "Modified:"
-msgstr ""
+msgstr "Променено:"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:716
-#, fuzzy
 msgid "Format:"
-msgstr "Формат"
+msgstr "Формат:"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:718
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:721
 msgid "Optimized:"
-msgstr ""
+msgstr "Оптимизирано:"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1179
-#, fuzzy
 msgid "PDF properties"
-msgstr "Атрибути"
+msgstr "Подробности за PDF"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1277
-#, fuzzy
 msgid "Loading..."
 msgstr "Зареждане..."
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1336
 #, c-format
 msgid "%s Document"
-msgstr ""
+msgstr "документ %s"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1342
 #, c-format
 msgid "of %d"
-msgstr ""
+msgstr "от %d"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1359
 msgid "PDF rendering failed for an unknown reason."
@@ -12163,69 +12066,60 @@ msgstr ""
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1722
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1940
-#, fuzzy
 msgid "Document Index"
-msgstr "Екип за документиране"
+msgstr "Индекс на документа"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1908
-#, fuzzy
 msgid "First Page"
 msgstr "Първа страница"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1911
-#, fuzzy
 msgid "Previous Page"
 msgstr "Предишна страница"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1914
-#, fuzzy
 msgid "Next Page"
 msgstr "Следваща страница"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1917
-#, fuzzy
 msgid "Last Page"
 msgstr "Последна страница"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1920
-#, fuzzy
 msgid "Zoom In"
-msgstr "Увеличаване на мащаба"
+msgstr "Увеличаване"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1922
-#, fuzzy
 msgid "Zoom Out"
-msgstr "Намаляване на мащаба"
+msgstr "Намаляване"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1925
 msgid "Fit Page"
-msgstr ""
+msgstr "Напасване на страницата"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1928
 msgid "Fit Page Width"
-msgstr ""
+msgstr "Напасване по широчина"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1931
 msgid "Rotate Left"
-msgstr ""
+msgstr "Завъртане наляво"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1934
 msgid "Rotate Right"
-msgstr ""
+msgstr "Завъртане надясно"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1937
 msgid "Document Info"
-msgstr ""
+msgstr "Данни за документ"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1942
-#, fuzzy
 msgid "Page Number"
-msgstr "Номер"
+msgstr "Номер на страница"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1944
-#, fuzzy
 msgid "Zoom Factor"
-msgstr "Вместване в прозореца"
+msgstr "Мащаб на увеличение"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:2049
 #, c-format
@@ -12239,9 +12133,8 @@ msgstr ""
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:2055
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:2063
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:2083
-#, fuzzy
 msgid "PDF Viewer"
-msgstr "преглед на изображения"
+msgstr "Преглед на PDF документи"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:2059
 #, c-format
@@ -12258,9 +12151,8 @@ msgid "Edit perl filter rules (ext)..."
 msgstr ""
 
 #: ../src/plugins/pgpcore/autocompletion.c:125
-#, fuzzy
 msgid "Failed to register PGP address autocompletion hook"
-msgstr "Грешка при създаване на папката"
+msgstr ""
 
 #: ../src/plugins/pgpcore/passphrase.c:86
 #: ../src/plugins/pgpcore/prefs_gpg.c:116
@@ -12326,6 +12218,8 @@ msgid ""
 "This key is not in your keyring. Do you want Claws Mail to try and import it "
 "from a keyserver?"
 msgstr ""
+"Този ключ не е в ключодържателя ви. Искате ли Claws Mail да опита да го внесе "
+"от сървър за ключове?"
 
 #: ../src/plugins/pgpcore/pgp_viewer.c:129
 #: ../src/plugins/pgpcore/pgp_viewer.c:201
@@ -12339,7 +12233,7 @@ msgstr ""
 #: ../src/plugins/pgpcore/pgp_viewer.c:132
 #: ../src/plugins/pgpcore/pgp_viewer.c:194
 msgid "   This key is not in your keyring.\n"
-msgstr ""
+msgstr "   Този ключ не е в ключодържателя ви.\n"
 
 #: ../src/plugins/pgpcore/pgp_viewer.c:133
 msgid "   It should be possible to import it "
@@ -12357,20 +12251,25 @@ msgid ""
 "\n"
 "     "
 msgstr ""
+"със следната команда:\n"
+"\n"
+"     "
 
 #: ../src/plugins/pgpcore/pgp_viewer.c:143
 msgid ""
 "\n"
 "  Importing key ID "
 msgstr ""
+"\n"
+"  Внасяне на ключ ID "
 
 #: ../src/plugins/pgpcore/pgp_viewer.c:186
 msgid "   This key has been imported to your keyring.\n"
-msgstr ""
+msgstr "   Този ключ е добавен към ключодържателя ви.\n"
 
 #: ../src/plugins/pgpcore/pgp_viewer.c:188
 msgid "   This key couldn't be imported to your keyring.\n"
-msgstr ""
+msgstr "   Този ключ не можа да бъде добавен към ключодържателя ви.\n"
 
 #: ../src/plugins/pgpcore/pgp_viewer.c:189
 msgid "   Key servers are sometimes slow.\n"
@@ -12388,7 +12287,7 @@ msgstr ""
 
 #: ../src/plugins/pgpcore/pgp_viewer.c:195
 msgid "   Key import isn't implemented in Windows.\n"
-msgstr ""
+msgstr "   Внасянето на ключове не е внедрено за Windows.\n"
 
 #: ../src/plugins/pgpcore/pgp_viewer.c:204
 msgid "   This key is in your keyring.\n"
@@ -12425,7 +12324,7 @@ msgstr ""
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:119
 msgid "Use gpg-agent to manage passwords"
-msgstr ""
+msgstr "Използване на gpg агент за управление на паролите"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:124
 msgid "Store passphrase in memory"
@@ -12445,7 +12344,7 @@ msgstr "минута(-и)"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:163
 msgid "Grab input while entering a passphrase"
-msgstr ""
+msgstr "Прихващане на входа при въвеждане на парола"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:170
 msgid "Display warning on start-up if GnuPG doesn't work"
@@ -12499,12 +12398,12 @@ msgid "Undefined"
 msgstr "Неопределено"
 
 #: ../src/plugins/pgpcore/select-keys.c:241
-#: ../src/plugins/pgpcore/sgpgme.c:146
+#: ../src/plugins/pgpcore/sgpgme.c:146 ../src/plugins/pgpcore/sgpgme.c:162
 msgid "Marginal"
 msgstr "Ограничено"
 
 #: ../src/plugins/pgpcore/select-keys.c:247
-#: ../src/plugins/pgpcore/sgpgme.c:150
+#: ../src/plugins/pgpcore/sgpgme.c:150 ../src/plugins/pgpcore/sgpgme.c:166
 msgid "Ultimate"
 msgstr "Пълно"
 
@@ -12537,9 +12436,9 @@ msgid "Enter another user or key ID:"
 msgstr "Въведете друг потребител или ключ:"
 
 #: ../src/plugins/pgpcore/select-keys.c:606
-#, fuzzy, c-format
+#, c-format
 msgid "Encrypt to %s <%s>"
-msgstr "Грешка при шифриране, %s"
+msgstr "Шифриране в %s <%s>"
 
 #: ../src/plugins/pgpcore/select-keys.c:607
 #, c-format
@@ -12558,197 +12457,207 @@ msgstr ""
 msgid "No signature found"
 msgstr "Не е открит подпис"
 
-#: ../src/plugins/pgpcore/sgpgme.c:184 ../src/plugins/pgpcore/sgpgme.c:203
+#: ../src/plugins/pgpcore/sgpgme.c:160
+msgid "Untrusted"
+msgstr "Недоверен"
+
+#: ../src/plugins/pgpcore/sgpgme.c:200 ../src/plugins/pgpcore/sgpgme.c:219
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Подписът не може да бъде проверен - %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:188 ../src/plugins/pgpcore/sgpgme.c:192
-#: ../src/plugins/pgpcore/sgpgme.c:245
+#: ../src/plugins/pgpcore/sgpgme.c:204 ../src/plugins/pgpcore/sgpgme.c:208
+#: ../src/plugins/pgpcore/sgpgme.c:249
 msgid "The signature has not been checked."
 msgstr "Подписът не е проверен."
 
-#: ../src/plugins/pgpcore/sgpgme.c:198 ../src/plugins/pgpcore/sgpgme.c:200
+#: ../src/plugins/pgpcore/sgpgme.c:214 ../src/plugins/pgpcore/sgpgme.c:216
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:215
+#: ../src/plugins/pgpcore/sgpgme.c:228
 #, c-format
 msgid "Good signature from %s."
 msgstr "Правилен подпис от %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:222
-#, c-format
-msgid "Good signature (untrusted) from %s."
-msgstr "Правилен подпис (недоверен) от %s"
-
-#: ../src/plugins/pgpcore/sgpgme.c:227
+#: ../src/plugins/pgpcore/sgpgme.c:231
 #, c-format
 msgid "Expired signature from %s."
 msgstr "Изтекъл подпис от %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:230
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:234
+#, c-format
 msgid "Good signature from %s, but the key has expired."
-msgstr "Правилен подпис от %s."
+msgstr "Правилен подпис от %s, но ключът е изтекъл."
 
-#: ../src/plugins/pgpcore/sgpgme.c:233
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:237
+#, c-format
 msgid "Good signature from %s, but the key has been revoked."
-msgstr "Правилен подпис от %s."
+msgstr "Правилен подпис от %s, но ключът е бил анулиран."
 
-#: ../src/plugins/pgpcore/sgpgme.c:236
+#: ../src/plugins/pgpcore/sgpgme.c:240
 #, c-format
 msgid "Bad signature from %s."
 msgstr "Неправилен подпис от %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:240
+#: ../src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:264
+#: ../src/plugins/pgpcore/sgpgme.c:268
 #, c-format
 msgid "Error checking signature: no status\n"
 msgstr "Грешка при проверка на подписа: няма състояние\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:283
+#: ../src/plugins/pgpcore/sgpgme.c:287
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Грешка при проверка на подписа: %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:302
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:306
+#, c-format
 msgid "Signature made on %s using %s key ID %s\n"
-msgstr "Подписано с ключ %s с идентификатор %s\n"
+msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:308
+#: ../src/plugins/pgpcore/sgpgme.c:312
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Правилен подпис от \"%s\" (Валидност: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:313
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:317
+#, c-format
 msgid "Expired key uid \"%s\"\n"
-msgstr "Изтекъл ключ от %s."
+msgstr "Изтекъл ключ uid \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:318
+#: ../src/plugins/pgpcore/sgpgme.c:322
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Изтекъл подпис от \"%s\" (Валидност: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:323
+#: ../src/plugins/pgpcore/sgpgme.c:327
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:328
+#: ../src/plugins/pgpcore/sgpgme.c:332
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Неправилен подпис от \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:339
+#: ../src/plugins/pgpcore/sgpgme.c:343
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                    uid \"%s\" (Валидност: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:346
-#, fuzzy
+#: ../src/plugins/pgpcore/sgpgme.c:345
+msgid "Revoked"
+msgstr "Анулиран"
+
+#: ../src/plugins/pgpcore/sgpgme.c:349
+#, c-format
+msgid "Owner Trust: %s\n"
+msgstr ""
+
+#: ../src/plugins/pgpcore/sgpgme.c:352
 msgid "Primary key fingerprint:"
-msgstr "Отпечатък на основния ключ: %s\n"
+msgstr "Отпечатък на основния ключ:"
 
-#: ../src/plugins/pgpcore/sgpgme.c:364
+#: ../src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 "Предупреждение: Адресът \"%s\" на подписалия не съвпада с DNS-записа му\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:370
+#: ../src/plugins/pgpcore/sgpgme.c:376
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:412
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:410
+#, c-format
 msgid "Couldn't get data from message, %s"
-msgstr "Грешка при изтеглянето на част от многосъставно писмо: %s"
+msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:428
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:426
+#, c-format
 msgid "Couldn't initialize data, %s"
-msgstr "Грешка при отваряне на файла %s."
+msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:583
+#: ../src/plugins/pgpcore/sgpgme.c:581
 msgid "Secret key specification is ambiguous"
 msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:593
+#: ../src/plugins/pgpcore/sgpgme.c:591
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Не е открит частен ключ. (%s)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:606
+#: ../src/plugins/pgpcore/sgpgme.c:604
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:690
+#: ../src/plugins/pgpcore/sgpgme.c:688
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:696
+#: ../src/plugins/pgpcore/sgpgme.c:694
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
 "version %s is required.\n"
 msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:704
+#: ../src/plugins/pgpcore/sgpgme.c:702
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:720
+#: ../src/plugins/pgpcore/sgpgme.c:718
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgstr ""
+"GnuPG не е инсталиран правилно или трябва да се обнови.\n"
+"Поддръжката на OpenPGP е изключена."
 
-#: ../src/plugins/pgpcore/sgpgme.c:754
+#: ../src/plugins/pgpcore/sgpgme.c:752
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:759
+#: ../src/plugins/pgpcore/sgpgme.c:757
 msgid "No PGP key found"
 msgstr "Не е открит PGP-ключ"
 
-#: ../src/plugins/pgpcore/sgpgme.c:760
+#: ../src/plugins/pgpcore/sgpgme.c:758
 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"
 "Do you want to create a new key pair now?"
 msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:830 ../src/plugins/pgpcore/sgpgme.c:846
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:828 ../src/plugins/pgpcore/sgpgme.c:844
+#, c-format
 msgid "Couldn't generate a new key pair: %s"
-msgstr "Създаване на нова двойка ключове"
+msgstr "Грешка при създаване на нова двойка ключове: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:837
+#: ../src/plugins/pgpcore/sgpgme.c:835
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr ""
+"Създаване на новата ви двойка ключове... Движете мишката, за да помогнете за "
+"събиране на произволни данни..."
 
-#: ../src/plugins/pgpcore/sgpgme.c:852
-#, fuzzy
+#: ../src/plugins/pgpcore/sgpgme.c:850
 msgid "Couldn't generate a new key pair: unknown error"
-msgstr "Създаване на нова двойка ключове"
+msgstr "Грешка при създаване на нова двойка ключове: непозната грешка"
 
-#: ../src/plugins/pgpcore/sgpgme.c:856
+#: ../src/plugins/pgpcore/sgpgme.c:854
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12757,21 +12666,21 @@ msgid ""
 "Do you want to export it to a keyserver?"
 msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:860
+#: ../src/plugins/pgpcore/sgpgme.c:858
 msgid "Key generated"
 msgstr "Ключът е създаден"
 
-#: ../src/plugins/pgpcore/sgpgme.c:899
+#: ../src/plugins/pgpcore/sgpgme.c:897
 msgid "Key exported."
 msgstr "Ключът е изнесен."
 
-#: ../src/plugins/pgpcore/sgpgme.c:901
+#: ../src/plugins/pgpcore/sgpgme.c:899
 msgid "Couldn't export key."
 msgstr "Грешка при изнасяне на ключа."
 
-#: ../src/plugins/pgpcore/sgpgme.c:905
+#: ../src/plugins/pgpcore/sgpgme.c:903
 msgid "Key export isn't implemented in Windows."
-msgstr ""
+msgstr "Изнасянето на ключове не е внедрено за Windows."
 
 #: ../src/plugins/pgpinline/pgpinline.c:158
 msgid "Incorrect part"
@@ -12783,9 +12692,8 @@ msgstr "Не е текстова част"
 
 #: ../src/plugins/pgpinline/pgpinline.c:173
 #: ../src/plugins/pgpinline/pgpinline.c:325
-#, fuzzy
 msgid "Couldn't get text data."
-msgstr "Грешка при изтеглянето на част от писмо."
+msgstr ""
 
 #: ../src/plugins/pgpinline/pgpinline.c:191
 msgid "Couldn't convert text data to any sane charset."
@@ -12797,21 +12705,20 @@ msgstr ""
 #: ../src/plugins/pgpinline/pgpinline.c:716
 #: ../src/plugins/pgpmime/pgpmime.c:74 ../src/plugins/pgpmime/pgpmime.c:184
 #: ../src/plugins/pgpmime/pgpmime.c:330 ../src/plugins/pgpmime/pgpmime.c:510
-#: ../src/plugins/pgpmime/pgpmime.c:655 ../src/plugins/smime/smime.c:415
-#, fuzzy, c-format
+#: ../src/plugins/pgpmime/pgpmime.c:651 ../src/plugins/smime/smime.c:415
+#, c-format
 msgid "Couldn't initialize GPG context, %s"
-msgstr "Грешка при добавяне на GPG-ключ %s, %s"
+msgstr ""
 
 #: ../src/plugins/pgpinline/pgpinline.c:318
-#, fuzzy
 msgid "Couldn't parse mime part."
-msgstr "Грешка при изтеглянето на част от писмо."
+msgstr ""
 
 #: ../src/plugins/pgpinline/pgpinline.c:348
 #: ../src/plugins/pgpmime/pgpmime.c:353
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't open decrypted file %s"
-msgstr "Грешка при отваряне на файла %s."
+msgstr "Грешка при отваряне на дешифрирания файл %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:365
 #: ../src/plugins/pgpinline/pgpinline.c:374
@@ -12820,9 +12727,9 @@ msgstr "Грешка при отваряне на файла %s."
 #: ../src/plugins/pgpinline/pgpinline.c:401
 #: ../src/plugins/pgpinline/pgpinline.c:410
 #: ../src/plugins/pgpmime/pgpmime.c:364 ../src/plugins/pgpmime/pgpmime.c:378
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't write to decrypted file %s"
-msgstr "Грешка при отваряне на файла %s."
+msgstr "Грешка при запис в дешифрирания файл %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:379
 #: ../src/plugins/pgpinline/pgpinline.c:380
@@ -12841,25 +12748,22 @@ msgstr ""
 
 #: ../src/plugins/pgpinline/pgpinline.c:418
 #: ../src/plugins/pgpmime/pgpmime.c:390
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't close decrypted file %s"
-msgstr "Грешка при отваряне на файла %s."
+msgstr "Грешка при затваряне на дешифрирания файл %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:430
-#, fuzzy
 msgid "Couldn't scan decrypted file."
-msgstr "Грешка при запис на файла '%s'."
+msgstr "Грешка при претърсване на дешифрирания файл."
 
 #: ../src/plugins/pgpinline/pgpinline.c:438
-#, fuzzy
 msgid "Couldn't scan decrypted file parts."
-msgstr "Грешка при запис на файла '%s'."
+msgstr "Грешка при претърсване на части с дешифрирани файлове."
 
 #: ../src/plugins/pgpinline/pgpinline.c:495
 #: ../src/plugins/pgpinline/pgpinline.c:687
-#, fuzzy
 msgid "Malformed message"
-msgstr "Отбелязано писмо"
+msgstr "Неправилно форматирано съобщение"
 
 #: ../src/plugins/pgpinline/pgpinline.c:506
 msgid "Couldn't create temporary file."
@@ -12894,19 +12798,19 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/pgpinline/pgpinline.c:670
-#: ../src/plugins/pgpmime/pgpmime.c:665
+#: ../src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Грешка при добавяне на GPG-ключ %s, %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:698
-#: ../src/plugins/pgpmime/pgpmime.c:694
+#: ../src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Грешка при създаване на временен файл %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:729
-#: ../src/plugins/pgpmime/pgpmime.c:721
+#: ../src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Грешка при шифриране, %s"
@@ -12939,27 +12843,29 @@ msgid "Signature boundary not found."
 msgstr "Не е открита границата на подписа."
 
 #: ../src/plugins/pgpmime/pgpmime.c:402 ../src/plugins/smime/smime.c:496
-#, fuzzy
 msgid "Couldn't parse decrypted file."
-msgstr "Грешка при запис на файла '%s'."
+msgstr "Грешка при обработка на дешифрирания файла"
 
 #: ../src/plugins/pgpmime/pgpmime.c:408 ../src/plugins/smime/smime.c:503
-#, fuzzy
 msgid "Couldn't parse decrypted file parts."
-msgstr "Грешка при запис на файла '%s'."
+msgstr "Грешка при обработка на части с дешифрирани файлове."
 
 #: ../src/plugins/pgpmime/pgpmime.c:456 ../src/plugins/pgpmime/pgpmime.c:495
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Грешка при създаване на временен файл: %s"
 
-#: ../src/plugins/pgpmime/pgpmime.c:621
+#: ../src/plugins/pgpmime/pgpmime.c:595
+msgid "OpenPGP digital signature"
+msgstr "Цифров подпис OpenPGP"
+
+#: ../src/plugins/pgpmime/pgpmime.c:617
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
 msgstr ""
 
-#: ../src/plugins/pgpmime/pgpmime.c:793
+#: ../src/plugins/pgpmime/pgpmime.c:789
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -12983,17 +12889,16 @@ msgstr ""
 
 #: ../src/plugins/python/python_plugin.c:358
 #: ../src/plugins/python/python_plugin.c:502
-#, fuzzy
 msgid "Python scripts"
-msgstr "Описание на шрифта"
+msgstr "Скриптове на python"
 
 #: ../src/plugins/python/python_plugin.c:497
 msgid "Show Python console..."
-msgstr ""
+msgstr "Показване конзолата на Python..."
 
 #: ../src/plugins/python/python_plugin.c:503
 msgid "Refresh"
-msgstr ""
+msgstr "Обновяване"
 
 #: ../src/plugins/python/python_plugin.c:505 ../src/prefs_account.c:2506
 #: ../src/prefs_account.c:2528 ../src/prefs_account.c:2792
@@ -13005,12 +12910,11 @@ msgstr "Преглед"
 #: ../src/plugins/python/python_plugin.c:646
 #: ../src/plugins/python/python_plugin.c:725
 msgid "Python"
-msgstr ""
+msgstr "Python"
 
 #: ../src/plugins/python/python_plugin.c:652
-#, fuzzy
 msgid "Failed to register \"compose create hook\" in the Python plugin"
-msgstr "Грешка при създаване на папката"
+msgstr ""
 
 #: ../src/plugins/python/python_plugin.c:730
 msgid ""
@@ -13020,7 +12924,7 @@ msgid ""
 "\n"
 "These scripts are then available via the menu. You can assign keyboard "
 "shortcuts to them just like it is done with other menu items. You can also "
-"put buttons for script invokation into the toolbars using Claws Mail's "
+"put buttons for script invocation into the toolbars using Claws Mail's "
 "builtin toolbar editor.\n"
 "\n"
 "You can provide scripts working on the main window by placing files into ~/."
@@ -13060,152 +12964,51 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/python/python_plugin.c:781
-#, fuzzy
 msgid "Python integration"
-msgstr "Настройки"
-
-#: ../src/plugins/rssyl/feed.c:126
-#, fuzzy
-msgid "Cannot open temporary file"
-msgstr "Грешка при създаване на временен файл."
-
-#: ../src/plugins/rssyl/feed.c:137
-msgid "Cannot init libCURL"
-msgstr ""
-
-#: ../src/plugins/rssyl/feed.c:234 ../src/plugins/vcalendar/vcal_folder.c:1596
-#, fuzzy
-msgid "401 (Authorisation required)"
-msgstr "Изисква се по-сигурно удостоверяване"
-
-#: ../src/plugins/rssyl/feed.c:237 ../src/plugins/vcalendar/vcal_folder.c:1599
-msgid "403 (Unauthorised)"
-msgstr ""
-
-#: ../src/plugins/rssyl/feed.c:240 ../src/plugins/vcalendar/vcal_folder.c:1602
-#, fuzzy
-msgid "404 (Not found)"
-msgstr "неоткрито"
-
-#: ../src/plugins/rssyl/feed.c:243 ../src/plugins/vcalendar/vcal_folder.c:1605
-#, fuzzy, c-format
-msgid "Error %ld"
-msgstr "Грешка:"
+msgstr "Интеграция на python"
 
-#: ../src/plugins/rssyl/feed.c:328
-#, fuzzy, c-format
-msgid "Fetching '%s'..."
-msgstr "Изтегляне на писмо..."
-
-#: ../src/plugins/rssyl/feed.c:387
-#, fuzzy
-msgid "Malformed feed"
-msgstr "Изтриване на заглавка"
-
-#: ../src/plugins/rssyl/feed.c:1203
-#, fuzzy, c-format
-msgid "Refreshing feed '%s'..."
-msgstr "Затваряне на папка %s..."
-
-#: ../src/plugins/rssyl/feed.c:1218
+#: ../src/plugins/rssyl/old_feeds.c:90
 #, c-format
 msgid ""
-"RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-"comments of '%s'"
-msgstr ""
-
-#: ../src/plugins/rssyl/feed.c:1227
-msgid "This feed format is not supported yet."
-msgstr ""
-
-#: ../src/plugins/rssyl/feed.c:1258
-msgid "N/A"
-msgstr ""
-
-#: ../src/plugins/rssyl/feed.c:1378
-#, fuzzy, c-format
-msgid "%ld byte"
-msgid_plural "%ld bytes"
-msgstr[0] "байта"
-msgstr[1] "байта"
-
-#: ../src/plugins/rssyl/feed.c:1381
-#, fuzzy
-msgid "size unknown"
-msgstr "непознат"
-
-#: ../src/plugins/rssyl/feed.c:1555
-#, fuzzy, c-format
-msgid ""
-"RSSyl: Cannot update feed %s:\n"
-"%s\n"
-msgstr "Грешка при отваряне на файла %s."
-
-#: ../src/plugins/rssyl/feed.c:1727
-msgid "You are already subscribed to this feed."
+"Couldn't read contents of old feeds.xml file:\n"
+"%s"
 msgstr ""
-
-#: ../src/plugins/rssyl/feed.c:1738
-#, fuzzy, c-format
-msgid ""
-"Couldn't fetch URL '%s':\n"
+"Грешка при четене съдържанието на стария файл feeds.xml:\n"
 "%s"
-msgstr "Грешка при запис на файла '%s'."
-
-#: ../src/plugins/rssyl/feed.c:1743
-#, fuzzy, c-format
-msgid ""
-"Couldn't fetch URL '%s':\n"
-"%s\n"
-msgstr "Грешка при запис на файла '%s'."
-
-#: ../src/plugins/rssyl/feed.c:1759
-#, fuzzy, c-format
-msgid "Can't subscribe feed '%s'."
-msgstr "Грешка при създаване на папката \"%s\"."
-
-#: ../src/plugins/rssyl/feed.c:1861 ../src/plugins/rssyl/rssyl_cb_menu.c:281
-#, fuzzy
-msgid "Claws Mail needs network access in order to update the feed."
-msgid_plural "Claws Mail needs network access in order to update the feeds."
-msgstr[0] "Claws Mail има нужда от достъп до мрежата, за да получава писмата."
-msgstr[1] "Claws Mail има нужда от достъп до мрежата, за да получава писмата."
-
-#: ../src/plugins/rssyl/feed.h:20
-#, fuzzy, c-format
-msgid "Time out connecting to URL %s\n"
-msgstr "Грешка при свързване с LDAP-сървър"
-
-#: ../src/plugins/rssyl/feed.h:21
-#, fuzzy, c-format
-msgid "Couldn't fetch URL %s\n"
-msgstr "Грешка при дешифриране: %s"
 
-#: ../src/plugins/rssyl/feed.h:22
+#: ../src/plugins/rssyl/opml_export.c:110
 #, c-format
-msgid "Error parsing feed from URL %s\n"
+msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr ""
 
-#: ../src/plugins/rssyl/feed.h:23
+#: ../src/plugins/rssyl/opml_export.c:131
 #, c-format
-msgid "Unsupported feed type at URL %s\n"
-msgstr ""
+msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
+msgstr "RSSyl: Грешка при изтриване на стар OPML файл \"%s\": %s\n"
 
-#: ../src/plugins/rssyl/feed.h:25
+#: ../src/plugins/rssyl/opml_export.c:141
 #, c-format
-msgid "RSSyl: Updating feed %s\n"
+msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
 
-#: ../src/plugins/rssyl/feed.h:26
-#, c-format
-msgid "RSSyl: Feed update finished: %s\n"
+#: ../src/plugins/rssyl/opml_export.c:182
+msgid "RSSyl: Error during writing feed export file.\n"
 msgstr ""
 
-#: ../src/plugins/rssyl/feed.h:27
-msgid "RSSyl: Feed update aborted, application is exiting.\n"
+#: ../src/plugins/rssyl/opml_import.c:109
+#, c-format
+msgid ""
+"Error while subscribing feed\n"
+"%s\n"
+"\n"
+"Folder name '%s' is not allowed."
 msgstr ""
+"Грешка при абонирането за емисия\n"
+"%s\n"
+"\n"
+"Не е позволено име на папка \"%s\"."
 
-#: ../src/plugins/rssyl/plugin.c:63
+#: ../src/plugins/rssyl/plugin.c:65
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13214,235 +13017,351 @@ msgid ""
 "the web. You can read them, and delete or keep old entries."
 msgstr ""
 
-#: ../src/plugins/rssyl/plugin.c:87
+#: ../src/plugins/rssyl/plugin.c:89
 msgid "RSS feed"
-msgstr ""
+msgstr "RSS емисия"
 
-#: ../src/plugins/rssyl/rssyl.c:133 ../src/plugins/rssyl/rssyl.c:145
+#: ../src/plugins/rssyl/rssyl_add_item.c:295
+msgctxt "Empty RSS feed title placeholder"
+msgid "(empty)"
+msgstr "(празно)"
+
+#: ../src/plugins/rssyl/rssyl.c:154 ../src/plugins/rssyl/rssyl.c:165
 msgid "Refresh all feeds"
-msgstr ""
+msgstr "Обновяване на всички емисии"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:62
-#, fuzzy
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Subscribe feed"
-msgstr "Записване"
+msgstr "Абониране за емисия"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:63
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:67
 msgid "Input the URL of the news feed you wish to subscribe:"
-msgstr ""
+msgstr "Въведете URL-адрес на емисията, за която искате да се абонирате:"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:138
-#, fuzzy, c-format
-msgid "Really remove the folder tree '%s'?\n"
-msgstr "Грешка при премахване на папката \"%s\"."
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:100
+#, c-format
+msgid "'%c' can't be used in folder name."
+msgstr "\"%c\" не може да присъства в име на папка."
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:139
-#, fuzzy
-msgid "Remove folder tree"
-msgstr "Пресъздаване на дървото с папки"
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:242
+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 има нужда от достъп до мрежата, за да обнови емисията."
+msgstr[1] "Claws Mail има нужда от достъп до мрежата, за да обнови емисиите."
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
-#, fuzzy, c-format
-msgid "Can't remove feed '%s'."
-msgstr "Грешка при премахване на папката \"%s\"."
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:305
+#, c-format
+msgid "Really remove the feed tree `%s' ?\n"
+msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:374
-#, fuzzy
-msgid "Select a .opml file"
-msgstr "Избор на файл"
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:306
+msgid "Remove feed tree"
+msgstr "Премахване на дървото с емисии"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:53
-msgid "_Refresh feed"
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:341
+msgid "Select an OPML file"
+msgstr "Избор на OPML файл"
+
+#: ../src/plugins/rssyl/rssyl_feed.c:75
+#: ../src/plugins/rssyl/rssyl_subscribe.c:139
+#, c-format
+msgid "Couldn't create folder for new feed '%s'."
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:54
-msgid "Refresh _all feeds"
+#: ../src/plugins/rssyl/rssyl_feed.h:10
+#, c-format
+msgid "RSSyl: Subscribing new feed: %s\n"
+msgstr "RSSyl: Записване за нова емисия: %s\n"
+
+#: ../src/plugins/rssyl/rssyl_feed.h:11
+#, c-format
+msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:55
-#, fuzzy
-msgid "Subscribe _new feed..."
-msgstr "_Записване..."
+#: ../src/plugins/rssyl/rssyl_feed.h:12
+#, c-format
+msgid "RSSyl: Updating feed: %s\n"
+msgstr "RSSyl: Обновяване на емисия: %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:56
-#, fuzzy
-msgid "_Unsubscribe feed..."
-msgstr "_Отписване..."
+#: ../src/plugins/rssyl/rssyl_feed.h:13
+#, c-format
+msgid "RSSyl: Feed update finished: %s\n"
+msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:57
-#, fuzzy
-msgid "Feed pr_operties..."
-msgstr "_Настройки..."
+#: ../src/plugins/rssyl/rssyl_feed.h:14
+#, c-format
+msgid "RSSyl: Error fetching feed at '%s': %s\n"
+msgstr "RSSyl: Грешка при изтегляне на емисия \"%s\": %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:58
-#, fuzzy
-msgid "Import feed list..."
-msgstr "Внасяне на mbox-файл"
+#: ../src/plugins/rssyl/rssyl_feed.h:15
+#, c-format
+msgid "RSSyl: No valid feed found at '%s'\n"
+msgstr "RSSyl: Не е открита правилна емисия от \"%s\"\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:59
-#, fuzzy
-msgid "Rena_me..."
-msgstr "Пре_именуване на папка..."
+#: ../src/plugins/rssyl/rssyl_feed.h:16
+#, c-format
+msgid "RSSyl: Couldn't process feed at '%s'\n"
+msgstr "RSSyl: Грешка при обработка на емисия \"%s\"\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:60
-#, fuzzy
-msgid "_Create new folder..."
-msgstr "Създаване на _нова папка..."
+#: ../src/plugins/rssyl/rssyl_feed.h:17
+#, c-format
+msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
+msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:62
-#, fuzzy
-msgid "Remove folder _tree..."
-msgstr "Пресъздаване на дървото с папки..."
+#: ../src/plugins/rssyl/rssyl_feed_props.c:243
+msgid "Use default refresh interval"
+msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:152
-#, fuzzy
-msgid "Add RSS folder tree"
-msgstr "Пресъздаване на дървото с папки"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:255
+msgid "Keep old items"
+msgstr "Запазване на старите статии"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:153
-#, fuzzy
-msgid "Enter name for a new RSS folder tree."
-msgstr "Въведете име за новата папка:"
+#. "Trim" button
+#: ../src/plugins/rssyl/rssyl_feed_props.c:261
+msgid "_Trim"
+msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:169
-msgid ""
-"Creation of folder tree failed.\n"
-"Maybe some files already exist, or you don't have the permission to write "
-"there?"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:264
+#: ../src/plugins/rssyl/rssyl_feed_props.c:267
+msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:184
-msgid "RSSyl..."
+#: ../src/plugins/rssyl/rssyl_feed_props.c:271
+msgid "Fetch comments if possible"
+msgstr "Изтегляне на коментари при възможност"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:296
+msgid "Always mark as new"
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:257
-msgid "Use default refresh interval"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:302
+msgid "If only its text changed"
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:269
-msgid "Keep default number of expired entries"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:308
+msgid "Never mark as new"
+msgstr "Никога да не се отбелязва като прочетено"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:313
+msgid "Add item title to top of message"
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:275
-msgid "Fetch comments if possible"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:320
+msgid "Ignore title rename"
+msgstr "Пренебрегване смяната на заглавията"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:326
+#: ../src/plugins/rssyl/rssyl_feed_props.c:329
+msgid ""
+"Enable this to keep current folder name, even if feed author changes title "
+"of the feed."
 msgstr ""
 
+#: ../src/plugins/rssyl/rssyl_feed_props.c:334
+#: ../src/plugins/vcalendar/vcal_prefs.c:518
+msgid "Verify SSL certificate validity"
+msgstr "Проверка за валидност на SSL-сертификат"
+
 #. Label for URL frame
-#: ../src/plugins/rssyl/rssyl_gtk.c:308
+#: ../src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "<b>Source URL:</b>"
 msgstr ""
 
-#. Fetch comments for - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:336
+#. Fetch comments max age - label
+#: ../src/plugins/rssyl/rssyl_feed_props.c:378
 msgid ""
 "<b>Fetch comments on posts aged less than:</b>\n"
 "<small>(In days; set to -1 to fetch all comments)</small>"
 msgstr ""
 
 #. Refresh interval - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:370
+#: ../src/plugins/rssyl/rssyl_feed_props.c:436
 msgid ""
 "<b>Refresh interval in minutes:</b>\n"
 "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
 msgstr ""
 
-#. Expired items - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:403
-msgid ""
-"<b>Number of expired entries to keep:</b>\n"
-"<small>(Set to -1 if you want to keep expired entries)</small>"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:462
+msgid "<b>If an item changes, do not mark it as new:</b>"
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:429
-msgid "<b>If an item changes, do not mark it as unread:</b>"
-msgstr ""
+#: ../src/plugins/rssyl/rssyl_feed_props.c:554
+msgid "_OK"
+msgstr "_Да"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:439
-msgid "Always mark as unread"
-msgstr ""
+#: ../src/plugins/rssyl/rssyl_feed_props.c:562
+msgid "Set feed properties"
+msgstr "Настройки на емисия"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:441
-msgid "If only its text has changed"
-msgstr ""
+#: ../src/plugins/rssyl/rssyl_gtk.c:48
+msgid "_Refresh feed"
+msgstr "_Обновяване на емисия"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:443
-msgid "Never mark as unread"
-msgstr ""
+#: ../src/plugins/rssyl/rssyl_gtk.c:49
+msgid "Feed pr_operties"
+msgstr "Настройки на _емисия"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:459
-#: ../src/plugins/vcalendar/vcal_prefs.c:518
-#, fuzzy
-msgid "Verify SSL certificate validity"
-msgstr "SSL-сертификати"
+#: ../src/plugins/rssyl/rssyl_gtk.c:50
+msgid "Rena_me..."
+msgstr "Преи_менуване…"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:515
-msgid "_OK"
-msgstr ""
+#: ../src/plugins/rssyl/rssyl_gtk.c:51
+msgid "R_efresh recursively"
+msgstr "Рекурсивно о_бновяване"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:523
-#, fuzzy
-msgid "Set feed properties"
-msgstr "Атрибути"
+#: ../src/plugins/rssyl/rssyl_gtk.c:52
+msgid "Subscribe _new feed..."
+msgstr "_Записване за нова емисия..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:651 ../src/plugins/rssyl/rssyl_gtk.c:675
-#, fuzzy
-msgid "Unsubscribe feed"
-msgstr "Отписване"
+#: ../src/plugins/rssyl/rssyl_gtk.c:53
+msgid "Create new _folder..."
+msgstr "Създаване на _нова папка..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:676
-#, fuzzy
-msgid "Do you really want to remove feed"
-msgstr "Наистина ли искате да изтриете тази заглавка?"
+#: ../src/plugins/rssyl/rssyl_gtk.c:54
+msgid "Import feed list..."
+msgstr "Внасяне на списък с емисии..."
 
-#. Remove cache checkbutton
-#: ../src/plugins/rssyl/rssyl_gtk.c:682
-#, fuzzy
-msgid "Remove cached entries"
-msgstr "/_Настройки/_Късане на нишката"
+#: ../src/plugins/rssyl/rssyl_gtk.c:56
+msgid "Remove tree"
+msgstr "Премахване на дървото"
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:126
+msgid "Add RSS folder tree"
+msgstr ""
 
-#: ../src/plugins/rssyl/rssyl.h:8
-msgid "RSSyl"
+#: ../src/plugins/rssyl/rssyl_gtk.c:127
+msgid "Enter name for a new RSS folder tree."
+msgstr ""
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:143
+msgid ""
+"Creation of folder tree failed.\n"
+"Maybe some files already exist, or you don't have the permission to write "
+"there?"
 msgstr ""
 
 #. Default RSSyl mailbox name
-#: ../src/plugins/rssyl/rssyl.h:14
+#: ../src/plugins/rssyl/rssyl.h:17
 msgid "My Feeds"
-msgstr ""
+msgstr "Моите емисии"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:106
-#, fuzzy
+#: ../src/plugins/rssyl/rssyl_prefs.c:128
 msgid "Default refresh interval in minutes"
-msgstr "Вградена тема по подразбиране"
+msgstr "Интервал за обновяване по подразбиране (в минути)"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:117
-msgid "Set to 0 to disable automatic refreshing"
+#: ../src/plugins/rssyl/rssyl_prefs.c:147
+msgid "Refresh all feeds on application start"
+msgstr "Обновяване на всички емисии при зареждане на програмата"
+
+#. Path to cookies file for libcurl to use
+#: ../src/plugins/rssyl/rssyl_prefs.c:155
+msgid "Path to cookies file"
+msgstr "Път до файл с бисквитки"
+
+#: ../src/plugins/rssyl/rssyl_prefs.c:166
+#: ../src/plugins/rssyl/rssyl_prefs.c:169
+msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:119
-msgid "Default number of expired items to keep"
+#: ../src/plugins/rssyl/rssyl_prefs.c:176
+msgid "Verify SSL certificates validity for new feeds"
+msgstr "Проверка за валидност на SSL-сертификатите на новите емисии"
+
+#. Create window
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+msgid "Subscribe new feed?"
+msgstr "Да се запише ли за нова емисия?"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:72
+msgid "<b>Feed folder:</b>"
+msgstr "<b>Папка с емисии:</b>"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:82
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:86
+msgid ""
+"Instead of using official title, you can enter a different folder name for "
+"the feed."
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:130
-msgid "Set to -1 to keep expired items"
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:91
+msgid "_Edit feed properties after subscribing"
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:133
-msgid "Refresh all feeds on application start"
+#: ../src/plugins/rssyl/rssyl_update_comments.c:99
+#, c-format
+msgid "Updating comments for '%s'..."
+msgstr "Обновяване на коментарите за \"%s\"..."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:102
+#: ../src/plugins/vcalendar/vcal_folder.c:1596
+msgid "401 (Authorisation required)"
+msgstr "401 (Изисква се удостоверяване)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:105
+#: ../src/plugins/vcalendar/vcal_folder.c:1599
+msgid "403 (Unauthorised)"
+msgstr "403 (Непозволено)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:108
+#: ../src/plugins/vcalendar/vcal_folder.c:1602
+msgid "404 (Not found)"
+msgstr "404 (Не е открито)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:111
+#, c-format
+msgid "Error %d"
+msgstr "Грешка %d"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:123
+#, c-format
+msgctxt "First parameter is URL, second is error text"
+msgid ""
+"Error fetching feed at\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
 msgstr ""
+"Грешка при получаване на емисия от\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:139
-#, fuzzy
-msgid "Path to cookies file"
-msgstr "Път до програмата bogofilter"
+#: ../src/plugins/rssyl/rssyl_update_feed.c:134
+#, c-format
+msgid ""
+"No valid feed found at\n"
+"<b>%s</b>"
+msgstr ""
+"Не е открита правилна емисия от\n"
+"<b>%s</b>"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:149
-msgid "Path to Netscape-style cookies.txt file containing your cookies"
+#: ../src/plugins/rssyl/rssyl_update_feed.c:200
+#, c-format
+msgid "Updating feed '%s'..."
+msgstr "Обновяване на емисията \"%s\"..."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:221
+#, c-format
+msgid ""
+"Couldn't process feed at\n"
+"<b>%s</b>\n"
+"\n"
+"Please contact developers, this should not happen."
 msgstr ""
+"Грешка при обработка на емисия от\n"
+"<b>%s</b>\n"
+"\n"
+"Това не би трябвало да се случва, моля свържете се с разработчиците."
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:152
-#, fuzzy
-msgid "Verify SSL certificate validity for new feeds"
-msgstr "SSL-сертификат за %s"
+#: ../src/plugins/rssyl/rssyl_update_feed.c:301
+msgid "Claws Mail needs network access in order to update your feeds."
+msgstr "Claws Mail има нужда от достъп до мрежата, за да обнови емисиите ви."
+
+#: ../src/plugins/rssyl/rssyl_update_format.c:127
+msgid ""
+"Internal problem while upgrading storage format. This should not happen. "
+"Please report this, with debug output attached.\n"
+msgstr ""
 
 #: ../src/plugins/smime/plugin.c:38 ../src/plugins/smime/plugin.c:54
 #: ../src/plugins/smime/smime.c:911
@@ -13470,24 +13389,21 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/smime/smime.c:423
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't set GPG protocol, %s"
-msgstr "Грешка при добавяне на GPG-ключ %s, %s"
+msgstr ""
 
 #: ../src/plugins/smime/smime.c:451
-#, fuzzy
 msgid "Couldn't open temporary file"
-msgstr "Грешка при създаване на временен файл."
+msgstr "Грешка при отваряне на временен файл"
 
 #: ../src/plugins/smime/smime.c:462 ../src/plugins/smime/smime.c:477
-#, fuzzy
 msgid "Couldn't write to temporary file"
-msgstr "Грешка при създаване на временен файл."
+msgstr "Грешка при запис във временен файл"
 
 #: ../src/plugins/smime/smime.c:488
-#, fuzzy
 msgid "Couldn't close temporary file"
-msgstr "Грешка при създаване на временен файл."
+msgstr "Грешка при затваряне на временен файл"
 
 #: ../src/plugins/smime/smime.c:708
 msgid ""
@@ -13495,6 +13411,42 @@ msgid ""
 "MIME system."
 msgstr ""
 
+#: ../src/plugins/spam_report/spam_report.c:295
+msgid "Reporting spam..."
+msgstr "Докладване за нежелана поща..."
+
+#: ../src/plugins/spam_report/spam_report.c:330
+msgid "Report spam online..."
+msgstr ""
+
+#: ../src/plugins/spam_report/spam_report.c:341
+#: ../src/plugins/spam_report/spam_report.c:379
+#: ../src/plugins/spam_report/spam_report_prefs.c:80
+msgid "SpamReport"
+msgstr ""
+
+#: ../src/plugins/spam_report/spam_report.c:384
+msgid ""
+"This plugin reports spam to various places.\n"
+"Currently the following sites or methods are supported:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * lists.debian.org nomination system"
+msgstr ""
+
+#: ../src/plugins/spam_report/spam_report.c:409
+msgid "Spam reporting"
+msgstr "Докладване за нежелана поща"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:122
+msgid "Enabled"
+msgstr "Включено"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:149
+msgid "Forward to:"
+msgstr "Препращане до:"
+
 #: ../src/plugins/spamassassin/spamassassin.c:77
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:649
 msgid "SpamAssassin"
@@ -13528,11 +13480,12 @@ msgid ""
 "Claws Mail needs network access in order to feed this mail(s) to the remote "
 "learner."
 msgstr ""
+"Claws Mail има нужда от достъп до мрежата, за да захрани с това писмо "
+"отдалечената услуга за разпознаване."
 
 #: ../src/plugins/spamassassin/spamassassin.c:574
-#, fuzzy
 msgid "Failed to get username"
-msgstr "Грешка при създаване на папката"
+msgstr "Грешка при получаване на потребителско име"
 
 #: ../src/plugins/spamassassin/spamassassin.c:586
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
@@ -13608,46 +13561,6 @@ msgid ""
 "aborted."
 msgstr ""
 
-#: ../src/plugins/spam_report/spam_report.c:293
-#, fuzzy
-msgid "Reporting spam..."
-msgstr "Сортиране на резюмето за съдържание на папката"
-
-#: ../src/plugins/spam_report/spam_report.c:328
-msgid "Report spam online..."
-msgstr ""
-
-#: ../src/plugins/spam_report/spam_report.c:339
-#: ../src/plugins/spam_report/spam_report.c:377
-#: ../src/plugins/spam_report/spam_report_prefs.c:80
-msgid "SpamReport"
-msgstr ""
-
-#: ../src/plugins/spam_report/spam_report.c:382
-msgid ""
-"This plugin reports spam to various places.\n"
-"Currently the following sites or methods are supported:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * lists.debian.org nomination system"
-msgstr ""
-
-#: ../src/plugins/spam_report/spam_report.c:407
-#, fuzzy
-msgid "Spam reporting"
-msgstr "Обучаване за нежелана поща"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:122
-#, fuzzy
-msgid "Enabled"
-msgstr "Включване"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:149
-#, fuzzy
-msgid "Forward to:"
-msgstr "Препращане"
-
 #: ../src/plugins/tnef_parse/tnef_parse.c:65
 #, c-format
 msgid ""
@@ -13659,27 +13572,25 @@ msgstr ""
 
 #: ../src/plugins/tnef_parse/tnef_parse.c:122
 #: ../src/plugins/tnef_parse/tnef_parse.c:129
-#, fuzzy
 msgid "Failed to write the part data."
-msgstr "Грешка при създаване на папката"
+msgstr ""
 
 #: ../src/plugins/tnef_parse/tnef_parse.c:174
 msgid "Failed to parse VCalendar data."
-msgstr ""
+msgstr "Грешка при обработка на данни от VCalendar."
 
 #: ../src/plugins/tnef_parse/tnef_parse.c:213
 msgid "Failed to parse VTask data."
-msgstr ""
+msgstr "Грешка при обработка на данни от VTask."
 
 #: ../src/plugins/tnef_parse/tnef_parse.c:263
-#, fuzzy
 msgid "Failed to parse VCard data."
-msgstr "Файлът изглежда не е във формат vCard."
+msgstr "Грешка при обработка на данни от VCard."
 
 #: ../src/plugins/tnef_parse/tnef_parse.c:399
 #: ../src/plugins/tnef_parse/tnef_parse.c:423
 msgid "TNEF Parser"
-msgstr ""
+msgstr "Обработка на TNEF"
 
 #: ../src/plugins/tnef_parse/tnef_parse.c:428
 msgid ""
@@ -13690,155 +13601,129 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/vcalendar/common-views.c:62
-#, fuzzy
 msgid "_Edit this meeting..."
-msgstr "Излизане..."
+msgstr "_Редактиране на тази среща..."
 
 #: ../src/plugins/vcalendar/common-views.c:63
-#, fuzzy
 msgid "_Cancel this meeting..."
-msgstr "Отмяна на получаването"
+msgstr "_Отмяна на тази среща..."
 
 #: ../src/plugins/vcalendar/common-views.c:65
-#, fuzzy
 msgid "_Create new meeting..."
-msgstr "Изтегляне на писмо..."
+msgstr "Съ_здаване на нова среща..."
 
 #: ../src/plugins/vcalendar/common-views.c:67
-#, fuzzy
 msgid "_Go to today"
-msgstr "П_реход"
+msgstr "Към _днес"
 
 #: ../src/plugins/vcalendar/day-view.c:593
 #: ../src/plugins/vcalendar/month-view.c:690
 msgid "Start"
-msgstr ""
+msgstr "Начало"
 
 #: ../src/plugins/vcalendar/day-view.c:606
 #: ../src/plugins/vcalendar/month-view.c:703
 msgid "Show"
-msgstr ""
+msgstr "Показване"
 
 #: ../src/plugins/vcalendar/day-view.c:614
 #: ../src/plugins/vcalendar/month-view.c:711 ../src/prefs_account.c:1477
-#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:334
+#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:336
 msgid "days"
 msgstr "дни"
 
 #: ../src/plugins/vcalendar/month-view.c:109
-#, fuzzy
 msgid "Monday"
-msgstr "Понеделник"
+msgstr "понеделник"
 
 #: ../src/plugins/vcalendar/month-view.c:110
-#, fuzzy
 msgid "Tuesday"
-msgstr "Вторник"
+msgstr "вторник"
 
 #: ../src/plugins/vcalendar/month-view.c:111
-#, fuzzy
 msgid "Wednesday"
-msgstr "Сряда"
+msgstr "сряда"
 
 #: ../src/plugins/vcalendar/month-view.c:112
-#, fuzzy
 msgid "Thursday"
-msgstr "Четвъртък"
+msgstr "четвъртък"
 
 #: ../src/plugins/vcalendar/month-view.c:113
-#, fuzzy
 msgid "Friday"
-msgstr "Петък"
+msgstr "петък"
 
 #: ../src/plugins/vcalendar/month-view.c:114
-#, fuzzy
 msgid "Saturday"
-msgstr "Събота"
+msgstr "събота"
 
 #: ../src/plugins/vcalendar/month-view.c:115
-#, fuzzy
 msgid "Sunday"
-msgstr "Неделя"
+msgstr "неделя"
 
 #: ../src/plugins/vcalendar/month-view.c:118
-#, fuzzy
 msgid "January"
-msgstr "Януари"
+msgstr "януари"
 
 #: ../src/plugins/vcalendar/month-view.c:119
-#, fuzzy
 msgid "February"
-msgstr "Февруари"
+msgstr "февруари"
 
 #: ../src/plugins/vcalendar/month-view.c:120
-#, fuzzy
 msgid "March"
-msgstr "Март"
+msgstr "март"
 
 #: ../src/plugins/vcalendar/month-view.c:121
-#, fuzzy
 msgid "April"
-msgstr "Април"
+msgstr "април"
 
 #: ../src/plugins/vcalendar/month-view.c:122
-#, fuzzy
 msgid "May"
-msgstr "Май"
+msgstr "май"
 
 #: ../src/plugins/vcalendar/month-view.c:123
-#, fuzzy
 msgid "June"
-msgstr "Юни"
+msgstr "юни"
 
 #: ../src/plugins/vcalendar/month-view.c:124
-#, fuzzy
 msgid "July"
-msgstr "Юли"
+msgstr "юли"
 
 #: ../src/plugins/vcalendar/month-view.c:125
-#, fuzzy
 msgid "August"
-msgstr "Август"
+msgstr "август"
 
 #: ../src/plugins/vcalendar/month-view.c:126
-#, fuzzy
 msgid "September"
-msgstr "Септември"
+msgstr "септември"
 
 #: ../src/plugins/vcalendar/month-view.c:127
-#, fuzzy
 msgid "October"
-msgstr "Октомври"
+msgstr "октомври"
 
 #: ../src/plugins/vcalendar/month-view.c:128
-#, fuzzy
 msgid "November"
-msgstr "Ноември"
+msgstr "ноември"
 
 #: ../src/plugins/vcalendar/month-view.c:129
-#, fuzzy
 msgid "December"
-msgstr "Декември"
+msgstr "декември"
 
 #: ../src/plugins/vcalendar/month-view.c:795
-#, fuzzy
 msgid "Week number"
-msgstr "по _брой"
+msgstr "Номер на седмица"
 
 #: ../src/plugins/vcalendar/month-view.c:886
-#, fuzzy
 msgid "Previous month"
-msgstr "Предишна страница"
+msgstr "Предишен месец"
 
 #: ../src/plugins/vcalendar/month-view.c:906
-#, fuzzy
 msgid "Next month"
-msgstr "Следваща част (a)"
+msgstr "Следващ месец"
 
 #: ../src/plugins/vcalendar/plugin.c:43 ../src/plugins/vcalendar/plugin.c:64
 #: ../src/plugins/vcalendar/vcal_prefs.c:681
 msgid "vCalendar"
-msgstr ""
+msgstr "vCalendar"
 
 #: ../src/plugins/vcalendar/plugin.c:69
 msgid ""
@@ -13859,42 +13744,38 @@ msgstr ""
 
 #: ../src/plugins/vcalendar/plugin.c:102
 msgid "Calendar"
-msgstr ""
+msgstr "Календар"
 
 #: ../src/plugins/vcalendar/vcalendar.c:100
-#, fuzzy
 msgid "Create meeting from message..."
-msgstr "Bogofilter: обучаване от писмата..."
+msgstr "Създаване на среща от писмо..."
 
 #: ../src/plugins/vcalendar/vcalendar.c:120
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to create %d meetings, one by one. Do you want to continue?"
-msgstr "Последователно изпечатване на %d писма. Искате ли да продължите?"
+msgstr ""
+"Ще създадете %d срещи, една след друга. Наистина ли искате да продължите?"
 
 #: ../src/plugins/vcalendar/vcalendar.c:139
-#, fuzzy
 msgid "Creating meeting..."
-msgstr "Изтегляне на писмо..."
+msgstr "Създаване на среща..."
 
 #: ../src/plugins/vcalendar/vcalendar.c:158
-#, fuzzy
 msgid "no subject"
-msgstr "По _относно"
+msgstr "без тема"
 
 #: ../src/plugins/vcalendar/vcalendar.c:393
-#, fuzzy
 msgid "Accept"
-msgstr "_Приемане"
+msgstr "Приемане"
 
 #: ../src/plugins/vcalendar/vcalendar.c:394
 msgid "Tentatively accept"
-msgstr ""
+msgstr "Неокончателно приемане"
 
 #: ../src/plugins/vcalendar/vcalendar.c:395
-#, fuzzy
 msgid "Decline"
-msgstr "Изтриване на ред"
+msgstr "Отхвърляне"
 
 #: ../src/plugins/vcalendar/vcalendar.c:482
 msgid "You have a Todo item."
@@ -13907,35 +13788,35 @@ msgstr ""
 #: ../src/plugins/vcalendar/vcalendar.c:512
 #: ../src/plugins/vcalendar/vcalendar.c:750
 msgid "Details follow:"
-msgstr ""
+msgstr "Следват подробности:"
 
 #: ../src/plugins/vcalendar/vcalendar.c:489
 msgid "You have created a meeting."
-msgstr ""
+msgstr "Създадохте среща."
 
 #: ../src/plugins/vcalendar/vcalendar.c:494
 msgid "You have been invited to a meeting."
-msgstr ""
+msgstr "Поканени сте на среща."
 
 #: ../src/plugins/vcalendar/vcalendar.c:502
 msgid "A meeting to which you had been invited has been cancelled."
 msgstr ""
 
 #: ../src/plugins/vcalendar/vcalendar.c:511
-#, fuzzy
 msgid "You have been forwarded an appointment."
-msgstr "На писмото е отговорено"
+msgstr "Препратен ви е ангажимент."
 
 #: ../src/plugins/vcalendar/vcalendar.c:564
-#, fuzzy, c-format
+#, c-format
 msgid "%s <span weight=\"bold\">(this event recurs)</span>"
-msgstr "<span weight=\"bold\">Адрес на сървъра:</span>"
+msgstr "%s <span weight=\"bold\">(събитието се повтаря)</span>"
 
 #: ../src/plugins/vcalendar/vcalendar.c:570
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s <span weight=\"bold\">(this event is part of a recurring event)</span>"
-msgstr "<span weight=\"bold\">определение на условията:</span>"
+msgstr ""
+"%s <span weight=\"bold\">(събитието е част от повтарящо се събитие)</span>"
 
 #: ../src/plugins/vcalendar/vcalendar.c:749
 msgid "You have received an answer to an unknown meeting proposal."
@@ -13949,9 +13830,8 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/vcalendar/vcalendar.c:832
-#, fuzzy
 msgid "Error - could not get the calendar MIME part."
-msgstr "Грешка при определянето състоянието на темата"
+msgstr ""
 
 #: ../src/plugins/vcalendar/vcalendar.c:839
 msgid "Error - no calendar part found."
@@ -13963,22 +13843,19 @@ msgstr ""
 
 #: ../src/plugins/vcalendar/vcalendar.c:982
 msgid "Send a notification to the attendees"
-msgstr ""
+msgstr "Изпращане на уведомление до участниците"
 
 #: ../src/plugins/vcalendar/vcalendar.c:991
-#, fuzzy
 msgid "Cancel meeting"
-msgstr "Отмяна на получаването"
+msgstr "Отмяна на срещата"
 
 #: ../src/plugins/vcalendar/vcalendar.c:992
-#, fuzzy
 msgid "Are you sure you want to cancel this meeting?"
-msgstr "Наистина ли искате да премахнете тази тема?"
+msgstr "Наистина ли искате да отмените тази среща?"
 
 #: ../src/plugins/vcalendar/vcalendar.c:1087
-#, fuzzy
 msgid "No account found"
-msgstr "Не е открит подпис"
+msgstr "Не е открита сметка"
 
 #: ../src/plugins/vcalendar/vcalendar.c:1088
 msgid ""
@@ -13992,137 +13869,120 @@ msgstr ""
 
 #: ../src/plugins/vcalendar/vcalendar.c:1219
 msgid "Answer"
-msgstr ""
+msgstr "Отговор"
 
 #: ../src/plugins/vcalendar/vcalendar.c:1220
-#, fuzzy
 msgid "Edit meeting..."
-msgstr "Излизане..."
+msgstr "Редактиране на срещата..."
 
 #: ../src/plugins/vcalendar/vcalendar.c:1221
-#, fuzzy
 msgid "Cancel meeting..."
-msgstr "Отмяна на получаването"
+msgstr "Отмяна на срещата..."
 
 #: ../src/plugins/vcalendar/vcalendar.c:1222
-#, fuzzy
 msgid "Launch website"
-msgstr "уеб-страница"
+msgstr "Зареждане на уеб-страница"
 
 #: ../src/plugins/vcalendar/vcalendar.c:1226
 msgid "You are already busy at this time."
-msgstr ""
+msgstr "Вече сте заети по това време."
 
 #: ../src/plugins/vcalendar/vcalendar.c:1265
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1740
 msgid "Event:"
-msgstr ""
+msgstr "Събитие:"
 
 #: ../src/plugins/vcalendar/vcalendar.c:1266
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1718
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1729
-#, fuzzy
 msgid "Organizer:"
-msgstr "Организация:"
+msgstr "Организатор:"
 
 #: ../src/plugins/vcalendar/vcalendar.c:1267
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1721
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1731
-#, fuzzy
 msgid "Location:"
 msgstr "Местоположение:"
 
 #: ../src/plugins/vcalendar/vcalendar.c:1268
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1719
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1730
-#, fuzzy
 msgid "Summary:"
-msgstr "Обобщения"
+msgstr "Обобщение:"
 
 #: ../src/plugins/vcalendar/vcalendar.c:1269
-#, fuzzy
 msgid "Starting:"
-msgstr "Писане"
+msgstr "Започване:"
 
 #: ../src/plugins/vcalendar/vcalendar.c:1270
-#, fuzzy
 msgid "Ending:"
-msgstr "Кодиране"
+msgstr "Завършване:"
 
 #: ../src/plugins/vcalendar/vcalendar.c:1272
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1723
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1733
 msgid "Attendees:"
-msgstr ""
+msgstr "Участници:"
 
 #: ../src/plugins/vcalendar/vcalendar.c:1274
-#, fuzzy
 msgid "Action:"
-msgstr "Действие"
+msgstr "Действие:"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:165
 msgid "_New meeting..."
-msgstr ""
+msgstr "_Нова среща..."
 
 #: ../src/plugins/vcalendar/vcal_folder.c:166
-#, fuzzy
 msgid "_Export calendar..."
-msgstr "Изнасяне в _mbox-файл..."
+msgstr "_Изнасяне на календар..."
 
 #: ../src/plugins/vcalendar/vcal_folder.c:167
-#, fuzzy
 msgid "_Subscribe to webCal..."
-msgstr "_Записване за новинарската група..."
+msgstr "_Записване за webCal..."
 
 #: ../src/plugins/vcalendar/vcal_folder.c:169
-#, fuzzy
 msgid "_Rename..."
-msgstr "Пре_именуване на папка..."
+msgstr "П_реименуване…"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:170
-#, fuzzy
 msgid "U_pdate subscriptions"
-msgstr "_Записвания"
+msgstr "О_бновяване на записванията"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:171
-#, fuzzy
 msgid "_List view"
-msgstr "Преглед за печат"
+msgstr "_Списъчен изглед"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:172
-#, fuzzy
 msgid "_Week view"
-msgstr "Ни_шков изглед"
+msgstr "Се_дмичен изглед"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Month view"
-msgstr ""
+msgstr "Ме_сечен изглед"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1092
-#, fuzzy
 msgid "Meetings"
-msgstr "неща"
+msgstr "Срещи"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1476
 msgid "in the past"
-msgstr ""
+msgstr "в миналото"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1479
 msgid "today"
-msgstr ""
+msgstr "днес"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1482
 msgid "tomorrow"
-msgstr ""
+msgstr "утре"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1485
 msgid "this week"
-msgstr ""
+msgstr "тази седмица"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1488
-#, fuzzy
 msgid "later"
-msgstr "По-късно"
+msgstr "по-късно"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1492
 #, c-format
@@ -14130,22 +13990,31 @@ msgid ""
 "\n"
 "These are the events planned %s:\n"
 msgstr ""
+"\n"
+"Това са планираните събития %s:\n"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1587
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
-msgstr ""
+msgstr "Просрочено свързване (%d секунди) към %s\n"
+
+#: ../src/plugins/vcalendar/vcal_folder.c:1605
+#, c-format
+msgid "Error %ld"
+msgstr "Грешка %ld"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1802
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
 "%s:\n"
 "\n"
 "%s"
 msgstr ""
-"Грешка при създаване на mbox-файла:\n"
-"%s\n"
+"Грешка при зареждане на Webcal URL:\n"
+"%s:\n"
+"\n"
+"%s"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1806
 #, c-format
@@ -14171,200 +14040,193 @@ msgid ""
 "%s\n"
 "%s\n"
 msgstr ""
+"Този адрес не прилича на WebCal URL-адрес:\n"
+"%s\n"
+"%s\n"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1849
 #: ../src/plugins/vcalendar/vcal_folder.c:1852
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create directory %s"
-msgstr "Грешка при създаването на целева директория"
+msgstr "Грешка при създаване на папка %s"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1890
-#, fuzzy
 msgid "Claws Mail needs network access in order to update the Webcal feed."
-msgstr "Claws Mail има нужда от достъп до мрежата, за да получава писмата."
+msgstr ""
+"Claws Mail има нужда от достъп до мрежата, за да обнови емисия на Webcal."
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1901
-#, fuzzy, c-format
+#, c-format
 msgid "Fetching calendar for %s..."
-msgstr "Претърсване на кеша за %s..."
+msgstr "Получаване на календар за %s..."
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1902
-#, fuzzy
 msgid "new subscription"
-msgstr "Записване за новинарска група"
+msgstr "нов абонамент"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1913
-#, fuzzy
 msgid "Claws Mail needs network access in order to update the subscription."
-msgstr "Claws Mail има нужда от достъп до мрежата, за да получава писмата."
+msgstr "Claws Mail има нужда от достъп до мрежата, за да обнови записването."
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1925
-#, fuzzy
 msgid "Subscribe to WebCal"
-msgstr "Записване"
+msgstr "Записване за WebCal"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1925
 msgid "Enter the WebCal URL:"
-msgstr ""
+msgstr "Въведете адрес на WebCal:"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1937
-#, fuzzy
 msgid "Could not parse the URL."
-msgstr "Грешка при изтеглянето на част от писмо."
+msgstr "Грешка при обработка на URL-адреса."
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1965
-#, fuzzy, c-format
+#, c-format
 msgid "Do you really want to unsubscribe?"
-msgstr "Наистина ли искате да изтриете това правило?"
+msgstr "Наистина ли искате да се отпишете?"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:109
-#, fuzzy
 msgid "accepted"
-msgstr "_Приемане"
+msgstr "прието"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:110
 msgid "tentatively accepted"
-msgstr ""
+msgstr "неокончателно прието"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:111
-#, fuzzy
 msgid "declined"
-msgstr "Неопределено"
+msgstr "отхвърлено"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:112
 msgid "did not answer"
-msgstr ""
+msgstr "няма отговор"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:142
 msgid "individual"
 msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_manager.c:143
-#, fuzzy
 msgid "group"
-msgstr "Група"
+msgstr "група"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:144
-#, fuzzy
 msgid "resource"
-msgstr "Източници"
+msgstr "ресурс"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:145
 msgid "room"
-msgstr ""
+msgstr "стая"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:556
-#, fuzzy
 msgid "Past"
-msgstr "_Поставяне"
+msgstr "Минало"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:559
 msgid "Today"
-msgstr ""
+msgstr "Днес"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:562
 msgid "Tomorrow"
-msgstr ""
+msgstr "Утре"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:565
 msgid "This week"
-msgstr ""
+msgstr "Тази седмица"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:568
 msgid "Later"
-msgstr ""
+msgstr "По-късно"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:1242
-#, fuzzy
 msgid "Accepted: "
-msgstr "_Приемане"
+msgstr "Прието: "
 
 #: ../src/plugins/vcalendar/vcal_manager.c:1244
 msgid "Declined: "
-msgstr ""
+msgstr "Отхвърлено: "
 
 #: ../src/plugins/vcalendar/vcal_manager.c:1246
 msgid "Tentatively Accepted: "
-msgstr ""
+msgstr "Неокончателно прието: "
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:307
 msgid "Individual"
 msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:309
-#, fuzzy
 msgid "Resource"
-msgstr "Източници"
+msgstr "Ресурс"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:310
 msgid "Room"
-msgstr ""
+msgstr "Стая"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:323
-#, fuzzy
 msgid "Add..."
-msgstr "_Добавяне..."
+msgstr "Добавяне..."
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:779
 msgid ""
 "The following person(s) are busy at the time of your planned meeting:\n"
 "- "
 msgstr ""
+"Следните участници са заето по време на планираната среща:\n"
+"- "
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:780
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:869
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:955
 msgid "You"
-msgstr ""
+msgstr "Вие"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:781
 msgid "You are busy at the time of your planned meeting"
-msgstr ""
+msgstr "Вие сте заети по време на планираната среща"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:783
 #, c-format
 msgid "%s is busy at the time of your planned meeting"
-msgstr ""
+msgstr "%d е зает(а) по време на планираната ви среща"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:785
 #, c-format
 msgid "%d hour sooner"
-msgstr ""
+msgstr "%d час по-рано"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:787
 #, c-format
 msgid "%d hours sooner"
-msgstr ""
+msgstr "%d часа по-рано"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:789
 #, c-format
 msgid "%d hours and %d minutes sooner"
-msgstr ""
+msgstr "%d часа и %d минути по-рано"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:791
 #, c-format
 msgid "%d minutes sooner"
-msgstr ""
+msgstr "%d минути по-рано"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:796
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour later"
-msgstr "По-късно"
+msgstr "%d час по-късно"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:798
 #, c-format
 msgid "%d hours later"
-msgstr ""
+msgstr "%d часа по-късно"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:800
 #, c-format
 msgid "%d hours and %d minutes later"
-msgstr ""
+msgstr "%d часа и %d минути по-късно"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:802
-#, fuzzy, c-format
+#, c-format
 msgid "%d minutes later"
-msgstr "минути"
+msgstr "%d минути по-късно"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:808
 #, c-format
@@ -14373,6 +14235,9 @@ msgid ""
 "\n"
 "Everyone would be available %s or %s."
 msgstr ""
+"\n"
+"\n"
+"Всички ще са налични %s или %s."
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:810
 #, c-format
@@ -14381,6 +14246,9 @@ msgid ""
 "\n"
 "Everyone would be available %s."
 msgstr ""
+"\n"
+"\n"
+"Всички ще са налични %s."
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:812
 #, c-format
@@ -14394,19 +14262,19 @@ msgstr ""
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:817
 #, c-format
 msgid "would be available %s or %s"
-msgstr ""
+msgstr "ще е наличен(-на) %s или %s"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:819
-#, fuzzy, c-format
+#, c-format
 msgid "would be available %s"
-msgstr "Грешка при отваряне на файла %s."
+msgstr "ще е наличен(-на) %s"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:821
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:882
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:952
-#, fuzzy, c-format
+#, c-format
 msgid "not available"
-msgstr "Въвеждане на променлива"
+msgstr "не е наличен"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:824
 #, c-format
@@ -14424,9 +14292,8 @@ msgid ", and isn't available in the previous or next 6 hours."
 msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:885
-#, fuzzy
 msgid "available"
-msgstr "Налични адреси:"
+msgstr "наличен"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:887
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1136
@@ -14434,35 +14301,31 @@ msgid "Free/busy retrieval failed"
 msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:969
-#, fuzzy
 msgid "Not everyone is available"
-msgstr "Няма налични данни"
+msgstr "Не всички са налични"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:970
-#, fuzzy
 msgid "Send anyway"
-msgstr "Да се изпрати ли въпреки това?"
+msgstr "Изпращане въпреки това"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:981
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1118
-#, fuzzy, c-format
+#, c-format
 msgid "Fetching planning for %s..."
-msgstr "Претърсване на папка %s ..."
+msgstr "Получаване на планирането за %s..."
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1145
-#, fuzzy
 msgid "Available"
-msgstr "Налични адреси:"
+msgstr "Наличен"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1158
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1165
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1173
-#, fuzzy
 msgid "Everyone is available."
-msgstr "Въвеждане на променлива"
+msgstr "Всички са налични."
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1174
 msgid ""
@@ -14475,64 +14338,62 @@ msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
 msgstr ""
+"Грешка при изпращане на поканата за среща.\n"
+"Проверете получателите."
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1474
-#, fuzzy
 msgid "Save & Send"
-msgstr "Запазване на нежеланата поща в"
+msgstr "Запис и изпращане"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1475
-#, fuzzy
 msgid "Check availability"
-msgstr "Проверка отново"
+msgstr "Проверка на наличност"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1598
 msgid "<b>Starts at:</b> "
-msgstr ""
+msgstr "<b>Започва в:</b> "
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1628
 msgid "<b> on:</b>"
-msgstr ""
+msgstr "<b> на:</b>"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "<b>Ends at:</b> "
-msgstr ""
+msgstr "<b>Приключва в:</b> "
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1663
-#, fuzzy
 msgid "New meeting"
-msgstr "Ново писмо"
+msgstr "Нова среща"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1665
 #, c-format
 msgid "%s - Edit meeting"
-msgstr ""
+msgstr "%s - Редактиране на среща"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1720
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1744
-#, fuzzy
 msgid "Time:"
-msgstr "Изтичане на времето"
+msgstr "Време:"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1877
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "часа"
-msgstr[1] "часа"
+msgstr[0] "%d час"
+msgstr[1] "%d часа"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1880
-#, fuzzy, c-format
+#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "минути"
-msgstr[1] "минути"
+msgstr[0] "%d минута"
+msgstr[1] "%d минути"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1891
 #, c-format
 msgid "Upcoming event: %s"
-msgstr ""
+msgstr "Предстоящо събитие: %s"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1892
 #, c-format
@@ -14544,76 +14405,77 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Имате среща или събитие скоро.\n"
+"Започва в %s и приключва след %s.\n"
+"Местоположение: %s\n"
+"Повече данни:\n"
+"\n"
+"%s"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1909
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Напомняне след %d минута"
+msgstr[1] "Напомняне след %d минути"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:2034
 msgid "Empty calendar"
-msgstr ""
+msgstr "Празен календар"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:2035
-#, fuzzy
 msgid "There is nothing to export."
-msgstr "Няма зададено филтриращо действие"
+msgstr "Няма нищо за изнасяне."
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:2075
-#, fuzzy
 msgid "Could not export the calendar."
-msgstr "Грешка при изнасяне на ключа."
+msgstr "Грешка при изнасяне на календара."
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:2092
 msgid "Export calendar to ICS"
-msgstr ""
+msgstr "Изнасяне на календара към ICS"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:2115
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't export calendar to '%s'\n"
-msgstr "Не може да изпълни командата: %s"
+msgstr "Грешка при изнасяне на календара към \"%s\"\n"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:2231
-#, fuzzy
 msgid "Could not export the freebusy info."
-msgstr "Грешка при изнасяне на ключа."
+msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:2263
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't export free/busy to '%s'\n"
-msgstr "Грешка при изнасяне на ключа."
+msgstr ""
 
 #. alert stuff
 #: ../src/plugins/vcalendar/vcal_prefs.c:266
-#, fuzzy
 msgid "Reminders"
-msgstr "Подател"
+msgstr "Напомняния"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:275
 msgid "Alert me"
-msgstr ""
+msgstr "Предупреждение"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:287
 msgid "minutes before an event"
-msgstr ""
+msgstr "минути преди събитието"
 
 #. calendar export
 #. export enable + path stuff
 #: ../src/plugins/vcalendar/vcal_prefs.c:299
 msgid "Calendar export"
-msgstr ""
+msgstr "Изнасяне на календар"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:310
-#, fuzzy
 msgid "Automatically export calendar to"
-msgstr "Автоматична проверка на подписите"
+msgstr "Автоматично изнасяне на календара към"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:319
 #: ../src/plugins/vcalendar/vcal_prefs.c:425
 msgid "You can export to a local file or URL"
-msgstr ""
+msgstr "Може да изнесете към локален файл или към URL"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:321
 msgid "Specify a local file or URL (http://server/path/file.ics)"
@@ -14639,7 +14501,7 @@ msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:361
 msgid "Command to run after calendar export"
-msgstr ""
+msgstr "Команда за изпълнение след изнасяне на календара"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:390
 msgid "Register Claws' calendar in XFCE's Orage clock"
@@ -14652,14 +14514,12 @@ msgstr ""
 #. freebusy export
 #. export enable + path stuff
 #: ../src/plugins/vcalendar/vcal_prefs.c:404
-#, fuzzy
 msgid "Free/Busy information"
-msgstr "Сървърни данни"
+msgstr "Информация свободен/зает"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:416
-#, fuzzy
 msgid "Automatically export free/busy status to"
-msgstr "Автоматична проверка на подписите"
+msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:427
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
@@ -14682,9 +14542,8 @@ msgstr ""
 
 #. SSL frame
 #: ../src/plugins/vcalendar/vcal_prefs.c:506
-#, fuzzy
 msgid "SSL options"
-msgstr "Настройки за отговор до подателя"
+msgstr "Настройки за SSL"
 
 #: ../src/pop.c:152
 msgid "Required APOP timestamp not found in greeting\n"
@@ -14708,14 +14567,14 @@ msgid "invalid UIDL response: %s\n"
 msgstr "неправилен UIDL отговор: %s\n"
 
 #: ../src/pop.c:835
-#, fuzzy, c-format
+#, c-format
 msgid "POP3: Deleting expired message %d [%s]\n"
-msgstr "Изтриване на повтарящите се писма..."
+msgstr "POP3: Изтриване на изтеклото писмо %d [%s]\n"
 
 #: ../src/pop.c:851
-#, fuzzy, c-format
+#, c-format
 msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
-msgstr "Изпращане на писмо (%d / %d байта)"
+msgstr "POP3: Пропускане на писмо %d [%s] (%d байта)\n"
 
 #: ../src/pop.c:883
 msgid "mailbox is locked\n"
@@ -14786,14 +14645,12 @@ msgid "Server information"
 msgstr "Сървърни данни"
 
 #: ../src/prefs_account.c:1130 ../src/wizard.c:1474
-#, fuzzy
 msgid "Auto-configure"
-msgstr "Настройка на действията"
+msgstr "Автоматична настройка"
 
 #: ../src/prefs_account.c:1132 ../src/wizard.c:1476
-#, fuzzy
 msgid "Cancel"
-msgstr "_Отказ"
+msgstr "Отказ"
 
 #: ../src/prefs_account.c:1148
 msgid ""
@@ -14854,11 +14711,6 @@ msgstr "Входяща кутия по подразбиране"
 msgid "Unfiltered messages will be stored in this folder"
 msgstr ""
 
-#: ../src/prefs_account.c:1442 ../src/prefs_account.c:1531
-#: ../src/prefs_account.c:1991 ../src/prefs_customheader.c:237
-msgid "Bro_wse"
-msgstr "П_реглед"
-
 #: ../src/prefs_account.c:1453
 msgid "Use secure authentication (APOP)"
 msgstr "Използване на сигурна автентикация (APOP)"
@@ -14876,9 +14728,8 @@ msgid "0 days and 0 hours : remove immediately"
 msgstr "0 дни и 0 часа: незабавно премахване"
 
 #: ../src/prefs_account.c:1497
-#, fuzzy
 msgid "Receive size limit"
-msgstr "Получаване на поща"
+msgstr ""
 
 #: ../src/prefs_account.c:1500
 msgid ""
@@ -14926,6 +14777,7 @@ msgstr ""
 #: ../src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
+"Този режим използва по-малко трафик, но може да е по-бавен с някои сървъри."
 
 #: ../src/prefs_account.c:1626
 msgid "Filter messages on receiving"
@@ -14940,8 +14792,8 @@ msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 
 #: ../src/prefs_account.c:1718 ../src/prefs_customheader.c:209
-#: ../src/prefs_matcher.c:620 ../src/prefs_matcher.c:1958
-#: ../src/prefs_matcher.c:1980
+#: ../src/prefs_matcher.c:623 ../src/prefs_matcher.c:1974
+#: ../src/prefs_matcher.c:1996
 msgid "Header"
 msgstr "Заглавка"
 
@@ -14954,9 +14806,8 @@ msgid "Send account mail address in Message-ID"
 msgstr ""
 
 #: ../src/prefs_account.c:1726
-#, fuzzy
 msgid "Add user agent header"
-msgstr "Зададена от потребителя заглавка"
+msgstr "Добавяне на заглавка с името на пощенския клиент"
 
 #: ../src/prefs_account.c:1733
 msgid "Add user-defined header"
@@ -14989,9 +14840,8 @@ msgid "Signature"
 msgstr "Подпис"
 
 #: ../src/prefs_account.c:1940
-#, fuzzy
 msgid "Automatically insert signature"
-msgstr "Автоматична проверка на подписите"
+msgstr "Автоматично вмъкване на подпис"
 
 #: ../src/prefs_account.c:1945
 msgid "Signature separator"
@@ -15158,9 +15008,8 @@ msgid ""
 msgstr ""
 
 #: ../src/prefs_account.c:2735
-#, fuzzy
 msgid "Use command to communicate with server"
-msgstr "Използване на командата mail вместо SMTP-сървър"
+msgstr "Използване на командата за връзка със сървъра"
 
 #: ../src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
@@ -15173,9 +15022,8 @@ msgid ""
 msgstr ""
 
 #: ../src/prefs_account.c:2749
-#, fuzzy
 msgid "Mark cross-posted messages as read and color:"
-msgstr "Отбелязване на писмата като прочетени след"
+msgstr ""
 
 #: ../src/prefs_account.c:2805
 msgid "Put sent messages in"
@@ -15260,9 +15108,8 @@ msgid "%s - Account preferences"
 msgstr "%s - настройки на сметката"
 
 #: ../src/prefs_account.c:3849 ../src/wizard.c:1374
-#, fuzzy
 msgid "Failed (wrong address)"
-msgstr "Адрес на е-поща"
+msgstr "Неуспех (грешен адрес)"
 
 #: ../src/prefs_account.c:3931
 msgid "Select signature file"
@@ -15311,20 +15158,19 @@ msgid "Replace the selected action in list with the action above"
 msgstr ""
 
 #: ../src/prefs_actions.c:337 ../src/prefs_filtering_action.c:616
-#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:778
-#: ../src/prefs_template.c:318 ../src/prefs_toolbar.c:1056
-#, fuzzy
+#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:781
+#: ../src/prefs_template.c:320 ../src/prefs_toolbar.c:1056
 msgid "Re_move"
-msgstr "Премахване"
+msgstr "Према_хване"
 
 #: ../src/prefs_actions.c:345
 msgid "Delete the selected action from the list"
 msgstr "Изтриване на избраното действие от списъка"
 
 #: ../src/prefs_actions.c:355 ../src/prefs_filtering.c:503
-#: ../src/prefs_template.c:336
+#: ../src/prefs_template.c:338
 msgid "Clear all the input fields in the dialog"
-msgstr ""
+msgstr "Изчистване на всички полета в прозореца"
 
 #: ../src/prefs_actions.c:363
 msgid "Show information on configuring actions"
@@ -15343,10 +15189,9 @@ msgstr "Преместване избраното действие надолу"
 #: ../src/prefs_actions.c:535 ../src/prefs_filtering_action.c:704
 #: ../src/prefs_filtering.c:836 ../src/prefs_filtering.c:838
 #: ../src/prefs_filtering.c:839 ../src/prefs_filtering.c:949
-#: ../src/prefs_matcher.c:897 ../src/prefs_template.c:469
-#, fuzzy
+#: ../src/prefs_matcher.c:900 ../src/prefs_template.c:472
 msgid "(New)"
-msgstr "Нови"
+msgstr "(Нов)"
 
 #: ../src/prefs_actions.c:600
 msgid "Menu name is not set."
@@ -15361,9 +15206,8 @@ msgid "Colon ':' is not allowed in the menu name."
 msgstr "Символ \":\" (двоеточие) не е позволен в менюто."
 
 #: ../src/prefs_actions.c:616
-#, fuzzy
 msgid "There is an action with this name already."
-msgstr "Ориентация на иконата в панела"
+msgstr "Вече има действие с такова име."
 
 #: ../src/prefs_actions.c:635
 msgid "Menu name is too long."
@@ -15406,22 +15250,22 @@ msgstr "Наистина ли искате да изтриете всички д
 
 #: ../src/prefs_actions.c:898 ../src/prefs_actions.c:929
 #: ../src/prefs_filtering.c:1497 ../src/prefs_filtering.c:1519
-#: ../src/prefs_matcher.c:2109 ../src/prefs_template.c:569
-#: ../src/prefs_template.c:594
+#: ../src/prefs_matcher.c:2125 ../src/prefs_template.c:572
+#: ../src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Записът не е запазен"
 
 #: ../src/prefs_actions.c:899 ../src/prefs_actions.c:930
 #: ../src/prefs_filtering.c:1498 ../src/prefs_filtering.c:1520
-#: ../src/prefs_template.c:570 ../src/prefs_template.c:595
+#: ../src/prefs_template.c:573 ../src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Записът не е запазен. Да се продължи ли затварянето?"
 
 #: ../src/prefs_actions.c:900 ../src/prefs_actions.c:905
 #: ../src/prefs_actions.c:931 ../src/prefs_filtering.c:1477
 #: ../src/prefs_filtering.c:1499 ../src/prefs_filtering.c:1521
-#: ../src/prefs_matcher.c:2111 ../src/prefs_template.c:571
-#: ../src/prefs_template.c:596 ../src/prefs_template.c:601
+#: ../src/prefs_matcher.c:2127 ../src/prefs_template.c:574
+#: ../src/prefs_template.c:599 ../src/prefs_template.c:604
 msgid "+_Continue editing"
 msgstr "+_Продължаване на редактирането"
 
@@ -15495,9 +15339,8 @@ msgid "for the file of the selected decoded message MIME part"
 msgstr "за файла на избраната декодирана MIME-част на писмото"
 
 #: ../src/prefs_actions.c:990
-#, fuzzy
 msgid "for a user provided argument"
-msgstr "Потребителски аргументи на действието"
+msgstr ""
 
 #: ../src/prefs_actions.c:991
 msgid "for a user provided hidden argument (e.g. password)"
@@ -15526,7 +15369,7 @@ msgid ""
 msgstr ""
 
 #: ../src/prefs_actions.c:1092 ../src/prefs_filtering.c:1695
-#: ../src/prefs_template.c:1101
+#: ../src/prefs_template.c:1121
 msgid "D_uplicate"
 msgstr ""
 
@@ -15556,9 +15399,8 @@ msgstr ""
 "\\n}?c{Копие: %c\\n}?n{Групи: %n\\n}?s{Относно: %s\\n}\\n\\n%M"
 
 #: ../src/prefs_common.c:442
-#, fuzzy
 msgid "%x(%a) %H:%M"
-msgstr "%y/%m/%d(%a) %H:%M"
+msgstr ""
 
 #. Account autoselection
 #: ../src/prefs_compose_writing.c:125
@@ -15587,18 +15429,16 @@ msgid "Automatically launch the external editor"
 msgstr "Автоматично зареждане на външния редактор"
 
 #: ../src/prefs_compose_writing.c:152
-#, fuzzy
 msgid "Automatically save message to Drafts folder every"
-msgstr "Автоматично задаване на следните адреси"
+msgstr "Автоматично записване в черновите на всеки"
 
 #: ../src/prefs_compose_writing.c:162 ../src/prefs_wrapping.c:101
 msgid "characters"
 msgstr "знака"
 
 #: ../src/prefs_compose_writing.c:173
-#, fuzzy
 msgid "Even if message is to be encrypted"
-msgstr "Отваряне на писмото при избиране"
+msgstr "Дори и ако писмото ще се шифрира"
 
 #: ../src/prefs_compose_writing.c:180
 msgid "Undo level"
@@ -15606,12 +15446,11 @@ msgstr ""
 
 #: ../src/prefs_compose_writing.c:198
 msgid "Warn when inserting a file larger than"
-msgstr ""
+msgstr "Предупреждение при вмъкване на файл, по-голям от"
 
 #: ../src/prefs_compose_writing.c:210
-#, fuzzy
 msgid "KB into message body "
-msgstr "тяло на писмото"
+msgstr ""
 
 #. Replying
 #: ../src/prefs_compose_writing.c:216
@@ -15623,9 +15462,8 @@ msgid "Reply will quote by default"
 msgstr "Цитиране по подразбиране при отговор"
 
 #: ../src/prefs_compose_writing.c:222
-#, fuzzy
 msgid "Reply button invokes mailing list reply"
-msgstr "/Отговор _до/пощенски _списък"
+msgstr "Бутонът за отговор отговаря до пощенски списък"
 
 #: ../src/prefs_compose_writing.c:224
 msgid "Forwarding"
@@ -15665,7 +15503,7 @@ msgid "Custom header configuration"
 msgstr "Настройка на потребителски заглавки"
 
 #: ../src/prefs_customheader.c:507 ../src/prefs_display_header.c:599
-#: ../src/prefs_matcher.c:1583 ../src/prefs_matcher.c:1598
+#: ../src/prefs_matcher.c:1595 ../src/prefs_matcher.c:1610
 msgid "Header name is not set."
 msgstr "Не е указано името на заглавката."
 
@@ -15695,26 +15533,24 @@ msgstr "Избраното изображение не е с нужните ра
 
 #: ../src/prefs_customheader.c:592
 msgid "The image is too big; it must be maximum 725 bytes."
-msgstr ""
+msgstr "Изображението е твърде голямо, може да е най-много 725 байта."
 
 #: ../src/prefs_customheader.c:597
-#, fuzzy
 msgid "The image isn't in the correct format (PNG)."
-msgstr "Избраното изображение не е с нужните размери (48x48)."
+msgstr "Изображението не е в правилен формат (PNG)."
 
 #: ../src/prefs_customheader.c:606
-#, fuzzy
 msgid "The image isn't in the correct format (XBM)."
-msgstr "Избраното изображение не е с нужните размери (48x48)."
+msgstr "Изображението не е в правилен формат (XBM)."
 
 #: ../src/prefs_customheader.c:615
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
 
 #: ../src/prefs_customheader.c:621
-#, fuzzy, c-format
+#, c-format
 msgid "Compface error: %s"
-msgstr "протоколна грешка: %s\n"
+msgstr "Грешка в compface: %s"
 
 #: ../src/prefs_customheader.c:672
 msgid "This file contains newlines."
@@ -15852,7 +15688,7 @@ msgstr "Пренасочване"
 
 #. S_COL_NUMBER
 #: ../src/prefs_filtering_action.c:194 ../src/prefs_filtering_action.c:195
-#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:626
+#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:629
 #: ../src/prefs_summary_column.c:87 ../src/summaryview.c:447
 msgid "Score"
 msgstr "Оценка"
@@ -15869,7 +15705,7 @@ msgstr "Поставяне на оценка"
 #. S_COL_SCORE
 #. S_COL_LOCKED
 #: ../src/prefs_filtering_action.c:196 ../src/prefs_filtering_action.c:197
-#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:630
+#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:633
 #: ../src/prefs_summary_column.c:89 ../src/summaryview.c:449
 msgid "Tags"
 msgstr "Етикети"
@@ -15899,7 +15735,7 @@ msgid "Action configuration"
 msgstr "Настройка на действията"
 
 #: ../src/prefs_filtering_action.c:427 ../src/prefs_filtering.c:1886
-#: ../src/prefs_matcher.c:583
+#: ../src/prefs_matcher.c:586
 msgid "Rule"
 msgstr "Правило"
 
@@ -15929,9 +15765,8 @@ msgid "Header is not set."
 msgstr "Не е указана заглавката."
 
 #: ../src/prefs_filtering_action.c:980
-#, fuzzy
 msgid "Target addressbook/folder is not set."
-msgstr "Не е указана заглавката."
+msgstr "Не е указан целеви адресник или папка."
 
 #: ../src/prefs_filtering_action.c:994
 msgid "Tag name is empty."
@@ -15942,25 +15777,25 @@ msgid "No action was defined."
 msgstr "Не са указано действие."
 
 #. completion of 'To' from address book
-#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2153
+#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2169
 #: ../src/quote_fmt.c:79
 msgid "literal %"
 msgstr ""
 
-#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2162
+#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2178
 msgid "filename (should not be modified)"
 msgstr "име на файла (не трябва да се променя)"
 
-#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2163
+#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2179
 #: ../src/quote_fmt.c:87
 msgid "new line"
 msgstr "нов ред"
 
-#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2164
+#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2180
 msgid "escape character for quotes"
 msgstr ""
 
-#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2165
+#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2181
 msgid "quote character"
 msgstr "знак за цитиране"
 
@@ -15985,7 +15820,7 @@ msgstr "Адресник/Папка"
 
 #: ../src/prefs_filtering_action.c:1430
 msgid "Destination"
-msgstr ""
+msgstr "Назначение"
 
 #: ../src/prefs_filtering_action.c:1434
 msgid "Color"
@@ -16003,21 +15838,19 @@ msgstr "Настройка на филтрирането и обработкат
 #: ../src/prefs_filtering.c:981
 msgctxt "Filtering Account Menu"
 msgid "All"
-msgstr ""
+msgstr "Всички"
 
 #: ../src/prefs_filtering.c:411
 msgid "Condition"
 msgstr "Условие"
 
 #: ../src/prefs_filtering.c:424
-#, fuzzy
 msgid " D_efine... "
-msgstr " Определяне... "
+msgstr "Опре_деляне... "
 
 #: ../src/prefs_filtering.c:446
-#, fuzzy
 msgid " De_fine... "
-msgstr " Определяне... "
+msgstr "Оп_ределяне... "
 
 #: ../src/prefs_filtering.c:475
 msgid "Append the new rule above to the list"
@@ -16036,9 +15869,8 @@ msgid "Move the selected rule to the top"
 msgstr "Преместване на избраното правило най-горе"
 
 #: ../src/prefs_filtering.c:535
-#, fuzzy
 msgid "Page u_p"
-msgstr "Страница нагоре"
+msgstr "Страница на_горе"
 
 #: ../src/prefs_filtering.c:543
 msgid "Move the selected rule one page up"
@@ -16053,9 +15885,8 @@ msgid "Move the selected rule down"
 msgstr "Преместване избраното правило надолу"
 
 #: ../src/prefs_filtering.c:563
-#, fuzzy
 msgid "Page dow_n"
-msgstr "Страница надолу"
+msgstr "Страница на_долу"
 
 #: ../src/prefs_filtering.c:571
 msgid "Move the selected rule one page down"
@@ -16114,17 +15945,15 @@ msgid "Enable"
 msgstr "Включване"
 
 #: ../src/prefs_folder_column.c:212
-#, fuzzy
 msgid "Folder list columns configuration"
-msgstr "Настройка на колоните в списъка с писма"
+msgstr "Настройка на колоните в списъка с папки"
 
 #: ../src/prefs_folder_column.c:229
-#, fuzzy
 msgid ""
 "Select columns to be displayed in the folder list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
 msgstr ""
-"Избиране на колоните, които да бъдат видими в списъка с писма. Можете да\n"
+"Избиране на колоните, които да бъдат видими в списъка с папки. Можете да\n"
 "промените подредбата с бутоните Нагоре/Надолу или чрез влачене с мишката."
 
 #: ../src/prefs_folder_column.c:258 ../src/prefs_summary_column.c:272
@@ -16159,9 +15988,8 @@ msgstr ""
 "под-папките"
 
 #: ../src/prefs_folder_item.c:305
-#, fuzzy
 msgid "Normal"
-msgstr "Нормален режим"
+msgstr "Нормално"
 
 #: ../src/prefs_folder_item.c:307
 msgid "Outbox"
@@ -16179,12 +16007,12 @@ msgstr "Регулярен израз за опростяване на \"Отн
 #. Test string
 #: ../src/prefs_folder_item.c:362
 msgid "Test string:"
-msgstr ""
+msgstr "Пробен низ:"
 
 #. Test result
 #: ../src/prefs_folder_item.c:379
 msgid "Result:"
-msgstr ""
+msgstr "Резултат:"
 
 #. Folder chmod
 #: ../src/prefs_folder_item.c:394
@@ -16201,14 +16029,12 @@ msgid "Pick color for folder"
 msgstr "Избор на цвят за папката"
 
 #: ../src/prefs_folder_item.c:451
-#, fuzzy
 msgid "Run Processing rules at start-up"
-msgstr "Скриване при зареждане"
+msgstr "Правила за обработка при зареждане"
 
 #: ../src/prefs_folder_item.c:466
-#, fuzzy
 msgid "Run Processing rules when opening"
-msgstr "/Създаване на правило за обработка"
+msgstr "Правила за обработка при отваряне"
 
 #. Check folder for new mail
 #: ../src/prefs_folder_item.c:480
@@ -16222,9 +16048,8 @@ msgid ""
 msgstr ""
 
 #: ../src/prefs_folder_item.c:502
-#, fuzzy
 msgid "Select the HTML part of multipart messages"
-msgstr "Грешка при изтеглянето на част от многосъставно писмо: %s"
+msgstr "Предпочитане на HTML от многосъставни писма"
 
 #: ../src/prefs_folder_item.c:519
 msgid ""
@@ -16238,23 +16063,20 @@ msgid "Synchronise for offline use"
 msgstr "Синхронизиране за изключен режим"
 
 #: ../src/prefs_folder_item.c:550
-#, fuzzy
 msgid "Fetch message bodies from the last"
-msgstr "Няма открити нови писма. Да се търси ли от края?"
+msgstr ""
 
 #: ../src/prefs_folder_item.c:557
 msgid "0: all bodies"
 msgstr ""
 
 #: ../src/prefs_folder_item.c:565
-#, fuzzy
 msgid "Remove older messages bodies"
-msgstr "цитирано тяло на писмо"
+msgstr "Премахване телата на старите писма"
 
 #: ../src/prefs_folder_item.c:582
-#, fuzzy
 msgid "Discard folder cache"
-msgstr "Отхвърляне на писмо"
+msgstr ""
 
 #: ../src/prefs_folder_item.c:897
 msgid "Request Return Receipt"
@@ -16272,14 +16094,12 @@ msgstr ""
 #: ../src/prefs_folder_item.c:925 ../src/prefs_folder_item.c:948
 #: ../src/prefs_folder_item.c:972 ../src/prefs_folder_item.c:995
 #: ../src/prefs_folder_item.c:1018
-#, fuzzy
 msgid "Default "
-msgstr "По подразбиране"
+msgstr "По подразбиране "
 
 #: ../src/prefs_folder_item.c:949
-#, fuzzy
 msgid " for replies"
-msgstr "Получател·за·отговорите по подразбиране:"
+msgstr ""
 
 #. Default account
 #: ../src/prefs_folder_item.c:1041
@@ -16287,14 +16107,12 @@ msgid "Default account"
 msgstr "Сметка по подразбиране"
 
 #: ../src/prefs_folder_item.c:1683
-#, fuzzy
 msgid "Discard cache"
-msgstr "Отхвърляне на писмо"
+msgstr ""
 
 #: ../src/prefs_folder_item.c:1684
-#, fuzzy
 msgid "Do you really want to discard the local cached data for this folder?"
-msgstr "Наистина ли искате да изтриете тази заглавка?"
+msgstr ""
 
 #: ../src/prefs_folder_item.c:1686
 msgid "+Discard"
@@ -16311,12 +16129,11 @@ msgstr "Настройки за папката %s"
 
 #. normal font label
 #: ../src/prefs_fonts.c:79
-#, fuzzy
 msgid "Folder and Message Lists"
-msgstr "Настройки за препращане на писмо"
+msgstr "Списъци с папки и писма"
 
 #. message font label
-#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2030
+#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2046
 msgid "Message"
 msgstr "Писмо"
 
@@ -16368,12 +16185,11 @@ msgstr ""
 
 #: ../src/prefs_image_viewer.c:78
 msgid "Clicking image toggles scaling"
-msgstr ""
+msgstr "Натискането върху изображението превключва мащабирането"
 
 #: ../src/prefs_image_viewer.c:83
-#, fuzzy
 msgid "Display images inline"
-msgstr "\"Показване като текст\""
+msgstr "Показване на вградените изображения"
 
 #: ../src/prefs_image_viewer.c:89
 msgid "Print images"
@@ -16412,28 +16228,24 @@ msgid ""
 msgstr ""
 
 #: ../src/prefs_logging.c:187
-#, fuzzy
 msgid "Log filtering/processing when..."
-msgstr "Bogofilter: обучаване от писмата..."
+msgstr ""
 
 #: ../src/prefs_logging.c:191
-#, fuzzy
 msgid "filtering at incorporation"
-msgstr "Настройка на действия за филтриране"
+msgstr "филтриране при вмъкване"
 
 #: ../src/prefs_logging.c:193
-#, fuzzy
 msgid "pre-processing folders"
-msgstr "обработка на папките"
+msgstr ""
 
 #: ../src/prefs_logging.c:198
 msgid "manually filtering"
 msgstr "ръчно филтриране"
 
 #: ../src/prefs_logging.c:200
-#, fuzzy
 msgid "post-processing folders"
-msgstr "обработка на папките"
+msgstr ""
 
 #: ../src/prefs_logging.c:207
 msgid "processing folders"
@@ -16469,13 +16281,12 @@ msgstr ""
 
 #. disk log
 #: ../src/prefs_logging.c:280
-#, fuzzy
 msgid "Disk log"
-msgstr "Диалогови прозорци"
+msgstr "Дисков журнал"
 
 #: ../src/prefs_logging.c:282
 msgid "Write the following information to disk..."
-msgstr ""
+msgstr "Записване на следните данни на диска..."
 
 #: ../src/prefs_logging.c:290
 msgid "Warning messages"
@@ -16502,251 +16313,249 @@ msgstr "Други"
 msgid "Logging"
 msgstr ""
 
-#: ../src/prefs_matcher.c:328
+#: ../src/prefs_matcher.c:330
 msgid "more than"
 msgstr "повече от"
 
-#: ../src/prefs_matcher.c:329
+#: ../src/prefs_matcher.c:331
 msgid "less than"
 msgstr "по-малко от"
 
-#: ../src/prefs_matcher.c:335
+#: ../src/prefs_matcher.c:337
 msgid "weeks"
 msgstr "седмици"
 
-#: ../src/prefs_matcher.c:339
+#: ../src/prefs_matcher.c:341
 msgid "higher than"
 msgstr "по-високо от"
 
-#: ../src/prefs_matcher.c:340
+#: ../src/prefs_matcher.c:342
 msgid "lower than"
 msgstr "по-ниско от"
 
-#: ../src/prefs_matcher.c:341 ../src/prefs_matcher.c:347
+#: ../src/prefs_matcher.c:343 ../src/prefs_matcher.c:349
 msgid "exactly"
 msgstr "точно"
 
-#: ../src/prefs_matcher.c:345
+#: ../src/prefs_matcher.c:347
 msgid "greater than"
 msgstr "по-голямо от"
 
-#: ../src/prefs_matcher.c:346
+#: ../src/prefs_matcher.c:348
 msgid "smaller than"
 msgstr "по-малко от"
 
-#: ../src/prefs_matcher.c:351
+#: ../src/prefs_matcher.c:353
 msgid "bytes"
 msgstr "байта"
 
-#: ../src/prefs_matcher.c:352
+#: ../src/prefs_matcher.c:354
 msgid "kilobytes"
 msgstr "килобайта"
 
-#: ../src/prefs_matcher.c:353
+#: ../src/prefs_matcher.c:355
 msgid "megabytes"
 msgstr "мегабайта"
 
-#: ../src/prefs_matcher.c:357
+#: ../src/prefs_matcher.c:359
 msgid "contains"
 msgstr "съдържа"
 
-#: ../src/prefs_matcher.c:358
+#: ../src/prefs_matcher.c:360
 msgid "doesn't contain"
 msgstr "не съдържа"
 
-#: ../src/prefs_matcher.c:381
+#: ../src/prefs_matcher.c:383
 msgid "headers part"
 msgstr "заглавна част"
 
-#: ../src/prefs_matcher.c:382
+#: ../src/prefs_matcher.c:384
+msgid "headers values"
+msgstr "стойности на заглавки"
+
+#: ../src/prefs_matcher.c:385
 msgid "body part"
 msgstr "тяло на писмото"
 
-#: ../src/prefs_matcher.c:383
+#: ../src/prefs_matcher.c:386
 msgid "whole message"
 msgstr "цялото писмо"
 
-#: ../src/prefs_matcher.c:389 ../src/summaryview.c:6300
+#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6300
 msgid "Marked"
 msgstr "Отбелязано"
 
-#: ../src/prefs_matcher.c:390 ../src/summaryview.c:6298
+#: ../src/prefs_matcher.c:393 ../src/summaryview.c:6298
 msgid "Deleted"
 msgstr "Изтрити"
 
-#: ../src/prefs_matcher.c:391
+#: ../src/prefs_matcher.c:394
 msgid "Replied"
 msgstr "Отговорени"
 
-#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6292
+#: ../src/prefs_matcher.c:395 ../src/summaryview.c:6292
 msgid "Forwarded"
 msgstr "Препратени"
 
-#: ../src/prefs_matcher.c:394 ../src/summaryview.c:6282 ../src/toolbar.c:416
+#: ../src/prefs_matcher.c:397 ../src/summaryview.c:6282 ../src/toolbar.c:416
 #: ../src/toolbar.c:934 ../src/toolbar.c:1978
 msgid "Spam"
 msgstr "Нежелано"
 
-#: ../src/prefs_matcher.c:395
-#, fuzzy
+#: ../src/prefs_matcher.c:398
 msgid "Has attachment"
-msgstr "Има прикрепени файлове"
+msgstr "Има прикрепки"
 
-#: ../src/prefs_matcher.c:396 ../src/summaryview.c:6318
+#: ../src/prefs_matcher.c:399 ../src/summaryview.c:6318
 msgid "Signed"
 msgstr "Подписано"
 
-#: ../src/prefs_matcher.c:400
+#: ../src/prefs_matcher.c:403
 msgid "set"
 msgstr "зададено"
 
-#: ../src/prefs_matcher.c:401
+#: ../src/prefs_matcher.c:404
 msgid "not set"
 msgstr "незададено"
 
-#: ../src/prefs_matcher.c:405
+#: ../src/prefs_matcher.c:408
 msgid "yes"
 msgstr "да"
 
-#: ../src/prefs_matcher.c:406
+#: ../src/prefs_matcher.c:409
 msgid "no"
 msgstr "не"
 
-#: ../src/prefs_matcher.c:410
+#: ../src/prefs_matcher.c:413
 msgid "Any tags"
 msgstr "Които и да са етикети"
 
-#: ../src/prefs_matcher.c:411
+#: ../src/prefs_matcher.c:414
 msgid "Specific tag"
 msgstr "Определен етикет"
 
-#: ../src/prefs_matcher.c:415
+#: ../src/prefs_matcher.c:418
 msgid "ignored"
 msgstr "пренебрегнато"
 
-#: ../src/prefs_matcher.c:416
+#: ../src/prefs_matcher.c:419
 msgid "not ignored"
 msgstr "непренебрегнато"
 
-#: ../src/prefs_matcher.c:417
+#: ../src/prefs_matcher.c:420
 msgid "watched"
 msgstr "наблюдавано"
 
-#: ../src/prefs_matcher.c:418
+#: ../src/prefs_matcher.c:421
 msgid "not watched"
 msgstr "ненаблюдавано"
 
-#: ../src/prefs_matcher.c:422
+#: ../src/prefs_matcher.c:425
 msgid "found"
 msgstr "открито"
 
-#: ../src/prefs_matcher.c:423
+#: ../src/prefs_matcher.c:426
 msgid "not found"
 msgstr "неоткрито"
 
-#: ../src/prefs_matcher.c:427
+#: ../src/prefs_matcher.c:430
 msgid "0 (Passed)"
 msgstr ""
 
-#: ../src/prefs_matcher.c:428
+#: ../src/prefs_matcher.c:431
 msgid "non-0 (Failed)"
 msgstr ""
 
-#: ../src/prefs_matcher.c:566
+#: ../src/prefs_matcher.c:569
 msgid "Condition configuration"
 msgstr "Настройка на условието"
 
 #. criteria combo box
-#: ../src/prefs_matcher.c:610
+#: ../src/prefs_matcher.c:613
 msgid "Match criteria:"
 msgstr "Критерии на търсенето:"
 
-#: ../src/prefs_matcher.c:619
+#: ../src/prefs_matcher.c:622
 msgid "All messages"
 msgstr "Всички писма"
 
-#: ../src/prefs_matcher.c:621
+#: ../src/prefs_matcher.c:624
 msgid "Age"
 msgstr "Възраст"
 
-#: ../src/prefs_matcher.c:622
-#, fuzzy
+#: ../src/prefs_matcher.c:625
 msgid "Phrase"
-msgstr "Парола"
+msgstr "Израз"
 
-#: ../src/prefs_matcher.c:623
-#, fuzzy
+#: ../src/prefs_matcher.c:626
 msgid "Flags"
-msgstr "Етикети"
+msgstr "Флагове"
 
-#: ../src/prefs_matcher.c:624 ../src/prefs_msg_colors.c:410
+#: ../src/prefs_matcher.c:627 ../src/prefs_msg_colors.c:410
 msgid "Color labels"
 msgstr "Цветни етикети"
 
-#: ../src/prefs_matcher.c:625
+#: ../src/prefs_matcher.c:628
 msgid "Thread"
 msgstr "Нишка"
 
-#: ../src/prefs_matcher.c:628
+#: ../src/prefs_matcher.c:631
 msgid "Partially downloaded"
 msgstr "Частично изтеглено"
 
-#: ../src/prefs_matcher.c:631
+#: ../src/prefs_matcher.c:634
 msgid "External program test"
 msgstr "Изпробване на външната програма"
 
 #. store UNtranslated "Any"/"All" in matcher expressions
-#: ../src/prefs_matcher.c:707 ../src/prefs_matcher.c:1604
-#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:2501
+#: ../src/prefs_matcher.c:710 ../src/prefs_matcher.c:1616
+#: ../src/prefs_matcher.c:1631 ../src/prefs_matcher.c:2521
 msgctxt "Filtering Matcher Menu"
 msgid "All"
-msgstr ""
+msgstr "Всички"
 
-#: ../src/prefs_matcher.c:741
+#: ../src/prefs_matcher.c:744
 msgid "Use regexp"
 msgstr "Приложи регулярен израз"
 
-#: ../src/prefs_matcher.c:818
-#, fuzzy
+#: ../src/prefs_matcher.c:821
 msgid "Message must match"
-msgstr "Паролите не съвпадат.\n"
+msgstr ""
 
-#: ../src/prefs_matcher.c:822
+#: ../src/prefs_matcher.c:825
 msgid "at least one"
 msgstr "поне едно"
 
-#: ../src/prefs_matcher.c:823
+#: ../src/prefs_matcher.c:826
 msgid "all"
 msgstr "всички"
 
-#: ../src/prefs_matcher.c:826
+#: ../src/prefs_matcher.c:829
 msgid "of above rules"
 msgstr "от горните правила"
 
-#: ../src/prefs_matcher.c:1522 ../src/prefs_matcher.c:1588
-#, fuzzy
+#: ../src/prefs_matcher.c:1534 ../src/prefs_matcher.c:1600
 msgid "Search pattern is not set."
-msgstr "Не е указано името на заглавката."
+msgstr "Не е указано шаблон за търсене."
 
-#: ../src/prefs_matcher.c:1531
-#, fuzzy
+#: ../src/prefs_matcher.c:1543
 msgid "Test command is not set."
-msgstr "Командният ред не е указан."
+msgstr "Не е указана команда за пробване."
 
-#: ../src/prefs_matcher.c:1605
+#: ../src/prefs_matcher.c:1617
 msgid "all addresses in all headers"
 msgstr "всички адреси от всички заглавки"
 
-#: ../src/prefs_matcher.c:1608
+#: ../src/prefs_matcher.c:1620
 msgid "any address in any header"
 msgstr "който и да е адрес от която и да е заглавка"
 
-#: ../src/prefs_matcher.c:1610
+#: ../src/prefs_matcher.c:1622
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "адресът(-сите) в заглавка '%s'"
 
-#: ../src/prefs_matcher.c:1611
+#: ../src/prefs_matcher.c:1623
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16755,80 +16564,83 @@ msgid ""
 "'%s' from the book/folder drop-down list."
 msgstr ""
 
-#: ../src/prefs_matcher.c:1830
+#: ../src/prefs_matcher.c:1842
 msgid "Headers part"
 msgstr "Заглавна част"
 
-#: ../src/prefs_matcher.c:1834
+#: ../src/prefs_matcher.c:1846
+msgid "Headers values"
+msgstr "Стойности на заглавки"
+
+#: ../src/prefs_matcher.c:1850
 msgid "Body part"
 msgstr "Тяло на писмото"
 
-#: ../src/prefs_matcher.c:1838
+#: ../src/prefs_matcher.c:1854
 msgid "Whole message"
 msgstr "Цялото писмо"
 
-#: ../src/prefs_matcher.c:1957 ../src/prefs_matcher.c:2001
+#: ../src/prefs_matcher.c:1973 ../src/prefs_matcher.c:2017
 msgid "in"
 msgstr "в"
 
-#: ../src/prefs_matcher.c:1959
+#: ../src/prefs_matcher.c:1975
 msgid "content is"
 msgstr "съдържанието е"
 
-#: ../src/prefs_matcher.c:1968
+#: ../src/prefs_matcher.c:1984
 msgid "Age is"
 msgstr "Възрастта е"
 
-#: ../src/prefs_matcher.c:1973
+#: ../src/prefs_matcher.c:1989
 msgid "Flag"
-msgstr ""
+msgstr "Флаг"
 
-#: ../src/prefs_matcher.c:1974 ../src/prefs_matcher.c:1991
+#: ../src/prefs_matcher.c:1990 ../src/prefs_matcher.c:2007
 msgid "is"
 msgstr "е"
 
-#: ../src/prefs_matcher.c:1979
+#: ../src/prefs_matcher.c:1995
 msgid "Name:"
 msgstr "Име:"
 
-#: ../src/prefs_matcher.c:1990
+#: ../src/prefs_matcher.c:2006
 msgid "Label"
 msgstr "Етикет"
 
-#: ../src/prefs_matcher.c:1996
+#: ../src/prefs_matcher.c:2012
 msgid "Value:"
 msgstr "Стойност:"
 
-#: ../src/prefs_matcher.c:2013
-#, fuzzy
+#: ../src/prefs_matcher.c:2029
 msgid "Score is"
-msgstr "Източници"
+msgstr "Оценката е"
 
-#: ../src/prefs_matcher.c:2014
+#: ../src/prefs_matcher.c:2030
 msgid "points"
 msgstr "точки"
 
-#: ../src/prefs_matcher.c:2024
+#: ../src/prefs_matcher.c:2040
 msgid "Size is"
 msgstr "Размерът е"
 
-#: ../src/prefs_matcher.c:2029
+#: ../src/prefs_matcher.c:2045
 msgid "Scope:"
 msgstr "Обхват:"
 
-#: ../src/prefs_matcher.c:2031
+#: ../src/prefs_matcher.c:2047
 msgid "tags"
 msgstr "етикети"
 
-#: ../src/prefs_matcher.c:2036
+#: ../src/prefs_matcher.c:2052
 msgid "type is"
 msgstr "видът е"
 
-#: ../src/prefs_matcher.c:2040
+#: ../src/prefs_matcher.c:2056
 msgid "Program returns"
 msgstr "Програмата връща"
 
-#: ../src/prefs_matcher.c:2110
+#: ../src/prefs_matcher.c:2126
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -16836,12 +16648,11 @@ msgstr ""
 "Записът не е запазен.\n"
 "Да се продължи ли затварянето?"
 
-#: ../src/prefs_matcher.c:2174
-#, fuzzy
+#: ../src/prefs_matcher.c:2190
 msgid "Match Type: 'Test'"
-msgstr "Вид на съвпадането"
+msgstr ""
 
-#: ../src/prefs_matcher.c:2175
+#: ../src/prefs_matcher.c:2191
 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"
@@ -16849,10 +16660,9 @@ msgid ""
 "The following symbols can be used:"
 msgstr ""
 
-#: ../src/prefs_matcher.c:2274
-#, fuzzy
+#: ../src/prefs_matcher.c:2290
 msgid "Current condition rules"
-msgstr "текущ речник"
+msgstr ""
 
 #: ../src/prefs_message.c:120
 msgid "Headers"
@@ -16867,14 +16677,12 @@ msgid "Display (X-)Face in message view"
 msgstr ""
 
 #: ../src/prefs_message.c:130
-#, fuzzy
 msgid "Display Face in message view"
-msgstr "Claws Mail - Преглед на писмо"
+msgstr "Показване на лице при изглед на писмо"
 
 #: ../src/prefs_message.c:144
-#, fuzzy
 msgid "Display headers in message view"
-msgstr "Показване на подателя според адресника"
+msgstr "Показване на заглавки при изглед на писмо"
 
 #: ../src/prefs_message.c:156
 msgid "HTML messages"
@@ -16889,9 +16697,8 @@ msgid "Render HTML-only messages with plugin if possible"
 msgstr "Показване на писма от чист HTML чрез приставка"
 
 #: ../src/prefs_message.c:165
-#, fuzzy
 msgid "Select the HTML part of multipart/alternative messages"
-msgstr "Грешка при изтеглянето на част от многосъставно писмо: %s"
+msgstr "Предпочитане на HTML от многосъставни или алтернативни писма"
 
 #: ../src/prefs_message.c:175
 msgid "Line space"
@@ -16923,13 +16730,12 @@ msgstr "Показване на характеристики на прикреп
 
 #. quote chars
 #: ../src/prefs_message.c:233
-#, fuzzy
 msgid "Quotation"
-msgstr "Знак за цитат"
+msgstr "Цитат"
 
 #: ../src/prefs_message.c:242
 msgid "Collapse quoted text on double click"
-msgstr ""
+msgstr "Свиване на цитатите при двойно щракване"
 
 #: ../src/prefs_message.c:249
 msgid "Treat these characters as quotation marks: "
@@ -16994,7 +16800,6 @@ msgid "Pick color for 3rd level text"
 msgstr "установяване на цвят за текст на 3-то ниво"
 
 #: ../src/prefs_msg_colors.c:263
-#, fuzzy
 msgid "Enable coloration of text background"
 msgstr "Включване на оцветяването на писмата"
 
@@ -17129,14 +16934,12 @@ msgid "Colors"
 msgstr "Цветове"
 
 #: ../src/prefs_other.c:97
-#, fuzzy
 msgid "Choose preset keyboard shortcuts"
-msgstr "Бързи клавиши"
+msgstr ""
 
 #: ../src/prefs_other.c:111
-#, fuzzy
 msgid "Select preset:"
-msgstr "Избор на файл"
+msgstr "Избор на шаблон:"
 
 #: ../src/prefs_other.c:126
 msgid ""
@@ -17170,12 +16973,10 @@ msgid "Keyboard shortcuts"
 msgstr "Бързи клавиши"
 
 #: ../src/prefs_other.c:500
-#, fuzzy
 msgid "Enable customisable keyboard shortcuts"
-msgstr "Активиране на напасването на бързия достъп до менютата"
+msgstr ""
 
 #: ../src/prefs_other.c:503
-#, fuzzy
 msgid ""
 "If checked, you can change the keyboard shortcuts of most of the menu items "
 "by focusing on the menu item and pressing a key combination.\n"
@@ -17188,14 +16989,12 @@ msgstr ""
 "бъдат заключени."
 
 #: ../src/prefs_other.c:510
-#, fuzzy
 msgid " Choose preset keyboard shortcuts... "
-msgstr "Бързи клавиши"
+msgstr ""
 
 #: ../src/prefs_other.c:520
-#, fuzzy
 msgid "Metadata handling"
-msgstr "Обработка на писмата"
+msgstr "Обработка на метаданни"
 
 #: ../src/prefs_other.c:521
 msgid ""
@@ -17204,18 +17003,16 @@ msgid ""
 msgstr ""
 
 #: ../src/prefs_other.c:525
-#, fuzzy
 msgid "Safer"
-msgstr "_Запазване"
+msgstr "По-сигурно"
 
 #: ../src/prefs_other.c:527
-#, fuzzy
 msgid "Faster"
-msgstr "_Поставяне"
+msgstr "По-бързо"
 
 #: ../src/prefs_other.c:545
 msgid "Socket I/O timeout"
-msgstr ""
+msgstr "Просрочен вход-изход на сокет"
 
 #: ../src/prefs_other.c:567
 msgid "Ask before emptying trash"
@@ -17229,13 +17026,15 @@ msgstr ""
 
 #: ../src/prefs_other.c:574
 msgid "Use secure file deletion if possible"
-msgstr ""
+msgstr "Използване на сигурно изтриване на файлове, ако е възможно"
 
 #: ../src/prefs_other.c:578
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
 msgstr ""
+"Използване на сигурно изтриване на файлове, ако е възможно\n"
+"(програмата \"shred\" не е налична)"
 
 #: ../src/prefs_other.c:583
 msgid ""
@@ -17249,7 +17048,7 @@ msgstr "Синхронизиране на офлайн папките при п
 
 #: ../src/prefs_other.c:690
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Разни"
 
 #: ../src/prefs_quote.c:77
 msgid "On %d\\n%f wrote:\\n\\n%q"
@@ -17257,9 +17056,8 @@ msgstr "На %d\\n%f написа:\\n\\n%q"
 
 #. Use of external incorporation program
 #: ../src/prefs_receive.c:123
-#, fuzzy
 msgid "External incorporation program"
-msgstr "Външни програми"
+msgstr ""
 
 #: ../src/prefs_receive.c:126
 msgid "Use external program for receiving mail"
@@ -17271,9 +17069,8 @@ msgid "Automatic checking"
 msgstr "Автоматична проверка"
 
 #: ../src/prefs_receive.c:149
-#, fuzzy
 msgid "Check for new mail every"
-msgstr "Автоматична проверка за нова поща на всеки"
+msgstr "Проверка за нова поща на всеки"
 
 #: ../src/prefs_receive.c:167
 msgid "Check for new mail on start-up"
@@ -17301,9 +17098,8 @@ msgid "Don't popup error dialog on receive error"
 msgstr "Да не се показва прозорец за грешка при получаване"
 
 #: ../src/prefs_receive.c:199
-#, fuzzy
 msgid "After receiving new mail"
-msgstr "След проверка за нова поща"
+msgstr "След получаване на нова поща"
 
 #: ../src/prefs_receive.c:201
 msgid "Go to Inbox"
@@ -17359,9 +17155,8 @@ msgid "Show send dialog"
 msgstr "Прозорец за изпращането"
 
 #: ../src/prefs_send.c:172
-#, fuzzy
 msgid "Warn when Subject is empty"
-msgstr "\"Относно\" е празно. %s"
+msgstr "Предупреждение при празна тема"
 
 #: ../src/prefs_send.c:180
 msgid "Outgoing encoding"
@@ -17460,9 +17255,8 @@ msgid "Japanese (Shift_JIS)"
 msgstr "Японско (Shift_JIS)"
 
 #: ../src/prefs_send.c:254
-#, fuzzy
 msgid "Simplified Chinese (GB18030)"
-msgstr "Опростено китайско (GBK)"
+msgstr "Опростен китайски (GB18030)"
 
 #: ../src/prefs_send.c:255
 msgid "Simplified Chinese (GB2312)"
@@ -17546,9 +17340,8 @@ msgid "Check with both dictionaries"
 msgstr "Проверка с двата речника"
 
 #: ../src/prefs_spelling.c:197
-#, fuzzy
 msgid "Get more dictionaries..."
-msgstr "Ползване и на двата речника"
+msgstr "Получаване на още речници..."
 
 #: ../src/prefs_spelling.c:207
 msgid "Misspelled word color"
@@ -17563,7 +17356,6 @@ msgid "Spell Checking"
 msgstr "Проверка на правописа"
 
 #: ../src/prefs_summaries.c:152
-#, fuzzy
 msgid "the abbreviated weekday name"
 msgstr "съкратено име на деня от седмицата"
 
@@ -17665,7 +17457,6 @@ msgid "Unread and Total messages"
 msgstr "Брой непрочетени и общ брой писма"
 
 #: ../src/prefs_summaries.c:381
-#, fuzzy
 msgid "Open last opened folder at start-up"
 msgstr "Отваряне на последно отваряната папка при зареждане"
 
@@ -17747,7 +17538,6 @@ msgid "Date format help"
 msgstr "Помощ за формата на датата"
 
 #: ../src/prefs_summaries.c:557
-#, fuzzy
 msgid "Confirm before marking all messages in a folder as read"
 msgstr ""
 "Потвърждаване преди отбелязването на всички писма в една папка като прочетени"
@@ -17810,121 +17600,121 @@ msgid "first email in the list"
 msgstr "първото писмо в списъка"
 
 #: ../src/prefs_summary_open.c:184
-#, fuzzy
 msgid " Selection when entering a folder"
-msgstr "Избор на папка"
+msgstr ""
 
 #: ../src/prefs_summary_open.c:230
 msgid "Possible selections"
 msgstr "Възможни избирания"
 
 #: ../src/prefs_summary_open.c:266
-#, fuzzy
 msgid "Selection on folder opening"
 msgstr "Действие при отваряне на папка"
 
-#: ../src/prefs_template.c:79
+#: ../src/prefs_template.c:80
 msgid "This name is used as the Menu item"
 msgstr "Това име се използва в менюто"
 
-#: ../src/prefs_template.c:81
+#: ../src/prefs_template.c:82
 msgid ""
 "Override composing account's From header. This doesn't change the composing "
 "account."
 msgstr ""
 
-#: ../src/prefs_template.c:307
+#: ../src/prefs_template.c:309
 msgid "Append the new template above to the list"
-msgstr ""
+msgstr "Добавяне на нов шаблон в началото на списъка"
 
-#: ../src/prefs_template.c:316
+#: ../src/prefs_template.c:318
 msgid "Replace the selected template in list with the template above"
-msgstr ""
+msgstr "Замяна на избрания шаблон с този по-горе"
 
-#: ../src/prefs_template.c:326
+#: ../src/prefs_template.c:328
 msgid "Delete the selected template from the list"
-msgstr ""
+msgstr "Изтриване на избрания шаблон от списъка"
 
-#: ../src/prefs_template.c:344
+#: ../src/prefs_template.c:346
 msgid "Show information on configuring templates"
 msgstr ""
 
-#: ../src/prefs_template.c:368
+#: ../src/prefs_template.c:370
 msgid "Move the selected template to the top"
-msgstr ""
+msgstr "Преместване на избрания шаблон най-отгоре"
 
-#: ../src/prefs_template.c:378
+#: ../src/prefs_template.c:380
 msgid "Move the selected template up"
 msgstr "Преместване на избрания шаблон нагоре"
 
-#: ../src/prefs_template.c:386
+#: ../src/prefs_template.c:388
 msgid "Move the selected template down"
 msgstr "Преместване на избрания шаблон надолу"
 
-#: ../src/prefs_template.c:396
+#: ../src/prefs_template.c:398
 msgid "Move the selected template to the bottom"
-msgstr ""
+msgstr "Преместване на избрания шаблон най-отдолу"
 
-#: ../src/prefs_template.c:412
+#: ../src/prefs_template.c:414
 msgid "Template configuration"
 msgstr "Настройка на шаблони"
 
-#: ../src/prefs_template.c:599
-#, fuzzy
+#: ../src/prefs_template.c:602
 msgid "Templates list not saved"
-msgstr "Не е указано име на шаблона."
+msgstr "Списъкът с шаблони не е запазен"
 
-#: ../src/prefs_template.c:600
-#, fuzzy
+#: ../src/prefs_template.c:603
 msgid "The templates list has been modified. Close anyway?"
-msgstr "Записът не е запазен. Да се продължи ли затварянето?"
+msgstr "Списъкът с шаблони е променен. Да се продължи ли затварянето?"
 
-#: ../src/prefs_template.c:761
-#, fuzzy
+#: ../src/prefs_template.c:768
 msgid "The template's name is not set."
 msgstr "Не е указано име на шаблона."
 
-#: ../src/prefs_template.c:798
+#: ../src/prefs_template.c:811
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr ""
 
-#: ../src/prefs_template.c:804
+#: ../src/prefs_template.c:817
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr ""
 
-#: ../src/prefs_template.c:810
+#: ../src/prefs_template.c:823
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr ""
 
-#: ../src/prefs_template.c:816
+#: ../src/prefs_template.c:829
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr ""
 
-#: ../src/prefs_template.c:822
+#: ../src/prefs_template.c:835
+msgid ""
+"The \"Reply-To\" field of the template contains an invalid email address."
+msgstr ""
+
+#: ../src/prefs_template.c:841
 msgid "The \"Subject\" field of the template is invalid."
 msgstr ""
 
-#: ../src/prefs_template.c:892
+#: ../src/prefs_template.c:912
 msgid "Delete template"
 msgstr "Изтриване на шаблон"
 
-#: ../src/prefs_template.c:893
+#: ../src/prefs_template.c:913
 msgid "Do you really want to delete this template?"
 msgstr "Наистина ли искате да изтриете този шаблон?"
 
-#: ../src/prefs_template.c:905
+#: ../src/prefs_template.c:925
 msgid "Delete all templates"
 msgstr "Изтриване на всички шаблони"
 
-#: ../src/prefs_template.c:906
+#: ../src/prefs_template.c:926
 msgid "Do you really want to delete all the templates?"
 msgstr "Наистина ли искате да изтриете всички шаблони?"
 
-#: ../src/prefs_template.c:1221
+#: ../src/prefs_template.c:1241
 msgid "Current templates"
 msgstr "Налични шаблони"
 
-#: ../src/prefs_template.c:1249
+#: ../src/prefs_template.c:1269
 msgid "Template"
 msgstr "Шаблон"
 
@@ -17997,15 +17787,16 @@ msgid "Theme exists"
 msgstr "Темата съществува"
 
 #: ../src/prefs_themes.c:553
-#, fuzzy
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
-"Тема със същото име е\n"
-"вече инсталирана на това място"
+"Тема със същото име е вече\n"
+"инсталирана на това място.\n"
+"\n"
+"Да се замени ли?"
 
 #: ../src/prefs_themes.c:559
 #, c-format
@@ -18013,9 +17804,9 @@ msgid "Couldn't delete the old theme in %s."
 msgstr "Грешка при изтриване на старата тема в %s."
 
 #: ../src/prefs_themes.c:567
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't create destination directory %s."
-msgstr "Грешка при създаването на целева директория"
+msgstr "Грешка при създаването на целева папка %s."
 
 #: ../src/prefs_themes.c:580
 msgid "Theme installed successfully."
@@ -18138,7 +17929,7 @@ msgstr "Икона"
 
 #: ../src/prefs_toolbar.c:1042
 msgid "A_dd"
-msgstr ""
+msgstr "_Добавяне"
 
 #: ../src/prefs_toolbar.c:1261 ../src/prefs_toolbar.c:1275
 #: ../src/prefs_toolbar.c:1289
@@ -18166,9 +17957,8 @@ msgid "Mapped event"
 msgstr "Действие"
 
 #: ../src/prefs_toolbar.c:1710
-#, fuzzy
 msgid "Toolbar item icon"
-msgstr "Текст върху лентата с инструменти"
+msgstr ""
 
 #: ../src/prefs_wrapping.c:80
 msgid "Auto wrapping"
@@ -18187,9 +17977,8 @@ msgid "Auto indent"
 msgstr "Автоматичен отстъп"
 
 #: ../src/prefs_wrapping.c:89
-#, fuzzy
 msgid "Wrap text at"
-msgstr "Не е текстова част"
+msgstr "Загръщане на текста на"
 
 #: ../src/prefs_wrapping.c:154
 msgid "Wrapping"
@@ -18236,7 +18025,7 @@ msgstr "Няма налични данни"
 msgid "No recipient keys defined."
 msgstr "Не са указани ключове на получателя."
 
-#: ../src/procmime.c:430 ../src/procmime.c:432 ../src/procmime.c:433
+#: ../src/procmime.c:433 ../src/procmime.c:435 ../src/procmime.c:436
 msgid "[Error decoding BASE64]\n"
 msgstr "[Грешка при BASE64 дешифроване]\n"
 
@@ -18257,9 +18046,9 @@ msgid "Couldn't encrypt the email: %s"
 msgstr "Грешка при шифроването на писмото: %s"
 
 #: ../src/procmsg.c:1697
-#, fuzzy, c-format
+#, c-format
 msgid "Queued message header is broken."
-msgstr "Чакащи писма"
+msgstr "Заглавната част на писмото в опашката е счупена."
 
 #: ../src/procmsg.c:1717
 #, c-format
@@ -18276,12 +18065,11 @@ msgstr ""
 "на SMTP сесията."
 
 #: ../src/procmsg.c:1739
-#, fuzzy
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
-"Грешка при събирането на информация за изпращане. Вероятно писмото не е било "
+"Грешка при определяне на данни за изпращането. Вероятно писмото не е било "
 "създадено с Claws Mail."
 
 #: ../src/procmsg.c:1761
@@ -18373,39 +18161,37 @@ msgstr "местоположение на курсора"
 #. X marks the cursor spot
 #: ../src/quote_fmt.c:69
 msgid "account property: your name"
-msgstr "данни на профила: вашето име"
+msgstr "данни на сметка: вашето име"
 
 #. full name in compose account
 #: ../src/quote_fmt.c:70
 msgid "account property: your email address"
-msgstr "данни на профила: вашата е-поща"
+msgstr "данни на сметка: вашата е-поща"
 
 #. mail address in compose account
 #: ../src/quote_fmt.c:71
 msgid "account property: account name"
-msgstr "данни на профила: име на сметката"
+msgstr "данни на сметка: име на сметката"
 
 #. compose account name itself
 #: ../src/quote_fmt.c:72
 msgid "account property: organization"
-msgstr "данни на профила: вашата организация"
+msgstr "данни на сметка: вашата организация"
 
 #. organization in compose account
 #: ../src/quote_fmt.c:73
-#, fuzzy
 msgid "account property: signature"
-msgstr "данни на профила: вашето име"
+msgstr "данни на сметка: подпис"
 
 #. signature set in account prefs
 #: ../src/quote_fmt.c:74
-#, fuzzy
 msgid "account property: signature path"
-msgstr "данни на профила: вашето име"
+msgstr "данни на сметка: път до подпис"
 
 #. signature path set in account prefs
 #: ../src/quote_fmt.c:75
 msgid "account property: default dictionary"
-msgstr "данни на профила: речник по подразбиране"
+msgstr "данни на сметка: речник по подразбиране"
 
 #. main dict (if enabled) in account
 #: ../src/quote_fmt.c:76
@@ -18455,29 +18241,27 @@ msgid "<span weight=\"bold\">commands:</span>"
 msgstr "<span weight=\"bold\">команди:</span>"
 
 #: ../src/quote_fmt.c:90
-#, fuzzy
 msgid ""
 "insert <span style=\"oblique\">expr</span> if x is set, where x is one of\n"
 "the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "symbols (or their long equivalent)"
 msgstr ""
-"вмъкване <span style=\"oblique\">expr</span> ако x е установен, където x е "
-"един от\n"
-"[dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
-"символи (или техните дълги съответствия)"
+"вмъкване <span style=\"oblique\">expr</span> ако x е зададено, където x "
+"е едно от\n"
+"[dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
+"(или техните дълги съответствия)"
 
 #: ../src/quote_fmt.c:91
-#, fuzzy
 msgid ""
 "insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
 "of\n"
 "the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "symbols (or their long equivalent)"
 msgstr ""
-"вмъкване <span style=\"oblique\">expr</span> ако x не е установен, където x "
-"е един от\n"
-"[dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
-"символи (или техните дълги съответствия)"
+"вмъкване <span style=\"oblique\">expr</span> ако x не е зададено, където x "
+"е едно от\n"
+"[dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
+"(или техните дълги съответствия)"
 
 #: ../src/quote_fmt.c:92
 msgid ""
@@ -18515,15 +18299,15 @@ msgstr ""
 
 #. insert user input
 #: ../src/quote_fmt.c:95
-#, fuzzy
 msgid ""
 "attach file:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
 "to attach"
 msgstr ""
 "вмъкване на файл:\n"
-"<span style=\"oblique\">sub_expr</span> ще се интерпретира като файл за "
-"вмъкване"
+"<span style=\"oblique\">sub_expr</span> ще се интерпретира като път до файла "
+"за "
+"прикрепяне"
 
 #: ../src/quote_fmt.c:97
 msgid "<span weight=\"bold\">definition of terms:</span>"
@@ -18566,9 +18350,8 @@ msgid "The following symbols and commands can be used:"
 msgstr "Следните символи и команди не могат да бъдат използвани:"
 
 #: ../src/quote_fmt.c:173
-#, fuzzy
 msgid "Use template when composing new messages"
-msgstr "Използване на специален формат за новите писма"
+msgstr "Използване на шаблон при писане на нови писма"
 
 #: ../src/quote_fmt.c:197
 msgid ""
@@ -18577,9 +18360,8 @@ msgid ""
 msgstr ""
 
 #: ../src/quote_fmt.c:299
-#, fuzzy
 msgid "Use template when replying to messages"
-msgstr "Използване на специален формат за новите писма"
+msgstr "Използване на шаблон при отговаряне на писма"
 
 #: ../src/quote_fmt.c:323
 msgid "Override From header. This doesn't change the account used to reply."
@@ -18590,9 +18372,8 @@ msgid "Quotation mark"
 msgstr "Знак за цитат"
 
 #: ../src/quote_fmt.c:429
-#, fuzzy
 msgid "Use template when forwarding messages"
-msgstr "Използване на специален формат за новите писма"
+msgstr "Използване на шаблон при препращане на писма"
 
 #: ../src/quote_fmt.c:453
 msgid "Override From header. This doesn't change the account used to forward."
@@ -18658,9 +18439,9 @@ msgid "POP before SMTP"
 msgstr "POP преди SMTP"
 
 #: ../src/send_message.c:361
-#, fuzzy, c-format
+#, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
-msgstr "Свързване към SMTP сървър: %s..."
+msgstr "Сметка \"%s\": Свързване към сървър SMTP: %s:%d..."
 
 #: ../src/send_message.c:418
 msgid "Mail sent successfully."
@@ -18752,7 +18533,6 @@ msgid "%s - Source"
 msgstr "%s - изходен код"
 
 #: ../src/ssl_manager.c:157
-#, fuzzy
 msgid "Saved SSL certificates"
 msgstr "Записани SSL-сертификати"
 
@@ -18923,11 +18703,11 @@ msgid "%s%d copied"
 msgstr "%s%d копирани"
 
 #: ../src/summaryview.c:2650
-#, fuzzy, c-format
+#, c-format
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " избран запис"
-msgstr[1] " избран запис"
+msgstr[1] " избрани записа"
 
 #: ../src/summaryview.c:2668 ../src/summaryview.c:2704
 #, c-format
@@ -18950,29 +18730,41 @@ msgid ""
 "<b>Ignored:</b> %d\n"
 "<b>Watched:</b> %d"
 msgstr ""
+"<b>Обобщение за съобщенията</b>\n"
+"<b>Нови:</b> %d\n"
+"<b>Непрочетени:</b> %d\n"
+"<b>Общо:</b> %d\n"
+"<b>Размер:</b> %s\n"
+"\n"
+"<b>Отбелязани:</b> %d\n"
+"<b>Отговорени:</b> %d\n"
+"<b>Препратени:</b> %d\n"
+"<b>Заключени:</b> %d\n"
+"<b>Пренебрегнати:</b> %d\n"
+"<b>Наблюдавани:</b> %d"
 
 #: ../src/summaryview.c:2699
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d избрани (%s/%s), %d непрочетени"
 
-#: ../src/summaryview.c:2979
+#: ../src/summaryview.c:2981
 msgid "Sorting summary..."
 msgstr "Сортиране на резюмето за съдържание на папката"
 
-#: ../src/summaryview.c:3118
+#: ../src/summaryview.c:3120
 msgid "Setting summary from message data..."
 msgstr "Изграждане на резюме за съдържанието на папката..."
 
-#: ../src/summaryview.c:3323
+#: ../src/summaryview.c:3325
 msgid "(No Date)"
 msgstr "(липсва дата)"
 
-#: ../src/summaryview.c:3375
+#: ../src/summaryview.c:3377
 msgid "(No Recipient)"
 msgstr "(липсва получател)"
 
-#: ../src/summaryview.c:3410
+#: ../src/summaryview.c:3412
 #, c-format
 msgid ""
 "%s\n"
@@ -18981,7 +18773,7 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>От: %s на %s</span>"
 
-#: ../src/summaryview.c:3417
+#: ../src/summaryview.c:3419
 #, c-format
 msgid ""
 "%s\n"
@@ -18990,26 +18782,26 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>До: %s на %s</span>"
 
-#: ../src/summaryview.c:4294
+#: ../src/summaryview.c:4296
 msgid "You're not the author of the article.\n"
 msgstr "Не сте автор на статията.\n"
 
-#: ../src/summaryview.c:4387
+#: ../src/summaryview.c:4389
 #, 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] "Наистина ли искате да изтриете избраното писмо?"
 msgstr[1] "Наистина ли искате да изтриете избраните %d писма?"
 
-#: ../src/summaryview.c:4390
+#: ../src/summaryview.c:4392
 msgid "Delete message(s)"
 msgstr "Изтриване на писмо(-а)"
 
-#: ../src/summaryview.c:4553
+#: ../src/summaryview.c:4555
 msgid "Destination is same as current folder."
 msgstr "Целта съвпадат с текущата папка."
 
-#: ../src/summaryview.c:4652
+#: ../src/summaryview.c:4653
 msgid "Destination to copy is same as current folder."
 msgstr "Изходната и целевата папки на копиране съвпадат."
 
@@ -19085,9 +18877,8 @@ msgid "Watched thread"
 msgstr "Наблюдавана нишка"
 
 #: ../src/summaryview.c:6288
-#, fuzzy
 msgid "Replied but also forwarded - click to see reply"
-msgstr "Отговорено — натиснете за преглед на отговора"
+msgstr "Отговорено и препратено  – натиснете за преглед на отговора"
 
 #: ../src/summaryview.c:6290
 msgid "Replied - click to see reply"
@@ -19117,7 +18908,7 @@ msgstr "Шифрирано"
 msgid "Has attachment(s)"
 msgstr "Има прикрепени файлове"
 
-#: ../src/summaryview.c:7929
+#: ../src/summaryview.c:7932
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19126,11 +18917,11 @@ msgstr ""
 "Грешка при регулярен израз (regexp):\n"
 "%s"
 
-#: ../src/summaryview.c:8034
+#: ../src/summaryview.c:8037
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Връщане към списъка с папките (Имате непрочетени писма)"
 
-#: ../src/summaryview.c:8039
+#: ../src/summaryview.c:8042
 msgid "Go back to the folder list"
 msgstr "Връщане към списъка с папките"
 
@@ -19143,9 +18934,8 @@ msgid "Copy this _link"
 msgstr "Копиране на тази п_репратка"
 
 #: ../src/textview.c:241
-#, fuzzy
 msgid "_Reply to this address"
-msgstr "Копиране на този а_дрес"
+msgstr "_Отговаряне на този адрес"
 
 #: ../src/textview.c:242
 msgid "Add to _Address book"
@@ -19188,9 +18978,8 @@ msgstr ""
 "  Изполвайте "
 
 #: ../src/textview.c:910
-#, fuzzy
 msgid "'Network Log'"
-msgstr "Мрежов _дневник"
+msgstr "Мрежов дневник"
 
 #: ../src/textview.c:911
 msgid " in the Tools menu for more information."
@@ -19215,9 +19004,8 @@ msgstr "\"Запазване като...\""
 
 #: ../src/textview.c:983 ../src/textview.c:995 ../src/textview.c:1007
 #: ../src/textview.c:1017
-#, fuzzy
 msgid " (Shortcut key: '"
-msgstr " (Бърз клавиш: 'y')"
+msgstr " (Бърз клавиш: '"
 
 #: ../src/textview.c:991
 msgid "     - To display as text, select "
@@ -19263,11 +19051,11 @@ msgstr ""
 "    %s\n"
 "Изходен код %d\n"
 
-#: ../src/textview.c:2194
+#: ../src/textview.c:2173
 msgid "Tags: "
 msgstr "Етикети: "
 
-#: ../src/textview.c:2896
+#: ../src/textview.c:2875
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
@@ -19286,24 +19074,22 @@ msgstr ""
 "\n"
 "Продължи с отварянето?"
 
-#: ../src/textview.c:2905
+#: ../src/textview.c:2884
 msgid "Phishing attempt warning"
 msgstr ""
 "Предупреждение за получавене на писмо, изпратено под фалшива самоличност"
 
-#: ../src/textview.c:2906
+#: ../src/textview.c:2885
 msgid "_Open URL"
 msgstr "_Зареждане на URL"
 
 #: ../src/toolbar.c:192 ../src/toolbar.c:1930
-#, fuzzy
 msgid "Receive Mail from all Accounts"
-msgstr "Получаване на поща във всички сметки"
+msgstr "Получаване на поща от всички сметки"
 
 #: ../src/toolbar.c:193 ../src/toolbar.c:1935
-#, fuzzy
 msgid "Receive Mail from current Account"
-msgstr "Получаване на поща в текущата сметка"
+msgstr "Получаване на поща от текущата сметка"
 
 #: ../src/toolbar.c:194 ../src/toolbar.c:1939
 msgid "Send Queued Messages"
@@ -19395,9 +19181,8 @@ msgid "Insert signature"
 msgstr "Добавяне на подпис"
 
 #: ../src/toolbar.c:221 ../src/toolbar.c:2126
-#, fuzzy
 msgid "Replace signature"
-msgstr "Проверка на подписа"
+msgstr "Замяна на подписа"
 
 #: ../src/toolbar.c:222 ../src/toolbar.c:2130
 msgid "Edit with external editor"
@@ -19424,24 +19209,21 @@ msgid "Cancel receiving"
 msgstr "Отмяна на получаването"
 
 #: ../src/toolbar.c:232 ../src/toolbar.c:2171
-#, fuzzy
 msgid "Cancel receiving/sending"
-msgstr "Отмяна на получаването"
+msgstr "Отмяна на получаването и изпращането"
 
 #: ../src/toolbar.c:233 ../src/toolbar.c:1943
 msgid "Close window"
 msgstr "Затваряне на прозореца"
 
 #: ../src/toolbar.c:235
-#, fuzzy
 msgid "Claws Mail Plugins"
-msgstr "Функционалност за действия в Claws Mail "
+msgstr "Приставки на Claws Mail"
 
 #: ../src/toolbar.c:379 ../src/toolbar.c:414
-#, fuzzy
 msgctxt "Toolbar"
 msgid "Trash"
-msgstr "Ленти с инструменти"
+msgstr "Кошче"
 
 #: ../src/toolbar.c:402
 msgid "Folders"
@@ -19453,10 +19235,9 @@ msgstr "Провери поща"
 
 #: ../src/toolbar.c:405
 msgid "Get"
-msgstr ""
+msgstr "Получаване"
 
 #: ../src/toolbar.c:407 ../src/toolbar.c:408
-#, fuzzy
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Писане"
@@ -19466,10 +19247,9 @@ msgid "All"
 msgstr "Всички"
 
 #: ../src/toolbar.c:411
-#, fuzzy
 msgctxt "Toolbar"
 msgid "Sender"
-msgstr "_Лентата с инструменти"
+msgstr "Подател"
 
 #: ../src/toolbar.c:412
 msgid "List"
@@ -19492,9 +19272,8 @@ msgid "Insert sig."
 msgstr "Добавяне на подпис"
 
 #: ../src/toolbar.c:430
-#, fuzzy
 msgid "Replace sig."
-msgstr "Замяна с..."
+msgstr "Замяна на подпис"
 
 #: ../src/toolbar.c:431
 msgid "Edit"
@@ -19513,9 +19292,8 @@ msgid "Stop"
 msgstr "Спиране"
 
 #: ../src/toolbar.c:437
-#, fuzzy
 msgid "Stop all"
-msgstr "Спиране"
+msgstr "Спиране на всичко"
 
 #: ../src/toolbar.c:897
 msgid "Compose News message"
@@ -19538,14 +19316,12 @@ msgid "Go to folder list"
 msgstr "Към списъка с папки"
 
 #: ../src/toolbar.c:1931
-#, fuzzy
 msgid "Receive Mail from selected Account"
-msgstr "Получаване на писмо в избраната сметка"
+msgstr "Получаване на поща от избраната сметка"
 
 #: ../src/toolbar.c:1947
-#, fuzzy
 msgid "Open preferences"
-msgstr "Настройки"
+msgstr "Отваряне на настройките"
 
 #: ../src/toolbar.c:1958
 msgid "Compose with selected Account"
@@ -19781,21 +19557,16 @@ msgid "Use authentication"
 msgstr "Използване на идентификация"
 
 #: ../src/wizard.c:1118
-#, fuzzy
 msgid "<span size=\"small\">(empty to use the same as receive)</span>"
-msgstr ""
-"SMTP потребителско име:\n"
-"<span size=\"small\">(оставете непопълнено, за да използвате същато, като "
-"при входящия сървър)</span>"
+msgstr "<span size=\"small\">(празно за същото като при получаване)</span>"
 
 #: ../src/wizard.c:1132
 msgid "SMTP username:"
-msgstr ""
+msgstr "Потребителско име за SMTP:"
 
 #: ../src/wizard.c:1143
-#, fuzzy
 msgid "SMTP password:"
-msgstr "Парола:"
+msgstr "Парола за SMTP:"
 
 #: ../src/wizard.c:1156
 msgid "Use SSL to connect to SMTP server"
@@ -19911,406 +19682,3 @@ msgid ""
 msgstr ""
 "Програмата е готова\n"
 "Натиснете \"Запазване\""
-
-#~ msgctxt "For use by strftime (default date+time format)"
-#~ msgid "%a %b %e %H:%M:%S %Y"
-#~ msgstr "%A %e %B %Y %H:%M:%S"
-
-#~ msgctxt "For use by strftime (default date format)"
-#~ msgid "%m/%d/%y"
-#~ msgstr "%d.%m.%Y"
-
-#~ msgctxt "For use by strftime (default time format)"
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgctxt "For use by strftime (default 12-hour time format)"
-#~ msgid "%I:%M:%S %p"
-#~ msgstr "%I:%M:%S %p"
-
-#~ msgid "More plugins are available from the Claws Mail website."
-#~ msgstr "Още приставки може да намерите на уеб-страницата ва Claws Mail."
-
-#~ msgid "`%c' can't be included in folder name."
-#~ msgstr "`%c' не може да присъства в име на папка."
-
-#~ msgid "Claws Mail: %d new message"
-#~ msgid_plural "Claws Mail: %d new messages"
-#~ msgstr[0] "Claws Mail: %d ново писмо"
-#~ msgstr[1] "Claws Mail: %d нови писма"
-
-#~ msgid "Unable to connect: you are offline."
-#~ msgstr "Свързването невъзможно. Програмата е в изключен режим."
-
-#~ msgid "Exiting..."
-#~ msgstr "Излизане..."
-
-#~ msgid "No registered viewer for this file type."
-#~ msgstr "Няма регистрирана програма за този вид файлове."
-
-#, fuzzy
-#~ msgid "Skip quoted lines"
-#~ msgstr "Пропускане на тези правила"
-
-#, fuzzy
-#~ msgid "Skip signature"
-#~ msgstr "Подпис"
-
-#~ msgid "Select ..."
-#~ msgstr "Избиране ..."
-
-#, fuzzy
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ " %s"
-#~ msgstr "Грешка при подписването, %s"
-
-#, fuzzy
-#~ msgid "Filename is null."
-#~ msgstr "Име на файла:"
-
-#, fuzzy
-#~ msgid "Conversion to postscript failed."
-#~ msgstr "Връзката с %s:%d е прекъсната."
-
-#, fuzzy
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Грешка при автентификацията:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Proxy Setting"
-#~ msgstr "Установяване на пощенската кутия"
-
-#, fuzzy
-#~ msgid "Auto-Load images"
-#~ msgstr "Зареждане на изображение"
-
-#, fuzzy
-#~ msgid "Block external content"
-#~ msgstr "Изтриване съдържанието на записа"
-
-#, fuzzy
-#~ msgid "The mailbox `%s' already exists."
-#~ msgstr "Пощенска кутия \"%s\" вече съществува."
-
-#, fuzzy
-#~ msgid "The folder `%s' already exists."
-#~ msgstr "Папката \"%s\" вече съществува."
-
-#, fuzzy
-#~ msgid "Can't create the folder `%s'."
-#~ msgstr "Грешка при създаване на папката \"%s\"."
-
-#, fuzzy
-#~ msgid ""
-#~ "Really remove the mailbox `%s' ?\n"
-#~ "(The messages are NOT deleted from the disk)"
-#~ msgstr ""
-#~ "Наистина ли да се махне кутията \"%s\"?\n"
-#~ "(Писмата не се изтриват от диска)"
-
-#, fuzzy
-#~ msgid "Can't remove the folder `%s'."
-#~ msgstr "Грешка при премахване на папката \"%s\"."
-
-#, fuzzy
-#~ msgid "Input new name for `%s':"
-#~ msgstr "Въведете ново име за \"%s\":"
-
-#, fuzzy
-#~ msgid "Newmail plugin unloaded\n"
-#~ msgstr "%s (приставката не е заредена)"
-
-#, fuzzy
-#~ msgid "Generate X-Mailer header"
-#~ msgstr "Създаване на нова двойка ключове"
-
-#~ msgid "Replace"
-#~ msgstr "Замяна"
-
-#, fuzzy
-#~ msgid "Blink LED"
-#~ msgstr "DN за свързване"
-
-#~ msgid "Play sound"
-#~ msgstr "Възпроизвеждане на звук"
-
-#, fuzzy
-#~ msgid "on external memory card"
-#~ msgstr "Вградена тема по подразбиране"
-
-#, fuzzy
-#~ msgid "on internal memory card"
-#~ msgstr "Вградена тема по подразбиране"
-
-#~ msgid "<span weight=\"bold\">Store data</span>"
-#~ msgstr "<span weight=\"bold\">Запазване на данните</span>"
-
-#~ msgid "Dillo Browser"
-#~ msgstr "Уеб-четец Dillo"
-
-#~ msgid "Load remote links in mails"
-#~ msgstr "Да се зареждат отдалечени препратки в писмата"
-
-#~ msgid "Equivalent to Dillo's '--local' option"
-#~ msgstr "Равнозначно на настройката на Dillo '--local'"
-
-#, fuzzy
-#~ msgid "You can still load remote links by reloading the page"
-#~ msgstr "Да не се зареждат отдалечени препратки в писмата"
-
-#, fuzzy
-#~ msgid "Only for senders found in address book/folder"
-#~ msgstr "Показване на подателя според адресника"
-
-#~ msgid "Full window mode (hide controls)"
-#~ msgstr "Режим на пълен екран (скриване на бутоните)"
-
-#~ msgid "Equivalent to Dillo's '--fullwindow' option"
-#~ msgstr "Равнозначно на настройката на Dillo '--fullwindow'"
-
-#~ msgid "Dillo HTML Viewer"
-#~ msgstr "Преглед на HTML с Dillo"
-
-#~ msgid "Trayicon"
-#~ msgstr "Икона в системния панел"
-
-#, fuzzy
-#~ msgid "Claws Mail"
-#~ msgstr "Относно Claws Mail"
-
-#, fuzzy
-#~ msgid "Failed to register close hook"
-#~ msgstr "Грешка при създаване на папката"
-
-#~ msgid "Hide Claws Mail at start-up"
-#~ msgstr "Скриване на програмата при зареждане"
-
-#~ msgid "Minimize to tray"
-#~ msgstr "Минимизиране в системния панел"
-
-#~ msgid ""
-#~ "Command could not be started. Pipe creation failed.\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Грешка при стартирането на командата. Каналът не може да бъде създаден.\n"
-#~ "%s"
-
-#~ msgid "Preparing pages..."
-#~ msgstr "Подготвяне на страниците..."
-
-#~ msgid "Rendering page %d of %d..."
-#~ msgstr "Показване на страница %d от общо %d..."
-
-#~ msgid "Printing page %d of %d..."
-#~ msgstr "Печат на страница %d от общо %d..."
-
-#~ msgid "Page %N of %Q"
-#~ msgstr "Страница %N от %Q"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1999-2009\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1999-2009\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "и екипът на Claws Mail"
-
-#~ msgid ""
-#~ "Copyright (C) 1999-2009\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-#~ msgstr ""
-#~ "Copyright (C) 1999-2009\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "и екипът на Claws Mail"
-
-#~ msgid "Change dictionary"
-#~ msgstr "Смяна на речника"
-
-#~ msgid "Configuration options for the print job"
-#~ msgstr "Настройки на печатането"
-
-#~ msgid "Tabs Width"
-#~ msgstr "Широчина на табулациите"
-
-#~ msgid "Wrap Mode"
-#~ msgstr "Режим на загръщане"
-
-#~ msgid "Word wrapping mode"
-#~ msgstr "Режим на загръщане на думите"
-
-#~ msgid "Highlight"
-#~ msgstr "Открояване"
-
-#~ msgid "Font"
-#~ msgstr "Шрифт"
-
-#~ msgid "Numbers Font"
-#~ msgstr "Шрифт за цифрите"
-
-#~ msgid "Print Line Numbers"
-#~ msgstr "Отпечатване на номера на редове"
-
-#~ msgid " Clear "
-#~ msgstr " Изчистване "
-
-#~ msgid " Extended Symbols... "
-#~ msgstr " Допълнителни символи... "
-
-#~ msgid "Info"
-#~ msgstr "Данни"
-
-#~ msgid "Unknown SSL Certificate"
-#~ msgstr "Непознат SSL-сертификат"
-
-#~ msgid "Expired SSL Certificate"
-#~ msgstr "Изтекъл SSL-сертификат"
-
-#~ msgid "Changed SSL Certificate"
-#~ msgstr "Променен SSL-сертификат"
-
-#~ msgid "Connecting to IMAP4 server %s...\n"
-#~ msgstr "Свързване към IMAP4 сървър %s...\n"
-
-#~ msgid "Last read message"
-#~ msgstr "Последно прочетено писмо"
-
-#~ msgid "_all"
-#~ msgstr "_всички"
-
-#~ msgid "_sender"
-#~ msgstr "_подател"
-
-#~ msgid "_Fold all"
-#~ msgstr "Сгъване на _всички"
-
-#~ msgid "by _Date"
-#~ msgstr "по _дата"
-
-#~ msgid "by _From"
-#~ msgstr "по по_дател"
-
-#~ msgid "by _To"
-#~ msgstr "по _получател"
-
-#~ msgid "by S_ubject"
-#~ msgstr "по _относно"
-
-#~ msgid "by Tag"
-#~ msgstr "по етикет"
-
-#~ msgid "by _Mark"
-#~ msgstr "по _отбелязване"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the print command-line:\n"
-#~ "('%s' will be replaced with file name)"
-#~ msgstr ""
-#~ "Въведете аргументите за следното действие:\n"
-#~ "('%%h' ще бъде заместен с аргумента)\n"
-#~ "  %s"
-
-#~ msgid "_Open (l)"
-#~ msgstr "_Отваряне (|)"
-
-#~ msgid "Open _with (o)..."
-#~ msgstr "Отваряне _с (o)..."
-
-#~ msgid "_Display as text (t)"
-#~ msgstr "_Показване като текст (t)"
-
-#~ msgid "_Save as (y)..."
-#~ msgstr "_Запазване като (y)..."
-
-#, fuzzy
-#~ msgid "creating NNTP connection to %s:%d ...\n"
-#~ msgstr "Връзката с %s:%d е прекъсната."
-
-#~ msgid "Trust key"
-#~ msgstr "Доверяване на ключа"
-
-#~ msgid "Orientation"
-#~ msgstr "Ориентация"
-
-#~ msgid "Insert signature automatically"
-#~ msgstr "Автоматично добавяне на подпис"
-
-#~ msgid "Info..."
-#~ msgstr "Данни..."
-
-#~ msgid "From file..."
-#~ msgstr "От файл..."
-
-#~ msgid "Print command"
-#~ msgstr "Команда за печатане"
-
-#~ msgid "Test RegExp"
-#~ msgstr "Изпробване на регулярния израз"
-
-#~ msgid "Default To:"
-#~ msgstr "Получател по подразбиране:"
-
-#~ msgid "Default Cc:"
-#~ msgstr "Копие по подразбиране:"
-
-#~ msgid "Default Bcc:"
-#~ msgstr "Скрито копие по подразбиране:"
-
-#, fuzzy
-#~ msgid "Default Reply-to:"
-#~ msgstr "Получател по подразбиране:"
-
-#~ msgid "Quotation characters"
-#~ msgstr "Цитиращи символи"
-
-#~ msgid " Symbols... "
-#~ msgstr " Символи... "
-
-#~ msgid "Main toolbar configuration"
-#~ msgstr "Настройки на основната лента с инструменти"
-
-#~ msgid "Compose toolbar configuration"
-#~ msgstr "Настройка на лентата с инструменти Писане"
-
-#~ msgid "Message view toolbar configuration"
-#~ msgstr "Настройка на лентата с инструменти Преглед на писмо"
-
-#~ msgid "Wrap messages at"
-#~ msgstr "Загръщане на текста на писмото до"
-
-#~ msgid "Description of symbols..."
-#~ msgstr "Описание на символите..."
-
-#~ msgid " items selected"
-#~ msgstr " избрани записа"
-
-#~ msgid "'View Log'"
-#~ msgstr "\"Преглед на дневника\""
-
-#~ msgid " (Shortcut key: 't')"
-#~ msgstr " (Бърз клавиш: 't')"
-
-#~ msgid " (Shortcut key: 'l')\n"
-#~ msgstr " (Бърз клавиш: 'l'),\n"
-
-#~ msgid " (Shortcut key: 'o')"
-#~ msgstr " (Бърз клавиш: 'o')"
-
-#~ msgid ""
-#~ "SMTP password:\n"
-#~ "<span size=\"small\">(empty to use the same as receive)</span>"
-#~ msgstr ""
-#~ "SMTP парола:\n"
-#~ "<span size=\"small\">(оставете непопълнено, за да използвате същата, като "
-#~ "при входящия сървър)</span>"
diff --git a/po/de.po b/po/de.po
index ab2678d..5cff4a0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,9 +3,9 @@
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
-# Thomas Bellmann <ThomasBellmann at gmx.net>, 2012, 2013, 2014
-# Marc Arens <marens at marens.eu>, 2009
+# Thomas Bellmann <ThomasBellmann at gmx.net>, 2012-2014
 # Stephan Sachse <white at dev-zero.com>, 2005-2010
+# Marc Arens <marens at marens.eu>, 2009
 # Thomas Gilgin <thg1 at karate-muellheim.de>, 2004, 2005
 # Hubert Gilgin, 2004
 # Jens Oberender <j.obi at troja.net>, 2003, 2004
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2014-06-13 03:15+0400\n"
-"PO-Revision-Date: 2014-05-30 13:10+0100\n"
-"Last-Translator: nadar <thenadar at gmx.net>\n"
+"POT-Creation-Date: 2014-10-13 22:26+0200\n"
+"PO-Revision-Date: 2014-10-18 16:29+0100\n"
+"Last-Translator: Thomas Bellmann <ThomasBellmann at gmx.net>\n"
 "Language-Team: Thomas Bellmann <ThomasBellmann at gmx.net>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -25,34 +25,211 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-Bookmarks: 2990,1708,-1,2647,2658,2696,2793,-1,-1,-1\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.9\n"
+
+#: ../claws-mail.desktop.in.h:1
+msgid "E-mail client"
+msgstr "Email-Programm"
+
+#: ../claws-mail.desktop.in.h:2
+msgid "Lightweight and Fast GTK+ based Mail Client"
+msgstr "Schlankes und sehr schnelles GTK+-basiertes Email-Programm"
 
-#: ../claws-mail.appdata.xml.in.h:1
-#, fuzzy
+#: ../claws-mail.desktop.in.h:3
+msgid "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
+msgstr "schlank;schnell;gui;erweiterbar;plugin;pop;pop3;imap;imap4;nntp;news"
+
+#: ../appdata/claws-mail.appdata.xml.in.h:1
 msgid "Claws Mail is a fast, powerful and very extensible email client."
-msgstr "Claws Mail wurde als Standardanwendung eingetragen."
+msgstr ""
+"Claws Mail ist ein schnelles, mächtiges und enorm konfigurierbares Email-"
+"Programm"
 
-#: ../claws-mail.appdata.xml.in.h:2
+#: ../appdata/claws-mail.appdata.xml.in.h:2
 msgid ""
 "It is highly configurable and handles hundreds of thousands of emails "
 "easily. Messages are managed in an open format, and are easy to interact "
 "with."
 msgstr ""
+"Es ist stark konfigurierbar und handhabt problemlos hunderttausende Emails. "
+"Nachrichten werden in einem offenen Format verarbeitet und können einfach "
 
-#: ../claws-mail.appdata.xml.in.h:3
+#: ../appdata/claws-mail.appdata.xml.in.h:3
 msgid ""
 "Lots of extra functionality is provided by plugins, such as PGP signatures "
 "and encryption, an RSS aggregator, a calendar, powerful spam filtering, Perl "
 "and Python interactions, HTML and PDF rendering, and more."
 msgstr ""
+"Eine Menge zusätzlicher Funktionen werden durch Plugins bereitgestellt, "
+"beispielsweise PGP-Signaturen und -Verschlüsselung, ein RSS-Aggregator, ein "
+"Kalender, mächtige Spam-Filter, Integration von Perl und Python, Darstellung "
+"von HTML- und PDF-Inhalten und Etliches mehr."
 
-#: ../claws-mail.desktop.in.h:1
-msgid "E-mail client"
+#: ../appdata/claws-mail-acpi_notifier.metainfo.xml.in.h:1
+msgid "Enables mail notification via LEDs on some laptops"
 msgstr ""
+"Zeigt auf manchen Laptops mithilfe von LEDs neue Mails im Posteingang an"
 
-#: ../claws-mail.desktop.in.h:2
-msgid "Lightweight and Fast GTK+ based Mail Client"
+#: ../appdata/claws-mail-address_keeper.metainfo.xml.in.h:1
+msgid ""
+"Allows saving outgoing addresses to a designated folder in the address book"
+msgstr ""
+"Erlaubt das Speichern von Adressen versendeter Mails in einem definierten "
+"Ordner im Adressbuch"
+
+#: ../appdata/claws-mail-archive.metainfo.xml.in.h:1
+msgid "Allows to make tars or zips of old folders"
+msgstr "Packt alte Ordner als .tar- oder .zip-Datei"
+
+#: ../appdata/claws-mail-att_remover.metainfo.xml.in.h:1
+msgid "Lets you remove attachments from emails"
+msgstr "Entfernt Anhänge von Emails"
+
+#: ../appdata/claws-mail-attachwarner.metainfo.xml.in.h:1
+msgid ""
+"Warns when a message mentioning an attachment in the message body without "
+"attaching any files"
+msgstr ""
+"Warnt, wenn in einer Nachricht ein Anhang erwähnt wird, aber keine Datei "
+"angehängt ist."
+
+#: ../appdata/claws-mail-bogofilter.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using Bogofilter"
+msgstr ""
+"Überprüft alle über IMAP-, LOCAL- oder POP-Konten kommenden Nachrichten auf "
+"SPAM unter der Verwendung von Bogofilter"
+
+#: ../appdata/claws-mail-bsfilter.metainfo.xml.in.h:1
+msgid ""
+"Check all messages that are received from an IMAP, LOCAL or POP account for "
+"spam using Bsfilter"
+msgstr ""
+"Überprüft alle über IMAP-, LOCAL- oder POP-Konten kommenden Nachrichten auf "
+"SPAM unter der Verwendung von Bsfilter"
+
+#: ../appdata/claws-mail-clamd.metainfo.xml.in.h:1
+msgid ""
+"Scans all messages that are received from an IMAP, LOCAL or POP account "
+"using clamd (Clam AV)"
+msgstr ""
+"Überprüft alle über IMAP-, LOCAL- oder POP-Konten kommenden Nachrichten auf "
+"Viren unter der Verwendung von clamd (ClamAV)"
+
+#: ../appdata/claws-mail-fancy.metainfo.xml.in.h:1
+msgid "Renders HTML e-mail using the WebKit library"
+msgstr "Zeigt HTML Emails mithilfe der WebKit-Bibliothek an"
+
+#: ../appdata/claws-mail-fetchinfo.metainfo.xml.in.h:1
+msgid ""
+"Inserts headers containing: UIDL, Claws' account name, POP server, user ID "
+"and retrieval time"
+msgstr ""
+"Ergänzt folgende Kopfzeilen: UIDL, Name des Claws Mail-Kontos, POP-Server, "
+"Benutzer-ID und Zeitpunkt des Herunterladens."
+
+#: ../appdata/claws-mail-gdata.metainfo.xml.in.h:1
+msgid "Provides an interface to Google services"
+msgstr "Stellt eine Schnittstelle zu Googles Diensten bereit"
+
+#: ../appdata/claws-mail-geolocation.metainfo.xml.in.h:1
+msgid "Provides GeoLocation functionality"
+msgstr "Stellt GeoLocation-Funktionen bereit"
+
+#: ../appdata/claws-mail-libravatar.metainfo.xml.in.h:1
+msgid ""
+"Displays libravatar/gravatar profiles' images or a dynamically generated or "
+"predefined alternative"
+msgstr ""
+"Zeigt libravatar/gravatar-Profilbilder an beziehungsweise dynamisch "
+"generierte oder vordefinierte Alternativen."
+
+#: ../appdata/claws-mail-mailmbox.metainfo.xml.in.h:1
+msgid "Direct support for mailboxes in mbox format"
+msgstr "Direkte Unterstützung von Mailboxen im mbox-Format"
+
+#: ../appdata/claws-mail-newmail.metainfo.xml.in.h:1
+msgid ""
+"Writes a msg header summary to a log file on arrival of new mail after "
+"sorting"
+msgstr ""
+"Schreibt nach dem Empfang neuer Nachrichten eine Zusammenfassung der "
+"Kopfzeilen in eine Logdatei"
+
+#: ../appdata/claws-mail-notification.metainfo.xml.in.h:1
+msgid "Provides various ways to notify the user of new and unread email"
+msgstr ""
+"Informiert den Nutzer auf verschiedene Arten über neue und ungelesene "
+"Nachrichten"
+
+#: ../appdata/claws-mail-pdf_viewer.metainfo.xml.in.h:1
+msgid ""
+"Enables the viewing of PDF and PostScript attachments using the Poppler "
+"library and GhostScript"
+msgstr ""
+"Zeigt PDF- und PostScript-Anhängen mithilfe der Poppler-Bibliothek und "
+"GhostScript an."
+
+#: ../appdata/claws-mail-perl.metainfo.xml.in.h:1
+msgid "Allowing the use of full Perl power in email filters"
+msgstr "Stellt die ganze Kraft von Perl für Email-Filter bereit"
+
+#: ../appdata/claws-mail-pgpcore.metainfo.xml.in.h:1
+msgid ""
+"Handles core PGP functions and is a dependency of both the PGP/Inline and "
+"PGP/MIME plugins."
+msgstr ""
+"Stellt Kernfunktionen von PGP zur Verfügung und ist eine Abhängigkeit der "
+"Plugins PGP/Inline und PGP/MIME"
+
+#: ../appdata/claws-mail-pgpinline.metainfo.xml.in.h:1
+msgid "Handles PGP/Inline signed and/or encrypted mails"
+msgstr "Verarbeitet PGP/Inline signierte und/oder verschlüsselte Emails"
+
+#: ../appdata/claws-mail-pgpmime.metainfo.xml.in.h:1
+msgid "Handles PGP/MIME signed and/or encrypted mails"
+msgstr "Verarbeitet PGP/MIME signierte und/oder verschlüsselte Emails"
+
+#: ../appdata/claws-mail-python.metainfo.xml.in.h:1
+msgid ""
+"Offers a Python scripting. Code can be entered into an embedded Python "
+"console or stored"
+msgstr ""
+"Ermöglicht Python-Scripting. Code kann in einer eingebetteten Kommandozeile "
+"eingegeben oder gespeichert werden"
+
+#: ../appdata/claws-mail-rssyl.metainfo.xml.in.h:1
+msgid "Read your RSS favourite newsfeeds"
+msgstr "Lesen Sie Ihre RSS.Feeds"
+
+#: ../appdata/claws-mail-smime.metainfo.xml.in.h:1
+msgid "Handles S/MIME signed and/or encrypted mails"
+msgstr "Verarbeitet S/MIME signierte und/oder verschlüsselte Emails"
+
+#: ../appdata/claws-mail-spam_report.metainfo.xml.in.h:1
+msgid "Reports spam to various places"
+msgstr "Meldet Spam an verschiedene Stellen"
+
+#: ../appdata/claws-mail-spamassassin.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using SpamAssassin"
+msgstr ""
+"Überprüft alle über IMAP-, LOCAL- oder POP-Konten kommenden Nachrichten auf "
+"SPAM unter der Verwendung von SpamAssassin"
+
+#: ../appdata/claws-mail-tnef_parse.metainfo.xml.in.h:1
+msgid "Enables reading application/ms-tnef attachments"
+msgstr "Liest Anhänge des application/ms-tnef-Typs"
+
+#: ../appdata/claws-mail-vcalendar.metainfo.xml.in.h:1
+msgid ""
+"Enables vCalendar message handling and handles webCal subscriptions. "
+"Provides a calendar import"
 msgstr ""
+"Ermöglicht die Handhabung von vCalendar-Nacrichten und webCal-Abonnements. "
+"Verfügt über einen Kalender-Import"
 
 # in General: maybe should unify "receive, retrieve" when translating into german.
 # (maybe) todo: replace "Protokoll-Datei" by "Log-Datei"; "Stylesheet" by "..?"; "free/busy" by "..?"
@@ -60,10 +237,10 @@ msgstr ""
 # "message body" -> "Textkörper" or "Nachrichtenkörper"?
 # "failed" -> "schlug fehl" or "fehlgeschlagen"?
 #
-#: ../src/account.c:392
+#: ../src/account.c:392 ../src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
+"Please close all the composing windows before editing accounts."
 msgstr ""
 "Einige Editor-Fenster sind geöffnet.\n"
 "Bitte schließen Sie alle Editor-Fenster vor dem Bearbeiten der Konten."
@@ -72,11 +249,11 @@ msgstr ""
 msgid "Can't create folder."
 msgstr "Ordner kann nicht erstellt werden."
 
-#: ../src/account.c:717
+#: ../src/account.c:724
 msgid "Edit accounts"
 msgstr "Konten bearbeiten"
 
-#: ../src/account.c:734
+#: ../src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -86,44 +263,44 @@ msgstr ""
 "Das Kontrollkästchen zeigt an, welche Konten einbezogen sind. Fette Schrift "
 "markiert das Standardkonto."
 
-#: ../src/account.c:805
+#: ../src/account.c:812
 msgid " _Set as default account "
 msgstr "_Als Standardkonto setzen"
 
-#: ../src/account.c:897
+#: ../src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Konten mit ferngelegenen Ordnern sind nicht kopierbar."
 
 #. copy fields
-#: ../src/account.c:904
+#: ../src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopie von %s"
 
-#: ../src/account.c:1064
+#: ../src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Möchten Sie das Konto '%s' wirklich löschen?"
 
-#: ../src/account.c:1066
+#: ../src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Unbenannt)"
 
-#: ../src/account.c:1067
+#: ../src/account.c:1074
 msgid "Delete account"
 msgstr "Konto löschen"
 
-#: ../src/account.c:1537
+#: ../src/account.c:1544
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: ../src/account.c:1543
+#: ../src/account.c:1550
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Abrufen' holt Nachrichten von den gewählten Konten ab"
 
-#: ../src/account.c:1550 ../src/addrduplicates.c:471 ../src/addressadd.c:215
-#: ../src/addressbook.c:125 ../src/compose.c:7144 ../src/editaddress.c:1263
+#: ../src/account.c:1557 ../src/addrduplicates.c:471 ../src/addressadd.c:215
+#: ../src/addressbook.c:125 ../src/compose.c:7148 ../src/editaddress.c:1263
 #: ../src/editaddress.c:1320 ../src/editaddress.c:1340
 #: ../src/editaddress_other_attributes_ldap.c:302
 #: ../src/editaddress_other_attributes_ldap.c:350 ../src/editbook.c:170
@@ -131,16 +308,16 @@ msgstr "'Abrufen' holt Nachrichten von den gewählten Konten ab"
 #: ../src/editvcard.c:173 ../src/importmutt.c:223 ../src/importpine.c:222
 #: ../src/mimeview.c:275 ../src/plugins/pdf_viewer/poppler_viewer.c:1797
 #: ../src/plugins/pgpcore/select-keys.c:396 ../src/prefs_filtering.c:384
-#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:78
+#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:79
 msgid "Name"
 msgstr "Name"
 
-#: ../src/account.c:1558 ../src/prefs_account.c:1103
+#: ../src/account.c:1565 ../src/prefs_account.c:1103
 #: ../src/prefs_account.c:4058
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/account.c:1566 ../src/ssl_manager.c:102
+#: ../src/account.c:1573 ../src/ssl_manager.c:102
 msgid "Server"
 msgstr "Server"
 
@@ -192,8 +369,8 @@ msgstr ""
 "%s"
 
 #: ../src/action.c:990 ../src/ldaputil.c:326
-#: ../src/plugins/bogofilter/bogofilter.c:876 ../src/plugins/rssyl/feed.c:1739
-#: ../src/plugins/rssyl/feed.c:1743 ../src/plugins/tnef_parse/tnef_parse.c:67
+#: ../src/plugins/bogofilter/bogofilter.c:876
+#: ../src/plugins/tnef_parse/tnef_parse.c:67
 #: ../src/plugins/vcalendar/vcal_folder.c:1803
 #: ../src/plugins/vcalendar/vcal_folder.c:1807
 #: ../src/plugins/vcalendar/vcal_folder.c:1818
@@ -250,24 +427,21 @@ msgid "Action's user argument"
 msgstr "Benutzerargument der Aktion"
 
 #: ../src/addrclip.c:479
-#, fuzzy
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr "Ein Ordner ist nicht in untergeordnete Ordner kopierbar."
 
 #: ../src/addrclip.c:502
-#, fuzzy
 msgid "Cannot copy an address book to itself."
-msgstr "Einfügen schlug fehl, da das Zieladressbuch nur lesbar ist."
+msgstr "Ein Adressbuch kann nicht in sich selbst kopiert werden."
 
 #: ../src/addrclip.c:593
-#, fuzzy
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
-"Ein Ordner kann nicht in einen seiner untergeordneten Ordner verschoben "
-"werden."
+"Ein Ordner kann nicht in sich selbst oder in einen seiner untergeordneten "
+"Ordner verschoben werden."
 
 #. that's a group
-#: ../src/addr_compl.c:620 ../src/addressbook.c:4866
+#: ../src/addr_compl.c:685 ../src/addressbook.c:4866
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "Gruppe"
@@ -342,14 +516,14 @@ msgstr ""
 
 #: ../src/addrcustomattr.c:212 ../src/addressbook.c:435
 #: ../src/addressbook.c:463 ../src/addressbook.c:480 ../src/edittags.c:272
-#: ../src/plugins/archive/archiver_gtk.c:1193 ../src/prefs_actions.c:1090
-#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1099
+#: ../src/plugins/archive/archiver_gtk.c:1194 ../src/prefs_actions.c:1090
+#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1119
 msgid "_Delete"
 msgstr "_Löschen"
 
 #: ../src/addrcustomattr.c:213 ../src/edittags.c:273
 #: ../src/prefs_actions.c:1091 ../src/prefs_filtering.c:1694
-#: ../src/prefs_template.c:1100
+#: ../src/prefs_template.c:1120
 msgid "Delete _all"
 msgstr "_alle Löschen"
 
@@ -448,7 +622,7 @@ msgid "Select Address Book Folder"
 msgstr "Adressbuchordner auswählen"
 
 #: ../src/addressadd.c:485 ../src/editaddress.c:1582 ../src/headerview.c:281
-#: ../src/textview.c:2064
+#: ../src/textview.c:2043
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -479,17 +653,17 @@ msgstr "Adressb_uch"
 
 #. {"Address/---",			NULL, "---", NULL, NULL, NULL },
 #: ../src/addressbook.c:403 ../src/addressbook.c:434 ../src/addressbook.c:462
-#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:504
+#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:506
 #: ../src/messageview.c:210
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:507
+#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:509
 #: ../src/messageview.c:213
 msgid "_Tools"
 msgstr "E_xtras"
 
-#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:509
+#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:511
 #: ../src/messageview.c:214
 msgid "_Help"
 msgstr "_Hilfe"
@@ -547,7 +721,7 @@ msgstr "_Ausschneiden"
 
 #. Edit menu
 #: ../src/addressbook.c:431 ../src/addressbook.c:470 ../src/addressbook.c:486
-#: ../src/compose.c:610 ../src/mainwindow.c:538 ../src/messageview.c:226
+#: ../src/compose.c:610 ../src/mainwindow.c:540 ../src/messageview.c:226
 msgid "_Copy"
 msgstr "_Kopieren"
 
@@ -603,7 +777,7 @@ msgid "Edit custom attributes..."
 msgstr "Nutzerdefinierte Angaben..."
 
 #. Help menu
-#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:801
+#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:803
 #: ../src/messageview.c:339
 msgid "_About"
 msgstr "Ü_ber"
@@ -613,9 +787,10 @@ msgid "_Browse Entry"
 msgstr "Eintrag ü_berfliegen"
 
 #. then add the appointment
-#: ../src/addressbook.c:504 ../src/crash.c:454 ../src/crash.c:473
+#: ../src/addressbook.c:504 ../src/crash.c:457 ../src/crash.c:476
 #: ../src/importldif.c:115 ../src/plugins/pgpcore/select-keys.c:251
-#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/vcalendar/day-view.c:402
+#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/pgpcore/sgpgme.c:168
+#: ../src/plugins/vcalendar/day-view.c:402
 #: ../src/plugins/vcalendar/month-view.c:428 ../src/prefs_themes.c:707
 #: ../src/prefs_themes.c:739 ../src/prefs_themes.c:740
 msgid "Unknown"
@@ -721,7 +896,7 @@ msgstr "Strenge(re) Authentifizierung erforderlich"
 msgid "Sources"
 msgstr "Quellen"
 
-#: ../src/addressbook.c:914 ../src/prefs_matcher.c:629
+#: ../src/addressbook.c:914 ../src/prefs_matcher.c:632
 #: ../src/prefs_other.c:475 ../src/toolbar.c:225 ../src/toolbar.c:2142
 msgid "Address book"
 msgstr "Adressbuch"
@@ -772,7 +947,7 @@ msgstr ""
 
 #: ../src/addressbook.c:2921 ../src/imap_gtk.c:363 ../src/mh_gtk.c:202
 #: ../src/plugins/mailmbox/plugin_gtk.c:324
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:236
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:152
 #: ../src/plugins/vcalendar/vcal_folder.c:1966
 msgid "Delete folder"
 msgstr "Ordner löschen"
@@ -936,10 +1111,10 @@ msgstr "LDAP-Anfrage"
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:443
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:490
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:613
-#: ../src/prefs_matcher.c:672 ../src/prefs_matcher.c:707
-#: ../src/prefs_matcher.c:1607 ../src/prefs_matcher.c:1614
-#: ../src/prefs_matcher.c:1622 ../src/prefs_matcher.c:1624
-#: ../src/prefs_matcher.c:2504 ../src/prefs_matcher.c:2508
+#: ../src/prefs_matcher.c:675 ../src/prefs_matcher.c:710
+#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:1626
+#: ../src/prefs_matcher.c:1634 ../src/prefs_matcher.c:1636
+#: ../src/prefs_matcher.c:2524 ../src/prefs_matcher.c:2528
 msgid "Any"
 msgstr "Alle"
 
@@ -1044,21 +1219,21 @@ msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Fehler bei Aktualisierung. Änderungen nicht ins Verzeichnis geschrieben."
 
-#: ../src/alertpanel.c:146 ../src/compose.c:9293
+#: ../src/alertpanel.c:146 ../src/compose.c:9324
 msgid "Notice"
 msgstr "Anmerkung"
 
 #: ../src/alertpanel.c:159 ../src/compose.c:5656 ../src/compose.c:6133
-#: ../src/compose.c:11662 ../src/file_checker.c:78 ../src/file_checker.c:100
+#: ../src/compose.c:11670 ../src/file_checker.c:78 ../src/file_checker.c:100
 #: ../src/messageview.c:853 ../src/messageview.c:866
-#: ../src/plugins/pgpcore/sgpgme.c:719
+#: ../src/plugins/pgpcore/sgpgme.c:717
 #: ../src/plugins/vcalendar/vcalendar.c:125 ../src/summaryview.c:4863
 msgid "Warning"
 msgstr "Warnung"
 
 #: ../src/alertpanel.c:172 ../src/alertpanel.c:195 ../src/compose.c:5597
 #: ../src/inc.c:669 ../src/plugins/pgpcore/sgpgme.c:152
-#: ../src/plugins/pgpcore/sgpgme.c:249
+#: ../src/plugins/pgpcore/sgpgme.c:253
 msgid "Error"
 msgstr "Fehler"
 
@@ -1070,14 +1245,9 @@ msgstr "Pr_otokoll einsehen"
 msgid "Show this message next time"
 msgstr "Diese Nachricht das nächste Mal anzeigen"
 
-#: ../src/avatars.c:97
-msgid "Internal avatars rendering already initialized"
-msgstr ""
-
 #: ../src/avatars.c:102
-#, fuzzy
 msgid "Failed to register avatars internal rendering hook"
-msgstr "Registrieren des \"avatar image render hook\" schlug fehl."
+msgstr "Registrieren des \"avatars internal rendering hook\" schlug fehl."
 
 #: ../src/browseldap.c:218
 msgid "Browse Directory Entry"
@@ -1187,7 +1357,7 @@ msgstr "Ihre Claws Mail-Version ist zu alt für das Plugin '%s'."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Ihre Claws Mail-Version ist zu alt für das Plugin."
 
-#: ../src/common/session.c:177 ../src/imap.c:1171
+#: ../src/common/session.c:177 ../src/imap.c:1177
 msgid "SSL handshake failed\n"
 msgstr "SSL-Verbindung schlug fehl\n"
 
@@ -1363,212 +1533,212 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: ../src/common/utils.c:4967
+#: ../src/common/utils.c:5000
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../src/common/utils.c:4968
+#: ../src/common/utils.c:5001
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Montag"
 
-#: ../src/common/utils.c:4969
+#: ../src/common/utils.c:5002
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../src/common/utils.c:4970
+#: ../src/common/utils.c:5003
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../src/common/utils.c:4971
+#: ../src/common/utils.c:5004
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../src/common/utils.c:4972
+#: ../src/common/utils.c:5005
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../src/common/utils.c:4973
+#: ../src/common/utils.c:5006
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../src/common/utils.c:4975
+#: ../src/common/utils.c:5008
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Januar"
 
-#: ../src/common/utils.c:4976
+#: ../src/common/utils.c:5009
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Februar"
 
-#: ../src/common/utils.c:4977
+#: ../src/common/utils.c:5010
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "März"
 
-#: ../src/common/utils.c:4978
+#: ../src/common/utils.c:5011
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "April"
 
-#: ../src/common/utils.c:4979
+#: ../src/common/utils.c:5012
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: ../src/common/utils.c:4980
+#: ../src/common/utils.c:5013
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Juni"
 
-#: ../src/common/utils.c:4981
+#: ../src/common/utils.c:5014
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Juli"
 
-#: ../src/common/utils.c:4982
+#: ../src/common/utils.c:5015
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "August"
 
-#: ../src/common/utils.c:4983
+#: ../src/common/utils.c:5016
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "September"
 
-#: ../src/common/utils.c:4984
+#: ../src/common/utils.c:5017
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Oktober"
 
-#: ../src/common/utils.c:4985
+#: ../src/common/utils.c:5018
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "November"
 
-#: ../src/common/utils.c:4986
+#: ../src/common/utils.c:5019
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Dezember"
 
-#: ../src/common/utils.c:4988
+#: ../src/common/utils.c:5021
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "So"
 
-#: ../src/common/utils.c:4989
+#: ../src/common/utils.c:5022
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Mo"
 
-#: ../src/common/utils.c:4990
+#: ../src/common/utils.c:5023
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Di"
 
-#: ../src/common/utils.c:4991
+#: ../src/common/utils.c:5024
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mi"
 
-#: ../src/common/utils.c:4992
+#: ../src/common/utils.c:5025
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Do"
 
-#: ../src/common/utils.c:4993
+#: ../src/common/utils.c:5026
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Fr"
 
-#: ../src/common/utils.c:4994
+#: ../src/common/utils.c:5027
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sa"
 
-#: ../src/common/utils.c:4996
+#: ../src/common/utils.c:5029
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: ../src/common/utils.c:4997
+#: ../src/common/utils.c:5030
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: ../src/common/utils.c:4998
+#: ../src/common/utils.c:5031
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mrz"
 
-#: ../src/common/utils.c:4999
+#: ../src/common/utils.c:5032
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Apr"
 
-#: ../src/common/utils.c:5000
+#: ../src/common/utils.c:5033
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: ../src/common/utils.c:5001
+#: ../src/common/utils.c:5034
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: ../src/common/utils.c:5002
+#: ../src/common/utils.c:5035
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: ../src/common/utils.c:5003
+#: ../src/common/utils.c:5036
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aug"
 
-#: ../src/common/utils.c:5004
+#: ../src/common/utils.c:5037
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: ../src/common/utils.c:5005
+#: ../src/common/utils.c:5038
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Okt"
 
-#: ../src/common/utils.c:5006
+#: ../src/common/utils.c:5039
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: ../src/common/utils.c:5007
+#: ../src/common/utils.c:5040
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dez"
 
-#: ../src/common/utils.c:5018
+#: ../src/common/utils.c:5051
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: ../src/common/utils.c:5019
+#: ../src/common/utils.c:5052
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: ../src/common/utils.c:5020
+#: ../src/common/utils.c:5053
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: ../src/common/utils.c:5021
+#: ../src/common/utils.c:5054
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
@@ -1579,7 +1749,7 @@ msgstr "_Hinzufügen..."
 
 #: ../src/compose.c:571 ../src/mh_gtk.c:361
 #: ../src/plugins/mailmbox/plugin_gtk.c:293
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:140
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:307
 msgid "_Remove"
 msgstr "_Entfernen"
 
@@ -1588,7 +1758,7 @@ msgid "_Properties..."
 msgstr "_Eigenschaften..."
 
 #. menus
-#: ../src/compose.c:580 ../src/mainwindow.c:506 ../src/messageview.c:212
+#: ../src/compose.c:580 ../src/mainwindow.c:508 ../src/messageview.c:212
 msgid "_Message"
 msgstr "_Nachricht"
 
@@ -1660,7 +1830,7 @@ msgstr "mit _Umbruch"
 msgid "_Unwrapped"
 msgstr "_ohne Umbruch"
 
-#: ../src/compose.c:618 ../src/mainwindow.c:539
+#: ../src/compose.c:618 ../src/mainwindow.c:541
 msgid "Select _all"
 msgstr "_Alles auswählen"
 
@@ -1792,48 +1962,48 @@ msgstr "_Priorität"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
 #. {"View/Scroll/---",          NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:666 ../src/mainwindow.c:603 ../src/messageview.c:265
+#: ../src/compose.c:666 ../src/mainwindow.c:605 ../src/messageview.c:265
 msgid "Character _encoding"
 msgstr "Zei_chenkodierung"
 
-#: ../src/compose.c:671 ../src/mainwindow.c:608 ../src/messageview.c:270
+#: ../src/compose.c:671 ../src/mainwindow.c:610 ../src/messageview.c:270
 msgid "Western European"
 msgstr "Westeuropäisch"
 
-#: ../src/compose.c:672 ../src/mainwindow.c:609 ../src/messageview.c:271
+#: ../src/compose.c:672 ../src/mainwindow.c:611 ../src/messageview.c:271
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: ../src/compose.c:673 ../src/mainwindow.c:610 ../src/messageview.c:272
+#: ../src/compose.c:673 ../src/mainwindow.c:612 ../src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: ../src/compose.c:674 ../src/mainwindow.c:611 ../src/messageview.c:273
+#: ../src/compose.c:674 ../src/mainwindow.c:613 ../src/messageview.c:273
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: ../src/compose.c:675 ../src/mainwindow.c:612 ../src/messageview.c:274
+#: ../src/compose.c:675 ../src/mainwindow.c:614 ../src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Kyrillisch"
 
-#: ../src/compose.c:676 ../src/mainwindow.c:613 ../src/messageview.c:275
+#: ../src/compose.c:676 ../src/mainwindow.c:615 ../src/messageview.c:275
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: ../src/compose.c:677 ../src/mainwindow.c:614 ../src/messageview.c:276
+#: ../src/compose.c:677 ../src/mainwindow.c:616 ../src/messageview.c:276
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: ../src/compose.c:678 ../src/mainwindow.c:615 ../src/messageview.c:277
+#: ../src/compose.c:678 ../src/mainwindow.c:617 ../src/messageview.c:277
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: ../src/compose.c:679 ../src/mainwindow.c:616 ../src/messageview.c:278
+#: ../src/compose.c:679 ../src/mainwindow.c:618 ../src/messageview.c:278
 msgid "Thai"
 msgstr "Thailändisch"
 
 #. Tools menu
-#: ../src/compose.c:682 ../src/mainwindow.c:723 ../src/messageview.c:314
+#: ../src/compose.c:682 ../src/mainwindow.c:725 ../src/messageview.c:314
 msgid "_Address book"
 msgstr "_Adressbuch"
 
@@ -1842,7 +2012,7 @@ msgid "_Template"
 msgstr "Vorlage"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:686 ../src/mainwindow.c:751 ../src/messageview.c:335
+#: ../src/compose.c:686 ../src/mainwindow.c:753 ../src/messageview.c:335
 msgid "Actio_ns"
 msgstr "A_ktionen"
 
@@ -1886,13 +2056,13 @@ msgid "_Normal"
 msgstr "_Normal"
 
 #. RADIO compose_reply_change_mode_cb
-#: ../src/compose.c:707 ../src/mainwindow.c:657 ../src/messageview.c:303
+#: ../src/compose.c:707 ../src/mainwindow.c:659 ../src/messageview.c:303
 msgid "_All"
 msgstr "_Alle"
 
 #. RADIO compose_reply_change_mode_cb
 #. COMPOSE_REPLY_TO_ALL
-#: ../src/compose.c:708 ../src/mainwindow.c:658 ../src/messageview.c:304
+#: ../src/compose.c:708 ../src/mainwindow.c:660 ../src/messageview.c:304
 msgid "_Sender"
 msgstr "Absender"
 
@@ -1920,19 +2090,19 @@ msgstr "_Gering"
 msgid "_Lowest"
 msgstr "_Sehr gering"
 
-#: ../src/compose.c:723 ../src/mainwindow.c:865 ../src/messageview.c:352
+#: ../src/compose.c:723 ../src/mainwindow.c:868 ../src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automatisch"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:724 ../src/mainwindow.c:866 ../src/messageview.c:353
+#: ../src/compose.c:724 ../src/mainwindow.c:869 ../src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:725 ../src/mainwindow.c:867 ../src/messageview.c:354
+#: ../src/compose.c:725 ../src/mainwindow.c:870 ../src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
@@ -1944,7 +2114,7 @@ msgstr "Unicode (_UTF-8)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:729 ../src/mainwindow.c:871 ../src/messageview.c:358
+#: ../src/compose.c:729 ../src/mainwindow.c:874 ../src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Mitteleuropäisch (ISO-8859-_2)"
 
@@ -1954,7 +2124,7 @@ msgstr "Mitteleuropäisch (ISO-8859-_2)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:732 ../src/mainwindow.c:874 ../src/messageview.c:361
+#: ../src/compose.c:732 ../src/mainwindow.c:877 ../src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Griechisch (ISO-8859-_7)"
 
@@ -1968,7 +2138,7 @@ msgstr "Griechisch (ISO-8859-_7)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:737 ../src/mainwindow.c:879 ../src/messageview.c:366
+#: ../src/compose.c:737 ../src/mainwindow.c:882 ../src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Türkisch (ISO-8859-_9)"
 
@@ -2024,33 +2194,33 @@ msgstr "Fw: mehrere E-Mails"
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Der Körper der \"Umleiten\"-Vorlage hat einen Fehler in Zeile %d."
 
-#: ../src/compose.c:2591 ../src/gtk/headers.h:13
+#: ../src/compose.c:2591 ../src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: ../src/compose.c:2594 ../src/gtk/headers.h:14
+#: ../src/compose.c:2594 ../src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: ../src/compose.c:2597 ../src/gtk/headers.h:11
+#: ../src/compose.c:2597 ../src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
 #: ../src/compose.c:2600 ../src/compose.c:4911 ../src/compose.c:4913
-#: ../src/gtk/headers.h:32
+#: ../src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Newsgruppen:"
 
-#: ../src/compose.c:2603 ../src/gtk/headers.h:33
+#: ../src/compose.c:2603 ../src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Followup an:"
 
-#: ../src/compose.c:2606 ../src/gtk/headers.h:16
+#: ../src/compose.c:2606 ../src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "In-Reply-To:"
 
 #: ../src/compose.c:2610 ../src/compose.c:4908 ../src/compose.c:4916
-#: ../src/gtk/headers.h:12 ../src/summary_search.c:433
+#: ../src/gtk/headers.h:13 ../src/summary_search.c:433
 msgid "To:"
 msgstr "An:"
 
@@ -2096,7 +2266,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
-#: ../src/compose.c:3603 ../src/compose.c:11144
+#: ../src/compose.c:3603 ../src/compose.c:11152
 msgid "+_Insert"
 msgstr "+Einfügen"
 
@@ -2123,16 +2293,16 @@ msgstr "Kann %s nicht lesen."
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:432
+#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Bearbeitet]"
 
-#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:435
+#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Nachricht verfassen%s"
 
-#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:438
+#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[kein Betreff] - Nachricht verfassen%s"
@@ -2141,7 +2311,7 @@ msgstr "[kein Betreff] - Nachricht verfassen%s"
 #. * This partly duplicates functionality in compose.c::compose_set_title().
 #. * While it's nice to not have to modify Claws Mail for this to work,
 #. * it would be cleaner to export that function in Claws Mail.
-#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:426
+#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Nachricht verfassen"
 
@@ -2197,7 +2367,7 @@ msgstr "Trotzdem vorspeichern?"
 msgid "Send later"
 msgstr "Später senden"
 
-#: ../src/compose.c:5134 ../src/compose.c:9719
+#: ../src/compose.c:5134 ../src/compose.c:9750
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2207,7 +2377,7 @@ msgstr ""
 "\n"
 "Zeichensatz-Konvertierung schlug fehl."
 
-#: ../src/compose.c:5137 ../src/compose.c:9722
+#: ../src/compose.c:5137 ../src/compose.c:9753
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2217,7 +2387,7 @@ msgstr ""
 "\n"
 "Schlüssel des Empfängers nicht erhältlich."
 
-#: ../src/compose.c:5143 ../src/compose.c:9716
+#: ../src/compose.c:5143 ../src/compose.c:9747
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2307,7 +2477,7 @@ msgstr "Gewähltes Konto ist nicht NNTP: Absenden schlug fehl."
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Der Anhang %s existiert nicht mehr. Ignorieren?"
 
-#: ../src/compose.c:6133 ../src/mainwindow.c:648 ../src/toolbar.c:231
+#: ../src/compose.c:6133 ../src/mainwindow.c:650 ../src/toolbar.c:231
 #: ../src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Senden abbrechen"
@@ -2326,34 +2496,34 @@ msgstr "Originaler %s-Teil"
 msgid "Add to address _book"
 msgstr "Zum Adress_buch hinzufügen"
 
-#: ../src/compose.c:6908
+#: ../src/compose.c:6912
 msgid "Delete entry contents"
 msgstr "Inhalt des Eintrags löschen"
 
-#: ../src/compose.c:6912 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: ../src/compose.c:6916 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Mit <tab> automatisch aus dem Adressbuch vervollständigen"
 
-#: ../src/compose.c:7132
+#: ../src/compose.c:7136
 msgid "Mime type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: ../src/compose.c:7138 ../src/mimeview.c:274
-#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:627
+#: ../src/compose.c:7142 ../src/mimeview.c:274
+#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:630
 #: ../src/prefs_summary_column.c:85 ../src/summaryview.c:445
 msgid "Size"
 msgstr "Größe"
 
 #. Save Message to folder
-#: ../src/compose.c:7201
+#: ../src/compose.c:7205
 msgid "Save Message to "
 msgstr "Nachricht speichern unter "
 
-#: ../src/compose.c:7238 ../src/editjpilot.c:276 ../src/editldap.c:520
+#: ../src/compose.c:7242 ../src/editjpilot.c:276 ../src/editldap.c:520
 #: ../src/editvcard.c:192 ../src/export.c:164 ../src/import.c:163
 #: ../src/importmutt.c:239 ../src/importpine.c:238
-#: ../src/plugins/archive/archiver_gtk.c:1028
+#: ../src/plugins/archive/archiver_gtk.c:1029
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:188
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:208
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:181
@@ -2362,24 +2532,23 @@ msgstr "Nachricht speichern unter "
 msgid "_Browse"
 msgstr "_Durchsuchen"
 
-#: ../src/compose.c:7710
+#: ../src/compose.c:7714
 msgid "Hea_der"
 msgstr "_Kopfzeile"
 
-#: ../src/compose.c:7715
+#: ../src/compose.c:7719
 msgid "_Attachments"
 msgstr "_Anhänge"
 
-#: ../src/compose.c:7729
+#: ../src/compose.c:7733
 msgid "Othe_rs"
 msgstr "_Weiteres"
 
-#: ../src/compose.c:7744 ../src/gtk/headers.h:18
-#: ../src/plugins/pdf_viewer/poppler_viewer.c:702 ../src/summary_search.c:440
-msgid "Subject:"
+#: ../src/compose.c:7748
+msgid "_Subject:"
 msgstr "Betreff:"
 
-#: ../src/compose.c:7966
+#: ../src/compose.c:7970
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2388,20 +2557,20 @@ msgstr ""
 "Rechtschreibprüfung konnte nicht gestartet werden.\n"
 "%s"
 
-#: ../src/compose.c:8072
+#: ../src/compose.c:8076
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Von: <i>%s</i>"
 
-#: ../src/compose.c:8106
+#: ../src/compose.c:8119
 msgid "Account to use for this email"
 msgstr "Für diese E-Mail zu verwendendes Konto"
 
-#: ../src/compose.c:8108
+#: ../src/compose.c:8121
 msgid "Sender address to be used"
 msgstr "Zu benutzende Absenderadresse"
 
-#: ../src/compose.c:8272
+#: ../src/compose.c:8285
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2410,64 +2579,68 @@ msgstr ""
 "Das Datenschutzsystem '%s' kann nicht geladen werden. Es wird nicht möglich "
 "sein, diese Nachricht zu signieren oder zu verschlüsseln."
 
-#: ../src/compose.c:8372 ../src/plugins/archive/archiver_gtk.c:1082
+#: ../src/compose.c:8385 ../src/plugins/archive/archiver_gtk.c:1083
 msgid "_None"
 msgstr "_Keines"
 
-#: ../src/compose.c:8473 ../src/prefs_template.c:753
+#: ../src/compose.c:8486 ../src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Der Text der Vorlage hat einen Fehler in Zeile %d."
 
-#: ../src/compose.c:8589
+#: ../src/compose.c:8602
 msgid "Template From format error."
 msgstr "Formatierungsfehler in Von-Vorlage."
 
-#: ../src/compose.c:8607
+#: ../src/compose.c:8620
 msgid "Template To format error."
 msgstr "Formatierungsfehler in An-Vorlage."
 
-#: ../src/compose.c:8625
+#: ../src/compose.c:8638
 msgid "Template Cc format error."
 msgstr "Formatierungsfehler in Cc-Vorlage."
 
-#: ../src/compose.c:8643
+#: ../src/compose.c:8656
 msgid "Template Bcc format error."
 msgstr "Formatierungsfehler in Bcc-Vorlage."
 
-#: ../src/compose.c:8662
+#: ../src/compose.c:8674
+msgid "Template Reply-To format error."
+msgstr "Formatierungsfehler in Reply-to-Vorlage."
+
+#: ../src/compose.c:8693
 msgid "Template subject format error."
 msgstr "Formatierungsfehler in Betreff-Vorlage."
 
-#: ../src/compose.c:8930
+#: ../src/compose.c:8961
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME-Typ."
 
-#: ../src/compose.c:8945
+#: ../src/compose.c:8976
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: ../src/compose.c:9019
+#: ../src/compose.c:9050
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: ../src/compose.c:9036
+#: ../src/compose.c:9067
 msgid "MIME type"
 msgstr "MIME-Typ"
 
-#: ../src/compose.c:9077
+#: ../src/compose.c:9108
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: ../src/compose.c:9097
+#: ../src/compose.c:9128
 msgid "Path"
 msgstr "Pfad"
 
-#: ../src/compose.c:9098
+#: ../src/compose.c:9129
 msgid "File name"
 msgstr "Dateiname"
 
-#: ../src/compose.c:9290
+#: ../src/compose.c:9321
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2478,15 +2651,15 @@ msgstr ""
 "Prozess beenden?\n"
 "Prozessgruppen-ID: %d"
 
-#: ../src/compose.c:9685 ../src/messageview.c:1095
+#: ../src/compose.c:9716 ../src/messageview.c:1095
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail benötigt Zugang zum Netz, um diese E-Mail zu senden."
 
-#: ../src/compose.c:9711
+#: ../src/compose.c:9742
 msgid "Could not queue message."
 msgstr "Nachricht konnte nicht vorgespeichert werden."
 
-#: ../src/compose.c:9713
+#: ../src/compose.c:9744
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2496,15 +2669,15 @@ msgstr ""
 "Nachricht konnte nicht vorgespeichert werden\n"
 "%s."
 
-#: ../src/compose.c:9891
+#: ../src/compose.c:9922
 msgid "Could not save draft."
 msgstr "Entwurf konnte nicht gespeichert werden."
 
-#: ../src/compose.c:9895
+#: ../src/compose.c:9926
 msgid "Could not save draft"
 msgstr "Entwurf konnte nicht gespeichert werden"
 
-#: ../src/compose.c:9896
+#: ../src/compose.c:9927
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2512,24 +2685,24 @@ msgstr ""
 "Entwurf konnte nicht gespeichert werden.\n"
 "Möchten Sie das Beenden zurücknehmen oder die Nachricht verwerfen?"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Cancel exit"
 msgstr "Beenden _zurücknehmen"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Discard email"
 msgstr "_Nachricht verwerfen"
 
-#: ../src/compose.c:10058 ../src/compose.c:10072
+#: ../src/compose.c:10089 ../src/compose.c:10103
 msgid "Select file"
 msgstr "Datei auswählen"
 
-#: ../src/compose.c:10086
+#: ../src/compose.c:10117
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Datei '%s' konnte nicht gelesen werden."
 
-#: ../src/compose.c:10088
+#: ../src/compose.c:10119
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2538,63 +2711,63 @@ msgstr ""
 "Die Datei '%s' enthält ungültige Zeichen\n"
 "für die aktuelle Kodierung, Einfügung kann fehlerhaft sein."
 
-#: ../src/compose.c:10175
+#: ../src/compose.c:10206
 msgid "Discard message"
 msgstr "Nachricht verwerfen"
 
-#: ../src/compose.c:10176
+#: ../src/compose.c:10207
 msgid "This message has been modified. Discard it?"
 msgstr "Diese Nachricht wurde geändert. Verwerfen?"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Discard"
 msgstr "_Verwerfen"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Save to Drafts"
 msgstr "Entwurf _speichern"
 
-#: ../src/compose.c:10179
+#: ../src/compose.c:10210
 msgid "Save changes"
 msgstr "Änderungen speichern"
 
-#: ../src/compose.c:10180
+#: ../src/compose.c:10211
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Diese Nachricht wurde geändert. Die letzten Änderungen speichern?"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "_Don't save"
 msgstr "_Nicht Speichern"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "+_Save to Drafts"
 msgstr "+Als Entwurf _speichern"
 
-#: ../src/compose.c:10251
+#: ../src/compose.c:10282
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Möchten Sie die Vorlage '%s' anwenden?"
 
-#: ../src/compose.c:10253
+#: ../src/compose.c:10284
 msgid "Apply template"
 msgstr "Vorlage anwenden"
 
-#: ../src/compose.c:10254 ../src/prefs_actions.c:329
+#: ../src/compose.c:10285 ../src/prefs_actions.c:329
 #: ../src/prefs_filtering_action.c:610 ../src/prefs_filtering.c:477
-#: ../src/prefs_matcher.c:772 ../src/prefs_template.c:309
+#: ../src/prefs_matcher.c:775 ../src/prefs_template.c:311
 #: ../src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "Ersetzen"
 
-#: ../src/compose.c:10254
+#: ../src/compose.c:10285
 msgid "_Insert"
 msgstr "Einfügen"
 
-#: ../src/compose.c:11141
+#: ../src/compose.c:11149
 msgid "Insert or attach?"
 msgstr "Einfügen oder Anhängen?"
 
-#: ../src/compose.c:11142
+#: ../src/compose.c:11150
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2602,16 +2775,16 @@ msgstr ""
 "Wollen Sie den Inhalt der Datei in den Nachrichtenkörper einfügen oder an "
 "die Nachricht anhängen?"
 
-#: ../src/compose.c:11144
+#: ../src/compose.c:11152
 msgid "_Attach"
 msgstr "_Anhang"
 
-#: ../src/compose.c:11361
+#: ../src/compose.c:11369
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Zitat-Formatierungsfehler in Zeile %d."
 
-#: ../src/compose.c:11656
+#: ../src/compose.c:11664
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2873,15 +3046,15 @@ msgstr "Ordner bearbeiten"
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen des Ordners ein:"
 
-#: ../src/editgroup.c:556 ../src/foldersel.c:581 ../src/imap_gtk.c:195
+#: ../src/editgroup.c:556 ../src/foldersel.c:585 ../src/imap_gtk.c:195
 #: ../src/mh_gtk.c:145 ../src/plugins/mailmbox/plugin_gtk.c:239
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:89
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "New folder"
 msgstr "Neuer Ordner"
 
-#: ../src/editgroup.c:557 ../src/foldersel.c:582 ../src/mh_gtk.c:146
+#: ../src/editgroup.c:557 ../src/foldersel.c:586 ../src/mh_gtk.c:146
 #: ../src/plugins/mailmbox/plugin_gtk.c:240
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:90
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen des neuen Ordners ein:"
 
@@ -3048,7 +3221,7 @@ msgstr ""
 
 #: ../src/editldap.c:592
 msgid " Defaults "
-msgstr " Standards "
+msgstr " Standardwerte "
 
 #: ../src/editldap.c:596
 msgid ""
@@ -3237,7 +3410,7 @@ msgstr "Neuen vCard-Eintrag hinzufügen"
 
 #: ../src/etpan/etpan-ssl.c:167
 msgid "Impossible to set the client certificate.\n"
-msgstr ""
+msgstr "Das Benutzerzertifikat kann nicht gesetzt werden.\n"
 
 #: ../src/exphtmldlg.c:106
 msgid "Please specify output directory and file to create."
@@ -3308,9 +3481,9 @@ msgstr "Stylesheet"
 #. * can always get back the SummaryView pointer.
 #: ../src/exphtmldlg.c:453 ../src/gtk/colorlabel.c:406
 #: ../src/gtk/gtkaspell.c:1571 ../src/gtk/gtkaspell.c:2231
-#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1174
+#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1177
 #: ../src/plugins/archive/archiver_prefs.c:241
-#: ../src/plugins/libravatar/libravatar_prefs.c:187 ../src/prefs_account.c:949
+#: ../src/plugins/libravatar/libravatar_prefs.c:206 ../src/prefs_account.c:949
 #: ../src/prefs_toolbar.c:780 ../src/prefs_toolbar.c:1465
 #: ../src/summaryview.c:6008
 msgid "None"
@@ -3322,7 +3495,7 @@ msgid "Default"
 msgstr "Standard"
 
 #: ../src/exphtmldlg.c:455 ../src/plugins/pgpcore/select-keys.c:244
-#: ../src/plugins/pgpcore/sgpgme.c:148
+#: ../src/plugins/pgpcore/sgpgme.c:148 ../src/plugins/pgpcore/sgpgme.c:164
 msgid "Full"
 msgstr "Voll"
 
@@ -3552,7 +3725,7 @@ msgstr "Adressbuch in LDIF-Datei exportieren"
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: ../src/export.c:113 ../src/summaryview.c:8117
+#: ../src/export.c:113 ../src/summaryview.c:8120
 msgid "Export to mbox file"
 msgstr "Export in Mbox-Datei"
 
@@ -3589,7 +3762,7 @@ msgid "Full Name"
 msgstr "Vollständiger Name"
 
 #: ../src/exporthtml.c:771 ../src/importldif.c:1022
-#: ../src/plugins/archive/archiver_gtk.c:736
+#: ../src/plugins/archive/archiver_gtk.c:737
 msgid "Attributes"
 msgstr "Merkmal"
 
@@ -3616,7 +3789,7 @@ msgstr "Nicht angegeben."
 #: ../src/file_checker.c:76
 #, c-format
 msgid "The file %s is missing! Do you want to use the backup file from %s?"
-msgstr "Datei %s fehlt! Möchten Sie die gesicherte Datei von %s verwenden?"
+msgstr "Datei %s fehlt! Möchten Sie die Backup-Datei von %s verwenden?"
 
 #: ../src/file_checker.c:84 ../src/file_checker.c:106
 #, c-format
@@ -3629,31 +3802,35 @@ msgid ""
 "The file %s is empty or corrupted! Do you want to use the backup file from "
 "%s?"
 msgstr ""
-"Datei %s ist leer oder defekt! Möchten Sie die gesicherte Datei von %s "
-"verwenden?"
+"Datei %s ist leer oder defekt! Möchten Sie die Backup-Datei von %s verwenden?"
 
 #: ../src/filtering.c:619 ../src/filtering.c:694 ../src/filtering.c:723
 msgid "rule is not account-based\n"
-msgstr ""
+msgstr "Filterregel ist nicht kontobasiert\n"
 
+# Übersetzung im Kontext des Programms prüfen
 #: ../src/filtering.c:623
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
 msgstr ""
+"Filterregel ist kontobasiert [id=%d, name='%s'], passend zu dem Konto das "
+"gerade benutzt wird, um Nachrichten empfangen\n"
 
 #: ../src/filtering.c:625 ../src/filtering.c:642 ../src/filtering.c:643
 #: ../src/filtering.c:667 ../src/filtering.c:685 ../src/filtering.c:712
 #: ../src/filtering.c:713 ../src/filtering.c:730 ../src/filtering.c:731
 msgid "NON_EXISTENT"
-msgstr ""
+msgstr "NICHT_EXISTENT"
 
 #: ../src/filtering.c:633
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
+"Filterregel ist kontenbasiert und passt nicht zu dem Konto, mit dem "
+"gegenwärtig Nachrichten abgerufen werden\n"
 
 #: ../src/filtering.c:640
 #, c-format
@@ -3661,11 +3838,16 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
 msgstr ""
+"Filterregel ist kontenbasiert [id=%d, name='%s'] und passt nicht zu dem "
+"Konto, mit dem gegenwärtig Nachrichten abgerufen werden [id=%d, name='%s']\n"
 
+# Übersetzung im Programmkontext prüfen
 #: ../src/filtering.c:659
 msgid ""
 "rule is not account-based, all rules are applied on user request anyway\n"
 msgstr ""
+"Filterregel ist nicht kontenbasiert, alle Filterregeln werden nach "
+"Benutzeranforderung ohnehin angewendet\n"
 
 #: ../src/filtering.c:665
 #, c-format
@@ -3673,15 +3855,19 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
 "request\n"
 msgstr ""
+"Filterregel ist kontenbasiert [id=%d, name='%s'], aber auf "
+"Benutzeranforderung werden alle Filterregeln werden angewandt\n"
 
 #: ../src/filtering.c:683
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
+"Filterregel ist kontenbasiert [id=%d, name='%s'], auf Benutzeranforderung "
+"übersprungen\n"
 
 #: ../src/filtering.c:688
 msgid "rule is account-based, skipped on user request\n"
-msgstr ""
+msgstr "Filterregel ist kontenbasiert, auf Benutzeranforderung übersprungen\n"
 
 #: ../src/filtering.c:710
 #, c-format
@@ -3689,82 +3875,81 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching current account [id="
 "%d, name='%s']\n"
 msgstr ""
+"Filterregel ist kontenbasiert [id=%d, name='%s'] und passt nicht zum "
+"gegenwärtigen Account [id=%d, name='%s']\n"
 
 #: ../src/filtering.c:716
 msgid "rule is account-based, not matching current account\n"
-msgstr ""
+msgstr "Filterregel ist kontenbasiert und passt nicht zum aktuellen Konto\n"
 
+# Übersetzung im Programmkontext prüfen
 #: ../src/filtering.c:728
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], current account [id=%d, "
 "name='%s']\n"
 msgstr ""
+"Filterregel ist kontenbasiert [id=%d, name='%s'], aktuelles Konto ist [id="
+"%d, name='%s']\n"
 
 #: ../src/filtering.c:768
 #, c-format
 msgid "applying action [ %s ]\n"
-msgstr ""
+msgstr "Wende Aktion an [ %s ]\n"
 
 #: ../src/filtering.c:773
 msgid "action could not apply\n"
-msgstr ""
+msgstr "Aktion konnte nicht angewendet werden\n"
 
 #: ../src/filtering.c:775
 #, c-format
 msgid "no further processing after action [ %s ]\n"
-msgstr ""
+msgstr "Keine weitere Verarbeitung nach Aktion [ %s ]\n"
 
 #: ../src/filtering.c:826
-#, fuzzy, c-format
+#, c-format
 msgid "processing rule '%s' [ %s ]\n"
-msgstr "Verarbeit_ungsregel anwenden"
+msgstr "Verarbeite Regel '%s' [ %s ]\n"
 
 #: ../src/filtering.c:830
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "Verarbeite Filterregel <unbenannt> [ %s ]\n"
 
 #: ../src/filtering.c:848
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
-msgstr ""
+msgstr "Deaktivierte Filterregel '%s' [ %s ]\n"
 
 #: ../src/filtering.c:852
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "Deaktivierte Filterregel <unbenannt> [ %s ]\n"
 
 #: ../src/filtering.c:890
-#, fuzzy
 msgid "undetermined"
-msgstr "Undefiniert"
+msgstr "undefiniert"
 
 # GUI adapted
 #: ../src/filtering.c:894
-#, fuzzy
 msgid "incorporation"
-msgstr "Nachrichteneingang gefiltert wird"
+msgstr "Aufruf"
 
 #: ../src/filtering.c:898
-#, fuzzy
 msgid "manually"
-msgstr "_Handbuch"
+msgstr "manuell"
 
 #: ../src/filtering.c:902
-#, fuzzy
 msgid "folder processing"
-msgstr "Ordner-Verarbeitungsregeln _anwenden"
+msgstr "Ordner-Verarbeitung"
 
 #: ../src/filtering.c:906
-#, fuzzy
 msgid "pre-processing"
-msgstr "_Vorverarbeitungsregeln..."
+msgstr "Vorverarbeitung"
 
 #: ../src/filtering.c:910
-#, fuzzy
 msgid "post-processing"
-msgstr "_Nachverarbeitungsregeln..."
+msgstr "Nachverarbeitung"
 
 #: ../src/filtering.c:927
 #, c-format
@@ -3776,10 +3961,16 @@ msgid ""
 "%s%s %s\n"
 "%s%s %s\n"
 msgstr ""
+"Filtere Nachricht (%s%s%s)\n"
+"%sNachrichtendatei: %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
 
 #: ../src/filtering.c:929 ../src/filtering.c:938
 msgid ": "
-msgstr ""
+msgstr ": "
 
 #: ../src/filtering.c:936
 #, c-format
@@ -3787,6 +3978,8 @@ msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
 msgstr ""
+"Filtere Nachricht (%s%s%s)\n"
+"%sNachrichtendatei: %s\n"
 
 #: ../src/folder.c:1564 ../src/foldersel.c:403 ../src/prefs_folder_item.c:306
 msgid "Inbox"
@@ -3844,38 +4037,37 @@ msgstr "Synchronisiere %s für Offline-Nutzung...\n"
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: ../src/foldersel.c:583 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
+#: ../src/foldersel.c:587 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
 #: ../src/plugins/mailmbox/plugin_gtk.c:241
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "NewFolder"
 msgstr "NeuerOrdner"
 
-#: ../src/foldersel.c:591 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
+#: ../src/foldersel.c:595 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
 #: ../src/imap_gtk.c:272 ../src/imap_gtk.c:277 ../src/mh_gtk.c:155
 #: ../src/mh_gtk.c:259 ../src/news_gtk.c:315
 #: ../src/plugins/mailmbox/plugin_gtk.c:249
 #: ../src/plugins/mailmbox/plugin_gtk.c:416
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:97
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:339
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
 #: ../src/plugins/vcalendar/vcal_folder.c:2040
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' darf nicht im Ordnernamen enthalten sein."
 
-#: ../src/foldersel.c:601 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
+#: ../src/foldersel.c:605 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
 #: ../src/mh_gtk.c:165 ../src/mh_gtk.c:266 ../src/news_gtk.c:322
 #: ../src/plugins/mailmbox/plugin_gtk.c:261
 #: ../src/plugins/mailmbox/plugin_gtk.c:425
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:107
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:346
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:211
 #: ../src/plugins/vcalendar/vcal_folder.c:2047
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Der Ordner '%s' existiert bereits."
 
-#: ../src/foldersel.c:608 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
+#: ../src/foldersel.c:612 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
 #: ../src/plugins/mailmbox/plugin_gtk.c:268
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:113
+#: ../src/plugins/rssyl/opml_import.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:121
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Ordner '%s' konnte nicht erstellt werden."
@@ -3888,7 +4080,7 @@ msgstr "Alle _gelesen markieren"
 msgid "R_un processing rules"
 msgstr "Verarbeit_ungsregel anwenden"
 
-#: ../src/folderview.c:233 ../src/mainwindow.c:544
+#: ../src/folderview.c:233 ../src/mainwindow.c:546
 msgid "_Search folder..."
 msgstr "_Ordner durchsuchen..."
 
@@ -3907,7 +4099,7 @@ msgstr "_Postausgang senden..."
 #. F_COL_FOLDER
 #: ../src/folderview.c:380 ../src/folderview.c:427
 #: ../src/plugins/notification/notification_lcdproc.c:141
-#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:388
+#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:391
 #: ../src/summaryview.c:6284
 msgid "New"
 msgstr "Neu"
@@ -3915,7 +4107,7 @@ msgstr "Neu"
 #. F_COL_NEW
 #: ../src/folderview.c:381 ../src/folderview.c:428
 #: ../src/plugins/notification/notification_lcdproc.c:145
-#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:387
+#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:390
 #: ../src/summaryview.c:6286
 msgid "Unread"
 msgstr "Ungelesen"
@@ -3937,22 +4129,22 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Ordnerdaten werden erstellt..."
 
-#: ../src/folderview.c:823 ../src/summaryview.c:4117 ../src/summaryview.c:4119
+#: ../src/folderview.c:823 ../src/summaryview.c:4119 ../src/summaryview.c:4121
 msgid "Mark all as read"
 msgstr "Alle als gelesen markieren"
 
-#: ../src/folderview.c:824 ../src/summaryview.c:4118
+#: ../src/folderview.c:824 ../src/summaryview.c:4120
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 "Möchten Sie wirklich alle Mails in diesem Ordner als gelesen markieren?"
 
-#: ../src/folderview.c:982 ../src/imap.c:4528 ../src/mainwindow.c:5134
+#: ../src/folderview.c:982 ../src/imap.c:4574 ../src/mainwindow.c:5157
 #: ../src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Ordner %s%c%s wird durchsucht..."
 
-#: ../src/folderview.c:986 ../src/imap.c:4533 ../src/mainwindow.c:5139
+#: ../src/folderview.c:986 ../src/imap.c:4579 ../src/mainwindow.c:5162
 #: ../src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
@@ -3986,60 +4178,60 @@ msgstr "Ordner %s konnte nicht durchsucht werden\n"
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ordner werden auf neue Nachrichten geprüft..."
 
-#: ../src/folderview.c:2005
+#: ../src/folderview.c:2046
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Schließe Ordner %s..."
 
 #. Open Folder
 #. TODO: wwp: avoid displaying (null) in the status bar
-#: ../src/folderview.c:2100
+#: ../src/folderview.c:2141
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Öffne Ordner %s..."
 
-#: ../src/folderview.c:2118
+#: ../src/folderview.c:2159
 msgid "Folder could not be opened."
 msgstr "Ordner konnte nicht geöffnet werden."
 
-#: ../src/folderview.c:2261 ../src/mainwindow.c:2877 ../src/mainwindow.c:2881
+#: ../src/folderview.c:2302 ../src/mainwindow.c:2887 ../src/mainwindow.c:2891
 msgid "Empty trash"
 msgstr "Papierkorb leeren"
 
-#: ../src/folderview.c:2262
+#: ../src/folderview.c:2303
 msgid "Delete all messages in trash?"
 msgstr "Alle Nachrichten im Papierkorb löschen?"
 
-#: ../src/folderview.c:2263
+#: ../src/folderview.c:2304
 msgid "+_Empty trash"
 msgstr "+_Papierkorb leeren"
 
-#: ../src/folderview.c:2307 ../src/inc.c:1540 ../src/toolbar.c:2607
+#: ../src/folderview.c:2348 ../src/inc.c:1540 ../src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Offline-Warnung"
 
-#: ../src/folderview.c:2308 ../src/toolbar.c:2608
+#: ../src/folderview.c:2349 ../src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Sie arbeiten offline. Trotzdem fortfahren?"
 
-#: ../src/folderview.c:2319 ../src/toolbar.c:2627
+#: ../src/folderview.c:2360 ../src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Vorgespeicherte Nachrichten senden"
 
-#: ../src/folderview.c:2320 ../src/toolbar.c:2628
+#: ../src/folderview.c:2361 ../src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Alle vorgespeicherten Nachrichten senden?"
 
-#: ../src/folderview.c:2321 ../src/messageview.c:854 ../src/messageview.c:871
+#: ../src/folderview.c:2362 ../src/messageview.c:854 ../src/messageview.c:871
 #: ../src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Senden"
 
-#: ../src/folderview.c:2329 ../src/toolbar.c:2647
+#: ../src/folderview.c:2370 ../src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Fehler beim Senden vorgespeicherter Nachrichten."
 
-#: ../src/folderview.c:2332 ../src/main.c:2714 ../src/toolbar.c:2650
+#: ../src/folderview.c:2373 ../src/main.c:2714 ../src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4048,67 +4240,67 @@ msgstr ""
 "Fehler beim Senden vorgespeicherter Nachrichten:\n"
 "%s"
 
-#: ../src/folderview.c:2409
+#: ../src/folderview.c:2450
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Soll der Ordner '%s' in '%s' kopiert werden?"
 
-#: ../src/folderview.c:2410
+#: ../src/folderview.c:2451
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Soll der Ordner '%s' wirklich ein Unterordner von '%s' werden?"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Copy folder"
 msgstr "Kopiere Ordner"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Move folder"
 msgstr "Ordner verschieben"
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopiere %s nach %s..."
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "%s wird nach %s verschoben..."
 
-#: ../src/folderview.c:2454
+#: ../src/folderview.c:2495
 msgid "Source and destination are the same."
 msgstr "Quelle und Ziel sind identisch."
 
-#: ../src/folderview.c:2457
+#: ../src/folderview.c:2498
 msgid "Can't copy a folder to one of its children."
 msgstr "Ein Ordner ist nicht in untergeordnete Ordner kopierbar."
 
-#: ../src/folderview.c:2458
+#: ../src/folderview.c:2499
 msgid "Can't move a folder to one of its children."
 msgstr ""
 "Ein Ordner kann nicht in einen seiner untergeordneten Ordner verschoben "
 "werden."
 
-#: ../src/folderview.c:2461
+#: ../src/folderview.c:2502
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Ordner können nicht zwischen verschiedenen Mailboxen verschoben werden"
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Copy failed!"
 msgstr "Kopieren schlug fehl!"
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Move failed!"
 msgstr "Verschieben schlug fehl!"
 
-#: ../src/folderview.c:2515
+#: ../src/folderview.c:2556
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Konfiguration Verarbeitung für Ordner %s"
 
-#: ../src/folderview.c:2943 ../src/summaryview.c:4558
-#: ../src/summaryview.c:4657
+#: ../src/folderview.c:2984 ../src/summaryview.c:4560
+#: ../src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Der Zielordner kann nur Unterordner aufnehmen."
 
@@ -4316,7 +4508,7 @@ msgstr ""
 #: ../src/gtk/about.c:462
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
-msgstr "ermöglicht das Konvertieren zwischen verschiedenen Zeichensätzen\n"
+msgstr "Konvertiert zwischen verschiedenen Zeichensätzen\n"
 
 #: ../src/gtk/about.c:472
 msgctxt "JPilot"
@@ -4659,92 +4851,91 @@ msgstr ""
 
 #: ../src/gtk/gtkutils.c:1907
 msgid "Failed."
-msgstr ""
+msgstr "Fehlgeschlagen."
 
 #: ../src/gtk/gtkutils.c:1970
-#, fuzzy
 msgid "Configuring..."
-msgstr "_Konfiguration"
+msgstr "Konfiguriere…"
 
 #. RFC2822
 #. S_COL_TO
 #. date expression
 #. S_COL_TO
-#: ../src/gtk/headers.h:8 ../src/prefs_filtering_action.c:1259
-#: ../src/prefs_matcher.c:2158 ../src/prefs_summary_column.c:84
+#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1259
+#: ../src/prefs_matcher.c:2174 ../src/prefs_summary_column.c:84
 #: ../src/quote_fmt.c:49 ../src/summaryview.c:444
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/gtk/headers.h:8
+#: ../src/gtk/headers.h:9
 msgid "Date:"
 msgstr "Datum:"
 
 #. S_COL_SUBJECT
 #. date
 #. S_COL_SUBJECT
-#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1256
-#: ../src/prefs_matcher.c:2155 ../src/prefs_summary_column.c:82
+#: ../src/gtk/headers.h:10 ../src/prefs_filtering_action.c:1256
+#: ../src/prefs_matcher.c:2171 ../src/prefs_summary_column.c:82
 #: ../src/quote_fmt.c:50 ../src/summaryview.c:442
 msgid "From"
 msgstr "Von"
 
-#: ../src/gtk/headers.h:9 ../src/summary_search.c:426
+#: ../src/gtk/headers.h:10 ../src/summary_search.c:426
 msgid "From:"
 msgstr "Von:"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender"
 msgstr "Absender"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender:"
 msgstr "Absender:"
 
-#: ../src/gtk/headers.h:11
+#: ../src/gtk/headers.h:12
 msgid "Reply-To"
 msgstr "Reply-To"
 
 #. S_COL_FROM
 #. subject
 #. S_COL_FROM
-#: ../src/gtk/headers.h:12 ../src/prefs_filtering_action.c:1257
-#: ../src/prefs_matcher.c:2156 ../src/prefs_summary_column.c:83
+#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1257
+#: ../src/prefs_matcher.c:2172 ../src/prefs_summary_column.c:83
 #: ../src/quote_fmt.c:57 ../src/summaryview.c:443
 msgid "To"
 msgstr "An"
 
 #. to
-#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1258
-#: ../src/prefs_matcher.c:2157 ../src/quote_fmt.c:58
+#: ../src/gtk/headers.h:14 ../src/prefs_filtering_action.c:1258
+#: ../src/prefs_matcher.c:2173 ../src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
-#: ../src/gtk/headers.h:14
+#: ../src/gtk/headers.h:15
 msgid "Bcc"
 msgstr "Bcc"
 
 #. references
-#: ../src/gtk/headers.h:15 ../src/prefs_filtering_action.c:1260
-#: ../src/prefs_matcher.c:2159 ../src/quote_fmt.c:61
+#: ../src/gtk/headers.h:16 ../src/prefs_filtering_action.c:1260
+#: ../src/prefs_matcher.c:2175 ../src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Message-ID"
 
-#: ../src/gtk/headers.h:15
+#: ../src/gtk/headers.h:16
 msgid "Message-ID:"
 msgstr "Message-ID:"
 
-#: ../src/gtk/headers.h:16
+#: ../src/gtk/headers.h:17
 msgid "In-Reply-To"
 msgstr "In-Reply-To"
 
 #. newsgroups
-#: ../src/gtk/headers.h:17 ../src/prefs_filtering_action.c:1262
-#: ../src/prefs_matcher.c:2161 ../src/quote_fmt.c:60
+#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1262
+#: ../src/prefs_matcher.c:2177 ../src/quote_fmt.c:60
 msgid "References"
 msgstr "Referenzen"
 
-#: ../src/gtk/headers.h:17
+#: ../src/gtk/headers.h:18
 msgid "References:"
 msgstr "Referenzen:"
 
@@ -4752,328 +4943,333 @@ msgstr "Referenzen:"
 #. initial of sender
 #. S_COL_STATUS
 #. S_COL_MIME
-#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1255
-#: ../src/prefs_matcher.c:2154 ../src/prefs_summary_column.c:81
+#: ../src/gtk/headers.h:19 ../src/prefs_filtering_action.c:1255
+#: ../src/prefs_matcher.c:2170 ../src/prefs_summary_column.c:81
 #: ../src/quote_fmt.c:56 ../src/summaryview.c:441
 msgid "Subject"
 msgstr "Betreff"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:19 ../src/plugins/pdf_viewer/poppler_viewer.c:702
+#: ../src/summary_search.c:440
+msgid "Subject:"
+msgstr "Betreff:"
+
+#: ../src/gtk/headers.h:20
 msgid "Comments"
 msgstr "Comments"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:20
 msgid "Comments:"
 msgstr "Comments:"
 
-#: ../src/gtk/headers.h:20
+#: ../src/gtk/headers.h:21
 msgid "Keywords"
 msgstr "Keywords"
 
-#: ../src/gtk/headers.h:20 ../src/plugins/pdf_viewer/poppler_viewer.c:704
+#: ../src/gtk/headers.h:21 ../src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Keywords:"
 msgstr "Schlagworte:"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date"
 msgstr "Resent-Date"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date:"
 msgstr "Resent-Date:"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From"
 msgstr "Resent-From"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From:"
 msgstr "Resent-From:"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender"
 msgstr "Resent-Sender"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender:"
 msgstr "Resent-Sender:"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To"
 msgstr "Resent-To"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To:"
 msgstr "Resent-To:"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc"
 msgstr "Resent-Cc"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc:"
 msgstr "Resent-Cc:"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc"
 msgstr "Resent-Bcc"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc:"
 msgstr "Resent-Bcc:"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID"
 msgstr "Resent-Message-ID"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID:"
 msgstr "Resent-Message-ID:"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path"
 msgstr "Return-Path"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path:"
 msgstr "Return-Path:"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received"
 msgstr "Empfangen"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received:"
 msgstr "Empfangen:"
 
 #. more
 #. cc
-#: ../src/gtk/headers.h:32 ../src/prefs_filtering_action.c:1261
-#: ../src/prefs_matcher.c:2160 ../src/quote_fmt.c:59
+#: ../src/gtk/headers.h:33 ../src/prefs_filtering_action.c:1261
+#: ../src/prefs_matcher.c:2176 ../src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Newsgruppen"
 
-#: ../src/gtk/headers.h:33
+#: ../src/gtk/headers.h:34
 msgid "Followup-To"
 msgstr "Followup-To"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To"
 msgstr "Delivered-To"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To:"
 msgstr "Delivered-To:"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen"
 msgstr "Seen"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen:"
 msgstr "Seen:"
 
 #. S_COL_MARK
-#: ../src/gtk/headers.h:36 ../src/gtk/progressdialog.c:149
+#: ../src/gtk/headers.h:37 ../src/gtk/progressdialog.c:149
 #: ../src/gtk/sslcertwindow.c:164 ../src/prefs_summary_column.c:79
 #: ../src/summaryview.c:2793
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtk/headers.h:36 ../src/prefs_themes.c:906
+#: ../src/gtk/headers.h:37 ../src/prefs_themes.c:906
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face"
 msgstr "Face"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face:"
 msgstr "Face:"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To"
 msgstr "Disposition-Notification-To"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To:"
 msgstr "Disposition-Notification-To:"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To"
 msgstr "Return-Receipt-To"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To:"
 msgstr "Return-Receipt-To:"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent"
 msgstr "User-Agent"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent:"
 msgstr "User-Agent:"
 
-#: ../src/gtk/headers.h:41
+#: ../src/gtk/headers.h:42
 msgid "Content-Type"
 msgstr "Content-Type"
 
-#: ../src/gtk/headers.h:41 ../src/image_viewer.c:327
+#: ../src/gtk/headers.h:42 ../src/image_viewer.c:327
 msgid "Content-Type:"
 msgstr "Content-Type:"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding"
 msgstr "Content-Transfer-Encoding:"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding:"
 msgstr "Content-Transfer-Encoding:"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version"
 msgstr "MIME-Version"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version:"
 msgstr "MIME-Version:"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence"
 msgstr "Precedence"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence:"
 msgstr "Precedence:"
 
-#: ../src/gtk/headers.h:45 ../src/prefs_account.c:1073
+#: ../src/gtk/headers.h:46 ../src/prefs_account.c:1073
 msgid "Organization"
 msgstr "Organisation"
 
-#: ../src/gtk/headers.h:45
+#: ../src/gtk/headers.h:46
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List"
 msgstr "Mailingliste"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List:"
 msgstr "Mailingliste:"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post"
 msgstr "List-Post"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post:"
 msgstr "List-Post:"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe"
 msgstr "Listen-Anmelden"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe:"
 msgstr "Listen-Anmelden:"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe"
 msgstr "Listen-Abmelden"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe:"
 msgstr "Listen-Abmelden:"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help"
 msgstr "List-Help"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help:"
 msgstr "List-Help:"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive"
 msgstr "List-Archive"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive:"
 msgstr "List-Archive:"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner"
 msgstr "Listen-Eigentümer"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner:"
 msgstr "Listen-Eigentümer:"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label"
 msgstr "X-Label"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label:"
 msgstr "X-Label:"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer"
 msgstr "X-Mailer"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer:"
 msgstr "X-Mailer:"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status"
 msgstr "X-Status"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status:"
 msgstr "X-Status:"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face"
 msgstr "X-Face"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face:"
 msgstr "X-Face:"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive"
 msgstr "X-No-Archive"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive:"
 msgstr "X-No-Archive:"
 
 #. some common logical names referring to real header names
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to"
 msgstr "In Antwort auf"
 
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to:"
 msgstr "In Antwort auf:"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc"
 msgstr "An oder Cc"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc:"
 msgstr "An oder Cc:"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject"
 msgstr "Von, An oder Betreff"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject:"
 msgstr "Von, An oder Betreff:"
 
@@ -5262,10 +5458,10 @@ msgstr ""
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:457
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:400
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:550
-#: ../src/plugins/fancy/fancy_prefs.c:109
+#: ../src/plugins/fancy/fancy_prefs.c:114
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:178
 #: ../src/plugins/gdata/cm_gdata_prefs.c:145
-#: ../src/plugins/libravatar/libravatar_prefs.c:399
+#: ../src/plugins/libravatar/libravatar_prefs.c:439
 #: ../src/plugins/notification/notification_prefs.c:396
 #: ../src/plugins/notification/notification_prefs.c:410
 #: ../src/plugins/notification/notification_prefs.c:428
@@ -5275,9 +5471,9 @@ msgstr ""
 #: ../src/plugins/notification/notification_prefs.c:496
 #: ../src/plugins/notification/notification_prefs.c:513
 #: ../src/plugins/pgpcore/prefs_gpg.c:569
-#: ../src/plugins/rssyl/rssyl_prefs.c:65
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
+#: ../src/plugins/rssyl/rssyl_prefs.c:69
 #: ../src/plugins/spam_report/spam_report_prefs.c:79
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
 #: ../src/plugins/vcalendar/vcal_prefs.c:680 ../src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Plugins"
@@ -5319,7 +5515,7 @@ msgstr "Aktivierte Plugins"
 msgid "Page Index"
 msgstr "Seitenindex"
 
-#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:828
+#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:831
 msgid "_Hide"
 msgstr "_Ausblenden"
 
@@ -5332,74 +5528,78 @@ msgstr "_Ausblenden"
 msgid "Account"
 msgstr "Konto"
 
-#: ../src/gtk/quicksearch.c:452
+#: ../src/gtk/quicksearch.c:451
 msgid "all messages"
 msgstr "Alle Nachrichten"
 
-#: ../src/gtk/quicksearch.c:453
+#: ../src/gtk/quicksearch.c:452
 msgid "messages whose age is greater than # days"
 msgstr "Nachrichten, die älter sind als # Tage"
 
-#: ../src/gtk/quicksearch.c:454
+#: ../src/gtk/quicksearch.c:453
 msgid "messages whose age is less than # days"
 msgstr "Nachrichten, die jünger sind als # Tage"
 
-#: ../src/gtk/quicksearch.c:455
+#: ../src/gtk/quicksearch.c:454
 msgid "messages whose age is greater than # hours"
 msgstr "Nachrichten, die älter sind als # Stunden"
 
-#: ../src/gtk/quicksearch.c:456
+#: ../src/gtk/quicksearch.c:455
 msgid "messages whose age is less than # hours"
 msgstr "Nachrichten, die jünger sind als # Stunden"
 
-#: ../src/gtk/quicksearch.c:457
+#: ../src/gtk/quicksearch.c:456
 msgid "messages which contain S in the message body"
 msgstr "Nachrichten, die S im Nachrichtenkörper enthalten"
 
-#: ../src/gtk/quicksearch.c:458
+#: ../src/gtk/quicksearch.c:457
 msgid "messages which contain S in the whole message"
 msgstr "Nachrichten, die S in der ganzen Nachricht enthalten"
 
-#: ../src/gtk/quicksearch.c:459
+#: ../src/gtk/quicksearch.c:458
 msgid "messages carbon-copied to S"
 msgstr "Nachrichten mit Kopie an S"
 
-#: ../src/gtk/quicksearch.c:460
+#: ../src/gtk/quicksearch.c:459
 msgid "message is either to: or cc: to S"
 msgstr "Nachricht ist entweder to: oder cc: an S"
 
-#: ../src/gtk/quicksearch.c:461
+#: ../src/gtk/quicksearch.c:460
 msgid "deleted messages"
 msgstr "Gelöschte Nachrichten"
 
 #. * how I can filter deleted messages *
-#: ../src/gtk/quicksearch.c:462
+#: ../src/gtk/quicksearch.c:461
 msgid "messages which contain S in the Sender field"
-msgstr "Nachrichten, die S in der 'Sender' Kopfzeile enthalten"
+msgstr "Nachrichten, die S in der 'Absender'-Kopfzeile enthalten"
 
-#: ../src/gtk/quicksearch.c:463
+#: ../src/gtk/quicksearch.c:462
 msgid "true if execute \"S\" succeeds"
-msgstr "Wahr, wenn Ausführung von \"S\" erfolgreich"
+msgstr "Wahr, wenn Ausführung von S erfolgreich"
 
-#: ../src/gtk/quicksearch.c:464
+#: ../src/gtk/quicksearch.c:463
 msgid "messages originating from user S"
 msgstr "Nachrichten, die von Benutzer S stammen"
 
-#: ../src/gtk/quicksearch.c:465
+#: ../src/gtk/quicksearch.c:464
 msgid "forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: ../src/gtk/quicksearch.c:466
+#: ../src/gtk/quicksearch.c:465
 msgid "messages which have attachments"
 msgstr "Nachrichten mit Anhängen"
 
+#: ../src/gtk/quicksearch.c:466
+msgid "messages which contain S in any header name or value"
+msgstr "Nachrichten, deren Kopfzeilen irgendwo in Name oder Wert S enthalten"
+
 #: ../src/gtk/quicksearch.c:467
-msgid "messages which contain header S"
-msgstr "Nachrichten mit S in der Kopfzeile"
+msgid "messages which contain S in the value of any header"
+msgstr "Nachrichten, deren Kopfzeilen irgendwo den Wert S enthalten"
 
 #: ../src/gtk/quicksearch.c:468
 msgid "messages which contain S in Message-ID header"
-msgstr "Nachrichten mit S in der Message-ID-Kopfzeile"
+msgstr "Nachrichten mit S in der 'Message-ID'-Kopfzeile"
 
 #: ../src/gtk/quicksearch.c:469
 msgid "messages which contain S in In-Reply-To header"
@@ -5498,7 +5698,7 @@ msgstr ""
 
 #: ../src/gtk/quicksearch.c:492
 msgid "messages which contain S in X-Label header"
-msgstr "Nachrichten, die S in der X-Label-Kopfzeile enthalten"
+msgstr "Nachrichten, die S in der 'X-Label'-Kopfzeile enthalten"
 
 #: ../src/gtk/quicksearch.c:494
 msgid "logical AND operator"
@@ -5534,7 +5734,7 @@ msgid ""
 "in order to match and be displayed in the message list.\n"
 "The following symbols can be used:"
 msgstr ""
-"Die Erweiterte Suche erlaubt, Kriterien zu definieren, die Nachrichten "
+"Die erweiterte Suche erlaubt, Kriterien zu definieren, die Nachrichten "
 "erfüllen müssen, um in der Liste angezeigt zu werden.\n"
 "Folgende Symbole können verwendet werden:"
 
@@ -5586,7 +5786,7 @@ msgstr "Bearbeiten"
 
 #: ../src/gtk/quicksearch.c:819 ../src/gtk/quicksearch.c:834
 #: ../src/prefs_actions.c:347 ../src/prefs_filtering.c:495
-#: ../src/prefs_template.c:328
+#: ../src/prefs_template.c:330
 msgid "C_lear"
 msgstr "_Leeren"
 
@@ -5739,8 +5939,8 @@ msgstr "Marken:"
 #: ../src/plugins/notification/notification_popup.c:316
 #: ../src/plugins/notification/notification_popup.c:621
 #: ../src/plugins/notification/notification_trayicon.c:851
-#: ../src/summaryview.c:3351 ../src/summaryview.c:3369
-#: ../src/summaryview.c:3390
+#: ../src/summaryview.c:3353 ../src/summaryview.c:3371
+#: ../src/summaryview.c:3392
 msgid "(No From)"
 msgstr "(Kein Von)"
 
@@ -5748,7 +5948,7 @@ msgstr "(Kein Von)"
 #: ../src/plugins/notification/notification_popup.c:318
 #: ../src/plugins/notification/notification_popup.c:625
 #: ../src/plugins/notification/notification_trayicon.c:854
-#: ../src/summaryview.c:3403 ../src/summaryview.c:3407
+#: ../src/summaryview.c:3405 ../src/summaryview.c:3409
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
@@ -5756,7 +5956,7 @@ msgstr "(Kein Betreff)"
 msgid "Error:"
 msgstr "Fehler:"
 
-#: ../src/image_viewer.c:299 ../src/mimeview.c:2544
+#: ../src/image_viewer.c:299 ../src/mimeview.c:2545
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:698
 msgid "Filename:"
 msgstr "Dateiname:"
@@ -5769,31 +5969,31 @@ msgstr "Dateigröße:"
 msgid "Load Image"
 msgstr "Bild laden"
 
-#: ../src/imap.c:577
+#: ../src/imap.c:583
 msgid "IMAP4 connection broken\n"
 msgstr "IMAP4-Verbindung unterbrochen\n"
 
-#: ../src/imap.c:616
+#: ../src/imap.c:622
 #, c-format
 msgid "IMAP error on %s: authenticated\n"
 msgstr "IMAP Fehler auf %s: beglaubigt\n"
 
-#: ../src/imap.c:619
+#: ../src/imap.c:625
 #, c-format
 msgid "IMAP error on %s: not authenticated\n"
 msgstr "IMAP Fehler auf %s: nicht beglaubigt\n"
 
-#: ../src/imap.c:622
+#: ../src/imap.c:628
 #, c-format
 msgid "IMAP error on %s: bad state\n"
 msgstr "IMAP Fehler auf %s: schlechter Zustand\n"
 
-#: ../src/imap.c:625
+#: ../src/imap.c:631
 #, c-format
 msgid "IMAP error on %s: stream error\n"
 msgstr "IMAP Fehler auf %s: stream error\n"
 
-#: ../src/imap.c:628
+#: ../src/imap.c:634
 #, c-format
 msgid ""
 "IMAP error on %s: parse error (very probably non-RFC compliance from the "
@@ -5802,22 +6002,22 @@ msgstr ""
 "IMAP Fehler auf %s: parse error (sehr wahrscheinlich ein nicht RFC-konformer "
 "Server)\n"
 
-#: ../src/imap.c:632
+#: ../src/imap.c:638
 #, c-format
 msgid "IMAP error on %s: connection refused\n"
 msgstr "IMAP Fehler auf %s: Verbindung abgelehnt\n"
 
-#: ../src/imap.c:635
+#: ../src/imap.c:641
 #, c-format
 msgid "IMAP error on %s: memory error\n"
 msgstr "IMAP Fehler auf %s: Speicherfehler\n"
 
-#: ../src/imap.c:638
+#: ../src/imap.c:644
 #, c-format
 msgid "IMAP error on %s: fatal error\n"
 msgstr "IMAP Fehler auf %s: schwerer Fehler\n"
 
-#: ../src/imap.c:641
+#: ../src/imap.c:647
 #, c-format
 msgid ""
 "IMAP error on %s: protocol error(very probably non-RFC compliance from the "
@@ -5826,172 +6026,172 @@ msgstr ""
 "IMAP Fehler auf %s: Protokollfehler (sehr wahrscheinlich ein nicht RFC-"
 "konformer Server)\n"
 
-#: ../src/imap.c:645
+#: ../src/imap.c:651
 #, c-format
 msgid "IMAP error on %s: connection not accepted\n"
 msgstr "IMAP Fehler auf %s: Verbindung nicht akzeptiert\n"
 
-#: ../src/imap.c:648
+#: ../src/imap.c:654
 #, c-format
 msgid "IMAP error on %s: APPEND error\n"
 msgstr "IMAP Fehler auf %s: APPEND Fehler\n"
 
-#: ../src/imap.c:651
+#: ../src/imap.c:657
 #, c-format
 msgid "IMAP error on %s: NOOP error\n"
 msgstr "IMAP Fehler auf %s: NOOP Fehler\n"
 
-#: ../src/imap.c:654
+#: ../src/imap.c:660
 #, c-format
 msgid "IMAP error on %s: LOGOUT error\n"
 msgstr "IMAP Fehler auf %s: LOGOUT Fehler\n"
 
-#: ../src/imap.c:657
+#: ../src/imap.c:663
 #, c-format
 msgid "IMAP error on %s: CAPABILITY error\n"
 msgstr "IMAP Fehler auf %s: CAPABILITY Fehler\n"
 
-#: ../src/imap.c:660
+#: ../src/imap.c:666
 #, c-format
 msgid "IMAP error on %s: CHECK error\n"
 msgstr "IMAP Fehler auf %s: CHECK Fehler\n"
 
-#: ../src/imap.c:663
+#: ../src/imap.c:669
 #, c-format
 msgid "IMAP error on %s: CLOSE error\n"
 msgstr "IMAP Fehler auf %s: CLOSE Fehler\n"
 
-#: ../src/imap.c:666
+#: ../src/imap.c:672
 #, c-format
 msgid "IMAP error on %s: EXPUNGE error\n"
 msgstr "IMAP Fehler auf %s: EXPUNGE Fehler\n"
 
-#: ../src/imap.c:669
+#: ../src/imap.c:675
 #, c-format
 msgid "IMAP error on %s: COPY error\n"
 msgstr "IMAP Fehler auf %s: COPY Fehler\n"
 
-#: ../src/imap.c:672
+#: ../src/imap.c:678
 #, c-format
 msgid "IMAP error on %s: UID COPY error\n"
 msgstr "IMAP Fehler auf %s: UID COPY Fehler\n"
 
-#: ../src/imap.c:675
+#: ../src/imap.c:681
 #, c-format
 msgid "IMAP error on %s: CREATE error\n"
 msgstr "IMAP Fehler auf %s: CREATE Fehler\n"
 
-#: ../src/imap.c:678
+#: ../src/imap.c:684
 #, c-format
 msgid "IMAP error on %s: DELETE error\n"
 msgstr "IMAP Fehler auf %s: DELETE Fehler\n"
 
-#: ../src/imap.c:681
+#: ../src/imap.c:687
 #, c-format
 msgid "IMAP error on %s: EXAMINE error\n"
 msgstr "IMAP Fehler auf %s: EXAMINE Fehler\n"
 
-#: ../src/imap.c:684
+#: ../src/imap.c:690
 #, c-format
 msgid "IMAP error on %s: FETCH error\n"
 msgstr "IMAP Fehler auf %s: FETCH Fehler\n"
 
-#: ../src/imap.c:687
+#: ../src/imap.c:693
 #, c-format
 msgid "IMAP error on %s: UID FETCH error\n"
 msgstr "IMAP Fehler auf %s: UID FETCH Fehler\n"
 
-#: ../src/imap.c:690
+#: ../src/imap.c:696
 #, c-format
 msgid "IMAP error on %s: LIST error\n"
 msgstr "IMAP Fehler auf %s: LIST Fehler\n"
 
-#: ../src/imap.c:693
+#: ../src/imap.c:699
 #, c-format
 msgid "IMAP error on %s: LOGIN error\n"
 msgstr "IMAP Fehler auf %s: LOGIN Fehler\n"
 
-#: ../src/imap.c:696
+#: ../src/imap.c:702
 #, c-format
 msgid "IMAP error on %s: LSUB error\n"
 msgstr "IMAP Fehler auf %s: LSUB Fehler\n"
 
-#: ../src/imap.c:699
+#: ../src/imap.c:705
 #, c-format
 msgid "IMAP error on %s: RENAME error\n"
 msgstr "IMAP Fehler auf %s: RENAME Fehler\n"
 
-#: ../src/imap.c:702
+#: ../src/imap.c:708
 #, c-format
 msgid "IMAP error on %s: SEARCH error\n"
 msgstr "IMAP Fehler auf %s: SEARCH Fehler\n"
 
-#: ../src/imap.c:705
+#: ../src/imap.c:711
 #, c-format
 msgid "IMAP error on %s: UID SEARCH error\n"
 msgstr "IMAP Fehler auf %s: UID SEARCH Fehler\n"
 
-#: ../src/imap.c:708
+#: ../src/imap.c:714
 #, c-format
 msgid "IMAP error on %s: SELECT error\n"
 msgstr "IMAP Fehler auf %s: SELECT Fehler\n"
 
-#: ../src/imap.c:711
+#: ../src/imap.c:717
 #, c-format
 msgid "IMAP error on %s: STATUS error\n"
 msgstr "IMAP Fehler auf %s: STATUS Fehler\n"
 
-#: ../src/imap.c:714
+#: ../src/imap.c:720
 #, c-format
 msgid "IMAP error on %s: STORE error\n"
 msgstr "IMAP Fehler auf %s: STORE Fehler\n"
 
-#: ../src/imap.c:717
+#: ../src/imap.c:723
 #, c-format
 msgid "IMAP error on %s: UID STORE error\n"
 msgstr "IMAP Fehler auf %s: UID STORE Fehler\n"
 
-#: ../src/imap.c:720
+#: ../src/imap.c:726
 #, c-format
 msgid "IMAP error on %s: SUBSCRIBE error\n"
 msgstr "IMAP Fehler auf %s: SUBSCRIBE Fehler\n"
 
-#: ../src/imap.c:723
+#: ../src/imap.c:729
 #, c-format
 msgid "IMAP error on %s: UNSUBSCRIBE error\n"
 msgstr "IMAP Fehler auf %s: UNSUBSCRIBE Fehler\n"
 
-#: ../src/imap.c:726
+#: ../src/imap.c:732
 #, c-format
 msgid "IMAP error on %s: STARTTLS error\n"
 msgstr "IMAP Fehler auf %s: STARTTLS Fehler\n"
 
-#: ../src/imap.c:729
+#: ../src/imap.c:735
 #, c-format
 msgid "IMAP error on %s: INVAL error\n"
 msgstr "IMAP Fehler auf %s: INVAL Fehler\n"
 
-#: ../src/imap.c:732
+#: ../src/imap.c:738
 #, c-format
 msgid "IMAP error on %s: EXTENSION error\n"
 msgstr "IMAP Fehler auf %s: EXTENSION Fehler\n"
 
-#: ../src/imap.c:735
+#: ../src/imap.c:741
 #, c-format
 msgid "IMAP error on %s: SASL error\n"
 msgstr "IMAP Fehler auf %s: SASL Fehler\n"
 
-#: ../src/imap.c:739
+#: ../src/imap.c:745
 #, c-format
 msgid "IMAP error on %s: SSL error\n"
 msgstr "IMAP Fehler auf %s: SSL Fehler\n"
 
-#: ../src/imap.c:743
+#: ../src/imap.c:749
 #, c-format
 msgid "IMAP error on %s: Unknown error [%d]\n"
 msgstr "IMAP Fehler auf %s: unbekannter Fehler [%d]\n"
 
-#: ../src/imap.c:928
+#: ../src/imap.c:934
 msgid ""
 "\n"
 "\n"
@@ -6003,7 +6203,7 @@ msgstr ""
 "CRAM-MD5-Anmeldungen sind nur möglich, wenn libetpan mit SASL-Unterstützung "
 "kompiliert wurde und das CRAM-MD5 SASL-Plugin installiert ist."
 
-#: ../src/imap.c:934
+#: ../src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -6016,39 +6216,39 @@ msgstr ""
 "Unterstützung kompiliert wurde und das DIGEST-MD5 SASL-Plugin installiert "
 "ist."
 
-#: ../src/imap.c:941
+#: ../src/imap.c:947
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Verbindung zu %s schlug fehl: Login abgelehnt.%s"
 
-#: ../src/imap.c:945
+#: ../src/imap.c:951
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Verbindung zu %s schlug fehl: Login abgelehnt.%s\n"
 
-#: ../src/imap.c:963
+#: ../src/imap.c:969
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Verbindung zu %s schlug fehl"
 
-#: ../src/imap.c:970 ../src/imap.c:973
+#: ../src/imap.c:976 ../src/imap.c:979
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-Verbindung zu %s wurde unterbrochen. Neuverbindung...\n"
 
-#: ../src/imap.c:1003 ../src/imap.c:3583 ../src/imap.c:4242 ../src/imap.c:4339
-#: ../src/imap.c:4517 ../src/imap.c:5314
+#: ../src/imap.c:1009 ../src/imap.c:3619 ../src/imap.c:4278 ../src/imap.c:4375
+#: ../src/imap.c:4555 ../src/imap.c:5364
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail benötigt eine Netzwerkverbindung, um auf den IMAP-Server "
 "zuzugreifen."
 
-#: ../src/imap.c:1112 ../src/inc.c:818 ../src/news.c:387
+#: ../src/imap.c:1118 ../src/inc.c:818 ../src/news.c:387
 #: ../src/send_message.c:278
 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
-#: ../src/imap.c:1113 ../src/inc.c:819 ../src/news.c:388
+#: ../src/imap.c:1119 ../src/inc.c:819 ../src/news.c:388
 #: ../src/send_message.c:279
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
@@ -6063,109 +6263,109 @@ msgstr ""
 "Soll die Verbindung zu diesem Server fortgesetzt werden? Die Kommunikation "
 "wäre nicht geschützt."
 
-#: ../src/imap.c:1119 ../src/inc.c:825 ../src/news.c:394
+#: ../src/imap.c:1125 ../src/inc.c:825 ../src/news.c:394
 #: ../src/send_message.c:285
 msgid "Con_tinue connecting"
 msgstr "Das Verbinden _fortsetzen"
 
-#: ../src/imap.c:1129
+#: ../src/imap.c:1135
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Konto '%s': Verbinde mit IMAP4-Server: %s:%d..."
 
-#: ../src/imap.c:1177
+#: ../src/imap.c:1183
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Keine Verbindung zum IMAP4-Server: %s:%d"
 
-#: ../src/imap.c:1180
+#: ../src/imap.c:1186
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung zum IMAP4-Server: %s:%d\n"
 
-#: ../src/imap.c:1213 ../src/imap.c:4004
+#: ../src/imap.c:1219 ../src/imap.c:4040
 msgid "Can't start TLS session.\n"
 msgstr "TLS-Sitzung konnte nicht gestartet werden.\n"
 
-#: ../src/imap.c:1276
+#: ../src/imap.c:1282
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Anmeldung am IMAP-Server %s schlug fehl.\n"
 
-#: ../src/imap.c:1279
+#: ../src/imap.c:1285
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Anmeldung am IMAP-Server %s schlug fehl."
 
-#: ../src/imap.c:1679
+#: ../src/imap.c:1703
 msgid "Adding messages..."
 msgstr "Nachrichten werden hinzugefügt..."
 
-#: ../src/imap.c:1883 ../src/mh.c:520
+#: ../src/imap.c:1908 ../src/mh.c:526
 msgid "Copying messages..."
 msgstr "Nachrichten werden kopiert..."
 
-#: ../src/imap.c:2465
+#: ../src/imap.c:2492
 msgid "can't set deleted flags\n"
 msgstr "Gelöscht-Merker nicht setzbar\n"
 
-#: ../src/imap.c:2472 ../src/imap.c:4944
+#: ../src/imap.c:2499 ../src/imap.c:4994
 msgid "can't expunge\n"
 msgstr "Löschen schlug fehl\n"
 
-#: ../src/imap.c:2823
+#: ../src/imap.c:2850
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Suche nach nicht abonnierten Ordnern in %s..."
 
-#: ../src/imap.c:2826
+#: ../src/imap.c:2853
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Suche nach Unterordnern von %s..."
 
-#: ../src/imap.c:3123
+#: ../src/imap.c:3159
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Mailbox kann nicht erstellt werden: LIST schlug fehl\n"
 
-#: ../src/imap.c:3138
+#: ../src/imap.c:3174
 msgid "can't create mailbox\n"
 msgstr "Mailbox kann nicht erstellt werden\n"
 
-#: ../src/imap.c:3229
+#: ../src/imap.c:3265
 msgid "New folder name must not contain the namespace path separator"
 msgstr "Neuer Ordnername nur ohne den Pfadtrenner des Namensbereichs"
 
-#: ../src/imap.c:3269
+#: ../src/imap.c:3305
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s kann nicht in %s umbenannt werden\n"
 
-#: ../src/imap.c:3382
+#: ../src/imap.c:3418
 msgid "can't delete mailbox\n"
 msgstr "Mailbox kann nicht gelöscht werden\n"
 
-#: ../src/imap.c:3661
+#: ../src/imap.c:3697
 msgid "LIST failed\n"
 msgstr "LIST schlug fehl\n"
 
-#: ../src/imap.c:3746
+#: ../src/imap.c:3782
 msgid "Flagging messages..."
 msgstr "Nachrichten-Merker setzen..."
 
-#: ../src/imap.c:3849
+#: ../src/imap.c:3885
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Ordner %s kann nicht ausgewählt werden\n"
 
-#: ../src/imap.c:4001
+#: ../src/imap.c:4037
 msgid "Server requires TLS to log in.\n"
 msgstr "Server benötigt TLS zur Anmeldung.\n"
 
-#: ../src/imap.c:4011
+#: ../src/imap.c:4047
 msgid "Can't refresh capabilities.\n"
 msgstr "Ressourcen können nicht aktualisiert werden.\n"
 
-#: ../src/imap.c:4016
+#: ../src/imap.c:4052
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -6174,20 +6374,20 @@ msgstr ""
 "Verbindung zu %s schlug fehl: Server benötigt TLS, aber Claws Mail wurde "
 "ohne OpenSSL kompiliert.\n"
 
-#: ../src/imap.c:4024
+#: ../src/imap.c:4060
 msgid "Server logins are disabled.\n"
 msgstr "Serveranmeldungen nicht bereit.\n"
 
-#: ../src/imap.c:4247
+#: ../src/imap.c:4283
 msgid "Fetching message..."
 msgstr "Nachricht wird abgeholt..."
 
-#: ../src/imap.c:4937
+#: ../src/imap.c:4987
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Gelöscht-Merker nicht setzbar: %d\n"
 
-#: ../src/imap.c:5973
+#: ../src/imap.c:6023
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6222,7 +6422,7 @@ msgid "Cop_y folder..."
 msgstr "Ordner _kopieren..."
 
 #: ../src/imap_gtk.c:69 ../src/mh_gtk.c:59
-#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:61
+#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:55
 msgid "_Delete folder..."
 msgstr "Ordner _löschen..."
 
@@ -6284,7 +6484,7 @@ msgstr "Eigenschaften des Überordners übernehmen"
 
 #: ../src/imap_gtk.c:261 ../src/mh_gtk.c:249 ../src/news_gtk.c:306
 #: ../src/plugins/mailmbox/plugin_gtk.c:405
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:331
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:196
 #: ../src/plugins/vcalendar/vcal_folder.c:2032
 #, c-format
 msgid "Input new name for '%s':"
@@ -6292,14 +6492,14 @@ msgstr "Neuer Name für '%s':"
 
 #: ../src/imap_gtk.c:263 ../src/mh_gtk.c:251
 #: ../src/plugins/mailmbox/plugin_gtk.c:406
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:332
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:197
 #: ../src/plugins/vcalendar/vcal_folder.c:2033
 msgid "Rename folder"
 msgstr "Ordner umbenennen"
 
 #: ../src/imap_gtk.c:292 ../src/mh_gtk.c:274 ../src/news_gtk.c:328
 #: ../src/plugins/mailmbox/plugin_gtk.c:433
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:352
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:217
 #: ../src/plugins/vcalendar/vcal_folder.c:2053
 msgid ""
 "The folder could not be renamed.\n"
@@ -6309,7 +6509,7 @@ msgstr ""
 "Der neue Name ist nicht zulässig."
 
 #: ../src/imap_gtk.c:360 ../src/mh_gtk.c:199
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:233
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:149
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6324,7 +6524,7 @@ msgstr ""
 
 #: ../src/imap_gtk.c:381 ../src/mh_gtk.c:220 ../src/news_gtk.c:281
 #: ../src/plugins/mailmbox/plugin_gtk.c:341
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:254
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:170
 #: ../src/plugins/vcalendar/vcal_folder.c:1986
 #, c-format
 msgid "Can't remove the folder '%s'."
@@ -6352,7 +6552,7 @@ msgstr "+_Suchen"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Wählen Sie einen Unterordner von %s zum Abonnieren: "
 
-#: ../src/imap_gtk.c:537 ../src/mainwindow.c:672
+#: ../src/imap_gtk.c:537 ../src/mainwindow.c:674
 msgid "Subscribe"
 msgstr "Abonnieren"
 
@@ -6629,7 +6829,7 @@ msgid "Auth failed"
 msgstr "Authentifizierung schlug fehl"
 
 #. S_COL_SCORE
-#: ../src/inc.c:662 ../src/prefs_matcher.c:393
+#: ../src/inc.c:662 ../src/prefs_matcher.c:396
 #: ../src/prefs_summary_column.c:88 ../src/summaryview.c:2789
 #: ../src/summaryview.c:6310
 msgid "Locked"
@@ -6816,23 +7016,10 @@ msgstr "%s%sSie arbeiten offline. Soll dies aufgehoben werden?"
 msgid "On_ly once"
 msgstr "nur einmal"
 
-#: ../src/ldapupdate.c:189
-#, c-format
-msgid "ldapsvr_retrieve_item_person->Unknown status: %d"
-msgstr ""
-
-#: ../src/ldapupdate.c:472
-msgid "ldapsvr_update_book: Could not clean cache\n"
-msgstr ""
-
+# SN ist ein LDAP-Attribut, sollte vermutlich nicht übersetzt werden. 
 #: ../src/ldapupdate.c:1056
 msgid "Some SN"
-msgstr ""
-
-#: ../src/ldapupdate.c:1440
-#, c-format
-msgid "ldapsvr_update_book->Unknown status: %s\n"
-msgstr ""
+msgstr "Some SN"
 
 #: ../src/ldif.c:776
 msgid "Nick Name"
@@ -7173,328 +7360,328 @@ msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: Netzwerk ist offline.\n"
 
 #. menus
-#: ../src/mainwindow.c:503 ../src/messageview.c:209
+#: ../src/mainwindow.c:505 ../src/messageview.c:209
 msgid "_File"
 msgstr "_Datei"
 
-#: ../src/mainwindow.c:505 ../src/messageview.c:211 ../src/summaryview.c:434
+#: ../src/mainwindow.c:507 ../src/messageview.c:211 ../src/summaryview.c:434
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../src/mainwindow.c:508
+#: ../src/mainwindow.c:510
 msgid "_Configuration"
 msgstr "_Konfiguration"
 
 #. File menu
-#: ../src/mainwindow.c:512
+#: ../src/mainwindow.c:514
 msgid "_Add mailbox"
 msgstr "_Neue Mailbox"
 
-#: ../src/mainwindow.c:513
+#: ../src/mainwindow.c:515
 msgid "MH..."
 msgstr "MH..."
 
-#: ../src/mainwindow.c:516
+#: ../src/mainwindow.c:518
 msgid "Change mailbox order..."
 msgstr "Reihenfolge der Mailboxen ändern..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:519
+#: ../src/mainwindow.c:521
 msgid "_Import mbox file..."
 msgstr "Mbox-Datei _importieren..."
 
-#: ../src/mainwindow.c:520
+#: ../src/mainwindow.c:522
 msgid "_Export to mbox file..."
 msgstr "In Mbox-Datei e_xportieren..."
 
-#: ../src/mainwindow.c:521
+#: ../src/mainwindow.c:523
 msgid "_Export selected to mbox file..."
 msgstr "Auswahl in Mbox-Datei _exportieren..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:523
+#: ../src/mainwindow.c:525
 msgid "Empty all _Trash folders"
 msgstr "Alle _Papierkörbe leeren"
 
 #. {"File/---",				NULL, "---" },
 #. File menu
-#: ../src/mainwindow.c:526 ../src/messageview.c:218
+#: ../src/mainwindow.c:528 ../src/messageview.c:218
 msgid "_Save email as..."
 msgstr "_Speichere E-Mail als..."
 
-#: ../src/mainwindow.c:527 ../src/messageview.c:219
+#: ../src/mainwindow.c:529 ../src/messageview.c:219
 msgid "_Save part as..."
 msgstr "_Speichere Teil als..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:530 ../src/messageview.c:220
+#: ../src/mainwindow.c:532 ../src/messageview.c:220
 msgid "Page setup..."
 msgstr "D_atei/Seite einrichten..."
 
-#: ../src/mainwindow.c:531 ../src/messageview.c:221
+#: ../src/mainwindow.c:533 ../src/messageview.c:221
 msgid "_Print..."
 msgstr "_Drucken..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:533
+#: ../src/mainwindow.c:535
 msgid "Synchronise folders"
 msgstr "Ordner syn_chronisieren"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:535
+#: ../src/mainwindow.c:537
 msgid "E_xit"
 msgstr "_Beenden"
 
-#: ../src/mainwindow.c:540
+#: ../src/mainwindow.c:542
 msgid "Select _thread"
 msgstr "Diskurs aus_wählen"
 
-#: ../src/mainwindow.c:541
+#: ../src/mainwindow.c:543
 msgid "_Delete thread"
 msgstr "_Diskurs entfernen"
 
-#: ../src/mainwindow.c:543
+#: ../src/mainwindow.c:545
 msgid "_Find in current message..."
 msgstr "In aktueller _Nachricht suchen..."
 
-#: ../src/mainwindow.c:545
+#: ../src/mainwindow.c:547
 msgid "_Quick search"
 msgstr "_Schnellsuche"
 
 #. View menu
-#: ../src/mainwindow.c:548
+#: ../src/mainwindow.c:550
 msgid "Show or hi_de"
 msgstr "Ein- oder Aus_blenden"
 
-#: ../src/mainwindow.c:549
+#: ../src/mainwindow.c:551
 msgid "_Toolbar"
 msgstr "_Werkzeugleiste"
 
-#: ../src/mainwindow.c:551
+#: ../src/mainwindow.c:553
 msgid "Set displayed _columns"
 msgstr "Angezeigte _Spalten"
 
-#: ../src/mainwindow.c:552
+#: ../src/mainwindow.c:554
 msgid "In _folder list..."
 msgstr "in _Ordnerliste..."
 
-#: ../src/mainwindow.c:553
+#: ../src/mainwindow.c:555
 msgid "In _message list..."
 msgstr "in _Nachrichtenliste..."
 
-#: ../src/mainwindow.c:558
+#: ../src/mainwindow.c:560
 msgid "La_yout"
 msgstr "Bildschirm-La_yout"
 
-#: ../src/mainwindow.c:561
+#: ../src/mainwindow.c:563
 msgid "_Sort"
 msgstr "_Sortieren nach"
 
-#: ../src/mainwindow.c:563
+#: ../src/mainwindow.c:565
 msgid "_Attract by subject"
 msgstr "Diskurse na_ch Betreff aufbauen"
 
-#: ../src/mainwindow.c:565
+#: ../src/mainwindow.c:567
 msgid "E_xpand all threads"
 msgstr "Alle Diskurse _ausklappen"
 
-#: ../src/mainwindow.c:566
+#: ../src/mainwindow.c:568
 msgid "Co_llapse all threads"
 msgstr "Alle Diskurse _einklappen"
 
 #. View menu
-#: ../src/mainwindow.c:568 ../src/messageview.c:232
+#: ../src/mainwindow.c:570 ../src/messageview.c:232
 msgid "_Go to"
 msgstr "Ge_he zu"
 
-#: ../src/mainwindow.c:569 ../src/messageview.c:233
+#: ../src/mainwindow.c:571 ../src/messageview.c:233
 msgid "_Previous message"
 msgstr "voriger N_achricht"
 
-#: ../src/mainwindow.c:570 ../src/messageview.c:234
+#: ../src/mainwindow.c:572 ../src/messageview.c:234
 msgid "_Next message"
 msgstr "nächster Na_chricht"
 
-#: ../src/mainwindow.c:572 ../src/messageview.c:236
+#: ../src/mainwindow.c:574 ../src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "vorig_er ungelesener Nachricht"
 
-#: ../src/mainwindow.c:573 ../src/messageview.c:237
+#: ../src/mainwindow.c:575 ../src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "nächster un_gelesener Nachricht"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:575 ../src/messageview.c:239
+#: ../src/mainwindow.c:577 ../src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "_voriger neuer Nachricht"
 
-#: ../src/mainwindow.c:576 ../src/messageview.c:240
+#: ../src/mainwindow.c:578 ../src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "nächster neuer Nachr_icht"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:578 ../src/messageview.c:242
+#: ../src/mainwindow.c:580 ../src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "voriger mar_kierter Nachricht"
 
-#: ../src/mainwindow.c:579 ../src/messageview.c:243
+#: ../src/mainwindow.c:581 ../src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "nächster _markierter Nachricht"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:581 ../src/messageview.c:245
+#: ../src/mainwindow.c:583 ../src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "voriger ei_ngefärbter Nachricht"
 
-#: ../src/mainwindow.c:582 ../src/messageview.c:246
+#: ../src/mainwindow.c:584 ../src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "nächster eingefärbter Nach_richt"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:584 ../src/messageview.c:248
+#: ../src/mainwindow.c:586 ../src/messageview.c:248
 msgid "Previous opened message"
 msgstr "voriger geöffneter Nachricht"
 
-#: ../src/mainwindow.c:585 ../src/messageview.c:249
+#: ../src/mainwindow.c:587 ../src/messageview.c:249
 msgid "Next opened message"
 msgstr "nächster geöffneter Nachricht"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:587 ../src/messageview.c:251
+#: ../src/mainwindow.c:589 ../src/messageview.c:251
 msgid "Parent message"
 msgstr "übergeordne_ter Nachricht"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:589 ../src/messageview.c:253
+#: ../src/mainwindow.c:591 ../src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "nächstem _ungelesenen Ordner"
 
-#: ../src/mainwindow.c:590 ../src/messageview.c:254
+#: ../src/mainwindow.c:592 ../src/messageview.c:254
 msgid "_Other folder..."
 msgstr "anderem _Ordner..."
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:592 ../src/messageview.c:256 ../src/mimeview.c:201
+#: ../src/mainwindow.c:594 ../src/messageview.c:256 ../src/mimeview.c:201
 msgid "Next part"
 msgstr "Nächster Teil"
 
-#: ../src/mainwindow.c:593 ../src/messageview.c:257 ../src/mimeview.c:202
+#: ../src/mainwindow.c:595 ../src/messageview.c:257 ../src/mimeview.c:202
 msgid "Previous part"
 msgstr "Voriger Teil"
 
 #. {"View/Scroll/---",                  NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:596 ../src/messageview.c:258
+#: ../src/mainwindow.c:598 ../src/messageview.c:258
 msgid "Message scroll"
 msgstr "Blättere zu"
 
-#: ../src/mainwindow.c:597 ../src/messageview.c:259
+#: ../src/mainwindow.c:599 ../src/messageview.c:259
 msgid "Previous line"
 msgstr "voriger Zeile"
 
-#: ../src/mainwindow.c:598 ../src/messageview.c:260
+#: ../src/mainwindow.c:600 ../src/messageview.c:260
 msgid "Next line"
 msgstr "nächster Zeile"
 
-#: ../src/mainwindow.c:599 ../src/messageview.c:261 ../src/printing.c:481
+#: ../src/mainwindow.c:601 ../src/messageview.c:261 ../src/printing.c:481
 msgid "Previous page"
 msgstr "voriger Seite"
 
-#: ../src/mainwindow.c:600 ../src/messageview.c:262 ../src/printing.c:488
+#: ../src/mainwindow.c:602 ../src/messageview.c:262 ../src/printing.c:488
 msgid "Next page"
 msgstr "nächster Seite"
 
-#: ../src/mainwindow.c:618 ../src/messageview.c:280
+#: ../src/mainwindow.c:620 ../src/messageview.c:280
 msgid "Decode"
 msgstr "De_kodierung"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:625
+#: ../src/mainwindow.c:627
 msgid "Open in new _window"
 msgstr "Öffnen in neuem _Fenster"
 
-#: ../src/mainwindow.c:626 ../src/messageview.c:287
+#: ../src/mainwindow.c:628 ../src/messageview.c:287
 msgid "Mess_age source"
 msgstr "_Quelltext anzeigen"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:628 ../src/messageview.c:288
+#: ../src/mainwindow.c:630 ../src/messageview.c:288
 msgid "Message part"
 msgstr "Nachrichtenteil"
 
-#: ../src/mainwindow.c:629 ../src/messageview.c:289
+#: ../src/mainwindow.c:631 ../src/messageview.c:289
 msgid "View as text"
 msgstr "Als Text darstellen"
 
-#: ../src/mainwindow.c:630 ../src/messageview.c:290 ../src/toolbar.c:403
+#: ../src/mainwindow.c:632 ../src/messageview.c:290 ../src/toolbar.c:403
 msgid "Open"
 msgstr "Öffnen"
 
-#: ../src/mainwindow.c:632 ../src/messageview.c:292
+#: ../src/mainwindow.c:634 ../src/messageview.c:292
 msgid "Open with..."
 msgstr "Öffnen mit..."
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:636 ../src/messageview.c:295
+#: ../src/mainwindow.c:638 ../src/messageview.c:295
 msgid "Quotes"
 msgstr "_Zitate"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:638
+#: ../src/mainwindow.c:640
 msgid "_Update summary"
 msgstr "Darstellung akt_ualisieren"
 
 #. Message menu
-#: ../src/mainwindow.c:641
+#: ../src/mainwindow.c:643
 msgid "Recei_ve"
 msgstr "_Empfangen"
 
-#: ../src/mainwindow.c:642
+#: ../src/mainwindow.c:644
 msgid "Get from _current account"
 msgstr "Vom a_ktuellen Konto"
 
-#: ../src/mainwindow.c:643
+#: ../src/mainwindow.c:645
 msgid "Get from _all accounts"
 msgstr "Von _allen Konten"
 
-#: ../src/mainwindow.c:644
+#: ../src/mainwindow.c:646
 msgid "Cancel receivin_g"
 msgstr "Empfang _abbrechen"
 
-#: ../src/mainwindow.c:647
+#: ../src/mainwindow.c:649
 msgid "_Send queued messages"
 msgstr "Vorgespei_cherte Nachrichten senden"
 
-#: ../src/mainwindow.c:652
+#: ../src/mainwindow.c:654
 msgid "Compose a_n email message"
 msgstr "Neue _Nachricht verfassen"
 
-#: ../src/mainwindow.c:653
+#: ../src/mainwindow.c:655
 msgid "Compose a news message"
 msgstr "Neue _News-Nachricht verfassen"
 
-#: ../src/mainwindow.c:655 ../src/messageview.c:301
+#: ../src/mainwindow.c:657 ../src/messageview.c:301
 #: ../src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Antworten"
 
 #. COMPOSE_REPLY
-#: ../src/mainwindow.c:656 ../src/messageview.c:302 ../src/summaryview.c:426
+#: ../src/mainwindow.c:658 ../src/messageview.c:302 ../src/summaryview.c:426
 msgid "Repl_y to"
 msgstr "An_twort an"
 
 #. COMPOSE_REPLY_TO_SENDER
-#: ../src/mainwindow.c:659 ../src/messageview.c:305
+#: ../src/mainwindow.c:661 ../src/messageview.c:305
 msgid "Mailing _list"
 msgstr "Mailingliste"
 
 #. COMPOSE_REPLY_TO_LIST
-#: ../src/mainwindow.c:660
+#: ../src/mainwindow.c:662
 msgid "Follow-up and reply to"
 msgstr "Fo_llow-up und Antwort an"
 
@@ -7502,181 +7689,181 @@ msgstr "Fo_llow-up und Antwort an"
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REPLY_TO_LIST
 #. {"Message/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:663 ../src/messageview.c:308 ../src/toolbar.c:2069
+#: ../src/mainwindow.c:665 ../src/messageview.c:308 ../src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
 #. COMPOSE_FORWARD_INLINE
-#: ../src/mainwindow.c:664 ../src/messageview.c:309 ../src/toolbar.c:2070
+#: ../src/mainwindow.c:666 ../src/messageview.c:309 ../src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "We_iterleiten als Anhang"
 
 #. COMPOSE_FORWARD_AS_ATTACH
-#: ../src/mainwindow.c:665 ../src/messageview.c:310 ../src/toolbar.c:2071
+#: ../src/mainwindow.c:667 ../src/messageview.c:310 ../src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "_Umleiten"
 
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:667
+#: ../src/mainwindow.c:669
 msgid "Mailing-_List"
 msgstr "Mailin_gliste"
 
-#: ../src/mainwindow.c:668
+#: ../src/mainwindow.c:670
 msgid "Post"
 msgstr "_Verfassen"
 
-#: ../src/mainwindow.c:670
+#: ../src/mainwindow.c:672
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../src/mainwindow.c:674
+#: ../src/mainwindow.c:676
 msgid "Unsubscribe"
 msgstr "A_bmelden"
 
-#: ../src/mainwindow.c:676
+#: ../src/mainwindow.c:678
 msgid "View archive"
 msgstr "Archiv ansehen"
 
-#: ../src/mainwindow.c:678
+#: ../src/mainwindow.c:680
 msgid "Contact owner"
 msgstr "Kontakt"
 
 #. separation
-#: ../src/mainwindow.c:682
+#: ../src/mainwindow.c:684
 msgid "M_ove..."
 msgstr "_Verschieben..."
 
-#: ../src/mainwindow.c:683
+#: ../src/mainwindow.c:685
 msgid "_Copy..."
 msgstr "_Kopieren..."
 
-#: ../src/mainwindow.c:684
+#: ../src/mainwindow.c:686
 msgid "Move to _trash"
 msgstr "In den _Papierkorb verschieben"
 
-#: ../src/mainwindow.c:685
+#: ../src/mainwindow.c:687
 msgid "_Delete..."
 msgstr "_Löschen..."
 
-#: ../src/mainwindow.c:686
+#: ../src/mainwindow.c:688
 msgid "Cancel a news message"
 msgstr "New_s-Beitrag annullieren"
 
 #. separation
-#: ../src/mainwindow.c:689 ../src/mainwindow.c:690 ../src/summaryview.c:427
+#: ../src/mainwindow.c:691 ../src/mainwindow.c:692 ../src/summaryview.c:427
 msgid "_Mark"
 msgstr "_Markieren"
 
-#: ../src/mainwindow.c:691
+#: ../src/mainwindow.c:693
 msgid "_Unmark"
 msgstr "_Demarkieren"
 
-#: ../src/mainwindow.c:694
+#: ../src/mainwindow.c:696
 msgid "Mark as unr_ead"
 msgstr "_Als ungelesen markieren"
 
-#: ../src/mainwindow.c:695
+#: ../src/mainwindow.c:697
 msgid "Mark as rea_d"
 msgstr "Als g_elesen markieren"
 
 #. separation
-#: ../src/mainwindow.c:697
+#: ../src/mainwindow.c:699
 msgid "Mark all read"
 msgstr "Alle als _gelesen markieren"
 
 #. separation
-#: ../src/mainwindow.c:699 ../src/prefs_filtering_action.c:199
+#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:199
 #: ../src/toolbar.c:208 ../src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Dis_kurs ignorieren"
 
-#: ../src/mainwindow.c:700
+#: ../src/mainwindow.c:702
 msgid "Unignore thread"
 msgstr "Diskurs _nicht ignorieren"
 
-#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:200
+#: ../src/mainwindow.c:703 ../src/prefs_filtering_action.c:200
 #: ../src/toolbar.c:209 ../src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Diskurs be_obachten"
 
-#: ../src/mainwindow.c:702
+#: ../src/mainwindow.c:704
 msgid "Unwatch thread"
 msgstr "Disk_urs nicht beobachten"
 
 #. separation
-#: ../src/mainwindow.c:705
+#: ../src/mainwindow.c:707
 msgid "Mark as _spam"
 msgstr "Als _Spam markieren"
 
-#: ../src/mainwindow.c:706
+#: ../src/mainwindow.c:708
 msgid "Mark as _ham"
 msgstr "Als Nic_ht-Spam markieren"
 
 #. separation
-#: ../src/mainwindow.c:709 ../src/prefs_filtering_action.c:181
+#: ../src/mainwindow.c:711 ../src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "_Sperren"
 
-#: ../src/mainwindow.c:710 ../src/prefs_filtering_action.c:182
+#: ../src/mainwindow.c:712 ../src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "En_tsperren"
 
-#: ../src/mainwindow.c:712 ../src/summaryview.c:428
+#: ../src/mainwindow.c:714 ../src/summaryview.c:428
 msgid "Color la_bel"
 msgstr "_Farbmarkierung"
 
-#: ../src/mainwindow.c:713 ../src/summaryview.c:429
+#: ../src/mainwindow.c:715 ../src/summaryview.c:429
 msgid "Ta_gs"
 msgstr "Nachrichten-Mar_ken"
 
 #. {"Message/---",			NULL, "---" },
-#: ../src/mainwindow.c:716
+#: ../src/mainwindow.c:718
 msgid "Re-_edit"
 msgstr "Ü_berarbeiten"
 
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:719 ../src/messageview.c:311 ../src/mimeview.c:1027
+#: ../src/mainwindow.c:721 ../src/messageview.c:311 ../src/mimeview.c:1027
 msgid "Check signature"
 msgstr "Digitale Signatur prüfen"
 
-#: ../src/mainwindow.c:724 ../src/messageview.c:315
+#: ../src/mainwindow.c:726 ../src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "A_bsender ins Adressbuch übernehmen"
 
-#: ../src/mainwindow.c:726
+#: ../src/mainwindow.c:728
 msgid "C_ollect addresses"
 msgstr "Adressen sa_mmeln"
 
-#: ../src/mainwindow.c:727
+#: ../src/mainwindow.c:729
 msgid "From current _folder..."
 msgstr "Aus aktuellem Ordner..."
 
-#: ../src/mainwindow.c:728
+#: ../src/mainwindow.c:730
 msgid "From selected _messages..."
 msgstr "Aus gewählten Nachrichten..."
 
 # msgid "/_Tools/---"
 # msgstr "/E_xtras/---"
-#: ../src/mainwindow.c:731
+#: ../src/mainwindow.c:733
 msgid "_Filter all messages in folder"
 msgstr "All_e Nachrichten im Ordner filtern"
 
 # msgid "/_Tools/---"
 # msgstr "/E_xtras/---"
-#: ../src/mainwindow.c:732
+#: ../src/mainwindow.c:734
 msgid "Filter _selected messages"
 msgstr "_Gewählte Nachrichten filtern"
 
-#: ../src/mainwindow.c:733
+#: ../src/mainwindow.c:735
 msgid "Run folder pr_ocessing rules"
 msgstr "Ordner-Verarbeitungsregeln _anwenden"
 
-#: ../src/mainwindow.c:735 ../src/messageview.c:318
+#: ../src/mainwindow.c:737 ../src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "Filterre_gel erstellen"
 
-#: ../src/mainwindow.c:736 ../src/mainwindow.c:742 ../src/messageview.c:319
+#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/messageview.c:319
 #: ../src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automatisch"
@@ -7684,7 +7871,7 @@ msgstr "_Automatisch"
 #. FILTER_BY_AUTO
 #. radio SORT_BY_THREAD_DATE
 #. FILTER_BY_AUTO
-#: ../src/mainwindow.c:737 ../src/mainwindow.c:743 ../src/mainwindow.c:845
+#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/mainwindow.c:848
 #: ../src/messageview.c:320 ../src/messageview.c:326
 msgid "By _From"
 msgstr "_Nach Absender"
@@ -7692,386 +7879,391 @@ msgstr "_Nach Absender"
 #. FILTER_BY_FROM
 #. radio SORT_BY_FROM
 #. FILTER_BY_FROM
-#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/mainwindow.c:846
+#: ../src/mainwindow.c:740 ../src/mainwindow.c:746 ../src/mainwindow.c:849
 #: ../src/messageview.c:321 ../src/messageview.c:327
 msgid "By _To"
 msgstr "Nach _Empfänger"
 
 #. FILTER_BY_TO
-#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/messageview.c:322
+#: ../src/mainwindow.c:741 ../src/mainwindow.c:747 ../src/messageview.c:322
 #: ../src/messageview.c:328
 msgid "By _Subject"
 msgstr "Nach _Betreff"
 
 #. FILTER_BY_SUBJECT
-#: ../src/mainwindow.c:741 ../src/messageview.c:324 ../src/summaryview.c:432
+#: ../src/mainwindow.c:743 ../src/messageview.c:324 ../src/summaryview.c:432
 msgid "Create processing rule"
 msgstr "_Verarbeitungsregel erstellen"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:748 ../src/messageview.c:332
+#: ../src/mainwindow.c:750 ../src/messageview.c:332
 msgid "List _URLs..."
 msgstr "_URLs anzeigen..."
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:755
+#: ../src/mainwindow.c:757
 msgid "Ch_eck for new messages in all folders"
 msgstr "Alle _Ordner auf neue Nachrichten prüfen"
 
-#: ../src/mainwindow.c:756
+#: ../src/mainwindow.c:758
 msgid "Delete du_plicated messages"
 msgstr "_Doppelte Nachrichten löschen"
 
-#: ../src/mainwindow.c:757
+#: ../src/mainwindow.c:759
 msgid "In selected folder"
 msgstr "In gewähltem Ordner"
 
-#: ../src/mainwindow.c:758
+#: ../src/mainwindow.c:760
 msgid "In all folders"
 msgstr "In allen Ordnern"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:761
+#: ../src/mainwindow.c:763
 msgid "E_xecute"
 msgstr "Ausfü_hren"
 
-#: ../src/mainwindow.c:762
+#: ../src/mainwindow.c:764
 msgid "Exp_unge"
 msgstr "_Löschen"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:765
+#: ../src/mainwindow.c:767
 msgid "SSL cer_tificates"
 msgstr "SSL-_Zertifikate"
 
-#: ../src/mainwindow.c:769
+#: ../src/mainwindow.c:771
 msgid "Filtering Lo_g"
 msgstr "_Filterprotokoll"
 
-#: ../src/mainwindow.c:771
+#: ../src/mainwindow.c:773
 msgid "Network _Log"
 msgstr "_Netzwerkprotokoll"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:773
+#: ../src/mainwindow.c:775
 msgid "_Forget all session passwords"
 msgstr "Alle _Sitzungskennwörter verwerfen"
 
 #. Configuration menu
-#: ../src/mainwindow.c:776
+#: ../src/mainwindow.c:778
 msgid "C_hange current account"
 msgstr "Aktuelles Konto _wechseln"
 
-#: ../src/mainwindow.c:778
+#: ../src/mainwindow.c:780
 msgid "_Preferences for current account..."
 msgstr "Einstellungen für akt_uelles Konto..."
 
-#: ../src/mainwindow.c:779
+#: ../src/mainwindow.c:781
 msgid "Create _new account..."
 msgstr "Neues _Konto erstellen..."
 
-#: ../src/mainwindow.c:780
+#: ../src/mainwindow.c:782
 msgid "_Edit accounts..."
 msgstr "Konten _bearbeiten..."
 
-#: ../src/mainwindow.c:783
+#: ../src/mainwindow.c:785
 msgid "P_references..."
 msgstr "_Einstellungen..."
 
-#: ../src/mainwindow.c:784
+#: ../src/mainwindow.c:786
 msgid "Pre-pr_ocessing..."
 msgstr "_Vorverarbeitungsregeln..."
 
-#: ../src/mainwindow.c:785
+#: ../src/mainwindow.c:787
 msgid "Post-pro_cessing..."
 msgstr "_Nachverarbeitungsregeln..."
 
-#: ../src/mainwindow.c:786
+#: ../src/mainwindow.c:788
 msgid "_Filtering..."
 msgstr "_Filtern..."
 
-#: ../src/mainwindow.c:787
+#: ../src/mainwindow.c:789
 msgid "_Templates..."
 msgstr "V_orlagen..."
 
-#: ../src/mainwindow.c:788
+#: ../src/mainwindow.c:790
 msgid "_Actions..."
 msgstr "_Aktionen..."
 
-#: ../src/mainwindow.c:789
+#: ../src/mainwindow.c:791
 msgid "Tag_s..."
 msgstr "_Marken..."
 
 #. {"Configuration/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:791
+#: ../src/mainwindow.c:793
 msgid "Plu_gins..."
 msgstr "Erweiterungen / _Plugins..."
 
 #. Help menu
-#: ../src/mainwindow.c:794
+#: ../src/mainwindow.c:796
 msgid "_Manual"
 msgstr "_Handbuch"
 
-#: ../src/mainwindow.c:795
+#: ../src/mainwindow.c:797
 msgid "_Online User-contributed FAQ"
 msgstr "_Online-FAQ mit Nutzerbeiträgen"
 
-#: ../src/mainwindow.c:796
+#: ../src/mainwindow.c:798
 msgid "Icon _Legend"
 msgstr "_Symbolerklärung"
 
-#: ../src/mainwindow.c:798
+#: ../src/mainwindow.c:800
 msgid "Set as default client"
 msgstr "Als Standardanwendung setzen"
 
-#: ../src/mainwindow.c:805
+#: ../src/mainwindow.c:807
 msgid "Offline _mode"
 msgstr "_Offline arbeiten"
 
 #. toggle
-#: ../src/mainwindow.c:806
+#: ../src/mainwindow.c:808
+msgid "Men_ubar"
+msgstr "Men_üleiste"
+
+#. toggle
+#: ../src/mainwindow.c:809
 msgid "_Message view"
 msgstr "Nachrichtenansicht"
 
-#: ../src/mainwindow.c:808
+#: ../src/mainwindow.c:811
 msgid "Status _bar"
 msgstr "Statusanzeige"
 
-#: ../src/mainwindow.c:810
+#: ../src/mainwindow.c:813
 msgid "Column headers"
 msgstr "Spaltenköpfe"
 
 #. toggle
-#: ../src/mainwindow.c:811
+#: ../src/mainwindow.c:814
 msgid "Th_read view"
 msgstr "_Diskurs-Ansicht"
 
 #. toggle
-#: ../src/mainwindow.c:812
+#: ../src/mainwindow.c:815
 msgid "Hide read threads"
 msgstr "Gelesene Diskurse verbergen"
 
 #. toggle
-#: ../src/mainwindow.c:813
+#: ../src/mainwindow.c:816
 msgid "_Hide read messages"
 msgstr "_Gelesene Nachrichten verbergen"
 
 #. toggle
-#: ../src/mainwindow.c:814
+#: ../src/mainwindow.c:817
 msgid "Hide deleted messages"
 msgstr "Gelöschte _Nachrichten verbergen"
 
 #. toggle
-#: ../src/mainwindow.c:815
+#: ../src/mainwindow.c:818
 msgid "_Fullscreen"
 msgstr "_Vollbildansicht"
 
 #. toggle
-#: ../src/mainwindow.c:816 ../src/messageview.c:344
+#: ../src/mainwindow.c:819 ../src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Alle _Kopfzeilen anzeigen"
 
 #. toggle
-#: ../src/mainwindow.c:817 ../src/messageview.c:345
+#: ../src/mainwindow.c:820 ../src/messageview.c:345
 msgid "_Collapse all"
 msgstr "Alle einklappen"
 
 #. 1 toggle
-#: ../src/mainwindow.c:818 ../src/messageview.c:346
+#: ../src/mainwindow.c:821 ../src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Ab _2. Ebene einklappen"
 
 #. 2 toggle
-#: ../src/mainwindow.c:819 ../src/messageview.c:347
+#: ../src/mainwindow.c:822 ../src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Ab _3. Ebene einklappen"
 
 #. toggle_toolbar_cb
-#: ../src/mainwindow.c:823
+#: ../src/mainwindow.c:826
 msgid "Text _below icons"
 msgstr "Text _unter Symbolen"
 
 #. radio TOOLBAR_BOTH
-#: ../src/mainwindow.c:824
+#: ../src/mainwindow.c:827
 msgid "Text be_side icons"
 msgstr "Text _neben Symbolen"
 
 #. radio TOOLBAR_BOTH_HORIZ
-#: ../src/mainwindow.c:825
+#: ../src/mainwindow.c:828
 msgid "_Icons only"
 msgstr "Nur _Symbole"
 
 #. radio TOOLBAR_ICON
-#: ../src/mainwindow.c:826
+#: ../src/mainwindow.c:829
 msgid "_Text only"
 msgstr "Nur _Text"
 
 #. set_layout_cb
-#: ../src/mainwindow.c:833
+#: ../src/mainwindow.c:836
 msgid "_Standard"
 msgstr "_Standard"
 
 #. radio NORMAL_LAYOUT
-#: ../src/mainwindow.c:834
+#: ../src/mainwindow.c:837
 msgid "_Three columns"
 msgstr "_Drei Spalten"
 
 #. radio VERTICAL_LAYOUT
-#: ../src/mainwindow.c:835
+#: ../src/mainwindow.c:838
 msgid "_Wide message"
 msgstr "_Breite Nachrichtenansicht"
 
 #. radio WIDE_LAYOUT
-#: ../src/mainwindow.c:836
+#: ../src/mainwindow.c:839
 msgid "W_ide message list"
 msgstr "Breite _Nachrichtenliste"
 
 #. radio WIDE_MSGLIST_LAYOUT
-#: ../src/mainwindow.c:837
+#: ../src/mainwindow.c:840
 msgid "S_mall screen"
 msgstr "_Ein-Feld-Anzeige"
 
 #. sort_summary_cb
-#: ../src/mainwindow.c:841
+#: ../src/mainwindow.c:844
 msgid "By _number"
 msgstr "Nummer"
 
 #. radio SORT_BY_NUMBER
-#: ../src/mainwindow.c:842
+#: ../src/mainwindow.c:845
 msgid "By s_ize"
 msgstr "Größe"
 
 #. radio SORT_BY_SIZE
-#: ../src/mainwindow.c:843
+#: ../src/mainwindow.c:846
 msgid "By _date"
 msgstr "_Datum"
 
 #. radio SORT_BY_DATE
-#: ../src/mainwindow.c:844
+#: ../src/mainwindow.c:847
 msgid "By thread date"
 msgstr "Diskursdatum"
 
 #. radio SORT_BY_TO
-#: ../src/mainwindow.c:847
+#: ../src/mainwindow.c:850
 msgid "By s_ubject"
 msgstr "_Betreff"
 
 #. radio SORT_BY_SUBJECT
-#: ../src/mainwindow.c:848
+#: ../src/mainwindow.c:851
 msgid "By _color label"
 msgstr "Farbmarkierung"
 
 #. radio SORT_BY_LABEL
-#: ../src/mainwindow.c:849
+#: ../src/mainwindow.c:852
 msgid "By tag"
 msgstr "Marke"
 
 #. radio SORT_BY_TAGS
-#: ../src/mainwindow.c:850
+#: ../src/mainwindow.c:853
 msgid "By _mark"
 msgstr "_Markierung"
 
 #. radio SORT_BY_MARK
-#: ../src/mainwindow.c:851
+#: ../src/mainwindow.c:854
 msgid "By _status"
 msgstr "Status"
 
 #. radio SORT_BY_STATUS
-#: ../src/mainwindow.c:852
+#: ../src/mainwindow.c:855
 msgid "By a_ttachment"
 msgstr "Anhang"
 
 #. radio SORT_BY_MIME
-#: ../src/mainwindow.c:853
+#: ../src/mainwindow.c:856
 msgid "By score"
 msgstr "Bewertung"
 
 #. radio SORT_BY_SCORE
-#: ../src/mainwindow.c:854
+#: ../src/mainwindow.c:857
 msgid "By locked"
 msgstr "Sperre"
 
 #. radio SORT_BY_LOCKED
-#: ../src/mainwindow.c:855
+#: ../src/mainwindow.c:858
 msgid "D_on't sort"
 msgstr "Nicht sortieren"
 
 #. sort_summary_type_cb
-#: ../src/mainwindow.c:859
+#: ../src/mainwindow.c:862
 msgid "Ascending"
 msgstr "Aufsteigend"
 
 #. radio SORT_ASCENDING
-#: ../src/mainwindow.c:860
+#: ../src/mainwindow.c:863
 msgid "Descending"
 msgstr "Absteigend"
 
-#: ../src/mainwindow.c:901 ../src/messageview.c:388
+#: ../src/mainwindow.c:904 ../src/messageview.c:388
 msgid "_Auto detect"
 msgstr "_Automatisch erkennen"
 
-#: ../src/mainwindow.c:1298 ../src/summaryview.c:6236
+#: ../src/mainwindow.c:1301 ../src/summaryview.c:6236
 msgid "Apply tags..."
 msgstr "Marken anwenden..."
 
-#: ../src/mainwindow.c:1936
+#: ../src/mainwindow.c:1943
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Es sind einige Fehler aufgetreten. Hier klicken um das Log anzusehen."
 
-#: ../src/mainwindow.c:1951
+#: ../src/mainwindow.c:1958
 msgid "You are online. Click the icon to go offline"
 msgstr "Sie sind online. Das Symbol anklicken, um offline zu gehen"
 
-#: ../src/mainwindow.c:1954
+#: ../src/mainwindow.c:1961
 msgid "You are offline. Click the icon to go online"
 msgstr "Sie sind offline. Das Symbol anklicken, um online zu gehen"
 
-#: ../src/mainwindow.c:1968
+#: ../src/mainwindow.c:1975
 msgid "Select account"
 msgstr "Konto wählen"
 
 #. init log instances data before creating log views
 #. Protocol log
-#: ../src/mainwindow.c:1995 ../src/prefs_logging.c:140
+#: ../src/mainwindow.c:2002 ../src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Netzwerkprotokoll"
 
-#: ../src/mainwindow.c:1999
+#: ../src/mainwindow.c:2006
 msgid "Filtering/Processing debug log"
 msgstr "Filter-/Verarbeitungsprotokoll"
 
-#: ../src/mainwindow.c:2018 ../src/prefs_logging.c:392
+#: ../src/mainwindow.c:2025 ../src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "Filterprotokoll aktiviert\n"
 
-#: ../src/mainwindow.c:2020 ../src/prefs_logging.c:394
+#: ../src/mainwindow.c:2027 ../src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "Filterprotokoll deaktiviert.\n"
 
-#: ../src/mainwindow.c:2460 ../src/mainwindow.c:2467 ../src/mainwindow.c:2510
-#: ../src/mainwindow.c:2543 ../src/mainwindow.c:2575 ../src/mainwindow.c:2620
+#: ../src/mainwindow.c:2470 ../src/mainwindow.c:2477 ../src/mainwindow.c:2520
+#: ../src/mainwindow.c:2553 ../src/mainwindow.c:2585 ../src/mainwindow.c:2630
 #: ../src/plugins/notification/notification_trayicon.c:360
-#: ../src/prefs_folder_item.c:1065
+#: ../src/plugins/rssyl/opml_import.c:73 ../src/prefs_folder_item.c:1065
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: ../src/mainwindow.c:2621 ../src/prefs_summary_open.c:114
+#: ../src/mainwindow.c:2631 ../src/prefs_summary_open.c:114
 msgid "none"
 msgstr "keine"
 
-#: ../src/mainwindow.c:2878 ../src/mainwindow.c:2882
+#: ../src/mainwindow.c:2888 ../src/mainwindow.c:2892
 msgid "Delete all messages in trash folders?"
 msgstr "Alle Nachrichten in Papierkörben löschen?"
 
-#: ../src/mainwindow.c:2879
+#: ../src/mainwindow.c:2889
 msgid "Don't quit"
 msgstr "Nicht beenden"
 
-#: ../src/mainwindow.c:2908 ../src/plugins/mailmbox/plugin_gtk.c:189
+#: ../src/mainwindow.c:2918 ../src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
-#: ../src/mainwindow.c:2909
+#: ../src/mainwindow.c:2919
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -8081,18 +8273,18 @@ msgstr ""
 "Wird eine existierende Mailbox angegeben,\n"
 "wird sie automatisch durchsucht."
 
-#: ../src/mainwindow.c:2915 ../src/plugins/mailmbox/plugin_gtk.c:196
-#: ../src/plugins/rssyl/rssyl_gtk.c:158
+#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:196
+#: ../src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Die Mailbox '%s' existiert bereits."
 
-#: ../src/mainwindow.c:2920 ../src/plugins/mailmbox/plugin_gtk.c:202
+#: ../src/mainwindow.c:2930 ../src/plugins/mailmbox/plugin_gtk.c:202
 #: ../src/setup.c:52 ../src/wizard.c:741
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:209
+#: ../src/mainwindow.c:2935 ../src/plugins/mailmbox/plugin_gtk.c:209
 #: ../src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
@@ -8103,137 +8295,137 @@ msgstr ""
 "Möglicherweise existieren einige Dateien bereits oder Sie haben keine "
 "Schreibrechte"
 
-#: ../src/mainwindow.c:3377
+#: ../src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "keine Nachrichten erlaubt"
 
-#: ../src/mainwindow.c:3955
+#: ../src/mainwindow.c:3965
 msgid "Mbox import has failed."
 msgstr "Mbox-Import schlug fehl."
 
-#: ../src/mainwindow.c:3964 ../src/mainwindow.c:3973
+#: ../src/mainwindow.c:3974 ../src/mainwindow.c:3983
 msgid "Export to mbox has failed."
 msgstr "Export in Mbox schlug fehl."
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit"
 msgstr "Beenden"
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit Claws Mail?"
 msgstr "Claws Mail beenden?"
 
-#: ../src/mainwindow.c:4205
+#: ../src/mainwindow.c:4215
 msgid "Folder synchronisation"
 msgstr "Ordner-Synchronisation"
 
-#: ../src/mainwindow.c:4206
+#: ../src/mainwindow.c:4216
 msgid "Do you want to synchronise your folders now?"
 msgstr "Sollen die Ordner jetzt synchronisiert werden?"
 
-#: ../src/mainwindow.c:4207
+#: ../src/mainwindow.c:4217
 msgid "+_Synchronise"
 msgstr "+_Synchronisieren"
 
-#: ../src/mainwindow.c:4636
+#: ../src/mainwindow.c:4659
 msgid "Deleting duplicated messages..."
 msgstr "Lösche doppelte Nachrichten..."
 
-#: ../src/mainwindow.c:4673
+#: ../src/mainwindow.c:4696
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d doppelte Nachricht in Ordner %d gelöscht.\n"
 msgstr[1] "%d doppelte Nachrichten in Ordner %d gelöscht.\n"
 
-#: ../src/mainwindow.c:4928 ../src/summaryview.c:5725
+#: ../src/mainwindow.c:4951 ../src/summaryview.c:5725
 msgid "Processing rules to apply before folder rules"
 msgstr "Ordnerregeln vorausgehende Verarbeitungsregeln"
 
-#: ../src/mainwindow.c:4936
+#: ../src/mainwindow.c:4959
 msgid "Processing rules to apply after folder rules"
 msgstr "Ordnerregeln nachfolgende Verarbeitungsregeln"
 
-#: ../src/mainwindow.c:4944 ../src/summaryview.c:5736
+#: ../src/mainwindow.c:4967 ../src/summaryview.c:5736
 msgid "Filtering configuration"
 msgstr "Filter-Konfiguration"
 
-#: ../src/mainwindow.c:5059
+#: ../src/mainwindow.c:5082
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Registrierung als Standardanwendung schlug fehl: Pfad zur ausführbaren Datei "
 "wurde nicht gefunden."
 
-#: ../src/mainwindow.c:5118
+#: ../src/mainwindow.c:5141
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail wurde als Standardanwendung eingetragen."
 
-#: ../src/mainwindow.c:5120
+#: ../src/mainwindow.c:5143
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Eintragung als Standardanwendung schlug fehl: es konnte nicht in die "
 "Registry geschrieben werden."
 
-#: ../src/mainwindow.c:5278
+#: ../src/mainwindow.c:5301
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "%d Kennwort in %d Konten verworfen.\n"
 msgstr[1] "%d Passwörter in %d Konten verworfen.\n"
 
-#: ../src/matcher.c:209 ../src/matcher.c:210 ../src/matcher.c:211
-#: ../src/matcher.c:212 ../src/matcher.c:213 ../src/matcher.c:214
-#: ../src/matcher.c:215
+#: ../src/matcher.c:211 ../src/matcher.c:212 ../src/matcher.c:213
+#: ../src/matcher.c:214 ../src/matcher.c:215 ../src/matcher.c:216
+#: ../src/matcher.c:217
 #, c-format
 msgid "%s header"
 msgstr "%s Kopfzeile"
 
-#: ../src/matcher.c:216
+#: ../src/matcher.c:218
 msgid "header"
 msgstr "Kopfzeile"
 
-#: ../src/matcher.c:217
+#: ../src/matcher.c:219
 msgid "header line"
 msgstr "Kopfzeile"
 
-#: ../src/matcher.c:218
+#: ../src/matcher.c:220
 msgid "body line"
 msgstr "Körperzeile"
 
-#: ../src/matcher.c:219
+#: ../src/matcher.c:221
 msgid "tag"
 msgstr "Marke"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553 ../src/message_search.c:205 ../src/prefs_matcher.c:739
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555 ../src/message_search.c:205 ../src/prefs_matcher.c:742
 #: ../src/summary_search.c:466
 msgid "Case sensitive"
 msgstr "Groß-/Kleinschreibung"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555
 msgid "Case insensitive"
 msgstr "Unabhängig von Groß- oder Kleinschreibung"
 
-#: ../src/matcher.c:1818
+#: ../src/matcher.c:1843
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "prüfe, ob Nachricht auf [ %s ] passt\n"
 
-#: ../src/matcher.c:1887 ../src/matcher.c:1906 ../src/matcher.c:1919
+#: ../src/matcher.c:1912 ../src/matcher.c:1931 ../src/matcher.c:1944
 msgid "message matches\n"
 msgstr "Nachricht ist passend\n"
 
-#: ../src/matcher.c:1894 ../src/matcher.c:1912 ../src/matcher.c:1921
+#: ../src/matcher.c:1919 ../src/matcher.c:1937 ../src/matcher.c:1946
 msgid "message does not match\n"
 msgstr "Nachricht ist unpassend\n"
 
-#: ../src/matcher.c:2184 ../src/matcher.c:2185 ../src/matcher.c:2186
-#: ../src/matcher.c:2187 ../src/matcher.c:2188 ../src/matcher.c:2189
-#: ../src/matcher.c:2190 ../src/matcher.c:2191
+#: ../src/matcher.c:2209 ../src/matcher.c:2210 ../src/matcher.c:2211
+#: ../src/matcher.c:2212 ../src/matcher.c:2213 ../src/matcher.c:2214
+#: ../src/matcher.c:2215 ../src/matcher.c:2216
 msgid "(none)"
 msgstr "(nichts)"
 
@@ -8261,8 +8453,8 @@ msgstr "Mbox-Datei überschreiben "
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Die Datei existiert bereits. Soll sie überschrieben werden?"
 
-#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1843
-#: ../src/prefs_themes.c:555 ../src/textview.c:3075
+#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1844
+#: ../src/prefs_themes.c:555 ../src/textview.c:3054
 msgid "Overwrite"
 msgstr "Überschreiben"
 
@@ -8357,7 +8549,7 @@ msgstr ""
 msgid "Fetching message (%s)..."
 msgstr "Nachricht (%s) wird abgeholt..."
 
-#: ../src/messageview.c:1357 ../src/procmime.c:1004
+#: ../src/messageview.c:1357 ../src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Entschlüsseln schlug fehl: %s"
@@ -8368,9 +8560,9 @@ msgstr ""
 "Nachricht entspricht nicht dem MIME-Standard und könnte falsch dargestellt "
 "werden."
 
-#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1996
-#: ../src/plugins/fancy/fancy_viewer.c:667 ../src/summaryview.c:4808
-#: ../src/summaryview.c:4811 ../src/textview.c:3063
+#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1997
+#: ../src/plugins/fancy/fancy_viewer.c:669 ../src/summaryview.c:4808
+#: ../src/summaryview.c:4811 ../src/textview.c:3042
 msgid "Save as"
 msgstr "Speichern als"
 
@@ -8478,7 +8670,7 @@ msgstr ""
 "Bitte wählen Sie, welches Konto Sie zum Senden der Empfangsbestätigung "
 "verwenden möchten:"
 
-#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_gtk.c:494
+#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_feed_props.c:533
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
@@ -8515,20 +8707,20 @@ msgstr ""
 "  Nachricht wurde in den Papierkorb oder einen anderen Ordner verschoben"
 
 #: ../src/messageview.c:2971 ../src/messageview.c:2977
-#: ../src/summaryview.c:4191 ../src/summaryview.c:6964
+#: ../src/summaryview.c:4193 ../src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "Beim Lernen ist ein Fehler aufgetreten.\n"
 
-#: ../src/mh.c:432
+#: ../src/mh.c:438
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "Nachricht %s kann nicht nach %s kopiert werden\n"
 
-#: ../src/mh.c:518
+#: ../src/mh.c:524
 msgid "Moving messages..."
 msgstr "Nachrichten werden verschoben..."
 
-#: ../src/mh.c:662 ../src/plugins/mailmbox/mailmbox_folder.c:839
+#: ../src/mh.c:668 ../src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Nachrichten werden gelöscht..."
 
@@ -8619,32 +8811,32 @@ msgstr "Digitale Signatur wird überprüft..."
 msgid "Go back to email"
 msgstr "Zurück zur E-Mail"
 
-#: ../src/mimeview.c:1762 ../src/mimeview.c:1851 ../src/mimeview.c:2043
-#: ../src/mimeview.c:2079 ../src/mimeview.c:2191
-#: ../src/plugins/fancy/fancy_viewer.c:420
+#: ../src/mimeview.c:1763 ../src/mimeview.c:1852 ../src/mimeview.c:2044
+#: ../src/mimeview.c:2080 ../src/mimeview.c:2192
+#: ../src/plugins/fancy/fancy_viewer.c:422
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Teil einer mehrteiligen Nachricht konnte nicht gespeichert werden: %s"
 
-#: ../src/mimeview.c:1840 ../src/textview.c:3073
+#: ../src/mimeview.c:1841 ../src/textview.c:3052
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Existierende Datei '%s' überschreiben?"
 
-#: ../src/mimeview.c:1882 ../src/plugins/archive/archiver_prefs.c:128
+#: ../src/mimeview.c:1883 ../src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
 msgstr "Zielordner auswählen"
 
-#: ../src/mimeview.c:1889 ../src/plugins/archive/archiver_prefs.c:134
+#: ../src/mimeview.c:1890 ../src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' ist kein Ordner."
 
-#: ../src/mimeview.c:2126 ../src/mimeview.c:2133 ../src/textview.c:2994
+#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2973
 msgid "Open with"
 msgstr "Öffnen mit"
 
-#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2995
+#: ../src/mimeview.c:2128 ../src/mimeview.c:2135 ../src/textview.c:2974
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8653,11 +8845,11 @@ msgstr ""
 "Geben Sie den Befehl zum Öffnen der Datei ein:\n"
 "('%s' wird durch den Dateinamen ersetzt)"
 
-#: ../src/mimeview.c:2225
+#: ../src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "Fremde Programmdatei ausführen?"
 
-#: ../src/mimeview.c:2226
+#: ../src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8669,19 +8861,19 @@ msgstr ""
 "\n"
 "Möchten Sie diese Datei ausführen?"
 
-#: ../src/mimeview.c:2230
+#: ../src/mimeview.c:2231
 msgid "Run binary"
 msgstr "Programmdatei ausführen"
 
-#: ../src/mimeview.c:2529
+#: ../src/mimeview.c:2530
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/mimeview.c:2530 ../src/plugins/pdf_viewer/poppler_viewer.c:699
+#: ../src/mimeview.c:2531 ../src/plugins/pdf_viewer/poppler_viewer.c:699
 msgid "Size:"
 msgstr "Größe:"
 
-#: ../src/mimeview.c:2544 ../src/plugins/vcalendar/vcalendar.c:1271
+#: ../src/mimeview.c:2545 ../src/plugins/vcalendar/vcalendar.c:1271
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1722
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1732
 msgid "Description:"
@@ -8813,7 +9005,7 @@ msgstr "Newsgruppe '%s' wirklich abmelden?"
 msgid "Unsubscribe newsgroup"
 msgstr "Newsgruppe abmelden"
 
-#: ../src/news_gtk.c:268 ../src/plugins/rssyl/rssyl_gtk.c:695
+#: ../src/news_gtk.c:268
 msgid "_Unsubscribe"
 msgstr "_Abmelden"
 
@@ -8961,7 +9153,7 @@ msgstr "Pfad zum Adressbuch, in dem die Adressen gespeichert werden"
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:201
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:447
 #: ../src/prefs_filtering_action.c:573 ../src/prefs_filtering_action.c:580
-#: ../src/prefs_matcher.c:676
+#: ../src/prefs_matcher.c:679
 msgid "Select..."
 msgstr "Auswählen..."
 
@@ -9074,36 +9266,36 @@ msgstr "Abbrechen-Schaltfläche drücken um Archivierung abzubrechen"
 msgid "Archiving:"
 msgstr "Archiviere:"
 
-#: ../src/plugins/archive/archiver_gtk.c:506
+#: ../src/plugins/archive/archiver_gtk.c:507
 msgid "Folder and archive must be selected"
 msgstr "Ordner und Archiv müssen ausgewählt sein"
 
-#: ../src/plugins/archive/archiver_gtk.c:515
+#: ../src/plugins/archive/archiver_gtk.c:516
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s: Existiert bereits. Trotzdem fortfahren?"
 
-#: ../src/plugins/archive/archiver_gtk.c:518
+#: ../src/plugins/archive/archiver_gtk.c:519
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: ist eine Verknüpfung. Kann nicht fortfahren."
 
-#: ../src/plugins/archive/archiver_gtk.c:521
+#: ../src/plugins/archive/archiver_gtk.c:522
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: ist ein Verzeichnis. Kann nicht fortfahren."
 
-#: ../src/plugins/archive/archiver_gtk.c:524
+#: ../src/plugins/archive/archiver_gtk.c:525
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: fehlende Rechte. Kann nicht fortfahren."
 
-#: ../src/plugins/archive/archiver_gtk.c:527
+#: ../src/plugins/archive/archiver_gtk.c:528
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: unbekannter Fehler. Kann nicht fortfahren."
 
-#: ../src/plugins/archive/archiver_gtk.c:564
+#: ../src/plugins/archive/archiver_gtk.c:565
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -9112,7 +9304,7 @@ msgstr ""
 "Ungültiger Dateiname:\n"
 "%s."
 
-#: ../src/plugins/archive/archiver_gtk.c:577
+#: ../src/plugins/archive/archiver_gtk.c:578
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -9121,7 +9313,7 @@ msgstr ""
 "Ungültiger Claws Mail-Ordner:\n"
 "%s."
 
-#: ../src/plugins/archive/archiver_gtk.c:606
+#: ../src/plugins/archive/archiver_gtk.c:607
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -9136,186 +9328,186 @@ msgstr ""
 "\n"
 "Trotzdem fortfahren?"
 
-#: ../src/plugins/archive/archiver_gtk.c:710
+#: ../src/plugins/archive/archiver_gtk.c:711
 msgid "Archive result"
 msgstr "Ergebnis des Archivierens"
 
 # UI adapted
-#: ../src/plugins/archive/archiver_gtk.c:740
+#: ../src/plugins/archive/archiver_gtk.c:741
 msgid "Values"
 msgstr "Wert"
 
-#: ../src/plugins/archive/archiver_gtk.c:749
+#: ../src/plugins/archive/archiver_gtk.c:750
 msgid "Archive"
 msgstr "Archiv"
 
-#: ../src/plugins/archive/archiver_gtk.c:755
+#: ../src/plugins/archive/archiver_gtk.c:756
 msgid "Archive format"
 msgstr "Archivformat"
 
-#: ../src/plugins/archive/archiver_gtk.c:762
+#: ../src/plugins/archive/archiver_gtk.c:763
 msgid "Compression method"
 msgstr "Kompressionsmethode"
 
-#: ../src/plugins/archive/archiver_gtk.c:770
+#: ../src/plugins/archive/archiver_gtk.c:771
 msgid "Number of files"
 msgstr "Anzahl Dateien"
 
-#: ../src/plugins/archive/archiver_gtk.c:778
+#: ../src/plugins/archive/archiver_gtk.c:779
 msgid "Archive Size"
 msgstr "Archivgröße"
 
-#: ../src/plugins/archive/archiver_gtk.c:786
+#: ../src/plugins/archive/archiver_gtk.c:787
 msgid "Folder Size"
 msgstr "Ordnergröße"
 
-#: ../src/plugins/archive/archiver_gtk.c:795
+#: ../src/plugins/archive/archiver_gtk.c:796
 msgid "Compression level"
 msgstr "Kompressionsstärke"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:718
 #: ../src/prefs_folder_item.c:514
 msgid "Yes"
 msgstr "ja"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:721
 #: ../src/prefs_folder_item.c:513 ../src/prefs_summaries.c:369
 msgid "No"
 msgstr "Nein"
 
-#: ../src/plugins/archive/archiver_gtk.c:803
+#: ../src/plugins/archive/archiver_gtk.c:804
 msgid "MD5 checksum"
 msgstr "MD5-Prüfsumme"
 
-#: ../src/plugins/archive/archiver_gtk.c:811
+#: ../src/plugins/archive/archiver_gtk.c:812
 msgid "Descriptive names"
 msgstr "Aussagekräftige Namen"
 
-#: ../src/plugins/archive/archiver_gtk.c:819
+#: ../src/plugins/archive/archiver_gtk.c:820
 msgid "Delete selected files"
 msgstr "Ausgewählte Dateien löschen"
 
-#: ../src/plugins/archive/archiver_gtk.c:828
-#: ../src/plugins/archive/archiver_gtk.c:1210
+#: ../src/plugins/archive/archiver_gtk.c:829
+#: ../src/plugins/archive/archiver_gtk.c:1211
 msgid "Select mails before"
 msgstr "Wähle Nachrichten vor Datum"
 
-#: ../src/plugins/archive/archiver_gtk.c:904
+#: ../src/plugins/archive/archiver_gtk.c:905
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Dateiname für Archiv angeben [die Endung sollte das Archivformat "
 "wiedergeben, wie zum Beispiel .tgz]"
 
-#: ../src/plugins/archive/archiver_gtk.c:952
+#: ../src/plugins/archive/archiver_gtk.c:953
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld von %ld"
 
-#: ../src/plugins/archive/archiver_gtk.c:991
+#: ../src/plugins/archive/archiver_gtk.c:992
 msgid "Create Archive"
 msgstr "Archiv erstellen"
 
-#: ../src/plugins/archive/archiver_gtk.c:1006
+#: ../src/plugins/archive/archiver_gtk.c:1007
 msgid "Enter Archiver arguments"
 msgstr "Einstellungen zum Archivieren"
 
-#: ../src/plugins/archive/archiver_gtk.c:1019
+#: ../src/plugins/archive/archiver_gtk.c:1020
 msgid "Folder to archive"
 msgstr "Ordner für das Archiv"
 
-#: ../src/plugins/archive/archiver_gtk.c:1026
+#: ../src/plugins/archive/archiver_gtk.c:1027
 msgid "Folder which is the root of the archive"
 msgstr "Ordner fürdas Wurzelverzeichnis des Archivs"
 
-#: ../src/plugins/archive/archiver_gtk.c:1031
+#: ../src/plugins/archive/archiver_gtk.c:1032
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 "Klicken Sie auf diese Schaltfläche, um einen Ordner zum Speichern des "
 "Archivs zu wählen."
 
-#: ../src/plugins/archive/archiver_gtk.c:1037
+#: ../src/plugins/archive/archiver_gtk.c:1038
 msgid "Name for archive"
 msgstr "Name für das Archiv"
 
-#: ../src/plugins/archive/archiver_gtk.c:1043
+#: ../src/plugins/archive/archiver_gtk.c:1044
 msgid "Archive location and name"
 msgstr "Archivpfad und -name"
 
-#: ../src/plugins/archive/archiver_gtk.c:1045
+#: ../src/plugins/archive/archiver_gtk.c:1046
 #: ../src/plugins/archive/archiver_prefs.c:198
 #: ../src/plugins/pgpcore/select-keys.c:422
 msgid "_Select"
 msgstr "_Wählen"
 
-#: ../src/plugins/archive/archiver_gtk.c:1048
+#: ../src/plugins/archive/archiver_gtk.c:1049
 msgid "Click this button to select a name and location for the archive"
 msgstr ""
 "Klicken Sie auf diese Schaltfläche, um einen Name und einen Speicherplatz "
 "für das Archiv zu wählen"
 
-#: ../src/plugins/archive/archiver_gtk.c:1050
+#: ../src/plugins/archive/archiver_gtk.c:1051
 msgid "Choose compression"
 msgstr "Kompression wählen"
 
-#: ../src/plugins/archive/archiver_gtk.c:1063
+#: ../src/plugins/archive/archiver_gtk.c:1064
 msgid "Choose this option to use ZIP compression for the archive"
 msgstr "Diese Option wählen, um das Archiv per ZIP zu komprimieren"
 
-#: ../src/plugins/archive/archiver_gtk.c:1070
+#: ../src/plugins/archive/archiver_gtk.c:1071
 msgid "Choose this option to use BZIP2 compression for the archive"
 msgstr "Diese Option wählen, um das Archiv per BZIP2 zu komprimieren"
 
-#: ../src/plugins/archive/archiver_gtk.c:1078
+#: ../src/plugins/archive/archiver_gtk.c:1079
 msgid "Choose this to use Compress compression for your archive"
 msgstr "Diese Option wählen, um das Archiv per COMPRESS zu komprimieren"
 
-#: ../src/plugins/archive/archiver_gtk.c:1086
+#: ../src/plugins/archive/archiver_gtk.c:1087
 msgid "Choose this option to disable compression for the archive"
 msgstr "Diese Option wählen, um das Archiv nicht zu komprimieren"
 
-#: ../src/plugins/archive/archiver_gtk.c:1108
+#: ../src/plugins/archive/archiver_gtk.c:1109
 msgid "Choose format"
 msgstr "Format wählen"
 
-#: ../src/plugins/archive/archiver_gtk.c:1121
+#: ../src/plugins/archive/archiver_gtk.c:1122
 msgid "Choose this option to use TAR as format for the archive"
 msgstr "Diese Option wählen, um das TAR als Archivformat zu verwenden"
 
-#: ../src/plugins/archive/archiver_gtk.c:1128
+#: ../src/plugins/archive/archiver_gtk.c:1129
 msgid "Choose this to use SHAR as format for the archive"
 msgstr "Diese Option wählen, um das SHAR als Archivformat zu verwenden"
 
-#: ../src/plugins/archive/archiver_gtk.c:1135
+#: ../src/plugins/archive/archiver_gtk.c:1136
 msgid "Choose this option to use CPIO as format for the archive"
 msgstr "Diese Option wählen, um das CPIO als Archivformat zu verwenden"
 
-#: ../src/plugins/archive/archiver_gtk.c:1142
+#: ../src/plugins/archive/archiver_gtk.c:1143
 msgid "Choose this option to use PAX as format for the archive"
 msgstr "Diese Option wählen, um das PAX als Archivformat zu verwenden"
 
-#: ../src/plugins/archive/archiver_gtk.c:1162
+#: ../src/plugins/archive/archiver_gtk.c:1163
 msgid "Miscellaneous options"
 msgstr "Weitere Optionen"
 
-#: ../src/plugins/archive/archiver_gtk.c:1171
+#: ../src/plugins/archive/archiver_gtk.c:1172
 msgid "_Recursive"
 msgstr "_Rekursiv"
 
-#: ../src/plugins/archive/archiver_gtk.c:1175
+#: ../src/plugins/archive/archiver_gtk.c:1176
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Diese Option wählen, um Unterordner im Archiv zu berücksichtigen"
 
-#: ../src/plugins/archive/archiver_gtk.c:1177
+#: ../src/plugins/archive/archiver_gtk.c:1178
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: ../src/plugins/archive/archiver_gtk.c:1181
+#: ../src/plugins/archive/archiver_gtk.c:1182
 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"
@@ -9326,11 +9518,11 @@ msgstr ""
 "Beachten Sie, dass dies die Zeit zum Erstellen des Archivs erheblich "
 "verlängert."
 
-#: ../src/plugins/archive/archiver_gtk.c:1185
+#: ../src/plugins/archive/archiver_gtk.c:1186
 msgid "R_ename"
 msgstr "_Umbenennen"
 
-#: ../src/plugins/archive/archiver_gtk.c:1189
+#: ../src/plugins/archive/archiver_gtk.c:1190
 #: ../src/plugins/archive/archiver_prefs.c:333
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9342,7 +9534,7 @@ msgstr ""
 "Das Benennungsschema: Datum_von at an@Betreff.\n"
 "Die Namen werden maximal 96 Zeichen lang."
 
-#: ../src/plugins/archive/archiver_gtk.c:1197
+#: ../src/plugins/archive/archiver_gtk.c:1198
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9350,11 +9542,11 @@ msgstr ""
 "Diese Option wählen, um Mails nach dem Archivieren zu löschen. Hier werden "
 "nur lokale Mboxen, IMAP4 und POP3 berücksichtigt."
 
-#: ../src/plugins/archive/archiver_gtk.c:1201
+#: ../src/plugins/archive/archiver_gtk.c:1202
 msgid "Selection options"
 msgstr "Auswahloptionen "
 
-#: ../src/plugins/archive/archiver_gtk.c:1217
+#: ../src/plugins/archive/archiver_gtk.c:1218
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9445,24 +9637,94 @@ msgstr "Umbenennen"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Diese Option wählen, um Mails nach dem Archivieren zu löschen"
 
-#: ../src/plugins/attachwarner/attachwarner.c:216
-#, c-format
-msgid ""
-"An attachment is mentioned in the mail you're sending, but no file was "
-"attached. Mention appears on line %d, which begins with text: <span weight="
-"\"bold\">%.20s</span>...\n"
-"\n"
-"%s it anyway?"
-msgstr ""
-"In der Nachricht wird ein Anhang erwähnt, aber es ist keine Datei angehängt. "
-"Die Nennung erfolgt in Zeile %d, die wie folgt beginnt: <span weight=\"bold"
-"\">%.20s</span>…\n"
-"\n"
-"Trotzdem %s?"
-
-#: ../src/plugins/attachwarner/attachwarner.c:220
-msgid "Attachment warning"
-msgstr "Warnung: fehlender Anhang?"
+#: ../src/plugins/att_remover/att_remover.c:299
+msgid "<b>Type: </b>"
+msgstr "<b>Typ:</b>"
+
+#: ../src/plugins/att_remover/att_remover.c:300
+msgid "<b>Size: </b>"
+msgstr "<b>Größe:</b>"
+
+#: ../src/plugins/att_remover/att_remover.c:301
+msgid "<b>Filename: </b>"
+msgstr "<b>Dateiname: </b>"
+
+#: ../src/plugins/att_remover/att_remover.c:332
+msgid "Remove attachments"
+msgstr "Anhänge entfernen"
+
+#: ../src/plugins/att_remover/att_remover.c:357
+#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
+msgid "Remove"
+msgstr "Entfernen"
+
+#. S_COL_STATUS
+#: ../src/plugins/att_remover/att_remover.c:365
+#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
+msgid "Attachment"
+msgstr "Anhang"
+
+#: ../src/plugins/att_remover/att_remover.c:417
+msgid "Destroy attachments"
+msgstr "Anhänge vernichten"
+
+#: ../src/plugins/att_remover/att_remover.c:418
+msgid ""
+"Do you really want to remove all attachments from the selected messages?\n"
+"\n"
+"The deleted data will be unrecoverable."
+msgstr ""
+"Möchten Sie wirklich alle Anhänge von den gewählten Nachrichten entfernen?\n"
+"\n"
+"Die Daten werden unwiderruflich gelöscht."
+
+#: ../src/plugins/att_remover/att_remover.c:479
+msgid "This message doesn't have any attachments."
+msgstr "Diese Nachricht hat keine Anhänge"
+
+#: ../src/plugins/att_remover/att_remover.c:494
+msgid "Remove attachments..."
+msgstr "Anhänge entfernen..."
+
+#: ../src/plugins/att_remover/att_remover.c:506
+#: ../src/plugins/att_remover/att_remover.c:566
+msgid "AttRemover"
+msgstr "AttRemover"
+
+#: ../src/plugins/att_remover/att_remover.c:571
+msgid ""
+"This plugin removes attachments from mails.\n"
+"\n"
+"Warning: this operation will be completely un-cancellable and the deleted "
+"attachments will be lost forever, and ever, and ever."
+msgstr ""
+"Dieses Plugin entfernt Anhänge von E-Mails.\n"
+"\n"
+"Warnung: Dieser Vorgang kann nicht abgebrochen werden und die gelöschten "
+"Anhänge werden für immer und ewig und ewig und ewig verloren sein."
+
+#: ../src/plugins/att_remover/att_remover.c:595
+msgid "Attachment handling"
+msgstr "Behandlung von Anhängen"
+
+#: ../src/plugins/attachwarner/attachwarner.c:216
+#, c-format
+msgid ""
+"An attachment is mentioned in the mail you're sending, but no file was "
+"attached. Mention appears on line %d, which begins with text: <span weight="
+"\"bold\">%.20s</span>...\n"
+"\n"
+"%s it anyway?"
+msgstr ""
+"In der Nachricht wird ein Anhang erwähnt, aber es ist keine Datei angehängt. "
+"Die Nennung erfolgt in Zeile %d, die wie folgt beginnt: <span weight=\"bold"
+"\">%.20s</span>…\n"
+"\n"
+"Trotzdem %s?"
+
+#: ../src/plugins/attachwarner/attachwarner.c:220
+msgid "Attachment warning"
+msgstr "Warnung: fehlender Anhang?"
 
 #: ../src/plugins/attachwarner/attachwarner.c:245
 #: ../src/plugins/attachwarner/attachwarner.c:282
@@ -9485,7 +9747,7 @@ msgstr "anhängen"
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:85
 msgid "One of the following regular expressions is matched (one per line):"
 msgstr ""
-"Einer der folgenden Regulären Ausdrücke zutrifft:\n"
+"einer der folgenden Regulären Ausdrücke zutrifft:\n"
 "(einer pro Zeile)"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:89
@@ -9548,76 +9810,6 @@ msgstr "Ausschließen"
 msgid "Attach Warner"
 msgstr "Anhangswarner"
 
-#: ../src/plugins/att_remover/att_remover.c:299
-msgid "<b>Type: </b>"
-msgstr "<b>Typ:</b>"
-
-#: ../src/plugins/att_remover/att_remover.c:300
-msgid "<b>Size: </b>"
-msgstr "<b>Größe:</b>"
-
-#: ../src/plugins/att_remover/att_remover.c:301
-msgid "<b>Filename: </b>"
-msgstr "<b>Dateiname: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:332
-msgid "Remove attachments"
-msgstr "Anhänge entfernen"
-
-#: ../src/plugins/att_remover/att_remover.c:357
-#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
-msgid "Remove"
-msgstr "Entfernen"
-
-#. S_COL_STATUS
-#: ../src/plugins/att_remover/att_remover.c:365
-#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
-msgid "Attachment"
-msgstr "Anhang"
-
-#: ../src/plugins/att_remover/att_remover.c:417
-msgid "Destroy attachments"
-msgstr "Anhänge vernichten"
-
-#: ../src/plugins/att_remover/att_remover.c:418
-msgid ""
-"Do you really want to remove all attachments from the selected messages?\n"
-"\n"
-"The deleted data will be unrecoverable."
-msgstr ""
-"Möchten Sie wirklich alle Anhänge von den gewählten Nachrichten entfernen?\n"
-"\n"
-"Die Daten werden unwiderruflich gelöscht."
-
-#: ../src/plugins/att_remover/att_remover.c:479
-msgid "This message doesn't have any attachments."
-msgstr "Diese Nachricht hat keine Anhänge"
-
-#: ../src/plugins/att_remover/att_remover.c:494
-msgid "Remove attachments..."
-msgstr "Anhänge entfernen..."
-
-#: ../src/plugins/att_remover/att_remover.c:506
-#: ../src/plugins/att_remover/att_remover.c:566
-msgid "AttRemover"
-msgstr "AttRemover"
-
-#: ../src/plugins/att_remover/att_remover.c:571
-msgid ""
-"This plugin removes attachments from mails.\n"
-"\n"
-"Warning: this operation will be completely un-cancellable and the deleted "
-"attachments will be lost forever, and ever, and ever."
-msgstr ""
-"Dieses Plugin entfernt Anhänge von E-Mails.\n"
-"\n"
-"Warnung: Dieser Vorgang kann nicht abgebrochen werden und die gelöschten "
-"Anhänge werden für immer und ewig und ewig und ewig verloren sein."
-
-#: ../src/plugins/att_remover/att_remover.c:595
-msgid "Attachment handling"
-msgstr "Behandlung von Anhängen"
-
 #: ../src/plugins/bogofilter/bogofilter.c:81
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:458
 msgid "Bogofilter"
@@ -10217,63 +10409,63 @@ msgstr ""
 "\n"
 "Es ist eigentlich nicht nützlich."
 
-#: ../src/plugins/fancy/fancy_prefs.c:141
+#: ../src/plugins/fancy/fancy_prefs.c:146
 msgid "Display images"
 msgstr "Bilder anzeigen"
 
-#: ../src/plugins/fancy/fancy_prefs.c:142
+#: ../src/plugins/fancy/fancy_prefs.c:147
 msgid "Display embedded images"
 msgstr "Eingebettete Bilder anzeigen"
 
-#: ../src/plugins/fancy/fancy_prefs.c:146
+#: ../src/plugins/fancy/fancy_prefs.c:151
 msgid "Execute javascript"
 msgstr "Führe JavaScript aus"
 
-#: ../src/plugins/fancy/fancy_prefs.c:147
+#: ../src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute embedded javascript"
 msgstr "Führe eingebettetes JavaScript aus"
 
-#: ../src/plugins/fancy/fancy_prefs.c:151
+#: ../src/plugins/fancy/fancy_prefs.c:156
 msgid "Execute Java applets"
 msgstr "Führe Java-Applets aus"
 
-#: ../src/plugins/fancy/fancy_prefs.c:152
+#: ../src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute embedded Java applets"
 msgstr "Führe eingebettete Java-Applets aus"
 
-#: ../src/plugins/fancy/fancy_prefs.c:156
+#: ../src/plugins/fancy/fancy_prefs.c:161
 msgid "Render objects using plugins"
 msgstr "Stelle Objekte mit Hilfe von Plugins dar"
 
-#: ../src/plugins/fancy/fancy_prefs.c:157
+#: ../src/plugins/fancy/fancy_prefs.c:162
 msgid "Render embedded objects using plugins"
 msgstr "Stelle eingebettete Objekte mit Hilfe von Plugins dar"
 
-#: ../src/plugins/fancy/fancy_prefs.c:164
+#: ../src/plugins/fancy/fancy_prefs.c:169
 msgid "Open in viewer (remote content is enabled)"
-msgstr "In Betrachter öffnen (nachzuladende Inhalte sind aktiviert)"
+msgstr "In Betrachter öffnen (Nachladen von Inhalten ist aktiviert)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:167
+#: ../src/plugins/fancy/fancy_prefs.c:172
 msgid "Do nothing (remote content is disabled)"
-msgstr "Nichts unternehmen (nachzuladende Inhalte sind aktiviert)"
+msgstr "Nichts unternehmen (Nachladen von Inhalten ist aktiviert)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:200
+#: ../src/plugins/fancy/fancy_prefs.c:209
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/plugins/fancy/fancy_prefs.c:202
+#: ../src/plugins/fancy/fancy_prefs.c:211
 msgid "Use GNOME's proxy settings"
 msgstr "Die Proxy-Einstellungen von GNOME verwenden"
 
-#: ../src/plugins/fancy/fancy_prefs.c:210
+#: ../src/plugins/fancy/fancy_prefs.c:219
 msgid "Use proxy:"
 msgstr "Proxy verwenden:"
 
-#: ../src/plugins/fancy/fancy_prefs.c:228
+#: ../src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
 msgstr "Nachzuladende Inhalte"
 
-#: ../src/plugins/fancy/fancy_prefs.c:229
+#: ../src/plugins/fancy/fancy_prefs.c:238
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10287,106 +10479,124 @@ msgstr ""
 "Die Darstellung von der E-Mail angehängten Bildern, Scripten, \n"
 "Plugin-Objekten oder Java-Applets ist trotzdem möglich."
 
-#: ../src/plugins/fancy/fancy_prefs.c:235
+#: ../src/plugins/fancy/fancy_prefs.c:244
 msgid "Enable loading of remote content"
-msgstr "Laden nachzuladender Inhalte aktivieren"
+msgstr "Nachladen von Inhalten aktivieren"
 
-#: ../src/plugins/fancy/fancy_prefs.c:267
+#: ../src/plugins/fancy/fancy_prefs.c:276
 msgid "When clicking on a link, by default:"
 msgstr "Beim Klicken auf einen Link standardmäßig:"
 
-#: ../src/plugins/fancy/fancy_prefs.c:275
+#: ../src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
 msgstr "In externem Webbrowser öffnen"
 
-#: ../src/plugins/fancy/fancy_viewer.c:391
+#: ../src/plugins/fancy/fancy_prefs.c:298
+msgid "The CSS in this file will be applied to all HTML parts"
+msgstr "Das CSS in dieser Datei wird auf alle HTML-Teile angewendet"
+
+#: ../src/plugins/fancy/fancy_prefs.c:300
+msgid "Stylesheet:"
+msgstr "Stylesheet:"
+
+#: ../src/plugins/fancy/fancy_prefs.c:308 ../src/prefs_account.c:1442
+#: ../src/prefs_account.c:1531 ../src/prefs_account.c:1991
+#: ../src/prefs_customheader.c:237
+msgid "Bro_wse"
+msgstr "Durchsuchen"
+
+#: ../src/plugins/fancy/fancy_prefs.c:350
+msgid "Select stylesheet"
+msgstr "Wähle Stylesheet"
+
+#: ../src/plugins/fancy/fancy_viewer.c:393
 msgid "Remote content loading is disabled."
 msgstr "Nachzuladende Inhalte sind deaktiviert"
 
-#: ../src/plugins/fancy/fancy_viewer.c:468
+#: ../src/plugins/fancy/fancy_viewer.c:470
 msgid "Load images"
 msgstr "Bilder laden"
 
-#: ../src/plugins/fancy/fancy_viewer.c:470
+#: ../src/plugins/fancy/fancy_viewer.c:472
 msgid "Enable remote content"
 msgstr "Nachzuladende Inhalte aktivieren"
 
-#: ../src/plugins/fancy/fancy_viewer.c:472
+#: ../src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable Javascript"
 msgstr "JavaScript aktivieren"
 
-#: ../src/plugins/fancy/fancy_viewer.c:474
+#: ../src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Plugins"
 msgstr "Plugins aktivieren"
 
-#: ../src/plugins/fancy/fancy_viewer.c:476
+#: ../src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Java"
 msgstr "Java aktivieren"
 
-#: ../src/plugins/fancy/fancy_viewer.c:478
+#: ../src/plugins/fancy/fancy_viewer.c:480
 msgid "Open links with external browser"
 msgstr "Links im Webbrowser öffnen"
 
-#: ../src/plugins/fancy/fancy_viewer.c:647
+#: ../src/plugins/fancy/fancy_viewer.c:649
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ein Fehler trat auf: %d\n"
 
-#: ../src/plugins/fancy/fancy_viewer.c:703
+#: ../src/plugins/fancy/fancy_viewer.c:705
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s ist ein missgebildeter oder nicht unterstützter Feed."
 
-#: ../src/plugins/fancy/fancy_viewer.c:714
+#: ../src/plugins/fancy/fancy_viewer.c:716
 msgid "Search the Web"
 msgstr "Das Web durchsuchen"
 
-#: ../src/plugins/fancy/fancy_viewer.c:726
+#: ../src/plugins/fancy/fancy_viewer.c:728
 msgid "Open in Viewer"
 msgstr "Im Betrachter öffnen"
 
-#: ../src/plugins/fancy/fancy_viewer.c:728
+#: ../src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer (enable remote content)"
-msgstr "In Betrachter öffnen (nachzuladende Inhalte aktivieren)"
+msgstr "In Betrachter öffnen (Nachladen von Inhalten aktivieren)"
 
-#: ../src/plugins/fancy/fancy_viewer.c:737
+#: ../src/plugins/fancy/fancy_viewer.c:739
 msgid "Open in Browser"
 msgstr "Im Webbrowser öffnen"
 
-#: ../src/plugins/fancy/fancy_viewer.c:747
+#: ../src/plugins/fancy/fancy_viewer.c:749
 msgid "Open Image"
 msgstr "Bild öffnen"
 
-#: ../src/plugins/fancy/fancy_viewer.c:756
+#: ../src/plugins/fancy/fancy_viewer.c:758
 msgid "Copy Link"
 msgstr "Link-Adresse kopieren"
 
-#: ../src/plugins/fancy/fancy_viewer.c:760
+#: ../src/plugins/fancy/fancy_viewer.c:762
 msgid "Download Link"
 msgstr "Download-Link"
 
-#: ../src/plugins/fancy/fancy_viewer.c:771
+#: ../src/plugins/fancy/fancy_viewer.c:773
 msgid "Save Image As"
 msgstr "Bild speichern unter"
 
-#: ../src/plugins/fancy/fancy_viewer.c:781
+#: ../src/plugins/fancy/fancy_viewer.c:783
 msgid "Copy Image"
 msgstr "Bild kopieren"
 
-#: ../src/plugins/fancy/fancy_viewer.c:799
+#: ../src/plugins/fancy/fancy_viewer.c:801
 msgid "Import feed"
 msgstr "Importiere Feed"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1012
+#: ../src/plugins/fancy/fancy_viewer.c:1014
 msgid "Fancy"
 msgstr "Fancy"
 
 #. i18n: 'Fancy' here is name of the plugin, not the english word.
-#: ../src/plugins/fancy/fancy_viewer.c:1040
+#: ../src/plugins/fancy/fancy_viewer.c:1042
 msgid "Fancy HTML Viewer"
 msgstr "Fancy - HTML-Betrachter"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1045
+#: ../src/plugins/fancy/fancy_viewer.c:1047
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10595,1025 +10805,1001 @@ msgstr "GData-Integration"
 #: ../src/plugins/geolocation/geolocation_plugin.c:349
 #, c-format
 msgid "Found location: (%.2f,%.2f)"
-msgstr ""
+msgstr "Standort gefunden: (%.2f,%.2f)"
 
 #. TRANSLATORS: The country name is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:369
 msgid "Alleged country of origin: "
-msgstr ""
+msgstr "Vermutliches Herkunftsland:"
 
 #. TRANSLATORS: The IP address is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:373
-#, fuzzy
 msgid "Could not resolve location of IP address "
-msgstr "Adressindex nicht lesbar"
+msgstr "Konnte den Standort der IP-Adresse nicht auflösen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:512
-#, fuzzy
 msgid "Try to locate sender"
-msgstr "Vorname des Absenders"
+msgstr "Versuche, den Absender zu lokalisieren"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:528
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:529
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Vereinigte Arabische Emirate"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:530
 msgid "Afghanistan"
-msgstr ""
+msgstr "Afghanistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:531
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "Antigua und Barbuda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:532
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguilla"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:533
 msgid "Albania"
-msgstr ""
+msgstr "Albanien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:534
 msgid "Armenia"
-msgstr ""
+msgstr "Armenien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:535
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Niederländische Antillen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:536
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:537
 msgid "Antarctica"
-msgstr ""
+msgstr "Antarktis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:538
-#, fuzzy
 msgid "Argentina"
-msgstr "Magenta"
+msgstr "Argentinien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:539
 msgid "American Samoa"
-msgstr ""
+msgstr "Amerikanisch-Samoa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:540
 msgid "Austria"
-msgstr ""
+msgstr "Österreich"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:541
 msgid "Australia"
-msgstr ""
+msgstr "Australien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:542
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:543
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Aserbaidschan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:544
 msgid "Bosnia And Herzegovina"
-msgstr ""
+msgstr "Bosnien und Herzegowina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:545
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:546
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladesch"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:547
 msgid "Belgium"
-msgstr ""
+msgstr "Belgien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:548
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:549
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgarien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:550
 msgid "Bahrain"
-msgstr ""
+msgstr "Bahrain"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:551
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:552
 msgid "Benin"
-msgstr ""
+msgstr "Benin"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:553
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermuda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:554
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:555
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolivien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:556
 msgid "Brazil"
-msgstr ""
+msgstr "Brasilien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:557
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahamas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:558
 msgid "Bhutan"
-msgstr ""
+msgstr "Bhutan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:559
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Bouvetinsel"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:560
 msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:561
 msgid "Belarus"
-msgstr ""
+msgstr "Weißrussland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:562
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:563
 msgid "Canada"
-msgstr ""
+msgstr "Kanada"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:564
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Kokosinseln"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:565
 msgid "Central African Republic"
-msgstr ""
+msgstr "Zentralafrikanische Republik"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:566
 msgid "Congo"
-msgstr ""
+msgstr "Republik Kongo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:567
 msgid "Switzerland"
-msgstr ""
+msgstr "Schweiz"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:568
 msgid "Cote D'Ivoire"
-msgstr ""
+msgstr "Elfenbeinküste"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:569
 msgid "Cook Islands"
-msgstr ""
+msgstr "Cookinseln"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:570
 msgid "Chile"
-msgstr ""
+msgstr "Chile"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:571
 msgid "Cameroon"
-msgstr ""
+msgstr "Kamerun"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:572
-#, fuzzy
 msgid "China"
-msgstr "Chinesisch"
+msgstr "China"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:573
-#, fuzzy
 msgid "Colombia"
-msgstr "Farbe"
+msgstr "Kolumbien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:574
 msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:575
 msgid "Cuba"
-msgstr ""
+msgstr "Kuba"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:576
 msgid "Cape Verde"
-msgstr ""
+msgstr "Kap Verde"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:577
 msgid "Christmas Island"
-msgstr ""
+msgstr "Weihnachtsinseln"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:578
 msgid "Cyprus"
-msgstr ""
+msgstr "Cypern"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:579
 msgid "Czech Republic"
-msgstr ""
+msgstr "Tschechische Republik\t"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:580
 msgid "Germany"
-msgstr ""
+msgstr "Deutschland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:581
 msgid "Djibouti"
-msgstr ""
+msgstr "Dschibuti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:582
-#, fuzzy
 msgid "Denmark"
-msgstr "Demarkieren"
+msgstr "Dänemark"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:583
 msgid "Dominica"
-msgstr ""
+msgstr "Dominica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:584
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Domonikanische Republik"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:585
 msgid "Algeria"
-msgstr ""
+msgstr "Algerien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:586
 msgid "Ecuador"
-msgstr ""
+msgstr "Äquador"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:587
 msgid "Estonia"
-msgstr ""
+msgstr "Estland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:588
 msgid "Egypt"
-msgstr ""
+msgstr "Ägypten"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:589
-#, fuzzy
 msgid "Western Sahara"
-msgstr "Westeuropäisch"
+msgstr "Westsahara"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:590
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:591
 msgid "Spain"
-msgstr ""
+msgstr "Spanien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:592
 msgid "Ethiopia"
-msgstr ""
+msgstr "Äthiopien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:593
 msgid "Finland"
-msgstr ""
+msgstr "Finnland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:594
 msgid "Fiji"
-msgstr ""
+msgstr "Fidschi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:595
 msgid "Falkland Islands (Malvinas)"
-msgstr ""
+msgstr "Falklandinseln"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:596
 msgid "Micronesia, Federated States Of"
-msgstr ""
+msgstr "Mikronesien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:597
 msgid "Faroe Islands"
-msgstr ""
+msgstr " Färöer-Inseln"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:598
-#, fuzzy
 msgid "France"
-msgstr "_Abbrechen"
+msgstr "Frankreich"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:599
 msgid "France, Metropolitan"
-msgstr ""
+msgstr "France métropolitaine"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:600
 msgid "Gabon"
-msgstr ""
+msgstr "Gabun"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:601
 #: ../src/plugins/geolocation/geolocation_plugin.c:747
 msgid "United Kingdom"
-msgstr ""
+msgstr "Vereinigtes Königreich"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:602
 msgid "Grenada"
-msgstr ""
+msgstr "Grenada"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:603
 msgid "Georgia"
-msgstr ""
+msgstr "Georgien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:604
 msgid "French Guiana"
-msgstr ""
+msgstr "Französisch Guiana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:605
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:606
-#, fuzzy
 msgid "Gibraltar"
-msgstr "Libravatar"
+msgstr "Gibraltar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:607
-#, fuzzy
 msgid "Greenland"
-msgstr "Grün"
+msgstr "Grönland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:608
 msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:609
 msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:610
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Guadeloupe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:611
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Äquatorialguinea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:612
-#, fuzzy
 msgid "Greece"
-msgstr "Grün"
+msgstr "Griechenland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:613
 msgid "South Georgia And The South Sandwich Islands"
-msgstr ""
+msgstr "Südgeorgien und die Sandwichinseln"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:614
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:615
 msgid "Guam"
-msgstr ""
+msgstr "Guam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:616
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Guinea-Bissau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:617
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:618
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hingkong"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:619
 msgid "Heard Island And Mcdonald Islands"
-msgstr ""
+msgstr "Heard und die McDonaldinseln"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:620
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:621
 msgid "Croatia"
-msgstr ""
+msgstr "Kroatien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:622
 msgid "Haiti"
-msgstr ""
+msgstr "Haïti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:623
 msgid "Hungary"
-msgstr ""
+msgstr "Ungarn"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:624
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonesien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:625
 msgid "Ireland"
-msgstr ""
+msgstr "Irland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:626
 msgid "Israel"
-msgstr ""
+msgstr "Israel"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:627
-#, fuzzy
 msgid "India"
-msgstr "Indikator"
+msgstr "Indien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:628
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Britisches Territorium im Indischen Ozean"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:629
 msgid "Iraq"
-msgstr ""
+msgstr "Irak"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:630
 msgid "Iran, Islamic Republic Of"
-msgstr ""
+msgstr "Iran"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:631
 msgid "Iceland"
-msgstr ""
+msgstr "Island"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:632
 msgid "Italy"
-msgstr ""
+msgstr "Italien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:633
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamaika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:634
 msgid "Jordan"
-msgstr ""
+msgstr "Jordanien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:635
-#, fuzzy
 msgid "Japan"
-msgstr "Japanisch"
+msgstr "Japan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:636
 msgid "Kenya"
-msgstr ""
+msgstr "Kenia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:637
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kirgisistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:638
 msgid "Cambodia"
-msgstr ""
+msgstr "Kambodscha"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:639
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:640
-#, fuzzy
 msgid "Comoros"
-msgstr "morgen"
+msgstr "Komoren"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:641
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "St. Kitts und Nevis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:642
 msgid "Korea, Democratic People'S Republic Of"
-msgstr ""
+msgstr "Nordkorea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:643
 msgid "Korea, Republic Of"
-msgstr ""
+msgstr "Südkorea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:644
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuwait"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:645
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Cayman Islands"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:646
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kasachstan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:647
 msgid "Lao People'S Democratic Republic"
-msgstr ""
+msgstr "Laos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:648
 msgid "Lebanon"
-msgstr ""
+msgstr "Libanon"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:649
 msgid "Saint Lucia"
-msgstr ""
+msgstr "St. Lucia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:650
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:651
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:652
 msgid "Liberia"
-msgstr ""
+msgstr "Liberia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:653
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:654
 msgid "Lithuania"
-msgstr ""
+msgstr "Litauen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:655
 msgid "Luxembourg"
-msgstr ""
+msgstr "Luxemburg"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:656
 msgid "Latvia"
-msgstr ""
+msgstr "Lettland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:657
 msgid "Libyan Arab Jamahiriya"
-msgstr ""
+msgstr "Libyen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:658
 msgid "Morocco"
-msgstr ""
+msgstr "Marokko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:659
 msgid "Monaco"
-msgstr ""
+msgstr "Monaco"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:660
 msgid "Moldova, Republic Of"
-msgstr ""
+msgstr "Moldawien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:661
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagaskar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:662
-#, fuzzy
 msgid "Marshall Islands"
-msgstr "Alle als gelesen markieren"
+msgstr "Marshallinseln"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:663
 msgid "Macedonia, The Former Yugoslav Republic Of"
-msgstr ""
+msgstr "Mazedonien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:664
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:665
-#, fuzzy
 msgid "Myanmar"
-msgstr "Demarkieren"
+msgstr "Myanmar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:666
 msgid "Mongolia"
-msgstr ""
+msgstr "Mongolei"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:667
 msgid "Macao"
-msgstr ""
+msgstr "Macao"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:668
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Nördliche Marianen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:669
 msgid "Martinique"
-msgstr ""
+msgstr "Martinique"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:670
 msgid "Mauritania"
-msgstr ""
+msgstr "Mauretanien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:671
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:672
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:673
 msgid "Mauritius"
-msgstr ""
+msgstr "Mauritius"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:674
 msgid "Maldives"
-msgstr ""
+msgstr "Malediven"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:675
 msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:676
 msgid "Mexico"
-msgstr ""
+msgstr "Mexiko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:677
 msgid "Malaysia"
-msgstr ""
+msgstr "Malaysia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:678
 msgid "Mozambique"
-msgstr ""
+msgstr "Mosambik"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:679
 msgid "Namibia"
-msgstr ""
+msgstr "Namibia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:680
-#, fuzzy
 msgid "New Caledonia"
-msgstr "Neue Kontakte"
+msgstr "Neukaledonien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:681
 msgid "Niger"
-msgstr ""
+msgstr "Niger"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:682
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Norfolkinseln"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:683
 msgid "Nigeria"
-msgstr ""
+msgstr "Nigeria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:684
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicaragua"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:685
 msgid "Netherlands"
-msgstr ""
+msgstr "Niederlande"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:686
-#, fuzzy
 msgid "Norway"
-msgstr "Weiterleiten"
+msgstr "Norwegen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:687
 msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:688
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:689
 msgid "Niue"
-msgstr ""
+msgstr "Niue"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:690
 msgid "New Zealand"
-msgstr ""
+msgstr "Neuseeland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:691
 msgid "Oman"
-msgstr ""
+msgstr "Oman"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:692
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:693
 msgid "Peru"
-msgstr ""
+msgstr "Peru"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:694
 msgid "French Polynesia"
-msgstr ""
+msgstr "Französisch-Polynesien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:695
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua-Neuguinea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:696
-#, fuzzy
 msgid "Philippines"
-msgstr "Zeilen"
+msgstr "Philippinen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:697
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:698
 msgid "Poland"
-msgstr ""
+msgstr "Polen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:699
 msgid "Saint Pierre And Miquelon"
-msgstr ""
+msgstr "Saint-Pierre und Miquelon"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:700
 msgid "Pitcairn"
-msgstr ""
+msgstr "Pitcairn"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:701
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Puerto Rico"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:702
-#, fuzzy
 msgid "Portugal"
-msgstr "Port"
+msgstr "Portugal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:703
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:704
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguay"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:705
-#, fuzzy
 msgid "Qatar"
-msgstr "Wavatar"
+msgstr "Katar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:706
 msgid "Reunion"
-msgstr ""
+msgstr "Reunion"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:707
 msgid "Romania"
-msgstr ""
+msgstr "Rumänien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:708
 msgid "Russian Federation"
-msgstr ""
+msgstr "Russland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:709
 msgid "Rwanda"
-msgstr ""
+msgstr "Ruanda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:710
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Saudi-Arabien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:711
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Salomonen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:712
 msgid "Seychelles"
-msgstr ""
+msgstr "Seychellen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:713
 msgid "Sudan"
-msgstr ""
+msgstr "Sudan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:714
 msgid "Sweden"
-msgstr ""
+msgstr "Schweden"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:715
 msgid "Singapore"
-msgstr ""
+msgstr "Singapur"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:716
 msgid "Saint Helena"
-msgstr ""
+msgstr "St. Helena"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:717
 msgid "Slovenia"
-msgstr ""
+msgstr "Slowenien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:718
 msgid "Svalbard And Jan Mayen"
-msgstr ""
+msgstr "Svalbard und Jan Mayen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:719
 msgid "Slovakia"
-msgstr ""
+msgstr "Slowakei"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:720
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:721
 msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:722
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:723
 msgid "Somalia"
-msgstr ""
+msgstr "Somalia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:724
-#, fuzzy
 msgid "Suriname"
-msgstr "SMTP-Benutzername:"
+msgstr "Surinam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:725
 msgid "Sao Tome And Principe"
-msgstr ""
+msgstr "São Tomé und Príncipe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:726
 msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:727
 msgid "Syrian Arab Republic"
-msgstr ""
+msgstr "Syrien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:728
 msgid "Swaziland"
-msgstr ""
+msgstr "Swasiland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:729
 msgid "Turks And Caicos Islands"
-msgstr ""
+msgstr "Turks- und Caicosinseln"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:730
 msgid "Chad"
-msgstr ""
+msgstr "Tschad"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:731
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Französische Süd- und Antarktisgebiete"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:732
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:733
-#, fuzzy
 msgid "Thailand"
-msgstr "Thailändisch"
+msgstr "Thailand"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:734
 msgid "Tajikistan"
-msgstr ""
+msgstr "Tadschikistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:735
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:736
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkmenistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:737
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunesien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:738
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:739
 msgid "East Timor"
-msgstr ""
+msgstr "Osttimor"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:740
 msgid "Turkey"
-msgstr ""
+msgstr "Türkei"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:741
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "Trinidad und Tobago"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:742
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:743
 msgid "Taiwan, Province Of China"
-msgstr ""
+msgstr "Taiwan, Province Of China"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:744
 msgid "Tanzania, United Republic Of"
-msgstr ""
+msgstr "Tansania"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:745
 msgid "Ukraine"
-msgstr ""
+msgstr "Ukraine"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:746
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:748
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "United States Minor Outlying Islands"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:749
 msgid "United States"
-msgstr ""
+msgstr "USA"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:750
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguay"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:751
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Usbekistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:752
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Vatikanstadt"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:753
 msgid "Saint Vincent And The Grenadines"
-msgstr ""
+msgstr "St. Vincent und die Grenadinen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:754
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:755
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "Britische Jungferninseln"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:756
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "Amerikanische Jungferninseln"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:757
-#, fuzzy
 msgid "Viet Nam"
-msgstr "Dateiname"
+msgstr "Vietnam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:758
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:759
 msgid "Wallis And Futuna"
-msgstr ""
+msgstr "Wallis und Futuna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:760
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:761
 msgid "Yemen"
-msgstr ""
+msgstr "Jemen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:762
 msgid "Mayotte"
-msgstr ""
+msgstr "Mayotte"
 
+# Existiert nicht mehr, nur übersetzt, bis Korrektur durch Entwickler erfolgt
 #: ../src/plugins/geolocation/geolocation_plugin.c:763
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "Serbien und Montenegro"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:764
 msgid "South Africa"
-msgstr ""
+msgstr "Südafrika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:765
 msgid "Zambia"
-msgstr ""
+msgstr "Sambia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:766
 msgid "Democratic Republic Of The Congo"
-msgstr ""
+msgstr "Demokratische Republik Kongo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:767
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Simbabwe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:777
 #: ../src/plugins/geolocation/geolocation_plugin.c:862
-#, fuzzy
 msgid "GeoLocation"
-msgstr "Ort:"
+msgstr "GeoLocation"
 
+# Clutter ist ein von dem GEoLocation-Plugin benötigtes Programm
 #: ../src/plugins/geolocation/geolocation_plugin.c:782
-#, fuzzy, c-format
+#, c-format
 msgid "Could not initialize clutter"
-msgstr "Rechtschreibprüfung %s konnte nicht initialisiert werden."
+msgstr "Clutter konnte nicht initialisiert werden."
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:788
 #: ../src/plugins/geolocation/geolocation_plugin.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create regular expression: %s\n"
-msgstr "Anlegen der temporären Datei schlug fehl: %s"
+msgstr "Anlegen des Regulären Ausdrucks schlug fehl: %s\n"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:803
-#, fuzzy
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
 msgstr ""
-"Registrieren des \"theme change hook\" im Benachrichtigungs-Plugin schlug "
+"Registrieren des \"messageview_show hook \" im Geolocation-Plugin schlug "
 "fehl."
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:867
@@ -11632,36 +11818,47 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome (but only if it's not about marital "
 "quarrels)."
 msgstr ""
+"Dieses Plugin stellt ein Geolocation-Funktion für Claws Mail bereit.\n"
+"\n"
+"Achtung: Es ist technisch unmöglich, den genauen geografischen Standort von "
+"Absendern aus deren Mails abzuleiten. Die Resultate dieses Plugins sind nur "
+"grobe Näherungen. Vor allem Mailing-Listen-Software entfernt oft "
+"Informationen des Absenders, so dass Mails von Mailinglisten der Standort "
+"des Mailing-Listen-Servers statt der des Absenders zugeordnet wird.\n"
+"Im Zweifelsfall sollten Sie dem Resultat dieses Plugins misstrauen und sich "
+"nicht aufgrund dieser Information von Ihrem Partner trennen.\n"
+"\n"
+"Rückmeldungen an <berndth at gmx.de> sind willkommen (aber nur, wenn es nicht "
+"um Eheprobleme geht)."
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:900
-#, fuzzy
 msgid "GeoLocation integration"
-msgstr "GData-Integration"
+msgstr "GeoLocation-Integration"
 
-#: ../src/plugins/libravatar/libravatar.c:374
-#: ../src/plugins/libravatar/libravatar.c:445
-#: ../src/plugins/libravatar/libravatar.c:505
-#: ../src/plugins/libravatar/libravatar_prefs.c:400
+#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:452
+#: ../src/plugins/libravatar/libravatar.c:512
+#: ../src/plugins/libravatar/libravatar_prefs.c:440
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:388
 msgid "Failed to register avatar header update hook"
 msgstr "Registrieren des \"avatar header update hook\" schlug fehl."
 
-#: ../src/plugins/libravatar/libravatar.c:389
+#: ../src/plugins/libravatar/libravatar.c:396
 msgid "Failed to register avatar image render hook"
 msgstr "Registrieren des \"avatar image render hook\" schlug fehl."
 
-#: ../src/plugins/libravatar/libravatar.c:394
+#: ../src/plugins/libravatar/libravatar.c:401
 msgid "Failed to create avatar image cache directory"
 msgstr "Erstellen des Verzeichnisses für den Avatar-Bilder-Cache schlug fehl."
 
-#: ../src/plugins/libravatar/libravatar.c:403
+#: ../src/plugins/libravatar/libravatar.c:410
 msgid "Failed to load missing items cache"
 msgstr "Der Cache für fehlende Icons konnte nicht geladen werden."
 
-#: ../src/plugins/libravatar/libravatar.c:455
+#: ../src/plugins/libravatar/libravatar.c:462
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -11697,87 +11894,87 @@ msgstr ""
 "\n"
 "Rückmeldungen an <ricardo at mones.org> sind gern gesehen.\n"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:112
+#: ../src/plugins/libravatar/libravatar_prefs.c:138
 msgid "_Use cached icons"
 msgstr "Icons aus dem Cache verwenden"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:113
+#: ../src/plugins/libravatar/libravatar_prefs.c:139
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr ""
 "Icons für Wiederbenutzung lokal speichern anstatt eine weitere "
 "Netzwerkanfrage zu machen."
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:121
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
 msgid "Cache refresh interval"
 msgstr "Zeitintervall zum Aktualisieren des Caches"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:123
-#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:333
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
+#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:335
 msgid "hours"
 msgstr "Stunden"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:188
+#: ../src/plugins/libravatar/libravatar_prefs.c:207
 msgid "Mystery man"
 msgstr "Mystery man"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:189
+#: ../src/plugins/libravatar/libravatar_prefs.c:208
 msgid "Identicon"
 msgstr "Identicon"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:190
+#: ../src/plugins/libravatar/libravatar_prefs.c:209
 msgid "MonsterID"
 msgstr "MonsterID"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:191
+#: ../src/plugins/libravatar/libravatar_prefs.c:210
 msgid "Wavatar"
 msgstr "Wavatar"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:192
+#: ../src/plugins/libravatar/libravatar_prefs.c:211
 msgid "Retro"
 msgstr "Retro"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:193
+#: ../src/plugins/libravatar/libravatar_prefs.c:212
 msgid "Custom URL"
 msgstr "Benutzerdefinierte URL"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:196
+#: ../src/plugins/libravatar/libravatar_prefs.c:215
 msgid "A blank image"
 msgstr "Ein leeres Bild"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:197
+#: ../src/plugins/libravatar/libravatar_prefs.c:216
 msgid "The unobtrusive low-contrast greyish silhouette"
 msgstr "Eine unaufdringliche graue Silhouette mit niedrigem Kontrast."
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:198
+#: ../src/plugins/libravatar/libravatar_prefs.c:217
 msgid "A generated geometric pattern"
 msgstr "Ein geometrisches Muster"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:199
+#: ../src/plugins/libravatar/libravatar_prefs.c:218
 msgid "A generated full-body monster"
 msgstr "Ein Ganzkörper-Monster"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:200
+#: ../src/plugins/libravatar/libravatar_prefs.c:219
 msgid "A generated almost unique face"
 msgstr "Ein beinahe einmaliges Gesicht"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:201
+#: ../src/plugins/libravatar/libravatar_prefs.c:220
 msgid "A generated 8-bit arcade-style pixelated image"
 msgstr "Ein 8-Bit-Pixel-Bild im Arcade-Stil"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:202
+#: ../src/plugins/libravatar/libravatar_prefs.c:221
 msgid "Redirect to a user provided URL"
 msgstr "Umleiten zu einer vom Benutzer definierten URL"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:229 ../src/prefs_themes.c:878
+#: ../src/plugins/libravatar/libravatar_prefs.c:248 ../src/prefs_themes.c:878
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:256
+#: ../src/plugins/libravatar/libravatar_prefs.c:276
 msgid "_Allow redirects to other sites"
 msgstr "Umleitung zu anderen Seiten erlauben."
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:257
+#: ../src/plugins/libravatar/libravatar_prefs.c:277
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
@@ -11785,24 +11982,45 @@ msgstr ""
 "Folge Umleitungs-Antworten vom libravatar-Server zu anderen Avatar-Diensten "
 "wie gravatar.com."
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:266
+#: ../src/plugins/libravatar/libravatar_prefs.c:286
 msgid "_Enable federated servers"
 msgstr "Aktiviere föderierte Server "
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:267
+#: ../src/plugins/libravatar/libravatar_prefs.c:287
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr ""
 "Versuche, das Avatar vom Domain-libravatar-Server des Absenders zu holen."
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:312
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+msgid "Request timeout"
+msgstr "Zeitüberschreitung der Anfrage"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+#: ../src/plugins/notification/notification_prefs.c:1028
+#: ../src/plugins/notification/notification_prefs.c:1300
+#: ../src/plugins/notification/notification_prefs.c:1608
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
+#: ../src/prefs_summaries.c:496
+msgid "seconds"
+msgstr "Sekunden"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:305
+msgid ""
+"Set to 0 to use global socket I/O timeout. Maximum value must be also less "
+"than global socket I/O timeout."
+msgstr ""
+"Auf 0 setzen, um den globalen Socket I/O-Timeout zu verwenden. Der "
+"Maximalwert muss niedriger sein als der globale Socket I/O-Timeout."
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:349
 msgid "Icon cache"
 msgstr "Icon-Cache"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:316
+#: ../src/plugins/libravatar/libravatar_prefs.c:353
 msgid "Default missing icon mode"
 msgstr "Standard-Modus bei fehlendem Icon"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:320
+#: ../src/plugins/libravatar/libravatar_prefs.c:357
 msgid "Network"
 msgstr "Netzwerk"
 
@@ -12113,7 +12331,7 @@ msgstr "Diese Ordnertypen einbeziehen"
 #. Include mail folders
 #: ../src/plugins/notification/notification_prefs.c:607
 msgid "Mail folders"
-msgstr "Mailordner"
+msgstr "Mail-Ordner"
 
 #. Include news folders
 #: ../src/plugins/notification/notification_prefs.c:615
@@ -12132,7 +12350,6 @@ msgstr "Kalender-Ordner"
 
 #. Warning-Label
 #: ../src/plugins/notification/notification_prefs.c:639
-#, fuzzy
 msgid "These settings override folder-specific selections."
 msgstr "Diese Einstellungen überschreiben ordnerspezifische Auswahlen."
 
@@ -12264,14 +12481,6 @@ msgstr "Popup aktivieren"
 msgid "Popup timeout:"
 msgstr "Anzeigedauer des Popups:"
 
-#: ../src/plugins/notification/notification_prefs.c:1028
-#: ../src/plugins/notification/notification_prefs.c:1300
-#: ../src/plugins/notification/notification_prefs.c:1608
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
-#: ../src/prefs_summaries.c:496
-msgid "seconds"
-msgstr "Sekunden"
-
 #. Sticky check button
 #: ../src/plugins/notification/notification_prefs.c:1057
 msgid "Make popup sticky"
@@ -12522,7 +12731,7 @@ msgstr "von %d"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1359
 msgid "PDF rendering failed for an unknown reason."
-msgstr ""
+msgstr "Darstellung des PDFs schlug aus unbekanntem Grund fehl."
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1722
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1940
@@ -12618,7 +12827,7 @@ msgstr ""
 
 #: ../src/plugins/perl/perl_gtk.c:50
 msgid "Edit perl filter rules (ext)..."
-msgstr ""
+msgstr "Perl-Filterregeln bearbeiten (ext)..."
 
 #: ../src/plugins/pgpcore/autocompletion.c:125
 msgid "Failed to register PGP address autocompletion hook"
@@ -12884,12 +13093,12 @@ msgid "Undefined"
 msgstr "Undefiniert"
 
 #: ../src/plugins/pgpcore/select-keys.c:241
-#: ../src/plugins/pgpcore/sgpgme.c:146
+#: ../src/plugins/pgpcore/sgpgme.c:146 ../src/plugins/pgpcore/sgpgme.c:162
 msgid "Marginal"
 msgstr "Gering"
 
 #: ../src/plugins/pgpcore/select-keys.c:247
-#: ../src/plugins/pgpcore/sgpgme.c:150
+#: ../src/plugins/pgpcore/sgpgme.c:150 ../src/plugins/pgpcore/sgpgme.c:166
 msgid "Ultimate"
 msgstr "Ultimativ"
 
@@ -12950,147 +13159,157 @@ msgstr ""
 msgid "No signature found"
 msgstr "Keine Signatur gefunden"
 
-#: ../src/plugins/pgpcore/sgpgme.c:184 ../src/plugins/pgpcore/sgpgme.c:203
+#: ../src/plugins/pgpcore/sgpgme.c:160
+msgid "Untrusted"
+msgstr "Nicht vertrauenswürdig"
+
+#: ../src/plugins/pgpcore/sgpgme.c:200 ../src/plugins/pgpcore/sgpgme.c:219
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Die Signatur kann nicht geprüft werden - %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:188 ../src/plugins/pgpcore/sgpgme.c:192
-#: ../src/plugins/pgpcore/sgpgme.c:245
+#: ../src/plugins/pgpcore/sgpgme.c:204 ../src/plugins/pgpcore/sgpgme.c:208
+#: ../src/plugins/pgpcore/sgpgme.c:249
 msgid "The signature has not been checked."
 msgstr "Die Signatur wurde nicht geprüft."
 
-#: ../src/plugins/pgpcore/sgpgme.c:198 ../src/plugins/pgpcore/sgpgme.c:200
+#: ../src/plugins/pgpcore/sgpgme.c:214 ../src/plugins/pgpcore/sgpgme.c:216
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP-Core: Schlüssel ist nicht verfügbar, kein GPG-Agent aktiv."
 
-#: ../src/plugins/pgpcore/sgpgme.c:215
+#: ../src/plugins/pgpcore/sgpgme.c:228
 #, c-format
 msgid "Good signature from %s."
 msgstr "Gültige Signatur von %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:222
-#, c-format
-msgid "Good signature (untrusted) from %s."
-msgstr "Gültige Signatur (nicht vertrauenswürdig) von %s."
-
-#: ../src/plugins/pgpcore/sgpgme.c:227
+#: ../src/plugins/pgpcore/sgpgme.c:231
 #, c-format
 msgid "Expired signature from %s."
 msgstr "Verfallene Signatur von %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:230
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:234
+#, c-format
 msgid "Good signature from %s, but the key has expired."
-msgstr "Gültige Signatur von %s."
+msgstr "Gültige Signatur von %s, aber der Schlüssel ist verfallen."
 
-#: ../src/plugins/pgpcore/sgpgme.c:233
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:237
+#, c-format
 msgid "Good signature from %s, but the key has been revoked."
-msgstr "Gültige Signatur von %s."
+msgstr "Gültige Signatur von %s, aber der Schlüssel wurde widerrufen."
 
-#: ../src/plugins/pgpcore/sgpgme.c:236
+#: ../src/plugins/pgpcore/sgpgme.c:240
 #, c-format
 msgid "Bad signature from %s."
 msgstr "Ungültige Signatur von %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:240
+#: ../src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Schlüssel 0x%s zum Prüfen der Signatur nicht verfügbar."
 
-#: ../src/plugins/pgpcore/sgpgme.c:264
+#: ../src/plugins/pgpcore/sgpgme.c:268
 #, c-format
 msgid "Error checking signature: no status\n"
 msgstr "Fehler beim Prüfen der Signatur: kein Status\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:283
+#: ../src/plugins/pgpcore/sgpgme.c:287
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Fehler beim Prüfen der Signatur: %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:302
+#: ../src/plugins/pgpcore/sgpgme.c:306
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Signatur erstellt auf %s unter Verwendung von %s Schlüssel-ID %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:308
+#: ../src/plugins/pgpcore/sgpgme.c:312
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Gültige Signatur von \"%s\" (Gültigkeit: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:313
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:317
+#, c-format
 msgid "Expired key uid \"%s\"\n"
-msgstr "Verfallener Schlüssel von %s."
+msgstr "Verfallener Schlüssel uid \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:318
+#: ../src/plugins/pgpcore/sgpgme.c:322
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Verfallene Signatur von \"%s\" (Gültigkeit: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:323
+#: ../src/plugins/pgpcore/sgpgme.c:327
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
-msgstr ""
+msgstr "Widerrufener Schlüssel uid \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:328
+#: ../src/plugins/pgpcore/sgpgme.c:332
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "UNGÜLTIGE Signatur von '%s'\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:339
+#: ../src/plugins/pgpcore/sgpgme.c:343
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                uid \"%s\" (Gültigkeit: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:346
+#: ../src/plugins/pgpcore/sgpgme.c:345
+msgid "Revoked"
+msgstr "Widerrufen"
+
+# Wird bei GnuPG nicht übersetzt:
+# http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob_plain;f=po/de.po;hb=6d9491842d5da597980eaa59e1e3e2137965fe09
+#: ../src/plugins/pgpcore/sgpgme.c:349
+#, c-format
+msgid "Owner Trust: %s\n"
+msgstr "Owner Trust: %s\n"
+
+#: ../src/plugins/pgpcore/sgpgme.c:352
 msgid "Primary key fingerprint:"
 msgstr "Primärer Schlüssel-Fingerabdruck:"
 
-#: ../src/plugins/pgpcore/sgpgme.c:364
+#: ../src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 "ACHTUNG: Adresse des Unterzeichners \"%s\" passt nicht zum DNS-Eintrag\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:370
+#: ../src/plugins/pgpcore/sgpgme.c:376
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Überprüfte Adresse des Unterzeichners ist \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:412
+#: ../src/plugins/pgpcore/sgpgme.c:410
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Keine Daten aus Nachricht erhältlich, %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:428
+#: ../src/plugins/pgpcore/sgpgme.c:426
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Daten konnten nicht initialisiert werden, %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:583
+#: ../src/plugins/pgpcore/sgpgme.c:581
 msgid "Secret key specification is ambiguous"
 msgstr "Angaben zum privaten Schlüssel sind mehrdeutig"
 
-#: ../src/plugins/pgpcore/sgpgme.c:593
+#: ../src/plugins/pgpcore/sgpgme.c:591
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Privater Schlüssel nicht gefunden (%s)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:606
+#: ../src/plugins/pgpcore/sgpgme.c:604
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Fehler beim Setzen des privaten Schlüssels: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:690
+#: ../src/plugins/pgpcore/sgpgme.c:688
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme Protokoll '%s' ist nicht nutzbar. Treiber '%s' ist nicht richtig "
 "installiert."
 
-#: ../src/plugins/pgpcore/sgpgme.c:696
+#: ../src/plugins/pgpcore/sgpgme.c:694
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -13099,12 +13318,12 @@ msgstr ""
 "Gpgme Protokoll '%s' ist nicht nutzbar. Treiber '%s' Version %s ist "
 "installiert, aber Version %s wird benötigt.\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:704
+#: ../src/plugins/pgpcore/sgpgme.c:702
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme Protokoll '%s' ist nicht nutzbar (unbekannter Fehler)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:720
+#: ../src/plugins/pgpcore/sgpgme.c:718
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -13112,7 +13331,7 @@ msgstr ""
 "GnuPG ist nicht richtig installiert oder muss aktualisiert werden.\n"
 "OpenPGP-Unterstützung deaktiviert."
 
-#: ../src/plugins/pgpcore/sgpgme.c:754
+#: ../src/plugins/pgpcore/sgpgme.c:752
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -13120,11 +13339,11 @@ msgstr ""
 "Sie müssen die Kontodaten mit \"OK\" speichern, bevor Sie ein Schlüsselpaar "
 "erzeugen können.\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:759
+#: ../src/plugins/pgpcore/sgpgme.c:757
 msgid "No PGP key found"
 msgstr "kein PGP-Schlüssel gefunden"
 
-#: ../src/plugins/pgpcore/sgpgme.c:760
+#: ../src/plugins/pgpcore/sgpgme.c:758
 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"
@@ -13134,12 +13353,12 @@ msgstr ""
 "E-Mails signieren noch verschlüsselte E-Mails empfangen können.\n"
 "Möchten Sie jetzt ein neues Schlüsselpaar erzeugen?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:830 ../src/plugins/pgpcore/sgpgme.c:846
+#: ../src/plugins/pgpcore/sgpgme.c:828 ../src/plugins/pgpcore/sgpgme.c:844
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Es konnte kein neues Schlüsselpaar erzeugt werden: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:837
+#: ../src/plugins/pgpcore/sgpgme.c:835
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -13147,11 +13366,11 @@ msgstr ""
 "Neues Schlüsselpaar wird erzeugt... Bitte die Maus bewegen, um beim Erzeugen "
 "von Entropy zu helfen..."
 
-#: ../src/plugins/pgpcore/sgpgme.c:852
+#: ../src/plugins/pgpcore/sgpgme.c:850
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Neues Schlüsselpaar konnte nicht erzeugt werden: unbekannter Fehler"
 
-#: ../src/plugins/pgpcore/sgpgme.c:856
+#: ../src/plugins/pgpcore/sgpgme.c:854
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -13164,19 +13383,19 @@ msgstr ""
 "\n"
 "Soll er zu einem Schlüsselserver exportiert werden?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:860
+#: ../src/plugins/pgpcore/sgpgme.c:858
 msgid "Key generated"
 msgstr "Schlüssel erzeugt."
 
-#: ../src/plugins/pgpcore/sgpgme.c:899
+#: ../src/plugins/pgpcore/sgpgme.c:897
 msgid "Key exported."
 msgstr "Schlüssel exportiert."
 
-#: ../src/plugins/pgpcore/sgpgme.c:901
+#: ../src/plugins/pgpcore/sgpgme.c:899
 msgid "Couldn't export key."
 msgstr "Schlüssel-Export schlug fehl."
 
-#: ../src/plugins/pgpcore/sgpgme.c:905
+#: ../src/plugins/pgpcore/sgpgme.c:903
 msgid "Key export isn't implemented in Windows."
 msgstr "Schlüssel-Export funktioniert nicht unter Windows."
 
@@ -13203,7 +13422,7 @@ msgstr "Textdaten nicht in normalen Zeichensatz konvertierbar."
 #: ../src/plugins/pgpinline/pgpinline.c:716
 #: ../src/plugins/pgpmime/pgpmime.c:74 ../src/plugins/pgpmime/pgpmime.c:184
 #: ../src/plugins/pgpmime/pgpmime.c:330 ../src/plugins/pgpmime/pgpmime.c:510
-#: ../src/plugins/pgpmime/pgpmime.c:655 ../src/plugins/smime/smime.c:415
+#: ../src/plugins/pgpmime/pgpmime.c:651 ../src/plugins/smime/smime.c:415
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "GPG Kontext konnte nicht initialisiert werden, %s"
@@ -13300,19 +13519,19 @@ msgstr ""
 "Inline-System verschlüsselt werden."
 
 #: ../src/plugins/pgpinline/pgpinline.c:670
-#: ../src/plugins/pgpmime/pgpmime.c:665
+#: ../src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Hinzufügen des GPG-Schlüssels %s schlug fehl, %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:698
-#: ../src/plugins/pgpmime/pgpmime.c:694
+#: ../src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Temporäre Datei nicht erstellbar, %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:729
-#: ../src/plugins/pgpmime/pgpmime.c:721
+#: ../src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Verschlüsseln schlug fehl, %s"
@@ -13369,7 +13588,11 @@ msgstr "Entschlüsselte Dateiteile nicht analysierbar."
 msgid "Couldn't create temporary file: %s"
 msgstr "Anlegen der temporären Datei schlug fehl: %s"
 
-#: ../src/plugins/pgpmime/pgpmime.c:621
+#: ../src/plugins/pgpmime/pgpmime.c:595
+msgid "OpenPGP digital signature"
+msgstr "Digitale Signatur von OpenPGP"
+
+#: ../src/plugins/pgpmime/pgpmime.c:617
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -13377,7 +13600,7 @@ msgstr ""
 "Bitte beachten Sie, dass Kopfzeilen (wie Betreff) vom PGP/Mime-System nicht "
 "verschlüsselt werden."
 
-#: ../src/plugins/pgpmime/pgpmime.c:793
+#: ../src/plugins/pgpmime/pgpmime.c:789
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -13447,7 +13670,7 @@ msgid ""
 "\n"
 "These scripts are then available via the menu. You can assign keyboard "
 "shortcuts to them just like it is done with other menu items. You can also "
-"put buttons for script invokation into the toolbars using Claws Mail's "
+"put buttons for script invocation into the toolbars using Claws Mail's "
 "builtin toolbar editor.\n"
 "\n"
 "You can provide scripts working on the main window by placing files into ~/."
@@ -13486,9 +13709,8 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
 "Dieses Plugin ermöglicht die Integration von Python.\n"
-"Python-Code kann interaktiv in eine eingebettete Python-Konsole eingegeben "
-"werden. Der Aufruf erfolgt über Extras -> Python-Konsole öffnen oder "
-"Scripte.\n"
+"Python-Code kann interaktiv in eine eingebettete Python-Konsole unter Extras "
+"-> Python-Konsole öffnen eingegeben oder in Scripten gespeichert werden.\n"
 "\n"
 "Diese Scripte sind über das Menü verfügbar. Sie können ihnen Tastenkürzel "
 "zuweisen wie allen anderen Menüeinträgen. Mit dem in Claws Mail integrierten "
@@ -13504,8 +13726,8 @@ msgstr ""
 "Gegenwärtig werden folgende Dateien in diesem Verzeichnis erkannt:\n"
 "\n"
 " compose_any\n"
-"_Umbenennen...ein Editor-Fenster geöffnet wird unabhängig davon, ob durch "
-"das Beantworten, Weiterleiten oder Erstellen einer neuen Nachricht.\n"
+"_Wird ausgeführt, wenn ein Editor-Fenster geöffnet wird – unabhängig davon, "
+"ob die Nachricht beantwortet, weitergeleitet oder neu erstellt wird.\n"
 "\n"
 " startup\n"
 "Wird ausgeführt, wenn das Plugin gestartet wird.\n"
@@ -13531,150 +13753,48 @@ msgstr ""
 msgid "Python integration"
 msgstr "Python-Integration"
 
-#: ../src/plugins/rssyl/feed.c:126
-msgid "Cannot open temporary file"
-msgstr "Temporäre Datei konnte nicht geöffnet werden"
-
-#: ../src/plugins/rssyl/feed.c:137
-msgid "Cannot init libCURL"
-msgstr "libCURL konnte nicht initialisiert werden"
-
-#: ../src/plugins/rssyl/feed.c:234 ../src/plugins/vcalendar/vcal_folder.c:1596
-msgid "401 (Authorisation required)"
-msgstr "401 (Anmeldung erforderlich)"
-
-#: ../src/plugins/rssyl/feed.c:237 ../src/plugins/vcalendar/vcal_folder.c:1599
-msgid "403 (Unauthorised)"
-msgstr "403 (nicht autorisiert)"
-
-#: ../src/plugins/rssyl/feed.c:240 ../src/plugins/vcalendar/vcal_folder.c:1602
-msgid "404 (Not found)"
-msgstr "404 (nicht gefunden)"
-
-#: ../src/plugins/rssyl/feed.c:243 ../src/plugins/vcalendar/vcal_folder.c:1605
-#, c-format
-msgid "Error %ld"
-msgstr "Fehler %ld"
-
-#: ../src/plugins/rssyl/feed.c:328
-#, c-format
-msgid "Fetching '%s'..."
-msgstr "Hole '%s'..."
-
-#: ../src/plugins/rssyl/feed.c:387
-msgid "Malformed feed"
-msgstr "Missgebildeter Feed"
-
-#: ../src/plugins/rssyl/feed.c:1203
-#, c-format
-msgid "Refreshing feed '%s'..."
-msgstr "Aktualisiere Feed '%s'..."
-
-#: ../src/plugins/rssyl/feed.c:1218
+#: ../src/plugins/rssyl/old_feeds.c:90
 #, c-format
 msgid ""
-"RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-"comments of '%s'"
+"Couldn't read contents of old feeds.xml file:\n"
+"%s"
 msgstr ""
-"RSSyl: Das Holen von Kommentaren aus RDF-Feeds wird nicht unterstützt. Die "
-"Kommentare von '%s' konnten nicht geholt werden."
-
-#: ../src/plugins/rssyl/feed.c:1227
-msgid "This feed format is not supported yet."
-msgstr "Dieses Feed-Format wird noch nicht unterstützt."
-
-#: ../src/plugins/rssyl/feed.c:1258
-msgid "N/A"
-msgstr "N/A"
+"Konnte Inhalt der aten feeds.xml-Datei lesen:\n"
+"%s"
 
-#: ../src/plugins/rssyl/feed.c:1378
+#: ../src/plugins/rssyl/opml_export.c:110
 #, c-format
-msgid "%ld byte"
-msgid_plural "%ld bytes"
-msgstr[0] "%ld Byte"
-msgstr[1] "%ld Bytes"
-
-#: ../src/plugins/rssyl/feed.c:1381
-msgid "size unknown"
-msgstr "Größe unbekannt"
+msgid "RSSyl: Error while writing '%s' to feed export list.\n"
+msgstr "RSSyl: Fehler beim Schreiben von '%s' in die Feed-Export-Liste.\n"
 
-#: ../src/plugins/rssyl/feed.c:1555
+#: ../src/plugins/rssyl/opml_export.c:131
 #, c-format
-msgid ""
-"RSSyl: Cannot update feed %s:\n"
-"%s\n"
-msgstr ""
-"RSSyl: Feed '%s' konnte nicht aktualisiert werden:\n"
-"%s\n"
+msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
+msgstr "RSSyl: Konnte alte .opml-Datei '%s': %s nicht löschen.\n"
 
-#: ../src/plugins/rssyl/feed.c:1727
-msgid "You are already subscribed to this feed."
-msgstr "Sie haben diesen Feed bereits abonniert."
-
-#: ../src/plugins/rssyl/feed.c:1738
+#: ../src/plugins/rssyl/opml_export.c:141
 #, c-format
-msgid ""
-"Couldn't fetch URL '%s':\n"
-"%s"
-msgstr ""
-"Konnte URL '%s' nicht holen:\n"
-"%s"
+msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
+msgstr "RSSyl: Konnte Datei '%s' für den Feed-List-Export nicht öffnen: %s\n"
+
+#: ../src/plugins/rssyl/opml_export.c:182
+msgid "RSSyl: Error during writing feed export file.\n"
+msgstr "RSSyl: Fehler beim Schreiben der Feed-Export-Datei.\n"
 
-#: ../src/plugins/rssyl/feed.c:1743
+#: ../src/plugins/rssyl/opml_import.c:109
 #, c-format
 msgid ""
-"Couldn't fetch URL '%s':\n"
+"Error while subscribing feed\n"
 "%s\n"
+"\n"
+"Folder name '%s' is not allowed."
 msgstr ""
-"Konnte URL '%s' nicht holen:\n"
+"Fehler beim Abonnieren des Feeds\n"
 "%s\n"
+"\n"
+"Ordnername '%s' ist nicht erlaubt."
 
-#: ../src/plugins/rssyl/feed.c:1759
-#, c-format
-msgid "Can't subscribe feed '%s'."
-msgstr "Der Feed '%s' konnte nicht abonniert werden."
-
-#: ../src/plugins/rssyl/feed.c:1861 ../src/plugins/rssyl/rssyl_cb_menu.c:281
-msgid "Claws Mail needs network access in order to update the feed."
-msgid_plural "Claws Mail needs network access in order to update the feeds."
-msgstr[0] "Claws Mail benötigt Netzwerkzugang, um den Feed zu aktualisieren."
-msgstr[1] "Claws Mail benötigt Netzwerkzugang, um die Feeds zu aktualisieren."
-
-#: ../src/plugins/rssyl/feed.h:20
-#, c-format
-msgid "Time out connecting to URL %s\n"
-msgstr "Zeitüberschreitung bei Verbindung zu URL %s\n"
-
-#: ../src/plugins/rssyl/feed.h:21
-#, c-format
-msgid "Couldn't fetch URL %s\n"
-msgstr "Konnte URL '%s' nicht holen\n"
-
-#: ../src/plugins/rssyl/feed.h:22
-#, c-format
-msgid "Error parsing feed from URL %s\n"
-msgstr "Fehler beim Parsen des Feeds von URL %s\n"
-
-#: ../src/plugins/rssyl/feed.h:23
-#, c-format
-msgid "Unsupported feed type at URL %s\n"
-msgstr "Nicht unterstützter Feedtyp von URL %s\n"
-
-#: ../src/plugins/rssyl/feed.h:25
-#, c-format
-msgid "RSSyl: Updating feed %s\n"
-msgstr "RSSyl: aktualisiere Feed %s\n"
-
-#: ../src/plugins/rssyl/feed.h:26
-#, c-format
-msgid "RSSyl: Feed update finished: %s\n"
-msgstr "RSSyl: Feedaktualisierung beendet: %s\n"
-
-#: ../src/plugins/rssyl/feed.h:27
-msgid "RSSyl: Feed update aborted, application is exiting.\n"
-msgstr "RSSyl: die Anwendung wird beendet, Feedaktualisierung abgebrochen.\n"
-
-#: ../src/plugins/rssyl/plugin.c:63
+#: ../src/plugins/rssyl/plugin.c:65
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13689,117 +13809,165 @@ msgstr ""
 "aus dem Web geholt werden. Sie können diese lesen, löschen sowie alte "
 "Einträge behalten."
 
-#: ../src/plugins/rssyl/plugin.c:87
+#: ../src/plugins/rssyl/plugin.c:89
 msgid "RSS feed"
 msgstr "RSS Feed"
 
-#: ../src/plugins/rssyl/rssyl.c:133 ../src/plugins/rssyl/rssyl.c:145
+#: ../src/plugins/rssyl/rssyl_add_item.c:295
+msgctxt "Empty RSS feed title placeholder"
+msgid "(empty)"
+msgstr "(leer)"
+
+#: ../src/plugins/rssyl/rssyl.c:154 ../src/plugins/rssyl/rssyl.c:165
 msgid "Refresh all feeds"
 msgstr "Alle Feeds _aktualisieren"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:62
-msgid "Subscribe feed"
-msgstr "Feed abonnieren"
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:66
+msgid "Subscribe feed"
+msgstr "Feed abonnieren"
+
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:67
+msgid "Input the URL of the news feed you wish to subscribe:"
+msgstr "Geben Sie die URL des zu abonnierenden Newsfeeds ein:"
+
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:100
+#, c-format
+msgid "'%c' can't be used in folder name."
+msgstr "'%c' darf nicht im Ordnernamen enthalten sein."
+
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:242
+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 benötigt Netzwerkzugang, um den Feed zu aktualisieren."
+msgstr[1] "Claws Mail benötigt Netzwerkzugang, um die Feeds zu aktualisieren."
+
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:305
+#, c-format
+msgid "Really remove the feed tree `%s' ?\n"
+msgstr "Den RSS-Feed-Baum '%s' wirklich entfernen?\n"
+
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:306
+msgid "Remove feed tree"
+msgstr "RSS-Feed-Baum entfernen"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:63
-msgid "Input the URL of the news feed you wish to subscribe:"
-msgstr "Geben Sie die URL des zu abonnierenden Newsfeeds ein:"
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:341
+msgid "Select an OPML file"
+msgstr "Wähle eine .opml Datei"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:138
+#: ../src/plugins/rssyl/rssyl_feed.c:75
+#: ../src/plugins/rssyl/rssyl_subscribe.c:139
 #, c-format
-msgid "Really remove the folder tree '%s'?\n"
-msgstr "Den Ordnerbaum '%s' wirklich entfernen?\n"
+msgid "Couldn't create folder for new feed '%s'."
+msgstr "Ordner für den neuen Feed '%s' konnte nicht erstellt werden."
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:139
-msgid "Remove folder tree"
-msgstr "Ordnerbaum entfernen"
+#: ../src/plugins/rssyl/rssyl_feed.h:10
+#, c-format
+msgid "RSSyl: Subscribing new feed: %s\n"
+msgstr "RSSyl: abonniere neuen Feed %s\n"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
+#: ../src/plugins/rssyl/rssyl_feed.h:11
 #, c-format
-msgid "Can't remove feed '%s'."
-msgstr "Der Feed '%s' konnte nicht entfernt werden."
+msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
+msgstr "RSSyl: Neuer Feed abonniert: '%s' (%s)\n"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:374
-msgid "Select a .opml file"
-msgstr "Wähle eine .opml Datei"
+#: ../src/plugins/rssyl/rssyl_feed.h:12
+#, c-format
+msgid "RSSyl: Updating feed: %s\n"
+msgstr "RSSyl: aktualisiere Feed %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:53
-msgid "_Refresh feed"
-msgstr "Feed aktualisie_ren"
+#: ../src/plugins/rssyl/rssyl_feed.h:13
+#, c-format
+msgid "RSSyl: Feed update finished: %s\n"
+msgstr "RSSyl: Feedaktualisierung beendet: %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:54
-msgid "Refresh _all feeds"
-msgstr "Alle Feeds _aktualisieren"
+# Übersetzung nach Kompilieren prüfen
+#: ../src/plugins/rssyl/rssyl_feed.h:14
+#, c-format
+msgid "RSSyl: Error fetching feed at '%s': %s\n"
+msgstr "RSSyl: Fehler beim Holen des Feeds bei '%s': %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:55
-msgid "Subscribe _new feed..."
-msgstr "Neue_n Feed abonnieren..."
+#: ../src/plugins/rssyl/rssyl_feed.h:15
+#, c-format
+msgid "RSSyl: No valid feed found at '%s'\n"
+msgstr "RSSyl: kein gültiger Feed bei %s gefunden\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:56
-msgid "_Unsubscribe feed..."
-msgstr "Feed a_bbestellen..."
+#: ../src/plugins/rssyl/rssyl_feed.h:16
+#, c-format
+msgid "RSSyl: Couldn't process feed at '%s'\n"
+msgstr "RSSyl: Konnte Feed von '%s' nicht verarbeiten\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:57
-msgid "Feed pr_operties..."
-msgstr "Feed-Ei_genschaften..."
+#: ../src/plugins/rssyl/rssyl_feed.h:17
+#, c-format
+msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
+msgstr ""
+"RSSyl: Anwendung bricht ab, Aktualisierung des Feeds konnte nicht beendet "
+"werden: '%s'\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:58
-msgid "Import feed list..."
-msgstr "Feedliste importieren..."
+#: ../src/plugins/rssyl/rssyl_feed_props.c:243
+msgid "Use default refresh interval"
+msgstr "Benutze vorgegebenen Zeitintervall zum Aktualisieren"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:59
-msgid "Rena_me..."
-msgstr "U_mbennen..."
+#: ../src/plugins/rssyl/rssyl_feed_props.c:255
+msgid "Keep old items"
+msgstr "Alte Einträge behalten"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:60
-msgid "_Create new folder..."
-msgstr "_Neuen Ordner erstellen..."
+#. "Trim" button
+#: ../src/plugins/rssyl/rssyl_feed_props.c:261
+msgid "_Trim"
+msgstr "_Abgleichen"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:62
-msgid "Remove folder _tree..."
-msgstr "Ord_nerbaum entfernen..."
+#: ../src/plugins/rssyl/rssyl_feed_props.c:264
+#: ../src/plugins/rssyl/rssyl_feed_props.c:267
+msgid "Update feed, deleting items which are no longer in the source feed"
+msgstr ""
+"Aktualisiert Feed und löscht Einträge, die in der Feed-Quelle nicht mehr "
+"existieren."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:152
-msgid "Add RSS folder tree"
-msgstr "RSS-Ordnerbaum hinzufügen"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:271
+msgid "Fetch comments if possible"
+msgstr "Hole Kommentare wenn möglich"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:153
-msgid "Enter name for a new RSS folder tree."
-msgstr "Namen des neuen RSS-Ordnerbaumes eingeben."
+#: ../src/plugins/rssyl/rssyl_feed_props.c:296
+msgid "Always mark as new"
+msgstr "Immer als neu markieren"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:169
-msgid ""
-"Creation of folder tree failed.\n"
-"Maybe some files already exist, or you don't have the permission to write "
-"there?"
-msgstr ""
-"Das Erzeugen des Ordnerbaumes schlug fehl.\n"
-"Eventuell existieren einige Dateien bereits oder Sie haben nicht die nötigen "
-"Rechte, um diese zu schreiben."
+#: ../src/plugins/rssyl/rssyl_feed_props.c:302
+msgid "If only its text changed"
+msgstr "Wenn sich nur der Text geändert hat"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:184
-msgid "RSSyl..."
-msgstr "RSSyl..."
+#: ../src/plugins/rssyl/rssyl_feed_props.c:308
+msgid "Never mark as new"
+msgstr "Niemals als neu markieren"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:257
-msgid "Use default refresh interval"
-msgstr "Benutze vorgegebenen Zeitintervall zum Aktualisieren"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:313
+msgid "Add item title to top of message"
+msgstr "Titel zum Anfang des Eintrags hinzufügen"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:269
-msgid "Keep default number of expired entries"
-msgstr "Behalte vorgegebene Anzahl abgelaufener Einträge"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:320
+msgid "Ignore title rename"
+msgstr "Ignoriere Änderung des Titels"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:275
-msgid "Fetch comments if possible"
-msgstr "Hole Kommentare wenn möglich"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:326
+#: ../src/plugins/rssyl/rssyl_feed_props.c:329
+msgid ""
+"Enable this to keep current folder name, even if feed author changes title "
+"of the feed."
+msgstr ""
+"Aktivieren, um den aktuellen Ordnername beizubehalten, selbst wenn sich der "
+"Titel des Feeds ändert"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:334
+#: ../src/plugins/vcalendar/vcal_prefs.c:518
+msgid "Verify SSL certificate validity"
+msgstr "Überprüfe Gültigkeit des SSL-Zertifikats"
 
 #. Label for URL frame
-#: ../src/plugins/rssyl/rssyl_gtk.c:308
+#: ../src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "<b>Source URL:</b>"
 msgstr "<b>Quell-URL:</b>"
 
-#. Fetch comments for - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:336
+#. Fetch comments max age - label
+#: ../src/plugins/rssyl/rssyl_feed_props.c:378
 msgid ""
 "<b>Fetch comments on posts aged less than:</b>\n"
 "<small>(In days; set to -1 to fetch all comments)</small>"
@@ -13808,7 +13976,7 @@ msgstr ""
 "<small>(in Tagen; auf -1 setzen, um alle Kommentare zu holen)</small>"
 
 #. Refresh interval - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:370
+#: ../src/plugins/rssyl/rssyl_feed_props.c:436
 msgid ""
 "<b>Refresh interval in minutes:</b>\n"
 "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
@@ -13817,97 +13985,195 @@ msgstr ""
 "<small>(auf 0 setzen, um das automatische Aktualisieren dieses Feeds zu "
 "deaktivieren)</small>"
 
-#. Expired items - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:403
-msgid ""
-"<b>Number of expired entries to keep:</b>\n"
-"<small>(Set to -1 if you want to keep expired entries)</small>"
-msgstr ""
-"<b>Anzahl der abgelaufenen Einträge, die aufgehoben werden:</b>\n"
-"<small>(auf -1 setzen, um abgelaufene Einträge zu behalten)</small>"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:462
+msgid "<b>If an item changes, do not mark it as new:</b>"
+msgstr "<b>Eintrag nicht als ungelesen markieren wenn er sich ändert:</b>"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:554
+msgid "_OK"
+msgstr "_OK"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:429
-msgid "<b>If an item changes, do not mark it as unread:</b>"
-msgstr "<b>Nachricht nicht als ungelesen markieren wenn sie sich ändert:</b>"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:562
+msgid "Set feed properties"
+msgstr "Feed-Eigenschaften einstellen"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:439
-msgid "Always mark as unread"
-msgstr "Immer als ungelesen markieren"
+#: ../src/plugins/rssyl/rssyl_gtk.c:48
+msgid "_Refresh feed"
+msgstr "Feed aktualisie_ren"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:441
-msgid "If only its text has changed"
-msgstr "Wenn sich nur der Text geändert hat"
+#: ../src/plugins/rssyl/rssyl_gtk.c:49
+msgid "Feed pr_operties"
+msgstr "Feed-Ei_genschaften.."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:443
-msgid "Never mark as unread"
-msgstr "Niemals als ungelesen markieren"
+#: ../src/plugins/rssyl/rssyl_gtk.c:50
+msgid "Rena_me..."
+msgstr "U_mbennen..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:459
-#: ../src/plugins/vcalendar/vcal_prefs.c:518
-msgid "Verify SSL certificate validity"
-msgstr "Überprüfe Gültigkeit des SSL-Zertifikats"
+#: ../src/plugins/rssyl/rssyl_gtk.c:51
+msgid "R_efresh recursively"
+msgstr "R_ekursiv erneuern"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:515
-msgid "_OK"
-msgstr "_OK"
+#: ../src/plugins/rssyl/rssyl_gtk.c:52
+msgid "Subscribe _new feed..."
+msgstr "Neue_n Feed abonnieren..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:523
-msgid "Set feed properties"
-msgstr "Feed-Eigenschaften einstellen"
+#: ../src/plugins/rssyl/rssyl_gtk.c:53
+msgid "Create new _folder..."
+msgstr "_Neuen Ordner erstellen..."
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:54
+msgid "Import feed list..."
+msgstr "Feedliste importieren..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:651 ../src/plugins/rssyl/rssyl_gtk.c:675
-msgid "Unsubscribe feed"
-msgstr "Feed abbestellen"
+#: ../src/plugins/rssyl/rssyl_gtk.c:56
+msgid "Remove tree"
+msgstr "Entferne RSS-Feed-Baum"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:676
-msgid "Do you really want to remove feed"
-msgstr "Soll dieser Feed wirklich entfernt werden:"
+#: ../src/plugins/rssyl/rssyl_gtk.c:126
+msgid "Add RSS folder tree"
+msgstr "RSS-Ordnerbaum hinzufügen"
 
-#. Remove cache checkbutton
-#: ../src/plugins/rssyl/rssyl_gtk.c:682
-msgid "Remove cached entries"
-msgstr "Zwischengespeicherte Einträge entfernen"
+#: ../src/plugins/rssyl/rssyl_gtk.c:127
+msgid "Enter name for a new RSS folder tree."
+msgstr "Namen des neuen RSS-Ordnerbaumes eingeben."
 
-#: ../src/plugins/rssyl/rssyl.h:8
-msgid "RSSyl"
-msgstr "RSSyl"
+#: ../src/plugins/rssyl/rssyl_gtk.c:143
+msgid ""
+"Creation of folder tree failed.\n"
+"Maybe some files already exist, or you don't have the permission to write "
+"there?"
+msgstr ""
+"Das Erzeugen des Ordnerbaumes schlug fehl.\n"
+"Eventuell existieren einige Dateien bereits oder Sie haben nicht die nötigen "
+"Rechte, um diese zu schreiben."
 
 #. Default RSSyl mailbox name
-#: ../src/plugins/rssyl/rssyl.h:14
+#: ../src/plugins/rssyl/rssyl.h:17
 msgid "My Feeds"
 msgstr "Meine Feeds"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:106
+#: ../src/plugins/rssyl/rssyl_prefs.c:128
 msgid "Default refresh interval in minutes"
 msgstr "Standardintervall für Aktualisierung in Minuten"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:117
-msgid "Set to 0 to disable automatic refreshing"
-msgstr "Auf 0 setzen, um automatische Aktualisierung zu deaktivieren"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:119
-msgid "Default number of expired items to keep"
-msgstr "Standardanzahl der zu behaltenden abgelaufenen Einträge"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:130
-msgid "Set to -1 to keep expired items"
-msgstr "Auf -1 setzen, um abgelaufenen Einträge zu behalten"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:133
+#: ../src/plugins/rssyl/rssyl_prefs.c:147
 msgid "Refresh all feeds on application start"
 msgstr "Alle Feeds beim Programmstart aktualisieren"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:139
+#. Path to cookies file for libcurl to use
+#: ../src/plugins/rssyl/rssyl_prefs.c:155
 msgid "Path to cookies file"
 msgstr "Pfad zur Cookie-Datei"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:149
+#: ../src/plugins/rssyl/rssyl_prefs.c:166
+#: ../src/plugins/rssyl/rssyl_prefs.c:169
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr "Pfad zur cookies.txt (Netscape-Format), die Ihre Cookies enthält."
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:152
-msgid "Verify SSL certificate validity for new feeds"
-msgstr "Überprüfe Gültigkeit des SSL-Zertifikats für neue Feeds."
+#: ../src/plugins/rssyl/rssyl_prefs.c:176
+msgid "Verify SSL certificates validity for new feeds"
+msgstr "Überprüfe Gültigkeit von SSL-Zertifikaten für neue Feeds."
+
+#. Create window
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+msgid "Subscribe new feed?"
+msgstr "Neue_n Feed abonnieren?"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:72
+msgid "<b>Feed folder:</b>"
+msgstr "<b>Feed-Ordner:</b>"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:82
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:86
+msgid ""
+"Instead of using official title, you can enter a different folder name for "
+"the feed."
+msgstr ""
+"Anstatt des offiziellen Titels können Sie einen anderen Ordnername für den "
+"Feed verwenden"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:91
+msgid "_Edit feed properties after subscribing"
+msgstr "Feed-Eigenschaften nach Abonnieren _bearbeiten"
+
+#: ../src/plugins/rssyl/rssyl_update_comments.c:99
+#, c-format
+msgid "Updating comments for '%s'..."
+msgstr "Aktualisiere Kommentare für %s..."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:102
+#: ../src/plugins/vcalendar/vcal_folder.c:1596
+msgid "401 (Authorisation required)"
+msgstr "401 (Anmeldung erforderlich)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:105
+#: ../src/plugins/vcalendar/vcal_folder.c:1599
+msgid "403 (Unauthorised)"
+msgstr "403 (nicht autorisiert)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:108
+#: ../src/plugins/vcalendar/vcal_folder.c:1602
+msgid "404 (Not found)"
+msgstr "404 (nicht gefunden)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:111
+#, c-format
+msgid "Error %d"
+msgstr "Fehler %d"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:123
+#, c-format
+msgctxt "First parameter is URL, second is error text"
+msgid ""
+"Error fetching feed at\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
+msgstr ""
+"Fehler beim Holen des Feeds von\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:134
+#, c-format
+msgid ""
+"No valid feed found at\n"
+"<b>%s</b>"
+msgstr ""
+"Kein gültiger Feed zu finden unter\n"
+"<b>%s</b>"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:200
+#, c-format
+msgid "Updating feed '%s'..."
+msgstr "Aktualisiere Feed '%s'..."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:221
+#, c-format
+msgid ""
+"Couldn't process feed at\n"
+"<b>%s</b>\n"
+"\n"
+"Please contact developers, this should not happen."
+msgstr ""
+"Konnte den Feed unter\n"
+"<b>%s</b>\n"
+"nicht verarbeiten\n"
+"\n"
+"Bitte kontaktieren Sie den Entwickler, dies sollte nicht passieren."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:301
+msgid "Claws Mail needs network access in order to update your feeds."
+msgstr "Claws Mail benötigt Netzwerkzugang, um Ihre Feeds zu aktualisieren."
+
+#: ../src/plugins/rssyl/rssyl_update_format.c:127
+msgid ""
+"Internal problem while upgrading storage format. This should not happen. "
+"Please report this, with debug output attached.\n"
+msgstr ""
+"Interner Fehler beim Aktualisieren des Speicherformats. Dies sollte nicht "
+"passieren. Bitte Melden Sie dies mit angehängter Debug-Ausgabe.\n"
 
 #: ../src/plugins/smime/plugin.c:38 ../src/plugins/smime/plugin.c:54
 #: ../src/plugins/smime/smime.c:911
@@ -13976,6 +14242,48 @@ msgstr ""
 "Bitte beachten, dass Kopfzeilen (wie Betreff) vom S/Mime-System nicht "
 "verschlüsselt werden."
 
+#: ../src/plugins/spam_report/spam_report.c:295
+msgid "Reporting spam..."
+msgstr "Melde Spam..."
+
+#: ../src/plugins/spam_report/spam_report.c:330
+msgid "Report spam online..."
+msgstr "Spam online melden..."
+
+#: ../src/plugins/spam_report/spam_report.c:341
+#: ../src/plugins/spam_report/spam_report.c:379
+#: ../src/plugins/spam_report/spam_report_prefs.c:80
+msgid "SpamReport"
+msgstr "SpamReport"
+
+#: ../src/plugins/spam_report/spam_report.c:384
+msgid ""
+"This plugin reports spam to various places.\n"
+"Currently the following sites or methods are supported:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * lists.debian.org nomination system"
+msgstr ""
+"Dieses Plugin meldet Spam an verschiedene Stellen.\n"
+"Gegenwärtig werden folgende Seiten oder Methoden unterstützt:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * lists.debian.org-Nominierungssystem"
+
+#: ../src/plugins/spam_report/spam_report.c:409
+msgid "Spam reporting"
+msgstr "Spam melden"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:122
+msgid "Enabled"
+msgstr "Aktiviert"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:149
+msgid "Forward to:"
+msgstr "Weiterleiten an:"
+
 #: ../src/plugins/spamassassin/spamassassin.c:77
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:649
 msgid "SpamAssassin"
@@ -14108,48 +14416,6 @@ msgstr ""
 "Zeitlimit für die Überprüfung. Nach Ablauf dieser Zeit wird die Überprüfung "
 "abgebrochen."
 
-#: ../src/plugins/spam_report/spam_report.c:293
-msgid "Reporting spam..."
-msgstr "Melde Spam..."
-
-#: ../src/plugins/spam_report/spam_report.c:328
-msgid "Report spam online..."
-msgstr "Spam online melden..."
-
-#: ../src/plugins/spam_report/spam_report.c:339
-#: ../src/plugins/spam_report/spam_report.c:377
-#: ../src/plugins/spam_report/spam_report_prefs.c:80
-msgid "SpamReport"
-msgstr "SpamReport"
-
-#: ../src/plugins/spam_report/spam_report.c:382
-msgid ""
-"This plugin reports spam to various places.\n"
-"Currently the following sites or methods are supported:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * lists.debian.org nomination system"
-msgstr ""
-"Dieses Plugin meldet Spam an verschiedene Stellen.\n"
-"Gegenwärtig werden folgende Seiten oder Methoden unterstützt:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * lists.debian.org-Nominierungssystem"
-
-#: ../src/plugins/spam_report/spam_report.c:407
-msgid "Spam reporting"
-msgstr "Spam melden"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:122
-msgid "Enabled"
-msgstr "Aktiviert"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:149
-msgid "Forward to:"
-msgstr "Weiterleiten an:"
-
 #: ../src/plugins/tnef_parse/tnef_parse.c:65
 #, c-format
 msgid ""
@@ -14226,7 +14492,7 @@ msgstr "Zeigen"
 
 #: ../src/plugins/vcalendar/day-view.c:614
 #: ../src/plugins/vcalendar/month-view.c:711 ../src/prefs_account.c:1477
-#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:334
+#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:336
 msgid "days"
 msgstr "Tag(en)"
 
@@ -14616,6 +14882,11 @@ msgstr ""
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Zeitüberschreitung (%d Sekunden) beim Verbinden zu %s\n"
 
+#: ../src/plugins/vcalendar/vcal_folder.c:1605
+#, c-format
+msgid "Error %ld"
+msgstr "Fehler %ld"
+
 #: ../src/plugins/vcalendar/vcal_folder.c:1802
 #, c-format
 msgid ""
@@ -14666,9 +14937,9 @@ msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1849
 #: ../src/plugins/vcalendar/vcal_folder.c:1852
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create directory %s"
-msgstr "Zielordner %s konnte nicht erstellt werden."
+msgstr "Ordner %s konnte nicht erstellt werden."
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1890
 msgid "Claws Mail needs network access in order to update the Webcal feed."
@@ -15146,7 +15417,7 @@ msgstr ""
 #. export enable + path stuff
 #: ../src/plugins/vcalendar/vcal_prefs.c:404
 msgid "Free/Busy information"
-msgstr "Frei/Beschäftigt-Informationen"
+msgstr "Frei/beschäftigt-Informationen"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:416
 msgid "Automatically export free/busy status to"
@@ -15348,11 +15619,6 @@ msgstr "Standard-Eingangsordner"
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ungefilterte Nachrichten werden in diesem Ordner gespeichert"
 
-#: ../src/prefs_account.c:1442 ../src/prefs_account.c:1531
-#: ../src/prefs_account.c:1991 ../src/prefs_customheader.c:237
-msgid "Bro_wse"
-msgstr "Durchsuchen"
-
 #: ../src/prefs_account.c:1453
 msgid "Use secure authentication (APOP)"
 msgstr "Sichere Authentifizierung verwenden (APOP)"
@@ -15437,8 +15703,8 @@ msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Abrufen' überprüft dieses Konto auf neue Nachrichten"
 
 #: ../src/prefs_account.c:1718 ../src/prefs_customheader.c:209
-#: ../src/prefs_matcher.c:620 ../src/prefs_matcher.c:1958
-#: ../src/prefs_matcher.c:1980
+#: ../src/prefs_matcher.c:623 ../src/prefs_matcher.c:1974
+#: ../src/prefs_matcher.c:1996
 msgid "Header"
 msgstr "Kopfzeile"
 
@@ -15812,8 +16078,8 @@ msgid "Replace the selected action in list with the action above"
 msgstr "In der Liste markierte Aktion durch Obige ersetzen"
 
 #: ../src/prefs_actions.c:337 ../src/prefs_filtering_action.c:616
-#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:778
-#: ../src/prefs_template.c:318 ../src/prefs_toolbar.c:1056
+#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:781
+#: ../src/prefs_template.c:320 ../src/prefs_toolbar.c:1056
 msgid "Re_move"
 msgstr "Entfernen"
 
@@ -15822,7 +16088,7 @@ msgid "Delete the selected action from the list"
 msgstr "Markierte Aktion aus der Liste löschen"
 
 #: ../src/prefs_actions.c:355 ../src/prefs_filtering.c:503
-#: ../src/prefs_template.c:336
+#: ../src/prefs_template.c:338
 msgid "Clear all the input fields in the dialog"
 msgstr "Alle Dialog-Eingabefelder löschen"
 
@@ -15843,7 +16109,7 @@ msgstr "Markierte Aktion abwärts bewegen"
 #: ../src/prefs_actions.c:535 ../src/prefs_filtering_action.c:704
 #: ../src/prefs_filtering.c:836 ../src/prefs_filtering.c:838
 #: ../src/prefs_filtering.c:839 ../src/prefs_filtering.c:949
-#: ../src/prefs_matcher.c:897 ../src/prefs_template.c:469
+#: ../src/prefs_matcher.c:900 ../src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Neu)"
 
@@ -15904,22 +16170,22 @@ msgstr "Möchten Sie wirklich alle Aktionen entfernen?"
 
 #: ../src/prefs_actions.c:898 ../src/prefs_actions.c:929
 #: ../src/prefs_filtering.c:1497 ../src/prefs_filtering.c:1519
-#: ../src/prefs_matcher.c:2109 ../src/prefs_template.c:569
-#: ../src/prefs_template.c:594
+#: ../src/prefs_matcher.c:2125 ../src/prefs_template.c:572
+#: ../src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Eintrag nicht gespeichert"
 
 #: ../src/prefs_actions.c:899 ../src/prefs_actions.c:930
 #: ../src/prefs_filtering.c:1498 ../src/prefs_filtering.c:1520
-#: ../src/prefs_template.c:570 ../src/prefs_template.c:595
+#: ../src/prefs_template.c:573 ../src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Der Eintrag wurde nicht gespeichert. Trotzdem schließen?"
 
 #: ../src/prefs_actions.c:900 ../src/prefs_actions.c:905
 #: ../src/prefs_actions.c:931 ../src/prefs_filtering.c:1477
 #: ../src/prefs_filtering.c:1499 ../src/prefs_filtering.c:1521
-#: ../src/prefs_matcher.c:2111 ../src/prefs_template.c:571
-#: ../src/prefs_template.c:596 ../src/prefs_template.c:601
+#: ../src/prefs_matcher.c:2127 ../src/prefs_template.c:574
+#: ../src/prefs_template.c:599 ../src/prefs_template.c:604
 msgid "+_Continue editing"
 msgstr "+Mit dem Editieren fortfahren"
 
@@ -16031,7 +16297,7 @@ msgstr ""
 "die eine Nachricht ganz oder teilweise bearbeiten."
 
 #: ../src/prefs_actions.c:1092 ../src/prefs_filtering.c:1695
-#: ../src/prefs_template.c:1101
+#: ../src/prefs_template.c:1121
 msgid "D_uplicate"
 msgstr "d_uplizieren"
 
@@ -16166,7 +16432,7 @@ msgid "Custom header configuration"
 msgstr "Einrichtung nutzerdefinierter Kopfzeilen"
 
 #: ../src/prefs_customheader.c:507 ../src/prefs_display_header.c:599
-#: ../src/prefs_matcher.c:1583 ../src/prefs_matcher.c:1598
+#: ../src/prefs_matcher.c:1595 ../src/prefs_matcher.c:1610
 msgid "Header name is not set."
 msgstr "Kopfzeilenname ist nicht gesetzt."
 
@@ -16282,7 +16548,7 @@ msgid ""
 "This option enables MIME parts to be displayed in the message view via a "
 "script when using the 'Display as text' contextual menu item"
 msgstr ""
-"Diese Option erlaubt, MIME Teile mit einem Script anzuzeigen, wenn 'Anzeigen "
+"Diese Option erlaubt, MIME-Teile mit einem Script anzuzeigen, wenn 'Anzeigen "
 "als Text' in der Nachrichtenansicht gewählt wird."
 
 #: ../src/prefs_ext_prog.c:269 ../src/prefs_image_viewer.c:138
@@ -16354,7 +16620,7 @@ msgstr "Umleiten"
 
 #. S_COL_NUMBER
 #: ../src/prefs_filtering_action.c:194 ../src/prefs_filtering_action.c:195
-#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:626
+#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:629
 #: ../src/prefs_summary_column.c:87 ../src/summaryview.c:447
 msgid "Score"
 msgstr "Bewertung"
@@ -16371,7 +16637,7 @@ msgstr "Bewertung setzen"
 #. S_COL_SCORE
 #. S_COL_LOCKED
 #: ../src/prefs_filtering_action.c:196 ../src/prefs_filtering_action.c:197
-#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:630
+#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:633
 #: ../src/prefs_summary_column.c:89 ../src/summaryview.c:449
 msgid "Tags"
 msgstr "Marken"
@@ -16401,7 +16667,7 @@ msgid "Action configuration"
 msgstr "Aktionskonfiguration"
 
 #: ../src/prefs_filtering_action.c:427 ../src/prefs_filtering.c:1886
-#: ../src/prefs_matcher.c:583
+#: ../src/prefs_matcher.c:586
 msgid "Rule"
 msgstr "Regel"
 
@@ -16426,10 +16692,9 @@ msgstr "Empfänger nicht gesetzt."
 msgid "Score is not set"
 msgstr "Bewertung nicht gesetzt"
 
-# Bei Gelegenheit nochmal überprüfen. in NL ist auch "Name" im übersetzten String...
 #: ../src/prefs_filtering_action.c:973
 msgid "Header is not set."
-msgstr "Kopfzeilenname ist nicht gesetzt."
+msgstr "Kopfzeilen ist nicht gesetzt."
 
 #: ../src/prefs_filtering_action.c:980
 msgid "Target addressbook/folder is not set."
@@ -16444,25 +16709,25 @@ msgid "No action was defined."
 msgstr "Keine Aktion definiert."
 
 #. completion of 'To' from address book
-#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2153
+#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2169
 #: ../src/quote_fmt.c:79
 msgid "literal %"
 msgstr "Symbol für %"
 
-#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2162
+#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2178
 msgid "filename (should not be modified)"
 msgstr "Dateiname (sollte nicht geändert werden)"
 
-#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2163
+#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2179
 #: ../src/quote_fmt.c:87
 msgid "new line"
 msgstr "neue Zeile"
 
-#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2164
+#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2180
 msgid "escape character for quotes"
 msgstr "Escape-Zeichen für Zitate"
 
-#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2165
+#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2181
 msgid "quote character"
 msgstr "Zitatzeichen"
 
@@ -16815,7 +17080,7 @@ msgid "Folder and Message Lists"
 msgstr "Ordner und Nachrichtenlisten"
 
 #. message font label
-#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2030
+#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2046
 msgid "Message"
 msgstr "Nachricht"
 
@@ -17016,245 +17281,249 @@ msgstr "Sonstiges"
 msgid "Logging"
 msgstr "Protokollierung"
 
-#: ../src/prefs_matcher.c:328
+#: ../src/prefs_matcher.c:330
 msgid "more than"
 msgstr "mehr als"
 
-#: ../src/prefs_matcher.c:329
+#: ../src/prefs_matcher.c:331
 msgid "less than"
 msgstr "weniger als"
 
-#: ../src/prefs_matcher.c:335
+#: ../src/prefs_matcher.c:337
 msgid "weeks"
 msgstr "Wochen"
 
-#: ../src/prefs_matcher.c:339
+#: ../src/prefs_matcher.c:341
 msgid "higher than"
 msgstr "größer als"
 
-#: ../src/prefs_matcher.c:340
+#: ../src/prefs_matcher.c:342
 msgid "lower than"
 msgstr "weniger als"
 
-#: ../src/prefs_matcher.c:341 ../src/prefs_matcher.c:347
+#: ../src/prefs_matcher.c:343 ../src/prefs_matcher.c:349
 msgid "exactly"
 msgstr "genau"
 
-#: ../src/prefs_matcher.c:345
+#: ../src/prefs_matcher.c:347
 msgid "greater than"
 msgstr "größer als"
 
-#: ../src/prefs_matcher.c:346
+#: ../src/prefs_matcher.c:348
 msgid "smaller than"
 msgstr "kleiner als"
 
-#: ../src/prefs_matcher.c:351
+#: ../src/prefs_matcher.c:353
 msgid "bytes"
 msgstr "Bytes"
 
-#: ../src/prefs_matcher.c:352
+#: ../src/prefs_matcher.c:354
 msgid "kilobytes"
 msgstr "Kilobytes"
 
-#: ../src/prefs_matcher.c:353
+#: ../src/prefs_matcher.c:355
 msgid "megabytes"
 msgstr "Megabytes"
 
-#: ../src/prefs_matcher.c:357
+#: ../src/prefs_matcher.c:359
 msgid "contains"
 msgstr "enthält"
 
-#: ../src/prefs_matcher.c:358
+#: ../src/prefs_matcher.c:360
 msgid "doesn't contain"
 msgstr "enthält nicht"
 
-#: ../src/prefs_matcher.c:381
+#: ../src/prefs_matcher.c:383
 msgid "headers part"
 msgstr "Kopfbereich"
 
-#: ../src/prefs_matcher.c:382
+#: ../src/prefs_matcher.c:384
+msgid "headers values"
+msgstr "Werte in Kopfzeilen"
+
+#: ../src/prefs_matcher.c:385
 msgid "body part"
 msgstr "Textbereich"
 
-#: ../src/prefs_matcher.c:383
+#: ../src/prefs_matcher.c:386
 msgid "whole message"
 msgstr "Ganze Nachricht"
 
-#: ../src/prefs_matcher.c:389 ../src/summaryview.c:6300
+#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6300
 msgid "Marked"
 msgstr "Markiert"
 
-#: ../src/prefs_matcher.c:390 ../src/summaryview.c:6298
+#: ../src/prefs_matcher.c:393 ../src/summaryview.c:6298
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: ../src/prefs_matcher.c:391
+#: ../src/prefs_matcher.c:394
 msgid "Replied"
 msgstr "Beantwortet"
 
-#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6292
+#: ../src/prefs_matcher.c:395 ../src/summaryview.c:6292
 msgid "Forwarded"
 msgstr "Weitergeleitet"
 
-#: ../src/prefs_matcher.c:394 ../src/summaryview.c:6282 ../src/toolbar.c:416
+#: ../src/prefs_matcher.c:397 ../src/summaryview.c:6282 ../src/toolbar.c:416
 #: ../src/toolbar.c:934 ../src/toolbar.c:1978
 msgid "Spam"
 msgstr "Spam"
 
-#: ../src/prefs_matcher.c:395
+#: ../src/prefs_matcher.c:398
 msgid "Has attachment"
 msgstr "Mit Anhang"
 
-#: ../src/prefs_matcher.c:396 ../src/summaryview.c:6318
+#: ../src/prefs_matcher.c:399 ../src/summaryview.c:6318
 msgid "Signed"
 msgstr "Signiert"
 
-#: ../src/prefs_matcher.c:400
+#: ../src/prefs_matcher.c:403
 msgid "set"
 msgstr "gesetzt"
 
-#: ../src/prefs_matcher.c:401
+#: ../src/prefs_matcher.c:404
 msgid "not set"
 msgstr "nicht gesetzt."
 
-#: ../src/prefs_matcher.c:405
+#: ../src/prefs_matcher.c:408
 msgid "yes"
 msgstr "ja"
 
-#: ../src/prefs_matcher.c:406
+#: ../src/prefs_matcher.c:409
 msgid "no"
 msgstr "nein"
 
-#: ../src/prefs_matcher.c:410
+#: ../src/prefs_matcher.c:413
 msgid "Any tags"
 msgstr "Beliebige Marke"
 
-#: ../src/prefs_matcher.c:411
+#: ../src/prefs_matcher.c:414
 msgid "Specific tag"
 msgstr "Bestimmte Marke"
 
-#: ../src/prefs_matcher.c:415
+#: ../src/prefs_matcher.c:418
 msgid "ignored"
 msgstr "Ignoriert"
 
-#: ../src/prefs_matcher.c:416
+#: ../src/prefs_matcher.c:419
 msgid "not ignored"
 msgstr "nicht ignoriert"
 
-#: ../src/prefs_matcher.c:417
+#: ../src/prefs_matcher.c:420
 msgid "watched"
 msgstr "beobachtet"
 
-#: ../src/prefs_matcher.c:418
+#: ../src/prefs_matcher.c:421
 msgid "not watched"
 msgstr "nicht beobachtet"
 
-#: ../src/prefs_matcher.c:422
+#: ../src/prefs_matcher.c:425
 msgid "found"
 msgstr "gefunden"
 
-#: ../src/prefs_matcher.c:423
+#: ../src/prefs_matcher.c:426
 msgid "not found"
 msgstr "nicht gefunden"
 
-#: ../src/prefs_matcher.c:427
+#: ../src/prefs_matcher.c:430
 msgid "0 (Passed)"
 msgstr "0 (erfolgreich)"
 
-#: ../src/prefs_matcher.c:428
+#: ../src/prefs_matcher.c:431
 msgid "non-0 (Failed)"
 msgstr "nicht 0 (negativ)"
 
-#: ../src/prefs_matcher.c:566
+#: ../src/prefs_matcher.c:569
 msgid "Condition configuration"
 msgstr "Bedingungskonfiguration"
 
 #. criteria combo box
-#: ../src/prefs_matcher.c:610
+#: ../src/prefs_matcher.c:613
 msgid "Match criteria:"
 msgstr "Suchkriterium:"
 
-#: ../src/prefs_matcher.c:619
+#: ../src/prefs_matcher.c:622
 msgid "All messages"
 msgstr "Alle Nachrichten"
 
-#: ../src/prefs_matcher.c:621
+#: ../src/prefs_matcher.c:624
 msgid "Age"
 msgstr "Alter"
 
-#: ../src/prefs_matcher.c:622
+#: ../src/prefs_matcher.c:625
 msgid "Phrase"
 msgstr "Ausdruck"
 
-#: ../src/prefs_matcher.c:623
+#: ../src/prefs_matcher.c:626
 msgid "Flags"
 msgstr "Merker"
 
-#: ../src/prefs_matcher.c:624 ../src/prefs_msg_colors.c:410
+#: ../src/prefs_matcher.c:627 ../src/prefs_msg_colors.c:410
 msgid "Color labels"
 msgstr "Farbmarken"
 
-#: ../src/prefs_matcher.c:625
+#: ../src/prefs_matcher.c:628
 msgid "Thread"
 msgstr "Diskurs"
 
-#: ../src/prefs_matcher.c:628
+#: ../src/prefs_matcher.c:631
 msgid "Partially downloaded"
 msgstr "Teilweise geladen"
 
-#: ../src/prefs_matcher.c:631
+#: ../src/prefs_matcher.c:634
 msgid "External program test"
 msgstr "Externer Programmtest"
 
 #. store UNtranslated "Any"/"All" in matcher expressions
-#: ../src/prefs_matcher.c:707 ../src/prefs_matcher.c:1604
-#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:2501
+#: ../src/prefs_matcher.c:710 ../src/prefs_matcher.c:1616
+#: ../src/prefs_matcher.c:1631 ../src/prefs_matcher.c:2521
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Alle"
 
-#: ../src/prefs_matcher.c:741
+#: ../src/prefs_matcher.c:744
 msgid "Use regexp"
 msgstr "Regexp verwenden"
 
-#: ../src/prefs_matcher.c:818
+#: ../src/prefs_matcher.c:821
 msgid "Message must match"
 msgstr "Nachricht muss auf"
 
-#: ../src/prefs_matcher.c:822
+#: ../src/prefs_matcher.c:825
 msgid "at least one"
 msgstr "mindestens eine"
 
-#: ../src/prefs_matcher.c:823
+#: ../src/prefs_matcher.c:826
 msgid "all"
 msgstr "alle"
 
-#: ../src/prefs_matcher.c:826
+#: ../src/prefs_matcher.c:829
 msgid "of above rules"
 msgstr "der obigen Regeln passen"
 
-#: ../src/prefs_matcher.c:1522 ../src/prefs_matcher.c:1588
+#: ../src/prefs_matcher.c:1534 ../src/prefs_matcher.c:1600
 msgid "Search pattern is not set."
 msgstr "Suchmuster ist nicht gesetzt."
 
-#: ../src/prefs_matcher.c:1531
+#: ../src/prefs_matcher.c:1543
 msgid "Test command is not set."
 msgstr "Test-Befehl ist nicht eingetragen."
 
-#: ../src/prefs_matcher.c:1605
+#: ../src/prefs_matcher.c:1617
 msgid "all addresses in all headers"
 msgstr "alle Adressen in allen Kopfzeilen"
 
-#: ../src/prefs_matcher.c:1608
+#: ../src/prefs_matcher.c:1620
 msgid "any address in any header"
 msgstr "beliebige Adresse in beliebiger Kopfzeile"
 
-#: ../src/prefs_matcher.c:1610
+#: ../src/prefs_matcher.c:1622
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "Die Adresse(n) in der Kopfzeile '%s'"
 
-#: ../src/prefs_matcher.c:1611
+#: ../src/prefs_matcher.c:1623
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -17267,82 +17536,86 @@ msgstr ""
 "Wenn %s gegen das gesamte Adressbuch verglichen werden soll, muss '%s' in "
 "der Adressbuch/Ordner Auswahl gewählt werden."
 
-#: ../src/prefs_matcher.c:1830
+#: ../src/prefs_matcher.c:1842
 msgid "Headers part"
 msgstr "Kopfbereich"
 
-#: ../src/prefs_matcher.c:1834
+#: ../src/prefs_matcher.c:1846
+msgid "Headers values"
+msgstr "Werte in Kopfzeilen"
+
+#: ../src/prefs_matcher.c:1850
 msgid "Body part"
 msgstr "Textbereich"
 
-#: ../src/prefs_matcher.c:1838
+#: ../src/prefs_matcher.c:1854
 msgid "Whole message"
 msgstr "Ganzer Nachricht"
 
-#: ../src/prefs_matcher.c:1957 ../src/prefs_matcher.c:2001
+#: ../src/prefs_matcher.c:1973 ../src/prefs_matcher.c:2017
 msgid "in"
 msgstr "in"
 
-#: ../src/prefs_matcher.c:1959
+#: ../src/prefs_matcher.c:1975
 msgid "content is"
 msgstr "Inhalt wird"
 
 # UI adapted
-#: ../src/prefs_matcher.c:1968
+#: ../src/prefs_matcher.c:1984
 msgid "Age is"
 msgstr "Alter von"
 
-#: ../src/prefs_matcher.c:1973
+#: ../src/prefs_matcher.c:1989
 msgid "Flag"
 msgstr "Merker"
 
-#: ../src/prefs_matcher.c:1974 ../src/prefs_matcher.c:1991
+#: ../src/prefs_matcher.c:1990 ../src/prefs_matcher.c:2007
 msgid "is"
 msgstr "ist"
 
-#: ../src/prefs_matcher.c:1979
+#: ../src/prefs_matcher.c:1995
 msgid "Name:"
 msgstr "Name:"
 
-#: ../src/prefs_matcher.c:1990
+#: ../src/prefs_matcher.c:2006
 msgid "Label"
 msgstr "Farbe"
 
-#: ../src/prefs_matcher.c:1996
+#: ../src/prefs_matcher.c:2012
 msgid "Value:"
 msgstr "Wert:"
 
-#: ../src/prefs_matcher.c:2013
+#: ../src/prefs_matcher.c:2029
 msgid "Score is"
 msgstr "Bewertung ist"
 
-#: ../src/prefs_matcher.c:2014
+#: ../src/prefs_matcher.c:2030
 msgid "points"
 msgstr "Punkte"
 
 # UI adapted
-#: ../src/prefs_matcher.c:2024
+#: ../src/prefs_matcher.c:2040
 msgid "Size is"
 msgstr "Nachricht ist"
 
-#: ../src/prefs_matcher.c:2029
+#: ../src/prefs_matcher.c:2045
 msgid "Scope:"
 msgstr "Umfang:"
 
-#: ../src/prefs_matcher.c:2031
+#: ../src/prefs_matcher.c:2047
 msgid "tags"
 msgstr "Marken"
 
 # UI adapted
-#: ../src/prefs_matcher.c:2036
+#: ../src/prefs_matcher.c:2052
 msgid "type is"
 msgstr "ist vom Typ"
 
-#: ../src/prefs_matcher.c:2040
+#: ../src/prefs_matcher.c:2056
 msgid "Program returns"
 msgstr "Rückgabewert"
 
-#: ../src/prefs_matcher.c:2110
+#: ../src/prefs_matcher.c:2126
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -17350,11 +17623,11 @@ msgstr ""
 "Der Eintrag wurde nicht gespeichert.\n"
 "Trotzdem schließen?"
 
-#: ../src/prefs_matcher.c:2174
+#: ../src/prefs_matcher.c:2190
 msgid "Match Type: 'Test'"
 msgstr "Treffertyp: 'Test'"
 
-#: ../src/prefs_matcher.c:2175
+#: ../src/prefs_matcher.c:2191
 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"
@@ -17366,7 +17639,7 @@ msgstr ""
 "\n"
 "Die folgenden Symbole können verwendet werden:"
 
-#: ../src/prefs_matcher.c:2274
+#: ../src/prefs_matcher.c:2290
 msgid "Current condition rules"
 msgstr "Aktuelle Bedingungsregeln"
 
@@ -18325,11 +18598,11 @@ msgstr "Auswahlmöglichkeiten"
 msgid "Selection on folder opening"
 msgstr "Auswahl beim Öffnen"
 
-#: ../src/prefs_template.c:79
+#: ../src/prefs_template.c:80
 msgid "This name is used as the Menu item"
 msgstr "Dieser Name wird als Menüeintrag benutzt"
 
-#: ../src/prefs_template.c:81
+#: ../src/prefs_template.c:82
 msgid ""
 "Override composing account's From header. This doesn't change the composing "
 "account."
@@ -18337,95 +18610,101 @@ msgstr ""
 "Überschreibt die Kopfzeile 'Von:' des Kontos. Dies ändert nicht das Konto, "
 "von dem aus geschrieben wird."
 
-#: ../src/prefs_template.c:307
+#: ../src/prefs_template.c:309
 msgid "Append the new template above to the list"
 msgstr "Obige neue Vorlage zur Liste hinzufügen"
 
-#: ../src/prefs_template.c:316
+#: ../src/prefs_template.c:318
 msgid "Replace the selected template in list with the template above"
 msgstr "Markierte Vorlage in der Liste durch obige Vorlage ersetzen"
 
-#: ../src/prefs_template.c:326
+#: ../src/prefs_template.c:328
 msgid "Delete the selected template from the list"
 msgstr "Markierte Vorlage aus der Liste löschen"
 
-#: ../src/prefs_template.c:344
+#: ../src/prefs_template.c:346
 msgid "Show information on configuring templates"
 msgstr "Informationen zum Konfigurieren von Vorlagen"
 
-#: ../src/prefs_template.c:368
+#: ../src/prefs_template.c:370
 msgid "Move the selected template to the top"
 msgstr "Markierte Vorlage ganz nach oben bewegen"
 
-#: ../src/prefs_template.c:378
+#: ../src/prefs_template.c:380
 msgid "Move the selected template up"
 msgstr "Markierte Vorlage aufwärts bewegen"
 
-#: ../src/prefs_template.c:386
+#: ../src/prefs_template.c:388
 msgid "Move the selected template down"
 msgstr "Markierte Vorlage abwärts bewegen"
 
-#: ../src/prefs_template.c:396
+#: ../src/prefs_template.c:398
 msgid "Move the selected template to the bottom"
 msgstr "Markierte Vorlage ganz nach unten bewegen"
 
-#: ../src/prefs_template.c:412
+#: ../src/prefs_template.c:414
 msgid "Template configuration"
 msgstr "Vorlagenkonfiguration"
 
-#: ../src/prefs_template.c:599
+#: ../src/prefs_template.c:602
 msgid "Templates list not saved"
 msgstr "Vorlagenliste nicht gespeichert"
 
-#: ../src/prefs_template.c:600
+#: ../src/prefs_template.c:603
 msgid "The templates list has been modified. Close anyway?"
 msgstr "Die Vorlagenliste wurde geändert. Trotzdem schließen?"
 
-#: ../src/prefs_template.c:761
+#: ../src/prefs_template.c:768
 msgid "The template's name is not set."
 msgstr "Vorlagenname ist nicht gesetzt."
 
-#: ../src/prefs_template.c:798
+#: ../src/prefs_template.c:811
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "Das \"Von\"-Feld der Vorlage enthält eine ungültige E-Mailadresse."
 
-#: ../src/prefs_template.c:804
+#: ../src/prefs_template.c:817
 msgid "The \"To\" field of the template contains an invalid email address."
-msgstr "das \"An\"-Feld der Vorlage enthält eine ungültige E-Mailadresse."
+msgstr "Das \"An\"-Feld der Vorlage enthält eine ungültige E-Mailadresse."
 
-#: ../src/prefs_template.c:810
+#: ../src/prefs_template.c:823
 msgid "The \"Cc\" field of the template contains an invalid email address."
-msgstr "das \"Cc\"-Feld der Vorlage enthält eine ungültige E-Mailadresse."
+msgstr "Das \"Cc\"-Feld der Vorlage enthält eine ungültige E-Mailadresse."
 
-#: ../src/prefs_template.c:816
+#: ../src/prefs_template.c:829
 msgid "The \"Bcc\" field of the template contains an invalid email address."
-msgstr "das \"Bcc\"-Feld der Vorlage enthält eine ungültige E-Mailadresse."
+msgstr "Das \"Bcc\"-Feld der Vorlage enthält eine ungültige E-Mailadresse."
+
+#: ../src/prefs_template.c:835
+msgid ""
+"The \"Reply-To\" field of the template contains an invalid email address."
+msgstr ""
+"Das \"Reply-To\"-Feld der Vorlage enthält eine ungültige E-Mailadresse."
 
-#: ../src/prefs_template.c:822
+#: ../src/prefs_template.c:841
 msgid "The \"Subject\" field of the template is invalid."
-msgstr "das \"Betreff\"-Feld der Vorlage ist ungültig."
+msgstr "Das \"Betreff\"-Feld der Vorlage ist ungültig."
 
-#: ../src/prefs_template.c:892
+#: ../src/prefs_template.c:912
 msgid "Delete template"
 msgstr "Vorlage löschen"
 
-#: ../src/prefs_template.c:893
+#: ../src/prefs_template.c:913
 msgid "Do you really want to delete this template?"
 msgstr "Möchten Sie diese Vorlage wirklich löschen?"
 
-#: ../src/prefs_template.c:905
+#: ../src/prefs_template.c:925
 msgid "Delete all templates"
 msgstr "Alle Vorlagen löschen"
 
-#: ../src/prefs_template.c:906
+#: ../src/prefs_template.c:926
 msgid "Do you really want to delete all the templates?"
 msgstr "Möchten Sie wirklich alle Vorlagen löschen?"
 
-#: ../src/prefs_template.c:1221
+#: ../src/prefs_template.c:1241
 msgid "Current templates"
 msgstr "Aktuelle Vorlagen"
 
-#: ../src/prefs_template.c:1249
+#: ../src/prefs_template.c:1269
 msgid "Template"
 msgstr "Vorlage"
 
@@ -18736,7 +19015,7 @@ msgstr "Keine Informationen verfügbar"
 msgid "No recipient keys defined."
 msgstr "Kein Empfängerschlüssel definiert."
 
-#: ../src/procmime.c:430 ../src/procmime.c:432 ../src/procmime.c:433
+#: ../src/procmime.c:433 ../src/procmime.c:435 ../src/procmime.c:436
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fehler beim BASE64-Entschlüsseln]\n"
 
@@ -19468,23 +19747,23 @@ msgstr ""
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d ausgewählt (%s/%s), %d ungelesen"
 
-#: ../src/summaryview.c:2979
+#: ../src/summaryview.c:2981
 msgid "Sorting summary..."
 msgstr "Ordneransicht wird sortiert..."
 
-#: ../src/summaryview.c:3118
+#: ../src/summaryview.c:3120
 msgid "Setting summary from message data..."
 msgstr "Ordneransicht wird aus Nachrichtendaten gesetzt..."
 
-#: ../src/summaryview.c:3323
+#: ../src/summaryview.c:3325
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
-#: ../src/summaryview.c:3375
+#: ../src/summaryview.c:3377
 msgid "(No Recipient)"
 msgstr "(Kein Empfänger)"
 
-#: ../src/summaryview.c:3410
+#: ../src/summaryview.c:3412
 #, c-format
 msgid ""
 "%s\n"
@@ -19493,7 +19772,7 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Von: %s, am %s</span>"
 
-#: ../src/summaryview.c:3417
+#: ../src/summaryview.c:3419
 #, c-format
 msgid ""
 "%s\n"
@@ -19502,26 +19781,26 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>An: %s, am %s</span>"
 
-#: ../src/summaryview.c:4294
+#: ../src/summaryview.c:4296
 msgid "You're not the author of the article.\n"
 msgstr "Sie sind nicht der Autor dieses Artikels.\n"
 
-#: ../src/summaryview.c:4387
+#: ../src/summaryview.c:4389
 #, 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] "Soll die ausgewählte Nachricht wirklich gelöscht werden?"
 msgstr[1] "Sollen die %d ausgewählten Nachrichten wirklich gelöscht werden?"
 
-#: ../src/summaryview.c:4390
+#: ../src/summaryview.c:4392
 msgid "Delete message(s)"
 msgstr "Nachricht(en) löschen"
 
-#: ../src/summaryview.c:4553
+#: ../src/summaryview.c:4555
 msgid "Destination is same as current folder."
 msgstr "Ziel ist der aktuelle Ordner."
 
-#: ../src/summaryview.c:4652
+#: ../src/summaryview.c:4653
 msgid "Destination to copy is same as current folder."
 msgstr "Ziel der Kopie ist der aktuelle Ordner."
 
@@ -19628,7 +19907,7 @@ msgstr "Verschlüsselt"
 msgid "Has attachment(s)"
 msgstr "Hat Anhänge"
 
-#: ../src/summaryview.c:7929
+#: ../src/summaryview.c:7932
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19637,11 +19916,11 @@ msgstr ""
 "Fehler in Regulärem Ausdruck (regexp):\n"
 "%s"
 
-#: ../src/summaryview.c:8034
+#: ../src/summaryview.c:8037
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Zurück zur Ordnerliste (Es gibt ungelesene Nachrichten)"
 
-#: ../src/summaryview.c:8039
+#: ../src/summaryview.c:8042
 msgid "Go back to the folder list"
 msgstr "Zurück zur Ordnerliste"
 
@@ -19769,11 +20048,11 @@ msgstr ""
 "....%s\n"
 "Rückgabewert %d\n"
 
-#: ../src/textview.c:2194
+#: ../src/textview.c:2173
 msgid "Tags: "
 msgstr "Marken: "
 
-#: ../src/textview.c:2896
+#: ../src/textview.c:2875
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
@@ -19792,11 +20071,11 @@ msgstr ""
 "\n"
 "Trotzdem öffnen?"
 
-#: ../src/textview.c:2905
+#: ../src/textview.c:2884
 msgid "Phishing attempt warning"
 msgstr "Warnung vor Phishing-Versuch"
 
-#: ../src/textview.c:2906
+#: ../src/textview.c:2885
 msgid "_Open URL"
 msgstr "_URL Öffnen"
 
diff --git a/po/eo.po b/po/eo.po
index 13eface..6d402bc 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,117 +1,218 @@
-# Esperanto translation of Claws Mail.
-# Copyright © 2013-2014 The Claws Mail team.
-# This file is distributed under the same license
-# as the Claws Mail package, see COPYING file.
-#
+# -*- coding: utf-8-unix -*-
+# Esperanto translation of Claws Mail
+# Copyright (C) 2014 The Claws Mail Team
+# This file is distributed under the same license as the claws-mail package.
 # Sian Mountbatten <poenikatu at fastmail.co.uk>, 2014.
-# Fredrick Brennan <admin at 8chan.co>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.9.3\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2014-06-13 03:15+0400\n"
-"PO-Revision-Date: 2014-05-29 15:08-0400\n"
-"Last-Translator: Fredrick Brennan <admin at 8chan.co>\n"
-"Language-Team: Esperanto <>\n"
+"POT-Creation-Date: 2014-10-13 09:04+0100\n"
+"PO-Revision-Date: 2014-10-13 22:52+0100\n"
+"Last-Translator: Sian Mountbatten <poenikatu at fastmail.co.uk>\n"
+"Language-Team: Esperanto <eo at li.org>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
-
-#: ../claws-mail.appdata.xml.in.h:1
-#, fuzzy
-msgid "Claws Mail is a fast, powerful and very extensible email client."
-msgstr "Claws Mail estis registrita kiel defaŭlta kliento."
-
-#: ../claws-mail.appdata.xml.in.h:2
-msgid ""
-"It is highly configurable and handles hundreds of thousands of emails "
-"easily. Messages are managed in an open format, and are easy to interact "
-"with."
-msgstr ""
-
-#: ../claws-mail.appdata.xml.in.h:3
-msgid ""
-"Lots of extra functionality is provided by plugins, such as PGP signatures "
-"and encryption, an RSS aggregator, a calendar, powerful spam filtering, Perl "
-"and Python interactions, HTML and PDF rendering, and more."
-msgstr ""
+"X-Generator: Poedit 1.5.4\n"
 
 #: ../claws-mail.desktop.in.h:1
 msgid "E-mail client"
-msgstr ""
+msgstr "Retpoŝtilo"
 
 #: ../claws-mail.desktop.in.h:2
 msgid "Lightweight and Fast GTK+ based Mail Client"
-msgstr ""
+msgstr "Malpeza kaj rapida GTK+-bazita retpoŝtilo"
+
+#: ../claws-mail.desktop.in.h:3
+msgid "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
+msgstr "malpeza;rapida;grafika fasono;etendebla;kromprogramo;pop;pop3;imap;imap4;nntp;news;"
+
+#: ../appdata/claws-mail.appdata.xml.in.h:1
+msgid "Claws Mail is a fast, powerful and very extensible email client."
+msgstr "Claws Mail estas rapida, potenca kaj ja etendebla retpoŝtilo."
+
+#: ../appdata/claws-mail.appdata.xml.in.h:2
+msgid "It is highly configurable and handles hundreds of thousands of emails easily. Messages are managed in an open format, and are easy to interact with."
+msgstr "Estas ja agordebla kaj traktas cent miloj da repoŝtoj facile. Mesaĝoj estas mastrumataj je malferma aranĝo, sed estas facile interagi kun ili."
+
+#: ../appdata/claws-mail.appdata.xml.in.h:3
+msgid "Lots of extra functionality is provided by plugins, such as PGP signatures and encryption, an RSS aggregator, a calendar, powerful spam filtering, Perl and Python interactions, HTML and PDF rendering, and more."
+msgstr "Multo da plua kapableco estas provizata de kromprogramoj, kiel PGP subskriboj kaj enĉifrado, RSS-fluo. kalendaro, potenca trudfiltrado, Perl kaj Pitona interagaj, HTML kaj PDF prezento, kaj pli."
+
+#: ../appdata/claws-mail-acpi_notifier.metainfo.xml.in.h:1
+msgid "Enables mail notification via LEDs on some laptops"
+msgstr "Ebligas retpoŝtan avizon pere de LED-oj ĉe kelkaj tekkomputiloj"
+
+#: ../appdata/claws-mail-address_keeper.metainfo.xml.in.h:1
+msgid "Allows saving outgoing addresses to a designated folder in the address book"
+msgstr "Permesas konservi elirantajn adresojn al titolita dosierujo en la adreslibro"
+
+#: ../appdata/claws-mail-archive.metainfo.xml.in.h:1
+msgid "Allows to make tars or zips of old folders"
+msgstr "Permesas fari tar aŭ zip arojn da malnovaj dosierujoj"
+
+#: ../appdata/claws-mail-att_remover.metainfo.xml.in.h:1
+msgid "Lets you remove attachments from emails"
+msgstr "Permesas vin forpreni algluaĵojn de retpoŝtoj"
+
+#: ../appdata/claws-mail-attachwarner.metainfo.xml.in.h:1
+msgid "Warns when a message mentioning an attachment in the message body without attaching any files"
+msgstr "Avertas kiam mesaĝo menciante algluaĵon en mesaĝa korpo sen algluante iujn ajn dosierojn"
+
+#: ../appdata/claws-mail-bogofilter.metainfo.xml.in.h:1
+msgid "Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL account using Bogofilter"
+msgstr "Ebligas skanadon de eniranta repoŝto ricevita de POP, IMAP aŭ LOKA konto uzante Bogofilter"
+
+#: ../appdata/claws-mail-bsfilter.metainfo.xml.in.h:1
+msgid "Check all messages that are received from an IMAP, LOCAL or POP account for spam using Bsfilter"
+msgstr "Kontrolu ĉiujn mesaĝojn kiuj estis ricevitaj de IMAP, LOKA aŭ POP konto por trudaĵoj uzante Bsfilter "
+
+#: ../appdata/claws-mail-clamd.metainfo.xml.in.h:1
+msgid "Scans all messages that are received from an IMAP, LOCAL or POP account using clamd (Clam AV)"
+msgstr "Skanas ĉiujn mesaĝojn kiuj estis ricevitaj de IMAP, LOKA aŭ POP konto uzante clamd (Clam AV)."
+
+#: ../appdata/claws-mail-fancy.metainfo.xml.in.h:1
+msgid "Renders HTML e-mail using the WebKit library"
+msgstr "Prezentas HTML retpoŝton uzante la WebKit bibliotekon"
+
+#: ../appdata/claws-mail-fetchinfo.metainfo.xml.in.h:1
+msgid "Inserts headers containing: UIDL, Claws' account name, POP server, user ID and retrieval time"
+msgstr "Enmetas ĉapojn enhavante: UIDL, ;a kontnomo de Claws, POP servilo, uzanta identeco kaj riceva horo"
+
+#: ../appdata/claws-mail-gdata.metainfo.xml.in.h:1
+msgid "Provides an interface to Google services"
+msgstr "Liveras interfacon al Guglaj servoj"
+
+#: ../appdata/claws-mail-geolocation.metainfo.xml.in.h:1
+msgid "Provides GeoLocation functionality"
+msgstr "Liveras Geolokan kapablon"
+
+#: ../appdata/claws-mail-libravatar.metainfo.xml.in.h:1
+msgid "Displays libravatar/gravatar profiles' images or a dynamically generated or predefined alternative"
+msgstr "Montras libravatarajn/gravatarajn profilajn bildojn aŭ dinamike generita aŭ antaŭdifinita alternativo"
+
+#: ../appdata/claws-mail-mailmbox.metainfo.xml.in.h:1
+msgid "Direct support for mailboxes in mbox format"
+msgstr "Rekta subteno por poŝtkestoj en mbox aranĝo"
+
+#: ../appdata/claws-mail-newmail.metainfo.xml.in.h:1
+msgid "Writes a msg header summary to a log file on arrival of new mail after sorting"
+msgstr "Skribas mesaĝan ĉapan resumon al protokola dosiero je alveno de nova retpoŝto post ordigo"
 
-#: ../src/account.c:392
+#: ../appdata/claws-mail-notification.metainfo.xml.in.h:1
+msgid "Provides various ways to notify the user of new and unread email"
+msgstr "Liveras diversajn manierojn por avizi la uzanto de nova kaj nelegita retpoŝto"
+
+#: ../appdata/claws-mail-pdf_viewer.metainfo.xml.in.h:1
+msgid "Enables the viewing of PDF and PostScript attachments using the Poppler library and GhostScript"
+msgstr "Ebligas la vidon de PDF kaj Postskriptan algluaĵojn uzante la Poppler biblioteko kaj Ghostscript"
+
+#: ../appdata/claws-mail-perl.metainfo.xml.in.h:1
+msgid "Allowing the use of full Perl power in email filters"
+msgstr "Permesas la plenan potencon de Perl en retpoŝtaj filtriloj"
+
+#: ../appdata/claws-mail-pgpcore.metainfo.xml.in.h:1
+msgid "Handles core PGP functions and is a dependency of both the PGP/Inline and PGP/MIME plugins."
+msgstr "Traktas kernajn PGP funkciojn kaj dependas de kaj PGP/enlinia kaj PGP/MIME kromprogramoj."
+
+#: ../appdata/claws-mail-pgpinline.metainfo.xml.in.h:1
+msgid "Handles PGP/Inline signed and/or encrypted mails"
+msgstr "Traktas PGP/enlinian subskribitan kaj/aŭ enĉifritaj retpoŝtoj"
+
+#: ../appdata/claws-mail-pgpmime.metainfo.xml.in.h:1
+msgid "Handles PGP/MIME signed and/or encrypted mails"
+msgstr "Traktas PGP/MIME subskribitaj kaj/aŭ enĉifritaj retpoŝtoj"
+
+#: ../appdata/claws-mail-python.metainfo.xml.in.h:1
+msgid "Offers a Python scripting. Code can be entered into an embedded Python console or stored"
+msgstr "Liveras Pitonan skriptadon. Kodo povas esti enmetita en enkorpigitan Pitonan konzolon aŭ enmemorigita"
+
+#: ../appdata/claws-mail-rssyl.metainfo.xml.in.h:1
+msgid "Read your RSS favourite newsfeeds"
+msgstr "Legu viajn RSS plejŝatatajn fluojn"
+
+#: ../appdata/claws-mail-smime.metainfo.xml.in.h:1
+msgid "Handles S/MIME signed and/or encrypted mails"
+msgstr "Traktas S/MIME subskribitajn kaj/aŭ enĉifritajn retpoŝtojn"
+
+#: ../appdata/claws-mail-spam_report.metainfo.xml.in.h:1
+msgid "Reports spam to various places"
+msgstr "Raportas trudaĵojn al diversaj lokoj"
+
+#: ../appdata/claws-mail-spamassassin.metainfo.xml.in.h:1
+msgid "Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL account using SpamAssassin"
+msgstr "Ebligas la skanadon de envenanta retpoŝto ricevita de POP, IMAP aŭ LOKA konto uzante SpamAssassin"
+
+#: ../appdata/claws-mail-tnef_parse.metainfo.xml.in.h:1
+msgid "Enables reading application/ms-tnef attachments"
+msgstr "Ebligas legadon de aplikaĵaj/ms-tnef algluaĵoj"
+
+#: ../appdata/claws-mail-vcalendar.metainfo.xml.in.h:1
+msgid "Enables vCalendar message handling and handles webCal subscriptions. Provides a calendar import"
+msgstr "Ebligas vKalendarajn mesaĝtraktadon kaj traktas webCal subskriboj. Liveras kalendaran importon"
+
+#: ../src/account.c:392 ../src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
+"Please close all the composing windows before editing accounts."
 msgstr ""
 "Kelkaj verkaj fenestroj estas malfermitaj.\n"
-"Bonvolu fermi ĉiujn verkajn fenestrojn antaŭ ol redakti la kontojn."
+"Bonvolu fermi ĉiujn verkajn fenestrojn antaŭ ol redakti kontojn."
 
 #: ../src/account.c:437
 msgid "Can't create folder."
 msgstr "Ne povas krei dosierujon."
 
-#: ../src/account.c:717
+#: ../src/account.c:724
 msgid "Edit accounts"
-msgstr "Redakti kontojn"
+msgstr "Redaktu kontojn"
 
-#: ../src/account.c:734
-msgid ""
-"Using 'Get Mail' will retrieve messages from your Accounts in the order "
-"given, the checkbox indicates which accounts will be included. Bold text "
-"indicates the default account."
-msgstr ""
-"Uzante `Havigi Poŝton' elŝutos mesaĝojn de viaj Kontoj laŭ la ordo donata. "
-"La markobutono indikas kiujn kontojn estos inkluzivitaj. Grasa teksto "
-"indikas la defaŭltan konton."
+#: ../src/account.c:741
+msgid "Using 'Get Mail' will retrieve messages from your Accounts in the order given, the checkbox indicates which accounts will be included. Bold text indicates the default account."
+msgstr "Uzante `Havigu Poŝton' elŝutos mesaĝojn de viaj Kontoj laŭ la ordo donata. La markobutono indikas kiujn kontojn estos inkluzivitaj. Grasa teksto indikas la defaŭltan konton."
 
-#: ../src/account.c:805
+#: ../src/account.c:812
 msgid " _Set as default account "
-msgstr "_Starigi kiel defaŭlta konto "
+msgstr "_Starigu kiel defaŭlta konto "
 
-#: ../src/account.c:897
+#: ../src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Kontoj kun foraj dosierujoj ne povas esti kopiitaj."
 
 #. copy fields
-#: ../src/account.c:904
+#: ../src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopio de %s"
 
-#: ../src/account.c:1064
+#: ../src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Ĉu vi vere volas forigi la konton `%s'?"
 
-#: ../src/account.c:1066
+#: ../src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Sentitola)"
 
-#: ../src/account.c:1067
+#: ../src/account.c:1074
 msgid "Delete account"
-msgstr "Forigi konton"
+msgstr "Forigu konton"
 
-#: ../src/account.c:1537
+#: ../src/account.c:1544
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: ../src/account.c:1543
+#: ../src/account.c:1550
 msgid "'Get Mail' retrieves mail from the checked accounts"
-msgstr "`Havigi Poŝton' elŝutas poŝton de la markitaj kontoj"
+msgstr "`Havigu Poŝton' elŝutas poŝton de la markitaj kontoj"
 
-#: ../src/account.c:1550 ../src/addrduplicates.c:471 ../src/addressadd.c:215
-#: ../src/addressbook.c:125 ../src/compose.c:7144 ../src/editaddress.c:1263
+#: ../src/account.c:1557 ../src/addrduplicates.c:471 ../src/addressadd.c:215
+#: ../src/addressbook.c:125 ../src/compose.c:7148 ../src/editaddress.c:1263
 #: ../src/editaddress.c:1320 ../src/editaddress.c:1340
 #: ../src/editaddress_other_attributes_ldap.c:302
 #: ../src/editaddress_other_attributes_ldap.c:350 ../src/editbook.c:170
@@ -119,16 +220,16 @@ msgstr "`Havigi Poŝton' elŝutas poŝton de la markitaj kontoj"
 #: ../src/editvcard.c:173 ../src/importmutt.c:223 ../src/importpine.c:222
 #: ../src/mimeview.c:275 ../src/plugins/pdf_viewer/poppler_viewer.c:1797
 #: ../src/plugins/pgpcore/select-keys.c:396 ../src/prefs_filtering.c:384
-#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:78
+#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:79
 msgid "Name"
 msgstr "Nomo"
 
-#: ../src/account.c:1558 ../src/prefs_account.c:1103
+#: ../src/account.c:1565 ../src/prefs_account.c:1103
 #: ../src/prefs_account.c:4058
 msgid "Protocol"
 msgstr "Protokolo"
 
-#: ../src/account.c:1566 ../src/ssl_manager.c:102
+#: ../src/account.c:1573 ../src/ssl_manager.c:102
 msgid "Server"
 msgstr "Servilo"
 
@@ -180,8 +281,8 @@ msgstr ""
 "%s"
 
 #: ../src/action.c:990 ../src/ldaputil.c:326
-#: ../src/plugins/bogofilter/bogofilter.c:876 ../src/plugins/rssyl/feed.c:1739
-#: ../src/plugins/rssyl/feed.c:1743 ../src/plugins/tnef_parse/tnef_parse.c:67
+#: ../src/plugins/bogofilter/bogofilter.c:876
+#: ../src/plugins/tnef_parse/tnef_parse.c:67
 #: ../src/plugins/vcalendar/vcal_folder.c:1803
 #: ../src/plugins/vcalendar/vcal_folder.c:1807
 #: ../src/plugins/vcalendar/vcal_folder.c:1818
@@ -238,22 +339,19 @@ msgid "Action's user argument"
 msgstr "Uzanta argumento por ago"
 
 #: ../src/addrclip.c:479
-#, fuzzy
 msgid "Cannot copy a folder to itself or to its sub-structure."
-msgstr "Ne povas kopii dosieron al unu el siaj idoj."
+msgstr "Ne povas kopii dosierujon al si mem aŭ al sia substrukturo."
 
 #: ../src/addrclip.c:502
-#, fuzzy
 msgid "Cannot copy an address book to itself."
-msgstr "Ne povas alglui. Cela adreslibro estas nurlega."
+msgstr "Ne povas kopii adreslibron al si mem."
 
 #: ../src/addrclip.c:593
-#, fuzzy
 msgid "Cannot move a folder to itself or to its sub-structure."
-msgstr "Ne povas movi dosierujon al unu el siaj idoj."
+msgstr "Ne povas movi dosierujon al si mem aŭ al sia substrukturo."
 
 #. that's a group
-#: ../src/addr_compl.c:620 ../src/addressbook.c:4866
+#: ../src/addr_compl.c:685 ../src/addressbook.c:4866
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "Grupo"
@@ -300,7 +398,7 @@ msgstr "Eca nomo"
 
 #: ../src/addrcustomattr.c:156
 msgid "Delete all attribute names"
-msgstr "Forigi ĉiujn ecajn nomojn"
+msgstr "Forigu ĉiujn ecajn nomojn"
 
 #: ../src/addrcustomattr.c:157
 msgid "Do you really want to delete all attribute names?"
@@ -308,7 +406,7 @@ msgstr "Ĉu vi vere volas forigi ĉiujn ecajn nomojn?"
 
 #: ../src/addrcustomattr.c:181
 msgid "Delete attribute name"
-msgstr "Forigi ecan nomon"
+msgstr "Forigu ecan nomon"
 
 #: ../src/addrcustomattr.c:182
 msgid "Do you really want to delete this attribute name?"
@@ -316,7 +414,7 @@ msgstr "Ĉu vi vere volas forigi ĉi tiun ecan nomon?"
 
 #: ../src/addrcustomattr.c:191
 msgid "Reset to default"
-msgstr "Restarigi al defaŭlto"
+msgstr "Restarigu al defaŭlto"
 
 #: ../src/addrcustomattr.c:192
 msgid ""
@@ -328,20 +426,20 @@ msgstr ""
 
 #: ../src/addrcustomattr.c:212 ../src/addressbook.c:435
 #: ../src/addressbook.c:463 ../src/addressbook.c:480 ../src/edittags.c:272
-#: ../src/plugins/archive/archiver_gtk.c:1193 ../src/prefs_actions.c:1090
-#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1099
+#: ../src/plugins/archive/archiver_gtk.c:1194 ../src/prefs_actions.c:1090
+#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1119
 msgid "_Delete"
-msgstr "Forigi"
+msgstr "Forigu"
 
 #: ../src/addrcustomattr.c:213 ../src/edittags.c:273
 #: ../src/prefs_actions.c:1091 ../src/prefs_filtering.c:1694
-#: ../src/prefs_template.c:1100
+#: ../src/prefs_template.c:1120
 msgid "Delete _all"
-msgstr "Forigi ĉiujn"
+msgstr "Forigu ĉiujn"
 
 #: ../src/addrcustomattr.c:214
 msgid "_Reset to default"
-msgstr "_Restarigi al defaŭlto"
+msgstr "_Restarigu al defaŭlto"
 
 #: ../src/addrcustomattr.c:403
 msgid "Attribute name is not set."
@@ -350,37 +448,31 @@ msgstr "Eca nomo ne estis starigita."
 #: ../src/addrcustomattr.c:462
 msgctxt "Dialog title"
 msgid "Edit attribute names"
-msgstr "Redakti ecajn nomojn"
+msgstr "Redaktu ecajn nomojn"
 
 #: ../src/addrcustomattr.c:476
 msgid "New attribute name:"
 msgstr "Nova eca nomo:"
 
 #: ../src/addrcustomattr.c:513
-msgid ""
-"Adding or removing attribute names won't affect attributes already set for "
-"contacts."
-msgstr ""
-"Aldonante aŭ forigante ecajn nomojn ne tuŝos ecojn jam starigitaj por "
-"kontaktoj."
+msgid "Adding or removing attribute names won't affect attributes already set for contacts."
+msgstr "Aldonante aŭ forigante ecajn nomojn ne tuŝos ecojn jam starigitaj por kontaktoj."
 
 #: ../src/addrduplicates.c:127
 msgid "Show duplicates in the same book"
-msgstr "Montri duplikatojn en la sama libro"
+msgstr "Montru duplikatojn en la sama libro"
 
 #: ../src/addrduplicates.c:133
 msgid "Show duplicates in different books"
-msgstr "Montri duplikatojn en malsamaj libroj"
+msgstr "Montru duplikatojn en malsamaj libroj"
 
 #: ../src/addrduplicates.c:144
 msgid "Find address book email duplicates"
-msgstr "Trovi adreslibrajn retpoŝtajn duplikatojn"
+msgstr "Trovu adreslibrajn retpoŝtajn duplikatojn"
 
 #: ../src/addrduplicates.c:145
-msgid ""
-"Claws Mail will now search for duplicate email addresses in the address book."
-msgstr ""
-"Claws Mail nun serĉos por duplikataj retpoŝtaj adresoj en la adreslibro."
+msgid "Claws Mail will now search for duplicate email addresses in the address book."
+msgstr "Claws Mail nun serĉos por duplikataj retpoŝtaj adresoj en la adreslibro."
 
 #: ../src/addrduplicates.c:315
 msgid "No duplicate email addresses found in the address book"
@@ -402,15 +494,15 @@ msgstr "Adreslibra vojo"
 #: ../src/addrduplicates.c:793 ../src/addressbook.c:1433
 #: ../src/addressbook.c:1486
 msgid "Delete address(es)"
-msgstr "Forigi adreso(j)n"
+msgstr "Forigu adreso(j)n"
 
 #: ../src/addrduplicates.c:794 ../src/addressbook.c:1487
 msgid "Really delete the address(es)?"
-msgstr "Ĉu vere forigi la adreso(j)n?"
+msgstr "Ĉu vere forigu la adreso(j)n?"
 
 #: ../src/addrduplicates.c:842
 msgid "Delete address"
-msgstr "Forigi adreson"
+msgstr "Forigu adreson"
 
 #: ../src/addrduplicates.c:843 ../src/addressbook.c:1434
 msgid "This address data is readonly and cannot be deleted."
@@ -418,11 +510,11 @@ msgstr "Ĉi tiuj adresdatumoj estas nurlegaj kaj ne povas esti forigitaj."
 
 #: ../src/addressadd.c:185 ../src/prefs_filtering_action.c:201
 msgid "Add to address book"
-msgstr "Aldoni al adreslibro"
+msgstr "Aldonu al adreslibro"
 
 #: ../src/addressadd.c:207
 msgid "Contact"
-msgstr "Kontakti"
+msgstr "Kontaktu"
 
 #: ../src/addressadd.c:238 ../src/addressbook.c:127 ../src/editaddress.c:1055
 #: ../src/editaddress.c:1130 ../src/editgroup.c:290
@@ -431,10 +523,10 @@ msgstr "Rimarkoj"
 
 #: ../src/addressadd.c:257 ../src/addressbook_foldersel.c:158
 msgid "Select Address Book Folder"
-msgstr "Elekti adreslibran dosierujon"
+msgstr "Elektu adreslibran dosierujon"
 
 #: ../src/addressadd.c:485 ../src/editaddress.c:1582 ../src/headerview.c:281
-#: ../src/textview.c:2064
+#: ../src/textview.c:2043
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -445,7 +537,7 @@ msgstr ""
 
 #: ../src/addressadd.c:535 ../src/addressbook.c:3209 ../src/addressbook.c:3260
 msgid "Add address(es)"
-msgstr "Aldoni adreso(j)n"
+msgstr "Aldonu adreso(j)n"
 
 #: ../src/addressadd.c:536
 msgid "Can't add the specified address"
@@ -465,17 +557,17 @@ msgstr "Li_bro"
 
 #. {"Address/---",			NULL, "---", NULL, NULL, NULL },
 #: ../src/addressbook.c:403 ../src/addressbook.c:434 ../src/addressbook.c:462
-#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:504
+#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:506
 #: ../src/messageview.c:210
 msgid "_Edit"
-msgstr "R_edakti"
+msgstr "R_edaktu"
 
-#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:507
+#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:509
 #: ../src/messageview.c:213
 msgid "_Tools"
 msgstr "Iloj"
 
-#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:509
+#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:511
 #: ../src/messageview.c:214
 msgid "_Help"
 msgstr "Helpo"
@@ -503,44 +595,44 @@ msgstr "Nova LDAP servilo"
 
 #: ../src/addressbook.c:421
 msgid "_Edit book"
-msgstr "R_edakti libron"
+msgstr "R_edaktu libron"
 
 #: ../src/addressbook.c:422
 msgid "_Delete book"
-msgstr "Forigi libron"
+msgstr "Forigu libron"
 
 #. {"Book/---",			NULL, "---", NULL, NULL, NULL },
 #. {"Message/---",		NULL, "---" },
 #: ../src/addressbook.c:424 ../src/compose.c:598
 msgid "_Save"
-msgstr "Kon_servi"
+msgstr "Kon_servu"
 
 #. {"Message/---",		NULL, "---" },
 #: ../src/addressbook.c:425 ../src/compose.c:602 ../src/messageview.c:223
 msgid "_Close"
-msgstr "Fermi"
+msgstr "Fermu"
 
 #. Adress menu
 #: ../src/addressbook.c:428 ../src/addressbook.c:477 ../src/messageview.c:227
 msgid "_Select all"
-msgstr "Elekti ĉiujn"
+msgstr "Elektu ĉiujn"
 
 #. {"ABTreePopup/---",		NULL, "---", NULL, NULL, NULL },
 #. {"ABListPopup/---",		NULL, "---", NULL, NULL, NULL },
 #: ../src/addressbook.c:430 ../src/addressbook.c:469 ../src/addressbook.c:485
 msgid "C_ut"
-msgstr "Eltondi"
+msgstr "Eltondu"
 
 #. Edit menu
 #: ../src/addressbook.c:431 ../src/addressbook.c:470 ../src/addressbook.c:486
-#: ../src/compose.c:610 ../src/mainwindow.c:538 ../src/messageview.c:226
+#: ../src/compose.c:610 ../src/mainwindow.c:540 ../src/messageview.c:226
 msgid "_Copy"
-msgstr "Kopii"
+msgstr "Kopiu"
 
 #: ../src/addressbook.c:432 ../src/addressbook.c:471 ../src/addressbook.c:487
 #: ../src/compose.c:611
 msgid "_Paste"
-msgstr "Alglui"
+msgstr "Algluu"
 
 #. {"Address/---",			NULL, "---", NULL, NULL, NULL },
 #. {"ABListPopup/---",		NULL, "---", NULL, NULL, NULL },
@@ -556,52 +648,53 @@ msgstr "Nova _grupo"
 #. {"ABListPopup/---",		NULL, "---", NULL, NULL, NULL },
 #: ../src/addressbook.c:440 ../src/addressbook.c:489
 msgid "_Mail To"
-msgstr "Sendi al"
+msgstr "Sendu al"
 
 #. Tools menu
 #: ../src/addressbook.c:444
 msgid "Import _LDIF file..."
-msgstr "Importi _LDIF dosieron..."
+msgstr "Importu _LDIF dosieron..."
 
 #: ../src/addressbook.c:445
 msgid "Import M_utt file..."
-msgstr "Importi M_utt dosieron..."
+msgstr "Importu M_utt dosieron..."
 
 #: ../src/addressbook.c:446
 msgid "Import _Pine file..."
-msgstr "Importi _Pine dosieron..."
+msgstr "Importu _Pine dosieron..."
 
 #: ../src/addressbook.c:448
 msgid "Export _HTML..."
-msgstr "Eksporti _HTML..."
+msgstr "Eksportu _HTML..."
 
 #: ../src/addressbook.c:449
 msgid "Export LDI_F..."
-msgstr "Eksporti LDI_F..."
+msgstr "Eksportu LDI_F..."
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
 #: ../src/addressbook.c:451
 msgid "Find duplicates..."
-msgstr "Trovi duplikatojn..."
+msgstr "Trovu duplikatojn..."
 
 #: ../src/addressbook.c:452
 msgid "Edit custom attributes..."
-msgstr "Redakti proprajn ecojn..."
+msgstr "Redaktu proprajn ecojn..."
 
 #. Help menu
-#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:801
+#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:803
 #: ../src/messageview.c:339
 msgid "_About"
 msgstr "Pri"
 
 #: ../src/addressbook.c:491
 msgid "_Browse Entry"
-msgstr "Foliumi enigon"
+msgstr "Foliumu enigon"
 
 #. then add the appointment
-#: ../src/addressbook.c:504 ../src/crash.c:454 ../src/crash.c:473
+#: ../src/addressbook.c:504 ../src/crash.c:457 ../src/crash.c:476
 #: ../src/importldif.c:115 ../src/plugins/pgpcore/select-keys.c:251
-#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/vcalendar/day-view.c:402
+#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/pgpcore/sgpgme.c:168
+#: ../src/plugins/vcalendar/day-view.c:402
 #: ../src/plugins/vcalendar/month-view.c:428 ../src/prefs_themes.c:707
 #: ../src/prefs_themes.c:739 ../src/prefs_themes.c:740
 msgid "Unknown"
@@ -641,11 +734,11 @@ msgstr "Malbona dosiera aranĝo"
 
 #: ../src/addressbook.c:519 ../src/importldif.c:130
 msgid "Error writing to file"
-msgstr "Eraro dum skribi al dosiero"
+msgstr "Eraro kiam skribante al dosiero"
 
 #: ../src/addressbook.c:520 ../src/importldif.c:131
 msgid "Error opening directory"
-msgstr "Eraro dum malfermi dosierujon"
+msgstr "Eraro malfermante dosierujon"
 
 #: ../src/addressbook.c:521 ../src/importldif.c:132
 msgid "No path specified"
@@ -707,25 +800,25 @@ msgstr "Pli forta aŭtentigo bezonata"
 msgid "Sources"
 msgstr "Fontoj"
 
-#: ../src/addressbook.c:914 ../src/prefs_matcher.c:629
+#: ../src/addressbook.c:914 ../src/prefs_matcher.c:632
 #: ../src/prefs_other.c:475 ../src/toolbar.c:225 ../src/toolbar.c:2142
 msgid "Address book"
 msgstr "Adreslibro"
 
 #: ../src/addressbook.c:1109
 msgid "Lookup name:"
-msgstr "Serĉi nomon:"
+msgstr "Serĉu nomon:"
 
 #: ../src/addressbook.c:1478
 msgid "Delete group"
-msgstr "Forigi grupon"
+msgstr "Forigu grupon"
 
 #: ../src/addressbook.c:1479
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgstr ""
-"Ĉu vere forigi la grupo(j)n?\n"
+"Ĉu vere forigu la grupo(j)n?\n"
 "La adresoj kiujn ĝi enhavas ne estos perditaj."
 
 #: ../src/addressbook.c:2190
@@ -745,31 +838,27 @@ msgstr "Ĉu vi volas forigi la petajn rezultojn kaj adresojn en `%s'?"
 #: ../src/addressbook.c:2942 ../src/plugins/archive/archiver_prefs.c:337
 #: ../src/prefs_filtering_action.c:177 ../src/toolbar.c:415
 msgid "Delete"
-msgstr "Forigi"
+msgstr "Forigu"
 
 #: ../src/addressbook.c:2918
 #, c-format
-msgid ""
-"Do you want to delete '%s'? If you delete the folder only, the addresses it "
-"contains will be moved into the parent folder."
-msgstr ""
-"Ĉu vi volas forigi `%s'? Se vi forigas nur la dosierujon, la adresoj kiujn "
-"ĝi enhavas estos movataj al la gepatra dosierujo."
+msgid "Do you want to delete '%s'? If you delete the folder only, the addresses it contains will be moved into the parent folder."
+msgstr "Ĉu vi volas forigi `%s'? Se vi forigas nur la dosierujon, la adresoj kiujn ĝi enhavas estos movataj al la gepatra dosierujo."
 
 #: ../src/addressbook.c:2921 ../src/imap_gtk.c:363 ../src/mh_gtk.c:202
 #: ../src/plugins/mailmbox/plugin_gtk.c:324
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:236
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:152
 #: ../src/plugins/vcalendar/vcal_folder.c:1966
 msgid "Delete folder"
-msgstr "Forigi dosierujon"
+msgstr "Forigu dosierujon"
 
 #: ../src/addressbook.c:2922
 msgid "+Delete _folder only"
-msgstr "+_Forigi nur la dosierujon"
+msgstr "+_Forigu nur la dosierujon"
 
 #: ../src/addressbook.c:2922
 msgid "Delete folder and _addresses"
-msgstr "Forigi dosierujon kaj _adresojn"
+msgstr "Forigu dosierujon kaj _adresojn"
 
 #: ../src/addressbook.c:2933
 #, c-format
@@ -795,7 +884,7 @@ msgstr ""
 #: ../src/addressbook.c:3054
 #, c-format
 msgid "Search '%s'"
-msgstr "Serĉi `%s'"
+msgstr "Serĉu `%s'"
 
 #: ../src/addressbook.c:3192 ../src/addressbook.c:3241
 msgid "New Contacts"
@@ -922,10 +1011,10 @@ msgstr "LDAP-demando"
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:443
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:490
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:613
-#: ../src/prefs_matcher.c:672 ../src/prefs_matcher.c:707
-#: ../src/prefs_matcher.c:1607 ../src/prefs_matcher.c:1614
-#: ../src/prefs_matcher.c:1622 ../src/prefs_matcher.c:1624
-#: ../src/prefs_matcher.c:2504 ../src/prefs_matcher.c:2508
+#: ../src/prefs_matcher.c:675 ../src/prefs_matcher.c:710
+#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:1626
+#: ../src/prefs_matcher.c:1634 ../src/prefs_matcher.c:1636
+#: ../src/prefs_matcher.c:2524 ../src/prefs_matcher.c:2528
 msgid "Any"
 msgstr "Iu ajn"
 
@@ -967,17 +1056,16 @@ msgid "Address book folder size:"
 msgstr "Adreslibra dosieruja grando:"
 
 #: ../src/addrgather.c:399 ../src/addrgather.c:409
-msgid ""
-"Maximum amount of entries per folder within the newly created address book"
+msgid "Maximum amount of entries per folder within the newly created address book"
 msgstr "Maksimuma kvanto da eroj po dosierujo en la nove kreita adreslibro"
 
 #: ../src/addrgather.c:413
 msgid "Process these mail header fields"
-msgstr "Procezi ĉi tiujn poŝtajn ĉapkampojn"
+msgstr "Procezu ĉi tiujn poŝtajn ĉapkampojn"
 
 #: ../src/addrgather.c:432
 msgid "Include subfolders"
-msgstr "Inkluzivi subdosierujojn"
+msgstr "Inkluzivu subdosierujojn"
 
 #: ../src/addrgather.c:456 ../src/prefs_filtering_action.c:1425
 msgid "Header Name"
@@ -995,15 +1083,15 @@ msgstr "Ĉapaj kampoj"
 #: ../src/addrgather.c:568 ../src/exphtmldlg.c:658 ../src/expldifdlg.c:722
 #: ../src/importldif.c:1023
 msgid "Finish"
-msgstr "Fini"
+msgstr "Finu"
 
 #: ../src/addrgather.c:626
 msgid "Collect email addresses from selected messages"
-msgstr "Kolekti retpoŝtajn adresojn de elektitaj mesaĝoj"
+msgstr "Kolektu retpoŝtajn adresojn de elektitaj mesaĝoj"
 
 #: ../src/addrgather.c:630
 msgid "Collect email addresses from folder"
-msgstr "Kolekti retpoŝtajn adresojn de dosierujo"
+msgstr "Kolektu retpoŝtajn adresojn de dosierujo"
 
 #: ../src/addrindex.c:123
 msgid "Common addresses"
@@ -1029,44 +1117,39 @@ msgstr "Ĝisdatigo de adreso(j)"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Ĝisdatigo fiaskis. Ŝanĝoj ne skribitaj al dosierujo."
 
-#: ../src/alertpanel.c:146 ../src/compose.c:9293
+#: ../src/alertpanel.c:146 ../src/compose.c:9324
 msgid "Notice"
 msgstr "Avizo"
 
 #: ../src/alertpanel.c:159 ../src/compose.c:5656 ../src/compose.c:6133
-#: ../src/compose.c:11662 ../src/file_checker.c:78 ../src/file_checker.c:100
+#: ../src/compose.c:11670 ../src/file_checker.c:78 ../src/file_checker.c:100
 #: ../src/messageview.c:853 ../src/messageview.c:866
-#: ../src/plugins/pgpcore/sgpgme.c:719
+#: ../src/plugins/pgpcore/sgpgme.c:717
 #: ../src/plugins/vcalendar/vcalendar.c:125 ../src/summaryview.c:4863
 msgid "Warning"
 msgstr "Averto"
 
 #: ../src/alertpanel.c:172 ../src/alertpanel.c:195 ../src/compose.c:5597
 #: ../src/inc.c:669 ../src/plugins/pgpcore/sgpgme.c:152
-#: ../src/plugins/pgpcore/sgpgme.c:249
+#: ../src/plugins/pgpcore/sgpgme.c:253
 msgid "Error"
 msgstr "Eraro"
 
 #: ../src/alertpanel.c:196 ../src/gtk/progressdialog.c:94
 msgid "_View log"
-msgstr "_Vidi protokolon"
+msgstr "_Vidu protokolon"
 
 #: ../src/alertpanel.c:347
 msgid "Show this message next time"
-msgstr "Montri ĉi tiun mesaĝon venontfoje"
-
-#: ../src/avatars.c:97
-msgid "Internal avatars rendering already initialized"
-msgstr ""
+msgstr "Montru ĉi tiun mesaĝon venontfoje"
 
 #: ../src/avatars.c:102
-#, fuzzy
 msgid "Failed to register avatars internal rendering hook"
-msgstr "Malsukcesis registri avatar-reproduktan hokon"
+msgstr "Malsukcesis registri avataran bildigan hokon"
 
 #: ../src/browseldap.c:218
 msgid "Browse Directory Entry"
-msgstr "Foliumi dosierujan eron"
+msgstr "Foliumu dosierujan eron"
 
 #: ../src/browseldap.c:237
 msgid "Server Name :"
@@ -1122,11 +1205,8 @@ msgstr "aĵoj"
 
 #: ../src/common/plugin.c:334
 #, c-format
-msgid ""
-"This plugin provides %s (%s), which is already provided by the %s plugin."
-msgstr ""
-"Ĉi tiu kromprogramo provizas %s (%s), kiu estas provizata jam de la %s "
-"kromprogramo."
+msgid "This plugin provides %s (%s), which is already provided by the %s plugin."
+msgstr "Ĉi tiu kromprogramo provizas %s (%s), kiu estas provizata jam de la %s kromprogramo."
 
 #: ../src/common/plugin.c:436
 msgid "Plugin already loaded"
@@ -1138,9 +1218,7 @@ msgstr "Malsukcesis disponigi memoron por kromprogramo"
 
 #: ../src/common/plugin.c:481
 msgid "This module is not licensed under a GPL v3 or later compatible license."
-msgstr ""
-"Ĉi tiu modulo ne estas licencita sub GPL versio 3 aŭ pli malfrua akorda "
-"permesilo."
+msgstr "Ĉi tiu modulo ne estas licencita sub GPL versio 3 aŭ pli malfrua akorda permesilo."
 
 #: ../src/common/plugin.c:490
 msgid "This module is for Claws Mail GTK1."
@@ -1148,20 +1226,12 @@ msgstr "Ĉi tiu modulo estas por Claws Mail GTK1."
 
 #: ../src/common/plugin.c:772
 #, c-format
-msgid ""
-"Your version of Claws Mail is newer than the version the '%s' plugin was "
-"built with."
-msgstr ""
-"Via versio de Claws Mail estas pli nova ol la versio kun kiu la `%s' "
-"kromprogramo estis konstruita."
+msgid "Your version of Claws Mail is newer than the version the '%s' plugin was built with."
+msgstr "Via versio de Claws Mail estas pli nova ol la versio kun kiu la `%s' kromprogramo estis konstruita."
 
 #: ../src/common/plugin.c:775
-msgid ""
-"Your version of Claws Mail is newer than the version the plugin was built "
-"with."
-msgstr ""
-"Via versio de Claws Mail estas pli nova ol la versio kun kiu la kromprogramo "
-"estis konstruita."
+msgid "Your version of Claws Mail is newer than the version the plugin was built with."
+msgstr "Via versio de Claws Mail estas pli nova ol la versio kun kiu la kromprogramo estis konstruita."
 
 #: ../src/common/plugin.c:784
 #, c-format
@@ -1172,7 +1242,7 @@ msgstr "Via versio de Claws Mail estas tro malnova por la `%s' kromprogramo."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Via versio de Claws Mail estas tro malnova por la kromprogramo."
 
-#: ../src/common/session.c:177 ../src/imap.c:1171
+#: ../src/common/session.c:177 ../src/imap.c:1177
 msgid "SSL handshake failed\n"
 msgstr "SSL-manpremo fiaskis\n"
 
@@ -1241,7 +1311,7 @@ msgstr "%s:%s: gasteja serĉo fiaskis (%s).\n"
 #: ../src/common/socket.c:1515
 #, c-format
 msgid "write on fd%d: %s\n"
-msgstr "skribi sur fd%d: %s\n"
+msgstr "skribu sur fd%d: %s\n"
 
 #: ../src/common/ssl_certificate.c:328
 #, c-format
@@ -1348,232 +1418,232 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: ../src/common/utils.c:4967
+#: ../src/common/utils.c:5000
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Dimanĉo"
 
-#: ../src/common/utils.c:4968
+#: ../src/common/utils.c:5001
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Lundo"
 
-#: ../src/common/utils.c:4969
+#: ../src/common/utils.c:5002
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Mardo"
 
-#: ../src/common/utils.c:4970
+#: ../src/common/utils.c:5003
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Merkredo"
 
-#: ../src/common/utils.c:4971
+#: ../src/common/utils.c:5004
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Ĵaŭdo"
 
-#: ../src/common/utils.c:4972
+#: ../src/common/utils.c:5005
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Vendredo"
 
-#: ../src/common/utils.c:4973
+#: ../src/common/utils.c:5006
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sabato"
 
-#: ../src/common/utils.c:4975
+#: ../src/common/utils.c:5008
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Januaro"
 
-#: ../src/common/utils.c:4976
+#: ../src/common/utils.c:5009
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Februaro"
 
-#: ../src/common/utils.c:4977
+#: ../src/common/utils.c:5010
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marto"
 
-#: ../src/common/utils.c:4978
+#: ../src/common/utils.c:5011
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Aprilo"
 
-#: ../src/common/utils.c:4979
+#: ../src/common/utils.c:5012
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Majo"
 
-#: ../src/common/utils.c:4980
+#: ../src/common/utils.c:5013
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Junio"
 
-#: ../src/common/utils.c:4981
+#: ../src/common/utils.c:5014
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Julio"
 
-#: ../src/common/utils.c:4982
+#: ../src/common/utils.c:5015
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Aŭgusto"
 
-#: ../src/common/utils.c:4983
+#: ../src/common/utils.c:5016
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Septembro"
 
-#: ../src/common/utils.c:4984
+#: ../src/common/utils.c:5017
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Oktobro"
 
-#: ../src/common/utils.c:4985
+#: ../src/common/utils.c:5018
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Novembro"
 
-#: ../src/common/utils.c:4986
+#: ../src/common/utils.c:5019
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Decembro"
 
-#: ../src/common/utils.c:4988
+#: ../src/common/utils.c:5021
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dim"
 
-#: ../src/common/utils.c:4989
+#: ../src/common/utils.c:5022
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Lun"
 
-#: ../src/common/utils.c:4990
+#: ../src/common/utils.c:5023
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Mar"
 
-#: ../src/common/utils.c:4991
+#: ../src/common/utils.c:5024
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mer"
 
-#: ../src/common/utils.c:4992
+#: ../src/common/utils.c:5025
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Ĵaŭ"
 
-#: ../src/common/utils.c:4993
+#: ../src/common/utils.c:5026
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Ven"
 
-#: ../src/common/utils.c:4994
+#: ../src/common/utils.c:5027
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sab"
 
-#: ../src/common/utils.c:4996
+#: ../src/common/utils.c:5029
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: ../src/common/utils.c:4997
+#: ../src/common/utils.c:5030
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: ../src/common/utils.c:4998
+#: ../src/common/utils.c:5031
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: ../src/common/utils.c:4999
+#: ../src/common/utils.c:5032
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Apr"
 
-#: ../src/common/utils.c:5000
+#: ../src/common/utils.c:5033
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Maj"
 
-#: ../src/common/utils.c:5001
+#: ../src/common/utils.c:5034
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: ../src/common/utils.c:5002
+#: ../src/common/utils.c:5035
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: ../src/common/utils.c:5003
+#: ../src/common/utils.c:5036
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aŭg"
 
-#: ../src/common/utils.c:5004
+#: ../src/common/utils.c:5037
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: ../src/common/utils.c:5005
+#: ../src/common/utils.c:5038
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Okt"
 
-#: ../src/common/utils.c:5006
+#: ../src/common/utils.c:5039
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: ../src/common/utils.c:5007
+#: ../src/common/utils.c:5040
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dec"
 
-#: ../src/common/utils.c:5018
+#: ../src/common/utils.c:5051
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "matene"
 
-#: ../src/common/utils.c:5019
+#: ../src/common/utils.c:5052
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "posttagmeze"
 
-#: ../src/common/utils.c:5020
+#: ../src/common/utils.c:5053
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "matene"
 
-#: ../src/common/utils.c:5021
+#: ../src/common/utils.c:5054
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "posttagmeze"
 
 #: ../src/compose.c:570
 msgid "_Add..."
-msgstr "_Aldoni..."
+msgstr "_Aldonu..."
 
 #: ../src/compose.c:571 ../src/mh_gtk.c:361
 #: ../src/plugins/mailmbox/plugin_gtk.c:293
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:140
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:307
 msgid "_Remove"
-msgstr "Fo_rigi"
+msgstr "Fo_rigu"
 
 #: ../src/compose.c:573 ../src/folderview.c:234
 msgid "_Properties..."
 msgstr "Ecoj..."
 
 #. menus
-#: ../src/compose.c:580 ../src/mainwindow.c:506 ../src/messageview.c:212
+#: ../src/compose.c:580 ../src/mainwindow.c:508 ../src/messageview.c:212
 msgid "_Message"
 msgstr "_Mesaĝo"
 
@@ -1588,46 +1658,46 @@ msgstr "_Opcioj"
 #. Message menu
 #: ../src/compose.c:589
 msgid "S_end"
-msgstr "S_endi"
+msgstr "S_endu"
 
 #: ../src/compose.c:590
 msgid "Send _later"
-msgstr "Sendi poste"
+msgstr "Sendu poste"
 
 #: ../src/compose.c:593
 msgid "_Attach file"
-msgstr "_Alglui dosieron"
+msgstr "_Algluu dosieron"
 
 #: ../src/compose.c:594
 msgid "_Insert file"
-msgstr "Enmet_i dosieron"
+msgstr "Enmet_u dosieron"
 
 #: ../src/compose.c:595
 msgid "Insert si_gnature"
-msgstr "Enmeti subskribon"
+msgstr "Enmetu subskribon"
 
 #: ../src/compose.c:596
 msgid "_Replace signature"
-msgstr "Anstataŭigi subsk_ribon"
+msgstr "Anstataŭigu subsk_ribon"
 
 #. COMPOSE_KEEP_EDITING
 #. {"Message/---",		NULL, "---" },
 #: ../src/compose.c:600
 msgid "_Print"
-msgstr "_Presi"
+msgstr "_Presu"
 
 #. Edit menu
 #: ../src/compose.c:605
 msgid "_Undo"
-msgstr "Malfari"
+msgstr "Malfaru"
 
 #: ../src/compose.c:606
 msgid "_Redo"
-msgstr "_Refari"
+msgstr "_Refaru"
 
 #: ../src/compose.c:609
 msgid "Cu_t"
-msgstr "_Tondi"
+msgstr "_Tondu"
 
 #: ../src/compose.c:613
 msgid "_Special paste"
@@ -1645,9 +1715,9 @@ msgstr "Ĉirkaŭfluigita"
 msgid "_Unwrapped"
 msgstr "Neĉirkaŭfluigita"
 
-#: ../src/compose.c:618 ../src/mainwindow.c:539
+#: ../src/compose.c:618 ../src/mainwindow.c:541
 msgid "Select _all"
-msgstr "Elekti ĉiujn"
+msgstr "Elektu ĉiujn"
 
 #: ../src/compose.c:620
 msgid "A_dvanced"
@@ -1655,83 +1725,83 @@ msgstr "Altnivela"
 
 #: ../src/compose.c:621
 msgid "Move a character backward"
-msgstr "Movi signon malantaŭen"
+msgstr "Movu signon malantaŭen"
 
 #. COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_CHARACTER
 #: ../src/compose.c:622
 msgid "Move a character forward"
-msgstr "Movi signon antaŭen"
+msgstr "Movu signon antaŭen"
 
 #. COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_CHARACTER
 #: ../src/compose.c:623
 msgid "Move a word backward"
-msgstr "Movi vorton malantaŭen"
+msgstr "Movu vorton malantaŭen"
 
 #. COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_WORD
 #: ../src/compose.c:624
 msgid "Move a word forward"
-msgstr "Movi vorton antaŭen"
+msgstr "Movu vorton antaŭen"
 
 #. COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_WORD
 #: ../src/compose.c:625
 msgid "Move to beginning of line"
-msgstr "Movi al komenco de linio"
+msgstr "Movu al komenco de linio"
 
 #. COMPOSE_CALL_ADVANCED_ACTION_MOVE_BEGINNING_OF_LINE
 #: ../src/compose.c:626
 msgid "Move to end of line"
-msgstr "Movi al linifino"
+msgstr "Movu al linifino"
 
 #. COMPOSE_CALL_ADVANCED_ACTION_MOVE_END_OF_LINE
 #: ../src/compose.c:627
 msgid "Move to previous line"
-msgstr "Movi al antaŭa linio"
+msgstr "Movu al antaŭa linio"
 
 #. COMPOSE_CALL_ADVANCED_ACTION_MOVE_PREVIOUS_LINE
 #: ../src/compose.c:628
 msgid "Move to next line"
-msgstr "Movi al sekva linio"
+msgstr "Movu al sekva linio"
 
 #. COMPOSE_CALL_ADVANCED_ACTION_MOVE_NEXT_LINE
 #: ../src/compose.c:629
 msgid "Delete a character backward"
-msgstr "Forigi signon malantaŭen"
+msgstr "Forigu signon malantaŭen"
 
 #. COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_CHARACTER
 #: ../src/compose.c:630
 msgid "Delete a character forward"
-msgstr "Forigi signon antaŭen"
+msgstr "Forigu signon antaŭen"
 
 #. COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_CHARACTER
 #: ../src/compose.c:631
 msgid "Delete a word backward"
-msgstr "Forigi vorton malantaŭen"
+msgstr "Forigu vorton malantaŭen"
 
 #. COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_WORD
 #: ../src/compose.c:632
 msgid "Delete a word forward"
-msgstr "Forigi vorton antaŭen"
+msgstr "Forigu vorton antaŭen"
 
 #. COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_WORD
 #: ../src/compose.c:633
 msgid "Delete line"
-msgstr "Forigi linion"
+msgstr "Forigu linion"
 
 #. COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE
 #: ../src/compose.c:634
 msgid "Delete to end of line"
-msgstr "Forigi ĝis linifino"
+msgstr "Forigu ĝis linifino"
 
 #. COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END
 #. {"Edit/---",			NULL, "---" },
 #: ../src/compose.c:637 ../src/messageview.c:229
 msgid "_Find"
-msgstr "Trovi"
+msgstr "Trovu"
 
 #. {"Edit/---",			NULL, "---" },
 #: ../src/compose.c:640
 msgid "_Wrap current paragraph"
-msgstr "Ĉirkaŭfluigi nunan paragrafon"
+msgstr "Ĉirkaŭfluigu nunan paragrafon"
 
 #. 0
 #: ../src/compose.c:641
@@ -1742,20 +1812,20 @@ msgstr "Ĉirkaŭfluigi ĉiujn longajn _liniojn"
 #. {"Edit/---",			NULL, "---" },
 #: ../src/compose.c:643
 msgid "Edit with e_xternal editor"
-msgstr "Redakti kun ekstera redaktilo"
+msgstr "Redaktu kun ekstera redaktilo"
 
 #. Spelling menu
 #: ../src/compose.c:646
 msgid "_Check all or check selection"
-msgstr "_Kontroli ĉiujn aŭ kontroli elekton"
+msgstr "_Kontrolu ĉiujn aŭ kontrolu elekton"
 
 #: ../src/compose.c:647
 msgid "_Highlight all misspelled words"
-msgstr "Marki ĉiujn misliterumitajn vortojn"
+msgstr "Marku ĉiujn misliterumitajn vortojn"
 
 #: ../src/compose.c:648
 msgid "Check _backwards misspelled word"
-msgstr "Kontroli malantaŭen misliterumitan vorton"
+msgstr "Kontrolu malantaŭen misliterumitan vorton"
 
 #: ../src/compose.c:649
 msgid "_Forward to next misspelled word"
@@ -1777,48 +1847,48 @@ msgstr "_Prioritato"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
 #. {"View/Scroll/---",          NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:666 ../src/mainwindow.c:603 ../src/messageview.c:265
+#: ../src/compose.c:666 ../src/mainwindow.c:605 ../src/messageview.c:265
 msgid "Character _encoding"
 msgstr "Signoprezento"
 
-#: ../src/compose.c:671 ../src/mainwindow.c:608 ../src/messageview.c:270
+#: ../src/compose.c:671 ../src/mainwindow.c:610 ../src/messageview.c:270
 msgid "Western European"
 msgstr "Okcidenteŭropa"
 
-#: ../src/compose.c:672 ../src/mainwindow.c:609 ../src/messageview.c:271
+#: ../src/compose.c:672 ../src/mainwindow.c:611 ../src/messageview.c:271
 msgid "Baltic"
 msgstr "Balta"
 
-#: ../src/compose.c:673 ../src/mainwindow.c:610 ../src/messageview.c:272
+#: ../src/compose.c:673 ../src/mainwindow.c:612 ../src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebrea"
 
-#: ../src/compose.c:674 ../src/mainwindow.c:611 ../src/messageview.c:273
+#: ../src/compose.c:674 ../src/mainwindow.c:613 ../src/messageview.c:273
 msgid "Arabic"
 msgstr "Araba"
 
-#: ../src/compose.c:675 ../src/mainwindow.c:612 ../src/messageview.c:274
+#: ../src/compose.c:675 ../src/mainwindow.c:614 ../src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Cirila"
 
-#: ../src/compose.c:676 ../src/mainwindow.c:613 ../src/messageview.c:275
+#: ../src/compose.c:676 ../src/mainwindow.c:615 ../src/messageview.c:275
 msgid "Japanese"
 msgstr "Japana"
 
-#: ../src/compose.c:677 ../src/mainwindow.c:614 ../src/messageview.c:276
+#: ../src/compose.c:677 ../src/mainwindow.c:616 ../src/messageview.c:276
 msgid "Chinese"
 msgstr "Ĉina"
 
-#: ../src/compose.c:678 ../src/mainwindow.c:615 ../src/messageview.c:277
+#: ../src/compose.c:678 ../src/mainwindow.c:617 ../src/messageview.c:277
 msgid "Korean"
 msgstr "Korea"
 
-#: ../src/compose.c:679 ../src/mainwindow.c:616 ../src/messageview.c:278
+#: ../src/compose.c:679 ../src/mainwindow.c:618 ../src/messageview.c:278
 msgid "Thai"
 msgstr "Taja"
 
 #. Tools menu
-#: ../src/compose.c:682 ../src/mainwindow.c:723 ../src/messageview.c:314
+#: ../src/compose.c:682 ../src/mainwindow.c:725 ../src/messageview.c:314
 msgid "_Address book"
 msgstr "_Adreslibro"
 
@@ -1827,7 +1897,7 @@ msgid "_Template"
 msgstr "Ŝablono"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:686 ../src/mainwindow.c:751 ../src/messageview.c:335
+#: ../src/compose.c:686 ../src/mainwindow.c:753 ../src/messageview.c:335
 msgid "Actio_ns"
 msgstr "Agoj"
 
@@ -1848,22 +1918,22 @@ msgstr "Si_gnumo"
 #. Toggle
 #: ../src/compose.c:698
 msgid "_Encrypt"
-msgstr "_Enĉifri"
+msgstr "_Enĉifru"
 
 #. Toggle
 #: ../src/compose.c:699
 msgid "_Request Return Receipt"
-msgstr "Peti _Revenan Recepton"
+msgstr "Petu _Revenan Recepton"
 
 #. TOGGLE
 #: ../src/compose.c:700
 msgid "Remo_ve references"
-msgstr "Forigi referencojn"
+msgstr "Forigu referencojn"
 
 #. TOGGLE
 #: ../src/compose.c:701
 msgid "Show _ruler"
-msgstr "Montri liniilon"
+msgstr "Montru liniilon"
 
 #. RADIO compose_set_priority_cb
 #: ../src/compose.c:706 ../src/compose.c:716
@@ -1871,13 +1941,13 @@ msgid "_Normal"
 msgstr "_Normala"
 
 #. RADIO compose_reply_change_mode_cb
-#: ../src/compose.c:707 ../src/mainwindow.c:657 ../src/messageview.c:303
+#: ../src/compose.c:707 ../src/mainwindow.c:659 ../src/messageview.c:303
 msgid "_All"
 msgstr "Ĉiuj"
 
 #. RADIO compose_reply_change_mode_cb
 #. COMPOSE_REPLY_TO_ALL
-#: ../src/compose.c:708 ../src/mainwindow.c:658 ../src/messageview.c:304
+#: ../src/compose.c:708 ../src/mainwindow.c:660 ../src/messageview.c:304
 msgid "_Sender"
 msgstr "_Sendanto"
 
@@ -1905,19 +1975,19 @@ msgstr "Malalta"
 msgid "_Lowest"
 msgstr "Plej ma_lalta"
 
-#: ../src/compose.c:723 ../src/mainwindow.c:865 ../src/messageview.c:352
+#: ../src/compose.c:723 ../src/mainwindow.c:868 ../src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Aŭtomata"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:724 ../src/mainwindow.c:866 ../src/messageview.c:353
+#: ../src/compose.c:724 ../src/mainwindow.c:869 ../src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bita ASKIO (US-ASK_IO)"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:725 ../src/mainwindow.c:867 ../src/messageview.c:354
+#: ../src/compose.c:725 ../src/mainwindow.c:870 ../src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unikodo (_UTF-8)"
 
@@ -1929,7 +1999,7 @@ msgstr "Unikodo (_UTF-8)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:729 ../src/mainwindow.c:871 ../src/messageview.c:358
+#: ../src/compose.c:729 ../src/mainwindow.c:874 ../src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centra Eŭropa (ISO-8859-_2)"
 
@@ -1939,7 +2009,7 @@ msgstr "Centra Eŭropa (ISO-8859-_2)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:732 ../src/mainwindow.c:874 ../src/messageview.c:361
+#: ../src/compose.c:732 ../src/mainwindow.c:877 ../src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Greka (ISO-8859-_7)"
 
@@ -1953,7 +2023,7 @@ msgstr "Greka (ISO-8859-_7)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:737 ../src/mainwindow.c:879 ../src/messageview.c:366
+#: ../src/compose.c:737 ../src/mainwindow.c:882 ../src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turka (ISO-8850-_9)"
 
@@ -1975,30 +2045,22 @@ msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Ne povas respondi. La origina retpoŝto probable ne ekzistas."
 
 #: ../src/compose.c:1626 ../src/quote_fmt.c:586
-msgid ""
-"The \"From\" field of the \"Reply\" template contains an invalid email "
-"address."
-msgstr ""
-"La \"De\" kampo de la \"Respondi\" ŝablono enhavas nevalidan retpoŝtan "
-"adreson."
+msgid "The \"From\" field of the \"Reply\" template contains an invalid email address."
+msgstr "La \"De\" kampo de la \"Respondu\" ŝablono enhavas nevalidan retpoŝtan adreson."
 
 #: ../src/compose.c:1674 ../src/quote_fmt.c:589
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
-msgstr "La korpo de la \"Respondi\" ŝablono havas eraron ĉe linio %d."
+msgstr "La korpo de la \"Respondu\" ŝablono havas eraron ĉe linio %d."
 
 #: ../src/compose.c:1810 ../src/compose.c:2002 ../src/quote_fmt.c:606
-msgid ""
-"The \"From\" field of the \"Forward\" template contains an invalid email "
-"address."
-msgstr ""
-"La \"De\" kampo de la \"Plusendi\" ŝablono enhavas nevalidan retpoŝtan "
-"adreson."
+msgid "The \"From\" field of the \"Forward\" template contains an invalid email address."
+msgstr "La \"De\" kampo de la \"Plusendu\" ŝablono enhavas nevalidan retpoŝtan adreson."
 
 #: ../src/compose.c:1870 ../src/quote_fmt.c:609
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
-msgstr "La korpo de la \"Plusendi\" ŝablono havas eraron ĉe linio %d."
+msgstr "La korpo de la \"Plusendu\" ŝablono havas eraron ĉe linio %d."
 
 #: ../src/compose.c:2044
 msgid "Fw: multiple emails"
@@ -2007,35 +2069,35 @@ msgstr "Plu: multaj retpoŝtoj"
 #: ../src/compose.c:2524
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
-msgstr "La korpo de la \"Redirekti\" ŝablono havas eraron ĉe linio %d."
+msgstr "La korpo de la \"Redirektu\" ŝablono havas eraron ĉe linio %d."
 
-#: ../src/compose.c:2591 ../src/gtk/headers.h:13
+#: ../src/compose.c:2591 ../src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kk:"
 
-#: ../src/compose.c:2594 ../src/gtk/headers.h:14
+#: ../src/compose.c:2594 ../src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bkk"
 
-#: ../src/compose.c:2597 ../src/gtk/headers.h:11
+#: ../src/compose.c:2597 ../src/gtk/headers.h:12
 msgid "Reply-To:"
-msgstr "Respondi-Al:"
+msgstr "Respondu-Al:"
 
 #: ../src/compose.c:2600 ../src/compose.c:4911 ../src/compose.c:4913
-#: ../src/gtk/headers.h:32
+#: ../src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Novaĵgrupoj:"
 
-#: ../src/compose.c:2603 ../src/gtk/headers.h:33
+#: ../src/compose.c:2603 ../src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Sekve-Al:"
 
-#: ../src/compose.c:2606 ../src/gtk/headers.h:16
+#: ../src/compose.c:2606 ../src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Responde-Al"
 
 #: ../src/compose.c:2610 ../src/compose.c:4908 ../src/compose.c:4916
-#: ../src/gtk/headers.h:12 ../src/summary_search.c:433
+#: ../src/gtk/headers.h:13 ../src/summary_search.c:433
 msgid "To:"
 msgstr "Al:"
 
@@ -2069,20 +2131,16 @@ msgstr "Ne povis havigi grandon de dosiero `%s'."
 
 #: ../src/compose.c:3599
 #, c-format
-msgid ""
-"You are about to insert a file of %s in the message body. Are you sure you "
-"want to do that?"
-msgstr ""
-"Vi estas enmetonta dosieron de %s en la mesaĝan korpon. Ĉu vi certas ke vi "
-"volas fari tion?"
+msgid "You are about to insert a file of %s in the message body. Are you sure you want to do that?"
+msgstr "Vi estas enmetonta dosieron de %s en la mesaĝan korpon. Ĉu vi certas ke vi volas fari tion?"
 
 #: ../src/compose.c:3602
 msgid "Are you sure?"
 msgstr "Ĉu vi estas certa?"
 
-#: ../src/compose.c:3603 ../src/compose.c:11144
+#: ../src/compose.c:3603 ../src/compose.c:11152
 msgid "+_Insert"
-msgstr "+Enmet_i"
+msgstr "+Enmet_u"
 
 #: ../src/compose.c:3717
 #, c-format
@@ -2095,7 +2153,7 @@ msgstr "Malplena dosiero"
 
 #: ../src/compose.c:3719
 msgid "+_Attach anyway"
-msgstr "+_Alglui ĉiukaze"
+msgstr "+_Alglui malgraŭe"
 
 #: ../src/compose.c:3728
 #, c-format
@@ -2107,27 +2165,27 @@ msgstr "Ne povas legi %s."
 msgid "Message: %s"
 msgstr "Mesaĝo: %s"
 
-#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:432
+#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Redaktita]"
 
-#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:435
+#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
-msgstr "%s - Verki mesaĝon%s"
+msgstr "%s - Verku mesaĝon%s"
 
-#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:438
+#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
-msgstr "[neniu temo] - Verki mesaĝon%s"
+msgstr "[neniu temo] - Verku mesaĝon%s"
 
 #. If the modified state changed, rewrite window title.
 #. * This partly duplicates functionality in compose.c::compose_set_title().
 #. * While it's nice to not have to modify Claws Mail for this to work,
 #. * it would be cleaner to export that function in Claws Mail.
-#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:426
+#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
-msgstr "Verki mesaĝon"
+msgstr "Verku mesaĝon"
 
 #: ../src/compose.c:4787 ../src/messageview.c:888
 msgid ""
@@ -2141,20 +2199,20 @@ msgstr ""
 #: ../src/plugins/attachwarner/attachwarner.c:219 ../src/prefs_account.c:3270
 #: ../src/toolbar.c:406 ../src/toolbar.c:424
 msgid "Send"
-msgstr "Sendi"
+msgstr "Sendu"
 
 #: ../src/compose.c:5008
 msgid "The only recipient is the default CC address. Send anyway?"
-msgstr "La nura ricevonto estas la defaŭlta KK adreso. Ĉu sendi malgraŭe?"
+msgstr "La nura ricevonto estas la defaŭlta KK adreso. Ĉu sendu malgraŭe?"
 
 #: ../src/compose.c:5009 ../src/compose.c:5041 ../src/compose.c:5074
 #: ../src/compose.c:5597 ../src/plugins/attachwarner/attachwarner.c:211
 msgid "+_Send"
-msgstr "+_Sendi"
+msgstr "+_Sendu"
 
 #: ../src/compose.c:5040
 msgid "The only recipient is the default BCC address. Send anyway?"
-msgstr "La nura ricevonto estas la defaŭlta BKK adreso. Ĉu sendi malgraŭe?"
+msgstr "La nura ricevonto estas la defaŭlta BKK adreso. Ĉu sendu malgraŭe?"
 
 #: ../src/compose.c:5057
 msgid "Recipient is not specified."
@@ -2171,17 +2229,17 @@ msgstr "Temo estas malplena. %s"
 
 #: ../src/compose.c:5078
 msgid "Send it anyway?"
-msgstr "Ĉu sendi ĝin malgraŭe?"
+msgstr "Ĉu sendu ĝin malgraŭe?"
 
 #: ../src/compose.c:5079
 msgid "Queue it anyway?"
-msgstr "Ĉu vicigi ĝin malgraŭe?"
+msgstr "Ĉu vicigu ĝin malgraŭe?"
 
 #: ../src/compose.c:5081 ../src/toolbar.c:425
 msgid "Send later"
-msgstr "Sendi poste"
+msgstr "Sendu poste"
 
-#: ../src/compose.c:5134 ../src/compose.c:9719
+#: ../src/compose.c:5134 ../src/compose.c:9750
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2191,7 +2249,7 @@ msgstr ""
 "\n"
 "Signara konverto fiaskis."
 
-#: ../src/compose.c:5137 ../src/compose.c:9722
+#: ../src/compose.c:5137 ../src/compose.c:9753
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2201,7 +2259,7 @@ msgstr ""
 "\n"
 "Ne povis havigi ricevontan enĉifrigan ŝlosilon."
 
-#: ../src/compose.c:5143 ../src/compose.c:9716
+#: ../src/compose.c:5143 ../src/compose.c:9747
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2233,7 +2291,7 @@ msgid ""
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "La mesaĝo estis vicigita sed ne povis sendi ĝin.\n"
-"Uzi \"Sendi vicigitajn mesaĝojn\" de la ĉefa fenestro por reprovi."
+"Uzu \"Sendu vicigitajn mesaĝojn\" de la ĉefa fenestro por reprovi."
 
 #: ../src/compose.c:5219
 #, c-format
@@ -2242,7 +2300,7 @@ msgid ""
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "%s\n"
-"Uzi \"Sendi vicigitajn mesaĝojn\" de la ĉefa fenestro por reprovi."
+"Uzu \"Sendu vicigitajn mesaĝojn\" de la ĉefa fenestro por reprovi."
 
 #: ../src/compose.c:5594
 #, c-format
@@ -2253,7 +2311,7 @@ msgid ""
 msgstr ""
 "Ne povas konverti la kodoprezenton de la mesaĝo \n"
 "al la specifita %s signaro.\n"
-"Ĉu sendi ĝin kiel %s?"
+"Ĉu sendu ĝin kiel %s?"
 
 #: ../src/compose.c:5652
 #, c-format
@@ -2266,7 +2324,7 @@ msgstr ""
 "Linio %d superas la linilongan limon (998 bitokoj).\n"
 "La enhavo de la mesaĝo povus esti rompita dum la liverado.\n"
 "\n"
-"Ĉu sendi ĝin malgraŭe?"
+"Ĉu sendu ĝin malgraŭe?"
 
 #: ../src/compose.c:5836
 msgid "Encryption warning"
@@ -2274,7 +2332,7 @@ msgstr "Enĉifra averto"
 
 #: ../src/compose.c:5837
 msgid "+C_ontinue"
-msgstr "+Daŭrigi"
+msgstr "+Daŭrigu"
 
 #: ../src/compose.c:5886
 msgid "No account for sending mails available!"
@@ -2287,16 +2345,16 @@ msgstr "Elektita konto ne estas NNTP: Poŝtado ne eblas."
 #: ../src/compose.c:6132
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
-msgstr "Algluaĵo %s ne ekzistas plu. Ĉu ignori?"
+msgstr "Algluaĵo %s ne ekzistas plu. Ĉu ignoru?"
 
-#: ../src/compose.c:6133 ../src/mainwindow.c:648 ../src/toolbar.c:231
+#: ../src/compose.c:6133 ../src/mainwindow.c:650 ../src/toolbar.c:231
 #: ../src/toolbar.c:2167
 msgid "Cancel sending"
-msgstr "Nuligi sendi"
+msgstr "Nuligu sendi"
 
 #: ../src/compose.c:6133
 msgid "Ignore attachment"
-msgstr "Ignori algluaĵon"
+msgstr "Ignoru algluaĵon"
 
 #: ../src/compose.c:6173
 #, c-format
@@ -2305,62 +2363,61 @@ msgstr "Origina %s parto"
 
 #: ../src/compose.c:6755
 msgid "Add to address _book"
-msgstr "Aldoni al adreslibro"
+msgstr "Aldonu al adreslibro"
 
-#: ../src/compose.c:6908
+#: ../src/compose.c:6912
 msgid "Delete entry contents"
-msgstr "Forigi eran enhavon"
+msgstr "Forigu eran enhavon"
 
-#: ../src/compose.c:6912 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: ../src/compose.c:6916 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
-msgstr "Uzi na <tabo> por aŭtomate kompletigi de adreslibro"
+msgstr "Uzu na <tabo> por aŭtomate kompletigi de adreslibro"
 
-#: ../src/compose.c:7132
+#: ../src/compose.c:7136
 msgid "Mime type"
 msgstr "Mime tipo"
 
 #. S_COL_DATE
-#: ../src/compose.c:7138 ../src/mimeview.c:274
-#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:627
+#: ../src/compose.c:7142 ../src/mimeview.c:274
+#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:630
 #: ../src/prefs_summary_column.c:85 ../src/summaryview.c:445
 msgid "Size"
 msgstr "Grando"
 
 #. Save Message to folder
-#: ../src/compose.c:7201
+#: ../src/compose.c:7205
 msgid "Save Message to "
-msgstr "Konservi mesaĝon al "
+msgstr "Konservu mesaĝon al "
 
-#: ../src/compose.c:7238 ../src/editjpilot.c:276 ../src/editldap.c:520
+#: ../src/compose.c:7242 ../src/editjpilot.c:276 ../src/editldap.c:520
 #: ../src/editvcard.c:192 ../src/export.c:164 ../src/import.c:163
 #: ../src/importmutt.c:239 ../src/importpine.c:238
-#: ../src/plugins/archive/archiver_gtk.c:1028
+#: ../src/plugins/archive/archiver_gtk.c:1029
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:188
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:208
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:181
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:297
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:418
 msgid "_Browse"
-msgstr "Foliumi"
+msgstr "Foliumu"
 
-#: ../src/compose.c:7710
+#: ../src/compose.c:7714
 msgid "Hea_der"
 msgstr "Ĉapo"
 
-#: ../src/compose.c:7715
+#: ../src/compose.c:7719
 msgid "_Attachments"
 msgstr "_Algluaĵoj"
 
-#: ../src/compose.c:7729
+#: ../src/compose.c:7733
 msgid "Othe_rs"
 msgstr "Aliaj"
 
-#: ../src/compose.c:7744 ../src/gtk/headers.h:18
-#: ../src/plugins/pdf_viewer/poppler_viewer.c:702 ../src/summary_search.c:440
-msgid "Subject:"
-msgstr "Temo:"
+#: ../src/compose.c:7748
+msgid "_Subject:"
+msgstr "_Temo:"
 
-#: ../src/compose.c:7966
+#: ../src/compose.c:7970
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2369,86 +2426,86 @@ msgstr ""
 "Ne povis starti literumilon.\n"
 "%s"
 
-#: ../src/compose.c:8072
+#: ../src/compose.c:8076
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "De: <i>%s</i>"
 
-#: ../src/compose.c:8106
+#: ../src/compose.c:8119
 msgid "Account to use for this email"
 msgstr "Konto uzenda por ĉi tiu retpoŝto"
 
-#: ../src/compose.c:8108
+#: ../src/compose.c:8121
 msgid "Sender address to be used"
 msgstr "Sendanta adreso uzenda"
 
-#: ../src/compose.c:8272
+#: ../src/compose.c:8285
 #, c-format
-msgid ""
-"The privacy system '%s' cannot be loaded. You will not be able to sign or "
-"encrypt this message."
-msgstr ""
-"La privateca sistemo `%s' ne povas esti ŝargita. Vi ne povos subskribi aŭ "
-"enĉifri ĉi tiun mesaĝon."
+msgid "The privacy system '%s' cannot be loaded. You will not be able to sign or encrypt this message."
+msgstr "La privateca sistemo `%s' ne povas esti ŝargita. Vi ne povos subskribi aŭ enĉifri ĉi tiun mesaĝon."
 
-#: ../src/compose.c:8372 ../src/plugins/archive/archiver_gtk.c:1082
+#: ../src/compose.c:8385 ../src/plugins/archive/archiver_gtk.c:1083
 msgid "_None"
 msgstr "_Neniu"
 
-#: ../src/compose.c:8473 ../src/prefs_template.c:753
+#: ../src/compose.c:8486 ../src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "La korpo de la ŝablono havas eraron ĉe linio %d."
 
-#: ../src/compose.c:8589
+#: ../src/compose.c:8602
 msgid "Template From format error."
 msgstr "Ŝablona De aranĝa eraro."
 
-#: ../src/compose.c:8607
+#: ../src/compose.c:8620
 msgid "Template To format error."
 msgstr "Ŝablona Al aranĝa eraro."
 
-#: ../src/compose.c:8625
+#: ../src/compose.c:8638
 msgid "Template Cc format error."
 msgstr "Ŝablona Kk aranĝa eraro"
 
-#: ../src/compose.c:8643
+#: ../src/compose.c:8656
 msgid "Template Bcc format error."
 msgstr "Ŝablona Bkk aranĝa eraro."
 
-#: ../src/compose.c:8662
+#: ../src/compose.c:8674
+msgid "Template Reply-To format error."
+msgstr "Ŝablona Responda aranĝa eraro."
+
+#: ../src/compose.c:8693
 msgid "Template subject format error."
 msgstr "Ŝablona tema aranĝa eraro."
 
-#: ../src/compose.c:8930
+#: ../src/compose.c:8961
 msgid "Invalid MIME type."
 msgstr "Nevalida MIME tipo."
 
-#: ../src/compose.c:8945
+#: ../src/compose.c:8976
 msgid "File doesn't exist or is empty."
 msgstr "Dosiero ne ekzistas aŭ estas malplena."
 
-#: ../src/compose.c:9019
+#: ../src/compose.c:9050
 msgid "Properties"
 msgstr "Ecoj"
 
-#: ../src/compose.c:9036
+#: ../src/compose.c:9067
 msgid "MIME type"
 msgstr "MIME tipo"
 
-#: ../src/compose.c:9077
+#: ../src/compose.c:9108
 msgid "Encoding"
 msgstr "Kodoprezento"
 
-#: ../src/compose.c:9097
+#: ../src/compose.c:9128
 msgid "Path"
 msgstr "Vojo"
 
-#: ../src/compose.c:9098
+#: ../src/compose.c:9129
 msgid "File name"
 msgstr "Dosiernomo"
 
-#: ../src/compose.c:9290
+#: ../src/compose.c:9321
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2456,18 +2513,18 @@ msgid ""
 "process group id: %d"
 msgstr ""
 "La ekstera redaktilo ankoraŭ funkcias.\n"
-"Ĉu devigi ĉeson de la procezo?\n"
+"Ĉu devigu ĉeson de la procezo?\n"
 "proceza grupa identigilo: %d"
 
-#: ../src/compose.c:9685 ../src/messageview.c:1095
+#: ../src/compose.c:9716 ../src/messageview.c:1095
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail bezonas retan atingon por sendi ĉi tiun retpoŝton."
 
-#: ../src/compose.c:9711
+#: ../src/compose.c:9742
 msgid "Could not queue message."
 msgstr "Ne povis vicigi mesaĝon."
 
-#: ../src/compose.c:9713
+#: ../src/compose.c:9744
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2478,15 +2535,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../src/compose.c:9891
+#: ../src/compose.c:9922
 msgid "Could not save draft."
 msgstr "Ne povis konservi provaĵon."
 
-#: ../src/compose.c:9895
+#: ../src/compose.c:9926
 msgid "Could not save draft"
-msgstr "Ne povis konservi provaĵon."
+msgstr "Ne povis konservi provaĵon"
 
-#: ../src/compose.c:9896
+#: ../src/compose.c:9927
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2494,24 +2551,24 @@ msgstr ""
 "Ne povis konservi provaĵon.\n"
 "Ĉu vi volas nuligi eliron aŭ ne konservi ĉi tiun retpoŝton?"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Cancel exit"
-msgstr "Nuligi eliron"
+msgstr "Nuligu eliron"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Discard email"
-msgstr "Ne konservi retpoŝton"
+msgstr "Ne konservu retpoŝton"
 
-#: ../src/compose.c:10058 ../src/compose.c:10072
+#: ../src/compose.c:10089 ../src/compose.c:10103
 msgid "Select file"
-msgstr "Elekti dosieron"
+msgstr "Elektu dosieron"
 
-#: ../src/compose.c:10086
+#: ../src/compose.c:10117
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Dosiero `%s' ne legeblis."
 
-#: ../src/compose.c:10088
+#: ../src/compose.c:10119
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2520,87 +2577,79 @@ msgstr ""
 "Dosiero `%s' enhavis nevalidajn signojn\n"
 "por la nuna kodoprezento, enmeto povus esti malkorekta."
 
-#: ../src/compose.c:10175
+#: ../src/compose.c:10206
 msgid "Discard message"
-msgstr "Ne konservi mesaĝon"
+msgstr "Ne konservu mesaĝon"
 
-#: ../src/compose.c:10176
+#: ../src/compose.c:10207
 msgid "This message has been modified. Discard it?"
-msgstr "Ĉi tiu mesaĝo estis modifita. Ĉu ne konservi ĝin?"
+msgstr "Ĉi tiu mesaĝo estis modifita. Ĉu ne konservu ĝin?"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Discard"
-msgstr "Ne konservi"
+msgstr "Ne konservu"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Save to Drafts"
-msgstr "Kon_servi al Provaĵoj"
+msgstr "Kon_servu al Provaĵoj"
 
-#: ../src/compose.c:10179
+#: ../src/compose.c:10210
 msgid "Save changes"
-msgstr "Konservi ŝanĝojn"
+msgstr "Konservu ŝanĝojn"
 
-#: ../src/compose.c:10180
+#: ../src/compose.c:10211
 msgid "This message has been modified. Save the latest changes?"
-msgstr "Ĉi tiu mesaĝo estis modifita. Ĉu konservi la plej lastajn ŝanĝojn?"
+msgstr "Ĉi tiu mesaĝo estis modifita. Ĉu konservu la plej lastajn ŝanĝojn?"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "_Don't save"
-msgstr "Ne konservi"
+msgstr "Ne konservu"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "+_Save to Drafts"
-msgstr "+Kon_servi al Provaĵoj"
+msgstr "+Kon_servu al Provaĵoj"
 
-#: ../src/compose.c:10251
+#: ../src/compose.c:10282
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Ĉu vi volas apliki la ŝablonon `%s'?"
 
-#: ../src/compose.c:10253
+#: ../src/compose.c:10284
 msgid "Apply template"
-msgstr "Apliki ŝablonon"
+msgstr "Apliku ŝablonon"
 
-#: ../src/compose.c:10254 ../src/prefs_actions.c:329
+#: ../src/compose.c:10285 ../src/prefs_actions.c:329
 #: ../src/prefs_filtering_action.c:610 ../src/prefs_filtering.c:477
-#: ../src/prefs_matcher.c:772 ../src/prefs_template.c:309
+#: ../src/prefs_matcher.c:775 ../src/prefs_template.c:311
 #: ../src/prefs_toolbar.c:1050
 msgid "_Replace"
-msgstr "Anstataŭigi"
+msgstr "Anstataŭigu"
 
-#: ../src/compose.c:10254
+#: ../src/compose.c:10285
 msgid "_Insert"
-msgstr "Enmet_i"
+msgstr "Enmet_u"
 
-#: ../src/compose.c:11141
+#: ../src/compose.c:11149
 msgid "Insert or attach?"
-msgstr "Ĉu enmeti aŭ alglui?"
+msgstr "Ĉu enmetu aŭ algluu?"
 
-#: ../src/compose.c:11142
-msgid ""
-"Do you want to insert the contents of the file(s) into the message body, or "
-"attach it to the email?"
-msgstr ""
-"Ĉu vi volas enmeti la enhavon de la dosiero(j) en la mesaĝan korpon, aŭ "
-"alglui ĝin al la retpoŝto?"
+#: ../src/compose.c:11150
+msgid "Do you want to insert the contents of the file(s) into the message body, or attach it to the email?"
+msgstr "Ĉu vi volas enmeti la enhavon de la dosiero(j) en la mesaĝan korpon, aŭ alglui ĝin al la retpoŝto?"
 
-#: ../src/compose.c:11144
+#: ../src/compose.c:11152
 msgid "_Attach"
-msgstr "_Alglui"
+msgstr "_Algluu"
 
-#: ../src/compose.c:11361
+#: ../src/compose.c:11369
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Cita aranĝa eraro ĉe linio %d."
 
-#: ../src/compose.c:11656
+#: ../src/compose.c:11664
 #, c-format
-msgid ""
-"You are about to reply to %d messages. Opening the windows could take some "
-"time. Do you want to continue?"
-msgstr ""
-"Vi estas respondonta al %d mesaĝoj. Malfermi la fenestrojn povus okazi dum "
-"iom da tempo. Ĉu vi volas daŭrigi?"
+msgid "You are about to reply to %d messages. Opening the windows could take some time. Do you want to continue?"
+msgstr "Vi estas respondonta al %d mesaĝoj. Malfermi la fenestrojn povus okazi dum iom da tempo. Ĉu vi volas daŭrigi?"
 
 #: ../src/crash.c:141
 #, c-format
@@ -2618,7 +2667,7 @@ msgid ""
 "Please file a bug report and include the information below."
 msgstr ""
 "%s.\n"
-"Bonvolu deponi misan raporton kaj inkluzivi la suban informon."
+"Bonvolu deponi misan raporton kaj inkluzivu la suban informon."
 
 #: ../src/crash.c:208
 msgid "Debug log"
@@ -2626,23 +2675,23 @@ msgstr "Senmisiga protokolo"
 
 #: ../src/crash.c:252 ../src/toolbar.c:422
 msgid "Close"
-msgstr "Fermi"
+msgstr "Fermu"
 
 #: ../src/crash.c:257
 msgid "Save..."
-msgstr "Konservi..."
+msgstr "Konservu..."
 
 #: ../src/crash.c:262
 msgid "Create bug report"
-msgstr "Krei misan raporton"
+msgstr "Kreu misan raporton"
 
 #: ../src/crash.c:312
 msgid "Save crash information"
-msgstr "Konservi fiaskan informon"
+msgstr "Konservu fiaskan informon"
 
 #: ../src/editaddress.c:156 ../src/editaddress.c:232
 msgid "Add New Person"
-msgstr "Aldoni novan homon"
+msgstr "Aldonu novan homon"
 
 #: ../src/editaddress.c:158
 msgid ""
@@ -2668,7 +2717,7 @@ msgstr ""
 " - Iu ajn aldona eco\n"
 "\n"
 "Alklaku Bone por daŭre redakti ĉi tiun kontakton.\n"
-"Alklaku Nuligi por fermi sen konservi."
+"Alklaku Nuligu por fermi sen konservi."
 
 #: ../src/editaddress.c:169
 msgid ""
@@ -2690,11 +2739,11 @@ msgstr ""
 " - Iu ajn aldona eco\n"
 "\n"
 "Alklaku Bone por daŭre redakti ĉi tiun kontakton.\n"
-"Alklaku Nuligi por fermi sen konservi."
+"Alklaku Nuligu por fermi sen konservi."
 
 #: ../src/editaddress.c:233
 msgid "Edit Person Details"
-msgstr "Redakti homajn detalojn"
+msgstr "Redaktu homajn detalojn"
 
 #: ../src/editaddress.c:411
 msgid "An Email address must be supplied."
@@ -2706,20 +2755,20 @@ msgstr "Nomo kaj valoro provizendas."
 
 #: ../src/editaddress.c:676
 msgid "Discard"
-msgstr "Ne konservi"
+msgstr "Ne konservu"
 
 #: ../src/editaddress.c:677
 msgid "Apply"
-msgstr "Apliki"
+msgstr "Apliku"
 
 #. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
 #: ../src/editaddress.c:707 ../src/editaddress.c:756
 msgid "Edit Person Data"
-msgstr "Redakti homajn datumojn"
+msgstr "Redaktu homajn datumojn"
 
 #: ../src/editaddress.c:785
 msgid "Choose a picture"
-msgstr "Elekti bildon"
+msgstr "Elektu bildon"
 
 #: ../src/editaddress.c:804
 #, c-format
@@ -2732,11 +2781,11 @@ msgstr ""
 
 #: ../src/editaddress.c:846
 msgid "_Set picture"
-msgstr "_Starigi bildon"
+msgstr "_Starigu bildon"
 
 #: ../src/editaddress.c:847
 msgid "_Unset picture"
-msgstr "Malstarigi bildon"
+msgstr "Malstarigu bildon"
 
 #: ../src/editaddress.c:905
 msgid "Photo"
@@ -2745,7 +2794,7 @@ msgstr "Fotografo"
 #: ../src/editaddress.c:952 ../src/editaddress.c:954 ../src/expldifdlg.c:516
 #: ../src/exporthtml.c:761 ../src/ldif.c:764
 msgid "Display Name"
-msgstr "Montri nomon"
+msgstr "Montru nomon"
 
 #: ../src/editaddress.c:961 ../src/editaddress.c:965 ../src/ldif.c:772
 msgid "Last Name"
@@ -2796,11 +2845,11 @@ msgstr "Ne povis legi dosieron."
 
 #: ../src/editbook.c:149 ../src/editbook.c:262
 msgid "Edit Addressbook"
-msgstr "Redakti adreslibron"
+msgstr "Redaktu adreslibron"
 
 #: ../src/editbook.c:177 ../src/editjpilot.c:264 ../src/editvcard.c:180
 msgid " Check File "
-msgstr " Kontroli dosieron"
+msgstr " Kontrolu dosieron"
 
 #: ../src/editbook.c:182 ../src/editjpilot.c:269 ../src/editvcard.c:185
 #: ../src/importmutt.c:232 ../src/importpine.c:231 ../src/prefs_account.c:1959
@@ -2810,7 +2859,7 @@ msgstr "Dosiero"
 
 #: ../src/editbook.c:281
 msgid "Add New Addressbook"
-msgstr "Aldoni novan adreslibron"
+msgstr "Aldonu novan adreslibron"
 
 #: ../src/editgroup.c:101
 msgid "A Group Name must be supplied."
@@ -2818,7 +2867,7 @@ msgstr "Grupa nomo provizendas."
 
 #: ../src/editgroup.c:294
 msgid "Edit Group Data"
-msgstr "Redakti grupajn datumojn"
+msgstr "Redaktu grupajn datumojn"
 
 #: ../src/editgroup.c:323 ../src/exporthtml.c:597
 msgid "Group Name"
@@ -2834,33 +2883,33 @@ msgstr "Disponeblaj adresoj"
 
 #: ../src/editgroup.c:452
 msgid "Move Email Addresses to or from Group with arrow buttons"
-msgstr "Movi retpoŝtajn adresojn al aŭ de grupo kun sagetbutonoj"
+msgstr "Movu retpoŝtajn adresojn al aŭ de grupo kun sagetbutonoj"
 
 #: ../src/editgroup.c:500
 msgid "Edit Group Details"
-msgstr "Redakti grupajn datumojn"
+msgstr "Redaktu grupajn datumojn"
 
 #: ../src/editgroup.c:503
 msgid "Add New Group"
-msgstr "Aldoni novan grupon"
+msgstr "Aldonu novan grupon"
 
 #: ../src/editgroup.c:553
 msgid "Edit folder"
-msgstr "Redakti dosierujon"
+msgstr "Redaktu dosierujon"
 
 #: ../src/editgroup.c:553
 msgid "Input the new name of folder:"
 msgstr "Enigu la novan nomon de dosierujo:"
 
-#: ../src/editgroup.c:556 ../src/foldersel.c:581 ../src/imap_gtk.c:195
+#: ../src/editgroup.c:556 ../src/foldersel.c:585 ../src/imap_gtk.c:195
 #: ../src/mh_gtk.c:145 ../src/plugins/mailmbox/plugin_gtk.c:239
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:89
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "New folder"
 msgstr "Nova dosierujo"
 
-#: ../src/editgroup.c:557 ../src/foldersel.c:582 ../src/mh_gtk.c:146
+#: ../src/editgroup.c:557 ../src/foldersel.c:586 ../src/mh_gtk.c:146
 #: ../src/plugins/mailmbox/plugin_gtk.c:240
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:90
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Input the name of new folder:"
 msgstr "Enigu la nomon de nova dosierujo:"
 
@@ -2870,11 +2919,11 @@ msgstr "Dosiero ne ŝajnas esti JPilota aranĝo."
 
 #: ../src/editjpilot.c:200
 msgid "Select JPilot File"
-msgstr "Elekti JPilotan dosieron"
+msgstr "Elektu JPilotan dosieron"
 
 #: ../src/editjpilot.c:236 ../src/editjpilot.c:365
 msgid "Edit JPilot Entry"
-msgstr "Redakti JPilotan eron"
+msgstr "Redaktu JPilotan eron"
 
 #: ../src/editjpilot.c:281
 msgid "Additional e-Mail address item(s)"
@@ -2882,11 +2931,11 @@ msgstr "Plua(j) retpoŝta(j) adresa(j) ero(j)"
 
 #: ../src/editjpilot.c:372
 msgid "Add New JPilot Entry"
-msgstr "Aldoni novan JPilotan eron"
+msgstr "Aldonu novan JPilotan eron"
 
 #: ../src/editldap_basedn.c:138
 msgid "Edit LDAP - Select Search Base"
-msgstr "Redakti LDAP - Elekti serĉbazon"
+msgstr "Redaktu LDAP - Elektu serĉbazon"
 
 #: ../src/editldap_basedn.c:157 ../src/editldap.c:441
 msgid "Hostname"
@@ -2931,23 +2980,15 @@ msgstr "Konektis sukcese al servilo"
 
 #: ../src/editldap.c:336 ../src/editldap.c:976
 msgid "Edit LDAP Server"
-msgstr "Redakti LDAP servilon"
+msgstr "Redaktu LDAP servilon"
 
 #: ../src/editldap.c:437
 msgid "A name that you wish to call the server."
 msgstr "Nomo kiun vi volas uzi por la servilo."
 
 #: ../src/editldap.c:450
-msgid ""
-"This is the hostname of the server. For example, \"ldap.mydomain.com\" may "
-"be appropriate for the \"mydomain.com\" organization. An IP address may also "
-"be used. You may specify \"localhost\" if running an LDAP server on the same "
-"computer as Claws Mail."
-msgstr ""
-"Ĉi tio estas la gastnomo de la servilo. Ekzemple, \"ldap.miadomajno.com\" "
-"povas esti taŭga por la \"miadomajna.com\" organizo. Ankaŭ, IP adreso povas "
-"esti uzata. Vi povas specifi \"localhost\" se rulante LDAP servilon ĉe la "
-"sama komputilo kiel Claws Mail."
+msgid "This is the hostname of the server. For example, \"ldap.mydomain.com\" may be appropriate for the \"mydomain.com\" organization. An IP address may also be used. You may specify \"localhost\" if running an LDAP server on the same computer as Claws Mail."
+msgstr "Ĉi tio estas la gastnomo de la servilo. Ekzemple, \"ldap.miadomajno.com\" povas esti taŭga por la \"miadomajna.com\" organizo. Ankaŭ, IP adreso povas esti uzata. Vi povas specifi \"localhost\" se rulante LDAP servilon ĉe la sama komputilo kiel Claws Mail."
 
 #: ../src/editldap.c:470
 msgid "TLS"
@@ -2958,164 +2999,96 @@ msgid "SSL"
 msgstr "SSL"
 
 #: ../src/editldap.c:475
-msgid ""
-"Enable secure connection to the LDAP server via TLS. If connection fails, be "
-"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
-"TLS_REQCERT fields)."
-msgstr ""
-"Ebligi sekuran konekton al la LDAP servilo pere de TLS. Se konekto "
-"malsukcesas, kontrolu la korektan agordon en ldap.conf (TLS_CACERTDIR kaj "
-"TLS_REQCERT kampoj)."
+msgid "Enable secure connection to the LDAP server via TLS. If connection fails, be sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)."
+msgstr "Ebligu sekuran konekton al la LDAP servilo pere de TLS. Se konekto malsukcesas, kontrolu la korektan agordon en ldap.conf (TLS_CACERTDIR kaj TLS_REQCERT kampoj)."
 
 #: ../src/editldap.c:479
-msgid ""
-"Enable secure connection to the LDAP server via SSL. If connection fails, be "
-"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
-"TLS_REQCERT fields)."
-msgstr ""
-"Ebligi sekuran konekton al la LDAP servilo pere de SSL. Se la konekto "
-"malsukcesas, kontrolu la korektan agordon en ldap.conf (TLS_CACERTDIR kaj "
-"TLS_REQCERT kampoj)."
+msgid "Enable secure connection to the LDAP server via SSL. If connection fails, be sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)."
+msgstr "Ebligu sekuran konekton al la LDAP servilo pere de SSL. Se la konekto malsukcesas, kontrolu la korektan agordon en ldap.conf (TLS_CACERTDIR kaj TLS_REQCERT kampoj)."
 
 #: ../src/editldap.c:493
 msgid "The port number that the server listens on. Port 389 is the default."
-msgstr ""
-"La porda numero ĉe kiu la servilo aŭskultas. Pordo 389 estas la defaŭlto."
+msgstr "La porda numero ĉe kiu la servilo aŭskultas. Pordo 389 estas la defaŭlto."
 
 #: ../src/editldap.c:496
 msgid " Check Server "
-msgstr " Kontroli servilon "
+msgstr " Kontrolu servilon "
 
 #: ../src/editldap.c:500
 msgid "Press this button to test the connection to the server."
-msgstr "Premi ĉi tiun butonon por provi la konekton al la servilo."
+msgstr "Premu ĉi tiun butonon por provi la konekton al la servilo."
 
 #: ../src/editldap.c:513
 msgid ""
-"This specifies the name of the directory to be searched on the server. "
-"Examples include:\n"
+"This specifies the name of the directory to be searched on the server. Examples include:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
-"Ĉi tio specifas la nomon de la dosierujo serĉenda sur la servilo. Ekzemploj "
-"inkluzivas:\n"
+"Ĉi tio specifas la nomon de la dosierujo serĉenda sur la servilo. Ekzemploj inkluzivas:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=homoj,dc=domajn-nomo,dc=com\n"
 "  o=Organiza nomo,c=Lando\n"
 
 #: ../src/editldap.c:524
-msgid ""
-"Press this button to lookup the name of available directory names on the "
-"server."
-msgstr ""
-"Premu ĉi tiun butonon por serĉi la nomon de haveblaj dosierujaj nomoj sur la "
-"servilo."
+msgid "Press this button to lookup the name of available directory names on the server."
+msgstr "Premu ĉi tiun butonon por serĉi la nomon de haveblaj dosierujaj nomoj sur la servilo."
 
 #: ../src/editldap.c:580
 msgid "Search Attributes"
-msgstr "Serĉi ecojn"
+msgstr "Serĉu ecojn"
 
 #: ../src/editldap.c:589
-msgid ""
-"A list of LDAP attribute names that should be searched when attempting to "
-"find a name or address."
-msgstr ""
-"Listo da LDAP ecaj nomoj kiuj devus esti serĉataj kiam provante trovi aŭ "
-"nomon aŭ adreson."
+msgid "A list of LDAP attribute names that should be searched when attempting to find a name or address."
+msgstr "Listo da LDAP ecaj nomoj kiuj devus esti serĉataj kiam provante trovi aŭ nomon aŭ adreson."
 
 #: ../src/editldap.c:592
 msgid " Defaults "
 msgstr " Defaŭltoj "
 
 #: ../src/editldap.c:596
-msgid ""
-"This resets the attribute names to a default value that should find most "
-"names and addresses during a name or address search process."
-msgstr ""
-"Ĉi tio restarigas la ecajn nomojn al defaŭlta valoro kiu devus trovi plej "
-"multajn nomojn kaj adresojn dum noma aŭ adresa serĉa procezo."
+msgid "This resets the attribute names to a default value that should find most names and addresses during a name or address search process."
+msgstr "Ĉi tio restarigas la ecajn nomojn al defaŭlta valoro kiu devus trovi plej multajn nomojn kaj adresojn dum noma aŭ adresa serĉa procezo."
 
 #: ../src/editldap.c:602
 msgid "Max Query Age (secs)"
 msgstr "Maks. Demanda Aĝo (sek-oj)"
 
 #: ../src/editldap.c:617
-msgid ""
-"This defines the maximum period of time (in seconds) that an address search "
-"result is valid for address completion purposes. Search results are stored "
-"in a cache until this period of time has passed and then retired. This will "
-"improve the response time when attempting to search for the same name or "
-"address on subsequent address completion requests. The cache will be "
-"searched in preference to performing a new server search request. The "
-"default value of 600 seconds (10 minutes), should be sufficient for most "
-"servers. A larger value will reduce the search time for subsequent searches. "
-"This is useful for servers that have slow response times at the expense of "
-"more memory to cache results."
-msgstr ""
-"Ĉi tio difinas la maksimuman periodon (laŭ sekundoj) dum kiu adresa serĉo "
-"validas por adreskompletigaj celoj. Serĉaj rezultoj estas konservitaj en "
-"kaŝmemoro ĝis ĉi tiu periodo estas pasinta kaj tiam foririgitaj. Ĉi tio "
-"plibonigos la respondtempon kiam provi serĉi por la sama nomo aŭ adreso je "
-"sekvaj adreskompletigaj petoj. La kaŝmemoro estos serĉata anstataŭ fari "
-"novan servilan serĉpeton. La defaŭlta valoro de 600 sekunkoj (10 minutoj), "
-"devus sufiĉi por plej multaj serviloj. Pli granda valoro malpliigos la "
-"serĉtempon por sekvaj serĉoj. Ĉi tio utilas por serviloj kiuj havas "
-"malrapidan respondan tempon je la kosto de plia memoro por kaŝi rezultojn."
+msgid "This defines the maximum period of time (in seconds) that an address search result is valid for address completion purposes. Search results are stored in a cache until this period of time has passed and then retired. This will improve the response time when attempting to search for the same name or address on subsequent address completion requests. The cache will be searched in preference to performing a new server search request. The default value of 600 seconds (10 minutes), should be sufficient for most servers. A larger value will reduce the search time for subsequent searches. This is useful for servers that have slow response times at the expense of more memory to cache results."
+msgstr "Ĉi tio difinas la maksimuman periodon (laŭ sekundoj) dum kiu adresa serĉo validas por adreskompletigaj celoj. Serĉaj rezultoj estas konservitaj en kaŝmemoro ĝis ĉi tiu periodo estas pasinta kaj tiam foririgitaj. Ĉi tio plibonigos la respondtempon kiam provante serĉi por la sama nomo aŭ adreso je sekvaj adreskompletigaj petoj. La kaŝmemoro estos serĉata anstataŭ fari novan servilan serĉpeton. La defaŭlta valoro de 600 sekundoj (10 minutoj), devus sufiĉi por plej multaj serviloj. Pli granda valoro malpliigos la serĉtempon por sekvaj serĉoj. Ĉi tio utilas por serviloj kiuj havas malrapidan respondan tempon je la kosto de plia memoro por kaŝi rezultojn."
 
 #: ../src/editldap.c:634
 msgid "Include server in dynamic search"
-msgstr "Inkluzivi servilon en dinamika serĉo"
+msgstr "Inkluzivu servilon en dinamika serĉo"
 
 #: ../src/editldap.c:639
-msgid ""
-"Check this option to include this server for dynamic searches when using "
-"address completion."
-msgstr ""
-"Marki ĉi tiun opcion por inkluzivi ĉi tiun servilon por dinamikaj serĉoj "
-"kiam uzante adreskompletigon."
+msgid "Check this option to include this server for dynamic searches when using address completion."
+msgstr "Marku ĉi tiun opcion por inkluzivi ĉi tiun servilon por dinamikaj serĉoj kiam uzante adreskompletigon."
 
 #: ../src/editldap.c:645
 msgid "Match names 'containing' search term"
-msgstr "Kongrui nomojn 'enhavante' serĉterminon"
+msgstr "Kongruu nomojn 'enhavante' serĉterminon"
 
 #: ../src/editldap.c:650
-msgid ""
-"Searches for names and addresses can be performed either using \"begins-with"
-"\" or \"contains\" search term. Check this option to perform a \"contains\" "
-"search; this type of search usually takes longer to complete. Note that for "
-"performance reasons, address completion uses \"begins-with\" for all "
-"searches against other address interfaces."
-msgstr ""
-"Serĉoj por nomoj kaj adresoj povas esti farataj aŭ uzante \"komencas-kun\" "
-"aŭ \"enhavas\" serĉajn termojn. Marki ĉi tiun opcion por fari \"enhavas\" "
-"serĉon; ĉi tiu tipo de serĉo kutime daŭras pli longe por kompletiĝi. Notu ke "
-"pro rendimentaj kialoj, adreskompletigo uzas \"komencas-kun\" por ĉiuj "
-"serĉoj anstataŭ aliaj adres-interfacoj."
+msgid "Searches for names and addresses can be performed either using \"begins-with\" or \"contains\" search term. Check this option to perform a \"contains\" search; this type of search usually takes longer to complete. Note that for performance reasons, address completion uses \"begins-with\" for all searches against other address interfaces."
+msgstr "Serĉoj por nomoj kaj adresoj povas esti farataj aŭ uzante \"komencas-kun\" aŭ \"enhavas\" serĉajn termojn. Marku ĉi tiun opcion por fari \"enhavas\" serĉon; ĉi tiu tipo de serĉo kutime daŭras pli longe por kompletiĝi. Notu ke pro rendimentaj kialoj, adreskompletigo uzas \"komencas-kun\" por ĉiuj serĉoj anstataŭ aliaj adres-interfacoj."
 
 #: ../src/editldap.c:703
 msgid "Bind DN"
-msgstr "Bindi DN"
+msgstr "Bindu DN"
 
 #: ../src/editldap.c:712
-msgid ""
-"The LDAP user account name to be used to connect to the server. This is "
-"usually only used for protected servers. This name is typically formatted "
-"as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when "
-"performing a search."
-msgstr ""
-"La LDAP uzanta konta nomo uzenda por konekti al la servilo. Ĉi tio kutime "
-"estas uzata nur por protektitaj serviloj. Ĉi tiu nomo estas kutime aranĝita "
-"kiel: \"cn=uzanto,dc=claws-mail,dc=org\". Ĉi tio estas kutime lasita vaka "
-"kiam serĉante."
+msgid "The LDAP user account name to be used to connect to the server. This is usually only used for protected servers. This name is typically formatted as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when performing a search."
+msgstr "La LDAP uzanta konta nomo uzenda por konekti al la servilo. Ĉi tio kutime estas uzata nur por protektitaj serviloj. Ĉi tiu nomo estas kutime aranĝita kiel: \"cn=uzanto,dc=claws-mail,dc=org\". Ĉi tio estas kutime lasita vaka kiam serĉante."
 
 #: ../src/editldap.c:719
 msgid "Bind Password"
-msgstr "Bindi pasvorton"
+msgstr "Bindu pasvorton"
 
 #: ../src/editldap.c:729
 msgid "The password to be used when connecting as the \"Bind DN\" user."
-msgstr "La pasvorto uzenda kiam konekti kiel la \"Bind DN\" uzanto."
+msgstr "La pasvorto uzenda kiam konektante kiel la \"Bind DN\" uzanto."
 
 #: ../src/editldap.c:734
 msgid "Timeout (secs)"
@@ -3130,10 +3103,8 @@ msgid "Maximum Entries"
 msgstr "Maksimumaj enigoj"
 
 #: ../src/editldap.c:766
-msgid ""
-"The maximum number of entries that should be returned in the search result."
-msgstr ""
-"La maksimuma nombro da enigoj kiuj devus esti revenitaj en la serĉa rezulto."
+msgid "The maximum number of entries that should be returned in the search result."
+msgstr "La maksimuma nombro da enigoj kiuj devus esti revenitaj en la serĉa rezulto."
 
 #: ../src/editldap.c:781 ../src/prefs_account.c:3234
 msgid "Basic"
@@ -3141,7 +3112,7 @@ msgstr "Baza"
 
 #: ../src/editldap.c:782
 msgid "Search"
-msgstr "Serĉi"
+msgstr "Serĉu"
 
 #: ../src/editldap.c:783 ../src/gtk/quicksearch.c:680
 msgid "Extended"
@@ -3149,7 +3120,7 @@ msgstr "Etendita"
 
 #: ../src/editldap.c:981
 msgid "Add New LDAP Server"
-msgstr "Aldoni novan LDAP servilon"
+msgstr "Aldonu novan LDAP servilon"
 
 #: ../src/edittags.c:187 ../src/prefs_filtering_action.c:1446
 msgid "Tag"
@@ -3157,7 +3128,7 @@ msgstr "Etikedo"
 
 #: ../src/edittags.c:216
 msgid "Delete tag"
-msgstr "Forigi etikedon"
+msgstr "Forigu etikedon"
 
 #: ../src/edittags.c:217
 msgid "Do you really want to delete this tag?"
@@ -3165,7 +3136,7 @@ msgstr "Ĉu vi vere volas forigi ĉi tiun etikedon?"
 
 #: ../src/edittags.c:244
 msgid "Delete all tags"
-msgstr "Forigi ĉiujn etikedojn"
+msgstr "Forigu ĉiujn etikedojn"
 
 #: ../src/edittags.c:245
 msgid "Do you really want to delete all tags?"
@@ -3182,7 +3153,7 @@ msgstr "Etikedo ne estas starigita."
 #: ../src/edittags.c:523
 msgctxt "Dialog title"
 msgid "Apply tags"
-msgstr "Apliki etikedojn"
+msgstr "Apliku etikedojn"
 
 #: ../src/edittags.c:537
 msgid "New tag:"
@@ -3198,19 +3169,19 @@ msgstr "Dosiero ne ŝajnas havi vKartan aranĝon."
 
 #: ../src/editvcard.c:107
 msgid "Select vCard File"
-msgstr "Elekti vKartan dosieron"
+msgstr "Elektu vKartan dosieron"
 
 #: ../src/editvcard.c:152 ../src/editvcard.c:256
 msgid "Edit vCard Entry"
-msgstr "Redakti vKartan enigon"
+msgstr "Redaktu vKartan enigon"
 
 #: ../src/editvcard.c:261
 msgid "Add New vCard Entry"
-msgstr "Aldoni novan vKartan enigon"
+msgstr "Aldonu novan vKartan enigon"
 
 #: ../src/etpan/etpan-ssl.c:167
 msgid "Impossible to set the client certificate.\n"
-msgstr ""
+msgstr "Neeblas starigi la klientan ateston.\n"
 
 #: ../src/exphtmldlg.c:106
 msgid "Please specify output directory and file to create."
@@ -3218,7 +3189,7 @@ msgstr "Bonvolu specifi eligan dosierujon kaj dosieron por krei."
 
 #: ../src/exphtmldlg.c:109
 msgid "Select stylesheet and formatting."
-msgstr "Elekti stilfolion kaj aranĝon."
+msgstr "Elektu stilfolion kaj aranĝon."
 
 #: ../src/exphtmldlg.c:112 ../src/expldifdlg.c:114
 msgid "File exported successfully."
@@ -3230,12 +3201,12 @@ msgid ""
 "The HTML output directory '%s'\n"
 "does not exist. Do you want to create it?"
 msgstr ""
-"HTML eliga dosierujo `%s'\n"
-"ne ekzistas. Ĉu bone krei novan dosierujon?"
+"La HTML eliga dosierujo `%s'\n"
+"ne ekzistas. Ĉu vi volas krei ĝin?"
 
 #: ../src/exphtmldlg.c:180
 msgid "Create directory"
-msgstr "Krei dosierujon"
+msgstr "Kreu dosierujon"
 
 #: ../src/exphtmldlg.c:189
 #, c-format
@@ -3256,7 +3227,7 @@ msgstr "Eraro kreante HTML dosieron"
 
 #: ../src/exphtmldlg.c:319
 msgid "Select HTML output file"
-msgstr "Elekti HTML eligan dosieron"
+msgstr "Elektu HTML eligan dosieron"
 
 #: ../src/exphtmldlg.c:383
 msgid "HTML Output File"
@@ -3265,7 +3236,7 @@ msgstr "HTML eligan dosieron"
 #: ../src/exphtmldlg.c:392 ../src/expldifdlg.c:409 ../src/export.c:171
 #: ../src/import.c:170 ../src/importldif.c:685
 msgid "B_rowse"
-msgstr "Foliumi"
+msgstr "Foliumu"
 
 #: ../src/exphtmldlg.c:445
 msgid "Stylesheet"
@@ -3281,9 +3252,9 @@ msgstr "Stilfolio"
 #. * can always get back the SummaryView pointer.
 #: ../src/exphtmldlg.c:453 ../src/gtk/colorlabel.c:406
 #: ../src/gtk/gtkaspell.c:1571 ../src/gtk/gtkaspell.c:2231
-#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1174
+#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1177
 #: ../src/plugins/archive/archiver_prefs.c:241
-#: ../src/plugins/libravatar/libravatar_prefs.c:187 ../src/prefs_account.c:949
+#: ../src/plugins/libravatar/libravatar_prefs.c:206 ../src/prefs_account.c:949
 #: ../src/prefs_toolbar.c:780 ../src/prefs_toolbar.c:1465
 #: ../src/summaryview.c:6008
 msgid "None"
@@ -3295,7 +3266,7 @@ msgid "Default"
 msgstr "Defaŭlto"
 
 #: ../src/exphtmldlg.c:455 ../src/plugins/pgpcore/select-keys.c:244
-#: ../src/plugins/pgpcore/sgpgme.c:148
+#: ../src/plugins/pgpcore/sgpgme.c:148 ../src/plugins/pgpcore/sgpgme.c:164
 msgid "Full"
 msgstr "Plena"
 
@@ -3333,11 +3304,11 @@ msgstr "Kolorgrupigo"
 
 #: ../src/exphtmldlg.c:488
 msgid "Format Email Links"
-msgstr "Aranĝi retpoŝtajn ligilojn"
+msgstr "Aranĝu retpoŝtajn ligilojn"
 
 #: ../src/exphtmldlg.c:494
 msgid "Format User Attributes"
-msgstr "Aranĝi uzantajn ecojn"
+msgstr "Aranĝu uzantajn ecojn"
 
 #: ../src/exphtmldlg.c:539 ../src/expldifdlg.c:612 ../src/importldif.c:892
 msgid "Address Book :"
@@ -3349,11 +3320,11 @@ msgstr "Dosiernomo :"
 
 #: ../src/exphtmldlg.c:559
 msgid "Open with Web Browser"
-msgstr "Malfermi kun krozilo"
+msgstr "Malfermu kun krozilo"
 
 #: ../src/exphtmldlg.c:591
 msgid "Export Address Book to HTML File"
-msgstr "Eksporti adreslibron al HTML dosiero"
+msgstr "Eksportu adreslibron al HTML dosiero"
 
 #: ../src/exphtmldlg.c:656 ../src/expldifdlg.c:720 ../src/importldif.c:1021
 msgid "File Info"
@@ -3369,7 +3340,7 @@ msgstr "Bonvolu specifi eligan dosierujon kaj LDIF dosieron kreendajn."
 
 #: ../src/expldifdlg.c:111
 msgid "Specify parameters to format distinguished name."
-msgstr "Specifi parametrojn por aranĝi distingitan nomon."
+msgstr "Specifu parametrojn por aranĝi distingitan nomon."
 
 #: ../src/expldifdlg.c:187
 #, c-format
@@ -3378,11 +3349,11 @@ msgid ""
 "does not exist. OK to create new directory?"
 msgstr ""
 "LDIF eliga dosierujo `%s'\n"
-"ne ekzistas. Ĉu bone krei novan dosierujon?"
+"ne ekzistas. Ĉu bone kreu novan dosierujon?"
 
 #: ../src/expldifdlg.c:190
 msgid "Create Directory"
-msgstr "Krei dosierujon"
+msgstr "Kreu dosierujon"
 
 #: ../src/expldifdlg.c:199
 #, c-format
@@ -3398,12 +3369,8 @@ msgid "Suffix was not supplied"
 msgstr "Sufikso ne estis provizita"
 
 #: ../src/expldifdlg.c:243
-msgid ""
-"A suffix is required if data is to be used for an LDAP server. Are you sure "
-"you wish to proceed without a suffix?"
-msgstr ""
-"Sufikso estas bezonata se datumoj uzendas por LDAP servilo. Ĉu vi certas ke "
-"vi volas daŭrigi sen sufikso?"
+msgid "A suffix is required if data is to be used for an LDAP server. Are you sure you wish to proceed without a suffix?"
+msgstr "Sufikso estas bezonata se datumoj uzendas por LDAP servilo. Ĉu vi certas ke vi volas daŭrigi sen sufikso?"
 
 #: ../src/expldifdlg.c:261
 msgid "Error creating LDIF file"
@@ -3411,7 +3378,7 @@ msgstr "Eraro kreante LDIF dosieron"
 
 #: ../src/expldifdlg.c:336
 msgid "Select LDIF output file"
-msgstr "Elekti LDIF eligan dosieron"
+msgstr "Elektu LDIF eligan dosieron"
 
 #: ../src/expldifdlg.c:400
 msgid "LDIF Output File"
@@ -3419,18 +3386,15 @@ msgstr "LDIF eliga dosiero"
 
 #: ../src/expldifdlg.c:431
 msgid ""
-"The address book Unique ID is used to create a DN that is formatted similar "
-"to:\n"
+"The address book Unique ID is used to create a DN that is formatted similar to:\n"
 "  uid=102376,ou=people,dc=claws-mail,dc=org"
 msgstr ""
-"La adreslibra unika identigilo estas uzata krei DN kiu estas aranĝita simile "
-"al:\n"
+"La adreslibra unika identigilo estas uzata krei DN kiu estas aranĝita simile al:\n"
 "  uid=102376,ou=homoj,dc=claws-mail,dc=org"
 
 #: ../src/expldifdlg.c:437
 msgid ""
-"The address book Display Name is used to create a DN that is formatted "
-"similar to:\n"
+"The address book Display Name is used to create a DN that is formatted similar to:\n"
 "  cn=John Doe,ou=people,dc=claws-mail,dc=org"
 msgstr ""
 "La adreslibra montra nomo estas uzata krei DN kiu estas aranĝita simile al:\n"
@@ -3438,12 +3402,10 @@ msgstr ""
 
 #: ../src/expldifdlg.c:443
 msgid ""
-"The first Email Address belonging to a person is used to create a DN that is "
-"formatted similar to:\n"
+"The first Email Address belonging to a person is used to create a DN that is formatted similar to:\n"
 "  mail=john.doe at domain.com,ou=people,dc=claws-mail,dc=org"
 msgstr ""
-"La unua retpoŝta adreso apartenante al homo estas uzata por krei DN kiu "
-"estas aranĝita simile al:\n"
+"La unua retpoŝta adreso apartenante al homo estas uzata por krei DN kiu estas aranĝita simile al:\n"
 "  mail=john.doe at domajno.com,ou=homoj,dc=claws-mail,dc=org"
 
 #: ../src/expldifdlg.c:489
@@ -3452,14 +3414,12 @@ msgstr "Sufikso"
 
 #: ../src/expldifdlg.c:499
 msgid ""
-"The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
-"entry. Examples include:\n"
+"The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP entry. Examples include:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
-"La sufikso estas uzata krei \"Distingitan Nomon\" (aŭ DN) por LDAP enigo. "
-"Ekzempleroj inkluzivas:\n"
+"La sufikso estas uzata krei \"Distingitan Nomon\" (aŭ DN) por LDAP enigo. Ekzempleroj inkluzivas:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=homoj,dc=domajnnomo,dc=com\n"
 "  o=Organiza nomo,c=lando\n"
@@ -3473,62 +3433,40 @@ msgid "Unique ID"
 msgstr "Unika identigilo"
 
 #: ../src/expldifdlg.c:523
-msgid ""
-"The LDIF file contains several data records that are usually loaded into an "
-"LDAP server. Each data record in the LDIF file is uniquely identified by a "
-"\"Distinguished Name\" (or DN). The suffix is appended to the \"Relative "
-"Distinguished Name\" (or RDN) to create the DN. Please select one of the "
-"available RDN options that will be used to create the DN."
-msgstr ""
-"La LDIF dosiero enhavas kelkajn datumajn rikordojn kiuj estas kutime "
-"ŝargitaj en LDAP servilon. Ĉiu datuma rikordo en la LDIF dosiero estas unike "
-"identigita per \"Distingita Nomo\" (DN). La sufikso estas aldonita al la "
-"\"Relativa DN\" (RDN) por krei la DN. Bonvolu elekti unu el la disponeblaj "
-"RDN opcioj por uzi krei la DN."
+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 \"Distinguished Name\" (or DN). The suffix is appended to the \"Relative Distinguished Name\" (or RDN) to create the DN. Please select one of the available RDN options that will be used to create the DN."
+msgstr "La LDIF dosiero enhavas kelkajn datumajn rikordojn kiuj estas kutime ŝargitaj en LDAP servilon. Ĉiu datuma rikordo en la LDIF dosiero estas unike identigita per \"Distingita Nomo\" (DN). La sufikso estas aldonita al la \"Relativa DN\" (RDN) por krei la DN. Bonvolu elekti unu el la disponeblaj RDN opcioj por uzi krei la DN."
 
 #: ../src/expldifdlg.c:543
 msgid "Use DN attribute if present in data"
 msgstr "Uzu DN atributon se ĉeestas en datumoj"
 
 #: ../src/expldifdlg.c:548
-msgid ""
-"The addressbook may contain entries that were previously imported from an "
-"LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
-"address book data, may be used in the exported LDIF file. The RDN selected "
-"above will be used if the DN user attribute is not found."
-msgstr ""
-"La adreslibro povas enhavi enigojn kiuj estis antaŭe importitaj de LDIF "
-"dosiero. La \"Distingita Nomo\" (DN) uzanta atributo, se ĉeestas en la "
-"adreslibraj datumoj, povas esti uzata en la eksportita LDIF dosiero. La RDN "
-"elektita supre estos uzata se la DN uzanta atributo ne troviĝas."
+msgid "The addressbook may contain entries that were previously imported from an LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the address book data, may be used in the exported LDIF file. The RDN selected above will be used if the DN user attribute is not found."
+msgstr "La adreslibro povas enhavi enigojn kiuj estis antaŭe importitaj de LDIF dosiero. La \"Distingita Nomo\" (DN) uzanta atributo, se ĉeestas en la adreslibraj datumoj, povas esti uzata en la eksportita LDIF dosiero. La RDN elektita supre estos uzata se la DN uzanta atributo ne troviĝas."
 
 #: ../src/expldifdlg.c:558
 msgid "Exclude record if no Email Address"
-msgstr "Ekskluzivi rikordon se neniu retpoŝta adreso"
+msgstr "Ekskluzivu rikordon se neniu retpoŝta adreso"
 
 #: ../src/expldifdlg.c:563
-msgid ""
-"An addressbook may contain entries without Email Addresses. Check this "
-"option to ignore these records."
-msgstr ""
-"Adreslibro povas enhavi enigojn sen retpoŝtaj adresoj. Marku ĉi tiun opcion "
-"por ignori ĉi tiujn rikordojn."
+msgid "An addressbook may contain entries without Email Addresses. Check this option to ignore these records."
+msgstr "Adreslibro povas enhavi enigojn sen retpoŝtaj adresoj. Marku ĉi tiun opcion por ignori ĉi tiujn rikordojn."
 
 #: ../src/expldifdlg.c:655
 msgid "Export Address Book to LDIF File"
-msgstr "Eksporti adreslibron al LDIF dosiero"
+msgstr "Eksportu adreslibron al LDIF dosiero"
 
 #: ../src/expldifdlg.c:721
 msgid "Distinguished Name"
 msgstr "Distingita Nomo"
 
-#: ../src/export.c:113 ../src/summaryview.c:8117
+#: ../src/export.c:113 ../src/summaryview.c:8120
 msgid "Export to mbox file"
-msgstr "Eksporti al mbox dosiero"
+msgstr "Eksportu al mbox dosiero"
 
 #: ../src/export.c:131
 msgid "Locate the folder to export and specify the mbox file."
-msgstr "Loki la dosierujon por eksporti kaj specifi la mbox dosieron."
+msgstr "Loku la dosierujon por eksporti kaj specifi la mbox dosieron."
 
 #: ../src/export.c:142
 msgid "Source folder:"
@@ -3552,14 +3490,14 @@ msgstr "Ne povis trovi la fontan dosierujon."
 
 #: ../src/export.c:245
 msgid "Select exporting file"
-msgstr "Elekti eksportantan dosieron"
+msgstr "Elektu eksportantan dosieron"
 
 #: ../src/exporthtml.c:767
 msgid "Full Name"
 msgstr "Plena nomo"
 
 #: ../src/exporthtml.c:771 ../src/importldif.c:1022
-#: ../src/plugins/archive/archiver_gtk.c:736
+#: ../src/plugins/archive/archiver_gtk.c:737
 msgid "Attributes"
 msgstr "Ecoj"
 
@@ -3595,145 +3533,122 @@ msgstr "Ne povis kopii %s al %s"
 
 #: ../src/file_checker.c:98
 #, c-format
-msgid ""
-"The file %s is empty or corrupted! Do you want to use the backup file from "
-"%s?"
-msgstr ""
-"La dosiero %s estas malplena aŭ rompita! Ĉu vi volas uzi la sekurkopian "
-"dosieron de %s?"
+msgid "The file %s is empty or corrupted! Do you want to use the backup file from %s?"
+msgstr "La dosiero %s estas malplena aŭ rompita! Ĉu vi volas uzi la sekurkopian dosieron de %s?"
 
 #: ../src/filtering.c:619 ../src/filtering.c:694 ../src/filtering.c:723
 msgid "rule is not account-based\n"
-msgstr ""
+msgstr "regulo ne estas konto-bazita\n"
 
 #: ../src/filtering.c:623
 #, c-format
-msgid ""
-"rule is account-based [id=%d, name='%s'], matching the account currently "
-"used to retrieve messages\n"
-msgstr ""
+msgid "rule is account-based [id=%d, name='%s'], matching the account currently used to retrieve messages\n"
+msgstr "regulo estas konto-bazita [id=%d, nomo='%s'], kongruante kun la konto nune uzata por havigi mesaĝojn\n"
 
 #: ../src/filtering.c:625 ../src/filtering.c:642 ../src/filtering.c:643
 #: ../src/filtering.c:667 ../src/filtering.c:685 ../src/filtering.c:712
 #: ../src/filtering.c:713 ../src/filtering.c:730 ../src/filtering.c:731
 msgid "NON_EXISTENT"
-msgstr ""
+msgstr "NE_EKZISTAS"
 
 #: ../src/filtering.c:633
-msgid ""
-"rule is account-based, not matching the account currently used to retrieve "
-"messages\n"
-msgstr ""
+msgid "rule is account-based, not matching the account currently used to retrieve messages\n"
+msgstr "regulo estas kontbazita, ne kongruante kun la kontro nune uzata por havigi mesaĝojn\n"
 
 #: ../src/filtering.c:640
 #, c-format
-msgid ""
-"rule is account-based [id=%d, name='%s'], not matching the account currently "
-"used to retrieve messages [id=%d, name='%s']\n"
-msgstr ""
+msgid "rule is account-based [id=%d, name='%s'], not matching the account currently used to retrieve messages [id=%d, name='%s']\n"
+msgstr "regulo estas kontbazita [id=%d, nomo='%s'], ne kongruas kun la konto nune uzata por havigi mesaĝojn [id=%d, nomo='%s']\n"
 
 #: ../src/filtering.c:659
-msgid ""
-"rule is not account-based, all rules are applied on user request anyway\n"
-msgstr ""
+msgid "rule is not account-based, all rules are applied on user request anyway\n"
+msgstr "regulo ne estas kontbazita, ĉiuj reguloj estas aplikataj je uzantpeto ĉiukaze\n"
 
 #: ../src/filtering.c:665
 #, c-format
-msgid ""
-"rule is account-based [id=%d, name='%s'], but all rules are applied on user "
-"request\n"
-msgstr ""
+msgid "rule is account-based [id=%d, name='%s'], but all rules are applied on user request\n"
+msgstr "regulo estas kontbazita [id=%d, nomo='%s'], sed ĉiuj reguloj estas aplikataj je uzanta peto\n"
 
 #: ../src/filtering.c:683
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
-msgstr ""
+msgstr "regulo estas kont-bazita [id=%d, nomo='%s'], transsaltita je uzanta peto\n"
 
 #: ../src/filtering.c:688
 msgid "rule is account-based, skipped on user request\n"
-msgstr ""
+msgstr "regulo estas kontbazita, saltita je uzanta peto\n"
 
 #: ../src/filtering.c:710
 #, c-format
-msgid ""
-"rule is account-based [id=%d, name='%s'], not matching current account [id="
-"%d, name='%s']\n"
-msgstr ""
+msgid "rule is account-based [id=%d, name='%s'], not matching current account [id=%d, name='%s']\n"
+msgstr "regulo estas kontbazita [id=%d, nomo='%s'], ne kongruas kun nuna konto [id=%d, nomo=%s']\n"
 
 #: ../src/filtering.c:716
 msgid "rule is account-based, not matching current account\n"
-msgstr ""
+msgstr "regulo estas kontbazita, ne kongruas kun nia nuna konto\n"
 
 #: ../src/filtering.c:728
 #, c-format
-msgid ""
-"rule is account-based [id=%d, name='%s'], current account [id=%d, "
-"name='%s']\n"
-msgstr ""
+msgid "rule is account-based [id=%d, name='%s'], current account [id=%d, name='%s']\n"
+msgstr "regulo estas kontbazita [id=%d, nomo='%s'], nuna konto [id=%d, nomo='%s']\n"
 
 #: ../src/filtering.c:768
 #, c-format
 msgid "applying action [ %s ]\n"
-msgstr ""
+msgstr "aplikas agon [ %s ]\n"
 
 #: ../src/filtering.c:773
 msgid "action could not apply\n"
-msgstr ""
+msgstr "ago ne aplikiĝis\n"
 
 #: ../src/filtering.c:775
 #, c-format
 msgid "no further processing after action [ %s ]\n"
-msgstr ""
+msgstr "neniu plua procezado post ago [ %s ]\n"
 
 #: ../src/filtering.c:826
-#, fuzzy, c-format
+#, c-format
 msgid "processing rule '%s' [ %s ]\n"
-msgstr "Plenumi traktajn regulojn"
+msgstr "procezas regulon '%s' [ %s ]\n"
 
 #: ../src/filtering.c:830
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "procezas regulon <nenomita> [ %s ]\n"
 
 #: ../src/filtering.c:848
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
-msgstr ""
+msgstr "malebligis regulon '%s' [ %s ]\n"
 
 #: ../src/filtering.c:852
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "malebligis regulon <nenomita> [ %s ]\n"
 
 #: ../src/filtering.c:890
-#, fuzzy
 msgid "undetermined"
-msgstr "Nedifinita"
+msgstr "Nedeterminita"
 
 #: ../src/filtering.c:894
-#, fuzzy
 msgid "incorporation"
-msgstr "filtrado je enkorpigo"
+msgstr "enkorpigo"
 
 #: ../src/filtering.c:898
-#, fuzzy
 msgid "manually"
-msgstr "_Manlibro"
+msgstr "permane"
 
 #: ../src/filtering.c:902
-#, fuzzy
 msgid "folder processing"
-msgstr "Ruli dosierujajn pr_ocezadajn regulojn"
+msgstr "dosieruje procezas"
 
 #: ../src/filtering.c:906
-#, fuzzy
 msgid "pre-processing"
-msgstr "Antaŭ-pr_ocezas..."
+msgstr "antaŭprocezas"
 
 #: ../src/filtering.c:910
-#, fuzzy
 msgid "post-processing"
-msgstr "Post-procezas..."
+msgstr "postprocezas"
 
 #: ../src/filtering.c:927
 #, c-format
@@ -3745,10 +3660,16 @@ msgid ""
 "%s%s %s\n"
 "%s%s %s\n"
 msgstr ""
+"filtras mesaĝon (%s%s%s)\n"
+"%smesaĝa dosierujo: %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
 
 #: ../src/filtering.c:929 ../src/filtering.c:938
 msgid ": "
-msgstr ""
+msgstr ":"
 
 #: ../src/filtering.c:936
 #, c-format
@@ -3756,6 +3677,8 @@ msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
 msgstr ""
+"filtras mesaĝon (%s%s%s)\n"
+"%smesaĝan dosieron: %s\n"
 
 #: ../src/folder.c:1564 ../src/foldersel.c:403 ../src/prefs_folder_item.c:306
 msgid "Inbox"
@@ -3811,55 +3734,54 @@ msgstr "Sinkronigas %s por senreta uzado...\n"
 
 #: ../src/foldersel.c:247
 msgid "Select folder"
-msgstr "Elekti dosierujon"
+msgstr "Elektu dosierujon"
 
-#: ../src/foldersel.c:583 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
+#: ../src/foldersel.c:587 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
 #: ../src/plugins/mailmbox/plugin_gtk.c:241
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "NewFolder"
 msgstr "Nova dosierujo"
 
-#: ../src/foldersel.c:591 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
+#: ../src/foldersel.c:595 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
 #: ../src/imap_gtk.c:272 ../src/imap_gtk.c:277 ../src/mh_gtk.c:155
 #: ../src/mh_gtk.c:259 ../src/news_gtk.c:315
 #: ../src/plugins/mailmbox/plugin_gtk.c:249
 #: ../src/plugins/mailmbox/plugin_gtk.c:416
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:97
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:339
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
 #: ../src/plugins/vcalendar/vcal_folder.c:2040
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "`%c' ne povas esti inkluzivigita en dosieruja nomo."
 
-#: ../src/foldersel.c:601 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
+#: ../src/foldersel.c:605 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
 #: ../src/mh_gtk.c:165 ../src/mh_gtk.c:266 ../src/news_gtk.c:322
 #: ../src/plugins/mailmbox/plugin_gtk.c:261
 #: ../src/plugins/mailmbox/plugin_gtk.c:425
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:107
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:346
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:211
 #: ../src/plugins/vcalendar/vcal_folder.c:2047
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La dosierujo `%s' jam ekzistas."
 
-#: ../src/foldersel.c:608 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
+#: ../src/foldersel.c:612 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
 #: ../src/plugins/mailmbox/plugin_gtk.c:268
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:113
+#: ../src/plugins/rssyl/opml_import.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:121
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Ne povas krei la dosierujon `%s'."
 
 #: ../src/folderview.c:230
 msgid "Mark all re_ad"
-msgstr "Marki ĉiujn legit_aj"
+msgstr "Marku ĉiujn legit_aj"
 
 #: ../src/folderview.c:232
 msgid "R_un processing rules"
-msgstr "Plenumi traktajn regulojn"
+msgstr "Plenumu traktajn regulojn"
 
-#: ../src/folderview.c:233 ../src/mainwindow.c:544
+#: ../src/folderview.c:233 ../src/mainwindow.c:546
 msgid "_Search folder..."
-msgstr "_Serĉi dosierujon..."
+msgstr "_Serĉu dosierujon..."
 
 #: ../src/folderview.c:235
 msgid "Process_ing..."
@@ -3867,16 +3789,16 @@ msgstr "Traktas..."
 
 #: ../src/folderview.c:236
 msgid "Empty _trash..."
-msgstr "Malplenigi rubujon..."
+msgstr "Malplenigu rubujon..."
 
 #: ../src/folderview.c:237
 msgid "Send _queue..."
-msgstr "Sendi vicon..."
+msgstr "Sendu vicon..."
 
 #. F_COL_FOLDER
 #: ../src/folderview.c:380 ../src/folderview.c:427
 #: ../src/plugins/notification/notification_lcdproc.c:141
-#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:388
+#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:391
 #: ../src/summaryview.c:6284
 msgid "New"
 msgstr "Nova"
@@ -3884,7 +3806,7 @@ msgstr "Nova"
 #. F_COL_NEW
 #: ../src/folderview.c:381 ../src/folderview.c:428
 #: ../src/plugins/notification/notification_lcdproc.c:145
-#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:387
+#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:390
 #: ../src/summaryview.c:6286
 msgid "Unread"
 msgstr "Nelegite"
@@ -3906,22 +3828,21 @@ msgstr "n-ro. "
 msgid "Setting folder info..."
 msgstr "Starigas dosierujan informon..."
 
-#: ../src/folderview.c:823 ../src/summaryview.c:4117 ../src/summaryview.c:4119
+#: ../src/folderview.c:823 ../src/summaryview.c:4119 ../src/summaryview.c:4121
 msgid "Mark all as read"
-msgstr "Marki ĉiujn kiel legitaj"
+msgstr "Marku ĉiujn kiel legitaj"
 
-#: ../src/folderview.c:824 ../src/summaryview.c:4118
+#: ../src/folderview.c:824 ../src/summaryview.c:4120
 msgid "Do you really want to mark all mails in this folder as read?"
-msgstr ""
-"Ĉu vi vere volas marki ĉiujn mesaĝojn en ĉi tiu dosierujo kiel legitaj?"
+msgstr "Ĉu vi vere volas marki ĉiujn mesaĝojn en ĉi tiu dosierujo kiel legitaj?"
 
-#: ../src/folderview.c:982 ../src/imap.c:4528 ../src/mainwindow.c:5134
+#: ../src/folderview.c:982 ../src/imap.c:4574 ../src/mainwindow.c:5157
 #: ../src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Skanas dosierujon %s%c%s..."
 
-#: ../src/folderview.c:986 ../src/imap.c:4533 ../src/mainwindow.c:5139
+#: ../src/folderview.c:986 ../src/imap.c:4579 ../src/mainwindow.c:5162
 #: ../src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
@@ -3929,13 +3850,11 @@ msgstr "Skanas dosierujon %s..."
 
 #: ../src/folderview.c:1017
 msgid "Rebuild folder tree"
-msgstr "Rekonstrui dosierujan arbon"
+msgstr "Rekonstruu dosierujan arbon"
 
 #: ../src/folderview.c:1018
-msgid ""
-"Rebuilding the folder tree will remove local caches. Do you want to continue?"
-msgstr ""
-"Rekonstruante la dosierujan arbon forigos lokajn kaŝojn. Ĉu vi volas daŭrigi?"
+msgid "Rebuilding the folder tree will remove local caches. Do you want to continue?"
+msgstr "Rekonstruante la dosierujan arbon forigos lokajn kaŝojn. Ĉu vi volas daŭrigi?"
 
 #: ../src/folderview.c:1028
 msgid "Rebuilding folder tree..."
@@ -3954,60 +3873,60 @@ msgstr "Ne povis skani dosierujon %s\n"
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolas por novaj mesaĝoj en ĉiuj dosierujoj..."
 
-#: ../src/folderview.c:2005
+#: ../src/folderview.c:2046
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Fermas dosierujon %s..."
 
 #. Open Folder
 #. TODO: wwp: avoid displaying (null) in the status bar
-#: ../src/folderview.c:2100
+#: ../src/folderview.c:2141
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Malfermas dosierujon %s..."
 
-#: ../src/folderview.c:2118
+#: ../src/folderview.c:2159
 msgid "Folder could not be opened."
 msgstr "Dosierujo ne povis esti malfermita."
 
-#: ../src/folderview.c:2261 ../src/mainwindow.c:2877 ../src/mainwindow.c:2881
+#: ../src/folderview.c:2302 ../src/mainwindow.c:2887 ../src/mainwindow.c:2891
 msgid "Empty trash"
-msgstr "Malplenigi rubujon"
+msgstr "Malplenigu rubujon"
 
-#: ../src/folderview.c:2262
+#: ../src/folderview.c:2303
 msgid "Delete all messages in trash?"
-msgstr "Ĉu forigi ĉiujn mesaĝojn en la rubujo?"
+msgstr "Ĉu forigu ĉiujn mesaĝojn en la rubujo?"
 
-#: ../src/folderview.c:2263
+#: ../src/folderview.c:2304
 msgid "+_Empty trash"
-msgstr "+Malpl_enigi rubujon"
+msgstr "+Malpl_enigu rubujon"
 
-#: ../src/folderview.c:2307 ../src/inc.c:1540 ../src/toolbar.c:2607
+#: ../src/folderview.c:2348 ../src/inc.c:1540 ../src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Senreta averto"
 
-#: ../src/folderview.c:2308 ../src/toolbar.c:2608
+#: ../src/folderview.c:2349 ../src/toolbar.c:2608
 msgid "You're working offline. Override?"
-msgstr "Vi laboras senrete. Ĉu superregi?"
+msgstr "Vi laboras senrete. Ĉu superregu?"
 
-#: ../src/folderview.c:2319 ../src/toolbar.c:2627
+#: ../src/folderview.c:2360 ../src/toolbar.c:2627
 msgid "Send queued messages"
-msgstr "Sendi vicigitajn mesaĝojn"
+msgstr "Sendu vicigitajn mesaĝojn"
 
-#: ../src/folderview.c:2320 ../src/toolbar.c:2628
+#: ../src/folderview.c:2361 ../src/toolbar.c:2628
 msgid "Send all queued messages?"
-msgstr "Ĉu sendi vicigitajn mesaĝojn?"
+msgstr "Ĉu sendu vicigitajn mesaĝojn?"
 
-#: ../src/folderview.c:2321 ../src/messageview.c:854 ../src/messageview.c:871
+#: ../src/folderview.c:2362 ../src/messageview.c:854 ../src/messageview.c:871
 #: ../src/toolbar.c:2629
 msgid "_Send"
-msgstr "_Sendi"
+msgstr "_Sendu"
 
-#: ../src/folderview.c:2329 ../src/toolbar.c:2647
+#: ../src/folderview.c:2370 ../src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Kelkaj eraroj okazis dum sendante vicigitajn mesaĝojn."
 
-#: ../src/folderview.c:2332 ../src/main.c:2714 ../src/toolbar.c:2650
+#: ../src/folderview.c:2373 ../src/main.c:2714 ../src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4016,65 +3935,65 @@ msgstr ""
 "Kelkaj eraroj okazis dum sendante vicigitajn mesaĝojn:\n"
 "%s"
 
-#: ../src/folderview.c:2409
+#: ../src/folderview.c:2450
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Ĉu vi vere volas kopii dosierujon `%s' en `%s'?"
 
-#: ../src/folderview.c:2410
+#: ../src/folderview.c:2451
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Ĉu vi vere volas krei dosierujon `%s' kiel subdosierujo de `%s'?"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Copy folder"
-msgstr "Kopii dosierujon"
+msgstr "Kopiu dosierujon"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Move folder"
-msgstr "Movi dosierujon"
+msgstr "Movu dosierujon"
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopias %s al %s..."
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Movas %s al %s..."
 
-#: ../src/folderview.c:2454
+#: ../src/folderview.c:2495
 msgid "Source and destination are the same."
 msgstr "Fonto kaj celo estas samaj."
 
-#: ../src/folderview.c:2457
+#: ../src/folderview.c:2498
 msgid "Can't copy a folder to one of its children."
 msgstr "Ne povas kopii dosieron al unu el siaj idoj."
 
-#: ../src/folderview.c:2458
+#: ../src/folderview.c:2499
 msgid "Can't move a folder to one of its children."
 msgstr "Ne povas movi dosierujon al unu el siaj idoj."
 
-#: ../src/folderview.c:2461
+#: ../src/folderview.c:2502
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Dosierujo ne povas esti movita inter malsamaj poŝtkestoj."
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Copy failed!"
 msgstr "Kopio fiaskis!"
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Move failed!"
 msgstr "Movo fiaskis!"
 
-#: ../src/folderview.c:2515
+#: ../src/folderview.c:2556
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Traktas agordon por dosierujo %s"
 
-#: ../src/folderview.c:2943 ../src/summaryview.c:4558
-#: ../src/summaryview.c:4657
+#: ../src/folderview.c:2984 ../src/summaryview.c:4560
+#: ../src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr "La cela dosierujo povas esti uzata nur por konservi subdosierujojn."
 
@@ -4084,15 +4003,15 @@ msgstr "Novaĵgrupa subskribo"
 
 #: ../src/grouplistdialog.c:178
 msgid "Select newsgroups for subscription:"
-msgstr "Elekti novaĵgrupojn por subskribo:"
+msgstr "Elektu novaĵgrupojn por subskribo:"
 
 #: ../src/grouplistdialog.c:184
 msgid "Find groups:"
-msgstr "Trovi grupojn:"
+msgstr "Trovu grupojn:"
 
 #: ../src/grouplistdialog.c:192
 msgid " Search "
-msgstr " Serĉi"
+msgstr " Serĉu "
 
 #: ../src/grouplistdialog.c:204
 msgid "Newsgroup name"
@@ -4158,13 +4077,11 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"Claws Mail is free software released under the GPL. If you wish to donate to "
-"the Claws Mail project you can do so at:\n"
+"Claws Mail is free software released under the GPL. If you wish to donate to the Claws Mail project you can do so at:\n"
 msgstr ""
 "\n"
 "\n"
-"Claws Mail estas libera programo eldonita sub la ĜPP. Se vi volas donaci al "
-"la Claws Mail projekto vi povas fari tion ĉe:\n"
+"Claws Mail estas libera programo eldonita sub la ĜPP. Se vi volas donaci al la Claws Mail projekto vi povas fari tion ĉe:\n"
 
 #: ../src/gtk/about.c:159
 msgid ""
@@ -4307,38 +4224,23 @@ msgstr "aldonas subtenon por detekti la retajn konektajn ŝanĝojn\n"
 
 #: ../src/gtk/about.c:544
 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 "
-"Software Foundation; either version 3, or (at your option) any later "
-"version.\n"
+"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 Software Foundation; either version 3, or (at your option) any later version.\n"
 "\n"
 msgstr ""
-"Ĉi tiu programo estas libera; vi rajtas redisvastigi ĝin kaj/aŭ modifi ĝin "
-"sub la termoj de la GNU Ĝenerala Publika Permesilo kiel eldonita per la Free "
-"Software Foundation; aŭ versio 3, aŭ (ĉe via opcio) iu ajn pli malfrua "
-"versio.\n"
+"Ĉi tiu programo estas libera; vi rajtas redisvastigi ĝin kaj/aŭ modifi ĝin sub la termoj de la GNU Ĝenerala Publika Permesilo kiel eldonita per la Free Software Foundation; aŭ versio 3, aŭ (ĉe via opcio) iu ajn pli malfrua versio.\n"
 "\n"
 
 #: ../src/gtk/about.c:550
 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 "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
 "\n"
 msgstr ""
-"Ĉi tiu programo estas disvastigita je espero ke ĝi estos utila, sed SEN IU "
-"AJN GARANTIO; sen eĉ la implicita garantio de VENDEBLECO aŭ TAŬGECO POR IU "
-"CELO. Vidu la GNU Ĝeneralan Publikan Permesilon por pliaj detaloj.\n"
+"Ĉi tiu programo estas disvastigita je espero ke ĝi estos utila, sed SEN IU AJN GARANTIO; sen eĉ la implicita garantio de VENDEBLECO aŭ TAŬGECO POR IU CELO. Vidu la GNU Ĝeneralan Publikan Permesilon por pliaj detaloj.\n"
 "\n"
 
 #: ../src/gtk/about.c:568
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <"
-msgstr ""
-"Vi devis ricevita kopion de la GNU Ĝenerala Publika Permesilo kune kun ĉi "
-"tiu programo. Se ne, vidu "
+msgid "You should have received a copy of the GNU General Public License along with this program. If not, see <"
+msgstr "Vi devis ricevita kopion de la GNU Ĝenerala Publika Permesilo kune kun ĉi tiu programo. Se ne, vidu "
 
 #: ../src/gtk/about.c:573
 msgid ""
@@ -4494,12 +4396,11 @@ msgstr "Fuksina"
 
 #: ../src/gtk/foldersort.c:156
 msgid "Set mailbox order"
-msgstr "Starigi poŝtkestan ordon"
+msgstr "Starigu poŝtkestan ordon"
 
 #: ../src/gtk/foldersort.c:190
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
-msgstr ""
-"Movi poŝtkestojn supren aŭ suben por ŝanĝi la ordon en la dosieruja listo."
+msgstr "Movu poŝtkestojn supren aŭ suben por ŝanĝi la ordon en la dosieruja listo."
 
 #: ../src/gtk/foldersort.c:216
 msgid "Mailboxes"
@@ -4529,12 +4430,12 @@ msgstr "Neniu misliterumita vorto trovita."
 
 #: ../src/gtk/gtkaspell.c:1443
 msgid "Replace unknown word"
-msgstr "Anstataŭigi nekonatan vorton"
+msgstr "Anstataŭigu nekonatan vorton"
 
 #: ../src/gtk/gtkaspell.c:1459
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Anstataŭigi \"%s\" kun: </span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Anstataŭigu \"%s\" kun: </span>"
 
 #: ../src/gtk/gtkaspell.c:1503
 msgid ""
@@ -4546,7 +4447,7 @@ msgstr ""
 
 #: ../src/gtk/gtkaspell.c:1800
 msgid "Change to..."
-msgstr "Ŝanĝi al..."
+msgstr "Ŝanĝu al..."
 
 #: ../src/gtk/gtkaspell.c:1811 ../src/gtk/gtkaspell.c:1949
 msgid "More..."
@@ -4559,20 +4460,20 @@ msgstr "\"%s\" nekonata en vortaro `%s'"
 
 #: ../src/gtk/gtkaspell.c:1883
 msgid "Accept in this session"
-msgstr "Akcepti en ĉi tiu sesio"
+msgstr "Akceptu en ĉi tiu sesio"
 
 #: ../src/gtk/gtkaspell.c:1893
 msgid "Add to personal dictionary"
-msgstr "Aldoni al persona vortaro"
+msgstr "Aldonu al persona vortaro"
 
 #: ../src/gtk/gtkaspell.c:1903
 msgid "Replace with..."
-msgstr "Anstataŭigi kun..."
+msgstr "Anstataŭigu kun..."
 
 #: ../src/gtk/gtkaspell.c:1916
 #, c-format
 msgid "Check with %s"
-msgstr "Kontroli kun %s"
+msgstr "Kontrolu kun %s"
 
 #: ../src/gtk/gtkaspell.c:1938
 msgid "(no suggestions)"
@@ -4586,15 +4487,15 @@ msgstr "Vortaro: %s"
 #: ../src/gtk/gtkaspell.c:2027
 #, c-format
 msgid "Use alternate (%s)"
-msgstr "Uzi alternativon (%s)"
+msgstr "Uzu alternativon (%s)"
 
 #: ../src/gtk/gtkaspell.c:2038
 msgid "Use both dictionaries"
-msgstr "Uzi ambaŭ vortarojn"
+msgstr "Uzu ambaŭ vortarojn"
 
 #: ../src/gtk/gtkaspell.c:2054 ../src/prefs_spelling.c:144
 msgid "Check while typing"
-msgstr "Kontroli dum tajpado"
+msgstr "Kontrolu dum tajpado"
 
 #: ../src/gtk/gtkaspell.c:2153
 #, c-format
@@ -4616,92 +4517,91 @@ msgstr ""
 
 #: ../src/gtk/gtkutils.c:1907
 msgid "Failed."
-msgstr ""
+msgstr "Fiaskis."
 
 #: ../src/gtk/gtkutils.c:1970
-#, fuzzy
 msgid "Configuring..."
-msgstr "Agordo"
+msgstr "Agordas..."
 
 #. RFC2822
 #. S_COL_TO
 #. date expression
 #. S_COL_TO
-#: ../src/gtk/headers.h:8 ../src/prefs_filtering_action.c:1259
-#: ../src/prefs_matcher.c:2158 ../src/prefs_summary_column.c:84
+#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1259
+#: ../src/prefs_matcher.c:2174 ../src/prefs_summary_column.c:84
 #: ../src/quote_fmt.c:49 ../src/summaryview.c:444
 msgid "Date"
 msgstr "Dato"
 
-#: ../src/gtk/headers.h:8
+#: ../src/gtk/headers.h:9
 msgid "Date:"
 msgstr "Dato:"
 
 #. S_COL_SUBJECT
 #. date
 #. S_COL_SUBJECT
-#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1256
-#: ../src/prefs_matcher.c:2155 ../src/prefs_summary_column.c:82
+#: ../src/gtk/headers.h:10 ../src/prefs_filtering_action.c:1256
+#: ../src/prefs_matcher.c:2171 ../src/prefs_summary_column.c:82
 #: ../src/quote_fmt.c:50 ../src/summaryview.c:442
 msgid "From"
 msgstr "De"
 
-#: ../src/gtk/headers.h:9 ../src/summary_search.c:426
+#: ../src/gtk/headers.h:10 ../src/summary_search.c:426
 msgid "From:"
 msgstr "De:"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender"
 msgstr "Sendanto"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender:"
 msgstr "Sendanto:"
 
-#: ../src/gtk/headers.h:11
+#: ../src/gtk/headers.h:12
 msgid "Reply-To"
-msgstr "Respondi al"
+msgstr "Respondu al"
 
 #. S_COL_FROM
 #. subject
 #. S_COL_FROM
-#: ../src/gtk/headers.h:12 ../src/prefs_filtering_action.c:1257
-#: ../src/prefs_matcher.c:2156 ../src/prefs_summary_column.c:83
+#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1257
+#: ../src/prefs_matcher.c:2172 ../src/prefs_summary_column.c:83
 #: ../src/quote_fmt.c:57 ../src/summaryview.c:443
 msgid "To"
 msgstr "Al"
 
 #. to
-#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1258
-#: ../src/prefs_matcher.c:2157 ../src/quote_fmt.c:58
+#: ../src/gtk/headers.h:14 ../src/prefs_filtering_action.c:1258
+#: ../src/prefs_matcher.c:2173 ../src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Kk"
 
-#: ../src/gtk/headers.h:14
+#: ../src/gtk/headers.h:15
 msgid "Bcc"
 msgstr "Bkk"
 
 #. references
-#: ../src/gtk/headers.h:15 ../src/prefs_filtering_action.c:1260
-#: ../src/prefs_matcher.c:2159 ../src/quote_fmt.c:61
+#: ../src/gtk/headers.h:16 ../src/prefs_filtering_action.c:1260
+#: ../src/prefs_matcher.c:2175 ../src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Mesaĝa identigilo"
 
-#: ../src/gtk/headers.h:15
+#: ../src/gtk/headers.h:16
 msgid "Message-ID:"
 msgstr "Mesaĝa identigilo:"
 
-#: ../src/gtk/headers.h:16
+#: ../src/gtk/headers.h:17
 msgid "In-Reply-To"
 msgstr "Responde al"
 
 #. newsgroups
-#: ../src/gtk/headers.h:17 ../src/prefs_filtering_action.c:1262
-#: ../src/prefs_matcher.c:2161 ../src/quote_fmt.c:60
+#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1262
+#: ../src/prefs_matcher.c:2177 ../src/quote_fmt.c:60
 msgid "References"
 msgstr "Referencas"
 
-#: ../src/gtk/headers.h:17
+#: ../src/gtk/headers.h:18
 msgid "References:"
 msgstr "Referencas:"
 
@@ -4709,328 +4609,333 @@ msgstr "Referencas:"
 #. initial of sender
 #. S_COL_STATUS
 #. S_COL_MIME
-#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1255
-#: ../src/prefs_matcher.c:2154 ../src/prefs_summary_column.c:81
+#: ../src/gtk/headers.h:19 ../src/prefs_filtering_action.c:1255
+#: ../src/prefs_matcher.c:2170 ../src/prefs_summary_column.c:81
 #: ../src/quote_fmt.c:56 ../src/summaryview.c:441
 msgid "Subject"
 msgstr "Temo"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:19 ../src/plugins/pdf_viewer/poppler_viewer.c:702
+#: ../src/summary_search.c:440
+msgid "Subject:"
+msgstr "Temo:"
+
+#: ../src/gtk/headers.h:20
 msgid "Comments"
 msgstr "Komentoj"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:20
 msgid "Comments:"
 msgstr "Komentoj:"
 
-#: ../src/gtk/headers.h:20
+#: ../src/gtk/headers.h:21
 msgid "Keywords"
 msgstr "Ŝlosilvortoj"
 
-#: ../src/gtk/headers.h:20 ../src/plugins/pdf_viewer/poppler_viewer.c:704
+#: ../src/gtk/headers.h:21 ../src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Keywords:"
 msgstr "Ŝlosilvortoj:"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date"
 msgstr "Resendita dato"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date:"
 msgstr "Resendita dato:"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From"
 msgstr "Resendita de"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From:"
 msgstr "Resendita de:"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender"
 msgstr "Resendita sendinto"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender:"
 msgstr "Resendita sendinto:"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To"
 msgstr "Resendita al"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To:"
 msgstr "Resendita al:"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc"
 msgstr "Resendita kk"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc:"
 msgstr "Resendita kk:"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc"
 msgstr "Resendita bkk"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc:"
 msgstr "Resendita bkk:"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID"
 msgstr "Resendita mesaĝa identigilo"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID:"
 msgstr "Resendita mesaĝa identigilo:"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path"
 msgstr "Revena vojo"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path:"
 msgstr "Revena vojo:"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received"
 msgstr "Ricevis"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received:"
 msgstr "Ricevis:"
 
 #. more
 #. cc
-#: ../src/gtk/headers.h:32 ../src/prefs_filtering_action.c:1261
-#: ../src/prefs_matcher.c:2160 ../src/quote_fmt.c:59
+#: ../src/gtk/headers.h:33 ../src/prefs_filtering_action.c:1261
+#: ../src/prefs_matcher.c:2176 ../src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Novaĵgrupoj"
 
-#: ../src/gtk/headers.h:33
+#: ../src/gtk/headers.h:34
 msgid "Followup-To"
-msgstr "Plutrakti al"
+msgstr "Plutraktu al"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To"
 msgstr "Liverita al"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To:"
 msgstr "Liverita al:"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen"
 msgstr "Vidita"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen:"
 msgstr "Vidita:"
 
 #. S_COL_MARK
-#: ../src/gtk/headers.h:36 ../src/gtk/progressdialog.c:149
+#: ../src/gtk/headers.h:37 ../src/gtk/progressdialog.c:149
 #: ../src/gtk/sslcertwindow.c:164 ../src/prefs_summary_column.c:79
 #: ../src/summaryview.c:2793
 msgid "Status"
 msgstr "Stato"
 
-#: ../src/gtk/headers.h:36 ../src/prefs_themes.c:906
+#: ../src/gtk/headers.h:37 ../src/prefs_themes.c:906
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face"
 msgstr "Tiparo"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face:"
 msgstr "Tiparo:"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To"
 msgstr "Dispona avizo al"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To:"
 msgstr "Dispona avizo al:"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To"
 msgstr "Revena recepto al"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To:"
 msgstr "Revena recepto al:"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent"
 msgstr "Uzantperanto"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent:"
 msgstr "Uzantperanto:"
 
-#: ../src/gtk/headers.h:41
+#: ../src/gtk/headers.h:42
 msgid "Content-Type"
 msgstr "Enhava tipo"
 
-#: ../src/gtk/headers.h:41 ../src/image_viewer.c:327
+#: ../src/gtk/headers.h:42 ../src/image_viewer.c:327
 msgid "Content-Type:"
 msgstr "Enhava tipo:"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding"
 msgstr "Enhavtransira kodoprezento"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding:"
 msgstr "Enhavtransira kodoprezento:"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version"
 msgstr "MIME-versio"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version:"
 msgstr "MIME-versio:"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence"
 msgstr "Antaŭeco"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence:"
 msgstr "Antaŭeco:"
 
-#: ../src/gtk/headers.h:45 ../src/prefs_account.c:1073
+#: ../src/gtk/headers.h:46 ../src/prefs_account.c:1073
 msgid "Organization"
 msgstr "Organizo"
 
-#: ../src/gtk/headers.h:45
+#: ../src/gtk/headers.h:46
 msgid "Organization:"
 msgstr "Organizo:"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List"
 msgstr "Poŝtlisto"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List:"
 msgstr "Poŝtlisto:"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post"
 msgstr "Lista poŝto"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post:"
 msgstr "Lista poŝto:"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe"
 msgstr "Lista subskribo"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe:"
 msgstr "Lista subskribo:"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe"
 msgstr "Lista malsubskribo"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe:"
 msgstr "Lista malsubskribo:"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help"
 msgstr "Lista helpo"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help:"
 msgstr "Lista helpo:"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive"
 msgstr "Lista arĥivo"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive:"
 msgstr "Lista arĥivo:"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner"
 msgstr "Lista posedanto"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner:"
 msgstr "Lista posedanto:"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label"
 msgstr "X-Etikedo"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label:"
 msgstr "X-Etikedo:"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer"
 msgstr "X-Poŝtilo"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer:"
 msgstr "X-Poŝtilo:"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status"
 msgstr "X-Stato"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status:"
 msgstr "X-Stato:"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face"
 msgstr "X-Tiparo"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face:"
 msgstr "X-Tiparo:"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive"
 msgstr "X-Neniu arĥivo"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive:"
 msgstr "X-Neniu arĥivo:"
 
 #. some common logical names referring to real header names
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to"
 msgstr "Responde al"
 
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to:"
 msgstr "Responde al:"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc"
 msgstr "Al aŭ Kk"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc:"
 msgstr "Al aŭ Kk:"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject"
 msgstr "De, Al aŭ Temo"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject:"
 msgstr "De, Al aŭ Temo:"
 
@@ -5128,12 +5033,8 @@ msgid "Icon Legend"
 msgstr "Piktograma etikedo"
 
 #: ../src/gtk/icon_legend.c:140
-msgid ""
-"<span weight=\"bold\">The following icons are used to show the status of "
-"messages and folders:</span>"
-msgstr ""
-"<span weight=\"bold\">La sekvaj piktogramoj estas uzataj por montri la "
-"staton de mesaĝoj kaj dosierujoj:</span>"
+msgid "<span weight=\"bold\">The following icons are used to show the status of messages and folders:</span>"
+msgstr "<span weight=\"bold\">La sekvaj piktogramoj estas uzataj por montri la staton de mesaĝoj kaj dosierujoj:</span>"
 
 #: ../src/gtk/inputdialog.c:233 ../src/gtk/inputdialog.c:255
 #, c-format
@@ -5158,15 +5059,15 @@ msgstr "Enigu pasvorton"
 
 #: ../src/gtk/inputdialog.c:273
 msgid "Remember password for this session"
-msgstr "Memori pasvorton por ĉi tiu sesio"
+msgstr "Memoru pasvorton por ĉi tiu sesio"
 
 #: ../src/gtk/inputdialog.c:372 ../src/gtk/inputdialog.c:419
 msgid "Remember this"
-msgstr "Memori ĉi tion"
+msgstr "Memoru ĉi tion"
 
 #: ../src/gtk/logwindow.c:447
 msgid "Clear _Log"
-msgstr "Vakigi protokolon"
+msgstr "Vakigu protokolon"
 
 #: ../src/gtk/menu.c:137
 msgid ""
@@ -5219,10 +5120,10 @@ msgstr ""
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:457
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:400
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:550
-#: ../src/plugins/fancy/fancy_prefs.c:109
+#: ../src/plugins/fancy/fancy_prefs.c:114
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:178
 #: ../src/plugins/gdata/cm_gdata_prefs.c:145
-#: ../src/plugins/libravatar/libravatar_prefs.c:399
+#: ../src/plugins/libravatar/libravatar_prefs.c:439
 #: ../src/plugins/notification/notification_prefs.c:396
 #: ../src/plugins/notification/notification_prefs.c:410
 #: ../src/plugins/notification/notification_prefs.c:428
@@ -5232,20 +5133,20 @@ msgstr ""
 #: ../src/plugins/notification/notification_prefs.c:496
 #: ../src/plugins/notification/notification_prefs.c:513
 #: ../src/plugins/pgpcore/prefs_gpg.c:569
-#: ../src/plugins/rssyl/rssyl_prefs.c:65
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
+#: ../src/plugins/rssyl/rssyl_prefs.c:69
 #: ../src/plugins/spam_report/spam_report_prefs.c:79
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
 #: ../src/plugins/vcalendar/vcal_prefs.c:680 ../src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Kromprogramoj"
 
 #: ../src/gtk/pluginwindow.c:337
 msgid "Load..."
-msgstr "Ŝargi..."
+msgstr "Ŝargu..."
 
 #: ../src/gtk/pluginwindow.c:338
 msgid "Unload"
-msgstr "Malŝargi"
+msgstr "Malŝargu"
 
 #: ../src/gtk/pluginwindow.c:351 ../src/prefs_summaries.c:221
 msgid "Description"
@@ -5253,12 +5154,8 @@ msgstr "Priskribo"
 
 #: ../src/gtk/pluginwindow.c:374
 #, c-format
-msgid ""
-"For more information about plugins see the <a href=\"%s\"><span underline="
-"\"none\">Claws Mail website</span></a>."
-msgstr ""
-"Por plia informo pri kromprogramoj, vidu la <a href=\"%s\"><span underline="
-"\"none\">Claws Mail retejon</span></a>."
+msgid "For more information about plugins see the <a href=\"%s\"><span underline=\"none\">Claws Mail website</span></a>."
+msgstr "Por plia informo pri kromprogramoj, vidu la <a href=\"%s\"><span underline=\"none\">Claws Mail retejon</span></a>."
 
 #: ../src/gtk/pluginwindow.c:414
 msgid "Click here to load one or more plugins"
@@ -5276,9 +5173,9 @@ msgstr "Ŝargitaj kromprogramoj"
 msgid "Page Index"
 msgstr "Paĝa indekso"
 
-#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:828
+#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:831
 msgid "_Hide"
-msgstr "Kaŝi"
+msgstr "Kaŝu"
 
 #: ../src/gtk/progressdialog.c:141 ../src/prefs_account.c:3233
 #: ../src/prefs_account.c:3251 ../src/prefs_account.c:3269
@@ -5289,70 +5186,74 @@ msgstr "Kaŝi"
 msgid "Account"
 msgstr "Konto"
 
-#: ../src/gtk/quicksearch.c:452
+#: ../src/gtk/quicksearch.c:451
 msgid "all messages"
 msgstr "ĉiuj mesaĝoj"
 
-#: ../src/gtk/quicksearch.c:453
+#: ../src/gtk/quicksearch.c:452
 msgid "messages whose age is greater than # days"
 msgstr "mesaĝoj kies aĝo estas pli ol # tagoj"
 
-#: ../src/gtk/quicksearch.c:454
+#: ../src/gtk/quicksearch.c:453
 msgid "messages whose age is less than # days"
 msgstr "mesaĝoj kies aĝo estas malpli ol # tagoj"
 
-#: ../src/gtk/quicksearch.c:455
+#: ../src/gtk/quicksearch.c:454
 msgid "messages whose age is greater than # hours"
 msgstr "mesaĝoj kies aĝo estas pli ol # horoj"
 
-#: ../src/gtk/quicksearch.c:456
+#: ../src/gtk/quicksearch.c:455
 msgid "messages whose age is less than # hours"
 msgstr "mesaĝoj kies aĝo estas malpli ol # horoj"
 
-#: ../src/gtk/quicksearch.c:457
+#: ../src/gtk/quicksearch.c:456
 msgid "messages which contain S in the message body"
 msgstr "mesaĝoj kiuj enhavas S en la mesaĝa korpo"
 
-#: ../src/gtk/quicksearch.c:458
+#: ../src/gtk/quicksearch.c:457
 msgid "messages which contain S in the whole message"
 msgstr "mesaĝoj kiuj enhavas S en la tuta mesaĝo"
 
-#: ../src/gtk/quicksearch.c:459
+#: ../src/gtk/quicksearch.c:458
 msgid "messages carbon-copied to S"
 msgstr "mesaĝoj kopiitaj al S"
 
-#: ../src/gtk/quicksearch.c:460
+#: ../src/gtk/quicksearch.c:459
 msgid "message is either to: or cc: to S"
 msgstr "mesaĝo estas aŭ al: aŭ kk: al S"
 
-#: ../src/gtk/quicksearch.c:461
+#: ../src/gtk/quicksearch.c:460
 msgid "deleted messages"
 msgstr "forigitaj mesaĝoj"
 
 #. * how I can filter deleted messages *
-#: ../src/gtk/quicksearch.c:462
+#: ../src/gtk/quicksearch.c:461
 msgid "messages which contain S in the Sender field"
 msgstr "mesaĝoj kiuj enhavas S en la Sendinta kampo"
 
-#: ../src/gtk/quicksearch.c:463
+#: ../src/gtk/quicksearch.c:462
 msgid "true if execute \"S\" succeeds"
 msgstr "vera se rulo de \"S\" sukcesas"
 
-#: ../src/gtk/quicksearch.c:464
+#: ../src/gtk/quicksearch.c:463
 msgid "messages originating from user S"
 msgstr "mesaĝoj iniciatitaj de uzanto S"
 
-#: ../src/gtk/quicksearch.c:465
+#: ../src/gtk/quicksearch.c:464
 msgid "forwarded messages"
 msgstr "plusenditaj mesaĝoj"
 
-#: ../src/gtk/quicksearch.c:466
+#: ../src/gtk/quicksearch.c:465
 msgid "messages which have attachments"
 msgstr "mesaĝoj kiuj havas algluaĵojn"
 
+#: ../src/gtk/quicksearch.c:466
+msgid "messages which contain S in any header name or value"
+msgstr "mesaĝoj kiuj enhavas S en iu ajn ĉapa nomo aŭ valoro"
+
 #: ../src/gtk/quicksearch.c:467
-msgid "messages which contain header S"
-msgstr "mesaĝoj kiuj enhavas ĉapon S"
+msgid "messages which contain S in the value of any header"
+msgstr "mesaĝoj kiuj enhavas S en la valoro de iu ajn ĉapo"
 
 #: ../src/gtk/quicksearch.c:468
 msgid "messages which contain S in Message-ID header"
@@ -5388,7 +5289,7 @@ msgstr "nekompletaj mesaĝoj (ne tute elŝutitaj)"
 
 #: ../src/gtk/quicksearch.c:476
 msgid "messages which you have replied to"
-msgstr "mesaĝoj kiuj respondiĝis"
+msgstr "mesaĝoj al kiuj vi respondis"
 
 #: ../src/gtk/quicksearch.c:477
 msgid "read messages"
@@ -5473,7 +5374,7 @@ msgstr "uskleca serĉo"
 
 #: ../src/gtk/quicksearch.c:498
 msgid "match using regular expressions instead of substring search"
-msgstr "kongrui uzante regulajn esprimojn anstataŭ subĉena serĉo"
+msgstr "kongruu uzante regulajn esprimojn anstataŭ subĉena serĉo"
 
 #: ../src/gtk/quicksearch.c:500
 msgid "all filtering expressions are allowed"
@@ -5485,12 +5386,10 @@ msgstr "Etendita serĉo"
 
 #: ../src/gtk/quicksearch.c:510
 msgid ""
-"Extended Search allows the user to define criteria that messages must have "
-"in order to match and be displayed in the message list.\n"
+"Extended Search allows the user to define criteria that messages must have in order to match and be displayed in the message list.\n"
 "The following symbols can be used:"
 msgstr ""
-"Etendita serĉo permesas la uzanton difini kriteriojn havendajn por kongrui "
-"kaj esti montritaj en mesaĝlisto.\n"
+"Etendita serĉo permesas la uzanton difini kriteriojn havendajn por kongrui kaj esti montritaj en mesaĝlisto.\n"
 "La sekvaj simboloj povas esti uzataj:"
 
 #: ../src/gtk/quicksearch.c:610
@@ -5511,19 +5410,19 @@ msgstr "Glua"
 
 #: ../src/gtk/quicksearch.c:706
 msgid "Type-ahead"
-msgstr "Tajpi antaŭen"
+msgstr "Tajpu antaŭen"
 
 #: ../src/gtk/quicksearch.c:718
 msgid "Run on select"
-msgstr "Ruliĝi je elekto"
+msgstr "Ruliĝu je elekto"
 
 #: ../src/gtk/quicksearch.c:760
 msgid "Clear the current search"
-msgstr "Vakigi la nunan serĉon"
+msgstr "Vakigu la nunan serĉon"
 
 #: ../src/gtk/quicksearch.c:770 ../src/summary_search.c:424
 msgid "Edit search criteria"
-msgstr "Redakti serĉajn kriteriojn"
+msgstr "Redaktu serĉajn kriteriojn"
 
 #: ../src/gtk/quicksearch.c:779
 msgid "Information about extended symbols"
@@ -5535,13 +5434,13 @@ msgstr "_Informo"
 
 #: ../src/gtk/quicksearch.c:818 ../src/gtk/quicksearch.c:833
 msgid "E_dit"
-msgstr "Re_dakti"
+msgstr "Re_daktu"
 
 #: ../src/gtk/quicksearch.c:819 ../src/gtk/quicksearch.c:834
 #: ../src/prefs_actions.c:347 ../src/prefs_filtering.c:495
-#: ../src/prefs_template.c:328
+#: ../src/prefs_template.c:330
 msgid "C_lear"
-msgstr "Vakigi"
+msgstr "Vakigu"
 
 #: ../src/gtk/sslcertwindow.c:157 ../src/gtk/sslcertwindow.c:348
 #: ../src/gtk/sslcertwindow.c:398 ../src/gtk/sslcertwindow.c:462
@@ -5614,7 +5513,7 @@ msgstr "Subskriba stato: %s"
 
 #: ../src/gtk/sslcertwindow.c:358 ../src/gtk/sslcertwindow.c:408
 msgid "_View certificate"
-msgstr "_Vidi ateston"
+msgstr "_Vidu ateston"
 
 #: ../src/gtk/sslcertwindow.c:364
 msgid "SSL certificate is invalid"
@@ -5627,11 +5526,11 @@ msgstr "SSL atesto ne estas konata"
 #: ../src/gtk/sslcertwindow.c:369 ../src/gtk/sslcertwindow.c:419
 #: ../src/gtk/sslcertwindow.c:481
 msgid "_Cancel connection"
-msgstr "Nuligi konekton"
+msgstr "Nuligu konekton"
 
 #: ../src/gtk/sslcertwindow.c:369 ../src/gtk/sslcertwindow.c:481
 msgid "_Accept and save"
-msgstr "_Akcepti kaj konservi"
+msgstr "_Akceptu kaj konservu"
 
 #: ../src/gtk/sslcertwindow.c:387
 #, c-format
@@ -5652,7 +5551,7 @@ msgstr "SSL atesto eltempiĝis"
 
 #: ../src/gtk/sslcertwindow.c:419
 msgid "_Accept"
-msgstr "_Akcepti"
+msgstr "_Akceptu"
 
 #: ../src/gtk/sslcertwindow.c:439
 msgid "New certificate:"
@@ -5673,7 +5572,7 @@ msgstr ""
 
 #: ../src/gtk/sslcertwindow.c:472
 msgid "_View certificates"
-msgstr "_Vidi atestojn"
+msgstr "_Vidu atestojn"
 
 #: ../src/gtk/sslcertwindow.c:477
 msgid "SSL certificate changed and is invalid"
@@ -5691,8 +5590,8 @@ msgstr "Etikedoj:"
 #: ../src/plugins/notification/notification_popup.c:316
 #: ../src/plugins/notification/notification_popup.c:621
 #: ../src/plugins/notification/notification_trayicon.c:851
-#: ../src/summaryview.c:3351 ../src/summaryview.c:3369
-#: ../src/summaryview.c:3390
+#: ../src/summaryview.c:3353 ../src/summaryview.c:3371
+#: ../src/summaryview.c:3392
 msgid "(No From)"
 msgstr "(Neniu De)"
 
@@ -5700,7 +5599,7 @@ msgstr "(Neniu De)"
 #: ../src/plugins/notification/notification_popup.c:318
 #: ../src/plugins/notification/notification_popup.c:625
 #: ../src/plugins/notification/notification_trayicon.c:854
-#: ../src/summaryview.c:3403 ../src/summaryview.c:3407
+#: ../src/summaryview.c:3405 ../src/summaryview.c:3409
 msgid "(No Subject)"
 msgstr "(Neniu Temo)"
 
@@ -5708,7 +5607,7 @@ msgstr "(Neniu Temo)"
 msgid "Error:"
 msgstr "Eraro:"
 
-#: ../src/image_viewer.c:299 ../src/mimeview.c:2544
+#: ../src/image_viewer.c:299 ../src/mimeview.c:2545
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:698
 msgid "Filename:"
 msgstr "Dosiernomo:"
@@ -5719,467 +5618,445 @@ msgstr "Dosiera grando:"
 
 #: ../src/image_viewer.c:355
 msgid "Load Image"
-msgstr "Ŝargi bildon"
+msgstr "Ŝargu bildon"
 
-#: ../src/imap.c:577
+#: ../src/imap.c:583
 msgid "IMAP4 connection broken\n"
 msgstr "IMAP4 konekto rompita\n"
 
-#: ../src/imap.c:616
+#: ../src/imap.c:622
 #, c-format
 msgid "IMAP error on %s: authenticated\n"
 msgstr "IMAP eraro ĉe %s: aŭtentigita\n"
 
-#: ../src/imap.c:619
+#: ../src/imap.c:625
 #, c-format
 msgid "IMAP error on %s: not authenticated\n"
 msgstr "IMAP eraro ĉe %s: ne aŭtentigita\n"
 
-#: ../src/imap.c:622
+#: ../src/imap.c:628
 #, c-format
 msgid "IMAP error on %s: bad state\n"
 msgstr "IMAP eraro sur %s: malbona stato\n"
 
-#: ../src/imap.c:625
+#: ../src/imap.c:631
 #, c-format
 msgid "IMAP error on %s: stream error\n"
 msgstr "IMAP eraro sur %s: flua eraro\n"
 
-#: ../src/imap.c:628
+#: ../src/imap.c:634
 #, c-format
-msgid ""
-"IMAP error on %s: parse error (very probably non-RFC compliance from the "
-"server)\n"
-msgstr ""
-"IMAP eraro sur %s: sintakse analiza eraro (probable ne-RFC konsento de la "
-"servilo)\n"
+msgid "IMAP error on %s: parse error (very probably non-RFC compliance from the server)\n"
+msgstr "IMAP eraro sur %s: sintakse analiza eraro (probable ne-RFC konsento de la servilo)\n"
 
-#: ../src/imap.c:632
+#: ../src/imap.c:638
 #, c-format
 msgid "IMAP error on %s: connection refused\n"
 msgstr "IMAP eraro sur %s: konekto rifuzita\n"
 
-#: ../src/imap.c:635
+#: ../src/imap.c:641
 #, c-format
 msgid "IMAP error on %s: memory error\n"
 msgstr "IMAP eraro sur %s: memora eraro\n"
 
-#: ../src/imap.c:638
+#: ../src/imap.c:644
 #, c-format
 msgid "IMAP error on %s: fatal error\n"
 msgstr "IMAP eraro sur %s: mortiga eraro\n"
 
-#: ../src/imap.c:641
+#: ../src/imap.c:647
 #, c-format
-msgid ""
-"IMAP error on %s: protocol error(very probably non-RFC compliance from the "
-"server)\n"
-msgstr ""
-"IMAP eraro sur %s: protokola eraro (probable ne-RFC konsento de la servilo)\n"
+msgid "IMAP error on %s: protocol error(very probably non-RFC compliance from the server)\n"
+msgstr "IMAP eraro sur %s: protokola eraro (probable ne-RFC konsento de la servilo)\n"
 
-#: ../src/imap.c:645
+#: ../src/imap.c:651
 #, c-format
 msgid "IMAP error on %s: connection not accepted\n"
 msgstr "IMAP eraro sur %s: konekto ne akceptita\n"
 
-#: ../src/imap.c:648
+#: ../src/imap.c:654
 #, c-format
 msgid "IMAP error on %s: APPEND error\n"
 msgstr "IMAP eraro sur %s: APPEND eraro\n"
 
-#: ../src/imap.c:651
+#: ../src/imap.c:657
 #, c-format
 msgid "IMAP error on %s: NOOP error\n"
 msgstr "IMAP eraro sur %s: NOOP eraro\n"
 
-#: ../src/imap.c:654
+#: ../src/imap.c:660
 #, c-format
 msgid "IMAP error on %s: LOGOUT error\n"
 msgstr "IMAP eraro sur %s: LOGOUT eraro\n"
 
-#: ../src/imap.c:657
+#: ../src/imap.c:663
 #, c-format
 msgid "IMAP error on %s: CAPABILITY error\n"
 msgstr "IMAP eraro sur %s: CAPABILIY eraro\n"
 
-#: ../src/imap.c:660
+#: ../src/imap.c:666
 #, c-format
 msgid "IMAP error on %s: CHECK error\n"
 msgstr "IMAP eraro sur %s: CHECK eraro\n"
 
-#: ../src/imap.c:663
+#: ../src/imap.c:669
 #, c-format
 msgid "IMAP error on %s: CLOSE error\n"
 msgstr "IMAP eraro sur %s: CLOSE eraro\n"
 
-#: ../src/imap.c:666
+#: ../src/imap.c:672
 #, c-format
 msgid "IMAP error on %s: EXPUNGE error\n"
 msgstr "IMAP eraro sur %s: EXPUNGE eraro\n"
 
-#: ../src/imap.c:669
+#: ../src/imap.c:675
 #, c-format
 msgid "IMAP error on %s: COPY error\n"
 msgstr "IMAP eraro sur %s: COPY eraro\n"
 
-#: ../src/imap.c:672
+#: ../src/imap.c:678
 #, c-format
 msgid "IMAP error on %s: UID COPY error\n"
 msgstr "IMAP eraro sur %s: UID COPY eraro\n"
 
-#: ../src/imap.c:675
+#: ../src/imap.c:681
 #, c-format
 msgid "IMAP error on %s: CREATE error\n"
 msgstr "IMAP eraro sur %s: CREATE eraro\n"
 
-#: ../src/imap.c:678
+#: ../src/imap.c:684
 #, c-format
 msgid "IMAP error on %s: DELETE error\n"
 msgstr "IMAP eraro sur %s: DELETE eraro\n"
 
-#: ../src/imap.c:681
+#: ../src/imap.c:687
 #, c-format
 msgid "IMAP error on %s: EXAMINE error\n"
 msgstr "IMAP eraro sur %s: EXAMINE eraro\n"
 
-#: ../src/imap.c:684
+#: ../src/imap.c:690
 #, c-format
 msgid "IMAP error on %s: FETCH error\n"
 msgstr "IMAP eraro sur %s: FETCH eraro\n"
 
-#: ../src/imap.c:687
+#: ../src/imap.c:693
 #, c-format
 msgid "IMAP error on %s: UID FETCH error\n"
 msgstr "IMAP eraro sur %s: UID FETCH eraro\n"
 
-#: ../src/imap.c:690
+#: ../src/imap.c:696
 #, c-format
 msgid "IMAP error on %s: LIST error\n"
 msgstr "IMAP eraro sur %s: LIST eraro\n"
 
-#: ../src/imap.c:693
+#: ../src/imap.c:699
 #, c-format
 msgid "IMAP error on %s: LOGIN error\n"
 msgstr "IMAP eraro sur %s: LOGIN eraro\n"
 
-#: ../src/imap.c:696
+#: ../src/imap.c:702
 #, c-format
 msgid "IMAP error on %s: LSUB error\n"
 msgstr "IMAP eraro sur %s: LSUB eraro\n"
 
-#: ../src/imap.c:699
+#: ../src/imap.c:705
 #, c-format
 msgid "IMAP error on %s: RENAME error\n"
 msgstr "IMAP eraro sur %s: RENAME eraro\n"
 
-#: ../src/imap.c:702
+#: ../src/imap.c:708
 #, c-format
 msgid "IMAP error on %s: SEARCH error\n"
 msgstr "IMAP eraro sur %s: SEARCH eraro\n"
 
-#: ../src/imap.c:705
+#: ../src/imap.c:711
 #, c-format
 msgid "IMAP error on %s: UID SEARCH error\n"
 msgstr "IMAP eraro sur %s: UID SEARCH eraro\n"
 
-#: ../src/imap.c:708
+#: ../src/imap.c:714
 #, c-format
 msgid "IMAP error on %s: SELECT error\n"
 msgstr "IMAP eraro sur %s: SELECT eraro\n"
 
-#: ../src/imap.c:711
+#: ../src/imap.c:717
 #, c-format
 msgid "IMAP error on %s: STATUS error\n"
 msgstr "IMAP eraro sur %s: STATUS eraro\n"
 
-#: ../src/imap.c:714
+#: ../src/imap.c:720
 #, c-format
 msgid "IMAP error on %s: STORE error\n"
 msgstr "IMAP eraro sur %s: STORE eraro\n"
 
-#: ../src/imap.c:717
+#: ../src/imap.c:723
 #, c-format
 msgid "IMAP error on %s: UID STORE error\n"
 msgstr "IMAP eraro sur %s: UID STORE eraro\n"
 
-#: ../src/imap.c:720
+#: ../src/imap.c:726
 #, c-format
 msgid "IMAP error on %s: SUBSCRIBE error\n"
 msgstr "IMAP eraro sur %s: SUBSCRIBE eraro\n"
 
-#: ../src/imap.c:723
+#: ../src/imap.c:729
 #, c-format
 msgid "IMAP error on %s: UNSUBSCRIBE error\n"
 msgstr "IMAP eraro sur %s: UNSUBSCRIBE eraro\n"
 
-#: ../src/imap.c:726
+#: ../src/imap.c:732
 #, c-format
 msgid "IMAP error on %s: STARTTLS error\n"
 msgstr "IMAP eraro sur %s: STARTTLS eraro\n"
 
-#: ../src/imap.c:729
+#: ../src/imap.c:735
 #, c-format
 msgid "IMAP error on %s: INVAL error\n"
 msgstr "IMAP eraro sur %s: INVAL eraro\n"
 
-#: ../src/imap.c:732
+#: ../src/imap.c:738
 #, c-format
 msgid "IMAP error on %s: EXTENSION error\n"
 msgstr "IMAP eraro sur %s: EXTENSION eraro\n"
 
-#: ../src/imap.c:735
+#: ../src/imap.c:741
 #, c-format
 msgid "IMAP error on %s: SASL error\n"
 msgstr "IMAP eraro sur %s: SASL eraro\n"
 
-#: ../src/imap.c:739
+#: ../src/imap.c:745
 #, c-format
 msgid "IMAP error on %s: SSL error\n"
 msgstr "IMAP eraro sur %s: SSL eraro\n"
 
-#: ../src/imap.c:743
+#: ../src/imap.c:749
 #, c-format
 msgid "IMAP error on %s: Unknown error [%d]\n"
 msgstr "IMAP eraro sur %s: Nekonata eraro [%d]\n"
 
-#: ../src/imap.c:928
+#: ../src/imap.c:934
 msgid ""
 "\n"
 "\n"
-"CRAM-MD5 logins only work if libetpan has been compiled with SASL support "
-"and the CRAM-MD5 SASL plugin is installed."
+"CRAM-MD5 logins only work if libetpan has been compiled with SASL support and the CRAM-MD5 SASL plugin is installed."
 msgstr ""
 "\n"
 "\n"
-"CRAM-MD5 ensalutoj nur funkcias se libetpan estis kompilita kun SASL subteno "
-"kaj la CRAM-MD5 SASL kromprogramo estas instalita."
+"CRAM-MD5 ensalutoj nur funkcias se libetpan estis kompilita kun SASL subteno kaj la CRAM-MD5 SASL kromprogramo estas instalita."
 
-#: ../src/imap.c:934
+#: ../src/imap.c:940
 msgid ""
 "\n"
 "\n"
-"DIGEST-MD5 logins only work if libetpan has been compiled with SASL support "
-"and the DIGEST-MD5 SASL plugin is installed."
+"DIGEST-MD5 logins only work if libetpan has been compiled with SASL support and the DIGEST-MD5 SASL plugin is installed."
 msgstr ""
 "\n"
 "\n"
-"DIGEST-MD5 ensalutoj nur funkcias se libetpan estis kompilita kun SASL "
-"subteno kaj la DIGEST-MD5 SASL kromprogramo estas instalita."
+"DIGEST-MD5 ensalutoj nur funkcias se libetpan estis kompilita kun SASL subteno kaj la DIGEST-MD5 SASL kromprogramo estas instalita."
 
-#: ../src/imap.c:941
+#: ../src/imap.c:947
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Konekto al %s fiaskis: ensaluto rifuzita.%s"
 
-#: ../src/imap.c:945
+#: ../src/imap.c:951
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Konekto al %s fiaskis: ensaluto rifuzita.%s\n"
 
-#: ../src/imap.c:963
+#: ../src/imap.c:969
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Konekto al %s fiaskis"
 
-#: ../src/imap.c:970 ../src/imap.c:973
+#: ../src/imap.c:976 ../src/imap.c:979
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 konekto al %s estis diskonektita. Rekonektas...\n"
 
-#: ../src/imap.c:1003 ../src/imap.c:3583 ../src/imap.c:4242 ../src/imap.c:4339
-#: ../src/imap.c:4517 ../src/imap.c:5314
+#: ../src/imap.c:1009 ../src/imap.c:3619 ../src/imap.c:4278 ../src/imap.c:4375
+#: ../src/imap.c:4555 ../src/imap.c:5364
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail bezonas retan atingon por atingi la IMAP servilon."
 
-#: ../src/imap.c:1112 ../src/inc.c:818 ../src/news.c:387
+#: ../src/imap.c:1118 ../src/inc.c:818 ../src/news.c:387
 #: ../src/send_message.c:278
 msgid "Insecure connection"
 msgstr "Nesekura konekto"
 
-#: ../src/imap.c:1113 ../src/inc.c:819 ../src/news.c:388
+#: ../src/imap.c:1119 ../src/inc.c:819 ../src/news.c:388
 #: ../src/send_message.c:279
 msgid ""
-"This connection is configured to be secured using SSL, but SSL is not "
-"available in this build of Claws Mail. \n"
+"This connection is configured to be secured using SSL, but SSL 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."
+"Do you want to continue connecting to this server? The communication would not be secure."
 msgstr ""
-"Ĉi tiu konekto estas agordita esti sekurigita uzante SSL, sed SSL ne "
-"disponeblas en ĉi tiu konstruo de Claws Mail. \n"
+"Ĉi tiu konekto estas agordita esti sekurigita uzante SSL, sed SSL ne disponeblas en ĉi tiu konstruo de Claws Mail. \n"
 "\n"
 "Ĉu vi volas daŭrigi konekti al ĉi tiu servilo? La komunikado ne estus sekura."
 
-#: ../src/imap.c:1119 ../src/inc.c:825 ../src/news.c:394
+#: ../src/imap.c:1125 ../src/inc.c:825 ../src/news.c:394
 #: ../src/send_message.c:285
 msgid "Con_tinue connecting"
-msgstr "Daŭrigi konekti"
+msgstr "Daŭrigu konekti"
 
-#: ../src/imap.c:1129
+#: ../src/imap.c:1135
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Konto `%s': Konektas al IMAP4 servilo: %s:%d..."
 
-#: ../src/imap.c:1177
+#: ../src/imap.c:1183
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Ne povas konekti kun IMAP4 servilo: %s:%d"
 
-#: ../src/imap.c:1180
+#: ../src/imap.c:1186
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ne povas konekti al IMAP4 servilo: %s:%d\n"
 
-#: ../src/imap.c:1213 ../src/imap.c:4004
+#: ../src/imap.c:1219 ../src/imap.c:4040
 msgid "Can't start TLS session.\n"
 msgstr "Ne povas komenci TLS sesion.\n"
 
-#: ../src/imap.c:1276
+#: ../src/imap.c:1282
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Ne povis ensaluti al IMAP servilo %s.\n"
 
-#: ../src/imap.c:1279
+#: ../src/imap.c:1285
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Ne povis ensaluti al IMAP servilo %s."
 
-#: ../src/imap.c:1679
+#: ../src/imap.c:1703
 msgid "Adding messages..."
 msgstr "Aldonas mesaĝojn..."
 
-#: ../src/imap.c:1883 ../src/mh.c:520
+#: ../src/imap.c:1908 ../src/mh.c:526
 msgid "Copying messages..."
 msgstr "Kopias mesaĝojn..."
 
-#: ../src/imap.c:2465
+#: ../src/imap.c:2492
 msgid "can't set deleted flags\n"
 msgstr "ne povas starigi forigitajn flagojn\n"
 
-#: ../src/imap.c:2472 ../src/imap.c:4944
+#: ../src/imap.c:2499 ../src/imap.c:4994
 msgid "can't expunge\n"
 msgstr "ne povas forviŝi\n"
 
-#: ../src/imap.c:2823
+#: ../src/imap.c:2850
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Serĉas por nesubskribitaj dosierujoj en %s..."
 
-#: ../src/imap.c:2826
+#: ../src/imap.c:2853
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Serĉas por subdosierujoj de %s..."
 
-#: ../src/imap.c:3123
+#: ../src/imap.c:3159
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne povas krei poŝtkeston: LIST fiaskis\n"
 
-#: ../src/imap.c:3138
+#: ../src/imap.c:3174
 msgid "can't create mailbox\n"
 msgstr "ne povas krei poŝtkeston\n"
 
-#: ../src/imap.c:3229
+#: ../src/imap.c:3265
 msgid "New folder name must not contain the namespace path separator"
 msgstr "Nova dosieruja nomo devas ne enhavi la nomspacan vojan apartigilon"
 
-#: ../src/imap.c:3269
+#: ../src/imap.c:3305
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ne povas renomi poŝtkeston: %s al %s\n"
 
-#: ../src/imap.c:3382
+#: ../src/imap.c:3418
 msgid "can't delete mailbox\n"
 msgstr "ne povas forigi poŝtkeston\n"
 
-#: ../src/imap.c:3661
+#: ../src/imap.c:3697
 msgid "LIST failed\n"
 msgstr "LIST fiaskis\n"
 
-#: ../src/imap.c:3746
+#: ../src/imap.c:3782
 msgid "Flagging messages..."
 msgstr "Flagas mesaĝojn..."
 
-#: ../src/imap.c:3849
+#: ../src/imap.c:3885
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne povas elekti dosierujon: %s\n"
 
-#: ../src/imap.c:4001
+#: ../src/imap.c:4037
 msgid "Server requires TLS to log in.\n"
 msgstr "Servilo postulas TLS por ensaluti.\n"
 
-#: ../src/imap.c:4011
+#: ../src/imap.c:4047
 msgid "Can't refresh capabilities.\n"
 msgstr "Ne povas refreŝigi kapablecojn.\n"
 
-#: ../src/imap.c:4016
+#: ../src/imap.c:4052
 #, c-format
-msgid ""
-"Connection to %s failed: server requires TLS, but Claws Mail has been "
-"compiled without OpenSSL support.\n"
-msgstr ""
-"Konekto al %s fiaskis: servilo bezonas TLS, sed Claws Mail estis kompilita "
-"sen OpenSSL subteno.\n"
+msgid "Connection to %s failed: server requires TLS, but Claws Mail has been compiled without OpenSSL support.\n"
+msgstr "Konekto al %s fiaskis: servilo bezonas TLS, sed Claws Mail estis kompilita sen OpenSSL subteno.\n"
 
-#: ../src/imap.c:4024
+#: ../src/imap.c:4060
 msgid "Server logins are disabled.\n"
 msgstr "Servilaj ensalutoj estas malebligitaj.\n"
 
-#: ../src/imap.c:4247
+#: ../src/imap.c:4283
 msgid "Fetching message..."
 msgstr "Alportas mesaĝon..."
 
-#: ../src/imap.c:4937
+#: ../src/imap.c:4987
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Ne povas starigi forigitajn flagojn: %d\n"
 
-#: ../src/imap.c:5973
+#: ../src/imap.c:6023
 msgid ""
-"You have one or more IMAP accounts defined. However this version of Claws "
-"Mail has been built without IMAP support; your IMAP account(s) are "
-"disabled.\n"
+"You have one or more IMAP accounts defined. However this version of Claws Mail has been built without IMAP support; your IMAP account(s) are disabled.\n"
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
-"Vi havas unu aŭ pli da IMAP kontoj difinitaj. Tamen ĉi tiu versio de Claws "
-"Mail estis konstruita sen IMAP subteno; via(j) IMAP konto(j) estas "
-"malebligita(j).\n"
+"Vi havas unu aŭ pli da IMAP kontoj difinitaj. Tamen ĉi tiu versio de Claws Mail estis konstruita sen IMAP subteno; via(j) IMAP konto(j) estas malebligita(j).\n"
 "\n"
 "Vi probable bezonas instali libetpan kaj rekompili Claws Mail."
 
 #: ../src/imap_gtk.c:63 ../src/mh_gtk.c:55
 #: ../src/plugins/mailmbox/plugin_gtk.c:59
 msgid "Create _new folder..."
-msgstr "Krei _novan dosierujon..."
+msgstr "Kreu _novan dosierujon..."
 
 #: ../src/imap_gtk.c:65 ../src/mh_gtk.c:56 ../src/news_gtk.c:61
 #: ../src/plugins/mailmbox/plugin_gtk.c:60
 msgid "_Rename folder..."
-msgstr "_Renomi dosierujon..."
+msgstr "_Renomu dosierujon..."
 
 #: ../src/imap_gtk.c:66 ../src/mh_gtk.c:57
 #: ../src/plugins/mailmbox/plugin_gtk.c:61
 msgid "M_ove folder..."
-msgstr "M_ovi dosierujon..."
+msgstr "M_ovu dosierujon..."
 
 #: ../src/imap_gtk.c:67 ../src/mh_gtk.c:58
 #: ../src/plugins/mailmbox/plugin_gtk.c:62
 msgid "Cop_y folder..."
-msgstr "Kopii dosierujon..."
+msgstr "Kopiu dosierujon..."
 
 #: ../src/imap_gtk.c:69 ../src/mh_gtk.c:59
-#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:61
+#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:55
 msgid "_Delete folder..."
-msgstr "Forigi dosierujon..."
+msgstr "Forigu dosierujon..."
 
 #: ../src/imap_gtk.c:71 ../src/news_gtk.c:59
 msgid "Synchronise"
-msgstr "Sinkronigi"
+msgstr "Sinkronigu"
 
 #: ../src/imap_gtk.c:72 ../src/news_gtk.c:60
 msgid "Down_load messages"
-msgstr "Elŝuti mesaĝojn"
+msgstr "Elŝutu mesaĝojn"
 
 #: ../src/imap_gtk.c:75
 msgid "S_ubscriptions"
@@ -6187,32 +6064,32 @@ msgstr "S_ubskriboj"
 
 #: ../src/imap_gtk.c:77
 msgid "_Subscribe..."
-msgstr "_Subskribi..."
+msgstr "_Subskribu..."
 
 #: ../src/imap_gtk.c:78 ../src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Unsubscribe..."
-msgstr "Malsubskribi..."
+msgstr "Malsubskribu..."
 
 #: ../src/imap_gtk.c:80 ../src/mh_gtk.c:60 ../src/news_gtk.c:63
 #: ../src/plugins/mailmbox/plugin_gtk.c:64
 msgid "_Check for new messages"
-msgstr "Kontroli por novaj mesaĝoj"
+msgstr "Kontrolu por novaj mesaĝoj"
 
 #. 0
 #: ../src/imap_gtk.c:81 ../src/mh_gtk.c:61
 #: ../src/plugins/mailmbox/plugin_gtk.c:65
 msgid "C_heck for new folders"
-msgstr "Kontroli por novaj dosierujoj"
+msgstr "Kontrolu por novaj dosierujoj"
 
 #. 1
 #: ../src/imap_gtk.c:82 ../src/mh_gtk.c:62
 #: ../src/plugins/mailmbox/plugin_gtk.c:66
 msgid "R_ebuild folder tree"
-msgstr "R_ekonstrui dosierujan arbon"
+msgstr "R_ekonstruu dosierujan arbon"
 
 #: ../src/imap_gtk.c:87
 msgid "Show only subscribed _folders"
-msgstr "Montri nur subskribitajn dosierujojn"
+msgstr "Montru nur subskribitajn dosierujojn"
 
 #: ../src/imap_gtk.c:196
 msgid ""
@@ -6222,16 +6099,16 @@ msgid ""
 msgstr ""
 "Enigu la nomon de nova dosierujo:\n"
 "(se vi volas krei dosierujon por konservi nur\n"
-"subdosierujojn kaj neniu poŝto, aldoni `/' al\n"
+"subdosierujojn kaj neniu poŝto, aldonu `/' al\n"
 "la dosieruja nomo)"
 
 #: ../src/imap_gtk.c:200 ../src/mh_gtk.c:148
 msgid "Inherit properties from parent folder"
-msgstr "Heredi ecojn de gepatra dosierujo"
+msgstr "Heredu ecojn de gepatra dosierujo"
 
 #: ../src/imap_gtk.c:261 ../src/mh_gtk.c:249 ../src/news_gtk.c:306
 #: ../src/plugins/mailmbox/plugin_gtk.c:405
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:331
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:196
 #: ../src/plugins/vcalendar/vcal_folder.c:2032
 #, c-format
 msgid "Input new name for '%s':"
@@ -6239,14 +6116,14 @@ msgstr "Enigu novan nomon por `%s':"
 
 #: ../src/imap_gtk.c:263 ../src/mh_gtk.c:251
 #: ../src/plugins/mailmbox/plugin_gtk.c:406
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:332
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:197
 #: ../src/plugins/vcalendar/vcal_folder.c:2033
 msgid "Rename folder"
-msgstr "Renomi dosierujon"
+msgstr "Renomu dosierujon"
 
 #: ../src/imap_gtk.c:292 ../src/mh_gtk.c:274 ../src/news_gtk.c:328
 #: ../src/plugins/mailmbox/plugin_gtk.c:433
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:352
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:217
 #: ../src/plugins/vcalendar/vcal_folder.c:2053
 msgid ""
 "The folder could not be renamed.\n"
@@ -6256,26 +6133,24 @@ msgstr ""
 "La nova dosieruja nomo ne estas permesata."
 
 #: ../src/imap_gtk.c:360 ../src/mh_gtk.c:199
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:233
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:149
 #, c-format
 msgid ""
-"All folders and messages under '%s' will be permanently deleted. Recovery "
-"will not be possible.\n"
+"All folders and messages under '%s' will be permanently deleted. Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
 msgstr ""
-"Ĉiuj dosierujoj kaj mesaĝoj sub `%s' estos por ĉiam forigitaj. Restatigo ne "
-"eblos.\n"
+"Ĉiuj dosierujoj kaj mesaĝoj sub `%s' estos por ĉiam forigitaj. Restatigo ne eblos.\n"
 "\n"
 "Ĉu vi vere volas forigi?"
 
 #: ../src/imap_gtk.c:381 ../src/mh_gtk.c:220 ../src/news_gtk.c:281
 #: ../src/plugins/mailmbox/plugin_gtk.c:341
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:254
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:170
 #: ../src/plugins/vcalendar/vcal_folder.c:1986
 #, c-format
 msgid "Can't remove the folder '%s'."
-msgstr "Ne povis forigi la dosierujon `%s'."
+msgstr "Ne povas forigi la dosierujon `%s'."
 
 #: ../src/imap_gtk.c:507
 #, c-format
@@ -6284,7 +6159,7 @@ msgstr "Ĉu vi volas serĉi por nesubskribitaj subdosierujoj de `%s'?"
 
 #: ../src/imap_gtk.c:510
 msgid "Search recursively"
-msgstr "Serĉi rikure"
+msgstr "Serĉu rikure"
 
 #: ../src/imap_gtk.c:515 ../src/imap_gtk.c:574
 msgid "Subscriptions"
@@ -6292,16 +6167,16 @@ msgstr "Subskriboj"
 
 #: ../src/imap_gtk.c:516
 msgid "+_Search"
-msgstr "+_Serĉi"
+msgstr "+_Serĉu"
 
 #: ../src/imap_gtk.c:526
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Elektu subdosierujon de %s por subskribi al: "
 
-#: ../src/imap_gtk.c:537 ../src/mainwindow.c:672
+#: ../src/imap_gtk.c:537 ../src/mainwindow.c:674
 msgid "Subscribe"
-msgstr "Subskribi"
+msgstr "Subskribu"
 
 #: ../src/imap_gtk.c:539 ../src/imap_gtk.c:541
 msgid "All of them"
@@ -6311,14 +6186,11 @@ msgstr "Ĉiuj el ili"
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
-"If there are new folders, created and subscribed to from another client, use "
-"\"Check for new folders\" at the mailbox's root folder."
+"If there are new folders, created and subscribed to from another client, use \"Check for new folders\" at the mailbox's root folder."
 msgstr ""
-"Ĉi tiu dosierujo estas jam subskribita kaj havas neniujn nesubskribitajn "
-"subdosierujojn.\n"
+"Ĉi tiu dosierujo estas jam subskribita kaj havas neniujn nesubskribitajn subdosierujojn.\n"
 "\n"
-"Se estas novaj dosierujoj, kreitaj kaj subskribitaj de alia kliento, uzu "
-"\"Kontroli por novaj dosierujoj\" ĉe la poŝtkesta radika dosierujo."
+"Se estas novaj dosierujoj, kreitaj kaj subskribitaj de alia kliento, uzu \"Kontrolu por novaj dosierujoj\" ĉe la poŝtkesta radika dosierujo."
 
 #: ../src/imap_gtk.c:566
 #, c-format
@@ -6327,32 +6199,32 @@ msgstr "Ĉu vi volas %s la `%s' dosierujon?"
 
 #: ../src/imap_gtk.c:567
 msgid "subscribe"
-msgstr "subskribi"
+msgstr "subskribu"
 
 #: ../src/imap_gtk.c:567
 msgid "unsubscribe"
-msgstr "malsubskribi"
+msgstr "malsubskribu"
 
 #: ../src/imap_gtk.c:569 ../src/prefs_folder_item.c:1439
 #: ../src/prefs_folder_item.c:1467 ../src/prefs_folder_item.c:1495
 msgid "Apply to subfolders"
-msgstr "Apliki al subdosierujoj"
+msgstr "Apliku al subdosierujoj"
 
 #: ../src/imap_gtk.c:575
 msgid "+_Subscribe"
-msgstr "+_Subskribi"
+msgstr "+_Subskribu"
 
 #: ../src/imap_gtk.c:575
 msgid "+_Unsubscribe"
-msgstr "+Mals_ubskribi"
+msgstr "+Mals_ubskribu"
 
 #: ../src/import.c:113 ../src/import.c:207
 msgid "Import mbox file"
-msgstr "Importi mbox dosieron"
+msgstr "Importu mbox dosieron"
 
 #: ../src/import.c:131
 msgid "Locate the mbox file and specify the destination folder."
-msgstr "Loki la mbox dosieron kaj specifi la celan dosierujon."
+msgstr "Loku la mbox dosieron kaj specifi la celan dosierujon."
 
 #: ../src/import.c:148
 msgid "Destination folder:"
@@ -6368,7 +6240,7 @@ msgid ""
 "Import mbox file to the Inbox folder?"
 msgstr ""
 "Cela dosierujo ne estas agordita.\n"
-"Ĉu importi mbox dosieron al la Enkesta dosierujo?"
+"Ĉu importu mbox dosieron al la Enkesta dosierujo?"
 
 #: ../src/import.c:229
 msgid "Can't find the destination folder."
@@ -6376,7 +6248,7 @@ msgstr "Ne povas trovi la celan dosierujon."
 
 #: ../src/import.c:254
 msgid "Select importing file"
-msgstr "Elekti importan dosieron"
+msgstr "Elektu importan dosieron"
 
 #: ../src/importldif.c:186
 msgid "Please specify address book name and file to import."
@@ -6384,7 +6256,7 @@ msgstr "Bonvolu specifi adreslibran nomon kaj dosieron importi."
 
 #: ../src/importldif.c:189
 msgid "Select and rename LDIF field names to import."
-msgstr "Elekti kaj renomi LDIF kampajn nomojn por importi."
+msgstr "Elektu kaj renomu LDIF kampajn nomojn por importi."
 
 #: ../src/importldif.c:192
 msgid "File imported."
@@ -6404,15 +6276,11 @@ msgstr "LDIF dosiero importita sukcese."
 
 #: ../src/importldif.c:582
 msgid "Select LDIF File"
-msgstr "Elekti LDIF dosieron"
+msgstr "Elektu LDIF dosieron"
 
 #: ../src/importldif.c:668
-msgid ""
-"Specify the name for the address book that will be created from the LDIF "
-"file data."
-msgstr ""
-"Specifi la nomon por la adreslibro kiu estos kreita de la LDIF dosieraj "
-"datumoj."
+msgid "Specify the name for the address book that will be created from the LDIF file data."
+msgstr "Specifu la nomon por la adreslibro kiu estos kreita de la LDIF dosieraj datumoj."
 
 #: ../src/importldif.c:673
 msgid "File Name"
@@ -6424,7 +6292,7 @@ msgstr "La plena dosiera specifo de la LDIF dosiero por importi."
 
 #: ../src/importldif.c:690
 msgid "Select the LDIF file to import."
-msgstr "Elekti la LDIF dosieron por importi."
+msgstr "Elektu la LDIF dosieron por importi."
 
 #: ../src/importldif.c:726
 msgid "R"
@@ -6452,21 +6320,8 @@ msgid "Attribute"
 msgstr "Eco"
 
 #: ../src/importldif.c:808
-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 "
-"automatically imported and cannot be renamed. A single click in the Select "
-"(\"S\") column will select the field for import with a tick. A single click "
-"anywhere in the row will select that field for rename in the input area "
-"below the list. A double click anywhere in the row will also select the "
-"field for import."
-msgstr ""
-"Elektu la LDIF kampon kiu estos renomita aŭ elektita por importo en la listo "
-"supre. Rezervitaj kampoj (markitaj kun streketo en la \"R\" kolumno), estas "
-"aŭtomate importitaj kaj ne povas esti renomitaj. Unuopa alklako en la Elekta "
-"(\"E\") kolumno elektos la kampon por importi kun streketo. Unuopa alklako "
-"ie ajn en la vico elektos tiun kampon por renomi en la enigejo sub la listo. "
-"Duobla alklako ie ajn en la vico ankaŭ elektos la kampon por importi."
+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 automatically imported and cannot be renamed. A single click in the Select (\"S\") column will select the field for import with a tick. A single click anywhere in the row will select that field for rename in the input area below the list. A double click anywhere in the row will also select the field for import."
+msgstr "Elektu la LDIF kampon kiu estos renomita aŭ elektita por importo en la listo supre. Rezervitaj kampoj (markitaj kun streketo en la \"R\" kolumno), estas aŭtomate importitaj kaj ne povas esti renomitaj. Unuopa alklako en la Elekta (\"E\") kolumno elektos la kampon por importi kun streketo. Unuopa alklako ie ajn en la vico elektos tiun kampon por renomi en la enigejo sub la listo. Duobla alklako ie ajn en la vico ankaŭ elektos la kampon por importi."
 
 #: ../src/importldif.c:823
 msgid "The LDIF field can be renamed to the User Attribute name."
@@ -6474,15 +6329,15 @@ msgstr "La LDIF kampo povas esti renomita al la uzanta eca nomo."
 
 #: ../src/importldif.c:828
 msgid "Select for Import"
-msgstr "Elekti por Importi"
+msgstr "Elektu por Importi"
 
 #: ../src/importldif.c:833
 msgid "Select the LDIF field for import into the address book."
-msgstr "Elekti la LDIF kampon por importi en la adreslibron."
+msgstr "Elektu la LDIF kampon por importi en la adreslibron."
 
 #: ../src/importldif.c:835
 msgid " Modify "
-msgstr "Modifi"
+msgstr " Modifu "
 
 #: ../src/importldif.c:840
 msgid "This button will update the list above with the data supplied."
@@ -6494,11 +6349,11 @@ msgstr "Rikordoj importitaj :"
 
 #: ../src/importldif.c:944
 msgid "Import LDIF file into Address Book"
-msgstr "Importi LDIF dosieron en adreslibron"
+msgstr "Importu LDIF dosieron en adreslibron"
 
 #: ../src/importldif.c:981
 msgid "Proceed"
-msgstr "Daŭrigi"
+msgstr "Daŭrigu"
 
 #: ../src/importmutt.c:142
 msgid "Error importing MUTT file."
@@ -6506,11 +6361,11 @@ msgstr "Eraro importante MUTT dosieron."
 
 #: ../src/importmutt.c:157
 msgid "Select MUTT File"
-msgstr "Elekti MUTT dosieron"
+msgstr "Elektu MUTT dosieron"
 
 #: ../src/importmutt.c:204
 msgid "Import MUTT file into Address Book"
-msgstr "Importi MUTT dosieron en adreslibron"
+msgstr "Importu MUTT dosieron en adreslibron"
 
 #: ../src/importmutt.c:289 ../src/importpine.c:289
 msgid "Please select a file to import."
@@ -6522,7 +6377,7 @@ msgstr "Eraro importante Pine dosieron."
 
 #: ../src/importpine.c:156
 msgid "Select Pine File"
-msgstr "Elekti Pine dosieron"
+msgstr "Elektu Pine dosieron"
 
 #: ../src/importpine.c:203
 msgid "Import Pine file into Address Book"
@@ -6574,7 +6429,7 @@ msgid "Auth failed"
 msgstr "Aŭtentigo fiaskis"
 
 #. S_COL_SCORE
-#: ../src/inc.c:662 ../src/prefs_matcher.c:393
+#: ../src/inc.c:662 ../src/prefs_matcher.c:396
 #: ../src/prefs_summary_column.c:88 ../src/summaryview.c:2789
 #: ../src/summaryview.c:6310
 msgid "Locked"
@@ -6730,12 +6585,8 @@ msgstr ""
 "%s"
 
 #: ../src/inc.c:1222 ../src/send_message.c:690
-msgid ""
-"Session timed out. You may be able to recover by increasing the timeout "
-"value in Preferences/Other/Miscellaneous."
-msgstr ""
-"Sesio eltempiĝis. Vi povos eble restatigi per pligrandigo de la tempolima "
-"valoro en Preferoj/Alia/Diversaj."
+msgid "Session timed out. You may be able to recover by increasing the timeout value in Preferences/Other/Miscellaneous."
+msgstr "Sesio eltempiĝis. Vi povos eble restatigi per pligrandigo de la tempolima valoro en Preferoj/Alia/Diversaj."
 
 #: ../src/inc.c:1227
 #, c-format
@@ -6749,34 +6600,20 @@ msgstr "Enkorpigo nuligita\n"
 #: ../src/inc.c:1530
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
-msgstr "%s%sVi laboras senrete. Ĉu superregi dum %d minutoj?"
+msgstr "%s%sVi laboras senrete. Ĉu superregu dum %d minutoj?"
 
 #: ../src/inc.c:1536
 #, c-format
 msgid "%s%sYou're working offline. Override?"
-msgstr "%s%sVi laboras senrete. Ĉu superregi?"
+msgstr "%s%sVi laboras senrete. Ĉu superregu?"
 
 #: ../src/inc.c:1543
 msgid "On_ly once"
 msgstr "Nur unufoje"
 
-#: ../src/ldapupdate.c:189
-#, c-format
-msgid "ldapsvr_retrieve_item_person->Unknown status: %d"
-msgstr ""
-
-#: ../src/ldapupdate.c:472
-msgid "ldapsvr_update_book: Could not clean cache\n"
-msgstr ""
-
 #: ../src/ldapupdate.c:1056
 msgid "Some SN"
-msgstr ""
-
-#: ../src/ldapupdate.c:1440
-#, c-format
-msgid "ldapsvr_update_book->Unknown status: %s\n"
-msgstr ""
+msgstr "Kelka SN"
 
 #: ../src/ldif.c:776
 msgid "Nick Name"
@@ -6815,17 +6652,11 @@ msgstr ""
 
 #: ../src/main.c:377
 msgid "Keep old configuration"
-msgstr "Konservi malnovan agordon"
+msgstr "Konservu malnovan agordon"
 
 #: ../src/main.c:380
-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 "
-"on your disk."
-msgstr ""
-"Konservante savkopion permesos vin reiri al pli malnova versio, sed povas "
-"uzi iom da tempo se vi kaŝis IMAP aŭ novaĵajn datumojn, kaj uzos kroman "
-"spacon sur via disko."
+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 on your disk."
+msgstr "Konservante savkopion permesos vin reiri al pli malnova versio, sed povas uzi iom da tempo se vi kaŝis IMAP aŭ novaĵajn datumojn, kaj uzos kroman spacon sur via disko."
 
 #: ../src/main.c:388
 msgid "Migration of configuration"
@@ -6857,7 +6688,7 @@ msgstr "g_thread ne estas subtenata de glib.\n"
 
 #: ../src/main.c:1136
 msgid "Sylpheed-Claws 2.6.0 (or older)"
-msgstr "Sylhpheed-Claws 2.6.0 (aŭ pli malnova)"
+msgstr "Sylpheed-Claws 2.6.0 (aŭ pli malnova)"
 
 #: ../src/main.c:1139
 msgid "Sylpheed-Claws 1.9.15 (or older)"
@@ -6870,41 +6701,28 @@ msgstr "Sylpheed-Claws 1.0.5 (aŭ pli malnova)"
 #: ../src/main.c:1442
 #, c-format
 msgid ""
-"The following plugin failed to load. Check the Plugins configuration for "
-"more information:\n"
+"The following plugin failed to load. Check the Plugins configuration for more information:\n"
 "%s"
 msgid_plural ""
-"The following plugins failed to load. Check the Plugins configuration for "
-"more information:\n"
+"The following plugins failed to load. Check the Plugins configuration for more information:\n"
 "%s"
 msgstr[0] ""
-"La sekva kromprogramo malsukcesis ŝargi. Kontrolu la Kromprograman agordon "
-"por plua informo:\n"
+"La sekva kromprogramo malsukcesis ŝargi. Kontrolu la Kromprograman agordon por plua informo:\n"
 "%s"
 msgstr[1] ""
-"La sekvaj kromprogramoj malsukcesis ŝargi. Kontrolu la Kromprograman agordon "
-"por plua informo:\n"
+"La sekvaj kromprogramoj malsukcesis ŝargi. Kontrolu la Kromprograman agordon por plua informo:\n"
 "%s"
 
 #: ../src/main.c:1470
-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 "
-"mailbox parent folder's context menu to try to fix it."
+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 mailbox parent folder's context menu to try to fix it."
 msgstr ""
 "Claws Mail detektis agorditan poŝtkeston, sed ĝi estas malkompleta.\n"
-"Ĝi estas eble kaŭzita de fiaskanta IMAP konto. Uzu \"Rekonstrui dosierujan\n"
+"Ĝi estas eble kaŭzita de fiaskanta IMAP konto. Uzu \"Rekonstruu dosierujan\n"
 "arbon\" ĉe la kunteksta menuo de la gepatra dosierujo por provi solvi ĝin."
 
 #: ../src/main.c:1476
-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 "
-"plugin and try again."
-msgstr ""
-"Claws Mail detektis agorditan poŝtkeston, sed ne povis ŝargi ĝin. Ĝi estas "
-"eble provizata de eksmoda ekstera kromprogramo. Bonvolu reinstali la "
-"kromprogramon kaj reprovu."
+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 plugin and try again."
+msgstr "Claws Mail detektis agorditan poŝtkeston, sed ne povis ŝargi ĝin. Ĝi estas eble provizata de eksmoda ekstera kromprogramo. Bonvolu reinstali la kromprogramon kaj reprovu."
 
 #: ../src/main.c:1726
 msgid "Missing filename\n"
@@ -6933,28 +6751,25 @@ msgstr "Uzado: %s [OPCIO]...\n"
 
 #: ../src/main.c:1907
 msgid "  --compose [address]    open composition window"
-msgstr "  --compose [adreso]     malfermi komponan fenestron"
+msgstr "  --compose [adreso]     malfermu komponan fenestron"
 
 #: ../src/main.c:1908
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
-"                         use - as file name for reading from standard "
-"input;\n"
-"                         content format: headers first (To: required) until "
-"an\n"
+"                         use - as file name for reading from standard input;\n"
+"                         content format: headers first (To: required) until an\n"
 "                         empty line, then mail body until end of file."
 msgstr ""
 "  --compose-from-file dosiero\n"
-"                        malfermi komponan fenestron kun datumoj de donata "
-"dosiero;\n"
-"                        uzi - kiel dosiernomo por legi de ĉefenigujo;\n"
+"                        malfermu komponan fenestron kun datumoj de donata dosiero;\n"
+"                        uzu - kiel dosiernomo por legi de ĉefenigujo;\n"
 "                        enhavo aranĝo: ĉapoj unue (Al: bezonata) ĝis\n"
 "                        malplena linio, tiam poŝta korpo ĝis dosierfino."
 
 #: ../src/main.c:1913
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
-msgstr "  --subscribe [uri]      subskribi al la donata URI se eble"
+msgstr "  --subscribe [uri]      subskribu al la donata URI se eble"
 
 #: ../src/main.c:1914
 msgid ""
@@ -6963,55 +6778,50 @@ msgid ""
 "                         attached"
 msgstr ""
 "  --attach dos1 [dos]...\n"
-"                         malfermi komponan fenestron kun specifitaj "
-"dosieroj\n"
+"                         malfermu komponan fenestron kun specifitaj dosieroj\n"
 "                         algluitaj"
 
 #: ../src/main.c:1917
 msgid "  --receive              receive new messages"
-msgstr "  --receive              ricevi novajn mesaĝojn"
+msgstr "  --receive              ricevu novajn mesaĝojn"
 
 #: ../src/main.c:1918
 msgid "  --receive-all          receive new messages of all accounts"
-msgstr "  --receive-all          ricevi novajn mesaĝojn de ĉiuj kontoj"
+msgstr "  --receive-all          ricevu novajn mesaĝojn de ĉiuj kontoj"
 
 #: ../src/main.c:1919
 msgid "  --cancel-receiving     cancel receiving of messages"
-msgstr "  --cancel-receiving     nuligi ricevon de mesaĝoj"
+msgstr "  --cancel-receiving     nuligu ricevon de mesaĝoj"
 
 #: ../src/main.c:1920
 msgid "  --cancel-sending       cancel sending of messages"
-msgstr "  --cancel-sending       nuligi sendon de mesaĝoj"
+msgstr "  --cancel-sending       nuligu sendon de mesaĝoj"
 
 #: ../src/main.c:1921
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
 "                         folder ex.: \"#mh/Mailbox/inbox\" or \"Mail\"\n"
-"                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] or "
-"g: tag\n"
+"                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] or g: tag\n"
 "                         request: search string\n"
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr ""
 "  --search dosieruja tipa peto [rikura]\n"
 "                        serĉas poŝtan dosierujon\n"
 "                          ekz.: \"#mh/Poŝtkesto/enkesto\" aŭ \"Poŝto\"\n"
-"                        tipo: s[ubject] (temo),f[rom] (de),t[o] "
-"(al),                              e[xtended] (etendita),m[ixed] (diversa) "
-"aŭ                               g: tag (etikedo)\n"
+"                        tipo: s[ubject] (temo),f[rom] (de),t[o] (al),                              e[xtended] (etendita),m[ixed] (diversa) aŭ                               g: tag (etikedo)\n"
 "                        peto: serĉa ĉeno\n"
-"                        rikura: `false' se arg. komenciĝas kun 0, n, N, f aŭ "
-"F"
+"                        rikura: `false' se arg. komenciĝas kun 0, n, N, f aŭ F"
 
 #: ../src/main.c:1928
 msgid "  --send                 send all queued messages"
-msgstr "  --send                 sendi ĉiujn vicigitajn mesaĝojn"
+msgstr "  --send                 sendu ĉiujn vicigitajn mesaĝojn"
 
 #: ../src/main.c:1929
 msgid "  --status [folder]...   show the total number of messages"
 msgstr ""
 "  --status [dosierujo]...\n"
-"                         montri la suman nombron da mesaĝoj"
+"                         montru la suman nombron da mesaĝoj"
 
 #: ../src/main.c:1930
 msgid ""
@@ -7019,15 +6829,15 @@ msgid ""
 "                         show the status of each folder"
 msgstr ""
 "  -status-full [dosierujo]...\n"
-"                         montri la staton de ĉiu dosierujo"
+"                         montru la staton de ĉiu dosierujo"
 
 #: ../src/main.c:1932
 msgid "  --statistics           show session statistics"
-msgstr "  --statistics           montri sesiajn statistikojn"
+msgstr "  --statistics           montru sesiajn statistikojn"
 
 #: ../src/main.c:1933
 msgid "  --reset-statistics     reset session statistics"
-msgstr "  --reset-statistics     rekomencigi sesiajn statistikojn"
+msgstr "  --reset-statistics     rekomencigu sesiajn statistikojn"
 
 #: ../src/main.c:1934
 msgid ""
@@ -7040,15 +6850,15 @@ msgstr ""
 
 #: ../src/main.c:1936
 msgid "  --online               switch to online mode"
-msgstr "  --online               ŝalti al surreta reĝimo"
+msgstr "  --online               ŝaltu al surreta reĝimo"
 
 #: ../src/main.c:1937
 msgid "  --offline              switch to offline mode"
-msgstr "  --offline              ŝalti al senreta reĝimo"
+msgstr "  --offline              ŝaltu al senreta reĝimo"
 
 #: ../src/main.c:1938
 msgid "  --exit --quit -q       exit Claws Mail"
-msgstr "  --exit --quit -q       eliri Claws Mail"
+msgstr "  --exit --quit -q       eliru Claws Mail"
 
 #: ../src/main.c:1939
 msgid "  --debug                debug mode"
@@ -7056,27 +6866,23 @@ msgstr "  --debug                senmisiga reĝimo"
 
 #: ../src/main.c:1940
 msgid "  --toggle-debug         toggle debug mode"
-msgstr "  --toggle-debug         baskuli senmisigan reĝimon"
+msgstr "  --toggle-debug         baskulu senmisigan reĝimon"
 
 #: ../src/main.c:1941
 msgid "  --help -h              display this help and exit"
-msgstr "  --help -h              montri ĉi tiun helpon kaj eliri"
+msgstr "  --help -h              montru ĉi tiun helpon kaj eliru"
 
 #: ../src/main.c:1942
 msgid "  --version -v           output version information and exit"
-msgstr "  --version -v           eligi versian informon kaj eliri"
+msgstr "  --version -v           eligu versian informon kaj eliru"
 
 #: ../src/main.c:1943
-msgid ""
-"  --version-full -V      output version and built-in features information "
-"and exit"
-msgstr ""
-"  --version-full -V      eligi version kaj enkonstruitajn trajtajn informojn "
-"kaj eliri"
+msgid "  --version-full -V      output version and built-in features information and exit"
+msgstr "  --version-full -V      eligu version kaj enkonstruitajn trajtajn informojn kaj eliru"
 
 #: ../src/main.c:1944
 msgid "  --config-dir           output configuration directory"
-msgstr "  --config-dir           eliri agordan dosierujon"
+msgstr "  --config-dir           eliru agordan dosierujon"
 
 #: ../src/main.c:1945
 msgid ""
@@ -7084,7 +6890,7 @@ msgid ""
 "                         use specified configuration directory"
 msgstr ""
 "  --alternate-config-dir [ujo]\n"
-"                         uzi specifitan agordan dosierujon"
+"                         uzu specifitan agordan dosierujon"
 
 #: ../src/main.c:1995
 #, c-format
@@ -7106,7 +6912,7 @@ msgstr "Vicigitaj mesaĝoj"
 
 #: ../src/main.c:2100
 msgid "Some unsent messages are queued. Exit now?"
-msgstr "Kelkaj nesenditaj mesaĝoj estas envicigitaj. Ĉu eliri nun?"
+msgstr "Kelkaj nesenditaj mesaĝoj estas envicigitaj. Ĉu eliru nun?"
 
 #: ../src/main.c:2843
 msgid "NetworkManager: network is online.\n"
@@ -7117,506 +6923,506 @@ msgid "NetworkManager: network is offline.\n"
 msgstr "Retmastrumilo: reto estas nekonektita.\n"
 
 #. menus
-#: ../src/mainwindow.c:503 ../src/messageview.c:209
+#: ../src/mainwindow.c:505 ../src/messageview.c:209
 msgid "_File"
 msgstr "Dosiero"
 
-#: ../src/mainwindow.c:505 ../src/messageview.c:211 ../src/summaryview.c:434
+#: ../src/mainwindow.c:507 ../src/messageview.c:211 ../src/summaryview.c:434
 msgid "_View"
-msgstr "_Vidi"
+msgstr "_Vidu"
 
-#: ../src/mainwindow.c:508
+#: ../src/mainwindow.c:510
 msgid "_Configuration"
 msgstr "Agordo"
 
 #. File menu
-#: ../src/mainwindow.c:512
+#: ../src/mainwindow.c:514
 msgid "_Add mailbox"
-msgstr "_Aldoni poŝtkeston"
+msgstr "_Aldonu poŝtkeston"
 
-#: ../src/mainwindow.c:513
+#: ../src/mainwindow.c:515
 msgid "MH..."
 msgstr "MH..."
 
-#: ../src/mainwindow.c:516
+#: ../src/mainwindow.c:518
 msgid "Change mailbox order..."
-msgstr "Ŝanĝi poŝtkestan ordon..."
+msgstr "Ŝanĝu poŝtkestan ordon..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:519
+#: ../src/mainwindow.c:521
 msgid "_Import mbox file..."
-msgstr "_Importi mbox dosieron..."
+msgstr "_Importu mbox dosieron..."
 
-#: ../src/mainwindow.c:520
+#: ../src/mainwindow.c:522
 msgid "_Export to mbox file..."
-msgstr "_Eksporti al mbox dosieron..."
+msgstr "_Eksportu al mbox dosieron..."
 
-#: ../src/mainwindow.c:521
+#: ../src/mainwindow.c:523
 msgid "_Export selected to mbox file..."
-msgstr "_Eksporti elektitan al mbox dosiero..."
+msgstr "_Eksportu elektitan al mbox dosiero..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:523
+#: ../src/mainwindow.c:525
 msgid "Empty all _Trash folders"
-msgstr "Malplenigi ĉiujn rubujajn dosierujojn"
+msgstr "Malplenigu ĉiujn rubujajn dosierujojn"
 
 #. {"File/---",				NULL, "---" },
 #. File menu
-#: ../src/mainwindow.c:526 ../src/messageview.c:218
+#: ../src/mainwindow.c:528 ../src/messageview.c:218
 msgid "_Save email as..."
-msgstr "Konservi mesaĝon kiel..."
+msgstr "Konservu mesaĝon kiel..."
 
-#: ../src/mainwindow.c:527 ../src/messageview.c:219
+#: ../src/mainwindow.c:529 ../src/messageview.c:219
 msgid "_Save part as..."
-msgstr "Konservi parton kiel..."
+msgstr "Konservu parton kiel..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:530 ../src/messageview.c:220
+#: ../src/mainwindow.c:532 ../src/messageview.c:220
 msgid "Page setup..."
 msgstr "Paĝa agordo"
 
-#: ../src/mainwindow.c:531 ../src/messageview.c:221
+#: ../src/mainwindow.c:533 ../src/messageview.c:221
 msgid "_Print..."
-msgstr "_Presi..."
+msgstr "_Presu..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:533
+#: ../src/mainwindow.c:535
 msgid "Synchronise folders"
-msgstr "Sinkronigi dosierujojn"
+msgstr "Sinkronigu dosierujojn"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:535
+#: ../src/mainwindow.c:537
 msgid "E_xit"
-msgstr "Eliri"
+msgstr "Eliru"
 
-#: ../src/mainwindow.c:540
+#: ../src/mainwindow.c:542
 msgid "Select _thread"
-msgstr "Elek_ti fadenon"
+msgstr "Elek_tu fadenon"
 
-#: ../src/mainwindow.c:541
+#: ../src/mainwindow.c:543
 msgid "_Delete thread"
-msgstr "Forigi fa_denon"
+msgstr "Forigu fa_denon"
 
-#: ../src/mainwindow.c:543
+#: ../src/mainwindow.c:545
 msgid "_Find in current message..."
-msgstr "Trovi en nuna mesaĝo..."
+msgstr "Trovu en nuna mesaĝo..."
 
-#: ../src/mainwindow.c:545
+#: ../src/mainwindow.c:547
 msgid "_Quick search"
 msgstr "Rapida serĉo"
 
 #. View menu
-#: ../src/mainwindow.c:548
+#: ../src/mainwindow.c:550
 msgid "Show or hi_de"
-msgstr "Montri aŭ kaŝi"
+msgstr "Montru aŭ kaŝu"
 
-#: ../src/mainwindow.c:549
+#: ../src/mainwindow.c:551
 msgid "_Toolbar"
 msgstr "Ilbre_to"
 
-#: ../src/mainwindow.c:551
+#: ../src/mainwindow.c:553
 msgid "Set displayed _columns"
-msgstr "Starigi montritajn kolumnojn"
+msgstr "Starigu montritajn kolumnojn"
 
-#: ../src/mainwindow.c:552
+#: ../src/mainwindow.c:554
 msgid "In _folder list..."
 msgstr "En dosieruja listo..."
 
-#: ../src/mainwindow.c:553
+#: ../src/mainwindow.c:555
 msgid "In _message list..."
 msgstr "En _mesaĝa listo..."
 
-#: ../src/mainwindow.c:558
+#: ../src/mainwindow.c:560
 msgid "La_yout"
 msgstr "Aranĝo"
 
-#: ../src/mainwindow.c:561
+#: ../src/mainwindow.c:563
 msgid "_Sort"
-msgstr "Ordigi"
+msgstr "Ordigu"
 
-#: ../src/mainwindow.c:563
+#: ../src/mainwindow.c:565
 msgid "_Attract by subject"
-msgstr "_Allogi laŭ temo"
+msgstr "_Allogu laŭ temo"
 
-#: ../src/mainwindow.c:565
+#: ../src/mainwindow.c:567
 msgid "E_xpand all threads"
-msgstr "Ekspansigi ĉiujn fadenojn"
+msgstr "Ekspansigu ĉiujn fadenojn"
 
-#: ../src/mainwindow.c:566
+#: ../src/mainwindow.c:568
 msgid "Co_llapse all threads"
-msgstr "Malekspansigi ĉiujn fadenojn"
+msgstr "Malekspansigu ĉiujn fadenojn"
 
 #. View menu
-#: ../src/mainwindow.c:568 ../src/messageview.c:232
+#: ../src/mainwindow.c:570 ../src/messageview.c:232
 msgid "_Go to"
 msgstr "Iru al"
 
-#: ../src/mainwindow.c:569 ../src/messageview.c:233
+#: ../src/mainwindow.c:571 ../src/messageview.c:233
 msgid "_Previous message"
 msgstr "Antaŭa mesaĝo"
 
-#: ../src/mainwindow.c:570 ../src/messageview.c:234
+#: ../src/mainwindow.c:572 ../src/messageview.c:234
 msgid "_Next message"
 msgstr "Sekva mesaĝo"
 
-#: ../src/mainwindow.c:572 ../src/messageview.c:236
+#: ../src/mainwindow.c:574 ../src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "Antaŭa nelegita mesaĝo"
 
-#: ../src/mainwindow.c:573 ../src/messageview.c:237
+#: ../src/mainwindow.c:575 ../src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Sekva nelegita mesaĝo"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:575 ../src/messageview.c:239
+#: ../src/mainwindow.c:577 ../src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Antaŭa nova mesaĝo"
 
-#: ../src/mainwindow.c:576 ../src/messageview.c:240
+#: ../src/mainwindow.c:578 ../src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Sekva nova mesaĝo"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:578 ../src/messageview.c:242
+#: ../src/mainwindow.c:580 ../src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Antaŭa markita mesaĝo"
 
-#: ../src/mainwindow.c:579 ../src/messageview.c:243
+#: ../src/mainwindow.c:581 ../src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Sekva markita mesaĝo"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:581 ../src/messageview.c:245
+#: ../src/mainwindow.c:583 ../src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Antaŭa etikedita mesaĝo"
 
-#: ../src/mainwindow.c:582 ../src/messageview.c:246
+#: ../src/mainwindow.c:584 ../src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Sekva etikedita mesaĝo"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:584 ../src/messageview.c:248
+#: ../src/mainwindow.c:586 ../src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Antaŭa malfermita mesaĝo"
 
-#: ../src/mainwindow.c:585 ../src/messageview.c:249
+#: ../src/mainwindow.c:587 ../src/messageview.c:249
 msgid "Next opened message"
 msgstr "Sekva malfermita mesaĝo"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:587 ../src/messageview.c:251
+#: ../src/mainwindow.c:589 ../src/messageview.c:251
 msgid "Parent message"
 msgstr "Gepatra mesaĝo"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:589 ../src/messageview.c:253
+#: ../src/mainwindow.c:591 ../src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Sekva nelegita dosierujo"
 
-#: ../src/mainwindow.c:590 ../src/messageview.c:254
+#: ../src/mainwindow.c:592 ../src/messageview.c:254
 msgid "_Other folder..."
 msgstr "Alia dosierujo..."
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:592 ../src/messageview.c:256 ../src/mimeview.c:201
+#: ../src/mainwindow.c:594 ../src/messageview.c:256 ../src/mimeview.c:201
 msgid "Next part"
 msgstr "Sekva parto"
 
-#: ../src/mainwindow.c:593 ../src/messageview.c:257 ../src/mimeview.c:202
+#: ../src/mainwindow.c:595 ../src/messageview.c:257 ../src/mimeview.c:202
 msgid "Previous part"
 msgstr "Antaŭa parto"
 
 #. {"View/Scroll/---",                  NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:596 ../src/messageview.c:258
+#: ../src/mainwindow.c:598 ../src/messageview.c:258
 msgid "Message scroll"
 msgstr "Mesaĝa rulumado"
 
-#: ../src/mainwindow.c:597 ../src/messageview.c:259
+#: ../src/mainwindow.c:599 ../src/messageview.c:259
 msgid "Previous line"
 msgstr "Antaŭa linio"
 
-#: ../src/mainwindow.c:598 ../src/messageview.c:260
+#: ../src/mainwindow.c:600 ../src/messageview.c:260
 msgid "Next line"
 msgstr "Sekva linio"
 
-#: ../src/mainwindow.c:599 ../src/messageview.c:261 ../src/printing.c:481
+#: ../src/mainwindow.c:601 ../src/messageview.c:261 ../src/printing.c:481
 msgid "Previous page"
 msgstr "Antaŭa paĝo"
 
-#: ../src/mainwindow.c:600 ../src/messageview.c:262 ../src/printing.c:488
+#: ../src/mainwindow.c:602 ../src/messageview.c:262 ../src/printing.c:488
 msgid "Next page"
 msgstr "Sekva paĝo"
 
-#: ../src/mainwindow.c:618 ../src/messageview.c:280
+#: ../src/mainwindow.c:620 ../src/messageview.c:280
 msgid "Decode"
-msgstr "Malkodi"
+msgstr "Malkodu"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:625
+#: ../src/mainwindow.c:627
 msgid "Open in new _window"
-msgstr "Malfermi en nova fenestro"
+msgstr "Malfermu en nova fenestro"
 
-#: ../src/mainwindow.c:626 ../src/messageview.c:287
+#: ../src/mainwindow.c:628 ../src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Mesaĝa fonto"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:628 ../src/messageview.c:288
+#: ../src/mainwindow.c:630 ../src/messageview.c:288
 msgid "Message part"
 msgstr "Mesaĝa parto"
 
-#: ../src/mainwindow.c:629 ../src/messageview.c:289
+#: ../src/mainwindow.c:631 ../src/messageview.c:289
 msgid "View as text"
-msgstr "Vidi kiel teksto"
+msgstr "Vidu kiel teksto"
 
-#: ../src/mainwindow.c:630 ../src/messageview.c:290 ../src/toolbar.c:403
+#: ../src/mainwindow.c:632 ../src/messageview.c:290 ../src/toolbar.c:403
 msgid "Open"
-msgstr "Malfermi"
+msgstr "Malfermu"
 
-#: ../src/mainwindow.c:632 ../src/messageview.c:292
+#: ../src/mainwindow.c:634 ../src/messageview.c:292
 msgid "Open with..."
-msgstr "Malfermi kun..."
+msgstr "Malfermu kun..."
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:636 ../src/messageview.c:295
+#: ../src/mainwindow.c:638 ../src/messageview.c:295
 msgid "Quotes"
 msgstr "Citoj"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:638
+#: ../src/mainwindow.c:640
 msgid "_Update summary"
 msgstr "Ĝisdatiga res_umo"
 
 #. Message menu
-#: ../src/mainwindow.c:641
+#: ../src/mainwindow.c:643
 msgid "Recei_ve"
-msgstr "Rice_vi"
+msgstr "Rice_vu"
 
-#: ../src/mainwindow.c:642
+#: ../src/mainwindow.c:644
 msgid "Get from _current account"
-msgstr "Havigi de nuna konto"
+msgstr "Havigu de nuna konto"
 
-#: ../src/mainwindow.c:643
+#: ../src/mainwindow.c:645
 msgid "Get from _all accounts"
-msgstr "Havigi de ĉiuj kontoj"
+msgstr "Havigu de ĉiuj kontoj"
 
-#: ../src/mainwindow.c:644
+#: ../src/mainwindow.c:646
 msgid "Cancel receivin_g"
-msgstr "Nuligi ricevadon"
+msgstr "Nuligu ricevadon"
 
-#: ../src/mainwindow.c:647
+#: ../src/mainwindow.c:649
 msgid "_Send queued messages"
-msgstr "Sendi vicigitajn mesaĝojn"
+msgstr "Sendu vicigitajn mesaĝojn"
 
-#: ../src/mainwindow.c:652
+#: ../src/mainwindow.c:654
 msgid "Compose a_n email message"
-msgstr "Verki retpoŝtan mesaĝon"
+msgstr "Verku retpoŝtan mesaĝon"
 
-#: ../src/mainwindow.c:653
+#: ../src/mainwindow.c:655
 msgid "Compose a news message"
-msgstr "Verki novaĵmesaĝon"
+msgstr "Verku novaĵmesaĝon"
 
-#: ../src/mainwindow.c:655 ../src/messageview.c:301
+#: ../src/mainwindow.c:657 ../src/messageview.c:301
 #: ../src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
-msgstr "_Respondi"
+msgstr "_Respondu"
 
 #. COMPOSE_REPLY
-#: ../src/mainwindow.c:656 ../src/messageview.c:302 ../src/summaryview.c:426
+#: ../src/mainwindow.c:658 ../src/messageview.c:302 ../src/summaryview.c:426
 msgid "Repl_y to"
-msgstr "Respondi al"
+msgstr "Respondu al"
 
 #. COMPOSE_REPLY_TO_SENDER
-#: ../src/mainwindow.c:659 ../src/messageview.c:305
+#: ../src/mainwindow.c:661 ../src/messageview.c:305
 msgid "Mailing _list"
 msgstr "Poŝt_listo"
 
 #. COMPOSE_REPLY_TO_LIST
-#: ../src/mainwindow.c:660
+#: ../src/mainwindow.c:662
 msgid "Follow-up and reply to"
-msgstr "Postatenti kaj respondi al"
+msgstr "Postatentu kaj respondu al"
 
 #. COMPOSE_FOLLOWUP_AND_REPLY_TO
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REPLY_TO_LIST
 #. {"Message/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:663 ../src/messageview.c:308 ../src/toolbar.c:2069
+#: ../src/mainwindow.c:665 ../src/messageview.c:308 ../src/toolbar.c:2069
 msgid "_Forward"
-msgstr "Plusendi"
+msgstr "Plusendu"
 
 #. COMPOSE_FORWARD_INLINE
-#: ../src/mainwindow.c:664 ../src/messageview.c:309 ../src/toolbar.c:2070
+#: ../src/mainwindow.c:666 ../src/messageview.c:309 ../src/toolbar.c:2070
 msgid "For_ward as attachment"
-msgstr "Plusendi kiel algluaĵo"
+msgstr "Plusendu kiel algluaĵo"
 
 #. COMPOSE_FORWARD_AS_ATTACH
-#: ../src/mainwindow.c:665 ../src/messageview.c:310 ../src/toolbar.c:2071
+#: ../src/mainwindow.c:667 ../src/messageview.c:310 ../src/toolbar.c:2071
 msgid "Redirec_t"
-msgstr "Redirekti"
+msgstr "Redirektu"
 
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:667
+#: ../src/mainwindow.c:669
 msgid "Mailing-_List"
 msgstr "Poŝt_listo"
 
-#: ../src/mainwindow.c:668
+#: ../src/mainwindow.c:670
 msgid "Post"
-msgstr "Poŝti"
+msgstr "Poŝtu"
 
-#: ../src/mainwindow.c:670
+#: ../src/mainwindow.c:672
 msgid "Help"
 msgstr "Helpo"
 
-#: ../src/mainwindow.c:674
+#: ../src/mainwindow.c:676
 msgid "Unsubscribe"
-msgstr "Malsubskribi"
+msgstr "Malsubskribu"
 
-#: ../src/mainwindow.c:676
+#: ../src/mainwindow.c:678
 msgid "View archive"
-msgstr "Vidi arĥivon"
+msgstr "Vidu arĥivon"
 
-#: ../src/mainwindow.c:678
+#: ../src/mainwindow.c:680
 msgid "Contact owner"
-msgstr "Kontakti posedanton"
+msgstr "Kontaktu posedanton"
 
 #. separation
-#: ../src/mainwindow.c:682
+#: ../src/mainwindow.c:684
 msgid "M_ove..."
-msgstr "M_ovi..."
+msgstr "M_ovu..."
 
-#: ../src/mainwindow.c:683
+#: ../src/mainwindow.c:685
 msgid "_Copy..."
-msgstr "Kopii..."
+msgstr "Kopiu..."
 
-#: ../src/mainwindow.c:684
+#: ../src/mainwindow.c:686
 msgid "Move to _trash"
-msgstr "Movi al rubujo"
+msgstr "Movu al rubujo"
 
-#: ../src/mainwindow.c:685
+#: ../src/mainwindow.c:687
 msgid "_Delete..."
-msgstr "Forigi..."
+msgstr "Forigu..."
 
-#: ../src/mainwindow.c:686
+#: ../src/mainwindow.c:688
 msgid "Cancel a news message"
-msgstr "Nuligi novaĵmesaĝon"
+msgstr "Nuligu novaĵmesaĝon"
 
 #. separation
-#: ../src/mainwindow.c:689 ../src/mainwindow.c:690 ../src/summaryview.c:427
+#: ../src/mainwindow.c:691 ../src/mainwindow.c:692 ../src/summaryview.c:427
 msgid "_Mark"
-msgstr "_Marki"
+msgstr "_Marku"
 
-#: ../src/mainwindow.c:691
+#: ../src/mainwindow.c:693
 msgid "_Unmark"
-msgstr "Malmarki"
+msgstr "Malmarku"
 
-#: ../src/mainwindow.c:694
+#: ../src/mainwindow.c:696
 msgid "Mark as unr_ead"
-msgstr "Marki kiel nelegita"
+msgstr "Marku kiel nelegita"
 
-#: ../src/mainwindow.c:695
+#: ../src/mainwindow.c:697
 msgid "Mark as rea_d"
-msgstr "Marki kiel legita"
+msgstr "Marku kiel legita"
 
 #. separation
-#: ../src/mainwindow.c:697
+#: ../src/mainwindow.c:699
 msgid "Mark all read"
-msgstr "Marki ĉiujn legitaj"
+msgstr "Marku ĉiujn legitaj"
 
 #. separation
-#: ../src/mainwindow.c:699 ../src/prefs_filtering_action.c:199
+#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:199
 #: ../src/toolbar.c:208 ../src/toolbar.c:419
 msgid "Ignore thread"
-msgstr "Ignori fadenon"
+msgstr "Ignoru fadenon"
 
-#: ../src/mainwindow.c:700
+#: ../src/mainwindow.c:702
 msgid "Unignore thread"
-msgstr "Malignori fadenon"
+msgstr "Malignoru fadenon"
 
-#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:200
+#: ../src/mainwindow.c:703 ../src/prefs_filtering_action.c:200
 #: ../src/toolbar.c:209 ../src/toolbar.c:420
 msgid "Watch thread"
-msgstr "Observadi fadenon"
+msgstr "Observadu fadenon"
 
-#: ../src/mainwindow.c:702
+#: ../src/mainwindow.c:704
 msgid "Unwatch thread"
-msgstr "Malobservadi fadenon"
+msgstr "Malobservadu fadenon"
 
 #. separation
-#: ../src/mainwindow.c:705
+#: ../src/mainwindow.c:707
 msgid "Mark as _spam"
-msgstr "Marki kiel spamo"
+msgstr "Marku kiel spamo"
 
-#: ../src/mainwindow.c:706
+#: ../src/mainwindow.c:708
 msgid "Mark as _ham"
-msgstr "Marki kiel nespamo"
+msgstr "Marku kiel nespamo"
 
 #. separation
-#: ../src/mainwindow.c:709 ../src/prefs_filtering_action.c:181
+#: ../src/mainwindow.c:711 ../src/prefs_filtering_action.c:181
 msgid "Lock"
-msgstr "Ŝlosi"
+msgstr "Ŝlosu"
 
-#: ../src/mainwindow.c:710 ../src/prefs_filtering_action.c:182
+#: ../src/mainwindow.c:712 ../src/prefs_filtering_action.c:182
 msgid "Unlock"
-msgstr "Malŝlosi"
+msgstr "Malŝlosu"
 
-#: ../src/mainwindow.c:712 ../src/summaryview.c:428
+#: ../src/mainwindow.c:714 ../src/summaryview.c:428
 msgid "Color la_bel"
 msgstr "Kolora etikedo"
 
-#: ../src/mainwindow.c:713 ../src/summaryview.c:429
+#: ../src/mainwindow.c:715 ../src/summaryview.c:429
 msgid "Ta_gs"
 msgstr "Etikedoj"
 
 #. {"Message/---",			NULL, "---" },
-#: ../src/mainwindow.c:716
+#: ../src/mainwindow.c:718
 msgid "Re-_edit"
-msgstr "Re-r_edakti"
+msgstr "Re-r_edaktu"
 
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:719 ../src/messageview.c:311 ../src/mimeview.c:1027
+#: ../src/mainwindow.c:721 ../src/messageview.c:311 ../src/mimeview.c:1027
 msgid "Check signature"
-msgstr "Kontroli subskribon"
+msgstr "Kontrolu subskribon"
 
-#: ../src/mainwindow.c:724 ../src/messageview.c:315
+#: ../src/mainwindow.c:726 ../src/messageview.c:315
 msgid "Add sender to address boo_k"
-msgstr "Aldoni sendanton al adreslibro"
+msgstr "Aldonu sendanton al adreslibro"
 
-#: ../src/mainwindow.c:726
+#: ../src/mainwindow.c:728
 msgid "C_ollect addresses"
-msgstr "K_olekti adresojn"
+msgstr "K_olektu adresojn"
 
-#: ../src/mainwindow.c:727
+#: ../src/mainwindow.c:729
 msgid "From current _folder..."
 msgstr "De nuna dosierujo..."
 
-#: ../src/mainwindow.c:728
+#: ../src/mainwindow.c:730
 msgid "From selected _messages..."
 msgstr "De elektitaj _mesaĝoj..."
 
-#: ../src/mainwindow.c:731
+#: ../src/mainwindow.c:733
 msgid "_Filter all messages in folder"
-msgstr "_Filtri ĉiujn mesaĝojn en dosierujo"
+msgstr "_Filtru ĉiujn mesaĝojn en dosierujo"
 
-#: ../src/mainwindow.c:732
+#: ../src/mainwindow.c:734
 msgid "Filter _selected messages"
-msgstr "Filtri elektitajn mesaĝojn"
+msgstr "Filtru elektitajn mesaĝojn"
 
-#: ../src/mainwindow.c:733
+#: ../src/mainwindow.c:735
 msgid "Run folder pr_ocessing rules"
-msgstr "Ruli dosierujajn pr_ocezadajn regulojn"
+msgstr "Rulu dosierujajn pr_ocezadajn regulojn"
 
-#: ../src/mainwindow.c:735 ../src/messageview.c:318
+#: ../src/mainwindow.c:737 ../src/messageview.c:318
 msgid "_Create filter rule"
-msgstr "Krei filtran regulon"
+msgstr "Kreu filtran regulon"
 
-#: ../src/mainwindow.c:736 ../src/mainwindow.c:742 ../src/messageview.c:319
+#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/messageview.c:319
 #: ../src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Aŭtomate"
@@ -7624,7 +7430,7 @@ msgstr "_Aŭtomate"
 #. FILTER_BY_AUTO
 #. radio SORT_BY_THREAD_DATE
 #. FILTER_BY_AUTO
-#: ../src/mainwindow.c:737 ../src/mainwindow.c:743 ../src/mainwindow.c:845
+#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/mainwindow.c:848
 #: ../src/messageview.c:320 ../src/messageview.c:326
 msgid "By _From"
 msgstr "Laŭ _De"
@@ -7632,386 +7438,391 @@ msgstr "Laŭ _De"
 #. FILTER_BY_FROM
 #. radio SORT_BY_FROM
 #. FILTER_BY_FROM
-#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/mainwindow.c:846
+#: ../src/mainwindow.c:740 ../src/mainwindow.c:746 ../src/mainwindow.c:849
 #: ../src/messageview.c:321 ../src/messageview.c:327
 msgid "By _To"
 msgstr "Laŭ Al"
 
 #. FILTER_BY_TO
-#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/messageview.c:322
+#: ../src/mainwindow.c:741 ../src/mainwindow.c:747 ../src/messageview.c:322
 #: ../src/messageview.c:328
 msgid "By _Subject"
 msgstr "Laŭ Temo"
 
 #. FILTER_BY_SUBJECT
-#: ../src/mainwindow.c:741 ../src/messageview.c:324 ../src/summaryview.c:432
+#: ../src/mainwindow.c:743 ../src/messageview.c:324 ../src/summaryview.c:432
 msgid "Create processing rule"
-msgstr "Krei traktan regulon"
+msgstr "Kreu traktan regulon"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:748 ../src/messageview.c:332
+#: ../src/mainwindow.c:750 ../src/messageview.c:332
 msgid "List _URLs..."
-msgstr "Listi retadresojn..."
+msgstr "Listu retadresojn..."
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:755
+#: ../src/mainwindow.c:757
 msgid "Ch_eck for new messages in all folders"
-msgstr "Kontroli por novaj m_esaĝoj en ĉiuj dosierujoj"
+msgstr "Kontrolu por novaj m_esaĝoj en ĉiuj dosierujoj"
 
-#: ../src/mainwindow.c:756
+#: ../src/mainwindow.c:758
 msgid "Delete du_plicated messages"
-msgstr "Forigi duplikatajn mesaĝojn"
+msgstr "Forigu duplikatajn mesaĝojn"
 
-#: ../src/mainwindow.c:757
+#: ../src/mainwindow.c:759
 msgid "In selected folder"
 msgstr "En elektita dosierujo"
 
-#: ../src/mainwindow.c:758
+#: ../src/mainwindow.c:760
 msgid "In all folders"
 msgstr "En ĉiuj dosierujoj"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:761
+#: ../src/mainwindow.c:763
 msgid "E_xecute"
-msgstr "Ruli"
+msgstr "Rulu"
 
-#: ../src/mainwindow.c:762
+#: ../src/mainwindow.c:764
 msgid "Exp_unge"
-msgstr "Forigi"
+msgstr "Forigu"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:765
+#: ../src/mainwindow.c:767
 msgid "SSL cer_tificates"
 msgstr "SSL atestoj"
 
-#: ../src/mainwindow.c:769
+#: ../src/mainwindow.c:771
 msgid "Filtering Lo_g"
 msgstr "Filtrada protokolo"
 
-#: ../src/mainwindow.c:771
+#: ../src/mainwindow.c:773
 msgid "Network _Log"
 msgstr "Reta Protoko_lo"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:773
+#: ../src/mainwindow.c:775
 msgid "_Forget all session passwords"
-msgstr "_Forgesi ĉiujn sesiajn pasvortojn"
+msgstr "_Forgesu ĉiujn sesiajn pasvortojn"
 
 #. Configuration menu
-#: ../src/mainwindow.c:776
+#: ../src/mainwindow.c:778
 msgid "C_hange current account"
-msgstr "Ŝanĝi nunan konton"
+msgstr "Ŝanĝu nunan konton"
 
-#: ../src/mainwindow.c:778
+#: ../src/mainwindow.c:780
 msgid "_Preferences for current account..."
 msgstr "Agordoj por nuna konto..."
 
-#: ../src/mainwindow.c:779
+#: ../src/mainwindow.c:781
 msgid "Create _new account..."
-msgstr "Krei novan konton..."
+msgstr "Kreu novan konton..."
 
-#: ../src/mainwindow.c:780
+#: ../src/mainwindow.c:782
 msgid "_Edit accounts..."
-msgstr "R_edakti kontojn..."
+msgstr "R_edaktu kontojn..."
 
-#: ../src/mainwindow.c:783
+#: ../src/mainwindow.c:785
 msgid "P_references..."
 msgstr "Preferoj..."
 
-#: ../src/mainwindow.c:784
+#: ../src/mainwindow.c:786
 msgid "Pre-pr_ocessing..."
 msgstr "Antaŭ-pr_ocezas..."
 
-#: ../src/mainwindow.c:785
+#: ../src/mainwindow.c:787
 msgid "Post-pro_cessing..."
 msgstr "Post-procezas..."
 
-#: ../src/mainwindow.c:786
+#: ../src/mainwindow.c:788
 msgid "_Filtering..."
 msgstr "_Filtras..."
 
-#: ../src/mainwindow.c:787
+#: ../src/mainwindow.c:789
 msgid "_Templates..."
 msgstr "Ŝablonoj..."
 
-#: ../src/mainwindow.c:788
+#: ../src/mainwindow.c:790
 msgid "_Actions..."
 msgstr "_Agoj..."
 
-#: ../src/mainwindow.c:789
+#: ../src/mainwindow.c:791
 msgid "Tag_s..."
 msgstr "Etikedoj..."
 
 #. {"Configuration/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:791
+#: ../src/mainwindow.c:793
 msgid "Plu_gins..."
 msgstr "Krompro_gramoj..."
 
 #. Help menu
-#: ../src/mainwindow.c:794
+#: ../src/mainwindow.c:796
 msgid "_Manual"
 msgstr "_Manlibro"
 
-#: ../src/mainwindow.c:795
+#: ../src/mainwindow.c:797
 msgid "_Online User-contributed FAQ"
 msgstr "Ĉeretaj Uzant-kontribuitaj oftaj demandoj"
 
-#: ../src/mainwindow.c:796
+#: ../src/mainwindow.c:798
 msgid "Icon _Legend"
 msgstr "Piktograma Etikedo"
 
-#: ../src/mainwindow.c:798
+#: ../src/mainwindow.c:800
 msgid "Set as default client"
-msgstr "Starigi kiel defaŭlta kliento"
+msgstr "Starigu kiel defaŭlta kliento"
 
-#: ../src/mainwindow.c:805
+#: ../src/mainwindow.c:807
 msgid "Offline _mode"
 msgstr "Senreta reĝi_mo"
 
 #. toggle
-#: ../src/mainwindow.c:806
+#: ../src/mainwindow.c:808
+msgid "Men_ubar"
+msgstr "Men_ua breto"
+
+#. toggle
+#: ../src/mainwindow.c:809
 msgid "_Message view"
 msgstr "_Mesaĝa vido"
 
-#: ../src/mainwindow.c:808
+#: ../src/mainwindow.c:811
 msgid "Status _bar"
 msgstr "Stata _breto"
 
-#: ../src/mainwindow.c:810
+#: ../src/mainwindow.c:813
 msgid "Column headers"
 msgstr "Kolumnaj ĉapoj"
 
 #. toggle
-#: ../src/mainwindow.c:811
+#: ../src/mainwindow.c:814
 msgid "Th_read view"
 msgstr "Fadena vido"
 
 #. toggle
-#: ../src/mainwindow.c:812
+#: ../src/mainwindow.c:815
 msgid "Hide read threads"
-msgstr "Kaŝi legitajn fadenojn"
+msgstr "Kaŝu legitajn fadenojn"
 
 #. toggle
-#: ../src/mainwindow.c:813
+#: ../src/mainwindow.c:816
 msgid "_Hide read messages"
-msgstr "Kaŝi legitajn mesaĝojn"
+msgstr "Kaŝu legitajn mesaĝojn"
 
 #. toggle
-#: ../src/mainwindow.c:814
+#: ../src/mainwindow.c:817
 msgid "Hide deleted messages"
-msgstr "Kaŝi forigitajn mesaĝojn"
+msgstr "Kaŝu forigitajn mesaĝojn"
 
 #. toggle
-#: ../src/mainwindow.c:815
+#: ../src/mainwindow.c:818
 msgid "_Fullscreen"
 msgstr "Tutekrane"
 
 #. toggle
-#: ../src/mainwindow.c:816 ../src/messageview.c:344
+#: ../src/mainwindow.c:819 ../src/messageview.c:344
 msgid "Show all _headers"
-msgstr "Montri ĉiujn ĉapojn"
+msgstr "Montru ĉiujn ĉapojn"
 
 #. toggle
-#: ../src/mainwindow.c:817 ../src/messageview.c:345
+#: ../src/mainwindow.c:820 ../src/messageview.c:345
 msgid "_Collapse all"
-msgstr "Maletendi ĉiujn"
+msgstr "Maletendu ĉiujn"
 
 #. 1 toggle
-#: ../src/mainwindow.c:818 ../src/messageview.c:346
+#: ../src/mainwindow.c:821 ../src/messageview.c:346
 msgid "Collapse from level _2"
-msgstr "Maletendi de nivelo _2"
+msgstr "Malekspansigu de nivelo _2"
 
 #. 2 toggle
-#: ../src/mainwindow.c:819 ../src/messageview.c:347
+#: ../src/mainwindow.c:822 ../src/messageview.c:347
 msgid "Collapse from level _3"
-msgstr "Maletendi de nivelo _3"
+msgstr "Malekspansigu de nivelo _3"
 
 #. toggle_toolbar_cb
-#: ../src/mainwindow.c:823
+#: ../src/mainwindow.c:826
 msgid "Text _below icons"
 msgstr "Teksto su_b piktogramoj"
 
 #. radio TOOLBAR_BOTH
-#: ../src/mainwindow.c:824
+#: ../src/mainwindow.c:827
 msgid "Text be_side icons"
 msgstr "Tek_sto apud piktogramoj"
 
 #. radio TOOLBAR_BOTH_HORIZ
-#: ../src/mainwindow.c:825
+#: ../src/mainwindow.c:828
 msgid "_Icons only"
 msgstr "P_iktogramoj nur"
 
 #. radio TOOLBAR_ICON
-#: ../src/mainwindow.c:826
+#: ../src/mainwindow.c:829
 msgid "_Text only"
 msgstr "_Teksto nur"
 
 #. set_layout_cb
-#: ../src/mainwindow.c:833
+#: ../src/mainwindow.c:836
 msgid "_Standard"
 msgstr "Norma"
 
 #. radio NORMAL_LAYOUT
-#: ../src/mainwindow.c:834
+#: ../src/mainwindow.c:837
 msgid "_Three columns"
 msgstr "_Tri kolumnoj"
 
 #. radio VERTICAL_LAYOUT
-#: ../src/mainwindow.c:835
+#: ../src/mainwindow.c:838
 msgid "_Wide message"
 msgstr "Larĝa mesaĝo"
 
 #. radio WIDE_LAYOUT
-#: ../src/mainwindow.c:836
+#: ../src/mainwindow.c:839
 msgid "W_ide message list"
 msgstr "Larĝa mesaĝa l_isto"
 
 #. radio WIDE_MSGLIST_LAYOUT
-#: ../src/mainwindow.c:837
+#: ../src/mainwindow.c:840
 msgid "S_mall screen"
 msgstr "_Malgranda ekrano"
 
 #. sort_summary_cb
-#: ../src/mainwindow.c:841
+#: ../src/mainwindow.c:844
 msgid "By _number"
 msgstr "Laŭ _nombro"
 
 #. radio SORT_BY_NUMBER
-#: ../src/mainwindow.c:842
+#: ../src/mainwindow.c:845
 msgid "By s_ize"
 msgstr "Laŭ grando"
 
 #. radio SORT_BY_SIZE
-#: ../src/mainwindow.c:843
+#: ../src/mainwindow.c:846
 msgid "By _date"
 msgstr "Laŭ _dato"
 
 #. radio SORT_BY_DATE
-#: ../src/mainwindow.c:844
+#: ../src/mainwindow.c:847
 msgid "By thread date"
 msgstr "Laŭ fadena dato"
 
 #. radio SORT_BY_TO
-#: ../src/mainwindow.c:847
+#: ../src/mainwindow.c:850
 msgid "By s_ubject"
 msgstr "Laŭ temo"
 
 #. radio SORT_BY_SUBJECT
-#: ../src/mainwindow.c:848
+#: ../src/mainwindow.c:851
 msgid "By _color label"
 msgstr "Laŭ kolorita etikedo"
 
 #. radio SORT_BY_LABEL
-#: ../src/mainwindow.c:849
+#: ../src/mainwindow.c:852
 msgid "By tag"
 msgstr "Laŭ etikedo"
 
 #. radio SORT_BY_TAGS
-#: ../src/mainwindow.c:850
+#: ../src/mainwindow.c:853
 msgid "By _mark"
 msgstr "Laŭ _marko"
 
 #. radio SORT_BY_MARK
-#: ../src/mainwindow.c:851
+#: ../src/mainwindow.c:854
 msgid "By _status"
 msgstr "Laŭ _stato"
 
 #. radio SORT_BY_STATUS
-#: ../src/mainwindow.c:852
+#: ../src/mainwindow.c:855
 msgid "By a_ttachment"
 msgstr "Laŭ algluaĵo"
 
 #. radio SORT_BY_MIME
-#: ../src/mainwindow.c:853
+#: ../src/mainwindow.c:856
 msgid "By score"
 msgstr "Laŭ poentoj"
 
 #. radio SORT_BY_SCORE
-#: ../src/mainwindow.c:854
+#: ../src/mainwindow.c:857
 msgid "By locked"
 msgstr "Laŭ ŝlositaj"
 
 #. radio SORT_BY_LOCKED
-#: ../src/mainwindow.c:855
+#: ../src/mainwindow.c:858
 msgid "D_on't sort"
-msgstr "Ne _ordigi"
+msgstr "Ne _ordigu"
 
 #. sort_summary_type_cb
-#: ../src/mainwindow.c:859
+#: ../src/mainwindow.c:862
 msgid "Ascending"
 msgstr "Kreska"
 
 #. radio SORT_ASCENDING
-#: ../src/mainwindow.c:860
+#: ../src/mainwindow.c:863
 msgid "Descending"
 msgstr "Malkreska"
 
-#: ../src/mainwindow.c:901 ../src/messageview.c:388
+#: ../src/mainwindow.c:904 ../src/messageview.c:388
 msgid "_Auto detect"
-msgstr "_Aŭtomate detekti"
+msgstr "_Aŭtomate detektu"
 
-#: ../src/mainwindow.c:1298 ../src/summaryview.c:6236
+#: ../src/mainwindow.c:1301 ../src/summaryview.c:6236
 msgid "Apply tags..."
-msgstr "Apliki etikedojn..."
+msgstr "Apliku etikedojn..."
 
-#: ../src/mainwindow.c:1936
+#: ../src/mainwindow.c:1943
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Kelkaj eraroj okazis. Alklaku ĉi tie por vidi protokolon."
 
-#: ../src/mainwindow.c:1951
+#: ../src/mainwindow.c:1958
 msgid "You are online. Click the icon to go offline"
 msgstr "Vi estas ĉereta. Alklaku la piktogramon por iri senreten"
 
-#: ../src/mainwindow.c:1954
+#: ../src/mainwindow.c:1961
 msgid "You are offline. Click the icon to go online"
 msgstr "Vi estas senreta. Alkaku la piktogramon por iri reten"
 
-#: ../src/mainwindow.c:1968
+#: ../src/mainwindow.c:1975
 msgid "Select account"
-msgstr "Elekti konton"
+msgstr "Elektu konton"
 
 #. init log instances data before creating log views
 #. Protocol log
-#: ../src/mainwindow.c:1995 ../src/prefs_logging.c:140
+#: ../src/mainwindow.c:2002 ../src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Reta protokolo"
 
-#: ../src/mainwindow.c:1999
+#: ../src/mainwindow.c:2006
 msgid "Filtering/Processing debug log"
 msgstr "Filtras/Procezas senmisigan protokolon"
 
-#: ../src/mainwindow.c:2018 ../src/prefs_logging.c:392
+#: ../src/mainwindow.c:2025 ../src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "filtrada protokolo ebligita\n"
 
-#: ../src/mainwindow.c:2020 ../src/prefs_logging.c:394
+#: ../src/mainwindow.c:2027 ../src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "filtrada protokolo malebligita\n"
 
-#: ../src/mainwindow.c:2460 ../src/mainwindow.c:2467 ../src/mainwindow.c:2510
-#: ../src/mainwindow.c:2543 ../src/mainwindow.c:2575 ../src/mainwindow.c:2620
+#: ../src/mainwindow.c:2470 ../src/mainwindow.c:2477 ../src/mainwindow.c:2520
+#: ../src/mainwindow.c:2553 ../src/mainwindow.c:2585 ../src/mainwindow.c:2630
 #: ../src/plugins/notification/notification_trayicon.c:360
-#: ../src/prefs_folder_item.c:1065
+#: ../src/plugins/rssyl/opml_import.c:73 ../src/prefs_folder_item.c:1065
 msgid "Untitled"
 msgstr "Sentitola"
 
-#: ../src/mainwindow.c:2621 ../src/prefs_summary_open.c:114
+#: ../src/mainwindow.c:2631 ../src/prefs_summary_open.c:114
 msgid "none"
 msgstr "neniom"
 
-#: ../src/mainwindow.c:2878 ../src/mainwindow.c:2882
+#: ../src/mainwindow.c:2888 ../src/mainwindow.c:2892
 msgid "Delete all messages in trash folders?"
-msgstr "Ĉu forigi ĉiujn mesaĝojn en la rubujo?"
+msgstr "Ĉu forigu ĉiujn mesaĝojn en la rubujo?"
 
-#: ../src/mainwindow.c:2879
+#: ../src/mainwindow.c:2889
 msgid "Don't quit"
 msgstr "Ne ĉesu"
 
-#: ../src/mainwindow.c:2908 ../src/plugins/mailmbox/plugin_gtk.c:189
+#: ../src/mainwindow.c:2918 ../src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Aldonu poŝtkeston"
 
-#: ../src/mainwindow.c:2909
+#: ../src/mainwindow.c:2919
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -8021,156 +7832,152 @@ msgstr ""
 "Se ekzistanta poŝtkesto estas specifita, ĝi estos\n"
 "skanita aŭtomate."
 
-#: ../src/mainwindow.c:2915 ../src/plugins/mailmbox/plugin_gtk.c:196
-#: ../src/plugins/rssyl/rssyl_gtk.c:158
+#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:196
+#: ../src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "La poŝtkesto `%s' jam ekzistas."
 
-#: ../src/mainwindow.c:2920 ../src/plugins/mailmbox/plugin_gtk.c:202
+#: ../src/mainwindow.c:2930 ../src/plugins/mailmbox/plugin_gtk.c:202
 #: ../src/setup.c:52 ../src/wizard.c:741
 msgid "Mailbox"
 msgstr "Poŝtkesto"
 
-#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:209
+#: ../src/mainwindow.c:2935 ../src/plugins/mailmbox/plugin_gtk.c:209
 #: ../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 "
-"there."
+"Maybe some files already exist, or you don't have the permission to write there."
 msgstr ""
 "Kreo de la poŝtkesto fiaskis.\n"
 "Eble kelkaj dosieroj jam ekzistas, aŭ vi ne havas permeson skribi tie."
 
-#: ../src/mainwindow.c:3377
+#: ../src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "Neniu poŝtado permesata"
 
-#: ../src/mainwindow.c:3955
+#: ../src/mainwindow.c:3965
 msgid "Mbox import has failed."
 msgstr "Mbox importo fiaskis."
 
-#: ../src/mainwindow.c:3964 ../src/mainwindow.c:3973
+#: ../src/mainwindow.c:3974 ../src/mainwindow.c:3983
 msgid "Export to mbox has failed."
 msgstr "Eksporto al mbox fiaskis."
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit"
-msgstr "Eliri"
+msgstr "Eliru"
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit Claws Mail?"
-msgstr "Ĉu eliri Claws Mail?"
+msgstr "Ĉu eliru Claws Mail?"
 
-#: ../src/mainwindow.c:4205
+#: ../src/mainwindow.c:4215
 msgid "Folder synchronisation"
 msgstr "Dosieruja sinkronigo"
 
-#: ../src/mainwindow.c:4206
+#: ../src/mainwindow.c:4216
 msgid "Do you want to synchronise your folders now?"
 msgstr "Ĉu vi volas sinkronigi viajn dosierujojn nun?"
 
-#: ../src/mainwindow.c:4207
+#: ../src/mainwindow.c:4217
 msgid "+_Synchronise"
-msgstr "+_Sinkronigi"
+msgstr "+_Sinkronigu"
 
-#: ../src/mainwindow.c:4636
+#: ../src/mainwindow.c:4659
 msgid "Deleting duplicated messages..."
 msgstr "Forigas duplikatajn mesaĝojn..."
 
-#: ../src/mainwindow.c:4673
+#: ../src/mainwindow.c:4696
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Forigis %d duplikatan mesaĝon en %d dosierujoj.\n"
 msgstr[1] "Forigis %d duplikatajn mesaĝojn en %d dosierujojn.\n"
 
-#: ../src/mainwindow.c:4928 ../src/summaryview.c:5725
+#: ../src/mainwindow.c:4951 ../src/summaryview.c:5725
 msgid "Processing rules to apply before folder rules"
 msgstr "Procezadaj reguloj aplikendaj antaŭ dosierujaj reguloj"
 
-#: ../src/mainwindow.c:4936
+#: ../src/mainwindow.c:4959
 msgid "Processing rules to apply after folder rules"
 msgstr "Procezadaj reguloj aplikendaj post dosierujaj reguloj"
 
-#: ../src/mainwindow.c:4944 ../src/summaryview.c:5736
+#: ../src/mainwindow.c:4967 ../src/summaryview.c:5736
 msgid "Filtering configuration"
 msgstr "Filtrila agordo"
 
-#: ../src/mainwindow.c:5059
+#: ../src/mainwindow.c:5082
 msgid "Can not register as default client: impossible to get executable path."
-msgstr ""
-"Ne povas registri kiel defaŭlta kliento: ne eblas havigi ruleblan vojon."
+msgstr "Ne povas registri kiel defaŭlta kliento: ne eblas havigi ruleblan vojon."
 
-#: ../src/mainwindow.c:5118
+#: ../src/mainwindow.c:5141
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail estis registrita kiel defaŭlta kliento."
 
-#: ../src/mainwindow.c:5120
-msgid ""
-"Can not register as default client: impossible to write to the registry."
-msgstr ""
-"Ne povas registri kiel defaŭlta kliento: ne eblas skribi al la registrejo."
+#: ../src/mainwindow.c:5143
+msgid "Can not register as default client: impossible to write to the registry."
+msgstr "Ne povas registri kiel defaŭlta kliento: ne eblas skribi al la registrejo."
 
-#: ../src/mainwindow.c:5278
+#: ../src/mainwindow.c:5301
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "Forgesis %d pasvorton en %d kontoj.\n"
 msgstr[1] "Forgesis %d pasvortojn en %d kontoj.\n"
 
-#: ../src/matcher.c:209 ../src/matcher.c:210 ../src/matcher.c:211
-#: ../src/matcher.c:212 ../src/matcher.c:213 ../src/matcher.c:214
-#: ../src/matcher.c:215
+#: ../src/matcher.c:211 ../src/matcher.c:212 ../src/matcher.c:213
+#: ../src/matcher.c:214 ../src/matcher.c:215 ../src/matcher.c:216
+#: ../src/matcher.c:217
 #, c-format
 msgid "%s header"
 msgstr "%s ĉapo"
 
-#: ../src/matcher.c:216
+#: ../src/matcher.c:218
 msgid "header"
 msgstr "ĉapo"
 
-#: ../src/matcher.c:217
+#: ../src/matcher.c:219
 msgid "header line"
 msgstr "ĉapa linio"
 
-#: ../src/matcher.c:218
+#: ../src/matcher.c:220
 msgid "body line"
 msgstr "korpa linio"
 
-#: ../src/matcher.c:219
+#: ../src/matcher.c:221
 msgid "tag"
 msgstr "etikedo"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553 ../src/message_search.c:205 ../src/prefs_matcher.c:739
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555 ../src/message_search.c:205 ../src/prefs_matcher.c:742
 #: ../src/summary_search.c:466
 msgid "Case sensitive"
 msgstr "Uskleca"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555
 msgid "Case insensitive"
 msgstr "Maluskleca"
 
-#: ../src/matcher.c:1818
+#: ../src/matcher.c:1843
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "kontrolas ĉu mesaĝo kongruas [ %s ]\n"
 
-#: ../src/matcher.c:1887 ../src/matcher.c:1906 ../src/matcher.c:1919
+#: ../src/matcher.c:1912 ../src/matcher.c:1931 ../src/matcher.c:1944
 msgid "message matches\n"
 msgstr "mesaĝo kongruas\n"
 
-#: ../src/matcher.c:1894 ../src/matcher.c:1912 ../src/matcher.c:1921
+#: ../src/matcher.c:1919 ../src/matcher.c:1937 ../src/matcher.c:1946
 msgid "message does not match\n"
 msgstr "mesaĝo ne kongruas\n"
 
-#: ../src/matcher.c:2184 ../src/matcher.c:2185 ../src/matcher.c:2186
-#: ../src/matcher.c:2187 ../src/matcher.c:2188 ../src/matcher.c:2189
-#: ../src/matcher.c:2190 ../src/matcher.c:2191
+#: ../src/matcher.c:2209 ../src/matcher.c:2210 ../src/matcher.c:2211
+#: ../src/matcher.c:2212 ../src/matcher.c:2213 ../src/matcher.c:2214
+#: ../src/matcher.c:2215 ../src/matcher.c:2216
 msgid "(none)"
 msgstr "(neniom)"
 
@@ -8192,16 +7999,16 @@ msgstr[1] "Importas de mbox... (%d poŝtoj importitaj)"
 
 #: ../src/mbox.c:554
 msgid "Overwrite mbox file"
-msgstr "Anstataŭigi mbox dosieron"
+msgstr "Anstataŭigu mbox dosieron"
 
 #: ../src/mbox.c:555
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Ĉi tiu dosiero jam ekzistas. Ĉu vi volas anstataŭigi ĝin?"
 
-#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1843
-#: ../src/prefs_themes.c:555 ../src/textview.c:3075
+#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1844
+#: ../src/prefs_themes.c:555 ../src/textview.c:3054
 msgid "Overwrite"
-msgstr "Anstataŭigi"
+msgstr "Anstataŭigu"
 
 #: ../src/mbox.c:565
 #, c-format
@@ -8218,11 +8025,11 @@ msgstr "Eksportas al mbox..."
 
 #: ../src/message_search.c:155
 msgid "Find in current message"
-msgstr "Trovi en nuna mesaĝo"
+msgstr "Trovu en nuna mesaĝo"
 
 #: ../src/message_search.c:173
 msgid "Find text:"
-msgstr "Trovi tekston:"
+msgstr "Trovu tekston:"
 
 #: ../src/message_search.c:334 ../src/summary_search.c:779
 msgid "Search failed"
@@ -8247,7 +8054,7 @@ msgstr "Serĉo finita"
 #. Message menu
 #: ../src/messageview.c:298 ../src/textview.c:240
 msgid "Compose _new message"
-msgstr "Verki _novan mesaĝon"
+msgstr "Verku _novan mesaĝon"
 
 #: ../src/messageview.c:712 ../src/messageview.c:1391
 #: ../src/messageview.c:1588
@@ -8287,14 +8094,14 @@ msgstr ""
 "Ĉi tiu mesaĝo demandas revenan receptan avizon\n"
 "sed laŭ ĝia `Al:' kaj `Kk:' ĉapoj ĝi ne estis\n"
 "oficiale adresita al vi.\n"
-"Estas avizita ne sendi la revenan recepton."
+"Estas avizita ne sendu la revenan recepton."
 
 #: ../src/messageview.c:1321
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Alportas mesaĝon (%s)..."
 
-#: ../src/messageview.c:1357 ../src/procmime.c:1004
+#: ../src/messageview.c:1357 ../src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Ne povis malĉifri: %s"
@@ -8303,15 +8110,15 @@ msgstr "Ne povis malĉifri: %s"
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Mesaĝo ne konformas al MIME normo. Ĝi eble montriĝos malĝuste."
 
-#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1996
-#: ../src/plugins/fancy/fancy_viewer.c:667 ../src/summaryview.c:4808
-#: ../src/summaryview.c:4811 ../src/textview.c:3063
+#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1997
+#: ../src/plugins/fancy/fancy_viewer.c:669 ../src/summaryview.c:4808
+#: ../src/summaryview.c:4811 ../src/textview.c:3042
 msgid "Save as"
-msgstr "Konservi kiel"
+msgstr "Konservu kiel"
 
 #: ../src/messageview.c:1847
 msgid "Overwrite existing file?"
-msgstr "Ĉu anstataŭigi ekzistantan dosieron?"
+msgstr "Ĉu anstataŭigu ekzistantan dosieron?"
 
 #: ../src/messageview.c:1855 ../src/summaryview.c:4828
 #: ../src/summaryview.c:4831 ../src/summaryview.c:4846
@@ -8322,19 +8129,15 @@ msgstr "Ne povis konservi la dosieron `%s'."
 #: ../src/messageview.c:1908
 #, c-format
 msgid "Show all %s."
-msgstr "Montri ĉiujn %s."
+msgstr "Montru ĉiujn %s."
 
 #: ../src/messageview.c:1910
 msgid "Only the first megabyte of text is shown."
 msgstr "Nur la unua megabitoko de teksto estas montrata."
 
 #: ../src/messageview.c:1941
-msgid ""
-"You got a return receipt for this message : it has been displayed by the "
-"recipient."
-msgstr ""
-"Vi ricevis revenan recepton por ĉi tiu mesaĝo : ĝi estis montrita de la "
-"ricevinto."
+msgid "You got a return receipt for this message : it has been displayed by the recipient."
+msgstr "Vi ricevis revenan recepton por ĉi tiu mesaĝo : ĝi estis montrita de la ricevinto."
 
 #: ../src/messageview.c:1944
 msgid "You asked for a return receipt in this message."
@@ -8346,7 +8149,7 @@ msgstr "Ĉi tiu mesaĝo demandas por revena recepto."
 
 #: ../src/messageview.c:1951
 msgid "Send receipt"
-msgstr "Sendi recepton"
+msgstr "Sendu recepton"
 
 #: ../src/messageview.c:1994
 #, c-format
@@ -8368,11 +8171,11 @@ msgstr ""
 
 #: ../src/messageview.c:2004 ../src/messageview.c:2026
 msgid "Mark for download"
-msgstr "Marki por elŝuto"
+msgstr "Marku por elŝuto"
 
 #: ../src/messageview.c:2005 ../src/messageview.c:2017
 msgid "Mark for deletion"
-msgstr "Marki por forigo"
+msgstr "Marku por forigo"
 
 #: ../src/messageview.c:2010
 #, c-format
@@ -8386,7 +8189,7 @@ msgstr ""
 #: ../src/messageview.c:2015 ../src/messageview.c:2028
 #: ../src/prefs_filtering_action.c:180
 msgid "Unmark"
-msgstr "Malmarki"
+msgstr "Malmarku"
 
 #: ../src/messageview.c:2021
 #, c-format
@@ -8403,22 +8206,19 @@ msgstr "Revena recepta avizo"
 
 #: ../src/messageview.c:2095
 msgid ""
-"More than one of your accounts uses the address that this message was sent "
-"to.\n"
-"Please choose which account you want to use for sending the receipt "
-"notification:"
+"More than one of your accounts uses the address that this message was sent to.\n"
+"Please choose which account you want to use for sending the receipt notification:"
 msgstr ""
-"Pli ol unu el viaj kontoj uzas la adreson al kiu ĉi tiu mesaĝo estis "
-"sendita.\n"
+"Pli ol unu el viaj kontoj uzas la adreson al kiu ĉi tiu mesaĝo estis sendita.\n"
 "Bonvolu elekti kiun konton vi volas uzi por sendi la receptan avizon:"
 
-#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_gtk.c:494
+#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_feed_props.c:533
 msgid "_Cancel"
-msgstr "Nuligi"
+msgstr "Nuligu"
 
 #: ../src/messageview.c:2099
 msgid "_Send Notification"
-msgstr "_Sendi avizon"
+msgstr "_Sendu avizon"
 
 #: ../src/messageview.c:2166
 msgid "Cannot print: the message doesn't contain text."
@@ -8449,27 +8249,27 @@ msgstr ""
 "  Mesaĝo estis forigita aŭ movita al alia dosierujo"
 
 #: ../src/messageview.c:2971 ../src/messageview.c:2977
-#: ../src/summaryview.c:4191 ../src/summaryview.c:6964
+#: ../src/summaryview.c:4193 ../src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "Eraro okazis dum lernado.\n"
 
-#: ../src/mh.c:432
+#: ../src/mh.c:438
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ne povas kopii mesaĝon %s al %s\n"
 
-#: ../src/mh.c:518
+#: ../src/mh.c:524
 msgid "Moving messages..."
 msgstr "Movas mesaĝojn..."
 
-#: ../src/mh.c:662 ../src/plugins/mailmbox/mailmbox_folder.c:839
+#: ../src/mh.c:668 ../src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Forigas mesaĝojn..."
 
 #. 2
 #: ../src/mh_gtk.c:63 ../src/plugins/mailmbox/plugin_gtk.c:67
 msgid "Remove _mailbox..."
-msgstr "Forigi poŝtkeston..."
+msgstr "Forigu poŝtkeston..."
 
 #: ../src/mh_gtk.c:358 ../src/plugins/mailmbox/plugin_gtk.c:290
 #, c-format
@@ -8477,36 +8277,36 @@ msgid ""
 "Really remove the mailbox '%s'?\n"
 "(The messages are NOT deleted from the disk)"
 msgstr ""
-"Ĉu vere forigi la poŝtkeston `%s'?\n"
+"Ĉu vere forigu la poŝtkeston `%s'?\n"
 "(La mesaĝoj ne estas forigitaj de la disko)"
 
 #: ../src/mh_gtk.c:360 ../src/plugins/mailmbox/plugin_gtk.c:292
 msgid "Remove mailbox"
-msgstr "Forigi poŝtkeston"
+msgstr "Forigu poŝtkeston"
 
 #: ../src/mimeview.c:193
 msgid "_Open"
-msgstr "Malfermi"
+msgstr "Malfermu"
 
 #: ../src/mimeview.c:195
 msgid "Open _with..."
-msgstr "Malfermi kun..."
+msgstr "Malfermu kun..."
 
 #: ../src/mimeview.c:197
 msgid "Send to..."
-msgstr "Sendi al..."
+msgstr "Sendu al..."
 
 #: ../src/mimeview.c:198
 msgid "_Display as text"
-msgstr "Montri kiel teksto"
+msgstr "Montru kiel teksto"
 
 #: ../src/mimeview.c:199
 msgid "_Save as..."
-msgstr "Kon_servi kiel..."
+msgstr "Kon_servu kiel..."
 
 #: ../src/mimeview.c:200
 msgid "Save _all..."
-msgstr "Konservi ĉiujn..."
+msgstr "Konservu ĉiujn..."
 
 #: ../src/mimeview.c:273
 msgid "MIME Type"
@@ -8515,34 +8315,30 @@ msgstr "MIME tipo"
 #: ../src/mimeview.c:1032 ../src/mimeview.c:1037 ../src/mimeview.c:1042
 #: ../src/mimeview.c:1047
 msgid "View full information"
-msgstr "Vidi plenan informon"
+msgstr "Vidu plenan informon"
 
 #: ../src/mimeview.c:1053
 msgid "Check again"
-msgstr "Kontroli denove"
+msgstr "Kontrolu denove"
 
 #: ../src/mimeview.c:1065
 #, c-format
 msgid "%s Click the icon to check it."
-msgstr "%s Alklaki la piktogramon por kontroli ĝin."
+msgstr "%s Alklaku la piktogramon por kontroli ĝin."
 
 #: ../src/mimeview.c:1067
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
-msgstr "%s Alklaki la piktogramon aŭ premi `%s' por kontroli ĝin."
+msgstr "%s Alklaku la piktogramon aŭ premu `%s' por kontroli ĝin."
 
 #: ../src/mimeview.c:1077
 msgid "Timeout checking the signature. Click the icon to try again."
-msgstr ""
-"Eltempiĝo je kontrolante la subskribon. Alklaki la piktogramon por reprovi."
+msgstr "Eltempiĝo je kontrolante la subskribon. Alklaku la piktogramon por reprovi."
 
 #: ../src/mimeview.c:1079
 #, c-format
-msgid ""
-"Timeout checking the signature. Click the icon or hit '%s' to try again."
-msgstr ""
-"Eltempiĝo je kontrolante la subskribon. Alklaki la piktogramon aŭ premi `%s' "
-"por reprovi."
+msgid "Timeout checking the signature. Click the icon or hit '%s' to try again."
+msgstr "Eltempiĝo je kontrolante la subskribon. Alklaku la piktogramon aŭ premu `%s' por reprovi."
 
 #: ../src/mimeview.c:1319
 msgid "Checking signature..."
@@ -8550,34 +8346,34 @@ msgstr "Kontrolas subskribon..."
 
 #: ../src/mimeview.c:1360
 msgid "Go back to email"
-msgstr "Reiri al retpoŝto"
+msgstr "Reiru al retpoŝto"
 
-#: ../src/mimeview.c:1762 ../src/mimeview.c:1851 ../src/mimeview.c:2043
-#: ../src/mimeview.c:2079 ../src/mimeview.c:2191
-#: ../src/plugins/fancy/fancy_viewer.c:420
+#: ../src/mimeview.c:1763 ../src/mimeview.c:1852 ../src/mimeview.c:2044
+#: ../src/mimeview.c:2080 ../src/mimeview.c:2192
+#: ../src/plugins/fancy/fancy_viewer.c:422
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Ne povis konservi la parton de multparta mesaĝo: %s"
 
-#: ../src/mimeview.c:1840 ../src/textview.c:3073
+#: ../src/mimeview.c:1841 ../src/textview.c:3052
 #, c-format
 msgid "Overwrite existing file '%s'?"
-msgstr "Ĉu anstataŭigi la ekzistantan dosieron `%s'?"
+msgstr "Ĉu anstataŭigu la ekzistantan dosieron `%s'?"
 
-#: ../src/mimeview.c:1882 ../src/plugins/archive/archiver_prefs.c:128
+#: ../src/mimeview.c:1883 ../src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
-msgstr "Elekti celan dosierujon"
+msgstr "Elektu celan dosierujon"
 
-#: ../src/mimeview.c:1889 ../src/plugins/archive/archiver_prefs.c:134
+#: ../src/mimeview.c:1890 ../src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "`%s' ne estas dosierujo."
 
-#: ../src/mimeview.c:2126 ../src/mimeview.c:2133 ../src/textview.c:2994
+#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2973
 msgid "Open with"
-msgstr "Malfermi kun"
+msgstr "Malfermu kun"
 
-#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2995
+#: ../src/mimeview.c:2128 ../src/mimeview.c:2135 ../src/textview.c:2974
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8586,35 +8382,33 @@ msgstr ""
 "Enigu la komand-linion por malfermi dosieron:\n"
 "(`%s' estos anstataŭigita de la dosiernomo)"
 
-#: ../src/mimeview.c:2225
+#: ../src/mimeview.c:2226
 msgid "Execute untrusted binary?"
-msgstr "Ĉu ruli nefidindan duumon?"
+msgstr "Ĉu rulu nefidindan duumon?"
 
-#: ../src/mimeview.c:2226
+#: ../src/mimeview.c:2227
 msgid ""
-"This attachment is an executable file. Executing untrusted binaries is "
-"dangerous and could probably lead to compromission of your computer.\n"
+"This attachment is an executable file. Executing untrusted binaries is dangerous and could probably lead to compromission of your computer.\n"
 "\n"
 "Do you want to run this file?"
 msgstr ""
-"Ĉi tiu algluaĵo estas rulebla dosiero. Rulante nefidindajn duumojn estas "
-"danĝera kaj eble povus kompromiti vian komputilon.\n"
+"Ĉi tiu algluaĵo estas rulebla dosiero. Rulante nefidindajn duumojn estas danĝera kaj eble povus kompromiti vian komputilon.\n"
 "\n"
 "Ĉu vi volas ruli ĉi tiun dosieron?"
 
-#: ../src/mimeview.c:2230
+#: ../src/mimeview.c:2231
 msgid "Run binary"
-msgstr "Ruli duumon"
+msgstr "Rulu duumon"
 
-#: ../src/mimeview.c:2529
+#: ../src/mimeview.c:2530
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/mimeview.c:2530 ../src/plugins/pdf_viewer/poppler_viewer.c:699
+#: ../src/mimeview.c:2531 ../src/plugins/pdf_viewer/poppler_viewer.c:699
 msgid "Size:"
 msgstr "Grando:"
 
-#: ../src/mimeview.c:2544 ../src/plugins/vcalendar/vcalendar.c:1271
+#: ../src/mimeview.c:2545 ../src/plugins/vcalendar/vcalendar.c:1271
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1722
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1732
 msgid "Description:"
@@ -8651,8 +8445,7 @@ msgstr "Eraro je ensaluto al %s:%d...\n"
 #. Ref.: http://tools.ietf.org/html/rfc3977#section-5.3
 #.
 #: ../src/news.c:437
-msgid ""
-"Libetpan does not support return code 480 so for now we choose to continue\n"
+msgid "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr "Libetpan ne subtenas revenan kodon 480, tial nune ni elektas daŭrigi\n"
 
 #. if the server does not advertise the capability MODE-READER,
@@ -8713,46 +8506,42 @@ msgstr "nevalida xover linio\n"
 
 #: ../src/news.c:1445
 msgid ""
-"You have one or more News accounts defined. However this version of Claws "
-"Mail has been built without News support; your News account(s) are "
-"disabled.\n"
+"You have one or more News accounts defined. However this version of Claws Mail has been built without News support; your News account(s) are disabled.\n"
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
-"Vi havas unu aŭ pli da Novaĵkontoj difinitaj. Tamen, ĉi tiu versio de Claws "
-"Mail estis konstruita sen Novaĵa subteno; via(j) Novaĵkonto(j) estas "
-"malebligitaj.\n"
+"Vi havas unu aŭ pli da Novaĵkontoj difinitaj. Tamen, ĉi tiu versio de Claws Mail estis konstruita sen Novaĵa subteno; via(j) Novaĵkonto(j) estas malebligitaj.\n"
 "\n"
 "Vi eble bezonas instali libetpan kaj rekompili Claws Mail."
 
 #: ../src/news_gtk.c:56
 msgid "_Subscribe to newsgroup..."
-msgstr "_Subskribi al novaĵgrupo..."
+msgstr "_Subskribu al novaĵgrupo..."
 
 #: ../src/news_gtk.c:57
 msgid "_Unsubscribe newsgroup"
-msgstr "Malsubskribi novaĵgrupon"
+msgstr "Malsubskribu novaĵgrupon"
 
 #: ../src/news_gtk.c:266
 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
-msgstr "Ĉu vere malsubskribi novaĵgrupon `%s'?"
+msgstr "Ĉu vere malsubskribu novaĵgrupon `%s'?"
 
 #: ../src/news_gtk.c:267
 msgid "Unsubscribe newsgroup"
-msgstr "Malsubskribi novaĵgrupon"
+msgstr "Malsubskribu novaĵgrupon"
 
-#: ../src/news_gtk.c:268 ../src/plugins/rssyl/rssyl_gtk.c:695
+#: ../src/news_gtk.c:268
 msgid "_Unsubscribe"
-msgstr "Malsubskribi"
+msgstr "Malsubskribu"
 
 #: ../src/news_gtk.c:307
 msgid "Rename newsgroup folder"
-msgstr "Renomi novaĵgrupan dosierujon"
+msgstr "Renomu novaĵgrupan dosierujon"
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:51
 msgid "Acpi Notifier"
-msgstr "Acpi notifilo"
+msgstr "Acpi avizilo"
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:67
 msgid ""
@@ -8850,7 +8639,7 @@ msgstr " - malŝaltite: "
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:433
 msgid "Blink when user interaction is required"
-msgstr "Brileti kiam uzanta interago estas bezonata"
+msgstr "Briletu kiam uzanta interago estas bezonata"
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:866
 msgid "This plugin handles various ACPI mail LEDs."
@@ -8877,7 +8666,7 @@ msgstr "Adresa konservilo"
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:104
 msgid "Keep to folder"
-msgstr "Konservi al dosierujo"
+msgstr "Konservu al dosierujo"
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:112
 msgid "Address book path where addresses are kept"
@@ -8888,40 +8677,37 @@ msgstr "Adreslibra vojo kie adresoj estas tenataj"
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:201
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:447
 #: ../src/prefs_filtering_action.c:573 ../src/prefs_filtering_action.c:580
-#: ../src/prefs_matcher.c:676
+#: ../src/prefs_matcher.c:679
 msgid "Select..."
-msgstr "Elekti..."
+msgstr "Elektu..."
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:130
 msgid "Keep 'To' addresses"
-msgstr "Konservi 'Al' adresojn"
+msgstr "Konservu 'Al' adresojn"
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:135
 msgid "Keep addresses which appear in 'To' headers"
-msgstr "Konservi adresojn kiuj aperas en `Al' ĉapoj"
+msgstr "Konservu adresojn kiuj aperas en `Al' ĉapoj"
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:140
 msgid "Keep 'Cc' addresses"
-msgstr "Konservi 'Kk' adresojn"
+msgstr "Konservu 'Kk' adresojn"
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:145
 msgid "Keep addresses which appear in 'Cc' headers"
-msgstr "Konservi adresojn kiuj aperas en `Kk' ĉapoj"
+msgstr "Konservu adresojn kiuj aperas en `Kk' ĉapoj"
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:150
 msgid "Keep 'Bcc' addresses"
-msgstr "Konservi 'Bkk' adresojn"
+msgstr "Konservu 'Bkk' adresojn"
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:155
 msgid "Keep addresses which appear in 'Bcc' headers"
-msgstr "Konservi adresojn kiuj aperas en `Bkk' ĉapoj"
+msgstr "Konservu adresojn kiuj aperas en `Bkk' ĉapoj"
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:160
-msgid ""
-"Exclude addresses matching the following regular expressions (one per line):"
-msgstr ""
-"Ekskluzivi adresojn kongruante kun la sekvaj regulaj esprimoj (po unu per "
-"linio):"
+msgid "Exclude addresses matching the following regular expressions (one per line):"
+msgstr "Ekskluzivu adresojn kongruante kun la sekvaj regulaj esprimoj (po unu per linio):"
 
 #: ../src/plugins/archive/archiver.c:43
 #: ../src/plugins/archive/archiver_prefs.c:93
@@ -8930,17 +8716,14 @@ msgstr "Retpoŝta arĥivilo"
 
 #: ../src/plugins/archive/archiver.c:54
 msgid "Create Archive..."
-msgstr "Krei arĥivon..."
+msgstr "Kreu arĥivon..."
 
 #: ../src/plugins/archive/archiver.c:126
 #, c-format
 msgid ""
 "This plugin adds archiving features to Claws Mail.\n"
 "\n"
-"It enables you to select a mail folder that you want to be archived, and "
-"then choose a name, format and location for the archive. Subfolders can be "
-"included and MD5 checksums can be added for each file in the archive. "
-"Several archiving options are also available.\n"
+"It enables you to select a mail folder that you want to be archived, and then choose a name, format and location for the archive. Subfolders can be included and MD5 checksums can be added for each file in the archive. Several archiving options are also available.\n"
 "\n"
 "The archive can be stored as:\n"
 "\tTAR\n"
@@ -8950,22 +8733,17 @@ msgid ""
 "\n"
 "The archive can be compressed using:\n"
 "%s\n"
-"The archives can be restored with any standard tool that supports the chosen "
-"format and compression.\n"
+"The archives can be restored with any standard tool that supports the chosen format and compression.\n"
 "\n"
 "The supported folder types are MH, IMAP, RSSyl and vCalendar.\n"
 "\n"
 "To activate the archiving feature go to /Tools/Create Archive\n"
 "\n"
-"Default options can be set in /Configuration/Preferences/Plugins/Mail "
-"Archiver"
+"Default options can be set in /Configuration/Preferences/Plugins/Mail Archiver"
 msgstr ""
 "Ĉi tiu kromprogramo aldonas arĥivajn trajtojn al Claws Mail.\n"
 "\n"
-"Ĝi ebligas vin elekti poŝtan dosierujon kiun vi volas esti arĥivita, kaj "
-"poste elekti nomon, aranĝon kaj lokon por la arĥivo. Subdosierujoj povas "
-"esti inkluzivitaj kaj MD5 kontrolsumoj povas esti aldonitaj po ĉiu dosiero "
-"en la arĥivo. Kelkaj arĥivaj opcioj ankaŭ haveblas.\n"
+"Ĝi ebligas vin elekti poŝtan dosierujon kiun vi volas esti arĥivita, kaj poste elekti nomon, aranĝon kaj lokon por la arĥivo. Subdosierujoj povas esti inkluzivitaj kaj MD5 kontrolsumoj povas esti aldonitaj po ĉiu dosiero en la arĥivo. Kelkaj arĥivaj opcioj ankaŭ haveblas.\n"
 "\n"
 "La arĥivo povas esti konservita kiel:\n"
 "\\tTAR\n"
@@ -8975,15 +8753,13 @@ msgstr ""
 "\n"
 "La arĥivo povas esti densigita uzante:\n"
 "%s\n"
-"La arĥivoj povas esti restaŭritaj kun iu ajn norma ilo kiu subtenas la "
-"elektitan aranĝon kaj densigon.\n"
+"La arĥivoj povas esti restaŭritaj kun iu ajn norma ilo kiu subtenas la elektitan aranĝon kaj densigon.\n"
 "\n"
 "La subtenataj dosierujaj tipoj estas MH, IMAP, RSSyl kaj vCalendar.\n"
 "\n"
-"Por aktivigi la arĥivan trajton, iru al /Iloj/Krei arĥivon\n"
+"Por aktivigi la arĥivan trajton, iru al /Iloj/Kreu arĥivon\n"
 "\n"
-"Defaŭltaj opcioj povas esti starigitaj en /Agordo/Preferoj/Kromprogramoj/"
-"Poŝta arĥivilo"
+"Defaŭltaj opcioj povas esti starigitaj en /Agordo/Preferoj/Kromprogramoj/Poŝta arĥivilo"
 
 #: ../src/plugins/archive/archiver.c:156
 msgid "Archiver"
@@ -8995,42 +8771,42 @@ msgstr "Arĥivas"
 
 #: ../src/plugins/archive/archiver_gtk.c:122
 msgid "Press Cancel button to stop archiving"
-msgstr "Premi Nuligi butonon por halti arĥivadon"
+msgstr "Premu Nuligi butonon por halti arĥivadon"
 
 #: ../src/plugins/archive/archiver_gtk.c:138
 msgid "Archiving:"
 msgstr "Arĥivas:"
 
-#: ../src/plugins/archive/archiver_gtk.c:506
+#: ../src/plugins/archive/archiver_gtk.c:507
 msgid "Folder and archive must be selected"
 msgstr "Dosierujo kaj arĥivo elektendas"
 
-#: ../src/plugins/archive/archiver_gtk.c:515
+#: ../src/plugins/archive/archiver_gtk.c:516
 #, c-format
 msgid "%s: Exists. Continue anyway?"
-msgstr "%s: Ekzistas. ĉu daŭrigi malgraŭe?"
+msgstr "%s: Ekzistas. Ĉu daŭrigu malgraŭe?"
 
-#: ../src/plugins/archive/archiver_gtk.c:518
+#: ../src/plugins/archive/archiver_gtk.c:519
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: Estas ligo. Ne povas daŭrigi"
 
-#: ../src/plugins/archive/archiver_gtk.c:521
+#: ../src/plugins/archive/archiver_gtk.c:522
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: Estas dosierujo. Ne povas daŭrigi"
 
-#: ../src/plugins/archive/archiver_gtk.c:524
+#: ../src/plugins/archive/archiver_gtk.c:525
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: Mankas permesoj. Ne povas daŭrigi"
 
-#: ../src/plugins/archive/archiver_gtk.c:527
+#: ../src/plugins/archive/archiver_gtk.c:528
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: Nekonata eraro. Ne povas daŭrigi"
 
-#: ../src/plugins/archive/archiver_gtk.c:564
+#: ../src/plugins/archive/archiver_gtk.c:565
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -9039,7 +8815,7 @@ msgstr ""
 "Ne estas valida dosiernomo:\n"
 "%s."
 
-#: ../src/plugins/archive/archiver_gtk.c:577
+#: ../src/plugins/archive/archiver_gtk.c:578
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -9048,7 +8824,7 @@ msgstr ""
 "Ne estas valida Claws Mail dosierujo:\n"
 "%s."
 
-#: ../src/plugins/archive/archiver_gtk.c:606
+#: ../src/plugins/archive/archiver_gtk.c:607
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -9061,225 +8837,223 @@ msgstr ""
 "Dosieroj en dosierujo: %d\n"
 "Dosieroj en listo:     %d\n"
 "\n"
-"Ĉu daŭrigi malgraŭe?"
+"Ĉu daŭrigu malgraŭe?"
 
-#: ../src/plugins/archive/archiver_gtk.c:710
+#: ../src/plugins/archive/archiver_gtk.c:711
 msgid "Archive result"
 msgstr "Arĥiva rezulto"
 
-#: ../src/plugins/archive/archiver_gtk.c:740
+#: ../src/plugins/archive/archiver_gtk.c:741
 msgid "Values"
 msgstr "Valoroj"
 
-#: ../src/plugins/archive/archiver_gtk.c:749
+#: ../src/plugins/archive/archiver_gtk.c:750
 msgid "Archive"
 msgstr "Arĥivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:755
+#: ../src/plugins/archive/archiver_gtk.c:756
 msgid "Archive format"
 msgstr "Arĥiva aranĝo"
 
-#: ../src/plugins/archive/archiver_gtk.c:762
+#: ../src/plugins/archive/archiver_gtk.c:763
 msgid "Compression method"
 msgstr "Densiga metodo"
 
-#: ../src/plugins/archive/archiver_gtk.c:770
+#: ../src/plugins/archive/archiver_gtk.c:771
 msgid "Number of files"
 msgstr "Nombro da dosieroj"
 
-#: ../src/plugins/archive/archiver_gtk.c:778
+#: ../src/plugins/archive/archiver_gtk.c:779
 msgid "Archive Size"
 msgstr "Arĥiva grando"
 
-#: ../src/plugins/archive/archiver_gtk.c:786
+#: ../src/plugins/archive/archiver_gtk.c:787
 msgid "Folder Size"
 msgstr "Dosieruja grando"
 
-#: ../src/plugins/archive/archiver_gtk.c:795
+#: ../src/plugins/archive/archiver_gtk.c:796
 msgid "Compression level"
 msgstr "Densiga nivelo"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:718
 #: ../src/prefs_folder_item.c:514
 msgid "Yes"
 msgstr "Jes"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:721
 #: ../src/prefs_folder_item.c:513 ../src/prefs_summaries.c:369
 msgid "No"
 msgstr "Ne"
 
-#: ../src/plugins/archive/archiver_gtk.c:803
+#: ../src/plugins/archive/archiver_gtk.c:804
 msgid "MD5 checksum"
 msgstr "MD5 kontrolsumo"
 
-#: ../src/plugins/archive/archiver_gtk.c:811
+#: ../src/plugins/archive/archiver_gtk.c:812
 msgid "Descriptive names"
 msgstr "Priskribaj nomoj"
 
-#: ../src/plugins/archive/archiver_gtk.c:819
+#: ../src/plugins/archive/archiver_gtk.c:820
 msgid "Delete selected files"
-msgstr "Forigi elektitajn dosierojn"
+msgstr "Forigu elektitajn dosierojn"
 
-#: ../src/plugins/archive/archiver_gtk.c:828
-#: ../src/plugins/archive/archiver_gtk.c:1210
+#: ../src/plugins/archive/archiver_gtk.c:829
+#: ../src/plugins/archive/archiver_gtk.c:1211
 msgid "Select mails before"
-msgstr "Elekti mesaĝojn antaŭe"
+msgstr "Elektu mesaĝojn antaŭe"
 
-#: ../src/plugins/archive/archiver_gtk.c:904
+#: ../src/plugins/archive/archiver_gtk.c:905
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
-msgstr ""
-"Elekti dosiernomon por arĥivo [sufikso devus speguli arĥivon kiel .tgz]"
+msgstr "Elektu dosiernomon por arĥivo [sufikso devus speguli arĥivon kiel .tgz]"
 
-#: ../src/plugins/archive/archiver_gtk.c:952
+#: ../src/plugins/archive/archiver_gtk.c:953
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld de %ld"
 
-#: ../src/plugins/archive/archiver_gtk.c:991
+#: ../src/plugins/archive/archiver_gtk.c:992
 msgid "Create Archive"
-msgstr "Krei arĥivon"
+msgstr "Kreu arĥivon"
 
-#: ../src/plugins/archive/archiver_gtk.c:1006
+#: ../src/plugins/archive/archiver_gtk.c:1007
 msgid "Enter Archiver arguments"
-msgstr "Enigi arĥivajn argumentojn"
+msgstr "Enigu arĥivajn argumentojn"
 
-#: ../src/plugins/archive/archiver_gtk.c:1019
+#: ../src/plugins/archive/archiver_gtk.c:1020
 msgid "Folder to archive"
 msgstr "Dosierujo arĥivenda"
 
-#: ../src/plugins/archive/archiver_gtk.c:1026
+#: ../src/plugins/archive/archiver_gtk.c:1027
 msgid "Folder which is the root of the archive"
 msgstr "Dosierujo kiu estas la radiko de la arĥivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1031
+#: ../src/plugins/archive/archiver_gtk.c:1032
 msgid "Click this button to select a folder which is to be root of the archive"
-msgstr ""
-"Alklaku ĉi tiun butonon elekti dosierujon kiu estos la radiko de la arĥivo"
+msgstr "Alklaku ĉi tiun butonon elekti dosierujon kiu estos la radiko de la arĥivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1037
+#: ../src/plugins/archive/archiver_gtk.c:1038
 msgid "Name for archive"
 msgstr "Nomo por arĥivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1043
+#: ../src/plugins/archive/archiver_gtk.c:1044
 msgid "Archive location and name"
 msgstr "Arĥiva loko kaj nomo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1045
+#: ../src/plugins/archive/archiver_gtk.c:1046
 #: ../src/plugins/archive/archiver_prefs.c:198
 #: ../src/plugins/pgpcore/select-keys.c:422
 msgid "_Select"
-msgstr "Elekti"
+msgstr "Elektu"
 
-#: ../src/plugins/archive/archiver_gtk.c:1048
+#: ../src/plugins/archive/archiver_gtk.c:1049
 msgid "Click this button to select a name and location for the archive"
-msgstr "Premi ĉi tiun butonon por elekti nomon kaj lokon por la arĥivo"
+msgstr "Premu ĉi tiun butonon por elekti nomon kaj lokon por la arĥivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1050
+#: ../src/plugins/archive/archiver_gtk.c:1051
 msgid "Choose compression"
-msgstr "Elekti densigan metodon"
+msgstr "Elektu densigan metodon"
 
-#: ../src/plugins/archive/archiver_gtk.c:1063
+#: ../src/plugins/archive/archiver_gtk.c:1064
 msgid "Choose this option to use ZIP compression for the archive"
-msgstr "Elekti ĉi tiun opcion por uzi ZIP densigon por la arĥivo"
+msgstr "Elektu ĉi tiun opcion por uzi ZIP densigon por la arĥivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1070
+#: ../src/plugins/archive/archiver_gtk.c:1071
 msgid "Choose this option to use BZIP2 compression for the archive"
-msgstr "Elekti ĉi tiun opcion por uzi BZIP2 densigon por la arĥivo"
+msgstr "Elektu ĉi tiun opcion por uzi BZIP2 densigon por la arĥivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1078
+#: ../src/plugins/archive/archiver_gtk.c:1079
 msgid "Choose this to use Compress compression for your archive"
-msgstr "Elekti ĉi tion por uzi Compress densigon por via arĥivo"
+msgstr "Elektu ĉi tion por uzi Compress densigon por via arĥivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1086
+#: ../src/plugins/archive/archiver_gtk.c:1087
 msgid "Choose this option to disable compression for the archive"
-msgstr "Elekti ĉi tiun opcion por malebligi densigon por la arĥivo"
+msgstr "Elektu ĉi tiun opcion por malebligi densigon por la arĥivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1108
+#: ../src/plugins/archive/archiver_gtk.c:1109
 msgid "Choose format"
-msgstr "Elekti aranĝon"
+msgstr "Elektu aranĝon"
 
-#: ../src/plugins/archive/archiver_gtk.c:1121
+#: ../src/plugins/archive/archiver_gtk.c:1122
 msgid "Choose this option to use TAR as format for the archive"
-msgstr "Elekti ĉi tiun opcion por uzi TAR kiel aranĝo por la arĥivo"
+msgstr "Elektu ĉi tiun opcion por uzi TAR kiel aranĝo por la arĥivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1128
+#: ../src/plugins/archive/archiver_gtk.c:1129
 msgid "Choose this to use SHAR as format for the archive"
-msgstr "Elekti ĉi tion por uzi SHAR kiel aranĝo por la arĥivo"
+msgstr "Elektu ĉi tion por uzi SHAR kiel aranĝo por la arĥivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1135
+#: ../src/plugins/archive/archiver_gtk.c:1136
 msgid "Choose this option to use CPIO as format for the archive"
-msgstr "Elekti ĉi tiun opcion por uzi CPIO kiel aranĝo por la arĥivo"
+msgstr "Elektu ĉi tiun opcion por uzi CPIO kiel aranĝo por la arĥivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1142
+#: ../src/plugins/archive/archiver_gtk.c:1143
 msgid "Choose this option to use PAX as format for the archive"
-msgstr "Elekti ĉi tiun opcion por uzi PAX kiel aranĝo por la arĥivo"
+msgstr "Elektu ĉi tiun opcion por uzi PAX kiel aranĝo por la arĥivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1162
+#: ../src/plugins/archive/archiver_gtk.c:1163
 msgid "Miscellaneous options"
 msgstr "Diversaj opcioj"
 
-#: ../src/plugins/archive/archiver_gtk.c:1171
+#: ../src/plugins/archive/archiver_gtk.c:1172
 msgid "_Recursive"
 msgstr "_Rikure"
 
-#: ../src/plugins/archive/archiver_gtk.c:1175
+#: ../src/plugins/archive/archiver_gtk.c:1176
 msgid "Choose this option to include subfolders in the archive"
-msgstr "Elekti ĉi tiun opcion por inkluzivi subdosierujojn en la arĥivo"
+msgstr "Elektu ĉi tiun opcion por inkluzivi subdosierujojn en la arĥivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1177
+#: ../src/plugins/archive/archiver_gtk.c:1178
 msgid "_MD5sum"
 msgstr "_MD5sumo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1181
+#: ../src/plugins/archive/archiver_gtk.c:1182
 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"
 "will take to create the archive"
 msgstr ""
-"Elekti ĉi tiun opcion por aldoni MD5 kontrolsumojn po ĉiu dosiero en la\n"
+"Elektu ĉi tiun opcion por aldoni MD5 kontrolsumojn po ĉiu dosiero en la\n"
 "arĥivo. Estu konscia, kvankam, ke ĉi tiu forte pliigas la tempon ĝi\n"
 "bezonos por krei la arĥivon"
 
-#: ../src/plugins/archive/archiver_gtk.c:1185
+#: ../src/plugins/archive/archiver_gtk.c:1186
 msgid "R_ename"
-msgstr "R_enomi"
+msgstr "R_enomu"
 
-#: ../src/plugins/archive/archiver_gtk.c:1189
+#: ../src/plugins/archive/archiver_gtk.c:1190
 #: ../src/plugins/archive/archiver_prefs.c:333
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
 "The naming scheme: date_from at to@subject.\n"
 "Names will be truncated to max 96 characters"
 msgstr ""
-"Elekti ĉi tiun opcion por uzi prisrkibajn nomojn po ĉiu dosiero\n"
+"Elektu ĉi tiun opcion por uzi prisrkibajn nomojn po ĉiu dosiero\n"
 "en la arĥivo. La noma skemo: dato_de at al@temo.\n"
 "Nomoj estos senpintigitaj al maks. 96 signoj"
 
-#: ../src/plugins/archive/archiver_gtk.c:1197
+#: ../src/plugins/archive/archiver_gtk.c:1198
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
 msgstr ""
-"Elekti ĉi tiun opcion por forigi poŝtojn post arĥivado\n"
+"Elektu ĉi tiun opcion por forigi poŝtojn post arĥivado\n"
 "Je ĉi tiu punkto nur traktas IMAP4, Loka mbox kaj POP3"
 
-#: ../src/plugins/archive/archiver_gtk.c:1201
+#: ../src/plugins/archive/archiver_gtk.c:1202
 msgid "Selection options"
 msgstr "Elektaj opcioj"
 
-#: ../src/plugins/archive/archiver_gtk.c:1217
+#: ../src/plugins/archive/archiver_gtk.c:1218
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
 msgstr ""
-"Elekti retpoŝtojn antaŭ iu dato\n"
+"Elektu retpoŝtojn antaŭ iu dato\n"
 "Dato devas konformi al ISO-8601 [JJJJ-MM-TT]"
 
 #: ../src/plugins/archive/archiver_prefs.c:190
@@ -9288,8 +9062,7 @@ msgstr "Defaŭlta konserva dosierujo"
 
 #: ../src/plugins/archive/archiver_prefs.c:202
 msgid "Click this button to select the default location for saving archives"
-msgstr ""
-"Alklaki ĉi tiun butonon por elekti la defaŭltan lokon por konservi arĥivojn"
+msgstr "Alklaku ĉi tiun butonon por elekti la defaŭltan lokon por konservi arĥivojn"
 
 #: ../src/plugins/archive/archiver_prefs.c:211
 msgid "Default compression"
@@ -9297,19 +9070,19 @@ msgstr "Defaŭlta densigo"
 
 #: ../src/plugins/archive/archiver_prefs.c:223
 msgid "Choose this option to use ZIP compression by default"
-msgstr "Elekti ĉi tiun opcion por uzi ZIP densigon defaŭlte"
+msgstr "Elektu ĉi tiun opcion por uzi ZIP densigon defaŭlte"
 
 #: ../src/plugins/archive/archiver_prefs.c:230
 msgid "Choose this option to use BZIP2 compression by default"
-msgstr "Elekti ĉi tiun opcion por uzi BZIP2 densigon defaŭlte"
+msgstr "Elektu ĉi tiun opcion por uzi BZIP2 densigon defaŭlte"
 
 #: ../src/plugins/archive/archiver_prefs.c:238
 msgid "Choose this option to use COMPRESS compression by default"
-msgstr "Elekti ĉi tiun opcion por uzi COMPRESS densigon defaŭlte"
+msgstr "Elektu ĉi tiun opcion por uzi COMPRESS densigon defaŭlte"
 
 #: ../src/plugins/archive/archiver_prefs.c:246
 msgid "Choose this option to disable compression by default"
-msgstr "Elekti ĉi tiun opcion por malebligi densigon defaŭlte"
+msgstr "Elektu ĉi tiun opcion por malebligi densigon defaŭlte"
 
 #: ../src/plugins/archive/archiver_prefs.c:265
 msgid "Default format"
@@ -9317,19 +9090,19 @@ msgstr " Defaŭlta aranĝo"
 
 #: ../src/plugins/archive/archiver_prefs.c:277
 msgid "Choose this option to use the TAR format by default"
-msgstr "Elekti ĉi tiun opcion por uzi la TAR aranĝon defaŭlte"
+msgstr "Elektu ĉi tiun opcion por uzi la TAR aranĝon defaŭlte"
 
 #: ../src/plugins/archive/archiver_prefs.c:284
 msgid "Choose this option to use the SHAR format by default"
-msgstr "Elekti ĉi tiun opcion por uzi la SHAR aranĝon defaŭlte"
+msgstr "Elektu ĉi tiun opcion por uzi la SHAR aranĝon defaŭlte"
 
 #: ../src/plugins/archive/archiver_prefs.c:291
 msgid "Choose this option to use the CPIO format by default"
-msgstr "Elekti ĉi tiun opcion por uzi la CPIO aranĝon defaŭlte"
+msgstr "Elektu ĉi tiun opcion por uzi la CPIO aranĝon defaŭlte"
 
 #: ../src/plugins/archive/archiver_prefs.c:298
 msgid "Choose this option to use the PAX format by default"
-msgstr "Elekti ĉi tiun opcion por uzi la PAX aranĝon defaŭlte"
+msgstr "Elektu ĉi tiun opcion por uzi la PAX aranĝon defaŭlte"
 
 #: ../src/plugins/archive/archiver_prefs.c:315
 msgid "Default miscellaneous options"
@@ -9337,8 +9110,7 @@ msgstr "Defaŭltaj diversaj opcioj"
 
 #: ../src/plugins/archive/archiver_prefs.c:324
 msgid "Choose this option to include subfolders in the archives by default"
-msgstr ""
-"Elekti ĉi tiun opcion por inkluzivi subdosierujojn en la arĥivoj defaŭlte"
+msgstr "Elektu ĉi tiun opcion por inkluzivi subdosierujojn en la arĥivoj defaŭlte"
 
 #: ../src/plugins/archive/archiver_prefs.c:325
 msgid "MD5sum"
@@ -9346,36 +9118,98 @@ msgstr "MD5sumo"
 
 #: ../src/plugins/archive/archiver_prefs.c:327
 msgid ""
-"Choose this option to add MD5 checksums for each file in the archives by "
-"default.\n"
+"Choose this option to add MD5 checksums for each file in the archives by default.\n"
 "Be aware though, that this dramatically increases the time it\n"
 "will take to create the archives"
 msgstr ""
-"Elekti ĉi tiun opcion por aldoni MD5 kontrolsumojn po ĉiu dosiero en la "
-"arĥivoj defaŭlte.\n"
+"Elektu ĉi tiun opcion por aldoni MD5 kontrolsumojn po ĉiu dosiero en la arĥivoj defaŭlte.\n"
 "Estu konscia, kvankam, ke ĉi tiu forte pliigas la tempon bezonata por\n"
 "krei la arĥivojn"
 
 #: ../src/plugins/archive/archiver_prefs.c:331
 msgid "Rename"
-msgstr "Renomi"
+msgstr "Renomu"
 
 #: ../src/plugins/archive/archiver_prefs.c:339
 msgid "Choose this option to delete mails after archiving"
-msgstr "Elekti ĉi tiun opcion por forigi poŝtojn post arĥivado"
+msgstr "Elektu ĉi tiun opcion por forigi poŝtojn post arĥivado"
+
+#: ../src/plugins/att_remover/att_remover.c:299
+msgid "<b>Type: </b>"
+msgstr "<b>Tipo: </b>"
+
+#: ../src/plugins/att_remover/att_remover.c:300
+msgid "<b>Size: </b>"
+msgstr "<b>Grando: </b>"
+
+#: ../src/plugins/att_remover/att_remover.c:301
+msgid "<b>Filename: </b>"
+msgstr "<b>Dosiernomo: </b>"
+
+#: ../src/plugins/att_remover/att_remover.c:332
+msgid "Remove attachments"
+msgstr "Forigu algluaĵojn"
+
+#: ../src/plugins/att_remover/att_remover.c:357
+#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
+msgid "Remove"
+msgstr "Forigu"
+
+#. S_COL_STATUS
+#: ../src/plugins/att_remover/att_remover.c:365
+#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
+msgid "Attachment"
+msgstr "Algluaĵo"
+
+#: ../src/plugins/att_remover/att_remover.c:417
+msgid "Destroy attachments"
+msgstr "Detruu algluaĵojn"
+
+#: ../src/plugins/att_remover/att_remover.c:418
+msgid ""
+"Do you really want to remove all attachments from the selected messages?\n"
+"\n"
+"The deleted data will be unrecoverable."
+msgstr ""
+"Ĉu vi vere volas forigi ĉiujn algluaĵojn de la elektitaj mesaĝoj?\n"
+"\n"
+"La forigitaj datumoj estos nerestatigeblaj."
+
+#: ../src/plugins/att_remover/att_remover.c:479
+msgid "This message doesn't have any attachments."
+msgstr "Ĉi tiu mesaĝo ne havas algluaĵojn."
+
+#: ../src/plugins/att_remover/att_remover.c:494
+msgid "Remove attachments..."
+msgstr "Forigu algluaĵojn..."
+
+#: ../src/plugins/att_remover/att_remover.c:506
+#: ../src/plugins/att_remover/att_remover.c:566
+msgid "AttRemover"
+msgstr "AttForigilo"
+
+#: ../src/plugins/att_remover/att_remover.c:571
+msgid ""
+"This plugin removes attachments from mails.\n"
+"\n"
+"Warning: this operation will be completely un-cancellable and the deleted attachments will be lost forever, and ever, and ever."
+msgstr ""
+"Ĉi tiu kromprogramo forigas algluaĵojn de poŝtoj.\n"
+"\n"
+"Averto: ĉi tiu operacio estos tute ne-nuligebla kaj la forigitaj algluaĵoj estos perditaj por ĉiam, por ĉiam, por ĉiam."
+
+#: ../src/plugins/att_remover/att_remover.c:595
+msgid "Attachment handling"
+msgstr "Algluaĵa traktado"
 
 #: ../src/plugins/attachwarner/attachwarner.c:216
 #, c-format
 msgid ""
-"An attachment is mentioned in the mail you're sending, but no file was "
-"attached. Mention appears on line %d, which begins with text: <span weight="
-"\"bold\">%.20s</span>...\n"
+"An attachment is mentioned in the mail you're sending, but no file was attached. Mention appears on line %d, which begins with text: <span weight=\"bold\">%.20s</span>...\n"
 "\n"
 "%s it anyway?"
 msgstr ""
-"Algluaĵo estas menciita en la poŝto kiun vi sendas, sed neniu dosiero estis "
-"algluita. Mencio aperas ĉe linio %d, kiu komenciĝas kun la teksto: <span "
-"weight=\"bold\">%.20s</span>...\n"
+"Algluaĵo estas menciita en la poŝto kiun vi sendas, sed neniu dosiero estis algluita. Mencio aperas ĉe linio %d, kiu komenciĝas kun la teksto: <span weight=\"bold\">%.20s</span>...\n"
 "\n"
 "Ĉu %s ĝin malgraŭe?"
 
@@ -9387,19 +9221,15 @@ msgstr "Algluaĵa averto"
 #: ../src/plugins/attachwarner/attachwarner.c:282
 #: ../src/plugins/attachwarner/attachwarner.c:334
 msgid "Attach warner"
-msgstr "Alglui avertilon"
+msgstr "Algluu avertilon"
 
 #: ../src/plugins/attachwarner/attachwarner.c:292
-msgid ""
-"Warns user if some reference to attachments is found in the message text and "
-"no file is attached."
-msgstr ""
-"Avertas uzanton se iu referenco al algluaĵoj estas trovita en la mesaĝa "
-"teksto kaj neniu dosiero estas algluita"
+msgid "Warns user if some reference to attachments is found in the message text and no file is attached."
+msgstr "Avertas uzanton se iu referenco al algluaĵoj estas trovita en la mesaĝa teksto kaj neniu dosiero estas algluita"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:54
 msgid "attach"
-msgstr "alglui"
+msgstr "algluu"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:85
 msgid "One of the following regular expressions is matched (one per line):"
@@ -9418,24 +9248,16 @@ msgid "Lines starting with quotation marks"
 msgstr "Linioj kiuj komenciĝas kun citiloj"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:121
-msgid ""
-"Exclude quoted lines from checking for the regular expressions above. Note "
-"that handmade quotes cannot be distinguished from quotes generated by "
-"replying."
-msgstr ""
-"Ekskluzivi cititajn liniojn de kontrolo por la regulaj esprimoj supre. Noti "
-"ke permanaj citaĵoj ne povas esti distingitaj de citaĵoj generitaj de "
-"respondo."
+msgid "Exclude quoted lines from checking for the regular expressions above. Note that handmade quotes cannot be distinguished from quotes generated by replying."
+msgstr "Ekskluzivu cititajn liniojn de kontrolo por la regulaj esprimoj supre. Notu ke permanaj citaĵoj ne povas esti distingitaj de citaĵoj generitaj de respondo."
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:124
 msgid "Forwarded or redirected messages"
 msgstr "Plusenditaj aŭ redirektitaj mesaĝoj"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:131
-msgid ""
-"Don't check for missing attachments when forwarding or redirecting messages"
-msgstr ""
-"Ne kontroli por mankantaj algluaĵoj kiam plusendante aŭ redirektante mesaĝojn"
+msgid "Don't check for missing attachments when forwarding or redirecting messages"
+msgstr "Ne kontrolu por mankantaj algluaĵoj kiam plusendante aŭ redirektante mesaĝojn"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:134
 #: ../src/prefs_msg_colors.c:362
@@ -9443,16 +9265,12 @@ msgid "Signatures"
 msgstr "Subskriboj"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:141
-msgid ""
-"Exclude lines from the first signature-separator onwards from checking for "
-"the regular expressions above"
-msgstr ""
-"Ekskluzivi liniojn de la unua subskrib-apartigilo posten de kontrolado por "
-"la regulaj esprimoj supre"
+msgid "Exclude lines from the first signature-separator onwards from checking for the regular expressions above"
+msgstr "Ekskluzivu liniojn de la unua subskrib-apartigilo posten de kontrolado por la regulaj esprimoj supre"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:147
 msgid "Warn when"
-msgstr "Averti kiam"
+msgstr "Avertu kiam"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:151
 msgid "Excluding"
@@ -9460,77 +9278,7 @@ msgstr "Ekskluzivante"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:229
 msgid "Attach Warner"
-msgstr "Alfiksi avertilon"
-
-#: ../src/plugins/att_remover/att_remover.c:299
-msgid "<b>Type: </b>"
-msgstr "<b>Tipo: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:300
-msgid "<b>Size: </b>"
-msgstr "<b>Grando: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:301
-msgid "<b>Filename: </b>"
-msgstr "<b>Dosiernomo: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:332
-msgid "Remove attachments"
-msgstr "Forigi algluaĵojn"
-
-#: ../src/plugins/att_remover/att_remover.c:357
-#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
-msgid "Remove"
-msgstr "Forigi"
-
-#. S_COL_STATUS
-#: ../src/plugins/att_remover/att_remover.c:365
-#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
-msgid "Attachment"
-msgstr "Algluaĵo"
-
-#: ../src/plugins/att_remover/att_remover.c:417
-msgid "Destroy attachments"
-msgstr "Detrui algluaĵojn"
-
-#: ../src/plugins/att_remover/att_remover.c:418
-msgid ""
-"Do you really want to remove all attachments from the selected messages?\n"
-"\n"
-"The deleted data will be unrecoverable."
-msgstr ""
-"Ĉu vi vere volas forigi ĉiujn algluaĵojn de la elektitaj mesaĝoj?\n"
-"\n"
-"La forigitaj datumoj estos nerestatigeblaj."
-
-#: ../src/plugins/att_remover/att_remover.c:479
-msgid "This message doesn't have any attachments."
-msgstr "Ĉi tiu mesaĝo ne havas algluaĵojn."
-
-#: ../src/plugins/att_remover/att_remover.c:494
-msgid "Remove attachments..."
-msgstr "Forigi algluaĵojn..."
-
-#: ../src/plugins/att_remover/att_remover.c:506
-#: ../src/plugins/att_remover/att_remover.c:566
-msgid "AttRemover"
-msgstr "AttForigilo"
-
-#: ../src/plugins/att_remover/att_remover.c:571
-msgid ""
-"This plugin removes attachments from mails.\n"
-"\n"
-"Warning: this operation will be completely un-cancellable and the deleted "
-"attachments will be lost forever, and ever, and ever."
-msgstr ""
-"Ĉi tiu kromprogramo forigas algluaĵojn de poŝtoj.\n"
-"\n"
-"Averto: ĉi tiu operacio estos tute ne-nuligebla kaj la forigitaj algluaĵoj "
-"estos perditaj por ĉiam, por ĉiam, por ĉiam."
-
-#: ../src/plugins/att_remover/att_remover.c:595
-msgid "Attachment handling"
-msgstr "Algluaĵa traktado"
+msgstr "Alfiksu avertilon"
 
 #: ../src/plugins/bogofilter/bogofilter.c:81
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:458
@@ -9548,24 +9296,16 @@ msgstr "Bogofiltrilo: filtras mesaĝojn..."
 #: ../src/plugins/bogofilter/bogofilter.c:604
 #, c-format
 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"
-"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bogofilter "
-"with a few hundred spam and ham messages."
+"The Bogofilter plugin couldn't filter a message. The probable cause of the error is that it didn't learn from any mail.\n"
+"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bogofilter with a few hundred spam and ham messages."
 msgstr ""
-"La Bogofiltrila kromprogramo ne povis filtri mesaĝon. La probabla kaŭzo de "
-"la eraro estas ke ĝi ne lernis de iu ajn poŝto.\n"
-"Uzu \"/Marki/Marki kiel spamo\" kaj \"/Marki/Marki kiel malspamo\" por dresi "
-"Bogofiltrilon kun kelkaj centoj da spamaj kaj malspamaj mesaĝoj."
+"La Bogofiltrila kromprogramo ne povis filtri mesaĝon. La probabla kaŭzo de la eraro estas ke ĝi ne lernis de iu ajn poŝto.\n"
+"Uzu \"/Marku/Marku kiel spamo\" kaj \"/Marku/Marku kiel malspamo\" por dresi Bogofiltrilon kun kelkaj centoj da spamaj kaj malspamaj mesaĝoj."
 
 #: ../src/plugins/bogofilter/bogofilter.c:611
 #, c-format
-msgid ""
-"The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
-"couldn't be run."
-msgstr ""
-"La Bogofiltrila kromprogramo ne povis filtri mesaĝon. La komando `%s %s %s` "
-"ne plenumeblis."
+msgid "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` couldn't be run."
+msgstr "La Bogofiltrila kromprogramo ne povis filtri mesaĝon. La komando `%s %s %s` ne plenumeblis."
 
 #: ../src/plugins/bogofilter/bogofilter.c:758
 msgid "Bogofilter: learning from message..."
@@ -9593,29 +9333,19 @@ msgstr ""
 
 #: ../src/plugins/bogofilter/bogofilter.c:1002
 msgid ""
-"This plugin can check all messages that are received from an IMAP, LOCAL or "
-"POP account for spam using Bogofilter. You will need Bogofilter installed "
-"locally.\n"
+"This plugin can check all messages that are received from an IMAP, LOCAL or POP account for spam using Bogofilter. You will need Bogofilter installed locally.\n"
 "\n"
-"Before Bogofilter can recognize spam messages, you have to train it by "
-"marking a few hundred spam and ham messages with the use of \"/Mark/Mark as "
-"spam\" and \"/Mark/Mark as ham\".\n"
+"Before Bogofilter can recognize spam messages, you have to train it by marking a few hundred spam and ham messages with the use of \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\".\n"
 "\n"
-"When a message is identified as spam it can be deleted or saved in a "
-"specially designated folder.\n"
+"When a message is identified as spam it can be deleted or saved in a specially designated folder.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
 msgstr ""
-"Ĉi tiu kromprogramo povas kontroli ĉiujn mesaĝojn ricevitaj de IMAP, LOKA aŭ "
-"POP konto por spamo uzante Bogofiltrilon. Vi bezonos Bogofiltrilon instalita "
-"loke.\n"
+"Ĉi tiu kromprogramo povas kontroli ĉiujn mesaĝojn ricevitaj de IMAP, LOKA aŭ POP konto por spamo uzante Bogofiltrilon. Vi bezonos Bogofiltrilon instalita loke.\n"
 "\n"
-"Antaŭ ol Bogofiltrilo povas rekoni spamajn mesaĝojn, vi devas dresi ĝin per "
-"markante kelkajn centajn spamajn kaj malspamajn mesaĝojn kun la uzo de "
-"\"Marki/Marki kiel spamo\" kaj \"/Marki/Marki kiel malspamo\".\n"
+"Antaŭ ol Bogofiltrilo povas rekoni spamajn mesaĝojn, vi devas dresi ĝin per markante kelkajn centajn spamajn kaj malspamajn mesaĝojn kun la uzo de \"Marku/Marku kiel spamo\" kaj \"/Marku/Marku kiel malspamo\".\n"
 "\n"
-"Kiam mesaĝo estas identifigita kiel spamo, ĝi povas esti forigita aŭ "
-"konservita en aparte desegnita dosierujo.\n"
+"Kiam mesaĝo estas identifigita kiel spamo, ĝi povas esti forigita aŭ konservita en aparte desegnita dosierujo.\n"
 "\n"
 "Opcioj povas esti trovataj en /Agordo/Preferoj/Kromprogramoj/Bogofiltrilo"
 
@@ -9635,7 +9365,7 @@ msgstr "Spama lernado"
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:143
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:400
 msgid "Process messages on receiving"
-msgstr "Trakti mesaĝojn je ricevo"
+msgstr "Traktu mesaĝojn je ricevo"
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:158
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:151
@@ -9660,13 +9390,12 @@ msgstr "KB"
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:171
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:408
 msgid "Save spam in"
-msgstr "Konservi spamon en"
+msgstr "Konservu spamon en"
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:186
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:179
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:416
-msgid ""
-"Folder for storing identified spam. Leave empty to use the trash folder."
+msgid "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
 "Dosierujo por konservi identifigitan spamon. Lasu malplena por uzi\n"
 "la rubujon."
@@ -9675,28 +9404,25 @@ msgstr ""
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:185
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:422
 msgid "Click this button to select a folder for storing spam"
-msgstr "Alklaki ĉi tiun butonon por elekti dosierujon por konservi spamon"
+msgstr "Alklaku ĉi tiun butonon por elekti dosierujon por konservi spamon"
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:198
 msgid "When unsure, move to"
-msgstr "Kiam necerta, movi al"
+msgstr "Kiam necerta, movu al"
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:206
-msgid ""
-"Folder for storing mail for which spam status is Unsure. Leave empty to use "
-"the Inbox folder."
+msgid "Folder for storing mail for which spam status is Unsure. Leave empty to use the Inbox folder."
 msgstr ""
 "Dosierujo por konservi poŝton por kiu la spama stato estas Necerta, Lasu\n"
 "malplena por uzi la Enkestan dosierujon."
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:212
 msgid "Click this button to select a folder for storing Unsure mails."
-msgstr ""
-"Alklaki ĉi tiun butonon por elekti dosierujon por konservi Necertajn poŝtojn."
+msgstr "Alklaku ĉi tiun butonon por elekti dosierujon por konservi Necertajn poŝtojn."
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:214
 msgid "Insert X-Bogosity header"
-msgstr "Enmeti X-Bogosecan ĉapon"
+msgstr "Enmetu X-Bogosecan ĉapon"
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:218
 msgid "Only done for messages in MH folders"
@@ -9711,32 +9437,23 @@ msgstr "Blanklistaj sendintoj trovitaj en adreslibro/dosierujo"
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:228
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:195
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:441
-msgid ""
-"Messages coming from your address book contacts will be received in the "
-"normal folder even if detected as spam"
-msgstr ""
-"Mesaĝoj venante de viaj adreslibraj kontaktoj estos ricevitaj en la kutima "
-"dosierujo eĉ se detektitaj kiel spamo"
+msgid "Messages coming from your address book contacts will be received in the normal folder even if detected as spam"
+msgstr "Mesaĝoj venante de viaj adreslibraj kontaktoj estos ricevitaj en la kutima dosierujo eĉ se detektitaj kiel spamo"
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:238
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:205
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:451
 msgid "Click this button to select a book or folder in the address book"
-msgstr ""
-"Alklaki ĉi tiun butonon por elekti libron aŭ dosierujon en la adreslibro"
+msgstr "Alklaku ĉi tiun butonon por elekti libron aŭ dosierujon en la adreslibro"
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:240
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:207
 msgid "Learn whitelisted emails as ham"
-msgstr "Lerni blanklistigitajn poŝtojn kiel malspamo"
+msgstr "Lernu blanklistigitajn poŝtojn kiel malspamo"
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:242
-msgid ""
-"If Bogofilter thought an email was spam or unsure, but it was whitelisted, "
-"learn it as ham."
-msgstr ""
-"Se Bogofiltrilo pensis retpoŝto estis spamo aŭ estis ne certa, sed ĝi estis "
-"blanklistigita, lerni ĝin kiel malspamo."
+msgid "If Bogofilter thought an email was spam or unsure, but it was whitelisted, learn it as ham."
+msgstr "Se Bogofiltrilo pensis retpoŝto estis spamo aŭ estis ne certa, sed ĝi estis blanklistigita, lernu ĝin kiel malspamo."
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:251
 msgid "Bogofilter call"
@@ -9750,7 +9467,7 @@ msgstr "Vojo al bogofiltrila plenumeblaĵo"
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:232
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:429
 msgid "Mark spam as read"
-msgstr "Marki spamon kiel legita"
+msgstr "Marku spamon kiel legita"
 
 #: ../src/plugins/bsfilter/bsfilter.c:82
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:401
@@ -9768,24 +9485,16 @@ msgstr "Bsfiltrilo: filtras mesaĝon..."
 #: ../src/plugins/bsfilter/bsfilter.c:393
 #, c-format
 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"
-"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bsfilter with "
-"a few hundred spam and ham messages."
+"The Bsfilter plugin couldn't filter a message. The probable cause of the error is that it didn't learn from any mail.\n"
+"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bsfilter with a few hundred spam and ham messages."
 msgstr ""
-"La Bsfiltrila kromprogramo ne povis filtri mesaĝon. La probabla kaŭzo de la "
-"eraro estas ke ĝi ne lernis de iu ajn poŝto.\n"
-"Uzu \"/Marki/Marki kiel spamo\" kaj \"/Marki/Marki kiel malspamo\" por dresi "
-"Bsfiltrilon kun kelkaj centoj da spamaj kaj malspamaj mesaĝoj."
+"La Bsfiltrila kromprogramo ne povis filtri mesaĝon. La probabla kaŭzo de la eraro estas ke ĝi ne lernis de iu ajn poŝto.\n"
+"Uzu \"/Marku/Marku kiel spamo\" kaj \"/Marku/Marku kiel malspamo\" por dresi Bsfiltrilon kun kelkaj centoj da spamaj kaj malspamaj mesaĝoj."
 
 #: ../src/plugins/bsfilter/bsfilter.c:400
 #, c-format
-msgid ""
-"The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
-"run."
-msgstr ""
-"La Bsfiltrila kromprogramo ne povis filtri mesaĝon. La komando `%s' ne povis "
-"esti plenumita."
+msgid "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be run."
+msgstr "La Bsfiltrila kromprogramo ne povis filtri mesaĝon. La komando `%s' ne povis esti plenumita."
 
 #: ../src/plugins/bsfilter/bsfilter.c:501
 msgid "Bsfilter: learning from message..."
@@ -9793,39 +9502,25 @@ msgstr "Bsfiltrilo: lernas de mesaĝo..."
 
 #: ../src/plugins/bsfilter/bsfilter.c:641
 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 "
-"locally.\n"
+"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 locally.\n"
 "\n"
-"Before Bsfilter can recognize spam messages, you have to train it by marking "
-"a few hundred spam and ham messages with the use of \"/Mark/Mark as spam\" "
-"and \"/Mark/Mark as ham\".\n"
+"Before Bsfilter can recognize spam messages, you have to train it by marking a few hundred spam and ham messages with the use of \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\".\n"
 "\n"
-"When a message is identified as spam it can be deleted or saved in a "
-"specially designated folder.\n"
+"When a message is identified as spam it can be deleted or saved in a specially designated folder.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bsfilter"
 msgstr ""
-"Ĉi tiu kromprogramo povas kontroli ĉiujn mesaĝojn kiuj estas ricevitaj de "
-"IMAP, LOKA aŭ POP konto por spamo uzante Bsfiltrilon. Vi bezonos Bsfiltrilon "
-"instalita loke.\n"
+"Ĉi tiu kromprogramo povas kontroli ĉiujn mesaĝojn kiuj estas ricevitaj de IMAP, LOKA aŭ POP konto por spamo uzante Bsfiltrilon. Vi bezonos Bsfiltrilon instalita loke.\n"
 "\n"
-"Antaŭ ol Bsfiltrilo povas rekoni spamajn mesaĝojn, vi devas dresi ĝin per "
-"markado de kelkaj centoj da spamaj kaj malspamaj mesaĝoj uzante \"/Marki/"
-"Marki kiel spamo\" kaj \"/Marki/Marki kiel malspamo\".\n"
+"Antaŭ ol Bsfiltrilo povas rekoni spamajn mesaĝojn, vi devas dresi ĝin per markado de kelkaj centoj da spamaj kaj malspamaj mesaĝoj uzante \"/Marku/Marku kiel spamo\" kaj \"/Marku/Marku kiel malspamo\".\n"
 "\n"
-"Kiam mesaĝo estas identifigita kiel spamo, ĝi povas esti forigita aŭ "
-"konservita en aparte desegnita dosierujo.\n"
+"Kiam mesaĝo estas identifigita kiel spamo, ĝi povas esti forigita aŭ konservita en aparte desegnita dosierujo.\n"
 "\n"
 "Opcioj povas esti trovataj en /Agordo/Preferoj/Kromprogramoj/Bsfiltrilo"
 
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:209
-msgid ""
-"If Bsfilter thought an email was spam or unsure, but it was whitelisted, "
-"learn it as ham."
-msgstr ""
-"Se Bsfiltrilo pensis ke retpoŝto estis spamo aŭ estis certa, sed ĝi estis "
-"blanklistigita, lerni ĝin kiel malspamo."
+msgid "If Bsfilter thought an email was spam or unsure, but it was whitelisted, learn it as ham."
+msgstr "Se Bsfiltrilo pensis ke retpoŝto estis spamo aŭ estis certa, sed ĝi estis blanklistigita, lernu ĝin kiel malspamo."
 
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:218
 msgid "Bsfilter call"
@@ -9893,7 +9588,7 @@ msgid ""
 "No socket information.\n"
 "Antivirus disabled."
 msgstr ""
-"Pravalorizi\n"
+"Pravalorizu\n"
 "Neniu inga informo.\n"
 "Antivirus malebligita."
 
@@ -9903,17 +9598,15 @@ msgid ""
 "Clamd does not respond to ping.\n"
 "Is clamd running?"
 msgstr ""
-"Pravalorizi\n"
+"Pravalorizu\n"
 "Clamd ne respondas al ping.\n"
 "Ĉu clamd plenumiĝas?"
 
 #: ../src/plugins/clamd/clamav_plugin.c:328
 msgid ""
-"This plugin uses Clam AntiVirus to scan all messages that are received from "
-"an IMAP, LOCAL or POP account.\n"
+"This plugin uses Clam AntiVirus to scan all messages that are received from an IMAP, LOCAL or POP account.\n"
 "\n"
-"When a message attachment is found to contain a virus it can be deleted or "
-"saved in a specially designated folder.\n"
+"When a message attachment is found to contain a virus it can be deleted or saved in a specially designated folder.\n"
 "\n"
 "Because this plugin communicates with clamd via a\n"
 "socket then there are some minimum requirements to\n"
@@ -9929,11 +9622,9 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
 msgstr ""
-"Ĉi tiu kromprogramo uzas Clam AntiVirus por skani ĉiujn mesaĝojn kiuj estas "
-"ricevitaj de IMAP, LOKA aŭ POP konto.\n"
+"Ĉi tiu kromprogramo uzas Clam AntiVirus por skani ĉiujn mesaĝojn kiuj estas ricevitaj de IMAP, LOKA aŭ POP konto.\n"
 "\n"
-"Kiam mesaĝa algluaĵo enhavas viruson, ĝi povas esti forigita aŭ konservita "
-"en apartan specifan dosierujon.\n"
+"Kiam mesaĝa algluaĵo enhavas viruson, ĝi povas esti forigita aŭ konservita en apartan specifan dosierujon.\n"
 "\n"
 "Ĉar ĉi tiu kromprogramo komunikas kun clamd pere de\n"
 "ingo tiam estas iaj minimumaj bezonoj por la permesoj\n"
@@ -9954,7 +9645,7 @@ msgstr "Virusa detektado"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:247
 msgid "Enable virus scanning"
-msgstr "Ebligi virusan skanadon"
+msgstr "Ebligu virusan skanadon"
 
 #. SET_TOGGLE_SENSITIVITY (enable_arc, hbox1);
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:257
@@ -9971,23 +9662,19 @@ msgstr "MB"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:281
 msgid "Save infected mail in"
-msgstr "Konservi infektitan retpoŝton en"
+msgstr "Konservu infektitan retpoŝton en"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:285
 msgid "Save mail that contains viruses"
-msgstr "Konservi poŝton kiu enhavas virusojn"
+msgstr "Konservu poŝton kiu enhavas virusojn"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:293
-msgid ""
-"Folder for storing infected mail. Leave empty to use the default trash folder"
-msgstr ""
-"Dosierujo por konservi infektitan poŝton. Lasu malplenan por uzi la "
-"defaŭltan rubujon"
+msgid "Folder for storing infected mail. Leave empty to use the default trash folder"
+msgstr "Dosierujo por konservi infektitan poŝton. Lasu malplenan por uzi la defaŭltan rubujon"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:301
 msgid "Click this button to select a folder for storing infected mail"
-msgstr ""
-"Alklaki ĉi tiun butonon por elekti dosierujon por konservi infektitan poŝton"
+msgstr "Alklaku ĉi tiun butonon por elekti dosierujon por konservi infektitan poŝton"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:309
 msgid "Automatic configuration"
@@ -10002,28 +9689,24 @@ msgid "Where is clamd.conf"
 msgstr "Kie estas clamd.conf"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:330
-msgid ""
-"Full path to clamd.conf. If this field is not empty then the plugin has been "
-"able to locate the file automatically"
-msgstr ""
-"Plena vojo al clamd.conf. Se ĉi tiu kampo ne estas malplena tiam la "
-"kromprogramo estis kapabla trovi la dosieron aŭtomate"
+msgid "Full path to clamd.conf. If this field is not empty then the plugin has been able to locate the file automatically"
+msgstr "Plena vojo al clamd.conf. Se ĉi tiu kampo ne estas malplena tiam la kromprogramo estis kapabla trovi la dosieron aŭtomate"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:334
 msgid "Br_owse"
-msgstr "F_oliumi"
+msgstr "F_oliumu"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:338
 msgid "Click this button to select full path to clamd.conf"
-msgstr "Alklaki ĉi tiun butonon por elekti plenan vojon al clamd.conf"
+msgstr "Alklaku ĉi tiun butonon por elekti plenan vojon al clamd.conf"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:346
 msgid "Check permission for folders and adjust if necessary"
-msgstr "Kontroli permeson por dosierujoj kaj ĝustigi se necese"
+msgstr "Kontrolu permeson por dosierujoj kaj ĝustigu se necese"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:359
 msgid "Click this button to check and adjust folder permissions"
-msgstr "Alklaki ĉi tiun butonon por kontroli kaj ĝustigi dosierujajn permesojn"
+msgstr "Alklaku ĉi tiun butonon por kontroli kaj ĝustigi dosierujajn permesojn"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:367
 msgid "Remote Host"
@@ -10116,74 +9799,71 @@ msgstr "Malsukcesis registri protokolan tekstan hokon"
 
 #: ../src/plugins/demo/demo.c:76
 msgid ""
-"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"
+"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."
 msgstr ""
-"Ĉi tiu kromprogramo estas nur provoversio de kiel skribi kromprogramojn por "
-"Claws Mail. Ĝi instalas hokon por nova protokola eligo kaj skribas ĝin al "
-"ĉefeligujo.\n"
+"Ĉi tiu kromprogramo estas nur provoversio de kiel skribi kromprogramojn por Claws Mail. Ĝi instalas hokon por nova protokola eligo kaj skribas ĝin al ĉefeligujo.\n"
 "\n"
 "Ĝi ne estas vere utila."
 
-#: ../src/plugins/fancy/fancy_prefs.c:141
+#: ../src/plugins/fancy/fancy_prefs.c:146
 msgid "Display images"
-msgstr "Montri bildojn"
+msgstr "Montru bildojn"
 
-#: ../src/plugins/fancy/fancy_prefs.c:142
+#: ../src/plugins/fancy/fancy_prefs.c:147
 msgid "Display embedded images"
-msgstr "Montri enkorpigitajn bildojn"
+msgstr "Montru enkorpigitajn bildojn"
 
-#: ../src/plugins/fancy/fancy_prefs.c:146
+#: ../src/plugins/fancy/fancy_prefs.c:151
 msgid "Execute javascript"
-msgstr "Plenumi javaskripton"
+msgstr "Plenumu javaskripton"
 
-#: ../src/plugins/fancy/fancy_prefs.c:147
+#: ../src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute embedded javascript"
-msgstr "Plenumi enkorpigitan javaskripton"
+msgstr "Plenumu enkorpigitan javaskripton"
 
-#: ../src/plugins/fancy/fancy_prefs.c:151
+#: ../src/plugins/fancy/fancy_prefs.c:156
 msgid "Execute Java applets"
-msgstr "Plenumi Javajn retprogramojn"
+msgstr "Plenumu Javajn retprogramojn"
 
-#: ../src/plugins/fancy/fancy_prefs.c:152
+#: ../src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute embedded Java applets"
-msgstr "Plenumi enkorpigitajn Javajn retprogramojn"
+msgstr "Plenumu enkorpigitajn Javajn retprogramojn"
 
-#: ../src/plugins/fancy/fancy_prefs.c:156
+#: ../src/plugins/fancy/fancy_prefs.c:161
 msgid "Render objects using plugins"
-msgstr "Prezenti objektojn uzante kromprogramojn"
+msgstr "Prezentu objektojn uzante kromprogramojn"
 
-#: ../src/plugins/fancy/fancy_prefs.c:157
+#: ../src/plugins/fancy/fancy_prefs.c:162
 msgid "Render embedded objects using plugins"
-msgstr "Prezenti enkorpigitajn objektojn uzante kromprogramojn"
+msgstr "Prezentu enkorpigitajn objektojn uzante kromprogramojn"
 
-#: ../src/plugins/fancy/fancy_prefs.c:164
+#: ../src/plugins/fancy/fancy_prefs.c:169
 msgid "Open in viewer (remote content is enabled)"
-msgstr "Malfermi en vidilo (fora enhavo estas ebligita)"
+msgstr "Malfermu en vidilo (fora enhavo estas ebligita)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:167
+#: ../src/plugins/fancy/fancy_prefs.c:172
 msgid "Do nothing (remote content is disabled)"
-msgstr "Fari nenion (fora enhavo estas malebligita)"
+msgstr "Faru nenion (fora enhavo estas malebligita)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:200
+#: ../src/plugins/fancy/fancy_prefs.c:209
 msgid "Proxy"
 msgstr "Prokurilo"
 
-#: ../src/plugins/fancy/fancy_prefs.c:202
+#: ../src/plugins/fancy/fancy_prefs.c:211
 msgid "Use GNOME's proxy settings"
-msgstr "Uzi la prokurilajn agordojn de GNOME"
+msgstr "Uzu la prokurilajn agordojn de GNOME"
 
-#: ../src/plugins/fancy/fancy_prefs.c:210
+#: ../src/plugins/fancy/fancy_prefs.c:219
 msgid "Use proxy:"
-msgstr "Uzi prokurilon:"
+msgstr "Uzu prokurilon:"
 
-#: ../src/plugins/fancy/fancy_prefs.c:228
+#: ../src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
 msgstr "Foraj risurcoj"
 
-#: ../src/plugins/fancy/fancy_prefs.c:229
+#: ../src/plugins/fancy/fancy_prefs.c:238
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10197,116 +9877,131 @@ msgstr ""
 "Javaj kromprogramoj povas ankoraŭ esti ebligitaj por enhavo kiu estas\n"
 "algluata al la retpoŝto."
 
-#: ../src/plugins/fancy/fancy_prefs.c:235
+#: ../src/plugins/fancy/fancy_prefs.c:244
 msgid "Enable loading of remote content"
-msgstr "Ebligi ŝargon de fora enhavo"
+msgstr "Ebligu ŝargon de fora enhavo"
 
-#: ../src/plugins/fancy/fancy_prefs.c:267
+#: ../src/plugins/fancy/fancy_prefs.c:276
 msgid "When clicking on a link, by default:"
 msgstr "Kiam alklakante ligon, defaŭlte:"
 
-#: ../src/plugins/fancy/fancy_prefs.c:275
+#: ../src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
-msgstr "Malfermi en ekstera krozilo"
+msgstr "Malfermu en ekstera krozilo"
+
+#: ../src/plugins/fancy/fancy_prefs.c:298
+msgid "The CSS in this file will be applied to all HTML parts"
+msgstr "La CSS en ĉi tiu dosiero estos aplikata al ĉiuj HTML partoj"
 
-#: ../src/plugins/fancy/fancy_viewer.c:391
+#: ../src/plugins/fancy/fancy_prefs.c:300
+msgid "Stylesheet:"
+msgstr "Stilfolio:"
+
+#: ../src/plugins/fancy/fancy_prefs.c:308 ../src/prefs_account.c:1442
+#: ../src/prefs_account.c:1531 ../src/prefs_account.c:1991
+#: ../src/prefs_customheader.c:237
+msgid "Bro_wse"
+msgstr "Foliumu"
+
+#: ../src/plugins/fancy/fancy_prefs.c:350
+msgid "Select stylesheet"
+msgstr "Elektu stilfolion"
+
+#: ../src/plugins/fancy/fancy_viewer.c:393
 msgid "Remote content loading is disabled."
 msgstr "Fora enhava ŝargo malebligita."
 
-#: ../src/plugins/fancy/fancy_viewer.c:468
+#: ../src/plugins/fancy/fancy_viewer.c:470
 msgid "Load images"
-msgstr "Ŝargi bildojn"
+msgstr "Ŝargu bildojn"
 
-#: ../src/plugins/fancy/fancy_viewer.c:470
+#: ../src/plugins/fancy/fancy_viewer.c:472
 msgid "Enable remote content"
-msgstr "Ebligi foran enhavon"
+msgstr "Ebligu foran enhavon"
 
-#: ../src/plugins/fancy/fancy_viewer.c:472
+#: ../src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable Javascript"
-msgstr "Ebligi Javaskripton"
+msgstr "Ebligu Javaskripton"
 
-#: ../src/plugins/fancy/fancy_viewer.c:474
+#: ../src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Plugins"
-msgstr "Ebligi kromprogramojn"
+msgstr "Ebligu kromprogramojn"
 
-#: ../src/plugins/fancy/fancy_viewer.c:476
+#: ../src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Java"
-msgstr "Ebligi Java"
+msgstr "Ebligu Java"
 
-#: ../src/plugins/fancy/fancy_viewer.c:478
+#: ../src/plugins/fancy/fancy_viewer.c:480
 msgid "Open links with external browser"
-msgstr "Malfermi ligilojn en ekstera krozilo"
+msgstr "Malfermu ligilojn en ekstera krozilo"
 
-#: ../src/plugins/fancy/fancy_viewer.c:647
+#: ../src/plugins/fancy/fancy_viewer.c:649
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Eraro okazis: %d\n"
 
-#: ../src/plugins/fancy/fancy_viewer.c:703
+#: ../src/plugins/fancy/fancy_viewer.c:705
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s estas misformita aŭ ne subtenata fluo"
 
-#: ../src/plugins/fancy/fancy_viewer.c:714
+#: ../src/plugins/fancy/fancy_viewer.c:716
 msgid "Search the Web"
-msgstr "Serĉi la TTT"
+msgstr "Serĉu la TTT"
 
-#: ../src/plugins/fancy/fancy_viewer.c:726
+#: ../src/plugins/fancy/fancy_viewer.c:728
 msgid "Open in Viewer"
-msgstr "Malfermi en vidilo"
+msgstr "Malfermu en vidilo"
 
-#: ../src/plugins/fancy/fancy_viewer.c:728
+#: ../src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer (enable remote content)"
-msgstr "Malfermi en Vidilo (ebligi foran enhavon)"
+msgstr "Malfermu en Vidilo (ebligu foran enhavon)"
 
-#: ../src/plugins/fancy/fancy_viewer.c:737
+#: ../src/plugins/fancy/fancy_viewer.c:739
 msgid "Open in Browser"
-msgstr "Malfermi en krozilo"
+msgstr "Malfermu en krozilo"
 
-#: ../src/plugins/fancy/fancy_viewer.c:747
+#: ../src/plugins/fancy/fancy_viewer.c:749
 msgid "Open Image"
-msgstr "Malfermi bildon"
+msgstr "Malfermu bildon"
 
-#: ../src/plugins/fancy/fancy_viewer.c:756
+#: ../src/plugins/fancy/fancy_viewer.c:758
 msgid "Copy Link"
-msgstr "Kopii ligilon"
+msgstr "Kopiu ligilon"
 
-#: ../src/plugins/fancy/fancy_viewer.c:760
+#: ../src/plugins/fancy/fancy_viewer.c:762
 msgid "Download Link"
-msgstr "Elŝuti ligilon"
+msgstr "Elŝutu ligilon"
 
-#: ../src/plugins/fancy/fancy_viewer.c:771
+#: ../src/plugins/fancy/fancy_viewer.c:773
 msgid "Save Image As"
-msgstr "Konservi bildon kiel"
+msgstr "Konservu bildon kiel"
 
-#: ../src/plugins/fancy/fancy_viewer.c:781
+#: ../src/plugins/fancy/fancy_viewer.c:783
 msgid "Copy Image"
-msgstr "Kopii bildon"
+msgstr "Kopiu bildon"
 
-#: ../src/plugins/fancy/fancy_viewer.c:799
+#: ../src/plugins/fancy/fancy_viewer.c:801
 msgid "Import feed"
-msgstr "Importi fluon"
+msgstr "Importu fluon"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1012
+#: ../src/plugins/fancy/fancy_viewer.c:1014
 msgid "Fancy"
 msgstr "Fantazia"
 
 #. i18n: 'Fancy' here is name of the plugin, not the english word.
-#: ../src/plugins/fancy/fancy_viewer.c:1040
+#: ../src/plugins/fancy/fancy_viewer.c:1042
 msgid "Fancy HTML Viewer"
 msgstr "Fantazia HTML vidilo"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1045
+#: ../src/plugins/fancy/fancy_viewer.c:1047
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
-"By default all remote content is blocked. Options can be found in /"
-"Configuration/Preferences/Plugins/Fancy"
+"By default all remote content is blocked. Options can be found in /Configuration/Preferences/Plugins/Fancy"
 msgstr ""
-"Ĉi tiu kromprogramo prezentas HTML poŝton uzante la WebKit %d.%d.%d "
-"bibliotekon.\n"
-"Defaŭlte, ĉiu fora enhavo estas blokita. Opcioj povas esti trovataj en /"
-"Agordo/Preferoj/Kromprogramoj/Fantazia"
+"Ĉi tiu kromprogramo prezentas HTML poŝton uzante la WebKit %d.%d.%d bibliotekon.\n"
+"Defaŭlte, ĉiu fora enhavo estas blokita. Opcioj povas esti trovataj en /Agordo/Preferoj/Kromprogramoj/Fantazia"
 
 #. i18n: Possible error message during plugin load
 #: ../src/plugins/fetchinfo/fetchinfo_plugin.c:151
@@ -10330,15 +10025,11 @@ msgstr "Malsukcesis registri poŝtan ricevan hokon"
 #. * catalog.
 #: ../src/plugins/fetchinfo/fetchinfo_plugin.c:209
 msgid ""
-"This plugin modifies the downloaded messages. It inserts headers containing "
-"some download information: UIDL, Claws Mail account name, POP server, user "
-"ID and retrieval time.\n"
+"This plugin modifies the downloaded messages. It inserts headers containing some download information: UIDL, Claws Mail account name, POP server, user ID and retrieval time.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Fetchinfo"
 msgstr ""
-"Ĉi tiu kromprogramo modifas la elŝutitajn mesaĝojn. Ĝi enmetas ĉapojn "
-"enhavante kelkan elŝutan informon: UIDL, Claws Mail kontnomo, POP servilo, "
-"uzanta identigilo kaj haviga horo.\n"
+"Ĉi tiu kromprogramo modifas la elŝutitajn mesaĝojn. Ĝi enmetas ĉapojn enhavante kelkan elŝutan informon: UIDL, Claws Mail kontnomo, POP servilo, uzanta identigilo kaj haviga horo.\n"
 "\n"
 "Opcioj povas esti trovataj en /Agordo/Preferoj/Kromprogramoj/Fetchinfo"
 
@@ -10350,7 +10041,7 @@ msgstr "Poŝta markado"
 #. i18n: Heading of a preferences section determining which headers to add
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:94
 msgid "Add fetchinfo headers"
-msgstr "Aldoni fetchinfo ĉapojn"
+msgstr "Aldonu fetchinfo ĉapojn"
 
 #. i18n: Description of a header to be added
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:101
@@ -10480,16 +10171,14 @@ msgid ""
 "This plugin provides access to the GData protocol for Claws Mail.\n"
 "\n"
 "The GData protocol is an interface to Google services.\n"
-"Currently, the only implemented functionality is to include Google Contacts "
-"into the Tab-address completion.\n"
+"Currently, the only implemented functionality is to include Google Contacts into the Tab-address completion.\n"
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
 "Ĉi tiu kromprogramo provizas atingon al la GData protokolo por Claws Mail.\n"
 "\n"
 "La GData protokolo estas interfaco al Guglaj servoj.\n"
-"Nune, la nura funkcieco realigita estas inkluzivi Guglajn Kontaktojn en la "
-"Tab-adresa kompletigo.\n"
+"Nune, la nura funkcieco realigita estas inkluzivi Guglajn Kontaktojn en la Tab-adresa kompletigo.\n"
 "\n"
 "Prijuĝaj rimarkoj al <berndth at gmx.de> estos bonvenaj."
 
@@ -10501,1071 +10190,1043 @@ msgstr "GData intergrado"
 #: ../src/plugins/geolocation/geolocation_plugin.c:349
 #, c-format
 msgid "Found location: (%.2f,%.2f)"
-msgstr ""
+msgstr "Trovis lokon: (%.2f,%.2f)"
 
 #. TRANSLATORS: The country name is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:369
 msgid "Alleged country of origin: "
-msgstr ""
+msgstr "Laŭdira lando origina:"
 
 #. TRANSLATORS: The IP address is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:373
-#, fuzzy
 msgid "Could not resolve location of IP address "
-msgstr "Ne povis legi la adresan indekson"
+msgstr "Ne povis solvi lokon de IP adreso"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:512
-#, fuzzy
 msgid "Try to locate sender"
-msgstr "unua nomo de sendanto"
+msgstr "Provu lokigi sendinton"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:528
 msgid "Andorra"
-msgstr ""
+msgstr "Andoro"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:529
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Unuigitaj Arabaj Emirejoj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:530
 msgid "Afghanistan"
-msgstr ""
+msgstr "Afganio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:531
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "Antigvo kaj Barbudo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:532
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguilo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:533
 msgid "Albania"
-msgstr ""
+msgstr "Albanio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:534
 msgid "Armenia"
-msgstr ""
+msgstr "Armenio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:535
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Nederlandaj Antiloj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:536
 msgid "Angola"
-msgstr ""
+msgstr "Angolo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:537
 msgid "Antarctica"
-msgstr ""
+msgstr "Antarkto"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:538
-#, fuzzy
 msgid "Argentina"
-msgstr "Fuksina"
+msgstr "Argentino"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:539
 msgid "American Samoa"
-msgstr ""
+msgstr "Usona Samoo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:540
 msgid "Austria"
-msgstr ""
+msgstr "Aŭstrio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:541
 msgid "Australia"
-msgstr ""
+msgstr "Aŭstralio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:542
 msgid "Aruba"
-msgstr ""
+msgstr "Arubo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:543
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbajĝano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:544
 msgid "Bosnia And Herzegovina"
-msgstr ""
+msgstr "Bosnio kaj Hercegovino"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:545
 msgid "Barbados"
-msgstr ""
+msgstr "Barbado"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:546
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladeŝo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:547
 msgid "Belgium"
-msgstr ""
+msgstr "Belgio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:548
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:549
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgario"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:550
 msgid "Bahrain"
-msgstr ""
+msgstr "Barejno"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:551
 msgid "Burundi"
-msgstr ""
+msgstr "Burundo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:552
 msgid "Benin"
-msgstr ""
+msgstr "Benino"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:553
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermudo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:554
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunej Darusalamo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:555
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolivio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:556
 msgid "Brazil"
-msgstr ""
+msgstr "Brazilo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:557
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahamoj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:558
 msgid "Bhutan"
-msgstr ""
+msgstr "Butano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:559
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Buve Insulo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:560
 msgid "Botswana"
-msgstr ""
+msgstr "Bocŭano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:561
 msgid "Belarus"
-msgstr ""
+msgstr "Belaruso"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:562
 msgid "Belize"
-msgstr ""
+msgstr "Belizo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:563
 msgid "Canada"
-msgstr ""
+msgstr "Kanado"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:564
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Kokaj (Kiling) Insuloj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:565
 msgid "Central African Republic"
-msgstr ""
+msgstr "Centra Afrika Respubliko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:566
 msgid "Congo"
-msgstr ""
+msgstr "Kongo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:567
 msgid "Switzerland"
-msgstr ""
+msgstr "Svislando"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:568
 msgid "Cote D'Ivoire"
-msgstr ""
+msgstr "Ebura Bordo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:569
 msgid "Cook Islands"
-msgstr ""
+msgstr "Cook Insuloj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:570
 msgid "Chile"
-msgstr ""
+msgstr "Ĉilio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:571
 msgid "Cameroon"
-msgstr ""
+msgstr "Kameruno"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:572
-#, fuzzy
 msgid "China"
-msgstr "Ĉina"
+msgstr "Ĉino"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:573
-#, fuzzy
 msgid "Colombia"
-msgstr "Koloro"
+msgstr "Kolombio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:574
 msgid "Costa Rica"
-msgstr ""
+msgstr "Kostariko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:575
 msgid "Cuba"
-msgstr ""
+msgstr "Kubo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:576
 msgid "Cape Verde"
-msgstr ""
+msgstr "Verdkabaj Insuloj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:577
 msgid "Christmas Island"
-msgstr ""
+msgstr "Kristnaska Insulo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:578
 msgid "Cyprus"
-msgstr ""
+msgstr "Cipro"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:579
 msgid "Czech Republic"
-msgstr ""
+msgstr "Ĉeka Respubliko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:580
 msgid "Germany"
-msgstr ""
+msgstr "Germanio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:581
 msgid "Djibouti"
-msgstr ""
+msgstr "Ĝibutio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:582
-#, fuzzy
 msgid "Denmark"
-msgstr "Malmarki"
+msgstr "Danlando"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:583
 msgid "Dominica"
-msgstr ""
+msgstr "Dominiko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:584
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Dominika Respubliko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:585
 msgid "Algeria"
-msgstr ""
+msgstr "Alĝerio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:586
 msgid "Ecuador"
-msgstr ""
+msgstr "Ekvadoro"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:587
 msgid "Estonia"
-msgstr ""
+msgstr "Estonio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:588
 msgid "Egypt"
-msgstr ""
+msgstr "Egipto"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:589
-#, fuzzy
 msgid "Western Sahara"
-msgstr "Okcidenteŭropa"
+msgstr "Okcidenta saharo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:590
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritreo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:591
 msgid "Spain"
-msgstr ""
+msgstr "Hispanio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:592
 msgid "Ethiopia"
-msgstr ""
+msgstr "Etiopio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:593
 msgid "Finland"
-msgstr ""
+msgstr "Finnlando"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:594
 msgid "Fiji"
-msgstr ""
+msgstr "Fiĝio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:595
 msgid "Falkland Islands (Malvinas)"
-msgstr ""
+msgstr "Falklandaj Insuloj  (Malvinio)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:596
 msgid "Micronesia, Federated States Of"
-msgstr ""
+msgstr "Mikronezio, Federacigitaj Ŝtatoj de"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:597
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Feroaj Insuloj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:598
-#, fuzzy
 msgid "France"
-msgstr "Nuligi"
+msgstr "Francio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:599
 msgid "France, Metropolitan"
-msgstr ""
+msgstr "Francio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:600
 msgid "Gabon"
-msgstr ""
+msgstr "Gabono"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:601
 #: ../src/plugins/geolocation/geolocation_plugin.c:747
 msgid "United Kingdom"
-msgstr ""
+msgstr "Unuiĝinta Reĝlando"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:602
 msgid "Grenada"
-msgstr ""
+msgstr "Grenado"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:603
 msgid "Georgia"
-msgstr ""
+msgstr "Georgio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:604
 msgid "French Guiana"
-msgstr ""
+msgstr "Franca Gujano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:605
 msgid "Ghana"
-msgstr ""
+msgstr "Ghano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:606
-#, fuzzy
 msgid "Gibraltar"
-msgstr "Libravatar"
+msgstr "Gibraltaro"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:607
-#, fuzzy
 msgid "Greenland"
-msgstr "Verda"
+msgstr "Grenlando"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:608
 msgid "Gambia"
-msgstr ""
+msgstr "Gambio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:609
 msgid "Guinea"
-msgstr ""
+msgstr "Gvineo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:610
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Gvadelupo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:611
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Ekvatora Gvineo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:612
-#, fuzzy
 msgid "Greece"
-msgstr "Verda"
+msgstr "Grekio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:613
 msgid "South Georgia And The South Sandwich Islands"
-msgstr ""
+msgstr "Suda Georgio kaj La Sudaj Sandviĉaj Insuloj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:614
 msgid "Guatemala"
-msgstr ""
+msgstr "Gvatemalo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:615
 msgid "Guam"
-msgstr ""
+msgstr "Gvamo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:616
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Gvineo-Bisaŭo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:617
 msgid "Guyana"
-msgstr ""
+msgstr "Gujano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:618
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hongkongo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:619
 msgid "Heard Island And Mcdonald Islands"
-msgstr ""
+msgstr "Herda Insulo kaj Makdonaldaj Insuloj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:620
 msgid "Honduras"
-msgstr ""
+msgstr "Honduraso"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:621
 msgid "Croatia"
-msgstr ""
+msgstr "Kroatio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:622
 msgid "Haiti"
-msgstr ""
+msgstr "Hejtio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:623
 msgid "Hungary"
-msgstr ""
+msgstr "Hungario"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:624
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonezio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:625
 msgid "Ireland"
-msgstr ""
+msgstr "Irlando"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:626
 msgid "Israel"
-msgstr ""
+msgstr "Israelo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:627
-#, fuzzy
 msgid "India"
-msgstr "Indikilo"
+msgstr "Hindio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:628
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Brita Hinda Oceana Teritorio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:629
 msgid "Iraq"
-msgstr ""
+msgstr "Irako"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:630
 msgid "Iran, Islamic Republic Of"
-msgstr ""
+msgstr "Irano, Islama Respubliko de"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:631
 msgid "Iceland"
-msgstr ""
+msgstr "Islando"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:632
 msgid "Italy"
-msgstr ""
+msgstr "Italio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:633
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamajko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:634
 msgid "Jordan"
-msgstr ""
+msgstr "Jordano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:635
-#, fuzzy
 msgid "Japan"
-msgstr "Japana"
+msgstr "Japanio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:636
 msgid "Kenya"
-msgstr ""
+msgstr "Kenjo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:637
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kirgistano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:638
 msgid "Cambodia"
-msgstr ""
+msgstr "Kambodio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:639
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribato"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:640
-#, fuzzy
 msgid "Comoros"
-msgstr "morgaŭ"
+msgstr "Komoroso"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:641
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "Sankta Kito kaj Nevis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:642
 msgid "Korea, Democratic People'S Republic Of"
-msgstr ""
+msgstr "Koreo, Demokrata Popola Respubliko de"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:643
 msgid "Korea, Republic Of"
-msgstr ""
+msgstr "Koreo, Respubliko de"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:644
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuŭeto"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:645
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Kejmanaj Insuloj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:646
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazakstano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:647
 msgid "Lao People'S Democratic Republic"
-msgstr ""
+msgstr "Laa Popola Demokrata Respubliko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:648
 msgid "Lebanon"
-msgstr ""
+msgstr "Libano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:649
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Sankta Luĉia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:650
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Liĥtenstajno"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:651
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Cejlono"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:652
 msgid "Liberia"
-msgstr ""
+msgstr "Liberio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:653
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesoto"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:654
 msgid "Lithuania"
-msgstr ""
+msgstr "Litovio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:655
 msgid "Luxembourg"
-msgstr ""
+msgstr "Luksemburgo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:656
 msgid "Latvia"
-msgstr ""
+msgstr "Latvio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:657
 msgid "Libyan Arab Jamahiriya"
-msgstr ""
+msgstr "Libia Araba Ĝamahirija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:658
 msgid "Morocco"
-msgstr ""
+msgstr "Maroko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:659
 msgid "Monaco"
-msgstr ""
+msgstr "Monako"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:660
 msgid "Moldova, Republic Of"
-msgstr ""
+msgstr "Moldovo, Respubliko de"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:661
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagaskaro"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:662
-#, fuzzy
 msgid "Marshall Islands"
-msgstr "Marki ĉiujn kiel legitaj"
+msgstr "Marŝalaj Insuloj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:663
 msgid "Macedonia, The Former Yugoslav Republic Of"
-msgstr ""
+msgstr "Macedonio, La Antaŭa Jugoslavia Respubliko de"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:664
 msgid "Mali"
-msgstr ""
+msgstr "Malio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:665
-#, fuzzy
 msgid "Myanmar"
-msgstr "Malmarki"
+msgstr "Myanmaro"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:666
 msgid "Mongolia"
-msgstr ""
+msgstr "Mongolio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:667
 msgid "Macao"
-msgstr ""
+msgstr "Makao"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:668
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Nordaj Marianaj Insuloj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:669
 msgid "Martinique"
-msgstr ""
+msgstr "Martiniko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:670
 msgid "Mauritania"
-msgstr ""
+msgstr "Maŭritanio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:671
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserato"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:672
 msgid "Malta"
-msgstr ""
+msgstr "Malto"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:673
 msgid "Mauritius"
-msgstr ""
+msgstr "Maŭricio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:674
 msgid "Maldives"
-msgstr ""
+msgstr "Maldivoj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:675
 msgid "Malawi"
-msgstr ""
+msgstr "Malaŭio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:676
 msgid "Mexico"
-msgstr ""
+msgstr "Meksiko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:677
 msgid "Malaysia"
-msgstr ""
+msgstr "Malajzio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:678
 msgid "Mozambique"
-msgstr ""
+msgstr "Mozambiko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:679
 msgid "Namibia"
-msgstr ""
+msgstr "Namibio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:680
-#, fuzzy
 msgid "New Caledonia"
-msgstr "Novaj kontaktoj"
+msgstr "Nova Kaledonio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:681
 msgid "Niger"
-msgstr ""
+msgstr "Nigero"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:682
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Norfolka Insulo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:683
 msgid "Nigeria"
-msgstr ""
+msgstr "Nigerio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:684
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nikaragvo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:685
 msgid "Netherlands"
-msgstr ""
+msgstr "Nederlando"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:686
-#, fuzzy
 msgid "Norway"
-msgstr "Plusendi"
+msgstr "Norvegio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:687
 msgid "Nepal"
-msgstr ""
+msgstr "Nepalo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:688
 msgid "Nauru"
-msgstr ""
+msgstr "Naŭruo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:689
 msgid "Niue"
-msgstr ""
+msgstr "Niuo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:690
 msgid "New Zealand"
-msgstr ""
+msgstr "Novzelando"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:691
 msgid "Oman"
-msgstr ""
+msgstr "Omano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:692
 msgid "Panama"
-msgstr ""
+msgstr "Panamo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:693
 msgid "Peru"
-msgstr ""
+msgstr "Peruo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:694
 msgid "French Polynesia"
-msgstr ""
+msgstr "Franca Polinezio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:695
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua Novgvineo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:696
-#, fuzzy
 msgid "Philippines"
-msgstr "linioj"
+msgstr "Filipinoj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:697
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakistano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:698
 msgid "Poland"
-msgstr ""
+msgstr "Pollando"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:699
 msgid "Saint Pierre And Miquelon"
-msgstr ""
+msgstr "Sankta Petro kaj Mikelono"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:700
 msgid "Pitcairn"
-msgstr ""
+msgstr "Pitkerna Insulo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:701
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Pŭerto Riko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:702
-#, fuzzy
 msgid "Portugal"
-msgstr "Pordo"
+msgstr "Portugalio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:703
 msgid "Palau"
-msgstr ""
+msgstr "Palaŭo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:704
 msgid "Paraguay"
-msgstr ""
+msgstr "Paragvajo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:705
-#, fuzzy
 msgid "Qatar"
-msgstr "Wavatar"
+msgstr "Kataro"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:706
 msgid "Reunion"
-msgstr ""
+msgstr "Reuniĝo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:707
 msgid "Romania"
-msgstr ""
+msgstr "Rumanio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:708
 msgid "Russian Federation"
-msgstr ""
+msgstr "Rusa Federacio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:709
 msgid "Rwanda"
-msgstr ""
+msgstr "Ruŭando"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:710
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Saŭdi Arabio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:711
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Salomonaj Insuloj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:712
 msgid "Seychelles"
-msgstr ""
+msgstr "Sejŝelo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:713
 msgid "Sudan"
-msgstr ""
+msgstr "Sudano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:714
 msgid "Sweden"
-msgstr ""
+msgstr "Svedio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:715
 msgid "Singapore"
-msgstr ""
+msgstr "Singaporo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:716
 msgid "Saint Helena"
-msgstr ""
+msgstr "Sankta Helena"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:717
 msgid "Slovenia"
-msgstr ""
+msgstr "Slovenio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:718
 msgid "Svalbard And Jan Mayen"
-msgstr ""
+msgstr "Svalbardo kaj Jan Mejeno"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:719
 msgid "Slovakia"
-msgstr ""
+msgstr "Slovakio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:720
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sieraleono"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:721
 msgid "San Marino"
-msgstr ""
+msgstr "Sankta Marino"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:722
 msgid "Senegal"
-msgstr ""
+msgstr "Senegalo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:723
 msgid "Somalia"
-msgstr ""
+msgstr "Somalio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:724
-#, fuzzy
 msgid "Suriname"
-msgstr "SMTP uzantnomo:"
+msgstr "Surinamo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:725
 msgid "Sao Tome And Principe"
-msgstr ""
+msgstr "Sankta Tome kaj Principe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:726
 msgid "El Salvador"
-msgstr ""
+msgstr "Salvadoro"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:727
 msgid "Syrian Arab Republic"
-msgstr ""
+msgstr "Siria Araba Respubliko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:728
 msgid "Swaziland"
-msgstr ""
+msgstr "Svazilando"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:729
 msgid "Turks And Caicos Islands"
-msgstr ""
+msgstr "Turkaj kaj Kajkosaj Insuloj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:730
 msgid "Chad"
-msgstr ""
+msgstr "Ĉado"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:731
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Francaj Sudaj Teritorioj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:732
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:733
-#, fuzzy
 msgid "Thailand"
-msgstr "Taja"
+msgstr "Tajlando"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:734
 msgid "Tajikistan"
-msgstr ""
+msgstr "Taĵikistano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:735
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelaŭo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:736
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkmenistano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:737
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunizio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:738
 msgid "Tonga"
-msgstr ""
+msgstr "Tongo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:739
 msgid "East Timor"
-msgstr ""
+msgstr "Orienta Timoro"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:740
 msgid "Turkey"
-msgstr ""
+msgstr "Turkio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:741
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "Trinidado kaj Tobago"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:742
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvaluo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:743
 msgid "Taiwan, Province Of China"
-msgstr ""
+msgstr "Tajvano, Provinco de Ĉino"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:744
 msgid "Tanzania, United Republic Of"
-msgstr ""
+msgstr "Tanzanio, Unuiĝinta Respubliko de"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:745
 msgid "Ukraine"
-msgstr ""
+msgstr "Ukrajnio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:746
 msgid "Uganda"
-msgstr ""
+msgstr "Ugando"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:748
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "Usonaj Malpligravaj Eksteraj Insuloj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:749
 msgid "United States"
-msgstr ""
+msgstr "Usono"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:750
 msgid "Uruguay"
-msgstr ""
+msgstr "Urugvajo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:751
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekistano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:752
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Eparĥio Sankta (Vatikana Urba Ŝtato)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:753
 msgid "Saint Vincent And The Grenadines"
-msgstr ""
+msgstr "Sankta Vincento kaj la Grenadinoj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:754
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuelo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:755
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "Virginaj Insuloj, Britaj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:756
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "Virginaj Insuloj, Usonaj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:757
-#, fuzzy
 msgid "Viet Nam"
-msgstr "Dosiera nomo"
+msgstr "Vietnamo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:758
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatuo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:759
 msgid "Wallis And Futuna"
-msgstr ""
+msgstr "Wallis kaj Futuno"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:760
 msgid "Samoa"
-msgstr ""
+msgstr "Samoo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:761
 msgid "Yemen"
-msgstr ""
+msgstr "Jemeno"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:762
 msgid "Mayotte"
-msgstr ""
+msgstr "Majoto"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:763
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "Serbio kaj Montenegro"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:764
 msgid "South Africa"
-msgstr ""
+msgstr "Sudafriko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:765
 msgid "Zambia"
-msgstr ""
+msgstr "Zambio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:766
 msgid "Democratic Republic Of The Congo"
-msgstr ""
+msgstr "Demokrata Respubliko de la Kongo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:767
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabvo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:777
 #: ../src/plugins/geolocation/geolocation_plugin.c:862
-#, fuzzy
 msgid "GeoLocation"
-msgstr "Loko:"
+msgstr "Geoloko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:782
-#, fuzzy, c-format
+#, c-format
 msgid "Could not initialize clutter"
-msgstr "Ne povis pravalorizi %s literumilon."
+msgstr "Ne povis pravalorizi malordon"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:788
 #: ../src/plugins/geolocation/geolocation_plugin.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create regular expression: %s\n"
-msgstr "Ne povis krei provizoran dosieron: %s"
+msgstr "Ne povis krei regulan esprimon: %s\n"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:803
-#, fuzzy
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-msgstr "Malsukcesis registri teman ŝanĝan hokon en la Aviza kromprogramo"
+msgstr "Malsukcesis registri messageview_show hokon en la geolokiga kromprogramo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:867
 msgid ""
 "This plugin provides GeoLocation functionality for Claws Mail.\n"
 "\n"
-"Warning: It is technically impossible to derive the geographic location of "
-"senders from their E-Mails with any amount of certainty. The results "
-"presented by this plugin are only rough estimates. In particular, mailing "
-"list managers often strip sender information from the mails, so mails from "
-"mailing lists may be assigned to the location of the mailing list server "
-"instead of the mail sender.\n"
-"When in doubt, don't trust the results of this plugin, and don't rely on "
-"this information to divorce your spouse.\n"
-"\n"
-"Feedback to <berndth at gmx.de> is welcome (but only if it's not about marital "
-"quarrels)."
+"Warning: It is technically impossible to derive the geographic location of senders from their E-Mails with any amount of certainty. The results presented by this plugin are only rough estimates. In particular, mailing list managers often strip sender information from the mails, so mails from mailing lists may be assigned to the location of the mailing list server instead of the mail sender.\n"
+"When in doubt, don't trust the results of this plugin, and don't rely on this information to divorce your spouse.\n"
+"\n"
+"Feedback to <berndth at gmx.de> is welcome (but only if it's not about marital quarrels)."
 msgstr ""
+"Ĉi tiu kromprogramo liveras GeoLocation kapablecon por Claws Mail.\n"
+"\n"
+"Averto: Estas teĥnike maleble derivi la geografian lokon de sendintoj el siaj retpoŝtoj kun ia kvanto da certeco. La rezultoj prezentataj de ĉi tiu kromprogramo estas nur taksoj krudaj. Aparte, mastrumoj de retpoŝtaj listoj ofte forprenas sendintan informon de la retpoŝtaĵoj, tiel ke retpoŝtoj el retpoŝtlistoj ofte estas valorizitaj al la loko de la retpoŝtlista servilo anstataŭ tiu de la sendinto.\n"
+"Kiam vi dubas, ne fidu la rezultojn de ĉi tiu kromprogramo, kaj ne fidu al ĉi tiu informo por sengeedziĝi.\n"
+"\n"
+"Prijuĝaj rimarkoj al <berndth at gmx.de> estos bonvenaj (sed nur se ĝi ne pritraktas geedzajn kverelojn)."
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:900
-#, fuzzy
 msgid "GeoLocation integration"
-msgstr "GData intergrado"
+msgstr "Geolokiga integriĝo"
 
-#: ../src/plugins/libravatar/libravatar.c:374
-#: ../src/plugins/libravatar/libravatar.c:445
-#: ../src/plugins/libravatar/libravatar.c:505
-#: ../src/plugins/libravatar/libravatar_prefs.c:400
+#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:452
+#: ../src/plugins/libravatar/libravatar.c:512
+#: ../src/plugins/libravatar/libravatar_prefs.c:440
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:388
 msgid "Failed to register avatar header update hook"
-msgstr "Malsukcesis registri hokon por ĝisdatiĝo de avataraj ĉapoj "
+msgstr "Malsukcesis registri hokon por ĝisdatigo de avataraj ĉapoj"
 
-#: ../src/plugins/libravatar/libravatar.c:389
+#: ../src/plugins/libravatar/libravatar.c:396
 msgid "Failed to register avatar image render hook"
-msgstr "Malsukcesis registri avatar-reproduktan hokon"
+msgstr "Malsukcesis registri avataran bildigan hokon"
 
-#: ../src/plugins/libravatar/libravatar.c:394
+#: ../src/plugins/libravatar/libravatar.c:401
 msgid "Failed to create avatar image cache directory"
-msgstr "Malsukcesis krei dosierujon por kaŝmemoro de bildoj"
+msgstr "Malsukcesis krei avataran bildan kaŝmemoran dosierujon"
 
-#: ../src/plugins/libravatar/libravatar.c:403
+#: ../src/plugins/libravatar/libravatar.c:410
 msgid "Failed to load missing items cache"
-msgstr "Malsukcesita ŝarĝi la kaŝmemoron de mankaj eroj"
+msgstr "Malsukcesis ŝarĝi la kaŝmemoron de mankaj eroj"
 
-#: ../src/plugins/libravatar/libravatar.c:455
+#: ../src/plugins/libravatar/libravatar.c:462
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -11580,128 +11241,140 @@ msgid ""
 "\n"
 "Feedback to <ricardo at mones.org> is welcome.\n"
 msgstr ""
-"Montri bildojn de la profiloj de libravatar por mesaĝoj.\n"
-"Pli informado estas disponebla pri libravatar ĉe \n"
+"Montru bildojn de la profiloj de libravatar por retmesaĝoj.\n"
+"Plia informo disponeblas pri libravatar ĉe \n"
 "http://www.libravatar.org/. Se vi havas profilon de gravatar.com\n"
-"sed ne profilon de libravatar, tiuj bildoj ankaŭ estos\n"
-"elŝutata (se alidirektoj estas permesita en la agordoj de la\n"
+"sed ne profilon de libravatar, tiuj ankaŭ estos\n"
+"elŝutitaj (se alidirektoj estas permesitaj en la agordo de la\n"
 "kromprogramo).\n"
-"Vi povas malfermi la agordo-paĝon de la ĉefa fenestro por klaki:\n"
-"/Agordo/Preferoj/Kromprogramo/Libravatar.\n"
+"Vi povas malfermi la agordan paĝon de la kromprogramo ĉe la\n"
+"ĉefa fenestro:\n"
+"/Agordo/Preferoj/Kromprogramoj/Libravatar.\n"
 "\n"
-"Ĉi-kromprogramo uzas libcurl-n por elŝuti bildojn, do se vi uzas\n"
-"prokuran servilon bonvole vidu la manlibro de curl(1) por detaloj\n"
-"pri 'http_proxy' agordo.\n"
+"Ĉi tiu kromprogramo uzas na libcurl por elŝuti bildojn, do se vi uzas\n"
+"prokurilon, bonvolu vidi la manlibron de curl(1) por detaloj\n"
+"pri 'http_proxy' agordo. Pliaj detaloj pri ĉi tio kaj aliaj en\n"
+"la README (LEGUMIN) dosiero.\n"
 "\n"
-"Rimarkoj al <ricardo at mones.org> estas bonvena.\n"
+"Prijuĝaj rimarkoj al <ricardo at mones.org> estos bonvenaj.\n"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:112
+#: ../src/plugins/libravatar/libravatar_prefs.c:138
 msgid "_Use cached icons"
-msgstr "Uzi bildsimbolojn kaŝmemoritajn"
+msgstr "Uzu kaŝmemoritajn piktogramojn"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:113
-msgid ""
-"Keep icons on disk for reusing instead of making another network request"
-msgstr ""
-"Savi la bildsimbolojn en la durdisko por reuzo anstataŭ repeti ĝin de la reto"
+#: ../src/plugins/libravatar/libravatar_prefs.c:139
+msgid "Keep icons on disk for reusing instead of making another network request"
+msgstr "Konservu la piktogramojn surdiske por reuzo anstataŭ fari alian retan peton"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:121
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
 msgid "Cache refresh interval"
 msgstr "Refreŝiga intervalo de la kaŝmemoro"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:123
-#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:333
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
+#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:335
 msgid "hours"
 msgstr "horoj"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:188
+#: ../src/plugins/libravatar/libravatar_prefs.c:207
 msgid "Mystery man"
-msgstr "Mystery man"
+msgstr "Misterulo"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:189
+#: ../src/plugins/libravatar/libravatar_prefs.c:208
 msgid "Identicon"
 msgstr "Identicon"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:190
+#: ../src/plugins/libravatar/libravatar_prefs.c:209
 msgid "MonsterID"
 msgstr "MonsterID"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:191
+#: ../src/plugins/libravatar/libravatar_prefs.c:210
 msgid "Wavatar"
 msgstr "Wavatar"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:192
+#: ../src/plugins/libravatar/libravatar_prefs.c:211
 msgid "Retro"
 msgstr "Retro"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:193
+#: ../src/plugins/libravatar/libravatar_prefs.c:212
 msgid "Custom URL"
-msgstr "Laŭmenda URL-o"
+msgstr "Propra retadreso"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:196
+#: ../src/plugins/libravatar/libravatar_prefs.c:215
 msgid "A blank image"
-msgstr "Malplena bildo"
+msgstr "Vaka bildo"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:197
+#: ../src/plugins/libravatar/libravatar_prefs.c:216
 msgid "The unobtrusive low-contrast greyish silhouette"
-msgstr "Neafektema silueto grizeca de malalta kontrasto"
+msgstr "La netruda silueto grizeca de malalta kontrasto"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:198
+#: ../src/plugins/libravatar/libravatar_prefs.c:217
 msgid "A generated geometric pattern"
-msgstr "Produktita geometria figuro"
+msgstr "Generita geometria figuro"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:199
+#: ../src/plugins/libravatar/libravatar_prefs.c:218
 msgid "A generated full-body monster"
-msgstr "Produktita bestaĉo (plena korpo)"
+msgstr "Generita bestaĉo (plena korpo)"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:200
+#: ../src/plugins/libravatar/libravatar_prefs.c:219
 msgid "A generated almost unique face"
-msgstr "Produktita vizaĝo preskaŭ unika"
+msgstr "Generita vizaĝo preskaŭ unika"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:201
+#: ../src/plugins/libravatar/libravatar_prefs.c:220
 msgid "A generated 8-bit arcade-style pixelated image"
-msgstr ""
-"Aŭtomate produktita ok-bita, \"rastrumeriĝita\" videoludeja stilo bildo"
+msgstr "Generita ok-bita, rastrumeriĝita videoludej-stila bildo"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:202
+#: ../src/plugins/libravatar/libravatar_prefs.c:221
 msgid "Redirect to a user provided URL"
-msgstr "Alidirekti al uzantdifinita URL"
+msgstr "Alidirektu al uzantdifinita retadreso"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:229 ../src/prefs_themes.c:878
+#: ../src/plugins/libravatar/libravatar_prefs.c:248 ../src/prefs_themes.c:878
 msgid "URL:"
 msgstr "Retadreso:"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:256
+#: ../src/plugins/libravatar/libravatar_prefs.c:276
 msgid "_Allow redirects to other sites"
-msgstr "_Permesi alidirektojn al aliaj retejoj"
+msgstr "_Permesu alidirektojn al aliaj retejoj"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:257
-msgid ""
-"Follow redirect responses received from libravatar server to other avatar "
-"services like gravatar.com"
-msgstr ""
-"Sekvi alidirektajn respondojn ricevitajn el la libravatar servilo al aliaj "
-"serviloj kiel gravatar.com"
+#: ../src/plugins/libravatar/libravatar_prefs.c:277
+msgid "Follow redirect responses received from libravatar server to other avatar services like gravatar.com"
+msgstr "Sekvu alidirektajn respondojn ricevitajn el la libravatar servilo al aliaj serviloj kiel gravatar.com"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:266
+#: ../src/plugins/libravatar/libravatar_prefs.c:286
 msgid "_Enable federated servers"
-msgstr "Ŝalti federitajn servilojn"
+msgstr "Ebligu federitajn servilojn"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:267
+#: ../src/plugins/libravatar/libravatar_prefs.c:287
 msgid "Try to get avatar from sender's domain libravatar server"
-msgstr "Provi peti la avataron de la avatar-servilo de la sendanto"
+msgstr "Provu havigi avataron de la domajna avatar-servilo de la sendinto"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+msgid "Request timeout"
+msgstr "Peta eltempiĝo"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+#: ../src/plugins/notification/notification_prefs.c:1028
+#: ../src/plugins/notification/notification_prefs.c:1300
+#: ../src/plugins/notification/notification_prefs.c:1608
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
+#: ../src/prefs_summaries.c:496
+msgid "seconds"
+msgstr "sekundoj"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:312
+#: ../src/plugins/libravatar/libravatar_prefs.c:305
+msgid "Set to 0 to use global socket I/O timeout. Maximum value must be also less than global socket I/O timeout."
+msgstr "Starigu al 0 por uzi mallokan ingan eneligan pretertempiĝon. Maksimuma valoro devas esti malpli ol malloka inga eneliga pretertempiĝo."
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:349
 msgid "Icon cache"
 msgstr "Piktograma kaŝmemoro"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:316
+#: ../src/plugins/libravatar/libravatar_prefs.c:353
 msgid "Default missing icon mode"
-msgstr "Defaŭlta maniero kiam la bildsimbolo mankas"
+msgstr "Defaŭlta reĝimo kiam la bildsimbolo mankas"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:320
+#: ../src/plugins/libravatar/libravatar_prefs.c:357
 msgid "Network"
-msgstr "Reta protokolo"
+msgstr "Reto"
 
 #: ../src/plugins/mailmbox/plugin.c:58
 msgid "mailmbox folder (etPan!)"
@@ -11725,7 +11398,7 @@ msgid ""
 "If the existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
-"Enigi la lokon de poŝtkesto.\n"
+"Enigu la lokon de poŝtkesto.\n"
 "Se la ekzistanta poŝtkesto estas specifita, ĝi estos skanita aŭtomate."
 
 #: ../src/plugins/mailmbox/plugin_gtk.c:322
@@ -11753,15 +11426,13 @@ msgstr "Ne povis malfermi protokolan dosieron %s: %s\n"
 #: ../src/plugins/newmail/newmail.c:154
 #, c-format
 msgid ""
-"This plugin writes a header summary to a log file for each mail received "
-"after sorting.\n"
+"This plugin writes a header summary to a log file for each mail received after sorting.\n"
 "\n"
 "Default is ~/Mail/NewLog\n"
 "\n"
 "Current log is %s"
 msgstr ""
-"Ĉi tiu kromprogramo skribas ĉapan resumon al protokola dosiero po ĉiu poŝto "
-"ricevita post ordigo.\n"
+"Ĉi tiu kromprogramo skribas ĉapan resumon al protokola dosiero po ĉiu poŝto ricevita post ordigo.\n"
 "\n"
 "Defaŭlto estas ~/Mail/NewLog\n"
 "\n"
@@ -11777,12 +11448,12 @@ msgstr "Dosierujo:"
 
 #: ../src/plugins/notification/notification_foldercheck.c:478
 msgid "Select folder(s)"
-msgstr "Elekti dosierujo(j)n"
+msgstr "Elektu dosierujo(j)n"
 
 #. recursive
 #: ../src/plugins/notification/notification_foldercheck.c:579
 msgid "select recursively"
-msgstr "elekti rikure"
+msgstr "elektu rikure"
 
 #: ../src/plugins/notification/notification_lcdproc.c:155
 msgid "No new messages"
@@ -11807,14 +11478,11 @@ msgstr "La Aviza kromprogramo bezonas subtenon de fadenoj."
 
 #: ../src/plugins/notification/notification_plugin.c:228
 msgid "Failed to register folder item update hook in the Notification plugin"
-msgstr ""
-"Malsukcesis registri dosierujan eran ĝisdatigan hokon en la Aviza "
-"kromprogramo"
+msgstr "Malsukcesis registri dosierujan eran ĝisdatigan hokon en la Aviza kromprogramo"
 
 #: ../src/plugins/notification/notification_plugin.c:236
 msgid "Failed to register folder update hook in the Notification plugin"
-msgstr ""
-"Malsukcesis registri dosierujan ĝisdatigan hokon en la Aviza kromprogramo"
+msgstr "Malsukcesis registri dosierujan ĝisdatigan hokon en la Aviza kromprogramo"
 
 #: ../src/plugins/notification/notification_plugin.c:246
 msgid "Failed to register msginfo update hook in the Notification plugin"
@@ -11826,19 +11494,15 @@ msgstr "Malsukcesis registri senretan ŝaltilan hokon el la Aviza kromprogramo"
 
 #: ../src/plugins/notification/notification_plugin.c:267
 msgid "Failed to register main window close hook in the Notification plugin"
-msgstr ""
-"Malsukcesis registri ĉef-fenestran ferman hokon en la Aviza kromprogramo"
+msgstr "Malsukcesis registri ĉef-fenestran ferman hokon en la Aviza kromprogramo"
 
 #: ../src/plugins/notification/notification_plugin.c:280
 msgid "Failed to register got iconified hook in the Notification plugin"
-msgstr ""
-"Malsukcesis registri havigitan piktrogramigitan hokon en la Aviza "
-"kromprogramo"
+msgstr "Malsukcesis registri havigitan piktrogramigitan hokon en la Aviza kromprogramo"
 
 #: ../src/plugins/notification/notification_plugin.c:293
 msgid "Failed to register account list changed hook in the Notification plugin"
-msgstr ""
-"Malsukcesis registri hokon por ŝanĝita konta listo en la Aviza kromprogramo"
+msgstr "Malsukcesis registri hokon pri kontlistaj ŝanĝoj en la Aviza kromprogramo"
 
 #: ../src/plugins/notification/notification_plugin.c:306
 msgid "Failed to register theme change hook in the Notification plugin"
@@ -11846,17 +11510,13 @@ msgstr "Malsukcesis registri teman ŝanĝan hokon en la Aviza kromprogramo"
 
 #: ../src/plugins/notification/notification_plugin.c:422
 msgid ""
-"This plugin provides various ways to notify the user of new and unread "
-"email.\n"
-"The plugin is extensively configurable in the plugins section of the "
-"preferences dialog.\n"
+"This plugin provides various ways to notify the user of new and unread email.\n"
+"The plugin is extensively configurable in the plugins section of the preferences dialog.\n"
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"Ĉi tiu kromprogramo provizas diversajn manierojn avizi la uzanton de nova "
-"kaj nelegita retpoŝto.\n"
-"La kromprogramon oni povas etende agordi en la kromprograma sekcio de la "
-"prefera dialogo.\n"
+"Ĉi tiu kromprogramo provizas diversajn manierojn avizi la uzanton de nova kaj nelegita retpoŝto.\n"
+"La kromprogramon oni povas etende agordi en la kromprograma sekcio de la prefera dialogo.\n"
 "\n"
 "Prijuĝaj rimarkoj al <berndth at gmx.de> estos bonvenaj."
 
@@ -11993,7 +11653,7 @@ msgstr ""
 #. Frame
 #: ../src/plugins/notification/notification_prefs.c:597
 msgid "Include folder types"
-msgstr "Inkluzivi dosierujajn tipojn"
+msgstr "Inkluzivu dosierujajn tipojn"
 
 #. Include mail folders
 #: ../src/plugins/notification/notification_prefs.c:607
@@ -12017,9 +11677,8 @@ msgstr "Kalendaraj dosierujoj"
 
 #. Warning-Label
 #: ../src/plugins/notification/notification_prefs.c:639
-#, fuzzy
 msgid "These settings override folder-specific selections."
-msgstr "Ĉi tiuj agordoj anstataŭigas dosierujajn specifajn elektojn."
+msgstr "Ĉi tiuj agordoj superregas dosierujajn elektojn."
 
 #. Frame
 #: ../src/plugins/notification/notification_prefs.c:650
@@ -12029,25 +11688,21 @@ msgstr "Mallokaj avizaj agordoj"
 #. urgency hint new
 #: ../src/plugins/notification/notification_prefs.c:660
 msgid "Set window manager urgency hint when new messages exist"
-msgstr ""
-"Fiksi fenestran mastrumilan urĝecan konsileton kiam nelegitaj mesaĝoj "
-"ekzistas"
+msgstr "Fiksu fenestran mastrumilan urĝecan konsileton kiam nelegitaj mesaĝoj ekzistas"
 
 #. urgency hint new
 #: ../src/plugins/notification/notification_prefs.c:669
 msgid "Set window manager urgency hint when unread messages exist"
-msgstr ""
-"Fiksi fenestran mastrumilan urĝecan konsileton kiam nelegitaj mesaĝoj "
-"ekzistas"
+msgstr "Fiksu fenestran mastrumilan urĝecan konsileton kiam nelegitaj mesaĝoj ekzistas"
 
 #. canberra
 #: ../src/plugins/notification/notification_prefs.c:679
 msgid "Use sound theme"
-msgstr "Uzi sonan temon"
+msgstr "Uzu sonan temon"
 
 #: ../src/plugins/notification/notification_prefs.c:741
 msgid "Show banner"
-msgstr "Montri standardon"
+msgstr "Montru standardon"
 
 #: ../src/plugins/notification/notification_prefs.c:746
 #: ../src/plugins/pgpcore/select-keys.c:238
@@ -12089,32 +11744,32 @@ msgstr "Standarda larĝo en bilderoj (0 signifas ekrangrando)"
 #. Include unread
 #: ../src/plugins/notification/notification_prefs.c:821
 msgid "Include unread mails in banner"
-msgstr "Inkluzivi nelegitajn poŝtojn en standardo"
+msgstr "Inkluzivu nelegitajn poŝtojn en standardo"
 
 #. Check button sticky
 #: ../src/plugins/notification/notification_prefs.c:829
 msgid "Make banner sticky"
-msgstr "Fari standardon glua"
+msgstr "Faru standardon glua"
 
 #: ../src/plugins/notification/notification_prefs.c:839
 #: ../src/plugins/notification/notification_prefs.c:1037
 #: ../src/plugins/notification/notification_prefs.c:1309
 #: ../src/plugins/notification/notification_prefs.c:1544
 msgid "Only include selected folders"
-msgstr "Nur inkluzivi elektitajn dosierujojn"
+msgstr "Nur inkluzivu elektitajn dosierujojn"
 
 #: ../src/plugins/notification/notification_prefs.c:848
 #: ../src/plugins/notification/notification_prefs.c:1046
 #: ../src/plugins/notification/notification_prefs.c:1318
 #: ../src/plugins/notification/notification_prefs.c:1553
 msgid "Select folders..."
-msgstr "Elekti dosierujojn..."
+msgstr "Elektu dosierujojn..."
 
 #. Check box for enabling custom colors
 #: ../src/plugins/notification/notification_prefs.c:858
 #: ../src/plugins/notification/notification_prefs.c:1078
 msgid "Use custom colors"
-msgstr "Uzi proprajn kolorojn"
+msgstr "Uzu proprajn kolorojn"
 
 #. foreground
 #: ../src/plugins/notification/notification_prefs.c:871
@@ -12143,29 +11798,21 @@ msgstr "Fona koloro"
 #. Enable popup
 #: ../src/plugins/notification/notification_prefs.c:1001
 msgid "Enable popup"
-msgstr "Ebligi ŝprucaĵon"
+msgstr "Ebligu ŝprucaĵon"
 
 #: ../src/plugins/notification/notification_prefs.c:1018
 #: ../src/plugins/notification/notification_prefs.c:1599
 msgid "Popup timeout:"
 msgstr "Ŝprucaĵa eltempiĝo:"
 
-#: ../src/plugins/notification/notification_prefs.c:1028
-#: ../src/plugins/notification/notification_prefs.c:1300
-#: ../src/plugins/notification/notification_prefs.c:1608
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
-#: ../src/prefs_summaries.c:496
-msgid "seconds"
-msgstr "sekundoj"
-
 #. Sticky check button
 #: ../src/plugins/notification/notification_prefs.c:1057
 msgid "Make popup sticky"
-msgstr "Fari ŝprucaĵon glua"
+msgstr "Faru ŝprucaĵon glua"
 
 #: ../src/plugins/notification/notification_prefs.c:1067
 msgid "Set popup window width and position"
-msgstr "Fiksi ŝprucfenestrajn larĝon kaj pozicion"
+msgstr "Fiksu ŝprucfenestrajn larĝon kaj pozicion"
 
 #: ../src/plugins/notification/notification_prefs.c:1072
 msgid "(the window manager is free to ignore this)"
@@ -12174,7 +11821,7 @@ msgstr "(la fenestra mastrumilo estas libera ignori ĉi tion)"
 #: ../src/plugins/notification/notification_prefs.c:1120
 #: ../src/plugins/notification/notification_prefs.c:1611
 msgid "Display folder name"
-msgstr "Montri dosierujan nomon"
+msgstr "Montru dosierujan nomon"
 
 #: ../src/plugins/notification/notification_prefs.c:1185
 msgid "Sample popup window"
@@ -12187,7 +11834,7 @@ msgstr "Farita"
 #. Enable command
 #: ../src/plugins/notification/notification_prefs.c:1260
 msgid "Enable command"
-msgstr "Ebligi komandon"
+msgstr "Ebligu komandon"
 
 #: ../src/plugins/notification/notification_prefs.c:1277
 msgid "Command to execute:"
@@ -12195,12 +11842,12 @@ msgstr "Komando plenumenda:"
 
 #: ../src/plugins/notification/notification_prefs.c:1290
 msgid "Block command after execution for"
-msgstr "Bloki komandon por plenumado dum"
+msgstr "Bloku komandon por plenumado dum"
 
 #. Enable lcdproc
 #: ../src/plugins/notification/notification_prefs.c:1397
 msgid "Enable LCD"
-msgstr "Ebligi LCD"
+msgstr "Ebligu LCD"
 
 #: ../src/plugins/notification/notification_prefs.c:1416
 msgid "Hostname:Port of LCDd server:"
@@ -12209,22 +11856,22 @@ msgstr "Gastnomo:Pordo de LCD-ita servilo:"
 #. Enable trayicon
 #: ../src/plugins/notification/notification_prefs.c:1501
 msgid "Enable Trayicon"
-msgstr "Ebligi Pletpiktogramon"
+msgstr "Ebligu Pletpiktogramon"
 
 #. Hide at startup
 #: ../src/plugins/notification/notification_prefs.c:1517
 msgid "Hide at start-up"
-msgstr "Kaŝi je komenco"
+msgstr "Kaŝu je komenco"
 
 #. Close to tray
 #: ../src/plugins/notification/notification_prefs.c:1525
 msgid "Close to tray"
-msgstr "Fermi al pleto"
+msgstr "Fermu al pleto"
 
 #. Hide when iconified
 #: ../src/plugins/notification/notification_prefs.c:1533
 msgid "Hide when iconified"
-msgstr "Kaŝi kiam piktogramigita"
+msgstr "Kaŝu kiam piktogramigita"
 
 #. Frame for trayicon popup stuff
 #. TRANSLATORS: "Toaster" does not refer to the kitchen appliance.
@@ -12240,27 +11887,27 @@ msgstr "Pasiva informa ŝprucaĵo"
 #. Enable popup for the tray icon
 #: ../src/plugins/notification/notification_prefs.c:1581
 msgid "Enable Popup"
-msgstr "Ebligi ŝprucaĵon"
+msgstr "Ebligu ŝprucaĵon"
 
 #. Enable indicator
 #: ../src/plugins/notification/notification_prefs.c:1799
 msgid "Add to Indicator Applet"
-msgstr "Aldoni al Aviza retprogramo"
+msgstr "Aldonu al Aviza retprogramo"
 
 #. hide when minimized
 #: ../src/plugins/notification/notification_prefs.c:1813
 msgid "Hide mainwindow when minimized"
-msgstr "Kaŝi ĉef-fenestron kiam minimumigita"
+msgstr "Kaŝu ĉef-fenestron kiam minimumigita"
 
 #. register
 #: ../src/plugins/notification/notification_prefs.c:1819
 msgid "Register Claws Mail"
-msgstr "Registri Claws Mail"
+msgstr "Registru Claws Mail"
 
 #. Enable hotkeys
 #: ../src/plugins/notification/notification_prefs.c:1880
 msgid "Enable global hotkeys"
-msgstr "Ebligi mallokajn fulmoklavojn"
+msgstr "Ebligu mallokajn fulmoklavojn"
 
 #: ../src/plugins/notification/notification_prefs.c:1894
 #, c-format
@@ -12278,11 +11925,11 @@ msgstr "<alt>N"
 #. toggle mainwindow
 #: ../src/plugins/notification/notification_prefs.c:1905
 msgid "Toggle minimize:"
-msgstr "Baskuli minimumigon:"
+msgstr "Baskulu minimumigon:"
 
 #: ../src/plugins/notification/notification_trayicon.c:114
 msgid "_Get Mail"
-msgstr "Havi_gi Poŝton"
+msgstr "Havi_gu Poŝton"
 
 #: ../src/plugins/notification/notification_trayicon.c:116
 msgid "_Email"
@@ -12294,19 +11941,19 @@ msgstr "Retpoŝto de konto"
 
 #: ../src/plugins/notification/notification_trayicon.c:118
 msgid "Open A_ddressbook"
-msgstr "Malfermi a_dreslibron"
+msgstr "Malfermu a_dreslibron"
 
 #: ../src/plugins/notification/notification_trayicon.c:119
 msgid "E_xit Claws Mail"
-msgstr "Eliri Claws Mail"
+msgstr "Eliru Claws Mail"
 
 #: ../src/plugins/notification/notification_trayicon.c:124
 msgid "_Work Offline"
-msgstr "Labori senrete"
+msgstr "Laboru senrete"
 
 #: ../src/plugins/notification/notification_trayicon.c:126
 msgid "Show Trayicon Notifications"
-msgstr "Montri Pletpiktogramajn avizojn"
+msgstr "Montru Pletpiktogramajn avizojn"
 
 #. Tooltip
 #: ../src/plugins/notification/notification_trayicon.c:269
@@ -12408,7 +12055,7 @@ msgstr "de %d"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1359
 msgid "PDF rendering failed for an unknown reason."
-msgstr ""
+msgstr "PDF bildigado fiaskis pro ne konata kialo."
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1722
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1940
@@ -12433,27 +12080,27 @@ msgstr "Lasta paĝo"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1920
 msgid "Zoom In"
-msgstr "Enzomi"
+msgstr "Enzomu"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1922
 msgid "Zoom Out"
-msgstr "Elzomi"
+msgstr "Elzomu"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1925
 msgid "Fit Page"
-msgstr "Adapti al paĝo"
+msgstr "Adaptu al paĝo"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1928
 msgid "Fit Page Width"
-msgstr "Adapti al paĝa larĝo"
+msgstr "Adaptu al paĝa larĝo"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1931
 msgid "Rotate Left"
-msgstr "Rotacii liven"
+msgstr "Rotaciu liven"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1934
 msgid "Rotate Right"
-msgstr "Rotacii dekstren"
+msgstr "Rotaciu dekstren"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1937
 msgid "Document Info"
@@ -12470,13 +12117,11 @@ msgstr "Zomfaktoro"
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:2049
 #, c-format
 msgid ""
-"This plugin enables the viewing of PDF and PostScript attachments using the "
-"Poppler %s Lib and the gs tool.\n"
+"This plugin enables the viewing of PDF and PostScript attachments using the Poppler %s Lib and the gs tool.\n"
 "\n"
 "Any feedback is welcome: iwkse at claws-mail.org"
 msgstr ""
-"Ĉi tiu kromprogramo ebligas la vidon de PDF kaj postskriptajn algluaĵojn "
-"uzante la Poppler %s bibliotekon kaj la gs ilo.\n"
+"Ĉi tiu kromprogramo ebligas la vidon de PDF kaj postskriptajn algluaĵojn uzante la Poppler %s bibliotekon kaj la gs ilo.\n"
 "\n"
 "Iuj ajn prijuĝaj rimarkoj estos bonvenaj: iwkse at claws-mail.org"
 
@@ -12489,27 +12134,21 @@ msgstr "PDF vidilo"
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:2059
 #, c-format
 msgid ""
-"Warning: could not find ghostscript binary (gs) required for %s plugin to "
-"process PostScript attachments, only PDF attachments will be displayed. To "
-"enable PostScript support please install gs program.\n"
+"Warning: could not find ghostscript binary (gs) required for %s plugin to process PostScript attachments, only PDF attachments will be displayed. To enable PostScript support please install gs program.\n"
 "\n"
 "%s"
 msgstr ""
-"Averto: ne povis trovi ghostscript duumon (gs) bezonata por %s kromprogramo "
-"trakti PostSkriptajn algluaĵojn; nur PDF algluaĵoj estos montrataj. Por "
-"ebligi PostSkriptan subtenon, bonvolu instali la gs programon.\n"
+"Averto: ne povis trovi ghostscript duumon (gs) bezonata por %s kromprogramo trakti PostSkriptajn algluaĵojn; nur PDF algluaĵoj estos montrataj. Por ebligi PostSkriptan subtenon, bonvolu instali la gs programon.\n"
 "\n"
 "%s"
 
 #: ../src/plugins/perl/perl_gtk.c:50
 msgid "Edit perl filter rules (ext)..."
-msgstr ""
+msgstr "Redaktu perl filtrajn regulojn (eks)..."
 
 #: ../src/plugins/pgpcore/autocompletion.c:125
 msgid "Failed to register PGP address autocompletion hook"
-msgstr ""
-"Malsukecis registri adresan kompletigan hokon de la kompletigo aŭtomata de "
-"PHP adresoj"
+msgstr "Malsukcesis registri na PGP adresan aŭtomatan kompletigan hokon"
 
 #: ../src/plugins/pgpcore/passphrase.c:86
 #: ../src/plugins/pgpcore/prefs_gpg.c:116
@@ -12523,13 +12162,11 @@ msgstr "[neniu uzanta identigilo]"
 #: ../src/plugins/pgpcore/passphrase.c:260
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the "
-"new key:</span>\n"
+"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the new key:</span>\n"
 "\n"
 "%.*s\n"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">%sBonvolu enigi la pasfrazon por la "
-"nova ŝlosilo:</span>\n"
+"<span weight=\"bold\" size=\"larger\">%sBonvolu enigi la pasfrazon por la nova ŝlosilo:</span>\n"
 "\n"
 "%.*s\n"
 
@@ -12540,26 +12177,22 @@ msgstr "Pasfrazoj ne kongruis.\n"
 #: ../src/plugins/pgpcore/passphrase.c:266
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the "
-"new key:</span>\n"
+"<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the new key:</span>\n"
 "\n"
 "%.*s\n"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Bonvolu re-enigi la pasfrazon por la "
-"nova ŝlosilo:</span>\n"
+"<span weight=\"bold\" size=\"larger\">Bonvolu re-enigi la pasfrazon por la nova ŝlosilo:</span>\n"
 "\n"
 "%.*s\n"
 
 #: ../src/plugins/pgpcore/passphrase.c:270
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-"span>\n"
+"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</span>\n"
 "\n"
 "%.*s\n"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">%sBonvolu enigi la pasfrazon por:</"
-"span>\n"
+"<span weight=\"bold\" size=\"larger\">%sBonvolu enigi la pasfrazon por:</span>\n"
 "\n"
 "%.*s\n"
 
@@ -12572,12 +12205,8 @@ msgid "Key import"
 msgstr "Ŝlosila importo"
 
 #: ../src/plugins/pgpcore/pgp_viewer.c:122
-msgid ""
-"This key is not in your keyring. Do you want Claws Mail to try and import it "
-"from a keyserver?"
-msgstr ""
-"Ĉi tiu ŝlosilo ne estas en via ŝlosilejo. Ĉu vi volas ke Claws Mail provu "
-"importi ĝin de ŝlosilservilo?"
+msgid "This key is not in your keyring. Do you want Claws Mail to try and import it from a keyserver?"
+msgstr "Ĉi tiu ŝlosilo ne estas en via ŝlosilejo. Ĉu vi volas ke Claws Mail provu importi ĝin de ŝlosilservilo?"
 
 #: ../src/plugins/pgpcore/pgp_viewer.c:129
 #: ../src/plugins/pgpcore/pgp_viewer.c:201
@@ -12659,22 +12288,17 @@ msgstr "PGP/Kerno"
 
 #: ../src/plugins/pgpcore/plugin.c:71
 msgid ""
-"This plugin handles PGP core operations and provides address autocompletion "
-"from the GPG keyring. It is used by other plugins, like PGP/Mime.\n"
+"This plugin handles PGP core operations and provides address autocompletion from the GPG keyring. It is used by other plugins, like PGP/Mime.\n"
 "\n"
-"Options can be found in /Configuration/Preferences/Plugins/GPG and /"
-"Configuration/[Account Preferences]/Plugins/GPG\n"
+"Options can be found in /Configuration/Preferences/Plugins/GPG and /Configuration/[Account Preferences]/Plugins/GPG\n"
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Ĉi tiu kromprogramo traktas PGP kernajn operaciojn kaj provizas aŭtomatan "
-"kompletigon el la ŝlosilejo de GPG. Ĝi estas uzata de aliaj kromprogramoj, "
-"kiel PGP/Mime.\n"
+"Ĉi tiu kromprogramo traktas PGP kernajn operaciojn kaj provizas aŭtomatan kompletigon el la ŝlosilejo de GPG. Ĝi estas uzata de aliaj kromprogramoj, kiel PGP/Mime.\n"
 "\n"
-"Opcioj povas esti trovataj en /Agordo/Preferoj/Kromprogramoj/GPG kaj /Agordo/"
-"[Kontaj Preferoj]/Kromprogramoj/GPG\n"
+"Opcioj povas esti trovataj en /Agordo/Preferoj/Kromprogramoj/GPG kaj /Agordo/[Kontaj Preferoj]/Kromprogramoj/GPG\n"
 "\n"
 "La kromprogramo uzas la GPGME bibliotekon kiel volvilo por GnuPG.\n"
 "\n"
@@ -12686,23 +12310,23 @@ msgstr "Kernaj operacioj"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:111
 msgid "Automatically check signatures"
-msgstr "Aŭtomate kontroli subskribojn"
+msgstr "Aŭtomate kontrolu subskribojn"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:114
 msgid "Use keyring for address autocompletion"
-msgstr "Uzi ŝlosilejon por aŭtomata kompletigo de retpoŝtadresoj"
+msgstr "Uzu ŝlosilejon por aŭtomata kompletigo de retpoŝtadresoj"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:119
 msgid "Use gpg-agent to manage passwords"
-msgstr "Uzi gpg-agent por mastrumi pasvortojn"
+msgstr "Uzu gpg-agent por mastrumi pasvortojn"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:124
 msgid "Store passphrase in memory"
-msgstr "Konservi pasfrazon memore"
+msgstr "Konservu pasfrazon memore"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:134
 msgid "Expire after"
-msgstr "Finiĝi post"
+msgstr "Finiĝu post"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:149
 msgid "Setting to '0' will store the passphrase for the whole session"
@@ -12714,11 +12338,11 @@ msgstr "minuto(j)"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:163
 msgid "Grab input while entering a passphrase"
-msgstr "Kapti enigon dum enigo de pasfrazo"
+msgstr "Kaptu enigon dum enigo de pasfrazo"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:170
 msgid "Display warning on start-up if GnuPG doesn't work"
-msgstr "Montri averton je komenco se GnuPG ne funkcias"
+msgstr "Montru averton je komenco se GnuPG ne funkcias"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:308
 msgid "Sign key"
@@ -12726,15 +12350,15 @@ msgstr "Subskriba ŝlosilo"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:316
 msgid "Use default GnuPG key"
-msgstr "Uzi defaŭltan GnuPG ŝlosilon"
+msgstr "Uzu defaŭltan GnuPG ŝlosilon"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:327
 msgid "Select key by your email address"
-msgstr "Elekti ŝlosilon pere de via retpoŝta adreso"
+msgstr "Elektu ŝlosilon pere de via retpoŝta adreso"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:338
 msgid "Specify key manually"
-msgstr "Specifi ŝlosilon permane"
+msgstr "Specifu ŝlosilon permane"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:348
 msgid "User or key ID:"
@@ -12746,7 +12370,7 @@ msgstr "Neniu sekreta ŝlosilo trovita."
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:392
 msgid "Generate a new key pair"
-msgstr "Generi novan ŝlosilan paron"
+msgstr "Generu novan ŝlosilan paron"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:570
 msgid "GPG"
@@ -12768,18 +12392,18 @@ msgid "Undefined"
 msgstr "Nedifinita"
 
 #: ../src/plugins/pgpcore/select-keys.c:241
-#: ../src/plugins/pgpcore/sgpgme.c:146
+#: ../src/plugins/pgpcore/sgpgme.c:146 ../src/plugins/pgpcore/sgpgme.c:162
 msgid "Marginal"
 msgstr "Marĝena"
 
 #: ../src/plugins/pgpcore/select-keys.c:247
-#: ../src/plugins/pgpcore/sgpgme.c:150
+#: ../src/plugins/pgpcore/sgpgme.c:150 ../src/plugins/pgpcore/sgpgme.c:166
 msgid "Ultimate"
 msgstr "Fina"
 
 #: ../src/plugins/pgpcore/select-keys.c:368
 msgid "Select Keys"
-msgstr "Elekti ŝlosilojn"
+msgstr "Elektu ŝlosilojn"
 
 #: ../src/plugins/pgpcore/select-keys.c:395
 msgid "Key ID"
@@ -12787,7 +12411,7 @@ msgstr "Ŝlosila identigilo"
 
 #: ../src/plugins/pgpcore/select-keys.c:398
 msgid "Trust"
-msgstr "Fidi"
+msgstr "Fidu"
 
 #: ../src/plugins/pgpcore/select-keys.c:423
 msgid "_Other"
@@ -12795,11 +12419,11 @@ msgstr "Alia"
 
 #: ../src/plugins/pgpcore/select-keys.c:424
 msgid "Do_n't encrypt"
-msgstr "_Ne enĉifri"
+msgstr "_Ne enĉifru"
 
 #: ../src/plugins/pgpcore/select-keys.c:583
 msgid "Add key"
-msgstr "Aldoni ŝlosilon"
+msgstr "Aldonu ŝlosilon"
 
 #: ../src/plugins/pgpcore/select-keys.c:584
 msgid "Enter another user or key ID:"
@@ -12808,7 +12432,7 @@ msgstr "Enigu alian uzantan aŭ ŝlosilan identigilon:"
 #: ../src/plugins/pgpcore/select-keys.c:606
 #, c-format
 msgid "Encrypt to %s <%s>"
-msgstr "Enĉifri al %s <%s>"
+msgstr "Enĉifru al %s <%s>"
 
 #: ../src/plugins/pgpcore/select-keys.c:607
 #, c-format
@@ -12834,159 +12458,162 @@ msgstr ""
 msgid "No signature found"
 msgstr "Neniu subskribo trovita"
 
-#: ../src/plugins/pgpcore/sgpgme.c:184 ../src/plugins/pgpcore/sgpgme.c:203
+#: ../src/plugins/pgpcore/sgpgme.c:160
+msgid "Untrusted"
+msgstr "Ne fidata"
+
+#: ../src/plugins/pgpcore/sgpgme.c:200 ../src/plugins/pgpcore/sgpgme.c:219
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "La subskribo ne povis esti kontrolita - %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:188 ../src/plugins/pgpcore/sgpgme.c:192
-#: ../src/plugins/pgpcore/sgpgme.c:245
+#: ../src/plugins/pgpcore/sgpgme.c:204 ../src/plugins/pgpcore/sgpgme.c:208
+#: ../src/plugins/pgpcore/sgpgme.c:249
 msgid "The signature has not been checked."
 msgstr "La subskribo ne estis kontrolita."
 
-#: ../src/plugins/pgpcore/sgpgme.c:198 ../src/plugins/pgpcore/sgpgme.c:200
+#: ../src/plugins/pgpcore/sgpgme.c:214 ../src/plugins/pgpcore/sgpgme.c:216
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Kerno: Ne povas havigi ŝlosilon - neniu gpg-agent plenumiĝas."
 
-#: ../src/plugins/pgpcore/sgpgme.c:215
+#: ../src/plugins/pgpcore/sgpgme.c:228
 #, c-format
 msgid "Good signature from %s."
 msgstr "Bona subskribo de %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:222
-#, c-format
-msgid "Good signature (untrusted) from %s."
-msgstr "Bona subskribo (nefidinda) de %s."
-
-#: ../src/plugins/pgpcore/sgpgme.c:227
+#: ../src/plugins/pgpcore/sgpgme.c:231
 #, c-format
 msgid "Expired signature from %s."
 msgstr "Finiĝinta subskribo de %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:230
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:234
+#, c-format
 msgid "Good signature from %s, but the key has expired."
-msgstr "Bona subskribo de %s."
+msgstr "Bona subskribo de %s, sed la ŝlosilo finiĝis."
 
-#: ../src/plugins/pgpcore/sgpgme.c:233
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:237
+#, c-format
 msgid "Good signature from %s, but the key has been revoked."
-msgstr "Bona subskribo de %s."
+msgstr "Bona subskribo de %s, se la ŝlosilo estis revokita."
 
-#: ../src/plugins/pgpcore/sgpgme.c:236
+#: ../src/plugins/pgpcore/sgpgme.c:240
 #, c-format
 msgid "Bad signature from %s."
 msgstr "Malbona subskribo de %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:240
+#: ../src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Ŝlosilo 0x%s ne haveblas por verigi ĉi tiun subskribon."
 
-#: ../src/plugins/pgpcore/sgpgme.c:264
+#: ../src/plugins/pgpcore/sgpgme.c:268
 #, c-format
 msgid "Error checking signature: no status\n"
 msgstr "Eraro kontrolante subskribon: neniu stato\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:283
+#: ../src/plugins/pgpcore/sgpgme.c:287
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Eraro kontrolante subskribon: %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:302
+#: ../src/plugins/pgpcore/sgpgme.c:306
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Subskribo farita je %s uzante %s ŝlosilan identigilon %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:308
+#: ../src/plugins/pgpcore/sgpgme.c:312
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Bona subskribo de uid \"%s\" (Valideco: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:313
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:317
+#, c-format
 msgid "Expired key uid \"%s\"\n"
-msgstr "Finiĝinta ŝlosilo de %s."
+msgstr "Finiĝinta ŝlosilo uid \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:318
+#: ../src/plugins/pgpcore/sgpgme.c:322
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Finiĝinta subskribo de uid \"%s\" (Valideco: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:323
+#: ../src/plugins/pgpcore/sgpgme.c:327
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
-msgstr ""
+msgstr "Revokita ŝlosilo uid \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:328
+#: ../src/plugins/pgpcore/sgpgme.c:332
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "MALBONA subskribo de \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:339
+#: ../src/plugins/pgpcore/sgpgme.c:343
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                    uid \"%s\" (Valideco: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:346
+#: ../src/plugins/pgpcore/sgpgme.c:345
+msgid "Revoked"
+msgstr "Revokita"
+
+#: ../src/plugins/pgpcore/sgpgme.c:349
+#, c-format
+msgid "Owner Trust: %s\n"
+msgstr "Posedanta fido: %s\n"
+
+#: ../src/plugins/pgpcore/sgpgme.c:352
 msgid "Primary key fingerprint:"
 msgstr "Fingropremo de ĉefa ŝlosilo:"
 
-#: ../src/plugins/pgpcore/sgpgme.c:364
+#: ../src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "AVERTO: Subskribinta adreso \"%s\" ne kongruas kun DNS ero\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:370
+#: ../src/plugins/pgpcore/sgpgme.c:376
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Verigita subskribinta adreso estas \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:412
+#: ../src/plugins/pgpcore/sgpgme.c:410
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Ne povis havigi datumojn de mesaĝo, %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:428
+#: ../src/plugins/pgpcore/sgpgme.c:426
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Ne povis pravalorizi datumojn, %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:583
+#: ../src/plugins/pgpcore/sgpgme.c:581
 msgid "Secret key specification is ambiguous"
 msgstr "Sekreta ŝlosila specifo estas plursenca"
 
-#: ../src/plugins/pgpcore/sgpgme.c:593
+#: ../src/plugins/pgpcore/sgpgme.c:591
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Sekreta ŝlosilo ne trovita (%s)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:606
+#: ../src/plugins/pgpcore/sgpgme.c:604
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Eraro fiksante sekretan ŝlosilon: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:690
+#: ../src/plugins/pgpcore/sgpgme.c:688
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
-msgstr ""
-"Gpgme protokolo `%s' estas neuzebla: Motoro `%s' ne estis instalita ĝuste."
+msgstr "Gpgme protokolo `%s' estas neuzebla: Motoro `%s' ne estis instalita ĝuste."
 
-#: ../src/plugins/pgpcore/sgpgme.c:696
+#: ../src/plugins/pgpcore/sgpgme.c:694
 #, c-format
-msgid ""
-"Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
-"version %s is required.\n"
-msgstr ""
-"Gpgme protokolo `%s' estas neuzebla: Motoro `%s' versio %s estas instalita, "
-"sed versio %s estas bezonata.\n"
+msgid "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but version %s is required.\n"
+msgstr "Gpgme protokolo `%s' estas neuzebla: Motoro `%s' versio %s estas instalita, sed versio %s estas bezonata.\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:704
+#: ../src/plugins/pgpcore/sgpgme.c:702
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme protokolo `%s' estas neuzebla (nekonata problemo)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:720
+#: ../src/plugins/pgpcore/sgpgme.c:718
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12994,46 +12621,36 @@ msgstr ""
 "GnuPG ne estis instalita ĝuste, aŭ bezonas esti ĝisdatigita.\n"
 "OpenPGP subteno malebligita."
 
-#: ../src/plugins/pgpcore/sgpgme.c:754
-msgid ""
-"You have to save the account's information with \"OK\" before being able to "
-"generate a key pair.\n"
-msgstr ""
-"Vi devas konservi la informon de la konto kun \"Bone\" antaŭ ol esti ebla "
-"generi ŝlosilan paron.\n"
+#: ../src/plugins/pgpcore/sgpgme.c:752
+msgid "You have to save the account's information with \"OK\" before being able to generate a key pair.\n"
+msgstr "Vi devas konservi la informon de la konto kun \"Bone\" antaŭ ol esti ebla generi ŝlosilan paron.\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:759
+#: ../src/plugins/pgpcore/sgpgme.c:757
 msgid "No PGP key found"
 msgstr "Neniu PGP ŝlosilo trovita"
 
-#: ../src/plugins/pgpcore/sgpgme.c:760
+#: ../src/plugins/pgpcore/sgpgme.c:758
 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"
+"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"
 "Do you want to create a new key pair now?"
 msgstr ""
-"Claws Mail ne trovis sekretan PGP ŝlosilon, kiu signifas ke vi ne povos "
-"subskribi retpoŝtojn aŭ ricevi enĉifritajn retpoŝtojn.\n"
+"Claws Mail ne trovis sekretan PGP ŝlosilon, kiu signifas ke vi ne povos subskribi retpoŝtojn aŭ ricevi enĉifritajn retpoŝtojn.\n"
 "Ĉu vi volas krei novan ŝlosilan paron nun?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:830 ../src/plugins/pgpcore/sgpgme.c:846
+#: ../src/plugins/pgpcore/sgpgme.c:828 ../src/plugins/pgpcore/sgpgme.c:844
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Ne povis generi novan ŝlosilan paron: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:837
-msgid ""
-"Generating your new key pair... Please move the mouse around to help "
-"generate entropy..."
-msgstr ""
-"Generas vian novan ŝlosilan paron... Bonvolu movi la muson ien por helpi "
-"generi entropion..."
+#: ../src/plugins/pgpcore/sgpgme.c:835
+msgid "Generating your new key pair... Please move the mouse around to help generate entropy..."
+msgstr "Generas vian novan ŝlosilan paron... Bonvolu movi la muson ien por helpi generi entropion..."
 
-#: ../src/plugins/pgpcore/sgpgme.c:852
+#: ../src/plugins/pgpcore/sgpgme.c:850
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Ne povis generi novan ŝlosilan paron: nekonata eraro"
 
-#: ../src/plugins/pgpcore/sgpgme.c:856
+#: ../src/plugins/pgpcore/sgpgme.c:854
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -13046,19 +12663,19 @@ msgstr ""
 "\n"
 "Ĉu vi volas eksporti ĝin al ŝlosilservilo?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:860
+#: ../src/plugins/pgpcore/sgpgme.c:858
 msgid "Key generated"
 msgstr "Ŝlosilo generita"
 
-#: ../src/plugins/pgpcore/sgpgme.c:899
+#: ../src/plugins/pgpcore/sgpgme.c:897
 msgid "Key exported."
 msgstr "Ŝlosilo eksportita."
 
-#: ../src/plugins/pgpcore/sgpgme.c:901
+#: ../src/plugins/pgpcore/sgpgme.c:899
 msgid "Couldn't export key."
 msgstr "Ne povis eksporti ŝlosilon."
 
-#: ../src/plugins/pgpcore/sgpgme.c:905
+#: ../src/plugins/pgpcore/sgpgme.c:903
 msgid "Key export isn't implemented in Windows."
 msgstr "Ŝlosila eksporto ne estas realigita en Vindozo."
 
@@ -13085,7 +12702,7 @@ msgstr "Ne povis konverti tekstajn datumojn al iu ajn sana signaro."
 #: ../src/plugins/pgpinline/pgpinline.c:716
 #: ../src/plugins/pgpmime/pgpmime.c:74 ../src/plugins/pgpmime/pgpmime.c:184
 #: ../src/plugins/pgpmime/pgpmime.c:330 ../src/plugins/pgpmime/pgpmime.c:510
-#: ../src/plugins/pgpmime/pgpmime.c:655 ../src/plugins/smime/smime.c:415
+#: ../src/plugins/pgpmime/pgpmime.c:651 ../src/plugins/smime/smime.c:415
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Ne povis pravalorizi GPG kuntekston, %s"
@@ -13174,27 +12791,23 @@ msgid "Data signing failed, no contents."
 msgstr "Datuma subskribado malsukcesis, neniu enhavo."
 
 #: ../src/plugins/pgpinline/pgpinline.c:626
-msgid ""
-"Please note that attachments are not encrypted by the PGP/Inline system, nor "
-"are email headers, like Subject."
-msgstr ""
-"Bonvolu noti ke algluaĵoj estas nek enĉifritaj de la PGP/Enteksta sistemo, "
-"nek retpoŝtaj ĉapoj, kiel Temo."
+msgid "Please note that attachments are not encrypted by the PGP/Inline system, nor are email headers, like Subject."
+msgstr "Bonvolu noti ke algluaĵoj estas nek enĉifritaj de la PGP/Enteksta sistemo, nek retpoŝtaj ĉapoj, kiel Temo."
 
 #: ../src/plugins/pgpinline/pgpinline.c:670
-#: ../src/plugins/pgpmime/pgpmime.c:665
+#: ../src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Ne povis aldoni GPG ŝlosilon %s, %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:698
-#: ../src/plugins/pgpmime/pgpmime.c:694
+#: ../src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Ne povis krei provizoran dosieron, %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:729
-#: ../src/plugins/pgpmime/pgpmime.c:721
+#: ../src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Enĉifro malsukcesis, %s"
@@ -13209,24 +12822,17 @@ msgstr "PGP/enteksta"
 
 #: ../src/plugins/pgpinline/plugin.c:60
 msgid ""
-"This plugin handles the deprecated Inline method of signing and/or "
-"encrypting mails. You can decrypt mails, verify signatures or sign and "
-"encrypt your own mails.\n"
+"This plugin handles the deprecated Inline method of signing and/or encrypting mails. You can decrypt mails, verify signatures or sign and encrypt your own mails.\n"
 "\n"
-"It can be selected as the Default Privacy System in /Configuration/[Account "
-"Preferences]/Privacy and when composing a message from /Options/Privacy "
-"System\n"
+"It can be selected as the Default Privacy System in /Configuration/[Account Preferences]/Privacy and when composing a message from /Options/Privacy System\n"
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Ĉi tiu kromprogramo traktas la malrekomendindan Entekstan metodon de "
-"subskribo kaj/aŭ enĉifro de poŝtoj. Vi povas elĉifri poŝtojn, verigi "
-"subskribojn aŭ subskribi kaj enĉifri viajn proprajn poŝtojn.\n"
+"Ĉi tiu kromprogramo traktas la malrekomendindan Entekstan metodon de subskribo kaj/aŭ enĉifro de poŝtoj. Vi povas elĉifri poŝtojn, verigi subskribojn aŭ subskribi kaj enĉifri viajn proprajn poŝtojn.\n"
 "\n"
-"Ĝi povas esti elektita kiel la defaŭlta privata sistemo en /Agordo/[Kontaj "
-"Preferoj]/Privateco kaj kiam verkante mesaĝon de /Opcioj/Privateca Sistemo\n"
+"Ĝi povas esti elektita kiel la defaŭlta privata sistemo en /Agordo/[Kontaj Preferoj]/Privateco kaj kiam verkante mesaĝon de /Opcioj/Privateca Sistemo\n"
 "\n"
 "La kromprogramo uzas la GPGME bibliotekon kiel volvilo por GnuPG.\n"
 "\n"
@@ -13249,15 +12855,15 @@ msgstr "Ne povis sintakse analizi elĉifritajn dosierajn partojn."
 msgid "Couldn't create temporary file: %s"
 msgstr "Ne povis krei provizoran dosieron: %s"
 
-#: ../src/plugins/pgpmime/pgpmime.c:621
-msgid ""
-"Please note that email headers, like Subject, are not encrypted by the PGP/"
-"Mime system."
-msgstr ""
-"Bonvolu noti ke retpoŝtaj ĉapoj, kiel Temo, ne estas enĉifritaj de la PGP/"
-"Mime sistemo."
+#: ../src/plugins/pgpmime/pgpmime.c:595
+msgid "OpenPGP digital signature"
+msgstr "OpenPGP cifera subskribo"
 
-#: ../src/plugins/pgpmime/pgpmime.c:793
+#: ../src/plugins/pgpmime/pgpmime.c:617
+msgid "Please note that email headers, like Subject, are not encrypted by the PGP/Mime system."
+msgstr "Bonvolu noti ke retpoŝtaj ĉapoj, kiel Temo, ne estas enĉifritaj de la PGP/Mime sistemo."
+
+#: ../src/plugins/pgpmime/pgpmime.c:789
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -13267,23 +12873,17 @@ msgstr "PGP/MIME"
 
 #: ../src/plugins/pgpmime/plugin.c:60
 msgid ""
-"This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
-"mails, verify signatures or sign and encrypt your own mails.\n"
+"This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt mails, verify signatures or sign and encrypt your own mails.\n"
 "\n"
-"It can be selected as the Default Privacy System in /Configuration/[Account "
-"Preferences]/Privacy and when composing a message from /Options/Privacy "
-"System\n"
+"It can be selected as the Default Privacy System in /Configuration/[Account Preferences]/Privacy and when composing a message from /Options/Privacy System\n"
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Ĉi tiu kromprogramo traktas PGP/MIME subskribitajn kaj/aŭ enĉifritajn "
-"poŝtojn. Vi povas elĉifri poŝtojn, verigi subskribojn aŭ subskribi kaj "
-"enĉifri viajn proprajn poŝtojn.\n"
+"Ĉi tiu kromprogramo traktas PGP/MIME subskribitajn kaj/aŭ enĉifritajn poŝtojn. Vi povas elĉifri poŝtojn, verigi subskribojn aŭ subskribi kaj enĉifri viajn proprajn poŝtojn.\n"
 "\n"
-"Ĝi povas esti elektita kiel la defaŭlta privata sistemo en /Agordo/[Kontaj "
-"Preferoj]/Privateco kaj kiam verkante mesaĝon de /Opcioj/Privateca sistemo\n"
+"Ĝi povas esti elektita kiel la defaŭlta privata sistemo en /Agordo/[Kontaj Preferoj]/Privateco kaj kiam verkante mesaĝon de /Opcioj/Privateca sistemo\n"
 "\n"
 "La kromprogramo uzas la GPGME bibliotekon kiel volvilo por GnuPG.\n"
 "\n"
@@ -13296,17 +12896,17 @@ msgstr "Pitonaj skriptoj"
 
 #: ../src/plugins/python/python_plugin.c:497
 msgid "Show Python console..."
-msgstr "Montri pitonan konzolon..."
+msgstr "Montru pitonan konzolon..."
 
 #: ../src/plugins/python/python_plugin.c:503
 msgid "Refresh"
-msgstr "Refreŝigi"
+msgstr "Refreŝigu"
 
 #: ../src/plugins/python/python_plugin.c:505 ../src/prefs_account.c:2506
 #: ../src/prefs_account.c:2528 ../src/prefs_account.c:2792
 #: ../src/wizard.c:1195 ../src/wizard.c:1609
 msgid "Browse"
-msgstr "Foliumi"
+msgstr "Foliumu"
 
 #. Version check
 #: ../src/plugins/python/python_plugin.c:646
@@ -13316,34 +12916,23 @@ msgstr "Pitono"
 
 #: ../src/plugins/python/python_plugin.c:652
 msgid "Failed to register \"compose create hook\" in the Python plugin"
-msgstr ""
-"Malsukcesis registri na \"verka kreiga hoko\" en la pitona kromprogramo"
+msgstr "Malsukcesis registri na \"verka kreiga hoko\" en la pitona kromprogramo"
 
 #: ../src/plugins/python/python_plugin.c:730
 msgid ""
 "This plugin provides Python integration features.\n"
-"Python code can be entered interactively into an embedded Python console, "
-"under Tools -> Show Python console, or stored in scripts.\n"
+"Python code can be entered interactively into an embedded Python console, under Tools -> Show Python console, or stored in scripts.\n"
 "\n"
-"These scripts are then available via the menu. You can assign keyboard "
-"shortcuts to them just like it is done with other menu items. You can also "
-"put buttons for script invokation into the toolbars using Claws Mail's "
-"builtin toolbar editor.\n"
+"These scripts are then available via the menu. You can assign keyboard shortcuts to them just like it is done with other menu items. You can also put buttons for script invocation into the toolbars using Claws Mail's builtin toolbar editor.\n"
 "\n"
-"You can provide scripts working on the main window by placing files into ~/."
-"claws-mail/python-scripts/main.\n"
+"You can provide scripts working on the main window by placing files into ~/.claws-mail/python-scripts/main.\n"
 "\n"
-"You can also provide scripts working on an open compose window by placing "
-"files into ~/.claws-mail/python-scripts/compose.\n"
+"You can also provide scripts working on an open compose window by placing files into ~/.claws-mail/python-scripts/compose.\n"
 "\n"
-"The folder ~/.claws-mail/python-scripts/auto/ may contain some scripts that "
-"are automatically executed when certain events occur. Currently, the "
-"following files in this directory are recognised:\n"
+"The folder ~/.claws-mail/python-scripts/auto/ may contain some scripts that are automatically executed when certain events occur. Currently, the following files in this directory are recognised:\n"
 "\n"
 "compose_any\n"
-"Gets executed whenever a compose window is opened, no matterif that opening "
-"happened as a result of composing a new message,replying or forwarding a "
-"message.\n"
+"Gets executed whenever a compose window is opened, no matterif that opening happened as a result of composing a new message,replying or forwarding a message.\n"
 "\n"
 "startup\n"
 "Executed at plugin load\n"
@@ -13358,36 +12947,23 @@ msgid ""
 "\n"
 "in the interactive Python console.\n"
 "\n"
-"The source distribution of this plugin comes with various example scripts in "
-"the \"examples\" subdirectory. If you wrote a script that you would be "
-"interested in sharing, feel free to send it to me to have it considered for "
-"inclusion in the examples.\n"
+"The source distribution of this plugin comes with various example scripts in the \"examples\" subdirectory. If you wrote a script that you would be interested in sharing, feel free to send it to me to have it considered for inclusion in the examples.\n"
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"Ĉi tiu kromprogramo provizas Pitonajn integradajn trajtojn.\n"
-"Pitona kodo povas esti enigita interage en enkorpigitan pitonan konzolon, "
-"sub Iloj -> Montri pitonan konzolon, aŭ konservita en skriptoj.\n"
+"Ĉi tiu kromprogramo provizas Pitonajn integriĝajn trajtojn.\n"
+"Pitona kodo povas esti enigita interage en enkorpigitan pitonan konzolon, sub Iloj -> Montru pitonan konzolon, aŭ konservita en skriptoj.\n"
 "\n"
-"Ĉi tiuj skriptoj estos tiam haveblaj pere de la menuo. Vi povas fiksi "
-"fulmoklavojn al ili ĵus kiel estas farata kun aliaj menueroj. Vi povas ankaŭ "
-"meti butonojn por skripta voko en la ilbretojn uzante la enkonstruitan "
-"ilbretan redaktilon de Claws Mail.\n"
+"Ĉi tiuj skriptoj estos tiam haveblaj pere de la menuo. Vi povas fiksi fulmoklavojn al ili ĵus kiel estas farata kun aliaj menueroj. Vi povas ankaŭ meti butonojn por skripta voko en la ilbretojn uzante la enkonstruitan ilbretan redaktilon de Claws Mail.\n"
 "\n"
-"Vi povas provizi skriptojn funkciantajn ĉe la ĉef-fenestro per lokante "
-"dosierojn en ~/.claws-mail/python-scripts/main.\n"
+"Vi povas provizi skriptojn funkciantaj ĉe la ĉef-fenestro per lokante dosierojn en ~/.claws-mail/python-scripts/main.\n"
 "\n"
-"Vi povas ankaŭ provizi skriptojn funkciantajn ĉe malferma verka fenestro "
-"pere de lokante dosierojn en ~/.claws-mail/python-scripts/compose.\n"
+"Vi povas ankaŭ provizi skriptojn funkciantaj ĉe malferma verka fenestro pere de lokante dosierojn en ~/.claws-mail/python-scripts/compose.\n"
 "\n"
-"La dosierujo ~/.claws-mail/python-scripts/auto/ povas enhavi iajn skriptojn "
-"kiuj estas aŭtomate plenumitaj kiam iaj eventoj okazas. Nune, la sekvantaj "
-"dosieroj en ĉi tiu dosierujo estas rekonataj:\n"
+"La dosierujo ~/.claws-mail/python-scripts/auto/ povas enhavi iajn skriptojn kiuj estas aŭtomate plenumitaj kiam iaj eventoj okazas. Nune, la sekvantaj dosieroj en ĉi tiu dosierujo estas rekonataj:\n"
 "\n"
 "compose_any\n"
-"Plenumiĝas kiam ajn verka fenestro estas malfermata, eĉ se tiu malfermo "
-"okazis kiel rezulto de verkante novan mesaĝon, respondante aŭ plusendante "
-"mesaĝon.\n"
+"Plenumiĝas kiam ajn verka fenestro estas malfermata, eĉ se tiu malfermo okazis kiel rezulto de verkante novan mesaĝon, respondante aŭ plusendante mesaĝon.\n"
 "\n"
 "startup\n"
 "Plenumita je kromprograma ŝargo\n"
@@ -13402,10 +12978,7 @@ msgstr ""
 "\n"
 "en la interaga pitona konzolo.\n"
 "\n"
-"La fonta distribuo de ĉi tiu kromprogramo venas kun diversaj ekzemplaj "
-"skriptoj en la \"examples\" subdosierujo. Se vi skribus skripton kiu "
-"interesus vin kundividi, sentu libera sendi ĝin al mi por konsidero por "
-"inkluziviĝo inter la ekzemploj.\n"
+"La fonta distribuo de ĉi tiu kromprogramo venas kun diversaj ekzemplaj skriptoj en la \"examples\" subdosierujo. Se vi skribus skripton kiu interesus vin kundividi, sentu libera sendi ĝin al mi por konsidero por inkluziviĝo inter la ekzemploj.\n"
 "\n"
 "Prijuĝaj rimarkoj al <berndth at gmx.de> estos bonvenaj."
 
@@ -13413,382 +12986,400 @@ msgstr ""
 msgid "Python integration"
 msgstr "Pitona integrado"
 
-#: ../src/plugins/rssyl/feed.c:126
-msgid "Cannot open temporary file"
-msgstr "Ne povas malfermi provizoran dosieron"
-
-#: ../src/plugins/rssyl/feed.c:137
-msgid "Cannot init libCURL"
-msgstr "Ne povas pravalorizi na libCURL"
-
-#: ../src/plugins/rssyl/feed.c:234 ../src/plugins/vcalendar/vcal_folder.c:1596
-msgid "401 (Authorisation required)"
-msgstr "401 (Aŭtentigo bezonata)"
-
-#: ../src/plugins/rssyl/feed.c:237 ../src/plugins/vcalendar/vcal_folder.c:1599
-msgid "403 (Unauthorised)"
-msgstr "403 (Ne rajtigita)"
-
-#: ../src/plugins/rssyl/feed.c:240 ../src/plugins/vcalendar/vcal_folder.c:1602
-msgid "404 (Not found)"
-msgstr "404 (Ne trovita)"
-
-#: ../src/plugins/rssyl/feed.c:243 ../src/plugins/vcalendar/vcal_folder.c:1605
-#, c-format
-msgid "Error %ld"
-msgstr "Eraro %ld"
-
-#: ../src/plugins/rssyl/feed.c:328
-#, c-format
-msgid "Fetching '%s'..."
-msgstr "Alportas `%s'..."
-
-#: ../src/plugins/rssyl/feed.c:387
-msgid "Malformed feed"
-msgstr "Misformita fluo"
-
-#: ../src/plugins/rssyl/feed.c:1203
-#, c-format
-msgid "Refreshing feed '%s'..."
-msgstr "Refreŝigas fluon `%s'..."
-
-#: ../src/plugins/rssyl/feed.c:1218
+#: ../src/plugins/rssyl/old_feeds.c:90
 #, c-format
 msgid ""
-"RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-"comments of '%s'"
+"Couldn't read contents of old feeds.xml file:\n"
+"%s"
 msgstr ""
-"RSSyl: Alporti komentojn ne estas subtenata por RDF fluoj. Ne povas alporti "
-"komentojn de `%s'"
+"Ne povis legi enhavon de malnova feeds.xml dosiero:\n"
+"%s"
 
-#: ../src/plugins/rssyl/feed.c:1227
-msgid "This feed format is not supported yet."
-msgstr "Ĉi tiu flua aranĝo estas ankoraŭ ne subtenata."
+#: ../src/plugins/rssyl/opml_export.c:110
+#, c-format
+msgid "RSSyl: Error while writing '%s' to feed export list.\n"
+msgstr "RSSyl: Eraro dum skribas '%s' por flua eksporta listo.\n"
 
-#: ../src/plugins/rssyl/feed.c:1258
-msgid "N/A"
-msgstr "Ne aplikebla"
+#: ../src/plugins/rssyl/opml_export.c:131
+#, c-format
+msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
+msgstr "RSSyl: Ne povis forigi malnovan OPML dosieron '%s': %s\n"
 
-#: ../src/plugins/rssyl/feed.c:1378
+#: ../src/plugins/rssyl/opml_export.c:141
 #, c-format
-msgid "%ld byte"
-msgid_plural "%ld bytes"
-msgstr[0] "%ld bitoko"
-msgstr[1] "%ld bitokoj"
+msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
+msgstr "RSSyl: Ne povis malfermi dosieron '%s' por flua lista eksportado: %s\n"
 
-#: ../src/plugins/rssyl/feed.c:1381
-msgid "size unknown"
-msgstr "grando nekonata"
+#: ../src/plugins/rssyl/opml_export.c:182
+msgid "RSSyl: Error during writing feed export file.\n"
+msgstr "RSSyl: Eraro dum skribado de flua eksporta dosiero.\n"
 
-#: ../src/plugins/rssyl/feed.c:1555
+#: ../src/plugins/rssyl/opml_import.c:109
 #, c-format
 msgid ""
-"RSSyl: Cannot update feed %s:\n"
+"Error while subscribing feed\n"
 "%s\n"
+"\n"
+"Folder name '%s' is not allowed."
 msgstr ""
-"RSSyl: Ne povas ĝisdatigi fluon %s:\n"
+"Eraro dum subskribas fluon\n"
 "%s\n"
+"\n"
+"Dosieruja nomo '%s' ne estas permesata."
 
-#: ../src/plugins/rssyl/feed.c:1727
-msgid "You are already subscribed to this feed."
-msgstr "Vi jam estas  subskribata al ĉi tiu fluo."
-
-#: ../src/plugins/rssyl/feed.c:1738
-#, c-format
+#: ../src/plugins/rssyl/plugin.c:65
 msgid ""
-"Couldn't fetch URL '%s':\n"
-"%s"
+"This plugin allows you to create a mailbox tree where you can add newsfeeds in RSS 1.0, RSS 2.0 or Atom format.\n"
+"\n"
+"Each newsfeed will create a folder with appropriate entries, fetched from the web. You can read them, and delete or keep old entries."
 msgstr ""
-"Ne povis alporti retadreson `%s':\n"
-"%s"
+"Ĉi tiu kromprogramo permesas vin krei poŝtkestan arbon kie vi povas aldoni novajn novaĵfluojn en RSS 1.0, RSS 2.0 aŭ Atoma aranĝo.\n"
+"\n"
+"Ĉiu novaĵfluo kreos dosierujon kun taŭgaj enigoj, alportitaj de la reto. Vi povas legi ilin, kaj forigi aŭ konservi malnovajn enigojn."
 
-#: ../src/plugins/rssyl/feed.c:1743
-#, c-format
-msgid ""
-"Couldn't fetch URL '%s':\n"
-"%s\n"
-msgstr ""
-"Ne povis alporti retadreson `%s':\n"
-"%s\n"
+#: ../src/plugins/rssyl/plugin.c:89
+msgid "RSS feed"
+msgstr "abona fluo"
+
+#: ../src/plugins/rssyl/rssyl_add_item.c:295
+msgctxt "Empty RSS feed title placeholder"
+msgid "(empty)"
+msgstr "(malplena)"
+
+#: ../src/plugins/rssyl/rssyl.c:154 ../src/plugins/rssyl/rssyl.c:165
+msgid "Refresh all feeds"
+msgstr "Refreŝigu ĉiujn fluojn"
 
-#: ../src/plugins/rssyl/feed.c:1759
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:66
+msgid "Subscribe feed"
+msgstr "Subskribu fluon"
+
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:67
+msgid "Input the URL of the news feed you wish to subscribe:"
+msgstr "Enigu la retadreson de la novaĵfluo al kiu vi volas subskribi:"
+
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:100
 #, c-format
-msgid "Can't subscribe feed '%s'."
-msgstr "Ne povas subskribi fluon `%s'."
+msgid "'%c' can't be used in folder name."
+msgstr "`%c' ne povas esti uzita en dosieruja nomo."
 
-#: ../src/plugins/rssyl/feed.c:1861 ../src/plugins/rssyl/rssyl_cb_menu.c:281
-msgid "Claws Mail needs network access in order to update the feed."
-msgid_plural "Claws Mail needs network access in order to update the feeds."
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:242
+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 bezonas retan atingon por ĝisdatigi la fluon."
-msgstr[1] "Claws Mail bezonas retan atingon por ĝisdatigi la fluojn."
+msgstr[1] "Claws Mail bezonas retan atingon por ĝisdatigi fluojn."
 
-#: ../src/plugins/rssyl/feed.h:20
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:305
 #, c-format
-msgid "Time out connecting to URL %s\n"
-msgstr "Eltempiĝo konektante al retadreso %s\n"
+msgid "Really remove the feed tree `%s' ?\n"
+msgstr "Ĉu vere forigu la fluan arbon `%s'?\n"
 
-#: ../src/plugins/rssyl/feed.h:21
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:306
+msgid "Remove feed tree"
+msgstr "Forigu fluan arbon"
+
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:341
+msgid "Select an OPML file"
+msgstr "Elektu OPML dosieron"
+
+#: ../src/plugins/rssyl/rssyl_feed.c:75
+#: ../src/plugins/rssyl/rssyl_subscribe.c:139
 #, c-format
-msgid "Couldn't fetch URL %s\n"
-msgstr "Ne povis alporti retadreson %s\n"
+msgid "Couldn't create folder for new feed '%s'."
+msgstr "Ne povis krei dosierujon por nova fluo '%s'."
 
-#: ../src/plugins/rssyl/feed.h:22
+#: ../src/plugins/rssyl/rssyl_feed.h:10
 #, c-format
-msgid "Error parsing feed from URL %s\n"
-msgstr "Eraro sintakse analizante fluon de retadreso %s\n"
+msgid "RSSyl: Subscribing new feed: %s\n"
+msgstr "RSSyl: Subskribas novan fluon: %s\n"
 
-#: ../src/plugins/rssyl/feed.h:23
+#: ../src/plugins/rssyl/rssyl_feed.h:11
 #, c-format
-msgid "Unsupported feed type at URL %s\n"
-msgstr "Nesubtenata flua tipo ĉe retadreso %s\n"
+msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
+msgstr "RSSyl: Nova fluo subskribita: '%s' (%s)\n"
 
-#: ../src/plugins/rssyl/feed.h:25
+#: ../src/plugins/rssyl/rssyl_feed.h:12
 #, c-format
-msgid "RSSyl: Updating feed %s\n"
-msgstr "RSSyl: Ĝisdatigas fluon %s\n"
+msgid "RSSyl: Updating feed: %s\n"
+msgstr "RSSyl: Ĝisdatigas fluon: %s\n"
 
-#: ../src/plugins/rssyl/feed.h:26
+#: ../src/plugins/rssyl/rssyl_feed.h:13
 #, c-format
 msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl: Flua ĝisdatigo finis: %s\n"
 
-#: ../src/plugins/rssyl/feed.h:27
-msgid "RSSyl: Feed update aborted, application is exiting.\n"
-msgstr "RSSyl: Flua ĝisdatigo abortita, aplikaĵo eliras.\n"
-
-#: ../src/plugins/rssyl/plugin.c:63
-msgid ""
-"This plugin allows you to create a mailbox tree where you can add newsfeeds "
-"in RSS 1.0, RSS 2.0 or Atom format.\n"
-"\n"
-"Each newsfeed will create a folder with appropriate entries, fetched from "
-"the web. You can read them, and delete or keep old entries."
-msgstr ""
-"Ĉi tiu kromprogramo permesas vin krei poŝtkestan arbon kie vi povas aldoni "
-"novajn novaĵfluojn en RSS 1.0, RSS 2.0 aŭ Atoma aranĝo.\n"
-"\n"
-"Ĉiu novaĵfluo kreos dosierujon kun taŭgaj enigoj, alportitaj de la reto. Vi "
-"povas legi ilin, kaj forigi aŭ konservi malnovajn enigojn."
-
-#: ../src/plugins/rssyl/plugin.c:87
-msgid "RSS feed"
-msgstr "abona fluo"
-
-#: ../src/plugins/rssyl/rssyl.c:133 ../src/plugins/rssyl/rssyl.c:145
-msgid "Refresh all feeds"
-msgstr "Refreŝigi ĉiujn fluojn"
-
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:62
-msgid "Subscribe feed"
-msgstr "Subskribi fluon"
-
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:63
-msgid "Input the URL of the news feed you wish to subscribe:"
-msgstr "Enigi la retadreson de la novaĵfluo al kiu vi volas subskribi:"
-
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:138
+#: ../src/plugins/rssyl/rssyl_feed.h:14
 #, c-format
-msgid "Really remove the folder tree '%s'?\n"
-msgstr "Ĉu vere forigi la dosierujan arbon `%s'?\n"
+msgid "RSSyl: Error fetching feed at '%s': %s\n"
+msgstr "RSSyl: Eraro havigante fluon ĉe '%s': %s\n"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:139
-msgid "Remove folder tree"
-msgstr "Forigi dosierujan arbon"
-
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
+#: ../src/plugins/rssyl/rssyl_feed.h:15
 #, c-format
-msgid "Can't remove feed '%s'."
-msgstr "Ne povas forigi fluon `%s'."
-
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:374
-msgid "Select a .opml file"
-msgstr "Elekti .opml dosieron"
-
-#: ../src/plugins/rssyl/rssyl_gtk.c:53
-msgid "_Refresh feed"
-msgstr "_Refreŝigi fluon"
+msgid "RSSyl: No valid feed found at '%s'\n"
+msgstr "RSSyl: Neniu valida fluo trovita ĉe '%s'\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:54
-msgid "Refresh _all feeds"
-msgstr "Refreŝigi ĉiujn fluojn"
-
-#: ../src/plugins/rssyl/rssyl_gtk.c:55
-msgid "Subscribe _new feed..."
-msgstr "Subkskribi al _nova fluo..."
+#: ../src/plugins/rssyl/rssyl_feed.h:16
+#, c-format
+msgid "RSSyl: Couldn't process feed at '%s'\n"
+msgstr "RSSyl: Ne povis procezi fluon ĉe '%s'\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:56
-msgid "_Unsubscribe feed..."
-msgstr "Mals_ubskribi fluon..."
+#: ../src/plugins/rssyl/rssyl_feed.h:17
+#, c-format
+msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
+msgstr "RSSyl: Aplikaĵo eliras, ne povis fini ĝisdatigi fluon je '%s'\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:57
-msgid "Feed pr_operties..."
-msgstr "Fluaj ec_oj..."
+#: ../src/plugins/rssyl/rssyl_feed_props.c:243
+msgid "Use default refresh interval"
+msgstr "Uzu defaŭltan refreŝigan intervalon"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:58
-msgid "Import feed list..."
-msgstr "Importi fluan liston..."
+#: ../src/plugins/rssyl/rssyl_feed_props.c:255
+msgid "Keep old items"
+msgstr "Konservu malnovajn erojn"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:59
-msgid "Rena_me..."
-msgstr "Reno_mi..."
+#. "Trim" button
+#: ../src/plugins/rssyl/rssyl_feed_props.c:261
+msgid "_Trim"
+msgstr "_Distranĉu"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:60
-msgid "_Create new folder..."
-msgstr "Krei novan dosierujon..."
+#: ../src/plugins/rssyl/rssyl_feed_props.c:264
+#: ../src/plugins/rssyl/rssyl_feed_props.c:267
+msgid "Update feed, deleting items which are no longer in the source feed"
+msgstr "Ĝisdatigu fluon, forviŝante erojn kiuj ne plu estas en la fonta fluo"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:62
-msgid "Remove folder _tree..."
-msgstr "Forigi dosierujan arbon..."
+#: ../src/plugins/rssyl/rssyl_feed_props.c:271
+msgid "Fetch comments if possible"
+msgstr "Alportu komentojn se eblas"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:152
-msgid "Add RSS folder tree"
-msgstr "Aldoni abonfluan arbon"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:296
+msgid "Always mark as new"
+msgstr "Ĉiam marku kiel nova"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:153
-msgid "Enter name for a new RSS folder tree."
-msgstr "Enigi la nomon por nova RSS dosieruja arbo."
+#: ../src/plugins/rssyl/rssyl_feed_props.c:302
+msgid "If only its text changed"
+msgstr "Se nur ĝia teksto ŝanĝiĝis"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:169
-msgid ""
-"Creation of folder tree failed.\n"
-"Maybe some files already exist, or you don't have the permission to write "
-"there?"
-msgstr ""
-"Kreo de dosiera arbo fiaskis.\n"
-"Ĉu eble kelkaj dosieroj jam ekzistas, aŭ vi ne havas permeson skribi tien?"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:308
+msgid "Never mark as new"
+msgstr "Neniam marku kiel nova"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:184
-msgid "RSSyl..."
-msgstr "RSSyl..."
+#: ../src/plugins/rssyl/rssyl_feed_props.c:313
+msgid "Add item title to top of message"
+msgstr "Aldonu eran titolon ĉe la supro de la mesaĝo"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:257
-msgid "Use default refresh interval"
-msgstr "Uzi defaŭltan refreŝigan intervalon"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:320
+msgid "Ignore title rename"
+msgstr "Ignoru titolan renomon"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:269
-msgid "Keep default number of expired entries"
-msgstr "Reteni defaŭltan nombron da finiĝintaj enigaĵoj"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:326
+#: ../src/plugins/rssyl/rssyl_feed_props.c:329
+msgid "Enable this to keep current folder name, even if feed author changes title of the feed."
+msgstr "Ebligu ĉi tion por teni nunan dosierujan nomon, eĉ se flua aŭtoro ŝanĝas titolon de la fluo."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:275
-msgid "Fetch comments if possible"
-msgstr "Alporti komentojn se eblas"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:334
+#: ../src/plugins/vcalendar/vcal_prefs.c:518
+msgid "Verify SSL certificate validity"
+msgstr "Kontrolu la validecon de SSL atesto"
 
 #. Label for URL frame
-#: ../src/plugins/rssyl/rssyl_gtk.c:308
+#: ../src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "<b>Source URL:</b>"
 msgstr "<b>Fonta retadreso:</b>"
 
-#. Fetch comments for - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:336
+#. Fetch comments max age - label
+#: ../src/plugins/rssyl/rssyl_feed_props.c:378
 msgid ""
 "<b>Fetch comments on posts aged less than:</b>\n"
 "<small>(In days; set to -1 to fetch all comments)</small>"
 msgstr ""
-"<b>Alporti komentojn ĉe poŝtoj malpli aĝaj ol:</b>\n"
-"<small>(Laŭ tagoj; fiksi al -1 por alporti ĉiujn komentojn)</small>"
+"<b>Alportu komentojn ĉe poŝtoj malpli aĝaj ol:</b>\n"
+"<small>(Laŭ tagoj; fiksu al -1 por alporti ĉiujn komentojn)</small>"
 
 #. Refresh interval - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:370
+#: ../src/plugins/rssyl/rssyl_feed_props.c:436
 msgid ""
 "<b>Refresh interval in minutes:</b>\n"
 "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
 msgstr ""
 "<b>Refreŝa intervalo laŭ minutoj:</b>\n"
-"<small>(Fiksi al 0 por malebligi aŭtomatan refreŝigon por ĉi tiu fluo)</"
-"small>"
+"<small>(Fiksu al 0 por malebligi aŭtomatan refreŝigon por ĉi tiu fluo)</small>"
 
-#. Expired items - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:403
+#: ../src/plugins/rssyl/rssyl_feed_props.c:462
+msgid "<b>If an item changes, do not mark it as new:</b>"
+msgstr "<b>Se ero ŝanĝiĝas, ne marku ĝin kiel nova:</b>"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:554
+msgid "_OK"
+msgstr "B_one"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:562
+msgid "Set feed properties"
+msgstr "Fiksu fluajn ecojn"
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:48
+msgid "_Refresh feed"
+msgstr "_Refreŝigu fluon"
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:49
+msgid "Feed pr_operties"
+msgstr "Fluaj ec_oj"
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:50
+msgid "Rena_me..."
+msgstr "Reno_mu..."
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:51
+msgid "R_efresh recursively"
+msgstr "R_efreŝigu rikure"
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:52
+msgid "Subscribe _new feed..."
+msgstr "Subkskribu al _nova fluo..."
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:53
+msgid "Create new _folder..."
+msgstr "Kreu novan _dosierujon..."
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:54
+msgid "Import feed list..."
+msgstr "Importu fluan liston..."
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:56
+msgid "Remove tree"
+msgstr "Forigu arbon"
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:126
+msgid "Add RSS folder tree"
+msgstr "Aldonu abonfluan arbon"
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:127
+msgid "Enter name for a new RSS folder tree."
+msgstr "Enigu la nomon por nova RSS dosieruja arbo."
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:143
 msgid ""
-"<b>Number of expired entries to keep:</b>\n"
-"<small>(Set to -1 if you want to keep expired entries)</small>"
+"Creation of folder tree failed.\n"
+"Maybe some files already exist, or you don't have the permission to write there?"
 msgstr ""
-"<b>Nombro da finiĝintaj enigoj por konservi:</b>\n"
-"<small>(Fiksi al -1 se vi volas konservi finiĝintajn enigojn)</small>"
+"Kreo de dosiera arbo fiaskis.\n"
+"Ĉu eble kelkaj dosieroj jam ekzistas, aŭ vi ne havas permeson skribi tien?"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:429
-#, fuzzy
-msgid "<b>If an item changes, do not mark it as unread:</b>"
-msgstr "<b>Se ero ŝanĝiĝas, marki ĝin kiel nelegita:</b>"
+#. Default RSSyl mailbox name
+#: ../src/plugins/rssyl/rssyl.h:17
+msgid "My Feeds"
+msgstr "Miaj fluoj"
+
+#: ../src/plugins/rssyl/rssyl_prefs.c:128
+msgid "Default refresh interval in minutes"
+msgstr "Defaŭlta refreŝiga intervalo laŭ minutoj"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:439
-msgid "Always mark as unread"
-msgstr ""
+#: ../src/plugins/rssyl/rssyl_prefs.c:147
+msgid "Refresh all feeds on application start"
+msgstr "Refreŝigu ĉiujn fluojn je aplikaĵa komenco"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:441
-msgid "If only its text has changed"
-msgstr "Nur se ĝia teksto ŝanĝiĝis"
+#. Path to cookies file for libcurl to use
+#: ../src/plugins/rssyl/rssyl_prefs.c:155
+msgid "Path to cookies file"
+msgstr "Vojo al kuketa dosiero"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:443
-msgid "Never mark as unread"
-msgstr ""
+#: ../src/plugins/rssyl/rssyl_prefs.c:166
+#: ../src/plugins/rssyl/rssyl_prefs.c:169
+msgid "Path to Netscape-style cookies.txt file containing your cookies"
+msgstr "Vojo al Fajrovulpaj cookies.txt dosiero enhavante viajn kuketojn"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:459
-#: ../src/plugins/vcalendar/vcal_prefs.c:518
-msgid "Verify SSL certificate validity"
-msgstr "Kontroli la validecon de SSL atesto"
+#: ../src/plugins/rssyl/rssyl_prefs.c:176
+msgid "Verify SSL certificates validity for new feeds"
+msgstr "Verigu SSL validecon de atestoj por novaj fluoj"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:515
-msgid "_OK"
-msgstr "B_one"
+#. Create window
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+msgid "Subscribe new feed?"
+msgstr "Subkskribu novan fluon?"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:523
-msgid "Set feed properties"
-msgstr "Fiksi fluajn ecojn"
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:72
+msgid "<b>Feed folder:</b>"
+msgstr "<b>Flua dosierujo:</b>"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:651 ../src/plugins/rssyl/rssyl_gtk.c:675
-msgid "Unsubscribe feed"
-msgstr "Malsubskribi fluon"
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:82
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:86
+msgid "Instead of using official title, you can enter a different folder name for the feed."
+msgstr "Anstataŭ uzante oficialan titolon, vi povas enmeti malsaman dosierujan nomon por la fluo."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:676
-msgid "Do you really want to remove feed"
-msgstr "Ĉu vi vere volas forigi la fluon"
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:91
+msgid "_Edit feed properties after subscribing"
+msgstr "R_edaktu fluajn ecojn post subskribo"
 
-#. Remove cache checkbutton
-#: ../src/plugins/rssyl/rssyl_gtk.c:682
-msgid "Remove cached entries"
-msgstr "Forigi kaŝitajn enskribojn"
+#: ../src/plugins/rssyl/rssyl_update_comments.c:99
+#, c-format
+msgid "Updating comments for '%s'..."
+msgstr "Ĝisdatigas komentojn por '%s'..."
 
-#: ../src/plugins/rssyl/rssyl.h:8
-msgid "RSSyl"
-msgstr "RSSyl"
+#: ../src/plugins/rssyl/rssyl_update_feed.c:102
+#: ../src/plugins/vcalendar/vcal_folder.c:1596
+msgid "401 (Authorisation required)"
+msgstr "401 (Aŭtentigo bezonata)"
 
-#. Default RSSyl mailbox name
-#: ../src/plugins/rssyl/rssyl.h:14
-msgid "My Feeds"
-msgstr "Miaj fluoj"
+#: ../src/plugins/rssyl/rssyl_update_feed.c:105
+#: ../src/plugins/vcalendar/vcal_folder.c:1599
+msgid "403 (Unauthorised)"
+msgstr "403 (Ne rajtigita)"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:106
-msgid "Default refresh interval in minutes"
-msgstr "Defaŭlta refreŝiga intervalo laŭ minutoj"
+#: ../src/plugins/rssyl/rssyl_update_feed.c:108
+#: ../src/plugins/vcalendar/vcal_folder.c:1602
+msgid "404 (Not found)"
+msgstr "404 (Ne trovita)"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:117
-msgid "Set to 0 to disable automatic refreshing"
-msgstr "Fiksi al 0 por malebligi aŭtomatan refreŝigon"
+#: ../src/plugins/rssyl/rssyl_update_feed.c:111
+#, c-format
+msgid "Error %d"
+msgstr "Eraro %d"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:119
-msgid "Default number of expired items to keep"
-msgstr "Defaŭlta nombro da finiĝantaj eroj por konservi"
+#: ../src/plugins/rssyl/rssyl_update_feed.c:123
+#, c-format
+msgctxt "First parameter is URL, second is error text"
+msgid ""
+"Error fetching feed at\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
+msgstr ""
+"Eraro dum havigas fluon ĉe\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:130
-msgid "Set to -1 to keep expired items"
-msgstr "Fiksi al -1 por teni finiĝintajn erojn"
+#: ../src/plugins/rssyl/rssyl_update_feed.c:134
+#, c-format
+msgid ""
+"No valid feed found at\n"
+"<b>%s</b>"
+msgstr ""
+"Neniu valida fluo trovita ĉe\n"
+"<b>%s</b>"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:133
-msgid "Refresh all feeds on application start"
-msgstr "Refreŝigi ĉiujn fluojn je aplikaĵa komenco"
+#: ../src/plugins/rssyl/rssyl_update_feed.c:200
+#, c-format
+msgid "Updating feed '%s'..."
+msgstr "Ĝisdatigas fluon '%s'..."
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:139
-msgid "Path to cookies file"
-msgstr "Vojo al kuketa dosiero"
+#: ../src/plugins/rssyl/rssyl_update_feed.c:221
+#, c-format
+msgid ""
+"Couldn't process feed at\n"
+"<b>%s</b>\n"
+"\n"
+"Please contact developers, this should not happen."
+msgstr ""
+"Ne povis procezi fluon ĉe\n"
+"<b>%s</b>\n"
+"Bonvolu kontakti evoluigistojn; ĉi tio devus ne okazi."
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:149
-msgid "Path to Netscape-style cookies.txt file containing your cookies"
-msgstr "Vojo al Fajrovulpaj cookies.txt dosiero enhavante viajn kuketojn"
+#: ../src/plugins/rssyl/rssyl_update_feed.c:301
+msgid "Claws Mail needs network access in order to update your feeds."
+msgstr "Claws Mail bezonas retan atingon por ĝisdatigi viajn fluojn."
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:152
-msgid "Verify SSL certificate validity for new feeds"
-msgstr "Kontroli SSL ateston por novaj abonfluoj"
+#: ../src/plugins/rssyl/rssyl_update_format.c:127
+msgid "Internal problem while upgrading storage format. This should not happen. Please report this, with debug output attached.\n"
+msgstr "Interna problemo dum ĝisdatigo de enmemoriga aranĝo. Ĉi tio devus ne okazi. Bonvolu raporti ĉi tion, kun senmisiga eligo algluata.\n"
 
 #: ../src/plugins/smime/plugin.c:38 ../src/plugins/smime/plugin.c:54
 #: ../src/plugins/smime/smime.c:911
@@ -13797,36 +13388,26 @@ msgstr "S/MIME"
 
 #: ../src/plugins/smime/plugin.c:59
 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"
+"This plugin handles S/MIME signed and/or encrypted mails. You can decrypt mails, verify signatures or sign and encrypt your own mails.\n"
 "\n"
-"It can be selected as the Default Privacy System in /Configuration/[Account "
-"Preferences]/Privacy and when composing a message from /Options/Privacy "
-"System\n"
+"It can be selected as the Default Privacy System in /Configuration/[Account Preferences]/Privacy and when composing a message from /Options/Privacy System\n"
 "\n"
 "This plugin uses the GPGME library as a wrapper for GnuPG.\n"
-"This plugin also needs gpgsm, gnupg-agent and dirmngr installed and "
-"configured.\n"
+"This plugin also needs gpgsm, gnupg-agent and dirmngr installed and configured.\n"
 "\n"
-"Information about how to get S/MIME certificates working with GPGSM can be "
-"found at:\n"
+"Information about how to get S/MIME certificates working with GPGSM can be found at:\n"
 "http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Ĉi tiu kromprogramo traktas S/MIME subskribitajn kaj/aŭ enĉifritajn poŝtojn. "
-"Vi povas elĉifri poŝtojn, verigi subskribojn aŭ subskribi kaj enĉifri viajn "
-"prorajn poŝtojn.\n"
+"Ĉi tiu kromprogramo traktas S/MIME subskribitajn kaj/aŭ enĉifritajn poŝtojn. Vi povas elĉifri poŝtojn, verigi subskribojn aŭ subskribi kaj enĉifri viajn prorajn poŝtojn.\n"
 "\n"
-"Ĝi povas esti elektita kiel la defaŭlta privata sistemo en /Agordo/[Kontaj "
-"Preferoj]/Privateco kaj kiam verkante mesaĝon de /Opcioj/Privateca Sistemo\n"
+"Ĝi povas esti elektita kiel la defaŭlta privata sistemo en /Agordo/[Kontaj Preferoj]/Privateco kaj kiam verkante mesaĝon de /Opcioj/Privateca Sistemo\n"
 "\n"
 "Ĉi tiu kromprogramo uzas la GPGME bibliotekon kiel volvilo por GnuPG.\n"
-"Ĉi tiu kromprogramo ankaŭ bezonas gpgsm, gnupg-agent kaj dirmngr instalitaj "
-"kaj agorditaj.\n"
+"Ĉi tiu kromprogramo ankaŭ bezonas gpgsm, gnupg-agent kaj dirmngr instalitaj kaj agorditaj.\n"
 "\n"
-"Informo pri kiel havigi S/MIME atestojn funkciantaj kun GPGSM povas esti "
-"trovata ĉe:\n"
+"Informo pri kiel havigi S/MIME atestojn funkciantaj kun GPGSM povas esti trovata ĉe:\n"
 "http://wwwo.claws-mail.org/faq/index.php/S/MIME_howto\n"
 "\n"
 "GPGME estas kopirajto 2001 per Werner Koch <dd9jn at gnu.org>"
@@ -13849,12 +13430,50 @@ msgid "Couldn't close temporary file"
 msgstr "Ne povis fermi provizoran dosieron"
 
 #: ../src/plugins/smime/smime.c:708
+msgid "Please note that email headers, like Subject, are not encrypted by the S/MIME system."
+msgstr "Bonvolu noti ke retpoŝtaj ĉapoj, kiel Temo, ne estas enĉifritaj de la S/MIME sistemo."
+
+#: ../src/plugins/spam_report/spam_report.c:295
+msgid "Reporting spam..."
+msgstr "Raportas spamon..."
+
+#: ../src/plugins/spam_report/spam_report.c:330
+msgid "Report spam online..."
+msgstr "Raportu spamon surrete..."
+
+#: ../src/plugins/spam_report/spam_report.c:341
+#: ../src/plugins/spam_report/spam_report.c:379
+#: ../src/plugins/spam_report/spam_report_prefs.c:80
+msgid "SpamReport"
+msgstr "SpamRaporto"
+
+#: ../src/plugins/spam_report/spam_report.c:384
 msgid ""
-"Please note that email headers, like Subject, are not encrypted by the S/"
-"MIME system."
+"This plugin reports spam to various places.\n"
+"Currently the following sites or methods are supported:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * lists.debian.org nomination system"
 msgstr ""
-"Bonvolu noti ke retpoŝtaj ĉapoj, kiel Temo, ne estas enĉifritaj de la S/MIME "
-"sistemo."
+"Ĉi tiu kromprogramo raportas spamon al kelkaj lokoj.\n"
+"Nune la sekvantaj retejoj aŭ metodoj estas subtenataj:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * list.debian.org nomiga sistemo"
+
+#: ../src/plugins/spam_report/spam_report.c:409
+msgid "Spam reporting"
+msgstr "Spama raportado"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:122
+msgid "Enabled"
+msgstr "Ebligita"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:149
+msgid "Forward to:"
+msgstr "Plusendu al:"
 
 #: ../src/plugins/spamassassin/spamassassin.c:77
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:649
@@ -13878,22 +13497,12 @@ msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtras mesaĝon..."
 
 #: ../src/plugins/spamassassin/spamassassin.c:372
-msgid ""
-"The SpamAssassin plugin couldn't filter a message. The probable cause of the "
-"error is an unreachable spamd daemon. Please make sure spamd is running and "
-"accessible."
-msgstr ""
-"La SpamAssassin kromprogramo ne povis filtri mesaĝon. La probabla kaŭzo de "
-"la eraro estas malatingebla spamd dajmono. Bonvolu certigi ke spand "
-"plenumiĝas kaj atingeblas."
+msgid "The SpamAssassin plugin couldn't filter a message. The probable cause of the error is an unreachable spamd daemon. Please make sure spamd is running and accessible."
+msgstr "La SpamAssassin kromprogramo ne povis filtri mesaĝon. La probabla kaŭzo de la eraro estas malatingebla spamd dajmono. Bonvolu certigi ke spand plenumiĝas kaj atingeblas."
 
 #: ../src/plugins/spamassassin/spamassassin.c:429
-msgid ""
-"Claws Mail needs network access in order to feed this mail(s) to the remote "
-"learner."
-msgstr ""
-"Claws Mail bezonas retan atingon ke ĝi povu fluigi ĉi tiu(j)n poŝto(j)n al "
-"la fora lernilo."
+msgid "Claws Mail needs network access in order to feed this mail(s) to the remote learner."
+msgstr "Claws Mail bezonas retan atingon ke ĝi povu fluigi ĉi tiu(j)n poŝto(j)n al la fora lernilo."
 
 #: ../src/plugins/spamassassin/spamassassin.c:574
 msgid "Failed to get username"
@@ -13901,30 +13510,23 @@ msgstr "Malsukcesis havigi uzantnomon"
 
 #: ../src/plugins/spamassassin/spamassassin.c:586
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
-msgstr ""
-"SpamAssassin kromprogramo estas ŝargita sed malebligita de siaj preferoj.\n"
+msgstr "SpamAssassin kromprogramo estas ŝargita sed malebligita de siaj preferoj.\n"
 
 #: ../src/plugins/spamassassin/spamassassin.c:620
 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 "
-"SpamAssassin Server (spamd) running somewhere.\n"
+"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 SpamAssassin Server (spamd) running somewhere.\n"
 "\n"
 "It can also be used for marking messages as Ham or Spam.\n"
 "\n"
-"When a message is identified as spam it can be deleted or saved in a "
-"specially designated folder.\n"
+"When a message is identified as spam it can be deleted or saved in a specially designated folder.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
-"Ĉi tiu kromprogramo povas kontroli ĉiujn mesaĝojn kiuj estas ricevitaj de "
-"IMAP, LOKA aŭ POP konto por spamo uzante SpamAssassin servilo. Vi bezonos "
-"SpamAssassin servilon (spamd) plenumiĝanta ie.\n"
+"Ĉi tiu kromprogramo povas kontroli ĉiujn mesaĝojn kiuj estas ricevitaj de IMAP, LOKA aŭ POP konto por spamo uzante SpamAssassin servilo. Vi bezonos SpamAssassin servilon (spamd) plenumiĝanta ie.\n"
 "\n"
 "Ĝi povas ankaŭ esti uzata por marki mesaĝojn kiel Hamo aŭ Spamo.\n"
 "\n"
-"Kiam mesaĝo estas identifigita kiel spamo, ĝi povas esti forigita aŭ "
-"konservita en aparte desegnita dosierujo.\n"
+"Kiam mesaĝo estas identifigita kiel spamo, ĝi povas esti forigita aŭ konservita en aparte desegnita dosierujo.\n"
 "\n"
 "Opcioj troveblas en /Agordo/Preferoj/Kromprogramoj/SpamAssassin"
 
@@ -13943,11 +13545,11 @@ msgstr "Uniksa ingo"
 
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:269
 msgid "Enable SpamAssassin plugin"
-msgstr "Ebligi SpamAssassin kromprogramon"
+msgstr "Ebligu SpamAssassin kromprogramon"
 
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:273
 msgid "Transport"
-msgstr "Transporti"
+msgstr "Transportu"
 
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:281
 msgid "Type of transport"
@@ -13978,54 +13580,8 @@ msgid "Path of Unix socket"
 msgstr "Vojo de Uniksa ingo"
 
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:387
-msgid ""
-"Maximum time allowed for checking. If the check takes longer it will be "
-"aborted."
-msgstr ""
-"Maksimuma tempo permesata por kontrolado. Se la kontrolo daŭras pli longe ĝi "
-"estos abortita."
-
-#: ../src/plugins/spam_report/spam_report.c:293
-msgid "Reporting spam..."
-msgstr "Raportas spamon..."
-
-#: ../src/plugins/spam_report/spam_report.c:328
-msgid "Report spam online..."
-msgstr "Raporti spamon surrete..."
-
-#: ../src/plugins/spam_report/spam_report.c:339
-#: ../src/plugins/spam_report/spam_report.c:377
-#: ../src/plugins/spam_report/spam_report_prefs.c:80
-msgid "SpamReport"
-msgstr "SpamRaporto"
-
-#: ../src/plugins/spam_report/spam_report.c:382
-msgid ""
-"This plugin reports spam to various places.\n"
-"Currently the following sites or methods are supported:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * lists.debian.org nomination system"
-msgstr ""
-"Ĉi tiu kromprogramo raportas spamon al kelkaj lokoj.\n"
-"Nune la sekvantaj retejoj aŭ metodoj estas subtenataj:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * list.debian.org nomiga sistemo"
-
-#: ../src/plugins/spam_report/spam_report.c:407
-msgid "Spam reporting"
-msgstr "Spama raportado"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:122
-msgid "Enabled"
-msgstr "Ebligita"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:149
-msgid "Forward to:"
-msgstr "Plusendi al:"
+msgid "Maximum time allowed for checking. If the check takes longer it will be aborted."
+msgstr "Maksimuma tempo permesata por kontrolado. Se la kontrolo daŭras pli longe ĝi estos abortita."
 
 #: ../src/plugins/tnef_parse/tnef_parse.c:65
 #, c-format
@@ -14066,26 +13622,23 @@ msgstr "TNEF analizilo"
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
-"The plugin uses the Ytnef library, which is copyright 2002-2007 by Randall "
-"Hand <yerase at yerot.com>"
+"The plugin uses the Ytnef library, which is copyright 2002-2007 by Randall Hand <yerase at yerot.com>"
 msgstr ""
-"Ĉi tiu Claws Mail kromprogramo permesas vin legi aplikaĵajn/ms-tnef "
-"algluaĵojn.\n"
+"Ĉi tiu Claws Mail kromprogramo permesas vin legi aplikaĵajn/ms-tnef algluaĵojn.\n"
 "\n"
-"La kromprogramo uzas la Ytnef bibliotekon, kiu estas kopirajta 2002-2007 de "
-"Randall Hard <yerase at yerot.com>"
+"La kromprogramo uzas la Ytnef bibliotekon, kiu estas kopirajta 2002-2007 de Randall Hard <yerase at yerot.com>"
 
 #: ../src/plugins/vcalendar/common-views.c:62
 msgid "_Edit this meeting..."
-msgstr "R_edakti ĉi tiun kunvenon..."
+msgstr "R_edaktu ĉi tiun kunvenon..."
 
 #: ../src/plugins/vcalendar/common-views.c:63
 msgid "_Cancel this meeting..."
-msgstr "Nuligi ĉi tiun renkonton..."
+msgstr "Nuligu ĉi tiun renkonton..."
 
 #: ../src/plugins/vcalendar/common-views.c:65
 msgid "_Create new meeting..."
-msgstr "Krei novan kunvenon..."
+msgstr "Kreu novan kunvenon..."
 
 #: ../src/plugins/vcalendar/common-views.c:67
 msgid "_Go to today"
@@ -14094,16 +13647,16 @@ msgstr "Iru al hodiaŭ"
 #: ../src/plugins/vcalendar/day-view.c:593
 #: ../src/plugins/vcalendar/month-view.c:690
 msgid "Start"
-msgstr "Komenciĝi"
+msgstr "Komenciĝu"
 
 #: ../src/plugins/vcalendar/day-view.c:606
 #: ../src/plugins/vcalendar/month-view.c:703
 msgid "Show"
-msgstr "Montri"
+msgstr "Montru"
 
 #: ../src/plugins/vcalendar/day-view.c:614
 #: ../src/plugins/vcalendar/month-view.c:711 ../src/prefs_account.c:1477
-#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:334
+#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:336
 msgid "days"
 msgstr "tagoj"
 
@@ -14202,33 +13755,21 @@ msgstr "vKalendaro"
 
 #: ../src/plugins/vcalendar/plugin.c:69
 msgid ""
-"This plugin enables vCalendar message handling like that produced by "
-"Evolution or Outlook.\n"
-"\n"
-"When loaded, it will create a vCalendar mailbox in the Folder List, which "
-"will be populated by meetings that you have accepted or created.\n"
-"Meeting requests that you receive will be presented in an appropriate form "
-"and you will be able to accept or decline them.\n"
-"To create a meeting right-click on the vCalendar or Meetings folder and "
-"choose \"New meeting...\".\n"
-"\n"
-"You will also be able to subscribe to remote webCal feeds,export your "
-"meetings and calendars, publish your free/busy information and retrieve that "
-"information from others."
+"This plugin enables vCalendar message handling like that produced by Evolution or Outlook.\n"
+"\n"
+"When loaded, it will create a vCalendar mailbox in the Folder List, which will be populated by meetings that you have accepted or created.\n"
+"Meeting requests that you receive will be presented in an appropriate form and you will be able to accept or decline them.\n"
+"To create a meeting right-click on the vCalendar or Meetings folder and choose \"New meeting...\".\n"
+"\n"
+"You will also be able to subscribe to remote webCal feeds,export your meetings and calendars, publish your free/busy information and retrieve that information from others."
 msgstr ""
-"Ĉi tiu kromprogramo ebligas vKalendaran mesaĝtraktadon kiel tiu produktita "
-"de Evolution aŭ Outlook.\n"
+"Ĉi tiu kromprogramo ebligas vKalendaran mesaĝtraktadon kiel tiu produktita de Evolution aŭ Outlook.\n"
 "\n"
-"Kiam ŝargita, ĝi kreos vKalendaran poŝtkeston en la Dosieruja listo, kiu "
-"enhavos kunvenojn kiujn vi akceptis aŭ kreis.\n"
-"Kunvenaj petoj, kiujn vi ricevas, estos prezentitaj en taga aranĝo kaj vi "
-"eblos akcepti aŭ rifuzi ilin.\n"
-"Krei kunvenon, dekstre-alklaki sur la vKalendara aŭ Kunvena dosierujo kaj "
-"elekti na \"Nova kunveno...\".\n"
+"Kiam ŝargita, ĝi kreos vKalendaran poŝtkeston en la Dosieruja listo, kiu enhavos kunvenojn kiujn vi akceptis aŭ kreis.\n"
+"Kunvenaj petoj, kiujn vi ricevas, estos prezentitaj en taga aranĝo kaj vi eblos akcepti aŭ rifuzi ilin.\n"
+"Krei kunvenon, dekstre-alklaku sur la vKalendara aŭ Kunvena dosierujo kaj elektu na \"Nova kunveno...\".\n"
 "\n"
-"Vi ankaŭ povos subskribi al fora webCal fluoj, eksporti viajn kunvenojn kaj "
-"kalendarojn, eldoni vian liberan/okupitan informon kaj havigi tian informon "
-"de aliaj."
+"Vi ankaŭ povos subskribi al fora webCal fluoj, eksporti viajn kunvenojn kaj kalendarojn, eldoni vian liberan/okupitan informon kaj havigi tian informon de aliaj."
 
 #: ../src/plugins/vcalendar/plugin.c:102
 msgid "Calendar"
@@ -14236,12 +13777,11 @@ msgstr "Kalendaro"
 
 #: ../src/plugins/vcalendar/vcalendar.c:100
 msgid "Create meeting from message..."
-msgstr "Krei renkonton de mesaĝo..."
+msgstr "Kreu renkonton de mesaĝo..."
 
 #: ../src/plugins/vcalendar/vcalendar.c:120
 #, c-format
-msgid ""
-"You are about to create %d meetings, one by one. Do you want to continue?"
+msgid "You are about to create %d meetings, one by one. Do you want to continue?"
 msgstr "Vi estas kreonta %d renkontojn, unuope. Ĉu vi volas daŭrigi?"
 
 #: ../src/plugins/vcalendar/vcalendar.c:139
@@ -14254,7 +13794,7 @@ msgstr "neniu temo"
 
 #: ../src/plugins/vcalendar/vcalendar.c:393
 msgid "Accept"
-msgstr "Akcepti"
+msgstr "Akceptu"
 
 #: ../src/plugins/vcalendar/vcalendar.c:394
 msgid "Tentatively accept"
@@ -14262,7 +13802,7 @@ msgstr "Prove akcepti"
 
 #: ../src/plugins/vcalendar/vcalendar.c:395
 msgid "Decline"
-msgstr "Rifuzi"
+msgstr "Rifuzu"
 
 #: ../src/plugins/vcalendar/vcalendar.c:482
 msgid "You have a Todo item."
@@ -14300,10 +13840,8 @@ msgstr "%s <span weight=\"bold\">(ĉi tiu okazo ripetiĝas)</span>"
 
 #: ../src/plugins/vcalendar/vcalendar.c:570
 #, c-format
-msgid ""
-"%s <span weight=\"bold\">(this event is part of a recurring event)</span>"
-msgstr ""
-"%s <span weight=\"bold\">(ĉi tiu okazo estas parto de ripetiĝa evento)</span>"
+msgid "%s <span weight=\"bold\">(this event is part of a recurring event)</span>"
+msgstr "%s <span weight=\"bold\">(ĉi tiu okazo estas parto de ripetiĝa evento)</span>"
 
 #: ../src/plugins/vcalendar/vcalendar.c:749
 msgid "You have received an answer to an unknown meeting proposal."
@@ -14332,11 +13870,11 @@ msgstr "Eraro - nekonata kalendara era tipo."
 
 #: ../src/plugins/vcalendar/vcalendar.c:982
 msgid "Send a notification to the attendees"
-msgstr "Sendi avizon al la ĉeestontaro"
+msgstr "Sendu avizon al la ĉeestontaro"
 
 #: ../src/plugins/vcalendar/vcalendar.c:991
 msgid "Cancel meeting"
-msgstr "Nuligi renkonton"
+msgstr "Nuligu renkonton"
 
 #: ../src/plugins/vcalendar/vcalendar.c:992
 msgid "Are you sure you want to cancel this meeting?"
@@ -14356,23 +13894,23 @@ msgstr ""
 
 #: ../src/plugins/vcalendar/vcalendar.c:1090
 msgid "+Reply anyway"
-msgstr "+Respondi malgraŭe"
+msgstr "+Respondu malgraŭe"
 
 #: ../src/plugins/vcalendar/vcalendar.c:1219
 msgid "Answer"
-msgstr "Respondi"
+msgstr "Respondu"
 
 #: ../src/plugins/vcalendar/vcalendar.c:1220
 msgid "Edit meeting..."
-msgstr "Redakti renkonton..."
+msgstr "Redaktu renkonton..."
 
 #: ../src/plugins/vcalendar/vcalendar.c:1221
 msgid "Cancel meeting..."
-msgstr "Nuligi renkonton..."
+msgstr "Nuligu renkonton..."
 
 #: ../src/plugins/vcalendar/vcalendar.c:1222
 msgid "Launch website"
-msgstr "Lanĉi retejon"
+msgstr "Lanĉu retejon"
 
 #: ../src/plugins/vcalendar/vcalendar.c:1226
 msgid "You are already busy at this time."
@@ -14425,19 +13963,19 @@ msgstr "_Nova kunveno..."
 
 #: ../src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Export calendar..."
-msgstr "_Eksporti kalendaron..."
+msgstr "_Eksportu kalendaron..."
 
 #: ../src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Subscribe to webCal..."
-msgstr "_Subskribi al webCal..."
+msgstr "_Subskribu al webCal..."
 
 #: ../src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Rename..."
-msgstr "_Renomi..."
+msgstr "_Renomu..."
 
 #: ../src/plugins/vcalendar/vcal_folder.c:170
 msgid "U_pdate subscriptions"
-msgstr "Ĝisdatigi subskribojn"
+msgstr "Ĝisdatigu subskribojn"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:171
 msgid "_List view"
@@ -14489,6 +14027,11 @@ msgstr ""
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Eltempiĝo (%d sekundoj) konektante al %s\n"
 
+#: ../src/plugins/vcalendar/vcal_folder.c:1605
+#, c-format
+msgid "Error %ld"
+msgstr "Eraro %ld"
+
 #: ../src/plugins/vcalendar/vcal_folder.c:1802
 #, c-format
 msgid ""
@@ -14539,9 +14082,9 @@ msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1849
 #: ../src/plugins/vcalendar/vcal_folder.c:1852
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create directory %s"
-msgstr "Ne povis krei celan dosierujon %s."
+msgstr "Ne povis krei dosierujon %s"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1890
 msgid "Claws Mail needs network access in order to update the Webcal feed."
@@ -14562,11 +14105,11 @@ msgstr "Claws Mail bezonas retan atingon por ĝisdatigi la subskribon."
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1925
 msgid "Subscribe to WebCal"
-msgstr "Subskribi al WebCal"
+msgstr "Subskribu al WebCal"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1925
 msgid "Enter the WebCal URL:"
-msgstr "Enigi la WebCal retadreson:"
+msgstr "Enigu la WebCal retadreson:"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1937
 msgid "Could not parse the URL."
@@ -14655,7 +14198,7 @@ msgstr "Ĉambro"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:323
 msgid "Add..."
-msgstr "Aldoni..."
+msgstr "Aldonu..."
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:779
 msgid ""
@@ -14747,8 +14290,7 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"It isn't possible to have this meeting with everyone in the previous or next "
-"6 hours."
+"It isn't possible to have this meeting with everyone in the previous or next 6 hours."
 msgstr ""
 "\n"
 "\n"
@@ -14801,11 +14343,11 @@ msgstr "Ne ĉiuj haveblas"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:970
 msgid "Send anyway"
-msgstr "Sendi malgraŭe"
+msgstr "Sendu malgraŭe"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:981
 msgid "Not everyone is available. See tooltips for more info..."
-msgstr "Ne ĉiuj haveblas. Vidi ŝpruckonsiletojn por plia informo..."
+msgstr "Ne ĉiuj haveblas. Vidu ŝpruckonsiletojn por plia informo..."
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1118
 #, c-format
@@ -14823,12 +14365,8 @@ msgid "Everyone is available."
 msgstr "Ĉiuj haveblas."
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1174
-msgid ""
-"Everyone seems available, but some free/busy information failed to be "
-"retrieved."
-msgstr ""
-"Ĉiuj ŝajnas haveblaj, sed kelkaj liberaj/okupataj informoj malsukcesis esti "
-"havigitaj."
+msgid "Everyone seems available, but some free/busy information failed to be retrieved."
+msgstr "Ĉiuj ŝajnas haveblaj, sed kelkaj liberaj/okupataj informoj malsukcesis esti havigitaj."
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1353
 msgid ""
@@ -14836,15 +14374,15 @@ msgid ""
 "Check the recipients."
 msgstr ""
 "Ne povis sendi la kunvenan inviton.\n"
-"Kontroli la ricevontojn."
+"Kontrolu la ricevontojn."
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1474
 msgid "Save & Send"
-msgstr "Konservi kaj Sendi"
+msgstr "Konservu kaj Sendu"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1475
 msgid "Check availability"
-msgstr "Kontroli havigeblecon"
+msgstr "Kontrolu havigeblecon"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1598
 msgid "<b>Starts at:</b> "
@@ -14866,7 +14404,7 @@ msgstr "Nova renkonto"
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1665
 #, c-format
 msgid "%s - Edit meeting"
-msgstr "%s - Redakti kunvenon"
+msgstr "%s - Redaktu kunvenon"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1720
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1744
@@ -14913,8 +14451,8 @@ msgstr ""
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
-msgstr[0] "Memorigi min post %d minuto"
-msgstr[1] "Memorigi min post %d minutoj"
+msgstr[0] "Memorigu min post %d minuto"
+msgstr[1] "Memorigu min post %d minutoj"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:2034
 msgid "Empty calendar"
@@ -14930,7 +14468,7 @@ msgstr "Ne povis eksporti la kalendaron."
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:2092
 msgid "Export calendar to ICS"
-msgstr "Eksporti kalendaron al ICS"
+msgstr "Eksportu kalendaron al ICS"
 
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:2115
 #, c-format
@@ -14953,7 +14491,7 @@ msgstr "Memorigiloj"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:275
 msgid "Alert me"
-msgstr "Atentigi min"
+msgstr "Atentigu min"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:287
 msgid "minutes before an event"
@@ -14967,7 +14505,7 @@ msgstr "Kalendara eksporto"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:310
 msgid "Automatically export calendar to"
-msgstr "Aŭtomate eksporti kalendaron al"
+msgstr "Aŭtomate eksportu kalendaron al"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:319
 #: ../src/plugins/vcalendar/vcal_prefs.c:425
@@ -14976,7 +14514,7 @@ msgstr "Vi povas eksporti al loka dosiero aŭ retadreso"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:321
 msgid "Specify a local file or URL (http://server/path/file.ics)"
-msgstr "Specifi lokan dosieron aŭ retadreson (http://servila/vojo/dosiero.ics)"
+msgstr "Specifu lokan dosieron aŭ retadreson (http://servila/vojo/dosiero.ics)"
 
 #. gtk_table_set_row_spacing (GTK_TABLE (serv_table), 2, 0);
 #: ../src/plugins/vcalendar/vcal_prefs.c:329
@@ -14994,7 +14532,7 @@ msgstr "Pasvorto"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:351
 msgid "Include webcal subscriptions in export"
-msgstr "Inkluzivi webcal subskribojn en eksporto"
+msgstr "Inkluzivu webcal subskribojn en eksporto"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:361
 msgid "Command to run after calendar export"
@@ -15002,7 +14540,7 @@ msgstr "Komando plenumenda post kalendara eksporto"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:390
 msgid "Register Claws' calendar in XFCE's Orage clock"
-msgstr "Registri la kalendaro de Claws Mail en la Orage horloĝo de XFCE"
+msgstr "Registru la kalendaro de Claws Mail en la Orage horloĝo de XFCE"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:392
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
@@ -15016,11 +14554,11 @@ msgstr "Libera/Okupita informo"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:416
 msgid "Automatically export free/busy status to"
-msgstr "Aŭtomate eksporti liberan/okupitan staton al"
+msgstr "Aŭtomate eksportu liberan/okupitan staton al"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:427
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
-msgstr "Specifi lokan dosieron aŭ retadreson (http://servilo/vojo/dosiero.ifb)"
+msgstr "Specifu lokan dosieron aŭ retadreson (http://servilo/vojo/dosiero.ifb)"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:457
 msgid "Command to run after free/busy status export"
@@ -15028,16 +14566,12 @@ msgstr "Komando plenumenda post libera/okupita stata eksporto"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:484
 msgid "Get free/busy status of others from"
-msgstr "Havigi liberan/okupitan staton de aliaj de"
+msgstr "Havigu liberan/okupitan staton de aliaj de"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:492
 #, c-format
-msgid ""
-"Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
-"left part of the email address, %d for the domain"
-msgstr ""
-"Specifi lokan dosieron aŭ retadreson (http://servila/vojo/dosiero.ifb). Uzi "
-"%u por la liva parto de la retpoŝta adreso, %d por la domajno"
+msgid "Specify a local file or URL (http://server/path/file.ifb). Use %u for the left part of the email address, %d for the domain"
+msgstr "Specifu lokan dosieron aŭ retadreson (http://servila/vojo/dosiero.ifb). Uzu %u por la liva parto de la retpoŝta adreso, %d por la domajno"
 
 #. SSL frame
 #: ../src/plugins/vcalendar/vcal_prefs.c:506
@@ -15125,7 +14659,7 @@ msgstr "Nomo de konto"
 
 #: ../src/prefs_account.c:1044
 msgid "Set as default"
-msgstr "Fiksi kiel defaŭlto"
+msgstr "Fiksu kiel defaŭlto"
 
 #: ../src/prefs_account.c:1052
 msgid "Personal information"
@@ -15149,7 +14683,7 @@ msgstr "Aŭtomata agordo"
 
 #: ../src/prefs_account.c:1132 ../src/wizard.c:1476
 msgid "Cancel"
-msgstr "Nuligi"
+msgstr "Nuligu"
 
 #: ../src/prefs_account.c:1148
 msgid ""
@@ -15165,7 +14699,7 @@ msgstr "Ĉi tiu servilo bezonas atentigon"
 
 #: ../src/prefs_account.c:1184
 msgid "Authenticate on connect"
-msgstr "Aŭtentigi je konekto"
+msgstr "Aŭtentigu je konekto"
 
 #: ../src/prefs_account.c:1238
 msgid "News server"
@@ -15182,11 +14716,11 @@ msgstr "Loka poŝtkesto"
 #. gtk_table_set_row_spacing (GTK_TABLE (serv_table), 2, 0);
 #: ../src/prefs_account.c:1257
 msgid "SMTP server (send)"
-msgstr "SMTP servilo (sendi)"
+msgstr "SMTP servilo (sendu)"
 
 #: ../src/prefs_account.c:1265
 msgid "Use mail command rather than SMTP server"
-msgstr "Uzi poŝtan komandon pli ol SMTP servilon"
+msgstr "Uzu poŝtan komandon pli ol SMTP servilon"
 
 #: ../src/prefs_account.c:1274
 msgid "command to send mails"
@@ -15210,38 +14744,29 @@ msgstr "Defaŭlta Inbox"
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Nefiltritaj mesaĝoj estos konservitaj en ĉi tiu dosierujo"
 
-#: ../src/prefs_account.c:1442 ../src/prefs_account.c:1531
-#: ../src/prefs_account.c:1991 ../src/prefs_customheader.c:237
-msgid "Bro_wse"
-msgstr "Foliumi"
-
 #: ../src/prefs_account.c:1453
 msgid "Use secure authentication (APOP)"
-msgstr "Uzi sekuran atentigon (APOP)"
+msgstr "Uzu sekuran atentigon (APOP)"
 
 #: ../src/prefs_account.c:1456
 msgid "Remove messages on server when received"
-msgstr "Forigi mesaĝojn ĉe servilo kiam ricevitaj"
+msgstr "Forigu mesaĝojn ĉe servilo kiam ricevitaj"
 
 #: ../src/prefs_account.c:1467
 msgid "Remove after"
-msgstr "Forigi poste"
+msgstr "Forigu poste"
 
 #: ../src/prefs_account.c:1474 ../src/prefs_account.c:1484
 msgid "0 days and 0 hours : remove immediately"
-msgstr "0 tagoj kaj 0 horoj : forigi tuj"
+msgstr "0 tagoj kaj 0 horoj : forigu tuj"
 
 #: ../src/prefs_account.c:1497
 msgid "Receive size limit"
 msgstr "Riceva granda limo"
 
 #: ../src/prefs_account.c:1500
-msgid ""
-"Messages over this limit will be partially retrieved. When selecting them "
-"you will be able to download them fully or delete them."
-msgstr ""
-"Mesaĝoj super ĉi tiu limo estos parte havigitaj. Kiam elektante ilin vi "
-"povos elŝuti ilin plene aŭ forigi ilin."
+msgid "Messages over this limit will be partially retrieved. When selecting them you will be able to download them fully or delete them."
+msgstr "Mesaĝoj super ĉi tiu limo estos parte havigitaj. Kiam elektante ilin vi povos elŝuti ilin plene aŭ forigi ilin."
 
 #: ../src/prefs_account.c:1540 ../src/prefs_account.c:2464
 msgid "NNTP"
@@ -15274,7 +14799,7 @@ msgstr "(kutime malplena)"
 
 #: ../src/prefs_account.c:1610
 msgid "Show subscribed folders only"
-msgstr "Montri subskribitajn dosierujojn nur"
+msgstr "Montru subskribitajn dosierujojn nur"
 
 #: ../src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
@@ -15282,59 +14807,53 @@ msgstr "Kapacita-efika reĝimo (malhelpas havigon de foraj etikedoj)"
 
 #: ../src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
-msgstr ""
-"Ĉi tiu reĝimo uzas malpli da kapacito, sed povas esti malpli rapida kun "
-"kelkaj serviloj."
+msgstr "Ĉi tiu reĝimo uzas malpli da kapacito, sed povas esti malpli rapida kun kelkaj serviloj."
 
 #: ../src/prefs_account.c:1626
 msgid "Filter messages on receiving"
-msgstr "Filtri mesaĝojn je ricevo"
+msgstr "Filtru mesaĝojn je ricevo"
 
 #: ../src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
-msgstr "Permesi filtradon uzante kromprogramojn je ricevado"
+msgstr "Permesu filtradon uzante kromprogramojn je ricevado"
 
 #: ../src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
-msgstr "`Havigi Poŝton' kontrolas novajn mesaĝojn ĉe ĉi tiu konto"
+msgstr "`Havigu Poŝton' kontrolas novajn mesaĝojn ĉe ĉi tiu konto"
 
 #: ../src/prefs_account.c:1718 ../src/prefs_customheader.c:209
-#: ../src/prefs_matcher.c:620 ../src/prefs_matcher.c:1958
-#: ../src/prefs_matcher.c:1980
+#: ../src/prefs_matcher.c:623 ../src/prefs_matcher.c:1974
+#: ../src/prefs_matcher.c:1996
 msgid "Header"
 msgstr "Ĉapo"
 
 #: ../src/prefs_account.c:1720
 msgid "Generate Message-ID"
-msgstr "Generi Mesaĝan-identigilon"
+msgstr "Generu Mesaĝan-identigilon"
 
 #: ../src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
-msgstr "Sendi kontan poŝtan adreson en Mesaĝa-identigilo"
+msgstr "Sendu kontan poŝtan adreson en Mesaĝa-identigilo"
 
 #: ../src/prefs_account.c:1726
 msgid "Add user agent header"
-msgstr "Aldoni klienta-aplikaĵan ĉapon"
+msgstr "Aldonu klienta-aplikaĵan ĉapon"
 
 #: ../src/prefs_account.c:1733
 msgid "Add user-defined header"
-msgstr "Aldoni uzantdifinitan ĉapon"
+msgstr "Aldonu uzantdifinitan ĉapon"
 
 #: ../src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP aŭtentigo (SMTP AUTH)"
 
 #: ../src/prefs_account.c:1833
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Se vi lasas ĉi tiujn erojn malplenaj, la sama uzanta identigilo kaj pasvorto "
-"kiel ricevi estos uzataj."
+msgid "If you leave these entries empty, the same user ID and password as receiving will be used."
+msgstr "Se vi lasas ĉi tiujn erojn malplenaj, la sama uzanta identigilo kaj pasvorto kiel ricevi estos uzataj."
 
 #: ../src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
-msgstr "Aŭtentigi kun POP3 antaŭ ol sendi"
+msgstr "Aŭtentigu kun POP3 antaŭ ol sendi"
 
 #: ../src/prefs_account.c:1859
 msgid "POP authentication timeout: "
@@ -15350,7 +14869,7 @@ msgstr "Subskribo"
 
 #: ../src/prefs_account.c:1940
 msgid "Automatically insert signature"
-msgstr "Aŭtomate enmeti subskribon"
+msgstr "Aŭtomate enmetu subskribon"
 
 #: ../src/prefs_account.c:1945
 msgid "Signature separator"
@@ -15362,7 +14881,7 @@ msgstr "Komanda eliĝo"
 
 #: ../src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
-msgstr "Aŭtomate fiksi la sekvantajn adresojn"
+msgstr "Aŭtomate fiksu la sekvantajn adresojn"
 
 #: ../src/prefs_account.c:2055
 msgid "Spell check dictionaries"
@@ -15386,18 +14905,18 @@ msgstr "Defaŭlta alternativa leksikono"
 #: ../src/prefs_quote.c:237 ../src/prefs_spelling.c:336
 #: ../src/prefs_wrapping.c:153
 msgid "Compose"
-msgstr "Verki"
+msgstr "Verku"
 
 #: ../src/prefs_account.c:2179 ../src/prefs_folder_item.c:1469
 #: ../src/prefs_quote.c:134 ../src/toolbar.c:409
 msgid "Reply"
-msgstr "Respondi"
+msgstr "Respondu"
 
 #: ../src/prefs_account.c:2194 ../src/prefs_filtering_action.c:191
 #: ../src/prefs_folder_item.c:1497 ../src/prefs_quote.c:149
 #: ../src/toolbar.c:413
 msgid "Forward"
-msgstr "Plusendi"
+msgstr "Plusendu"
 
 #: ../src/prefs_account.c:2241
 msgid "Default privacy system"
@@ -15405,62 +14924,61 @@ msgstr "Defaŭlta privateca sistemo"
 
 #: ../src/prefs_account.c:2270
 msgid "Always sign messages"
-msgstr "Ĉiam subskribi mesaĝojn"
+msgstr "Ĉiam subskribu mesaĝojn"
 
 #: ../src/prefs_account.c:2272
 msgid "Always encrypt messages"
-msgstr "Ĉiam enĉifri mesaĝojn"
+msgstr "Ĉiam enĉifru mesaĝojn"
 
 #: ../src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
-msgstr "Ĉiam subskribi mesaĝojn kiam respondante al subskribita mesaĝo"
+msgstr "Ĉiam subskribu mesaĝojn kiam respondante al subskribita mesaĝo"
 
 #: ../src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
-msgstr "Ĉiam enĉifri mesaĝojn kiam respondante al enĉifrita mesaĝo"
+msgstr "Ĉiam enĉifru mesaĝojn kiam respondante al enĉifrita mesaĝo"
 
 #: ../src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
-msgstr ""
-"Enĉifri senditajn mesaĝojn kun via propra ŝlosilo krom tiu de la ricevinto"
+msgstr "Enĉifru senditajn mesaĝojn kun via propra ŝlosilo krom tiu de la ricevinto"
 
 #: ../src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
-msgstr "Konservi senditajn enĉifritajn mesaĝojn kiel klara teksto"
+msgstr "Konservu senditajn enĉifritajn mesaĝojn kiel klara teksto"
 
 #: ../src/prefs_account.c:2438 ../src/prefs_account.c:2453
 #: ../src/prefs_account.c:2467
 msgid "Don't use SSL"
-msgstr "Ne uzi SSL"
+msgstr "Ne uzu SSL"
 
 #: ../src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
-msgstr "Uzi SSL por POP3 konekto"
+msgstr "Uzu SSL por POP3 konekto"
 
 #: ../src/prefs_account.c:2444 ../src/prefs_account.c:2459
 #: ../src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
-msgstr "Uzi STARTTLS komandon komenci SSL sesion"
+msgstr "Uzu STARTTLS komandon komenci SSL sesion"
 
 #: ../src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
-msgstr "Uzi SSL por IMAP4 konekto"
+msgstr "Uzu SSL por IMAP4 konekto"
 
 #: ../src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
-msgstr "Uzi SSL por NNTP konekto"
+msgstr "Uzu SSL por NNTP konekto"
 
 #: ../src/prefs_account.c:2480
 msgid "Send (SMTP)"
-msgstr "Sendi (SMTP)"
+msgstr "Sendu (SMTP)"
 
 #: ../src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
-msgstr "Ne uzi SSL (sed, se necese, uzi STARTTLS)"
+msgstr "Ne uzu SSL (sed, se necese, uzu STARTTLS)"
 
 #: ../src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
-msgstr "Uzi SSL por SMTP konekto"
+msgstr "Uzu SSL por SMTP konekto"
 
 #: ../src/prefs_account.c:2495
 msgid "Client certificates"
@@ -15481,15 +14999,15 @@ msgstr "Atesto por sendi"
 
 #: ../src/prefs_account.c:2558
 msgid "Automatically accept unknown valid SSL certificates"
-msgstr "Aŭtomate akcepti nekonatajn validajn SSL atestojn"
+msgstr "Aŭtomate akceptu nekonatajn validajn SSL atestojn"
 
 #: ../src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
-msgstr "Uzi ne-blokigan SSL"
+msgstr "Uzu ne-blokigan SSL"
 
 #: ../src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
-msgstr "Malŝalti ĉi tion se vi havas SSL konektajn problemojn"
+msgstr "Malŝaltu ĉi tion se vi havas SSL konektajn problemojn"
 
 #: ../src/prefs_account.c:2691
 msgid "SMTP port"
@@ -15512,48 +15030,40 @@ msgid "Domain name"
 msgstr "Domajna nomo"
 
 #: ../src/prefs_account.c:2721
-msgid ""
-"The domain name will be used in the generated Message-ID, and when "
-"connecting to SMTP servers."
-msgstr ""
-"La domajna nomo estos uzata en la generita Mesaĝa-identigilo, kaj kiam "
-"konektante al SMTP serviloj."
+msgid "The domain name will be used in the generated Message-ID, and when connecting to SMTP servers."
+msgstr "La domajna nomo estos uzata en la generita Mesaĝa-identigilo, kaj kiam konektante al SMTP serviloj."
 
 #: ../src/prefs_account.c:2735
 msgid "Use command to communicate with server"
-msgstr "Uzi komandon komuniki kun servilo"
+msgstr "Uzu komandon komuniki kun servilo"
 
 #: ../src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
-msgstr "Movi forigitajn poŝtojn al rubujo kaj forviŝi tuj"
+msgstr "Movu forigitajn poŝtojn al rubujo kaj forviŝu tuj"
 
 #: ../src/prefs_account.c:2745
-msgid ""
-"Moves deleted mails to trash instead of using the \\Deleted flag without "
-"expunging."
-msgstr ""
-"Movas forigitajn poŝtojn al rubujo anstataŭ uzante la \\Forviŝitan flagon "
-"sen forviŝo."
+msgid "Moves deleted mails to trash instead of using the \\Deleted flag without expunging."
+msgstr "Movas forigitajn poŝtojn al rubujo anstataŭ uzante la \\Forviŝitan flagon sen forviŝo."
 
 #: ../src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
-msgstr "Marki trans-poŝtitajn mesaĝojn kiel legitaj kaj kolorigi:"
+msgstr "Marku trans-poŝtitajn mesaĝojn kiel legitaj kaj kolorigu:"
 
 #: ../src/prefs_account.c:2805
 msgid "Put sent messages in"
-msgstr "Meti senditajn mesaĝojn en"
+msgstr "Metu senditajn mesaĝojn en"
 
 #: ../src/prefs_account.c:2807
 msgid "Put queued messages in"
-msgstr "Meti envicigitajn mesaĝojn en"
+msgstr "Metu envicigitajn mesaĝojn en"
 
 #: ../src/prefs_account.c:2809
 msgid "Put draft messages in"
-msgstr "Meti provajn mesaĝojn en"
+msgstr "Metu provajn mesaĝojn en"
 
 #: ../src/prefs_account.c:2811
 msgid "Put deleted messages in"
-msgstr "Meti forigitajn mesaĝojn en"
+msgstr "Metu forigitajn mesaĝojn en"
 
 #: ../src/prefs_account.c:2871
 msgid "Account name is not entered."
@@ -15597,7 +15107,7 @@ msgstr "poŝta komando ne estis enigita."
 
 #: ../src/prefs_account.c:3252
 msgid "Receive"
-msgstr "Ricevi"
+msgstr "Ricevu"
 
 #: ../src/prefs_account.c:3306 ../src/prefs_folder_item.c:1848
 #: ../src/prefs_quote.c:238
@@ -15623,16 +15133,16 @@ msgstr "%s - Kontaj preferoj"
 
 #: ../src/prefs_account.c:3849 ../src/wizard.c:1374
 msgid "Failed (wrong address)"
-msgstr "Malsukcesis (malĝusta retpoŝtadreso)"
+msgstr "Fiaskis (malĝusta retpoŝtadreso)"
 
 #: ../src/prefs_account.c:3931
 msgid "Select signature file"
-msgstr "Elekti subskriban dosieron"
+msgstr "Elektu subskriban dosieron"
 
 #: ../src/prefs_account.c:3949 ../src/prefs_account.c:3966
 #: ../src/wizard.c:1057
 msgid "Select certificate file"
-msgstr "Elekti atestan dosieron"
+msgstr "Elektu atestan dosieron"
 
 #: ../src/prefs_account.c:4062
 msgid "Protocol:"
@@ -15661,49 +15171,49 @@ msgstr "Filtrila ago"
 
 #: ../src/prefs_actions.c:299
 msgid "Edit filter action"
-msgstr "Redakti filtrilan agon"
+msgstr "Redaktu filtrilan agon"
 
 #: ../src/prefs_actions.c:327
 msgid "Append the new action above to the list"
-msgstr "Postglui la novan agon supran al la listo"
+msgstr "Postgluu la novan agon supran al la listo"
 
 #: ../src/prefs_actions.c:335
 msgid "Replace the selected action in list with the action above"
-msgstr "Anstataŭigi la elektitan agon en listo kun la ago supra"
+msgstr "Anstataŭigu la elektitan agon en listo kun la ago supra"
 
 #: ../src/prefs_actions.c:337 ../src/prefs_filtering_action.c:616
-#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:778
-#: ../src/prefs_template.c:318 ../src/prefs_toolbar.c:1056
+#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:781
+#: ../src/prefs_template.c:320 ../src/prefs_toolbar.c:1056
 msgid "Re_move"
-msgstr "Forigi"
+msgstr "Forigu"
 
 #: ../src/prefs_actions.c:345
 msgid "Delete the selected action from the list"
-msgstr "Forigi la elektitan agon el la listo"
+msgstr "Forigu la elektitan agon el la listo"
 
 #: ../src/prefs_actions.c:355 ../src/prefs_filtering.c:503
-#: ../src/prefs_template.c:336
+#: ../src/prefs_template.c:338
 msgid "Clear all the input fields in the dialog"
-msgstr "Vakigi ĉiujn enigajn kampojn en la dialogo"
+msgstr "Vakigu ĉiujn enigajn kampojn en la dialogo"
 
 #: ../src/prefs_actions.c:363
 msgid "Show information on configuring actions"
-msgstr "Montri informon ĉe agordaj agoj"
+msgstr "Montru informon ĉe agordaj agoj"
 
 #: ../src/prefs_actions.c:394
 msgid "Move the selected action up"
-msgstr "Movi la elektitan agon supren"
+msgstr "Movu la elektitan agon supren"
 
 #: ../src/prefs_actions.c:402
 msgid "Move selected action down"
-msgstr "Movi elektitan agon suben"
+msgstr "Movu elektitan agon suben"
 
 #. FIXME: this strcmp() is bogus: "(New)" should never
 #. * be inserted in the storage
 #: ../src/prefs_actions.c:535 ../src/prefs_filtering_action.c:704
 #: ../src/prefs_filtering.c:836 ../src/prefs_filtering.c:838
 #: ../src/prefs_filtering.c:839 ../src/prefs_filtering.c:949
-#: ../src/prefs_matcher.c:897 ../src/prefs_template.c:469
+#: ../src/prefs_matcher.c:900 ../src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Nova)"
 
@@ -15748,7 +15258,7 @@ msgstr ""
 
 #: ../src/prefs_actions.c:713
 msgid "Delete action"
-msgstr "Forigi agon"
+msgstr "Forigu agon"
 
 #: ../src/prefs_actions.c:714
 msgid "Do you really want to delete this action?"
@@ -15756,7 +15266,7 @@ msgstr "Ĉu vi vere volas forigi ĉi tiun agon?"
 
 #: ../src/prefs_actions.c:734
 msgid "Delete all actions"
-msgstr "Forigi ĉiujn agojn"
+msgstr "Forigu ĉiujn agojn"
 
 #: ../src/prefs_actions.c:735
 msgid "Do you really want to delete all the actions?"
@@ -15764,24 +15274,24 @@ msgstr "Ĉu vi vere volas forigi ĉiujn agojn?"
 
 #: ../src/prefs_actions.c:898 ../src/prefs_actions.c:929
 #: ../src/prefs_filtering.c:1497 ../src/prefs_filtering.c:1519
-#: ../src/prefs_matcher.c:2109 ../src/prefs_template.c:569
-#: ../src/prefs_template.c:594
+#: ../src/prefs_matcher.c:2125 ../src/prefs_template.c:572
+#: ../src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Enigo ne konservita"
 
 #: ../src/prefs_actions.c:899 ../src/prefs_actions.c:930
 #: ../src/prefs_filtering.c:1498 ../src/prefs_filtering.c:1520
-#: ../src/prefs_template.c:570 ../src/prefs_template.c:595
+#: ../src/prefs_template.c:573 ../src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
-msgstr "La enigo ne estis konservita. Ĉu fermi malgraŭe?"
+msgstr "La enigo ne estis konservita. Ĉu fermu malgraŭe?"
 
 #: ../src/prefs_actions.c:900 ../src/prefs_actions.c:905
 #: ../src/prefs_actions.c:931 ../src/prefs_filtering.c:1477
 #: ../src/prefs_filtering.c:1499 ../src/prefs_filtering.c:1521
-#: ../src/prefs_matcher.c:2111 ../src/prefs_template.c:571
-#: ../src/prefs_template.c:596 ../src/prefs_template.c:601
+#: ../src/prefs_matcher.c:2127 ../src/prefs_template.c:574
+#: ../src/prefs_template.c:599 ../src/prefs_template.c:604
 msgid "+_Continue editing"
-msgstr "+_Daŭrigi redaktadon"
+msgstr "+_Daŭrigu redaktadon"
 
 #: ../src/prefs_actions.c:903
 msgid "Actions list not saved"
@@ -15789,7 +15299,7 @@ msgstr "Aga listo ne konservita"
 
 #: ../src/prefs_actions.c:904
 msgid "The actions list has been modified. Close anyway?"
-msgstr "La aga listo estis modifita. Ĉu fermi malgraŭe?"
+msgstr "La aga listo estis modifita. Ĉu fermu malgraŭe?"
 
 #: ../src/prefs_actions.c:974
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
@@ -15797,7 +15307,7 @@ msgstr "<span weight=\"bold\" underline=\"single\">Menua nomo:</span>"
 
 #: ../src/prefs_actions.c:975
 msgid "Use / in menu name to make submenus."
-msgstr "Uzi / en menua nomo por fari submenuojn."
+msgstr "Uzu / en menua nomo por fari submenuojn."
 
 #: ../src/prefs_actions.c:977
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
@@ -15805,7 +15315,7 @@ msgstr "<span weight=\"bold\" underline=\"single\">Komand-linio:</span>"
 
 #: ../src/prefs_actions.c:978
 msgid "<span weight=\"bold\">Begin with:</span>"
-msgstr "<span weight=\"bold\">Komenci kun:</span>"
+msgstr "<span weight=\"bold\">Komencu kun:</span>"
 
 #: ../src/prefs_actions.c:979
 msgid "to send message body or selection to command's standard input"
@@ -15817,16 +15327,15 @@ msgstr "por sendi uzante provizitan tekston al la ĉefenigujo de la komando"
 
 #: ../src/prefs_actions.c:981
 msgid "to send user provided hidden text to command's standard input"
-msgstr ""
-"por sendi uzante provizitan kaŝitan tekston al la ĉefenigujo de la komando"
+msgstr "por sendi uzante provizitan kaŝitan tekston al la ĉefenigujo de la komando"
 
 #: ../src/prefs_actions.c:982
 msgid "<span weight=\"bold\">End with:</span>"
-msgstr "<span weight=\"bold\">Fini kun:</span>"
+msgstr "<span weight=\"bold\">Finu kun:</span>"
 
 #: ../src/prefs_actions.c:983
 msgid "to replace message body or selection with command's standard output"
-msgstr "anstataŭi mesaĝan korpon aŭ elekton kun la ĉefeligujo de la komando"
+msgstr "anstataŭigi mesaĝan korpon aŭ elekton kun la ĉefeligujo de la komando"
 
 #: ../src/prefs_actions.c:984
 msgid "to insert command's standard output without replacing old text"
@@ -15838,17 +15347,15 @@ msgstr "plenumi komandon malsinkrone"
 
 #: ../src/prefs_actions.c:986
 msgid "<span weight=\"bold\">Use:</span>"
-msgstr "<span weight=\"bold\">Uzi:</span>"
+msgstr "<span weight=\"bold\">Uzu:</span>"
 
 #: ../src/prefs_actions.c:987
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "por la dosiero de la elektita mesaĝo en RFC822/2822 aranĝo "
 
 #: ../src/prefs_actions.c:988
-msgid ""
-"for the list of the files of the selected messages in RFC822/2822 format"
-msgstr ""
-"por la listo de la dosieroj de la elektitaj mesaĝoj en RFC822/2822 aranĝo"
+msgid "for the list of the files of the selected messages in RFC822/2822 format"
+msgstr "por la listo de la dosieroj de la elektitaj mesaĝoj en RFC822/2822 aranĝo"
 
 #: ../src/prefs_actions.c:989
 msgid "for the file of the selected decoded message MIME part"
@@ -15868,7 +15375,7 @@ msgstr "por la teksta elekto"
 
 #: ../src/prefs_actions.c:993
 msgid "apply filtering actions between {} to selected messages"
-msgstr "apliki filtrilajn agojn inter {} al elektitaj mesaĝoj"
+msgstr "apliku filtrilajn agojn inter {} al elektitaj mesaĝoj"
 
 #: ../src/prefs_actions.c:994
 msgid "for a literal %"
@@ -15879,17 +15386,13 @@ msgid "Actions"
 msgstr "Agoj"
 
 #: ../src/prefs_actions.c:1005
-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."
-msgstr ""
-"La Aga trajto estas maniero por la uzanto lanĉi eksterajn komandojn trakti "
-"kompletan mesaĝan dosieron aŭ nur unu el ĝiaj partoj."
+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."
+msgstr "La Aga trajto estas maniero por la uzanto lanĉi eksterajn komandojn trakti kompletan mesaĝan dosieron aŭ nur unu el ĝiaj partoj."
 
 #: ../src/prefs_actions.c:1092 ../src/prefs_filtering.c:1695
-#: ../src/prefs_template.c:1101
+#: ../src/prefs_template.c:1121
 msgid "D_uplicate"
-msgstr "D_uplikati"
+msgstr "D_uplikatu"
 
 #: ../src/prefs_actions.c:1212
 msgid "Current actions"
@@ -15905,16 +15408,48 @@ msgid "Hello,\\n"
 msgstr "Saluton.\\n"
 
 #: ../src/prefs_common.c:296
-msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
-msgstr "Je %d\\n%f skribis:\\n\\n%q\\n%X"
+msgid ""
+"On %d\\n"
+"%f wrote:\\n"
+"\\n"
+"%q\\n"
+"%X"
+msgstr ""
+"Je %d\\n"
+"%f skribis:\\n"
+"\\n"
+"%q\\n"
+"%X"
 
 #: ../src/prefs_common.c:302 ../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"
-msgstr ""
-"\\n\\nKomenci plusenditan mesaĝon:\\n\\n?d{Dato: %d\\n}?f{De: %f\\n}?t{Al: %t"
-"\\n}?c{Kk: %c\\n}?n{Novaĵgrupoj: %n\\n}?s{Temo: %s\\n}\\n\\n%M"
+"\\n"
+"\\n"
+"Begin 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"
+msgstr ""
+"\\n"
+"\\n"
+"Komencu plusenditan mesaĝon:\\n"
+"\\n"
+"?d{Dato: %d\\n"
+"}?f{De: %f\\n"
+"}?t{Al: %t\\n"
+"}?c{Kk: %c\\n"
+"}?n{Novaĵgrupoj: %n\\n"
+"}?s{Temo: %s\\n"
+"}\\n"
+"\\n"
+"%M"
 
 #: ../src/prefs_common.c:442
 msgid "%x(%a) %H:%M"
@@ -15944,11 +15479,11 @@ msgstr "Redaktante"
 
 #: ../src/prefs_compose_writing.c:144
 msgid "Automatically launch the external editor"
-msgstr "Aŭtomate lanĉi la eksteran redaktilon"
+msgstr "Aŭtomate lanĉu la eksteran redaktilon"
 
 #: ../src/prefs_compose_writing.c:152
 msgid "Automatically save message to Drafts folder every"
-msgstr "Aŭtomate konservi mesaĝon al Prova dosierujo ĉiu"
+msgstr "Aŭtomate konservu mesaĝon al Prova dosierujo ĉiu"
 
 #: ../src/prefs_compose_writing.c:162 ../src/prefs_wrapping.c:101
 msgid "characters"
@@ -15956,7 +15491,7 @@ msgstr "signoj"
 
 #: ../src/prefs_compose_writing.c:173
 msgid "Even if message is to be encrypted"
-msgstr "Eĉ se la mesaĝo estos ĉifrita"
+msgstr "Eĉ se la mesaĝo estas ĉifrenda"
 
 #: ../src/prefs_compose_writing.c:180
 msgid "Undo level"
@@ -15964,7 +15499,7 @@ msgstr "Malfara nivelo"
 
 #: ../src/prefs_compose_writing.c:198
 msgid "Warn when inserting a file larger than"
-msgstr "Averti kiam enmetante dosieron pli granda ol"
+msgstr "Avertu kiam enmetante dosieron pli granda ol"
 
 #: ../src/prefs_compose_writing.c:210
 msgid "KB into message body "
@@ -15989,11 +15524,11 @@ msgstr "Plusendas"
 
 #: ../src/prefs_compose_writing.c:227 ../src/prefs_filtering_action.c:192
 msgid "Forward as attachment"
-msgstr "Plusendi kiel algluaĵo"
+msgstr "Plusendu kiel algluaĵo"
 
 #: ../src/prefs_compose_writing.c:230
 msgid "Keep the original 'From' header when redirecting"
-msgstr "Konservi la originan `De' ĉapon kiam redirektante"
+msgstr "Konservu la originan `De' ĉapon kiam redirektante"
 
 #. dnd insert or attach
 #: ../src/prefs_compose_writing.c:233
@@ -16002,15 +15537,15 @@ msgstr "Kiam faligante dosierojn en la Verkan fenestron"
 
 #: ../src/prefs_compose_writing.c:242
 msgid "Ask"
-msgstr "Demandi"
+msgstr "Demandu"
 
 #: ../src/prefs_compose_writing.c:243 ../src/toolbar.c:427
 msgid "Insert"
-msgstr "Enmeti"
+msgstr "Enmetu"
 
 #: ../src/prefs_compose_writing.c:244 ../src/toolbar.c:428
 msgid "Attach"
-msgstr "Alglui"
+msgstr "Algluu"
 
 #: ../src/prefs_compose_writing.c:371
 msgid "Writing"
@@ -16021,7 +15556,7 @@ msgid "Custom header configuration"
 msgstr "Propra ĉapa agordo"
 
 #: ../src/prefs_customheader.c:507 ../src/prefs_display_header.c:599
-#: ../src/prefs_matcher.c:1583 ../src/prefs_matcher.c:1598
+#: ../src/prefs_matcher.c:1595 ../src/prefs_matcher.c:1610
 msgid "Header name is not set."
 msgstr "Ĉapa nomo ne estas fiksita."
 
@@ -16031,15 +15566,15 @@ msgstr "Ĉi tiu ĉapa nomo ne estas permesata en propra ĉapo."
 
 #: ../src/prefs_customheader.c:564
 msgid "Choose a PNG file"
-msgstr "Elekti PNG dosieron"
+msgstr "Elektu PNG dosieron"
 
 #: ../src/prefs_customheader.c:566
 msgid "Choose an XBM file"
-msgstr "Elekti XBM dosieron"
+msgstr "Elektu XBM dosieron"
 
 #: ../src/prefs_customheader.c:568
 msgid "Choose a text file"
-msgstr "Elekti tekstan dosieron"
+msgstr "Elektu tekstan dosieron"
 
 #: ../src/prefs_customheader.c:581
 msgid "This file isn't an image."
@@ -16076,7 +15611,7 @@ msgstr "Ĉi tiu dosiero enhavas novliniojn."
 
 #: ../src/prefs_customheader.c:702
 msgid "Delete header"
-msgstr "Forigi ĉapon"
+msgstr "Forigu ĉapon"
 
 #: ../src/prefs_customheader.c:703
 msgid "Do you really want to delete this header?"
@@ -16104,7 +15639,7 @@ msgstr "Kaŝitaj ĉapoj"
 
 #: ../src/prefs_display_header.c:405
 msgid "Show all unspecified headers"
-msgstr "Montri ĉiujn nespecifitajn ĉapojn"
+msgstr "Montru ĉiujn nespecifitajn ĉapojn"
 
 #: ../src/prefs_display_header.c:609
 msgid "This header is already in the list."
@@ -16117,7 +15652,7 @@ msgstr "%s estos anstataŭigita kun dosiernomo / URI"
 
 #: ../src/prefs_ext_prog.c:120
 msgid "Use system defaults when possible"
-msgstr "Uzi sistemajn defaŭltojn kiam eble"
+msgstr "Uzu sistemajn defaŭltojn kiam eble"
 
 #: ../src/prefs_ext_prog.c:141
 msgid "Web browser"
@@ -16129,15 +15664,11 @@ msgstr "Redaktilo"
 
 #: ../src/prefs_ext_prog.c:197
 msgid "Command for 'Display as text'"
-msgstr "Komando por `Montri kiel teksto'"
+msgstr "Komando por `Montru kiel teksto'"
 
 #: ../src/prefs_ext_prog.c:210
-msgid ""
-"This option enables MIME parts to be displayed in the message view via a "
-"script when using the 'Display as text' contextual menu item"
-msgstr ""
-"Ĉi tiu opcio ebligas MIME parton esti montrita en la mesaĝa vido pere de "
-"skripto kiam uzante la `Montri kiel teksto' kuntekstan menueron"
+msgid "This option enables MIME parts to be displayed in the message view via a script when using the 'Display as text' contextual menu item"
+msgstr "Ĉi tiu opcio ebligas MIME parton esti montrita en la mesaĝa vido pere de skripto kiam uzante la `Montru kiel teksto' kuntekstan menueron"
 
 #: ../src/prefs_ext_prog.c:269 ../src/prefs_image_viewer.c:138
 #: ../src/prefs_message.c:354
@@ -16150,15 +15681,15 @@ msgstr "Eksteraj programoj"
 
 #: ../src/prefs_filtering_action.c:175
 msgid "Move"
-msgstr "Movi"
+msgstr "Movu"
 
 #: ../src/prefs_filtering_action.c:176
 msgid "Copy"
-msgstr "Kopii"
+msgstr "Kopiu"
 
 #: ../src/prefs_filtering_action.c:178
 msgid "Hide"
-msgstr "Kaŝi"
+msgstr "Kaŝu"
 
 #: ../src/prefs_filtering_action.c:179 ../src/prefs_filtering_action.c:180
 #: ../src/prefs_filtering_action.c:181 ../src/prefs_filtering_action.c:182
@@ -16170,77 +15701,77 @@ msgstr "Mesaĝaj flagoj"
 #: ../src/prefs_filtering_action.c:179 ../src/prefs_summary_column.c:78
 #: ../src/summaryview.c:2783
 msgid "Mark"
-msgstr "Marki"
+msgstr "Marku"
 
 #: ../src/prefs_filtering_action.c:183
 msgid "Mark as read"
-msgstr "Marki kiel legita"
+msgstr "Marku kiel legita"
 
 #: ../src/prefs_filtering_action.c:184
 msgid "Mark as unread"
-msgstr "Marki kiel nelegita"
+msgstr "Marku kiel nelegita"
 
 #: ../src/prefs_filtering_action.c:185
 msgid "Mark as spam"
-msgstr "Marki kiel spamo"
+msgstr "Marku kiel spamo"
 
 #: ../src/prefs_filtering_action.c:186
 msgid "Mark as ham"
-msgstr "Marki kiel hamo"
+msgstr "Marku kiel hamo"
 
 #: ../src/prefs_filtering_action.c:187 ../src/prefs_filtering_action.c:1438
 #: ../src/toolbar.c:205 ../src/toolbar.c:438 ../src/toolbar.c:2088
 msgid "Execute"
-msgstr "Plenumi"
+msgstr "Plenumu"
 
 #: ../src/prefs_filtering_action.c:189
 msgid "Color label"
-msgstr "Kolorigi etikedon"
+msgstr "Kolorigu etikedon"
 
 #: ../src/prefs_filtering_action.c:191 ../src/prefs_filtering_action.c:192
 #: ../src/prefs_filtering_action.c:193
 msgid "Resend"
-msgstr "Resendi"
+msgstr "Resendu"
 
 #: ../src/prefs_filtering_action.c:193
 msgid "Redirect"
-msgstr "Redirekti"
+msgstr "Redirektu"
 
 #. S_COL_NUMBER
 #: ../src/prefs_filtering_action.c:194 ../src/prefs_filtering_action.c:195
-#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:626
+#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:629
 #: ../src/prefs_summary_column.c:87 ../src/summaryview.c:447
 msgid "Score"
 msgstr "Poentoj"
 
 #: ../src/prefs_filtering_action.c:194
 msgid "Change score"
-msgstr "Ŝanĝi poentojn"
+msgstr "Ŝanĝu poentojn"
 
 #: ../src/prefs_filtering_action.c:195
 msgid "Set score"
-msgstr "Fiksi poentojn"
+msgstr "Fiksu poentojn"
 
 #. S_COL_LOCKED
 #. S_COL_SCORE
 #. S_COL_LOCKED
 #: ../src/prefs_filtering_action.c:196 ../src/prefs_filtering_action.c:197
-#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:630
+#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:633
 #: ../src/prefs_summary_column.c:89 ../src/summaryview.c:449
 msgid "Tags"
 msgstr "Etikedoj"
 
 #: ../src/prefs_filtering_action.c:196
 msgid "Apply tag"
-msgstr "Apliki etikedon"
+msgstr "Apliku etikedon"
 
 #: ../src/prefs_filtering_action.c:197
 msgid "Unset tag"
-msgstr "Malfiksi etikedon"
+msgstr "Malfiksu etikedon"
 
 #: ../src/prefs_filtering_action.c:198
 msgid "Clear tags"
-msgstr "Vakigi etikedojn"
+msgstr "Vakigu etikedojn"
 
 #: ../src/prefs_filtering_action.c:199 ../src/prefs_filtering_action.c:200
 msgid "Threads"
@@ -16248,14 +15779,14 @@ msgstr "Fadenoj"
 
 #: ../src/prefs_filtering_action.c:202
 msgid "Stop filter"
-msgstr "Halti filtrilon"
+msgstr "Haltu filtrilon"
 
 #: ../src/prefs_filtering_action.c:410
 msgid "Action configuration"
 msgstr "Aga agordo"
 
 #: ../src/prefs_filtering_action.c:427 ../src/prefs_filtering.c:1886
-#: ../src/prefs_matcher.c:583
+#: ../src/prefs_matcher.c:586
 msgid "Rule"
 msgstr "Regulo"
 
@@ -16297,40 +15828,38 @@ msgid "No action was defined."
 msgstr "Neniu ago estis difinita"
 
 #. completion of 'To' from address book
-#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2153
+#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2169
 #: ../src/quote_fmt.c:79
 msgid "literal %"
 msgstr "laŭlitera %"
 
-#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2162
+#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2178
 msgid "filename (should not be modified)"
 msgstr "dosiernomo (devus ne esti modifita)"
 
-#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2163
+#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2179
 #: ../src/quote_fmt.c:87
 msgid "new line"
 msgstr "nova linio"
 
-#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2164
+#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2180
 msgid "escape character for quotes"
 msgstr "eskapsigno por citoj"
 
-#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2165
+#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2181
 msgid "quote character"
 msgstr "citila signo"
 
 #: ../src/prefs_filtering_action.c:1275
 msgid "Filtering Action: 'Execute'"
-msgstr "Filtrila ago: `Plenumi'"
+msgstr "Filtrila ago: `Plenumu'"
 
 #: ../src/prefs_filtering_action.c:1276
 msgid ""
-"'Execute' allows you to send a message or message element to an external "
-"program or script.\n"
+"'Execute' allows you to send a message or message element to an external program or script.\n"
 "The following symbols can be used:"
 msgstr ""
-"`Plenumi' permesas vin sendi mesaĝon aŭ mesaĝeron al ekstera programo aŭ "
-"skripto.\n"
+"`Plenumu' permesas vin sendi mesaĝon aŭ mesaĝeron al ekstera programo aŭ skripto.\n"
 "La sekvantaj simboloj povas esti uzataj:"
 
 #: ../src/prefs_filtering_action.c:1422
@@ -16369,27 +15898,27 @@ msgstr "Kondiĉo"
 
 #: ../src/prefs_filtering.c:424
 msgid " D_efine... "
-msgstr " Difini..."
+msgstr " Difinu..."
 
 #: ../src/prefs_filtering.c:446
 msgid " De_fine... "
-msgstr " Di_fini..."
+msgstr " Di_finu..."
 
 #: ../src/prefs_filtering.c:475
 msgid "Append the new rule above to the list"
-msgstr "Postglui la novan regulon supran al la listo"
+msgstr "Postgluu la novan regulon supran al la listo"
 
 #: ../src/prefs_filtering.c:484
 msgid "Replace the selected rule in list with the rule above"
-msgstr "Anstataŭigi la elektitan regulon en listo kun la regulo supra"
+msgstr "Anstataŭigu la elektitan regulon en listo kun la regulo supra"
 
 #: ../src/prefs_filtering.c:493
 msgid "Delete the selected rule from the list"
-msgstr "Forigi la elektitan regulon el la listo"
+msgstr "Forigu la elektitan regulon el la listo"
 
 #: ../src/prefs_filtering.c:532
 msgid "Move the selected rule to the top"
-msgstr "Movi la elektitan regulon al la supro"
+msgstr "Movu la elektitan regulon al la supro"
 
 #: ../src/prefs_filtering.c:535
 msgid "Page u_p"
@@ -16397,15 +15926,15 @@ msgstr "Paĝo supren"
 
 #: ../src/prefs_filtering.c:543
 msgid "Move the selected rule one page up"
-msgstr "Movi la elektitan regulon unu paĝo supren"
+msgstr "Movu la elektitan regulon unu paĝo supren"
 
 #: ../src/prefs_filtering.c:552
 msgid "Move the selected rule up"
-msgstr "Movi la elektitan regulon supren"
+msgstr "Movu la elektitan regulon supren"
 
 #: ../src/prefs_filtering.c:560
 msgid "Move the selected rule down"
-msgstr "Movi la elektitan regulon suben"
+msgstr "Movu la elektitan regulon suben"
 
 #: ../src/prefs_filtering.c:563
 msgid "Page dow_n"
@@ -16413,11 +15942,11 @@ msgstr "Paĝo suben"
 
 #: ../src/prefs_filtering.c:571
 msgid "Move the selected rule one page down"
-msgstr "Movi la elektitan regulon unu paĝo suben"
+msgstr "Movu la elektitan regulon unu paĝo suben"
 
 #: ../src/prefs_filtering.c:580
 msgid "Move the selected rule to the bottom"
-msgstr "Movi la elektitan regulon al la subo"
+msgstr "Movu la elektitan regulon al la subo"
 
 #: ../src/prefs_filtering.c:1038 ../src/prefs_filtering.c:1124
 msgid "Condition string is not valid."
@@ -16433,7 +15962,7 @@ msgstr "Aga ĉeno estas malplena."
 
 #: ../src/prefs_filtering.c:1205
 msgid "Delete rule"
-msgstr "Forigi regulon"
+msgstr "Forigu regulon"
 
 #: ../src/prefs_filtering.c:1206
 msgid "Do you really want to delete this rule?"
@@ -16441,7 +15970,7 @@ msgstr "Ĉu vi vere volas forigi ĉi tiun regulon?"
 
 #: ../src/prefs_filtering.c:1224
 msgid "Delete all rules"
-msgstr "Forigi ĉiujn regulojn"
+msgstr "Forigu ĉiujn regulojn"
 
 #: ../src/prefs_filtering.c:1225
 msgid "Do you really want to delete all the rules?"
@@ -16453,19 +15982,19 @@ msgstr "Filtrilaj reguloj ne konservitaj"
 
 #: ../src/prefs_filtering.c:1476
 msgid "The list of filtering rules have been modified. Close anyway?"
-msgstr "La listo de filtrilaj reguloj estis modifita. Ĉu fermi malgraŭe?"
+msgstr "La listo de filtrilaj reguloj estis modifita. Ĉu fermu malgraŭe?"
 
 #: ../src/prefs_filtering.c:1698
 msgid "Move one page up"
-msgstr "Movi unu paĝon supren"
+msgstr "Movu unu paĝon supren"
 
 #: ../src/prefs_filtering.c:1699
 msgid "Move one page down"
-msgstr "Movi unu paĝon suben"
+msgstr "Movu unu paĝon suben"
 
 #: ../src/prefs_filtering.c:1854
 msgid "Enable"
-msgstr "Ebligi"
+msgstr "Ebligu"
 
 #: ../src/prefs_folder_column.c:212
 msgid "Folder list columns configuration"
@@ -16476,7 +16005,7 @@ msgid ""
 "Select columns to be displayed in the folder list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
 msgstr ""
-"Elekti kolumnojn montrendajn en la dosieruja listo. Vi povas modifi\n"
+"Elektu kolumnojn montrendajn en la dosieruja listo. Vi povas modifi\n"
 "la ordon uzante la Supren /Suben butonojn aŭ per treni la erojn."
 
 #: ../src/prefs_folder_column.c:258 ../src/prefs_summary_column.c:272
@@ -16491,18 +16020,13 @@ msgstr "Montritaj kolumnoj"
 #: ../src/prefs_folder_column.c:329 ../src/prefs_msg_colors.c:494
 #: ../src/prefs_summary_column.c:343 ../src/prefs_toolbar.c:1064
 msgid " Use default "
-msgstr " Uzi defaŭlton "
+msgstr " Uzu defaŭlton "
 
 #: ../src/prefs_folder_item.c:268 ../src/prefs_folder_item.c:876
 #: ../src/prefs_folder_item.c:1401
-msgid ""
-"<i>These preferences will not be saved as this folder is a top-level folder. "
-"However, you can set them for the whole mailbox tree by using \"Apply to "
-"subfolders\".</i>"
+msgid "<i>These preferences will not be saved as this folder is a top-level folder. However, you can set them for the whole mailbox tree by using \"Apply to subfolders\".</i>"
 msgstr ""
-"<i>Ĉi tiuj preferoj ne estos konservitaj ĉar ĉi tiu dosierujo estas supra-"
-"nivela. Tamen, vi povas starigi ilin por la tuta poŝtkesta arbo uzante "
-"\"Apliki al \n"
+"<i>Ĉi tiuj preferoj ne estos konservitaj ĉar ĉi tiu dosierujo estas supra-nivela. Tamen, vi povas starigi ilin por la tuta poŝtkesta arbo uzante \"Apliku al \n"
 "subdosierujoj\".</i>"
 
 #. Apply to subfolders
@@ -16511,7 +16035,7 @@ msgid ""
 "Apply to\n"
 "subfolders"
 msgstr ""
-"Apliki al\n"
+"Apliku al\n"
 "subdosierujoj"
 
 #: ../src/prefs_folder_item.c:305
@@ -16529,7 +16053,7 @@ msgstr "Dosieruja tipo"
 #. Simplify Subject
 #: ../src/prefs_folder_item.c:336
 msgid "Simplify Subject RegExp"
-msgstr "Simpligi Tema RegEsprim"
+msgstr "Simpligu Tema RegEsprim"
 
 #. Test string
 #: ../src/prefs_folder_item.c:362
@@ -16553,49 +16077,41 @@ msgstr "Dosieruja koloro"
 
 #: ../src/prefs_folder_item.c:433 ../src/prefs_folder_item.c:1670
 msgid "Pick color for folder"
-msgstr "Elekti koloron por dosierujo"
+msgstr "Elektu koloron por dosierujo"
 
 #: ../src/prefs_folder_item.c:451
 msgid "Run Processing rules at start-up"
-msgstr "Plenumi procezajn regulojn je komenco"
+msgstr "Plenumu procezajn regulojn je komenco"
 
 #: ../src/prefs_folder_item.c:466
 msgid "Run Processing rules when opening"
-msgstr "Plenumi procezajn regulojn kiam malfermante"
+msgstr "Plenumu procezajn regulojn kiam malfermante"
 
 #. Check folder for new mail
 #: ../src/prefs_folder_item.c:480
 msgid "Scan for new mail"
-msgstr "Skani por nova poŝto"
+msgstr "Skanu por nova poŝto"
 
 #: ../src/prefs_folder_item.c:482
-msgid ""
-"Turn this option on if mail is delivered directly to this folder by server "
-"side filtering on IMAP or by an external application"
-msgstr ""
-"Ŝalti ĉi tiun opcion se poŝto estas liverita rekte al ĉi tiu dosierujo per "
-"servila filtrado ĉe IMAP aŭ per ekstera aplikaĵo"
+msgid "Turn this option on if mail is delivered directly to this folder by server side filtering on IMAP or by an external application"
+msgstr "Ŝaltu ĉi tiun opcion se poŝto estas liverita rekte al ĉi tiu dosierujo per servila filtrado ĉe IMAP aŭ per ekstera aplikaĵo"
 
 #: ../src/prefs_folder_item.c:502
 msgid "Select the HTML part of multipart messages"
-msgstr "Elekti la HTML parton de multpartaj mesaĝoj"
+msgstr "Elektu la HTML parton de multpartaj mesaĝoj"
 
 #: ../src/prefs_folder_item.c:519
-msgid ""
-"\"Default\" will follow global preference (found in /Preferences/Message "
-"View/Text Options)"
-msgstr ""
-"\"Defalto\" sekvos mallokan preferon (trovita en /Agordoj/Mesaĝa Vido/"
-"Tekstaj Opcioj)"
+msgid "\"Default\" will follow global preference (found in /Preferences/Message View/Text Options)"
+msgstr "\"Defalto\" sekvos mallokan preferon (trovita en /Agordoj/Mesaĝa Vido/Tekstaj Opcioj)"
 
 #. Synchronise folder for offline use
 #: ../src/prefs_folder_item.c:529
 msgid "Synchronise for offline use"
-msgstr "Sinkronigi por senreta uzado"
+msgstr "Sinkronigu por senreta uzado"
 
 #: ../src/prefs_folder_item.c:550
 msgid "Fetch message bodies from the last"
-msgstr "Alporti mesaĝajn korpojn ekde la lasta"
+msgstr "Alportu mesaĝajn korpojn ekde la lasta"
 
 #: ../src/prefs_folder_item.c:557
 msgid "0: all bodies"
@@ -16603,20 +16119,19 @@ msgstr "0: ĉiuj korpoj"
 
 #: ../src/prefs_folder_item.c:565
 msgid "Remove older messages bodies"
-msgstr "Forigi pli malnovajn mesaĝajn korpojn"
+msgstr "Forigu pli malnovajn mesaĝajn korpojn"
 
 #: ../src/prefs_folder_item.c:582
 msgid "Discard folder cache"
-msgstr "Ne konservi dosierujan kaŝon"
+msgstr "Ne konservu dosierujan kaŝon"
 
 #: ../src/prefs_folder_item.c:897
 msgid "Request Return Receipt"
-msgstr "Peti Revenan konfirmon"
+msgstr "Petu Revenan konfirmon"
 
 #: ../src/prefs_folder_item.c:912
 msgid "Save copy of outgoing messages to this folder instead of Sent"
-msgstr ""
-"Konservi kopion de elirantaj mesaĝoj al ĉi tiu dosierujo anstataŭ Senditaj"
+msgstr "Konservu kopion de elirantaj mesaĝoj al ĉi tiu dosierujo anstataŭ Senditaj"
 
 #. Default To
 #. Default address to reply to
@@ -16640,17 +16155,15 @@ msgstr "Defaŭlta konto"
 
 #: ../src/prefs_folder_item.c:1683
 msgid "Discard cache"
-msgstr "Ne konservi kaŝon"
+msgstr "Ne konservu kaŝon"
 
 #: ../src/prefs_folder_item.c:1684
 msgid "Do you really want to discard the local cached data for this folder?"
-msgstr ""
-"Ĉu vi vere volas ne konservi la lokajn kaŝitajn datumojn por ĉi tiu "
-"dosierujo?"
+msgstr "Ĉu vi vere volas ne konservi la lokajn kaŝitajn datumojn por ĉi tiu dosierujo?"
 
 #: ../src/prefs_folder_item.c:1686
 msgid "+Discard"
-msgstr "+Ne konservi"
+msgstr "+Ne konservu"
 
 #: ../src/prefs_folder_item.c:1815
 msgid "General"
@@ -16667,15 +16180,14 @@ msgid "Folder and Message Lists"
 msgstr "Dosierujaj kaj mesaĝaj listoj"
 
 #. message font label
-#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2030
+#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2046
 msgid "Message"
 msgstr "Mesaĝo"
 
 #. derive from normal font check button
 #: ../src/prefs_fonts.c:126
 msgid "Derive small and bold fonts from Folder and Message Lists font"
-msgstr ""
-"Derivi malgrandajn kaj grasajn tiparojn de Dosieruja kaj Mesaĝa lista tiparo"
+msgstr "Derivu malgrandajn kaj grasajn tiparojn de Dosieruja kaj Mesaĝa lista tiparo"
 
 #. small font label
 #: ../src/prefs_fonts.c:136
@@ -16690,7 +16202,7 @@ msgstr "Grasa"
 #. print check button
 #: ../src/prefs_fonts.c:180
 msgid "Use different font for printing"
-msgstr "Uzi malsaman tiparon por presi"
+msgstr "Uzu malsaman tiparon por presi"
 
 #. print font label
 #: ../src/prefs_fonts.c:190
@@ -16700,7 +16212,7 @@ msgstr "Mesaĝa presado"
 #: ../src/prefs_fonts.c:268 ../src/prefs_msg_colors.c:839
 #: ../src/prefs_summaries.c:678 ../src/prefs_themes.c:369
 msgid "Display"
-msgstr "Montri"
+msgstr "Montru"
 
 #: ../src/prefs_fonts.c:269
 msgid "Fonts"
@@ -16712,11 +16224,11 @@ msgstr "Preferoj"
 
 #: ../src/prefs_image_viewer.c:69
 msgid "Automatically display attached images"
-msgstr "Aŭtomate montri algluitajn bildojn"
+msgstr "Aŭtomate montru algluitajn bildojn"
 
 #: ../src/prefs_image_viewer.c:75
 msgid "Resize attached images by default"
-msgstr "Regrandigi algluitajn bildojn defaŭlte"
+msgstr "Regrandigu algluitajn bildojn defaŭlte"
 
 #: ../src/prefs_image_viewer.c:78
 msgid "Clicking image toggles scaling"
@@ -16724,11 +16236,11 @@ msgstr "Alklakante bildon baskulas skaladon"
 
 #: ../src/prefs_image_viewer.c:83
 msgid "Display images inline"
-msgstr "Montri bildojn entekste"
+msgstr "Montru bildojn entekste"
 
 #: ../src/prefs_image_viewer.c:89
 msgid "Print images"
-msgstr "Presi bildojn"
+msgstr "Presu bildojn"
 
 #: ../src/prefs_image_viewer.c:139
 msgid "Image Viewer"
@@ -16736,7 +16248,7 @@ msgstr "Bilda vidilo"
 
 #: ../src/prefs_logging.c:147 ../src/prefs_logging.c:254
 msgid "Restrict the log window to"
-msgstr "Limigi la protokolan fenestron al"
+msgstr "Limigu la protokolan fenestron al"
 
 #: ../src/prefs_logging.c:159 ../src/prefs_logging.c:266
 msgid "0 to stop logging in the log window"
@@ -16752,23 +16264,21 @@ msgstr "Filtras/traktas protokolon"
 
 #: ../src/prefs_logging.c:174
 msgid "Enable logging of filtering/processing rules"
-msgstr "Ebligi protokoladon de filtraj/traktaj reguloj"
+msgstr "Ebligu protokoladon de filtraj/traktaj reguloj"
 
 #: ../src/prefs_logging.c:180
 msgid ""
 "If checked, turns on logging of filtering and processing rules.\n"
 "The log is accessible from 'Tools/Filtering log'.\n"
-"Caution: enabling this option will slow down the filtering/processing, this "
-"might be critical when applying many rules upon thousands of messages."
+"Caution: enabling this option will slow down the filtering/processing, this might be critical when applying many rules upon thousands of messages."
 msgstr ""
 "Se markita, ŝaltas protokoladon de filtraj kaj traktaj reguloj.\n"
 "La protokolo atingebas de `Iloj/Filtra protokolo'.\n"
-"Averto: ebligante ĉi tiun opcion malrapidigos la filtradon/traktadon. Ĉi tio "
-"povus esti kriza kiam aplikante multajn regulojn sur miloj da mesaĝoj."
+"Averto: ebligante ĉi tiun opcion malrapidigos la filtradon/traktadon. Ĉi tio povus esti kriza kiam aplikante multajn regulojn sur miloj da mesaĝoj."
 
 #: ../src/prefs_logging.c:187
 msgid "Log filtering/processing when..."
-msgstr "Protokoli filtradon/traktadon kiam..."
+msgstr "Protokolu filtradon/traktadon kiam..."
 
 #: ../src/prefs_logging.c:191
 msgid "filtering at incorporation"
@@ -16809,21 +16319,16 @@ msgstr "Alta"
 #: ../src/prefs_logging.c:238
 msgid ""
 "Select the level of detail of the logging.\n"
-"Choose Low to see when rules are applied, which conditions match or don't "
-"match and what actions are performed.\n"
-"Choose Medium to see more details about the message that is being processed, "
-"and why rules are skipped.\n"
-"Choose High to explicitly show the reason why all rules are processed or "
-"skipped, and why all conditions are matched or not matched.\n"
+"Choose Low to see when rules are applied, which conditions match or don't match and what actions are performed.\n"
+"Choose Medium to see more details about the message that is being processed, and why rules are skipped.\n"
+"Choose High to explicitly show the reason why all rules are processed or skipped, and why all conditions are matched or not matched.\n"
 "Caution: the higher the level, the greater the impact on performance."
 msgstr ""
-"Elekti la nivelon de detaloj de la protokolado.\n"
-"Elekti Malalta por vidi kiam reguloj estas aplikataj, kiuj kondiĉoj kongruas "
-"aŭ ne, kaj kial reguloj estas transsaltitaj.\n"
-"Eleki Meza por vidi pli da detaloj pri la mesaĝo kiu estas traktata aŭ \n"
+"Elektu la nivelon de detaloj de la protokolado.\n"
+"Elektu Malalta por vidi kiam reguloj estas aplikataj, kiuj kondiĉoj kongruas aŭ ne, kaj kial reguloj estas transsaltitaj.\n"
+"Eleku Meza por vidi pli da detaloj pri la mesaĝo kiu estas traktata aŭ \n"
 "transsaltata.\n"
-"Elekti Alta por eksplicite montri la kaŭzon kial ĉiuj reguloj estas "
-"traktataj aŭ \n"
+"Elektu Alta por eksplicite montri la kaŭzon kial ĉiuj reguloj estas traktataj aŭ \n"
 "trranssaltataj, kaj kial la kondiĉoj kongruas aŭ ne.\n"
 "Averto: ju pli alta la nivelo, des pli granda la kunfrapo sur prezento."
 
@@ -16834,7 +16339,7 @@ msgstr "Diska protokolo"
 
 #: ../src/prefs_logging.c:282
 msgid "Write the following information to disk..."
-msgstr "Skribi la sekvantan informon disken..."
+msgstr "Skribu la sekvantan informon disken..."
 
 #: ../src/prefs_logging.c:290
 msgid "Warning messages"
@@ -16861,354 +16366,358 @@ msgstr "Alia"
 msgid "Logging"
 msgstr "Protokolas"
 
-#: ../src/prefs_matcher.c:328
+#: ../src/prefs_matcher.c:330
 msgid "more than"
 msgstr "pli ol"
 
-#: ../src/prefs_matcher.c:329
+#: ../src/prefs_matcher.c:331
 msgid "less than"
 msgstr "malpli ol"
 
-#: ../src/prefs_matcher.c:335
+#: ../src/prefs_matcher.c:337
 msgid "weeks"
 msgstr "semajnoj"
 
-#: ../src/prefs_matcher.c:339
+#: ../src/prefs_matcher.c:341
 msgid "higher than"
 msgstr "pli alta ol"
 
-#: ../src/prefs_matcher.c:340
+#: ../src/prefs_matcher.c:342
 msgid "lower than"
 msgstr "malpli alta ol"
 
-#: ../src/prefs_matcher.c:341 ../src/prefs_matcher.c:347
+#: ../src/prefs_matcher.c:343 ../src/prefs_matcher.c:349
 msgid "exactly"
 msgstr "ekzakte"
 
-#: ../src/prefs_matcher.c:345
+#: ../src/prefs_matcher.c:347
 msgid "greater than"
 msgstr "pli granda ol"
 
-#: ../src/prefs_matcher.c:346
+#: ../src/prefs_matcher.c:348
 msgid "smaller than"
 msgstr "malpli granda ol"
 
-#: ../src/prefs_matcher.c:351
+#: ../src/prefs_matcher.c:353
 msgid "bytes"
 msgstr "bitokoj"
 
-#: ../src/prefs_matcher.c:352
+#: ../src/prefs_matcher.c:354
 msgid "kilobytes"
 msgstr "kilobitokoj"
 
-#: ../src/prefs_matcher.c:353
+#: ../src/prefs_matcher.c:355
 msgid "megabytes"
 msgstr "megabitokoj"
 
-#: ../src/prefs_matcher.c:357
+#: ../src/prefs_matcher.c:359
 msgid "contains"
 msgstr "enhavas"
 
-#: ../src/prefs_matcher.c:358
+#: ../src/prefs_matcher.c:360
 msgid "doesn't contain"
 msgstr "ne enhavas"
 
-#: ../src/prefs_matcher.c:381
+#: ../src/prefs_matcher.c:383
 msgid "headers part"
 msgstr "ĉapa parto"
 
-#: ../src/prefs_matcher.c:382
+#: ../src/prefs_matcher.c:384
+msgid "headers values"
+msgstr "ĉapaj valoroj"
+
+#: ../src/prefs_matcher.c:385
 msgid "body part"
 msgstr "korpa parto"
 
-#: ../src/prefs_matcher.c:383
+#: ../src/prefs_matcher.c:386
 msgid "whole message"
 msgstr "tuta mesaĝo"
 
-#: ../src/prefs_matcher.c:389 ../src/summaryview.c:6300
+#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6300
 msgid "Marked"
 msgstr "Markita"
 
-#: ../src/prefs_matcher.c:390 ../src/summaryview.c:6298
+#: ../src/prefs_matcher.c:393 ../src/summaryview.c:6298
 msgid "Deleted"
 msgstr "Forigita"
 
-#: ../src/prefs_matcher.c:391
+#: ../src/prefs_matcher.c:394
 msgid "Replied"
 msgstr "Respondita"
 
-#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6292
+#: ../src/prefs_matcher.c:395 ../src/summaryview.c:6292
 msgid "Forwarded"
 msgstr "Plusendita"
 
-#: ../src/prefs_matcher.c:394 ../src/summaryview.c:6282 ../src/toolbar.c:416
+#: ../src/prefs_matcher.c:397 ../src/summaryview.c:6282 ../src/toolbar.c:416
 #: ../src/toolbar.c:934 ../src/toolbar.c:1978
 msgid "Spam"
 msgstr "Spamo"
 
-#: ../src/prefs_matcher.c:395
+#: ../src/prefs_matcher.c:398
 msgid "Has attachment"
 msgstr "Havas algluaĵon"
 
-#: ../src/prefs_matcher.c:396 ../src/summaryview.c:6318
+#: ../src/prefs_matcher.c:399 ../src/summaryview.c:6318
 msgid "Signed"
 msgstr "Subskribita"
 
-#: ../src/prefs_matcher.c:400
+#: ../src/prefs_matcher.c:403
 msgid "set"
 msgstr "fiksita"
 
-#: ../src/prefs_matcher.c:401
+#: ../src/prefs_matcher.c:404
 msgid "not set"
 msgstr "ne fiksita"
 
-#: ../src/prefs_matcher.c:405
+#: ../src/prefs_matcher.c:408
 msgid "yes"
 msgstr "jes"
 
-#: ../src/prefs_matcher.c:406
+#: ../src/prefs_matcher.c:409
 msgid "no"
 msgstr "ne"
 
-#: ../src/prefs_matcher.c:410
+#: ../src/prefs_matcher.c:413
 msgid "Any tags"
 msgstr "Iu ajn etikedojn"
 
-#: ../src/prefs_matcher.c:411
+#: ../src/prefs_matcher.c:414
 msgid "Specific tag"
 msgstr "Specifa etikedo"
 
-#: ../src/prefs_matcher.c:415
+#: ../src/prefs_matcher.c:418
 msgid "ignored"
 msgstr "ignorata"
 
-#: ../src/prefs_matcher.c:416
+#: ../src/prefs_matcher.c:419
 msgid "not ignored"
 msgstr "ne ignorata"
 
-#: ../src/prefs_matcher.c:417
+#: ../src/prefs_matcher.c:420
 msgid "watched"
 msgstr "observadata"
 
-#: ../src/prefs_matcher.c:418
+#: ../src/prefs_matcher.c:421
 msgid "not watched"
 msgstr "ne observadata"
 
-#: ../src/prefs_matcher.c:422
+#: ../src/prefs_matcher.c:425
 msgid "found"
 msgstr "trovita"
 
-#: ../src/prefs_matcher.c:423
+#: ../src/prefs_matcher.c:426
 msgid "not found"
 msgstr "ne trovita"
 
-#: ../src/prefs_matcher.c:427
+#: ../src/prefs_matcher.c:430
 msgid "0 (Passed)"
 msgstr "0 (Sukcesis)"
 
-#: ../src/prefs_matcher.c:428
+#: ../src/prefs_matcher.c:431
 msgid "non-0 (Failed)"
 msgstr "ne-0 (Malsukcesis)"
 
-#: ../src/prefs_matcher.c:566
+#: ../src/prefs_matcher.c:569
 msgid "Condition configuration"
 msgstr "Kondiĉa agordo"
 
 #. criteria combo box
-#: ../src/prefs_matcher.c:610
+#: ../src/prefs_matcher.c:613
 msgid "Match criteria:"
 msgstr "Kongruaj kriterioj:"
 
-#: ../src/prefs_matcher.c:619
+#: ../src/prefs_matcher.c:622
 msgid "All messages"
 msgstr "Ĉiuj mesaĝoj"
 
-#: ../src/prefs_matcher.c:621
+#: ../src/prefs_matcher.c:624
 msgid "Age"
 msgstr "Aĝo"
 
-#: ../src/prefs_matcher.c:622
+#: ../src/prefs_matcher.c:625
 msgid "Phrase"
 msgstr "Frazo"
 
-#: ../src/prefs_matcher.c:623
+#: ../src/prefs_matcher.c:626
 msgid "Flags"
 msgstr "Flagoj"
 
-#: ../src/prefs_matcher.c:624 ../src/prefs_msg_colors.c:410
+#: ../src/prefs_matcher.c:627 ../src/prefs_msg_colors.c:410
 msgid "Color labels"
 msgstr "Koloraj etikedoj"
 
-#: ../src/prefs_matcher.c:625
+#: ../src/prefs_matcher.c:628
 msgid "Thread"
 msgstr "Fadeno"
 
-#: ../src/prefs_matcher.c:628
+#: ../src/prefs_matcher.c:631
 msgid "Partially downloaded"
 msgstr "Parte elŝutita"
 
-#: ../src/prefs_matcher.c:631
+#: ../src/prefs_matcher.c:634
 msgid "External program test"
 msgstr "Ekstera programa provo"
 
 #. store UNtranslated "Any"/"All" in matcher expressions
-#: ../src/prefs_matcher.c:707 ../src/prefs_matcher.c:1604
-#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:2501
+#: ../src/prefs_matcher.c:710 ../src/prefs_matcher.c:1616
+#: ../src/prefs_matcher.c:1631 ../src/prefs_matcher.c:2521
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Ĉiuj"
 
-#: ../src/prefs_matcher.c:741
+#: ../src/prefs_matcher.c:744
 msgid "Use regexp"
-msgstr "Uzi regulan esprimon"
+msgstr "Uzu regulan esprimon"
 
-#: ../src/prefs_matcher.c:818
+#: ../src/prefs_matcher.c:821
 msgid "Message must match"
 msgstr "Mesaĝo devas kongrui"
 
-#: ../src/prefs_matcher.c:822
+#: ../src/prefs_matcher.c:825
 msgid "at least one"
 msgstr "almenaŭ unu"
 
-#: ../src/prefs_matcher.c:823
+#: ../src/prefs_matcher.c:826
 msgid "all"
 msgstr "ĉiuj"
 
-#: ../src/prefs_matcher.c:826
+#: ../src/prefs_matcher.c:829
 msgid "of above rules"
 msgstr "de supraj reguloj"
 
-#: ../src/prefs_matcher.c:1522 ../src/prefs_matcher.c:1588
+#: ../src/prefs_matcher.c:1534 ../src/prefs_matcher.c:1600
 msgid "Search pattern is not set."
 msgstr "Serĉa ŝablono ne estas fiksita."
 
-#: ../src/prefs_matcher.c:1531
+#: ../src/prefs_matcher.c:1543
 msgid "Test command is not set."
 msgstr "Prova komando ne esta fiksita."
 
-#: ../src/prefs_matcher.c:1605
+#: ../src/prefs_matcher.c:1617
 msgid "all addresses in all headers"
 msgstr "ĉiuj adresoj en ĉiuj ĉapoj"
 
-#: ../src/prefs_matcher.c:1608
+#: ../src/prefs_matcher.c:1620
 msgid "any address in any header"
 msgstr "iu ajn adreso en iu ajn ĉapo"
 
-#: ../src/prefs_matcher.c:1610
+#: ../src/prefs_matcher.c:1622
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "la adreso(j) en ĉapo `%s'"
 
-#: ../src/prefs_matcher.c:1611
+#: ../src/prefs_matcher.c:1623
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
 "\n"
-"If you want to match %s against the whole address book, you have to select "
-"'%s' from the book/folder drop-down list."
+"If you want to match %s against the whole address book, you have to select '%s' from the book/folder drop-down list."
 msgstr ""
 "Libra/dosieruja vojo ne estas fiksita.\n"
 "\n"
-"Se vi volas kongrui %s kontraŭ la tuta adreslibro, vi devas elekti `%s' de "
-"la libra/dosieruja fal-listo."
+"Se vi volas kongrui %s kontraŭ la tuta adreslibro, vi devas elekti `%s' de la libra/dosieruja fal-listo."
 
-#: ../src/prefs_matcher.c:1830
+#: ../src/prefs_matcher.c:1842
 msgid "Headers part"
 msgstr "Ĉapa parto"
 
-#: ../src/prefs_matcher.c:1834
+#: ../src/prefs_matcher.c:1846
+msgid "Headers values"
+msgstr "Ĉapaj valoroj"
+
+#: ../src/prefs_matcher.c:1850
 msgid "Body part"
 msgstr "Korpa parto"
 
-#: ../src/prefs_matcher.c:1838
+#: ../src/prefs_matcher.c:1854
 msgid "Whole message"
 msgstr "Tuta mesaĝo"
 
-#: ../src/prefs_matcher.c:1957 ../src/prefs_matcher.c:2001
+#: ../src/prefs_matcher.c:1973 ../src/prefs_matcher.c:2017
 msgid "in"
 msgstr "en"
 
-#: ../src/prefs_matcher.c:1959
+#: ../src/prefs_matcher.c:1975
 msgid "content is"
 msgstr "enhavo estas"
 
-#: ../src/prefs_matcher.c:1968
+#: ../src/prefs_matcher.c:1984
 msgid "Age is"
 msgstr "Ago estas"
 
-#: ../src/prefs_matcher.c:1973
+#: ../src/prefs_matcher.c:1989
 msgid "Flag"
 msgstr "Flago"
 
-#: ../src/prefs_matcher.c:1974 ../src/prefs_matcher.c:1991
+#: ../src/prefs_matcher.c:1990 ../src/prefs_matcher.c:2007
 msgid "is"
 msgstr "estas"
 
-#: ../src/prefs_matcher.c:1979
+#: ../src/prefs_matcher.c:1995
 msgid "Name:"
 msgstr "Nomo:"
 
-#: ../src/prefs_matcher.c:1990
+#: ../src/prefs_matcher.c:2006
 msgid "Label"
 msgstr "Etikedo"
 
-#: ../src/prefs_matcher.c:1996
+#: ../src/prefs_matcher.c:2012
 msgid "Value:"
 msgstr "Valoro:"
 
-#: ../src/prefs_matcher.c:2013
+#: ../src/prefs_matcher.c:2029
 msgid "Score is"
 msgstr "Poentaro estas"
 
-#: ../src/prefs_matcher.c:2014
+#: ../src/prefs_matcher.c:2030
 msgid "points"
 msgstr "poentoj"
 
-#: ../src/prefs_matcher.c:2024
+#: ../src/prefs_matcher.c:2040
 msgid "Size is"
 msgstr "Grando estas"
 
-#: ../src/prefs_matcher.c:2029
+#: ../src/prefs_matcher.c:2045
 msgid "Scope:"
 msgstr "Amplekso:"
 
-#: ../src/prefs_matcher.c:2031
+#: ../src/prefs_matcher.c:2047
 msgid "tags"
 msgstr "etikedoj"
 
-#: ../src/prefs_matcher.c:2036
+#: ../src/prefs_matcher.c:2052
 msgid "type is"
 msgstr "tipo estas"
 
-#: ../src/prefs_matcher.c:2040
+#: ../src/prefs_matcher.c:2056
 msgid "Program returns"
 msgstr "Programo liveras"
 
-#: ../src/prefs_matcher.c:2110
+#: ../src/prefs_matcher.c:2126
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgstr ""
 "La enigo ne estis konservita.\n"
-"Ĉu fermi malgraŭe?"
+"Ĉu fermu malgraŭe?"
 
-#: ../src/prefs_matcher.c:2174
+#: ../src/prefs_matcher.c:2190
 msgid "Match Type: 'Test'"
 msgstr "Kongrua tipo: `Test'"
 
-#: ../src/prefs_matcher.c:2175
+#: ../src/prefs_matcher.c:2191
 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"
+"'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"
 "\n"
 "The following symbols can be used:"
 msgstr ""
-"`Test' permesas vin provi mesaĝon aŭ mesaĝeron uzante eksteran programon aŭ "
-"skripton. La programo liveros aŭ 0 aŭ 1.\n"
+"`Test' permesas vin provi mesaĝon aŭ mesaĝeron uzante eksteran programon aŭ skripton. La programo liveros aŭ 0 aŭ 1.\n"
 "\n"
 "La sekvantaj simboloj povas esti uzataj:"
 
-#: ../src/prefs_matcher.c:2274
+#: ../src/prefs_matcher.c:2290
 msgid "Current condition rules"
 msgstr "Nunaj kondiĉaj reguloj"
 
@@ -17218,19 +16727,19 @@ msgstr "Ĉapoj"
 
 #: ../src/prefs_message.c:123
 msgid "Display header pane above message view"
-msgstr "Montri ĉapan panelon super mesaĝa vido"
+msgstr "Montru ĉapan panelon super mesaĝa vido"
 
 #: ../src/prefs_message.c:127
 msgid "Display (X-)Face in message view"
-msgstr "Montri (X-)Face en mesaĝa vido"
+msgstr "Montru (X-)Face en mesaĝa vido"
 
 #: ../src/prefs_message.c:130
 msgid "Display Face in message view"
-msgstr "Montri tiparon en mesaĝa vido"
+msgstr "Montru tiparon en mesaĝa vido"
 
 #: ../src/prefs_message.c:144
 msgid "Display headers in message view"
-msgstr "Montri ĉapojn en mesaĝa vido"
+msgstr "Montru ĉapojn en mesaĝa vido"
 
 #: ../src/prefs_message.c:156
 msgid "HTML messages"
@@ -17238,15 +16747,15 @@ msgstr "HTML mesaĝoj"
 
 #: ../src/prefs_message.c:159
 msgid "Render HTML messages as text"
-msgstr "Prezenti HTML mesaĝojn kiel teksto"
+msgstr "Prezentu HTML mesaĝojn kiel teksto"
 
 #: ../src/prefs_message.c:162
 msgid "Render HTML-only messages with plugin if possible"
-msgstr "Prezenti nur-HTML mesaĝojn kun kromprogramo se eble"
+msgstr "Prezentu nur-HTML mesaĝojn kun kromprogramo se eble"
 
 #: ../src/prefs_message.c:165
 msgid "Select the HTML part of multipart/alternative messages"
-msgstr "Elekti la HTML parton de multpartaj/alternativaj mesaĝoj"
+msgstr "Elektu la HTML parton de multpartaj/alternativaj mesaĝoj"
 
 #: ../src/prefs_message.c:175
 msgid "Line space"
@@ -17258,7 +16767,7 @@ msgstr "bildero(j)"
 
 #: ../src/prefs_message.c:195
 msgid "Scroll"
-msgstr "Rulumi"
+msgstr "Rulumu"
 
 #: ../src/prefs_message.c:197
 msgid "Half page"
@@ -17274,7 +16783,7 @@ msgstr "Paŝo"
 
 #: ../src/prefs_message.c:230
 msgid "Show attachment descriptions (rather than names)"
-msgstr "Montri algluaĵajn priskribojn (prefere ol nomojn)"
+msgstr "Montru algluaĵajn priskribojn (prefere ol nomojn)"
 
 #. quote chars
 #: ../src/prefs_message.c:233
@@ -17283,11 +16792,11 @@ msgstr "Cito"
 
 #: ../src/prefs_message.c:242
 msgid "Collapse quoted text on double click"
-msgstr "Malekspansigi cititan tekston je duobla alklako"
+msgstr "Malekspansigu cititan tekston je duobla alklako"
 
 #: ../src/prefs_message.c:249
 msgid "Treat these characters as quotation marks: "
-msgstr "Trakti ĉi tiujn signojn kiel citiloj: "
+msgstr "Traktu ĉi tiujn signojn kiel citiloj: "
 
 #: ../src/prefs_message.c:355
 msgid "Text Options"
@@ -17299,15 +16808,15 @@ msgstr "Mesaĝa vido"
 
 #: ../src/prefs_msg_colors.c:154
 msgid "Enable coloration of message text"
-msgstr "Ebligi kolorigon de mesaĝa teksto"
+msgstr "Ebligu kolorigon de mesaĝa teksto"
 
 #: ../src/prefs_msg_colors.c:162
 msgid "Quote"
-msgstr "Citi"
+msgstr "Citu"
 
 #: ../src/prefs_msg_colors.c:174
 msgid "Cycle quote colors"
-msgstr "Cikli citajn kolorojn"
+msgstr "Ciklu citajn kolorojn"
 
 #: ../src/prefs_msg_colors.c:178
 msgid "If there are more than 3 quote levels, the colors will be reused"
@@ -17325,7 +16834,7 @@ msgstr "Teksto"
 #: ../src/prefs_msg_colors.c:204
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text"
-msgstr "Elekti koloron por unua nivela teksto"
+msgstr "Elektu koloron por unua nivela teksto"
 
 #: ../src/prefs_msg_colors.c:210
 msgid "2nd Level"
@@ -17334,7 +16843,7 @@ msgstr "2a nivelo"
 #: ../src/prefs_msg_colors.c:230
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text"
-msgstr "Elekti koloron por 2a nivela teksto"
+msgstr "Elektu koloron por 2a nivela teksto"
 
 #: ../src/prefs_msg_colors.c:236
 msgid "3rd Level"
@@ -17343,31 +16852,31 @@ msgstr "3a nivelo"
 #: ../src/prefs_msg_colors.c:256
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text"
-msgstr "Elekti koloron por 3a nivela teksto"
+msgstr "Elektu koloron por 3a nivela teksto"
 
 #: ../src/prefs_msg_colors.c:263
 msgid "Enable coloration of text background"
-msgstr "Ebligi kolorigon de teksta fono"
+msgstr "Ebligu kolorigon de teksta fono"
 
 #: ../src/prefs_msg_colors.c:279
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text background"
-msgstr "Elekti koloron por unua nivela teksta fono"
+msgstr "Elektu koloron por unua nivela teksta fono"
 
 #: ../src/prefs_msg_colors.c:300
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text background"
-msgstr "Elekti koloron por 2a nivela teksta fono"
+msgstr "Elektu koloron por 2a nivela teksta fono"
 
 #: ../src/prefs_msg_colors.c:321
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text background"
-msgstr "Elekti koloron por 3a nivela teksta fono"
+msgstr "Elektu koloron por 3a nivela teksta fono"
 
 #: ../src/prefs_msg_colors.c:341
 msgctxt "Tooltip"
 msgid "Pick color for links"
-msgstr "Elekti koloron por ligiloj"
+msgstr "Elektu koloron por ligiloj"
 
 #: ../src/prefs_msg_colors.c:343
 msgid "URI link"
@@ -17376,19 +16885,17 @@ msgstr "URI ligilon"
 #: ../src/prefs_msg_colors.c:360
 msgctxt "Tooltip"
 msgid "Pick color for signatures"
-msgstr "Elekti koloron por subskriboj"
+msgstr "Elektu koloron por subskriboj"
 
 #: ../src/prefs_msg_colors.c:367 ../src/prefs_summaries.c:354
 msgid "Folder list"
 msgstr "Dosieruja listo"
 
 #: ../src/prefs_msg_colors.c:380
-msgid ""
-"Pick color for Target folder. Target folder is used when the option 'Execute "
-"immediately when moving or deleting messages' is turned off"
+msgid "Pick color for Target folder. Target folder is used when the option 'Execute immediately when moving or deleting messages' is turned off"
 msgstr ""
-"Elekti koloron por Cela dosierujo. Cela dosierujo estas uzata kiam\n"
-"la opcio `Plenumi tuj kiam movante aŭ forigante mesaĝojn' estas malŝaltita"
+"Elektu koloron por Cela dosierujo. Cela dosierujo estas uzata kiam\n"
+"la opcio `Plenumu tuj kiam movante aŭ forigante mesaĝojn' estas malŝaltita"
 
 #: ../src/prefs_msg_colors.c:384
 msgid "Target folder"
@@ -17396,7 +16903,7 @@ msgstr "Cela dosierujo"
 
 #: ../src/prefs_msg_colors.c:399
 msgid "Pick color for folders containing new messages"
-msgstr "Elekti koloron por dosierujoj enhavante novajn mesaĝojn"
+msgstr "Elektu koloron por dosierujoj enhavante novajn mesaĝojn"
 
 #: ../src/prefs_msg_colors.c:401
 msgid "Folder containing new messages"
@@ -17408,14 +16915,14 @@ msgstr "Doseriujo enhavanta novajn mesaĝojn"
 #, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
-msgstr "Elekti koloron por `color %d'"
+msgstr "Elektu koloron por `color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 #: ../src/prefs_msg_colors.c:432 ../src/prefs_msg_colors.c:463
 #, c-format
 msgid "Set label for 'color %d'"
-msgstr "Fiksi etikedon por 'color %d'"
+msgstr "Fiksu etikedon por 'color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
@@ -17423,57 +16930,57 @@ msgstr "Fiksi etikedon por 'color %d'"
 #, c-format
 msgctxt "Dialog title"
 msgid "Pick color for 'color %d'"
-msgstr "Elekti koloron por 'color %d'"
+msgstr "Elektu koloron por 'color %d'"
 
 #: ../src/prefs_msg_colors.c:600
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text"
-msgstr "Elekti koloron por unua nivela teksto"
+msgstr "Elektu koloron por unua nivela teksto"
 
 #: ../src/prefs_msg_colors.c:603
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text"
-msgstr "Elekti koloron por 2a nivela teksto"
+msgstr "Elektu koloron por 2a nivela teksto"
 
 #: ../src/prefs_msg_colors.c:606
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text"
-msgstr "Elekti koloron por 3a nivela teksto"
+msgstr "Elektu koloron por 3a nivela teksto"
 
 #: ../src/prefs_msg_colors.c:609
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text background"
-msgstr "Elekti koloron por unua nivela teksta fono"
+msgstr "Elektu koloron por unua nivela teksta fono"
 
 #: ../src/prefs_msg_colors.c:612
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text background"
-msgstr "Elekti koloron por 2a nivela teksta fono"
+msgstr "Elektu koloron por 2a nivela teksta fono"
 
 #: ../src/prefs_msg_colors.c:615
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text background"
-msgstr "Elekti koloron por 3a nivela teksta fono"
+msgstr "Elektu koloron por 3a nivela teksta fono"
 
 #: ../src/prefs_msg_colors.c:618
 msgctxt "Dialog title"
 msgid "Pick color for links"
-msgstr "Elekti koloron por ligiloj"
+msgstr "Elektu koloron por ligiloj"
 
 #: ../src/prefs_msg_colors.c:621
 msgctxt "Dialog title"
 msgid "Pick color for target folder"
-msgstr "Elekti koloron por cela dosierujo"
+msgstr "Elektu koloron por cela dosierujo"
 
 #: ../src/prefs_msg_colors.c:624
 msgctxt "Dialog title"
 msgid "Pick color for signatures"
-msgstr "Elekti koloron por subskriboj"
+msgstr "Elektu koloron por subskriboj"
 
 #: ../src/prefs_msg_colors.c:627
 msgctxt "Dialog title"
 msgid "Pick color for folder"
-msgstr "Elekti koloron por dosierujo"
+msgstr "Elektu koloron por dosierujo"
 
 #: ../src/prefs_msg_colors.c:840
 msgid "Colors"
@@ -17481,11 +16988,11 @@ msgstr "Koloroj"
 
 #: ../src/prefs_other.c:97
 msgid "Choose preset keyboard shortcuts"
-msgstr "Elekti antaŭagordajn fulmoklavojn:"
+msgstr "Elektu antaŭagordajn fulmoklavojn:"
 
 #: ../src/prefs_other.c:111
 msgid "Select preset:"
-msgstr "Elekti antaŭagordon:"
+msgstr "Elektu antaŭagordon:"
 
 #: ../src/prefs_other.c:126
 msgid ""
@@ -17497,7 +17004,7 @@ msgstr ""
 
 #: ../src/prefs_other.c:479
 msgid "Add address to destination when double-clicked"
-msgstr "Aldoni adreson al celo kiam duoble-alklakita"
+msgstr "Aldonu adreson al celo kiam duoble-alklakita"
 
 #. On Exit
 #: ../src/prefs_other.c:482
@@ -17506,15 +17013,15 @@ msgstr "Je eliro"
 
 #: ../src/prefs_other.c:485
 msgid "Confirm on exit"
-msgstr "Konfirmi je eliro"
+msgstr "Konfirmu je eliro"
 
 #: ../src/prefs_other.c:492
 msgid "Empty trash on exit"
-msgstr "Malplenigi rubujon je eliro"
+msgstr "Malplenigu rubujon je eliro"
 
 #: ../src/prefs_other.c:495
 msgid "Warn if there are queued messages"
-msgstr "Averti se estas envicigitaj mesaĝoj"
+msgstr "Avertu se estas envicigitaj mesaĝoj"
 
 #: ../src/prefs_other.c:497
 msgid "Keyboard shortcuts"
@@ -17522,21 +17029,20 @@ msgstr "Fulmoklavoj"
 
 #: ../src/prefs_other.c:500
 msgid "Enable customisable keyboard shortcuts"
-msgstr "Ebligi proprigeblajn fulmoklavojn"
+msgstr "Ebligu proprigeblajn fulmoklavojn"
 
 #: ../src/prefs_other.c:503
 msgid ""
-"If checked, you can change the keyboard shortcuts of most of the menu items "
-"by focusing on the menu item and pressing a key combination.\n"
+"If checked, you can change the keyboard shortcuts of most of the menu items by focusing on the menu item and pressing a key combination.\n"
 "Uncheck this option if you want to lock all existing keyboard shortcuts."
 msgstr ""
 "Se markita, vi povas ŝanĝi la fulmoklavojn de la plejparto de la menueroj\n"
 "per fokusante sur la menuero kaj premante klavkombinon.\n"
-"Malmarki ĉi tiun opcion se vi volas ŝlosi ĉiujn ekzistantajn fulmoklavojn."
+"Malmarku ĉi tiun opcion se vi volas ŝlosi ĉiujn ekzistantajn fulmoklavojn."
 
 #: ../src/prefs_other.c:510
 msgid " Choose preset keyboard shortcuts... "
-msgstr " Elekti antaŭagordajn fulmoklavojn..."
+msgstr " Elektu antaŭagordajn fulmoklavojn..."
 
 #: ../src/prefs_other.c:520
 msgid "Metadata handling"
@@ -17547,8 +17053,7 @@ msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
 msgstr ""
-"Pli sekura reĝimo demandas al la operaciumo skribi metadatumojn al la disko "
-"rekte;\n"
+"Pli sekura reĝimo demandas al la operaciumo skribu metadatumojn al la disko rekte;\n"
 "ĝi evitas perdon de datumoj post kraŝoj, sed povas daŭri dum iom da tempo."
 
 #: ../src/prefs_other.c:525
@@ -17565,16 +17070,16 @@ msgstr "Inga eneliga eltempiĝo"
 
 #: ../src/prefs_other.c:567
 msgid "Ask before emptying trash"
-msgstr "Demandi antaŭ ol malplenigi rubujon"
+msgstr "Demandu antaŭ ol malplenigi rubujon"
 
 #: ../src/prefs_other.c:569
 msgid "Ask about account specific filtering rules when filtering manually"
-msgstr "Demandi pri kontaj specifaj filtradaj reguloj kiam filtras permane"
+msgstr "Demandu pri kontaj specifaj filtradaj reguloj kiam filtras permane"
 
 #: ../src/prefs_other.c:574
 msgid "Use secure file deletion if possible"
 msgstr ""
-"Uzi sekuran dosieran forigon se eble\n"
+"Uzu sekuran dosieran forigon se eble\n"
 "(la `shred' programo ne haveblas)"
 
 #: ../src/prefs_other.c:578
@@ -17582,29 +17087,32 @@ msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
 msgstr ""
-"Uzi sekuran dosieran forigon se eble\n"
+"Uzu sekuran dosieran forigon se eble\n"
 "(la `shred' programo ne haveblas)"
 
 #: ../src/prefs_other.c:583
-msgid ""
-"Use the 'shred' program to overwrite files with random data before deleting "
-"them. This slows down deletion. Be sure to read shred's man page for caveats."
-msgstr ""
-"Uzi la `shred' (disŝiri) programon anstataŭigi dosierojn kun stokastaj "
-"datumoj antaŭ ol forigante ilin. Ĉi tio malrapidigas forigon. Estu certa "
-"legi la manlibron por la `shred' programo por esceptoj."
+msgid "Use the 'shred' program to overwrite files with random data before deleting them. This slows down deletion. Be sure to read shred's man page for caveats."
+msgstr "Uzu la `shred' (disŝiru) programon anstataŭigi dosierojn kun stokastaj datumoj antaŭ ol forigante ilin. Ĉi tio malrapidigas forigon. Estu certa legi la manlibron por la `shred' programo por esceptoj."
 
 #: ../src/prefs_other.c:587
 msgid "Synchronise offline folders as soon as possible"
-msgstr "Sinkronigi enretajn dosierujon kiel eble plej baldaŭ"
+msgstr "Sinkronigu enretajn dosierujon kiel eble plej baldaŭ"
 
 #: ../src/prefs_other.c:690
 msgid "Miscellaneous"
 msgstr "Diversaj"
 
 #: ../src/prefs_quote.c:77
-msgid "On %d\\n%f wrote:\\n\\n%q"
-msgstr "Je %d\\n%f skribis:\\n\\n%q"
+msgid ""
+"On %d\\n"
+"%f wrote:\\n"
+"\\n"
+"%q"
+msgstr ""
+"Je %d\\n"
+"%f skribis:\\n"
+"\\n"
+"%q"
 
 #. Use of external incorporation program
 #: ../src/prefs_receive.c:123
@@ -17613,7 +17121,7 @@ msgstr "Ekstera enkorpiga programo"
 
 #: ../src/prefs_receive.c:126
 msgid "Use external program for receiving mail"
-msgstr "Uzi eksteran programon por ricevi poŝton"
+msgstr "Uzu eksteran programon por ricevi poŝton"
 
 #. Auto-checking
 #: ../src/prefs_receive.c:142
@@ -17622,11 +17130,11 @@ msgstr "Aŭtomata kontrolado"
 
 #: ../src/prefs_receive.c:149
 msgid "Check for new mail every"
-msgstr "Kontroli por nova poŝto ĉiu"
+msgstr "Kontrolu por nova poŝto ĉiu"
 
 #: ../src/prefs_receive.c:167
 msgid "Check for new mail on start-up"
-msgstr "Kontroli por nova poŝto je komenco"
+msgstr "Kontrolu por nova poŝto je komenco"
 
 #. receive dialog
 #: ../src/prefs_receive.c:170
@@ -17635,7 +17143,7 @@ msgstr "Dialogoj"
 
 #: ../src/prefs_receive.c:172
 msgid "Show receive dialog"
-msgstr "Montri ricevan dialogon"
+msgstr "Montru ricevan dialogon"
 
 #: ../src/prefs_receive.c:182
 msgid "Only on manual receiving"
@@ -17643,7 +17151,7 @@ msgstr "Nur je permana ricevado"
 
 #: ../src/prefs_receive.c:193
 msgid "Close receive dialog when finished"
-msgstr "Fermi ricevadan dialogon kiam finita"
+msgstr "Fermu ricevadan dialogon kiam finita"
 
 #: ../src/prefs_receive.c:196
 msgid "Don't popup error dialog on receive error"
@@ -17659,11 +17167,11 @@ msgstr "Iru al Enirkesto"
 
 #: ../src/prefs_receive.c:203
 msgid "Update all local folders"
-msgstr "Ĝisdatigi ĉiujn lokajn dosierujojn"
+msgstr "Ĝisdatigu ĉiujn lokajn dosierujojn"
 
 #: ../src/prefs_receive.c:205
 msgid "Run command"
-msgstr "Plenumi komandon"
+msgstr "Plenumu komandon"
 
 #: ../src/prefs_receive.c:210
 msgid "after automatic check"
@@ -17680,7 +17188,7 @@ msgid ""
 "(use %d as number of new mails)"
 msgstr ""
 "Komando plenumenda:\n"
-"(uzi %d kiel nombro da novaj poŝtoj)"
+"(uzu %d kiel nombro da novaj poŝtoj)"
 
 #: ../src/prefs_receive.c:343 ../src/prefs_send.c:357
 msgid "Mail Handling"
@@ -17692,35 +17200,31 @@ msgstr "Ricevas"
 
 #: ../src/prefs_send.c:161
 msgid "Save sent messages to Sent folder"
-msgstr "Konservi senditajn mesaĝojn al Sendita dosierujo"
+msgstr "Konservu senditajn mesaĝojn al Sendita dosierujo"
 
 #: ../src/prefs_send.c:164
 msgid "Confirm before sending queued messages"
-msgstr "Konfirmi antaŭ ol sendi envicigitajn mesaĝojn"
+msgstr "Konfirmu antaŭ ol sendi envicigitajn mesaĝojn"
 
 #: ../src/prefs_send.c:167
 msgid "Never send Return Receipts"
-msgstr "Neniam sendi Revenajn Kvitancojn"
+msgstr "Neniam sendu Revenajn Kvitancojn"
 
 #: ../src/prefs_send.c:170
 msgid "Show send dialog"
-msgstr "Montri sendan dialogon"
+msgstr "Montru sendan dialogon"
 
 #: ../src/prefs_send.c:172
 msgid "Warn when Subject is empty"
-msgstr "Averti kiam temo estas malplena"
+msgstr "Avertu kiam temo estas malplena"
 
 #: ../src/prefs_send.c:180
 msgid "Outgoing encoding"
 msgstr "Elira kodoprezento"
 
 #: ../src/prefs_send.c:205
-msgid ""
-"If 'Automatic' is selected, the optimal encoding for the current locale will "
-"be used"
-msgstr ""
-"Se `Aŭtomata' estas elektita, la optimuma kodoprezento por la nuna lokaĵaro "
-"estos uzata"
+msgid "If 'Automatic' is selected, the optimal encoding for the current locale will be used"
+msgstr "Se `Aŭtomata' estas elektita, la optimuma kodoprezento por la nuna lokaĵaro estos uzata"
 
 #: ../src/prefs_send.c:220
 msgid "Automatic (Recommended)"
@@ -17847,12 +17351,8 @@ msgid "Transfer encoding"
 msgstr "Transmeta kodoprezento"
 
 #: ../src/prefs_send.c:281
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters"
-msgstr ""
-"Specifi Enhava-Transmeta-Kodoprezenton uzata kiam mesaĝa korpo enhavas ne-"
-"ASKIAJ signojn"
+msgid "Specify Content-Transfer-Encoding used when message body contains non-ASCII characters"
+msgstr "Specifu Enhava-Transmeta-Kodoprezenton uzata kiam mesaĝa korpo enhavas ne-ASKIAJ signojn"
 
 #: ../src/prefs_send.c:358 ../src/send_message.c:499 ../src/send_message.c:503
 #: ../src/send_message.c:508
@@ -17861,15 +17361,15 @@ msgstr "Sendas"
 
 #: ../src/prefs_spelling.c:81
 msgid "Pick color for misspelled word"
-msgstr "Elekti koloron por misliterumita vorto"
+msgstr "Elektu koloron por misliterumita vorto"
 
 #: ../src/prefs_spelling.c:129
 msgid "Enable spell checker"
-msgstr "Ebligi literumilon"
+msgstr "Ebligu literumilon"
 
 #: ../src/prefs_spelling.c:134
 msgid "Enable alternate dictionary"
-msgstr "Ebligi alternativan leksikon"
+msgstr "Ebligu alternativan leksikon"
 
 #: ../src/prefs_spelling.c:139
 msgid "Faster switching with last used dictionary"
@@ -17881,7 +17381,7 @@ msgstr "Aŭtomata literumada kontrolo"
 
 #: ../src/prefs_spelling.c:149
 msgid "Re-check message when changing dictionary"
-msgstr "Re-kontroli mesaĝon kiam ŝanĝante leksikonon"
+msgstr "Re-kontrolu mesaĝon kiam ŝanĝante leksikonon"
 
 #: ../src/prefs_spelling.c:153
 msgid "Dictionary"
@@ -17889,11 +17389,11 @@ msgstr "Leksikono"
 
 #: ../src/prefs_spelling.c:190
 msgid "Check with both dictionaries"
-msgstr "Kontroli kun ambaŭ leksikonoj"
+msgstr "Kontrolu kun ambaŭ leksikonoj"
 
 #: ../src/prefs_spelling.c:197
 msgid "Get more dictionaries..."
-msgstr "Havigi pluajn leksikonojn..."
+msgstr "Havigu pluajn leksikonojn..."
 
 #: ../src/prefs_spelling.c:207
 msgid "Misspelled word color"
@@ -17901,7 +17401,7 @@ msgstr "Koloro de misliterumita vorto"
 
 #: ../src/prefs_spelling.c:220
 msgid "Pick color for misspelled word. Use black to underline"
-msgstr "Elekti koloron por misliterumita vorto. Uzi nigron por substreki"
+msgstr "Elektu koloron por misliterumita vorto. Uzu nigron por substreki"
 
 #: ../src/prefs_spelling.c:337
 msgid "Spell Checking"
@@ -17998,7 +17498,7 @@ msgstr "Specimeno"
 
 #: ../src/prefs_summaries.c:360
 msgid "Display message number next to folder name"
-msgstr "Montri mesaĝan numeron apud la dosieruja nomo"
+msgstr "Montru mesaĝan numeron apud la dosieruja nomo"
 
 #: ../src/prefs_summaries.c:370
 msgid "Unread messages"
@@ -18010,11 +17510,11 @@ msgstr "Nelegitaj mesaĝoj kaj sumo"
 
 #: ../src/prefs_summaries.c:381
 msgid "Open last opened folder at start-up"
-msgstr "Malfermi laste malfermitan dosierujon je komenco"
+msgstr "Malfermu laste malfermitan dosierujon je komenco"
 
 #: ../src/prefs_summaries.c:384
 msgid "Abbreviate newsgroup names longer than"
-msgstr "Mallongigi novaĵgrupajn nomojn pli longa ol"
+msgstr "Mallongigu novaĵgrupajn nomojn pli longa ol"
 
 #: ../src/prefs_summaries.c:398
 msgid "letters"
@@ -18026,23 +17526,23 @@ msgstr "Mesaĝa listo"
 
 #: ../src/prefs_summaries.c:422
 msgid "Set default selection when entering a folder"
-msgstr "Fiksi defaŭltan elekton kiam enirante dosierujon"
+msgstr "Fiksu defaŭltan elekton kiam enirante dosierujon"
 
 #: ../src/prefs_summaries.c:435
 msgid "Show \"no unread (or new) message\" dialog"
-msgstr "Montri \"neniu nelegita (aŭ nova) mesaĝo\" dialogon"
+msgstr "Montru \"neniu nelegita (aŭ nova) mesaĝo\" dialogon"
 
 #: ../src/prefs_summaries.c:445
 msgid "Assume 'Yes'"
-msgstr "Supozi `Jes'"
+msgstr "Supozu `Jes'"
 
 #: ../src/prefs_summaries.c:446
 msgid "Assume 'No'"
-msgstr "Supozi `Ne'"
+msgstr "Supozu `Ne'"
 
 #: ../src/prefs_summaries.c:454
 msgid "Open message when selected"
-msgstr "Malfermi mesaĝon kiam elektita"
+msgstr "Malfermu mesaĝon kiam elektita"
 
 #: ../src/prefs_summaries.c:464
 msgid "When message view is visible"
@@ -18054,18 +17554,15 @@ msgstr "Fadeno uzante temon krom normajn ĉapojn"
 
 #: ../src/prefs_summaries.c:474
 msgid "Execute immediately when moving or deleting messages"
-msgstr "Plenumi tuj kiam movante aŭ forigante mesaĝojn"
+msgstr "Plenumu tuj kiam movante aŭ forigante mesaĝojn"
 
 #: ../src/prefs_summaries.c:476
-msgid ""
-"Defers moving, copying and deleting of messages until you choose 'Tools/"
-"Execute'"
-msgstr ""
-"Prokrastas movon, kopion aŭ forigon de mesaĝoj ĝis vi elektas `Iloj/Plenumi'"
+msgid "Defers moving, copying and deleting of messages until you choose 'Tools/Execute'"
+msgstr "Prokrastas movon, kopion aŭ forigon de mesaĝoj ĝis vi elektas `Iloj/Plenumu'"
 
 #: ../src/prefs_summaries.c:479
 msgid "Mark message as read"
-msgstr "Marki mesaĝon kiel legite"
+msgstr "Marku mesaĝon kiel legite"
 
 #: ../src/prefs_summaries.c:482
 msgid "when selected, after"
@@ -18077,11 +17574,11 @@ msgstr "nur kiam malfermita en nova fenestro, aŭ respondita al"
 
 #: ../src/prefs_summaries.c:509
 msgid "Display sender using address book"
-msgstr "Montri sendinton uzante adreslibron"
+msgstr "Montru sendinton uzante adreslibron"
 
 #: ../src/prefs_summaries.c:513
 msgid "Show tooltips"
-msgstr "Montri ŝpruckonsiletojn"
+msgstr "Montru ŝpruckonsiletojn"
 
 #: ../src/prefs_summaries.c:539
 msgid "Date format help"
@@ -18089,19 +17586,15 @@ msgstr "Data aranĝa helpo"
 
 #: ../src/prefs_summaries.c:557
 msgid "Confirm before marking all messages in a folder as read"
-msgstr "Konfirmi antaŭ ol marki ĉiujn mesaĝojn en dosierujo kiel legite"
+msgstr "Konfirmu antaŭ ol marki ĉiujn mesaĝojn en dosierujo kiel legite"
 
 #: ../src/prefs_summaries.c:560
 msgid "Translate header names"
-msgstr "Traduki ĉapajn nomojn"
+msgstr "Traduku ĉapajn nomojn"
 
 #: ../src/prefs_summaries.c:562
-msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be "
-"translated into your language."
-msgstr ""
-"La montro de normaj ĉapoj (kiel `De:', `Temo:') estos tradukitaj en vian "
-"lingvon"
+msgid "The display of standard headers (such as 'From:', 'Subject:') will be translated into your language."
+msgstr "La montro de normaj ĉapoj (kiel `De:', `Temo:') estos tradukitaj en vian lingvon"
 
 #: ../src/prefs_summaries.c:679
 msgid "Summaries"
@@ -18121,7 +17614,7 @@ msgid ""
 "Select columns to be displayed in the message list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
 msgstr ""
-"Elekti kolumnojn montrendajn en la mesaĝa listo. Vi povas modifi\n"
+"Elektu kolumnojn montrendajn en la mesaĝa listo. Vi povas modifi\n"
 "la ordon uzante la Supren / Malsupren butonojn aŭ per treno de la eroj."
 
 #: ../src/prefs_summary_open.c:109
@@ -18160,105 +17653,107 @@ msgstr "Eblaj elektoj"
 msgid "Selection on folder opening"
 msgstr "Elekto je dosieruja malfermo"
 
-#: ../src/prefs_template.c:79
+#: ../src/prefs_template.c:80
 msgid "This name is used as the Menu item"
 msgstr "Ĉi tiu nomo estas uzata kiel la menuero"
 
-#: ../src/prefs_template.c:81
-msgid ""
-"Override composing account's From header. This doesn't change the composing "
-"account."
-msgstr "Superregi De ĉapo de verka konto. Ĉi tio ne ŝanĝas la verkan konton."
+#: ../src/prefs_template.c:82
+msgid "Override composing account's From header. This doesn't change the composing account."
+msgstr "Superregu De ĉapo de verka konto. Ĉi tio ne ŝanĝas la verkan konton."
 
-#: ../src/prefs_template.c:307
+#: ../src/prefs_template.c:309
 msgid "Append the new template above to the list"
-msgstr "Aldoni la novan ŝablonon supran al la listo"
+msgstr "Aldonu la novan ŝablonon supran al la listo"
 
-#: ../src/prefs_template.c:316
+#: ../src/prefs_template.c:318
 msgid "Replace the selected template in list with the template above"
-msgstr "Anstataŭigi la elektitan ŝablonon en listo kun la supra ŝablono"
+msgstr "Anstataŭigu la elektitan ŝablonon en listo kun la supra ŝablono"
 
-#: ../src/prefs_template.c:326
+#: ../src/prefs_template.c:328
 msgid "Delete the selected template from the list"
-msgstr "Forigi la elektitan ŝablonon de la listo"
+msgstr "Forigu la elektitan ŝablonon de la listo"
 
-#: ../src/prefs_template.c:344
+#: ../src/prefs_template.c:346
 msgid "Show information on configuring templates"
-msgstr "Montri informon pri agordo de ŝablonoj"
+msgstr "Montru informon pri agordo de ŝablonoj"
 
-#: ../src/prefs_template.c:368
+#: ../src/prefs_template.c:370
 msgid "Move the selected template to the top"
-msgstr "Movi la elektitan ŝablonon al la supro"
+msgstr "Movu la elektitan ŝablonon al la supro"
 
-#: ../src/prefs_template.c:378
+#: ../src/prefs_template.c:380
 msgid "Move the selected template up"
 msgstr "Move la elektitan ŝablonon supren"
 
-#: ../src/prefs_template.c:386
+#: ../src/prefs_template.c:388
 msgid "Move the selected template down"
-msgstr "Movi la elektitan ŝablonon malsupren"
+msgstr "Movu la elektitan ŝablonon malsupren"
 
-#: ../src/prefs_template.c:396
+#: ../src/prefs_template.c:398
 msgid "Move the selected template to the bottom"
-msgstr "Movi la elektitan ŝablonon al la malsupro"
+msgstr "Movu la elektitan ŝablonon al la malsupro"
 
-#: ../src/prefs_template.c:412
+#: ../src/prefs_template.c:414
 msgid "Template configuration"
 msgstr "Ŝablona agordo"
 
-#: ../src/prefs_template.c:599
+#: ../src/prefs_template.c:602
 msgid "Templates list not saved"
 msgstr "Ŝablona listo ne konservita"
 
-#: ../src/prefs_template.c:600
+#: ../src/prefs_template.c:603
 msgid "The templates list has been modified. Close anyway?"
-msgstr "La ŝablona listo estis modifiita. Ĉu fermi malgraŭe?"
+msgstr "La ŝablona listo estis modifiita. Ĉu fermu malgraŭe?"
 
-#: ../src/prefs_template.c:761
+#: ../src/prefs_template.c:768
 msgid "The template's name is not set."
 msgstr "La nomo de la ŝablono ne estas fiksita."
 
-#: ../src/prefs_template.c:798
+#: ../src/prefs_template.c:811
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "La \"De\" kampo de la ŝablono enhavas nevalidan retpoŝtan adreson"
 
-#: ../src/prefs_template.c:804
+#: ../src/prefs_template.c:817
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "La \"To\" kampo de la ŝablono enhavas nevalidan retpoŝtan adreson."
 
-#: ../src/prefs_template.c:810
+#: ../src/prefs_template.c:823
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "La \"Kk\" kampo de la ŝablono enhavas nevalidan retpoŝtan adreson."
 
-#: ../src/prefs_template.c:816
+#: ../src/prefs_template.c:829
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "La \"Bkk\" kampo de la ŝablono enhavas nevalidan retpoŝtan adreson."
 
-#: ../src/prefs_template.c:822
+#: ../src/prefs_template.c:835
+msgid "The \"Reply-To\" field of the template contains an invalid email address."
+msgstr "La \"Respondu-Al\" kampo de la ŝablono enhavas nevalidan retpoŝtan adreson."
+
+#: ../src/prefs_template.c:841
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "La \"Temo\" kampo de la ŝablono ne estas valida."
 
-#: ../src/prefs_template.c:892
+#: ../src/prefs_template.c:912
 msgid "Delete template"
-msgstr "Forigi ŝablonon"
+msgstr "Forigu ŝablonon"
 
-#: ../src/prefs_template.c:893
+#: ../src/prefs_template.c:913
 msgid "Do you really want to delete this template?"
 msgstr "Ĉu vi vere volas forigi ĉi tiun ŝablonon?"
 
-#: ../src/prefs_template.c:905
+#: ../src/prefs_template.c:925
 msgid "Delete all templates"
-msgstr "Forigi ĉiujn ŝablonojn"
+msgstr "Forigu ĉiujn ŝablonojn"
 
-#: ../src/prefs_template.c:906
+#: ../src/prefs_template.c:926
 msgid "Do you really want to delete all the templates?"
 msgstr "Ĉu vi vere volas forigi ĉiujn ŝablonojn?"
 
-#: ../src/prefs_template.c:1221
+#: ../src/prefs_template.c:1241
 msgid "Current templates"
 msgstr "Nunaj ŝablonoj"
 
-#: ../src/prefs_template.c:1249
+#: ../src/prefs_template.c:1269
 msgid "Template"
 msgstr "Ŝablono"
 
@@ -18277,12 +17772,12 @@ msgstr "Nur la ĉefuzanto povas forigi sistemajn temojn"
 #: ../src/prefs_themes.c:461
 #, c-format
 msgid "Remove system theme '%s'"
-msgstr "Forigi sisteman temon `%s'"
+msgstr "Forigu sisteman temon `%s'"
 
 #: ../src/prefs_themes.c:464
 #, c-format
 msgid "Remove theme '%s'"
-msgstr "Forigi temon `%s'"
+msgstr "Forigu temon `%s'"
 
 #: ../src/prefs_themes.c:470
 msgid "Are you sure you want to remove this theme?"
@@ -18307,12 +17802,12 @@ msgstr "Temo forigita sukcese"
 
 #: ../src/prefs_themes.c:507
 msgid "Select theme folder"
-msgstr "Elekti teman dosierujon"
+msgstr "Elektu teman dosierujon"
 
 #: ../src/prefs_themes.c:522
 #, c-format
 msgid "Install theme '%s'"
-msgstr "Instali temon `%s'"
+msgstr "Instalu temon `%s'"
 
 #: ../src/prefs_themes.c:525
 msgid ""
@@ -18320,7 +17815,7 @@ msgid ""
 "Install anyway?"
 msgstr ""
 "Ĉi tiu dosierujo ŝajnas ne esti tema dosierujo.\n"
-"Ĉu instali malgraŭe?"
+"Ĉu instalu malgraŭe?"
 
 #: ../src/prefs_themes.c:532
 msgid "Do you want to install theme for all users?"
@@ -18398,11 +17893,11 @@ msgstr "Elektilo"
 
 #: ../src/prefs_themes.c:840
 msgid "Install new..."
-msgstr "Instali nova(j)n..."
+msgstr "Instalu nova(j)n..."
 
 #: ../src/prefs_themes.c:845
 msgid "Get more..."
-msgstr "Havigi pliajn..."
+msgstr "Havigu pliajn..."
 
 #: ../src/prefs_themes.c:856
 msgid "Information"
@@ -18418,7 +17913,7 @@ msgstr "Antaŭvido"
 
 #: ../src/prefs_themes.c:970
 msgid "Use this"
-msgstr "Uzi ĉi tion"
+msgstr "Uzu ĉi tion"
 
 #: ../src/prefs_toolbar.c:176
 msgid ""
@@ -18473,7 +17968,7 @@ msgstr "Piktogramo"
 
 #: ../src/prefs_toolbar.c:1042
 msgid "A_dd"
-msgstr "Al_doni"
+msgstr "Al_donu"
 
 #: ../src/prefs_toolbar.c:1261 ../src/prefs_toolbar.c:1275
 #: ../src/prefs_toolbar.c:1289
@@ -18510,23 +18005,23 @@ msgstr "Aŭtŭomata teksta ĉirkaŭfluo"
 
 #: ../src/prefs_wrapping.c:81
 msgid "Wrap quotation"
-msgstr "Ĉirkaŭflui citon"
+msgstr "Ĉirkaŭfluigu citon"
 
 #: ../src/prefs_wrapping.c:82
 msgid "Wrap pasted text"
-msgstr "Ĉirkaŭflui algluitan tekston"
+msgstr "Ĉirkaŭfluigu algluitan tekston"
 
 #: ../src/prefs_wrapping.c:83
 msgid "Auto indent"
-msgstr "Aŭtomate alinei"
+msgstr "Aŭtomate alineu"
 
 #: ../src/prefs_wrapping.c:89
 msgid "Wrap text at"
-msgstr "Ĉirkaŭflui tekston ĉe"
+msgstr "Ĉirkaŭfluigu tekston ĉe"
 
 #: ../src/prefs_wrapping.c:154
 msgid "Wrapping"
-msgstr "Ĉirkaŭfluas"
+msgstr "Ĉirkaŭfluigas"
 
 #: ../src/printing.c:436
 msgid "Print preview"
@@ -18542,19 +18037,19 @@ msgstr "Lasta paĝo"
 
 #: ../src/printing.c:496
 msgid "Zoom 100%"
-msgstr "Zomi 100%"
+msgstr "Zomu 100%"
 
 #: ../src/printing.c:498
 msgid "Zoom fit"
-msgstr "Zomi taŭge"
+msgstr "Zomu taŭge"
 
 #: ../src/printing.c:500
 msgid "Zoom in"
-msgstr "Enzomi"
+msgstr "Enzomu"
 
 #: ../src/printing.c:502
 msgid "Zoom out"
-msgstr "Elzomi"
+msgstr "Elzomu"
 
 #: ../src/printing.c:701
 #, c-format
@@ -18569,7 +18064,7 @@ msgstr "Neniu informo haveblas"
 msgid "No recipient keys defined."
 msgstr "Neniu ricevintaj ŝlosiloj difinitaj."
 
-#: ../src/procmime.c:430 ../src/procmime.c:432 ../src/procmime.c:433
+#: ../src/procmime.c:433 ../src/procmime.c:435 ../src/procmime.c:436
 msgid "[Error decoding BASE64]\n"
 msgstr "[Eraro malkodante BASE64]\n"
 
@@ -18601,19 +18096,12 @@ msgstr "Eraro okazis dum SMTP sesio."
 
 #: ../src/procmsg.c:1731
 #, c-format
-msgid ""
-"No specific account has been found to send, and an error happened during "
-"SMTP session."
-msgstr ""
-"Neniu specifa konto estas trovita por sendi, kaj eraro okazis dum SMTP sesio."
+msgid "No specific account has been found to send, and an error happened during SMTP session."
+msgstr "Neniu specifa konto estas trovita por sendi, kaj eraro okazis dum SMTP sesio."
 
 #: ../src/procmsg.c:1739
-msgid ""
-"Couldn't determine sending information. Maybe the email hasn't been "
-"generated by Claws Mail."
-msgstr ""
-"Ne povis determini sendan informon. Eble la retpoŝto ne estis generita de "
-"Claws Mail."
+msgid "Couldn't determine sending information. Maybe the email hasn't been generated by Claws Mail."
+msgstr "Ne povis determini sendan informon. Eble la retpoŝto ne estis generita de Claws Mail."
 
 #: ../src/procmsg.c:1761
 msgid "Couldn't create temporary file for news sending."
@@ -18622,7 +18110,7 @@ msgstr "Ne povis krei provizoran dosieron por novaĵsendo."
 #: ../src/procmsg.c:1774
 #, c-format
 msgid "Error when writing temporary file for news sending."
-msgstr "Eraro dum skribi provizoran dosieron por novaĵsendo."
+msgstr "Eraro kiam skribante provizoran dosieron por novaĵsendo."
 
 #: ../src/procmsg.c:1788
 #, c-format
@@ -18789,45 +18277,38 @@ msgid ""
 "the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "symbols (or their long equivalent)"
 msgstr ""
-"enmeti <span style=\"oblique\">espr</span> se x estas fiksita, kie x estas "
-"unu el\n"
+"enmetu <span style=\"oblique\">espr</span> se x estas fiksita, kie x estas unu el\n"
 "la [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "simboloj (aŭ iliaj longaj ekvivalentoj)"
 
 #: ../src/quote_fmt.c:91
 msgid ""
-"insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
-"of\n"
+"insert <span style=\"oblique\">expr</span> if x is not set, where x is one of\n"
 "the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "symbols (or their long equivalent)"
 msgstr ""
-"enmeti <span style=\"oblique\">espr</span> se x ne estas fiksita, kie x "
-"estas unu el\n"
+"enmetu <span style=\"oblique\">espr</span> se x ne estas fiksita, kie x estas unu el\n"
 "la [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "simboloj (aŭ iliaj ekvivalentoj)"
 
 #: ../src/quote_fmt.c:92
 msgid ""
 "insert file:\n"
-"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
-"to insert"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file to insert"
 msgstr ""
-"enmeti dosieron:\n"
-"<span style=\"oblique\">sub_espr</span> estas taksita kiel komandlinio por "
-"havigi\n"
+"enmetu dosieron:\n"
+"<span style=\"oblique\">sub_espr</span> estas taksita kiel komandlinio por havigi\n"
 "la eligon de"
 
 #. insert file
 #: ../src/quote_fmt.c:93
 msgid ""
 "insert program output:\n"
-"<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
-"get\n"
+"<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to get\n"
 "the output from"
 msgstr ""
-"enmeti programan eligon:\n"
-"<span style=\"oblique\">sub_espr</span> estas taksata kiel komandlinio por "
-"havigi\n"
+"enmetu programan eligon:\n"
+"<span style=\"oblique\">sub_espr</span> estas taksata kiel komandlinio por havigi\n"
 "la eligon de"
 
 #. insert program output
@@ -18837,7 +18318,7 @@ msgid ""
 "<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"
 "user-entered text"
 msgstr ""
-"enmeti uzantan enigon:\n"
+"enmetu uzantan enigon:\n"
 "<span style=\"oblique\">sub_espr</span> estas variablo anstataŭigenda de\n"
 "uzant-enigita teksto"
 
@@ -18845,12 +18326,10 @@ msgstr ""
 #: ../src/quote_fmt.c:95
 msgid ""
 "attach file:\n"
-"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
-"to attach"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file to attach"
 msgstr ""
-"alglui dosieron:\n"
-"<span style=\"oblique\">sub_espr</span> estas taksata kiel la vojo de la "
-"dosiero algluenda"
+"algluu dosieron:\n"
+"<span style=\"oblique\">sub_espr</span> estas taksata kiel la vojo de la dosiero algluenda"
 
 #: ../src/quote_fmt.c:97
 msgid "<span weight=\"bold\">definition of terms:</span>"
@@ -18894,23 +18373,19 @@ msgstr "La sekvantaj simboloj kaj komandoj povas esti uzataj:"
 
 #: ../src/quote_fmt.c:173
 msgid "Use template when composing new messages"
-msgstr "Uzi ŝablonon kiam verkante novan mesaĝojn"
+msgstr "Uzu ŝablonon kiam verkante novan mesaĝojn"
 
 #: ../src/quote_fmt.c:197
-msgid ""
-"Override From header. This doesn't change the account used to compose the "
-"new message."
-msgstr ""
-"Superregi De ĉapon. Ĉi tio ne ŝanĝas la konton uzatan por verki la novan "
-"mesaĝon."
+msgid "Override From header. This doesn't change the account used to compose the new message."
+msgstr "Superregu De ĉapon. Ĉi tio ne ŝanĝas la konton uzatan por verki la novan mesaĝon."
 
 #: ../src/quote_fmt.c:299
 msgid "Use template when replying to messages"
-msgstr "Uzi ŝablonon kiam respondante al mesaĝoj"
+msgstr "Uzu ŝablonon kiam respondante al mesaĝoj"
 
 #: ../src/quote_fmt.c:323
 msgid "Override From header. This doesn't change the account used to reply."
-msgstr "Superregi De ĉapon. Ĉi tio ne ŝanĝas la konton uzata por respondi."
+msgstr "Superregu De ĉapon. Ĉi tio ne ŝanĝas la konton uzata por respondi."
 
 #: ../src/quote_fmt.c:334 ../src/quote_fmt.c:464
 msgid "Quotation mark"
@@ -18918,23 +18393,19 @@ msgstr "Citilo"
 
 #: ../src/quote_fmt.c:429
 msgid "Use template when forwarding messages"
-msgstr "Uzi ŝablonon kiam plusendante mesaĝojn"
+msgstr "Uzu ŝablonon kiam plusendante mesaĝojn"
 
 #: ../src/quote_fmt.c:453
 msgid "Override From header. This doesn't change the account used to forward."
-msgstr "Superregi De ĉapon. Ĉi tio ne ŝanĝas la konton uzata por plusendi."
+msgstr "Superregu De ĉapon. Ĉi tio ne ŝanĝas la konton uzata por plusendi."
 
 #: ../src/quote_fmt.c:545
 msgid "Defaults"
 msgstr "Defaŭltoj"
 
 #: ../src/quote_fmt.c:563
-msgid ""
-"The \"From\" field of the \"New message\" template contains an invalid email "
-"address."
-msgstr ""
-"La \"De\" kampo de la \"Nova mesaĝo\" ŝablono enhavas nevalidan retpoŝtan "
-"adreson."
+msgid "The \"From\" field of the \"New message\" template contains an invalid email address."
+msgstr "La \"De\" kampo de la \"Nova mesaĝo\" ŝablono enhavas nevalidan retpoŝtan adreson."
 
 #: ../src/quote_fmt.c:566
 msgid "The \"Subject\" field of the \"New message\" template is invalid."
@@ -18946,16 +18417,16 @@ msgstr "La \"Citilo\" kampo de la \"Respondo\" ŝablono ne estas valida."
 
 #: ../src/quote_fmt.c:603
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
-msgstr "La \"Citlo\" kampo de la \"Plusendi\" ŝablono ne estas valida."
+msgstr "La \"Citlo\" kampo de la \"Plusendu\" ŝablono ne estas valida."
 
 #: ../src/quote_fmt_parse.y:509
 #, c-format
 msgid "Enter text to replace '%s'"
-msgstr "Enigi tekston por anstataŭigi `%s'"
+msgstr "Enigu tekston por anstataŭigi `%s'"
 
 #: ../src/quote_fmt_parse.y:510
 msgid "Enter variable"
-msgstr "Enigi variablon"
+msgstr "Enigu variablon"
 
 #: ../src/send_message.c:152
 #, c-format
@@ -19069,7 +18540,7 @@ msgstr ""
 "Unue, vi devas fiksi la lokon de poŝtkesto.\n"
 "Vi povas uzi ekzistantan poŝtkeston en MH aranĝo\n"
 "se vi havas nur unu.\n"
-"Se vi ne certas, nur elekti Bone."
+"Se vi ne certas, nur elektu Bone."
 
 #: ../src/sourcewindow.c:64
 msgid "Source of the message"
@@ -19086,7 +18557,7 @@ msgstr "Konservis SSL atestojn"
 
 #: ../src/ssl_manager.c:428
 msgid "Delete certificate"
-msgstr "Forigi ateston"
+msgstr "Forigu ateston"
 
 #: ../src/ssl_manager.c:429
 msgid "Do you really want to delete this certificate?"
@@ -19094,15 +18565,15 @@ msgstr "Ĉu vi vere volas forigi ĉi tiun ateston?"
 
 #: ../src/summary_search.c:259
 msgid "Search messages"
-msgstr "Serĉi mesaĝojn"
+msgstr "Serĉu mesaĝojn"
 
 #: ../src/summary_search.c:281
 msgid "Match any of the following"
-msgstr "Kongrui kun iun ajn de la sekvantaj"
+msgstr "Kongruu kun iun ajn de la sekvantaj"
 
 #: ../src/summary_search.c:283
 msgid "Match all of the following"
-msgstr "Kongrui kun ĉiuj el la sekvantaj"
+msgstr "Kongruu kun ĉiuj el la sekvantaj"
 
 #: ../src/summary_search.c:447
 msgid "Body:"
@@ -19114,7 +18585,7 @@ msgstr "Kondiĉo:"
 
 #: ../src/summary_search.c:484
 msgid "Find _all"
-msgstr "Trovi ĉiujn"
+msgstr "Trovu ĉiujn"
 
 #: ../src/summary_search.c:690 ../src/summaryview.c:1100
 #: ../src/summaryview.c:1361
@@ -19132,15 +18603,15 @@ msgstr "Fino de listo atingita; ĉu daŭrigu de komenco?"
 
 #: ../src/summaryview.c:430
 msgid "Create _filter rule"
-msgstr "Krei _filtran regulon"
+msgstr "Kreu _filtran regulon"
 
 #: ../src/summaryview.c:550
 msgid "Toggle quick search bar"
-msgstr "Baskuli rapidserĉan breton"
+msgstr "Baskulu rapidserĉan breton"
 
 #: ../src/summaryview.c:587
 msgid "Toggle multiple selection"
-msgstr "Baskuli multoblan elektadon"
+msgstr "Baskulu multoblan elektadon"
 
 #: ../src/summaryview.c:1289
 msgid "Process mark"
@@ -19148,7 +18619,7 @@ msgstr "Trakta marko"
 
 #: ../src/summaryview.c:1290
 msgid "Some marks are left. Process them?"
-msgstr "Kelkaj markoj restas. Ĉu trakti ilin?"
+msgstr "Kelkaj markoj restas. Ĉu traktu ilin?"
 
 #: ../src/summaryview.c:1340
 #, c-format
@@ -19161,15 +18632,13 @@ msgstr "Neniuj plu nelegitaj mesaĝoj"
 
 #: ../src/summaryview.c:1838
 msgid "No unread message found. Search from the end?"
-msgstr "Neniu nelegita mesaĝo trovita. Ĉu serĉi de la fino?"
+msgstr "Neniu nelegita mesaĝo trovita. Ĉu serĉu de la fino?"
 
 #: ../src/summaryview.c:1850 ../src/summaryview.c:1902
 #: ../src/summaryview.c:1945 ../src/summaryview.c:1997
 #: ../src/summaryview.c:2076
-msgid ""
-"Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
-msgstr ""
-"Interna eraro: neatendita valoro por prefs_common.next_unread_msg_dialog\n"
+msgid "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
+msgstr "Interna eraro: neatendita valoro por prefs_common.next_unread_msg_dialog\n"
 
 #: ../src/summaryview.c:1858
 msgid "No unread messages."
@@ -19185,7 +18654,7 @@ msgstr "Neniuj pliaj novaj mesaĝoj"
 
 #: ../src/summaryview.c:1933
 msgid "No new message found. Search from the end?"
-msgstr "Neniu nova mesaĝo trovita. Ĉu serĉi de la fino?"
+msgstr "Neniu nova mesaĝo trovita. Ĉu serĉu de la fino?"
 
 #: ../src/summaryview.c:1953
 msgid "No new messages."
@@ -19201,7 +18670,7 @@ msgstr "Neniuj pliaj markitaj mesaĝoj"
 
 #: ../src/summaryview.c:2023
 msgid "No marked message found. Search from the end?"
-msgstr "Neniu markita mesaĝo trovita. Ĉu serĉi de la fino?"
+msgstr "Neniu markita mesaĝo trovita. Ĉu serĉu de la fino?"
 
 #: ../src/summaryview.c:2032
 msgid "No marked messages."
@@ -19209,7 +18678,7 @@ msgstr "Neniuj markitaj mesaĝoj."
 
 #: ../src/summaryview.c:2064
 msgid "No marked message found. Go to next folder?"
-msgstr "Neniu markita mesaĝo trovita. Ĉu iri al la sekva dosierujo?"
+msgstr "Neniu markita mesaĝo trovita. Ĉu iru al la sekva dosierujo?"
 
 #: ../src/summaryview.c:2101 ../src/summaryview.c:2126
 msgid "No more labeled messages"
@@ -19217,7 +18686,7 @@ msgstr "Neniuj pli da etikeditaj mesaĝoj"
 
 #: ../src/summaryview.c:2102
 msgid "No labeled message found. Search from the end?"
-msgstr "Neniu etikedita mesaĝo trovita. Ĉu serĉi de la fino?"
+msgstr "Neniu etikedita mesaĝo trovita. Ĉu serĉu de la fino?"
 
 #: ../src/summaryview.c:2111 ../src/summaryview.c:2136
 msgid "No labeled messages."
@@ -19225,7 +18694,7 @@ msgstr "Neniuj etikeditaj mesaĝoj."
 
 #: ../src/summaryview.c:2127
 msgid "No labeled message found. Search from the beginning?"
-msgstr "Neniu etikedita mesaĝo trovita. Ĉu serĉi de la komenco?"
+msgstr "Neniu etikedita mesaĝo trovita. Ĉu serĉu de la komenco?"
 
 #: ../src/summaryview.c:2441
 msgid "Attracting messages by subject..."
@@ -19296,23 +18765,23 @@ msgstr ""
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d elektitaj (%s/%s), %d nelegitaj"
 
-#: ../src/summaryview.c:2979
+#: ../src/summaryview.c:2981
 msgid "Sorting summary..."
 msgstr "Ordigas resumon..."
 
-#: ../src/summaryview.c:3118
+#: ../src/summaryview.c:3120
 msgid "Setting summary from message data..."
 msgstr "Starigas resumon de mesaĝaj datumoj..."
 
-#: ../src/summaryview.c:3323
+#: ../src/summaryview.c:3325
 msgid "(No Date)"
 msgstr "(Neniu Dato)"
 
-#: ../src/summaryview.c:3375
+#: ../src/summaryview.c:3377
 msgid "(No Recipient)"
 msgstr "(Neniu Ricevonto)"
 
-#: ../src/summaryview.c:3410
+#: ../src/summaryview.c:3412
 #, c-format
 msgid ""
 "%s\n"
@@ -19321,7 +18790,7 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>De: %s, je %s</span>"
 
-#: ../src/summaryview.c:3417
+#: ../src/summaryview.c:3419
 #, c-format
 msgid ""
 "%s\n"
@@ -19330,49 +18799,48 @@ msgstr ""
 "%s\n"
 "<span color=`%s' style='italic'>Al: %s, je %s</span>"
 
-#: ../src/summaryview.c:4294
+#: ../src/summaryview.c:4296
 msgid "You're not the author of the article.\n"
 msgstr "Vi ne estas la aŭtoro de la artikolo.\n"
 
-#: ../src/summaryview.c:4387
+#: ../src/summaryview.c:4389
 #, 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] "Ĉu vi vere volas forigi la elektitan mesaĝon?"
 msgstr[1] "Ĉu vi vere volas forigi la %d elektitajn mesaĝojn?"
 
-#: ../src/summaryview.c:4390
+#: ../src/summaryview.c:4392
 msgid "Delete message(s)"
-msgstr "Forigi mesaĝo(j)n"
+msgstr "Forigu mesaĝo(j)n"
 
-#: ../src/summaryview.c:4553
+#: ../src/summaryview.c:4555
 msgid "Destination is same as current folder."
 msgstr "Celo estas same kiel la nuna dosierujo."
 
-#: ../src/summaryview.c:4652
+#: ../src/summaryview.c:4653
 msgid "Destination to copy is same as current folder."
 msgstr "Celo por kopio estas same kiel la nuna dosierujo."
 
 #: ../src/summaryview.c:4815
 msgid "Append or Overwrite"
-msgstr "Aldoni aŭ Superskribi"
+msgstr "Aldonu aŭ Superskribu"
 
 #: ../src/summaryview.c:4816
 msgid "Append or overwrite existing file?"
-msgstr "Ĉu aldoni aŭ superskribi ekzistantan dosieron?"
+msgstr "Ĉu aldonu aŭ superskribu ekzistantan dosieron?"
 
 #: ../src/summaryview.c:4817
 msgid "_Append"
-msgstr "_Aldoni"
+msgstr "_Aldonu"
 
 #: ../src/summaryview.c:4817
 msgid "_Overwrite"
-msgstr "Superskribi"
+msgstr "Superskribu"
 
 #: ../src/summaryview.c:4858
 #, c-format
-msgid ""
-"You are about to print %d messages, one by one. Do you want to continue?"
+msgid "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "Vi estas presonta %d mesaĝojn, unuope. Ĉu vi volas daŭrigi?"
 
 #: ../src/summaryview.c:5337
@@ -19381,15 +18849,15 @@ msgstr "Konstruante fadenojn..."
 
 #: ../src/summaryview.c:5585
 msgid "Skip these rules"
-msgstr "Transsalti ĉi tiujn regulojn"
+msgstr "Transsaltu ĉi tiujn regulojn"
 
 #: ../src/summaryview.c:5588
 msgid "Apply these rules regardless of the account they belong to"
-msgstr "Apliki ĉi tiujn regulojn sen rigardo al la konto al kiu ili apartenas"
+msgstr "Apliku ĉi tiujn regulojn sen rigardo al la konto al kiu ili apartenas"
 
 #: ../src/summaryview.c:5591
 msgid "Apply these rules if they apply to the current account"
-msgstr "Apliki ĉi tiujn regulojn se ili aplikas al la nuna konto"
+msgstr "Apliku ĉi tiujn regulojn se ili aplikas al la nuna konto"
 
 #: ../src/summaryview.c:5620
 msgid "Filtering"
@@ -19425,11 +18893,11 @@ msgstr "Observata fadeno"
 
 #: ../src/summaryview.c:6288
 msgid "Replied but also forwarded - click to see reply"
-msgstr "Respondis sed ankaŭ plu sendis - alklaki por vidi respondon"
+msgstr "Respondis sed ankaŭ plu sendis - alklaku por vidi respondon"
 
 #: ../src/summaryview.c:6290
 msgid "Replied - click to see reply"
-msgstr "Respondis - alklaki por vidi respondon"
+msgstr "Respondis - alklaku por vidi respondon"
 
 #: ../src/summaryview.c:6302
 msgid "To be moved"
@@ -19455,7 +18923,7 @@ msgstr "Ĉifrita"
 msgid "Has attachment(s)"
 msgstr "Havas algluaĵo(j)n"
 
-#: ../src/summaryview.c:7929
+#: ../src/summaryview.c:7932
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19464,41 +18932,41 @@ msgstr ""
 "Regula esprimo (regesp) eraro:\n"
 "%s"
 
-#: ../src/summaryview.c:8034
+#: ../src/summaryview.c:8037
 msgid "Go back to the folder list (You have unread messages)"
-msgstr "Reiri al la dosieruja listo (vi havas nelegitajn mesaĝojn)"
+msgstr "Reiru al la dosieruja listo (vi havas nelegitajn mesaĝojn)"
 
-#: ../src/summaryview.c:8039
+#: ../src/summaryview.c:8042
 msgid "Go back to the folder list"
-msgstr "Reiri al la dosieruja listo"
+msgstr "Reiru al la dosieruja listo"
 
 #: ../src/textview.c:233
 msgid "_Open in web browser"
-msgstr "Malfermi en kr_ozilo"
+msgstr "Malfermu en kr_ozilo"
 
 #: ../src/textview.c:234
 msgid "Copy this _link"
-msgstr "Kopii ĉi tiun _ligilon"
+msgstr "Kopiu ĉi tiun _ligilon"
 
 #: ../src/textview.c:241
 msgid "_Reply to this address"
-msgstr "_Respondi al ĉi tiu adreso"
+msgstr "_Respondu al ĉi tiu adreso"
 
 #: ../src/textview.c:242
 msgid "Add to _Address book"
-msgstr "Aldoni al _Adreslibro"
+msgstr "Aldonu al _Adreslibro"
 
 #: ../src/textview.c:243
 msgid "Copy this add_ress"
-msgstr "Kopii ĉi tiun ad_reson"
+msgstr "Kopiu ĉi tiun ad_reson"
 
 #: ../src/textview.c:249
 msgid "_Open image"
-msgstr "Malfermi bild_on"
+msgstr "Malfermu bild_on"
 
 #: ../src/textview.c:250
 msgid "_Save image..."
-msgstr "Kon_servi bildon..."
+msgstr "Kon_servu bildon..."
 
 #: ../src/textview.c:723
 #, c-format
@@ -19522,7 +18990,7 @@ msgstr ""
 "  Ĉi tiu mesaĝo ne povas esti montrita.\n"
 "  Eble ĉi tio estis kaŭzita de reta eraro.\n"
 "\n"
-"  Uzi "
+"  Uzu "
 
 #: ../src/textview.c:910
 msgid "'Network Log'"
@@ -19542,11 +19010,11 @@ msgstr "  pere de dekstre alklakante la piktogramon aŭ listeron:"
 
 #: ../src/textview.c:980
 msgid "     - To save, select "
-msgstr "     - Por konservi, elekti "
+msgstr "     - Por konservi, elektu "
 
 #: ../src/textview.c:981
 msgid "'Save as...'"
-msgstr "'Konservi kiel...'"
+msgstr "'Konservu kiel...'"
 
 #: ../src/textview.c:983 ../src/textview.c:995 ../src/textview.c:1007
 #: ../src/textview.c:1017
@@ -19555,19 +19023,19 @@ msgstr " (Fulmoklavo: '"
 
 #: ../src/textview.c:991
 msgid "     - To display as text, select "
-msgstr "     - Por montri kiel teksto, elekti "
+msgstr "     - Por montri kiel teksto, elektu "
 
 #: ../src/textview.c:992
 msgid "'Display as text'"
-msgstr "'Montri kiel teksto'"
+msgstr "'Montru kiel teksto'"
 
 #: ../src/textview.c:1003
 msgid "     - To open with an external program, select "
-msgstr "     - Por malfermi kun ekstera programo, elekti "
+msgstr "     - Por malfermi kun ekstera programo, elektu "
 
 #: ../src/textview.c:1004
 msgid "'Open'"
-msgstr "'Malfermi'"
+msgstr "'Malfermu'"
 
 #: ../src/textview.c:1012
 msgid "       (alternately double-click, or click the middle "
@@ -19579,11 +19047,11 @@ msgstr "musbutonon)\n"
 
 #: ../src/textview.c:1015
 msgid "     - Or use "
-msgstr "     - Aŭ uzi "
+msgstr "     - Aŭ uzu "
 
 #: ../src/textview.c:1016
 msgid "'Open with...'"
-msgstr "'Malfermi kun...'"
+msgstr "'Malfermu kun...'"
 
 #: ../src/textview.c:1128
 #, c-format
@@ -19596,11 +19064,11 @@ msgstr ""
 "    %s\n"
 "Elira stato %d\n"
 
-#: ../src/textview.c:2194
+#: ../src/textview.c:2173
 msgid "Tags: "
 msgstr "Etikedoj: "
 
-#: ../src/textview.c:2896
+#: ../src/textview.c:2875
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
@@ -19617,132 +19085,132 @@ msgstr ""
 "\n"
 "<b>Vera retadreso:</b> %s\n"
 "\n"
-"Ĉu malfermi malgraŭe?"
+"Ĉu malfermu malgraŭe?"
 
-#: ../src/textview.c:2905
+#: ../src/textview.c:2884
 msgid "Phishing attempt warning"
 msgstr "Trompa prova averto"
 
-#: ../src/textview.c:2906
+#: ../src/textview.c:2885
 msgid "_Open URL"
-msgstr "Malfermi retadreson"
+msgstr "Malfermu retadreson"
 
 #: ../src/toolbar.c:192 ../src/toolbar.c:1930
 msgid "Receive Mail from all Accounts"
-msgstr "Ricevi poŝton de ĉiuj kontoj"
+msgstr "Ricevu poŝton de ĉiuj kontoj"
 
 #: ../src/toolbar.c:193 ../src/toolbar.c:1935
 msgid "Receive Mail from current Account"
-msgstr "Ricevi poŝton de nuna konto"
+msgstr "Ricevu poŝton de nuna konto"
 
 #: ../src/toolbar.c:194 ../src/toolbar.c:1939
 msgid "Send Queued Messages"
-msgstr "Sendi envicigitajn mesaĝojn"
+msgstr "Sendu envicigitajn mesaĝojn"
 
 #: ../src/toolbar.c:195 ../src/toolbar.c:905 ../src/toolbar.c:1957
 #: ../src/toolbar.c:1968
 msgid "Compose Email"
-msgstr "Verki retpoŝton"
+msgstr "Verku retpoŝton"
 
 #: ../src/toolbar.c:196
 msgid "Compose News"
-msgstr "Verki novaĵon"
+msgstr "Verku novaĵon"
 
 #: ../src/toolbar.c:197 ../src/toolbar.c:1996 ../src/toolbar.c:2006
 msgid "Reply to Message"
-msgstr "Respondi al mesaĝo"
+msgstr "Respondu al mesaĝo"
 
 #: ../src/toolbar.c:198 ../src/toolbar.c:2013 ../src/toolbar.c:2023
 msgid "Reply to Sender"
-msgstr "Respondi al Sendinto"
+msgstr "Respondu al Sendinto"
 
 #: ../src/toolbar.c:199 ../src/toolbar.c:2030 ../src/toolbar.c:2040
 msgid "Reply to All"
-msgstr "Respondi al ĉiuj"
+msgstr "Respondu al ĉiuj"
 
 #: ../src/toolbar.c:200 ../src/toolbar.c:2047 ../src/toolbar.c:2057
 msgid "Reply to Mailing-list"
-msgstr "Respondi al poŝtlisto"
+msgstr "Respondu al poŝtlisto"
 
 #: ../src/toolbar.c:201 ../src/toolbar.c:1951
 msgid "Open email"
-msgstr "Malfermi retpoŝton"
+msgstr "Malfermu retpoŝton"
 
 #: ../src/toolbar.c:202 ../src/toolbar.c:2064 ../src/toolbar.c:2075
 msgid "Forward Message"
-msgstr "Plusendi mesaĝon"
+msgstr "Plusendu mesaĝon"
 
 #: ../src/toolbar.c:203 ../src/toolbar.c:2080
 msgid "Trash Message"
-msgstr "Movi mesaĝon al la rubujo"
+msgstr "Movu mesaĝon al la rubujo"
 
 #: ../src/toolbar.c:204 ../src/toolbar.c:2084
 msgid "Delete Message"
-msgstr "Forigi mesaĝon"
+msgstr "Forigu mesaĝon"
 
 #: ../src/toolbar.c:206 ../src/toolbar.c:2092
 msgid "Go to Previous Unread Message"
-msgstr "Iri al antaŭa nelegita mesaĝo"
+msgstr "Iru al antaŭa nelegita mesaĝo"
 
 #: ../src/toolbar.c:207 ../src/toolbar.c:2096
 msgid "Go to Next Unread Message"
-msgstr "Iri al sekva nelegita mesaĝo"
+msgstr "Iru al sekva nelegita mesaĝo"
 
 #: ../src/toolbar.c:210 ../src/toolbar.c:421
 msgid "Print"
-msgstr "Presi"
+msgstr "Presu"
 
 #: ../src/toolbar.c:211
 msgid "Learn Spam or Ham"
-msgstr "Lerni spamon aŭ malspamon"
+msgstr "Lernu spamon aŭ malspamon"
 
 #: ../src/toolbar.c:212
 msgid "Open folder/Go to folder list"
-msgstr "Malfermi dosierujon/Iri al dosieruja listo"
+msgstr "Malfermu dosierujon/Iru al dosieruja listo"
 
 #: ../src/toolbar.c:215 ../src/toolbar.c:2102
 msgid "Send Message"
-msgstr "Sendi mesaĝon"
+msgstr "Sendu mesaĝon"
 
 #: ../src/toolbar.c:216 ../src/toolbar.c:2106
 msgid "Put into queue folder and send later"
-msgstr "Meti en vican dosierujon kaj sendi pli malfrue"
+msgstr "Metu en vican dosierujon kaj sendu pli malfrue"
 
 #: ../src/toolbar.c:217 ../src/toolbar.c:2110
 msgid "Save to draft folder"
-msgstr "Konservi al provaĵa dosierujo"
+msgstr "Konservu al provaĵa dosierujo"
 
 #: ../src/toolbar.c:218 ../src/toolbar.c:2114
 msgid "Insert file"
-msgstr "Enmeti dosieron"
+msgstr "Enmetu dosieron"
 
 #: ../src/toolbar.c:219 ../src/toolbar.c:2118
 msgid "Attach file"
-msgstr "Alglui dosieron"
+msgstr "Algluu dosieron"
 
 #: ../src/toolbar.c:220 ../src/toolbar.c:2122
 msgid "Insert signature"
-msgstr "Enmeti subskribon"
+msgstr "Enmetu subskribon"
 
 #: ../src/toolbar.c:221 ../src/toolbar.c:2126
 msgid "Replace signature"
-msgstr "Anstataŭigi subsk_ribon"
+msgstr "Anstataŭigu subsk_ribon"
 
 #: ../src/toolbar.c:222 ../src/toolbar.c:2130
 msgid "Edit with external editor"
-msgstr "Redakti kun ekstera redaktilo"
+msgstr "Redaktu kun ekstera redaktilo"
 
 #: ../src/toolbar.c:223 ../src/toolbar.c:2134
 msgid "Wrap long lines of current paragraph"
-msgstr "Ĉirkaŭflui longajn liniojn de nuna paragrafo"
+msgstr "Ĉirkaŭfluigu longajn liniojn de la nuna paragrafo"
 
 #: ../src/toolbar.c:224 ../src/toolbar.c:2138
 msgid "Wrap all long lines"
-msgstr "Ĉirkaŭflui longajn liniojn"
+msgstr "Ĉirkaŭfluigu longajn liniojn"
 
 #: ../src/toolbar.c:227 ../src/toolbar.c:440 ../src/toolbar.c:2147
 msgid "Check spelling"
-msgstr "Kontroli literumadon"
+msgstr "Kontrolu literumadon"
 
 #: ../src/toolbar.c:229
 msgid "Claws Mail Actions Feature"
@@ -19750,15 +19218,15 @@ msgstr "Claws Mail Aga Trajto"
 
 #: ../src/toolbar.c:230 ../src/toolbar.c:2163
 msgid "Cancel receiving"
-msgstr "Nuligi ricevadon"
+msgstr "Nuligu ricevadon"
 
 #: ../src/toolbar.c:232 ../src/toolbar.c:2171
 msgid "Cancel receiving/sending"
-msgstr "Nuligi ricevadon/sendadon"
+msgstr "Nuligu ricevadon/sendadon"
 
 #: ../src/toolbar.c:233 ../src/toolbar.c:1943
 msgid "Close window"
-msgstr "Fermi fenestron"
+msgstr "Fermu fenestron"
 
 #: ../src/toolbar.c:235
 msgid "Claws Mail Plugins"
@@ -19775,16 +19243,16 @@ msgstr "Dosierujoj"
 
 #: ../src/toolbar.c:404
 msgid "Get Mail"
-msgstr "Havigi poŝton"
+msgstr "Havigu poŝton"
 
 #: ../src/toolbar.c:405
 msgid "Get"
-msgstr "Havigi"
+msgstr "Havigu"
 
 #: ../src/toolbar.c:407 ../src/toolbar.c:408
 msgctxt "Toolbar"
 msgid "Compose"
-msgstr "Verki"
+msgstr "Verku"
 
 #: ../src/toolbar.c:410
 msgid "All"
@@ -19813,39 +19281,39 @@ msgstr "Provaĵo"
 
 #: ../src/toolbar.c:429
 msgid "Insert sig."
-msgstr "Enmeti subskrib."
+msgstr "Enmetu subskrib."
 
 #: ../src/toolbar.c:430
 msgid "Replace sig."
-msgstr "Anstataŭigi subsk_ribon"
+msgstr "Anstataŭigu subsk_ribon"
 
 #: ../src/toolbar.c:431
 msgid "Edit"
-msgstr "Redakti"
+msgstr "Redaktu"
 
 #: ../src/toolbar.c:432
 msgid "Wrap para."
-msgstr "Ĉirkaŭflui para."
+msgstr "Ĉirkaŭfluigu para."
 
 #: ../src/toolbar.c:433
 msgid "Wrap all"
-msgstr "Ĉirkaŭflui ĉion"
+msgstr "Ĉirkaŭfluigu ĉion"
 
 #: ../src/toolbar.c:435 ../src/toolbar.c:436
 msgid "Stop"
-msgstr "Halti"
+msgstr "Haltu"
 
 #: ../src/toolbar.c:437
 msgid "Stop all"
-msgstr "Halti ĉiujn"
+msgstr "Haltu ĉiujn"
 
 #: ../src/toolbar.c:897
 msgid "Compose News message"
-msgstr "Verki novaĵmesaĝon"
+msgstr "Verku novaĵmesaĝon"
 
 #: ../src/toolbar.c:936
 msgid "Learn spam"
-msgstr "Lerni spamon"
+msgstr "Lernu spamon"
 
 #: ../src/toolbar.c:945
 msgid "Ham"
@@ -19853,61 +19321,61 @@ msgstr "Malspamo"
 
 #: ../src/toolbar.c:947
 msgid "Learn ham"
-msgstr "Lerni malspamon"
+msgstr "Lernu malspamon"
 
 #: ../src/toolbar.c:1925
 msgid "Go to folder list"
-msgstr "Iri al la dosieruja listo"
+msgstr "Iru al la dosieruja listo"
 
 #: ../src/toolbar.c:1931
 msgid "Receive Mail from selected Account"
-msgstr "Ricevi retpoŝton de elektita konto"
+msgstr "Ricevu retpoŝton de elektita konto"
 
 #: ../src/toolbar.c:1947
 msgid "Open preferences"
-msgstr "Malfermi preferojn"
+msgstr "Malfermu preferojn"
 
 #: ../src/toolbar.c:1958
 msgid "Compose with selected Account"
-msgstr "Verki kun elektita konto"
+msgstr "Verku kun elektita konto"
 
 #: ../src/toolbar.c:1979
 msgid "Learn as..."
-msgstr "Lerni kiel..."
+msgstr "Lernu kiel..."
 
 #: ../src/toolbar.c:1989
 msgid "Learn as _Spam"
-msgstr "Lerni kiel _Spamo"
+msgstr "Lernu kiel _Spamo"
 
 #: ../src/toolbar.c:1990
 msgid "Learn as _Ham"
-msgstr "Lerni kiel Malspamo"
+msgstr "Lernu kiel Malspamo"
 
 #: ../src/toolbar.c:1997
 msgid "Reply to Message options"
-msgstr "Respondi al mesaĝaj opcioj"
+msgstr "Respondu al mesaĝaj opcioj"
 
 #: ../src/toolbar.c:2001 ../src/toolbar.c:2018 ../src/toolbar.c:2035
 #: ../src/toolbar.c:2052
 msgid "_Reply with quote"
-msgstr "Respondi kun cito"
+msgstr "Respondu kun cito"
 
 #: ../src/toolbar.c:2002 ../src/toolbar.c:2019 ../src/toolbar.c:2036
 #: ../src/toolbar.c:2053
 msgid "Reply without _quote"
-msgstr "Respondi sen cito"
+msgstr "Respondu sen cito"
 
 #: ../src/toolbar.c:2014
 msgid "Reply to Sender options"
-msgstr "Opcioj por Respondi al sendinto"
+msgstr "Opcioj por Respondu al sendinto"
 
 #: ../src/toolbar.c:2031
 msgid "Reply to All options"
-msgstr "Opcioj por Respondi al ĉiuj"
+msgstr "Opcioj por Respondu al ĉiuj"
 
 #: ../src/toolbar.c:2048
 msgid "Reply to Mailing-list options"
-msgstr "Opcioj por respondi al poŝtlistoj"
+msgstr "Opcioj por Respondu al poŝtlistoj"
 
 #: ../src/toolbar.c:2065
 msgid "Forward Message options"
@@ -19924,7 +19392,7 @@ msgstr "Haveblaj retadresoj:"
 #: ../src/uri_opener.c:181
 msgctxt "Dialog title"
 msgid "Open URLs"
-msgstr "Malfermi retadresojn"
+msgstr "Malfermu retadresojn"
 
 #: ../src/uri_opener.c:206
 msgid "Please select the URL to open."
@@ -19932,7 +19400,7 @@ msgstr "Bonvolu elekti la retadreson por malfermi."
 
 #: ../src/uri_opener.c:214
 msgid "Select All"
-msgstr "Elekti ĉiujn"
+msgstr "Elektu ĉiujn"
 
 #: ../src/wizard.c:521
 msgctxt "Welcome Mail Subject"
@@ -20072,20 +19540,12 @@ msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Poŝtkesta nomo:</span>"
 
 #: ../src/wizard.c:1030
-msgid ""
-"You can also specify an absolute path, for example: \"/home/john/Documents/"
-"Mail\""
-msgstr ""
-"Vi povas ankaŭ specifi absolutan vojon, ekzemple: \"/home/petro/Dokumentoj/"
-"Retpoŝto\""
+msgid "You can also specify an absolute path, for example: \"/home/john/Documents/Mail\""
+msgstr "Vi povas ankaŭ specifi absolutan vojon, ekzemple: \"/home/petro/Dokumentoj/Retpoŝto\""
 
 #: ../src/wizard.c:1101
-msgid ""
-"You can specify the port number by appending it at the end: \"mail.example."
-"com:25\""
-msgstr ""
-"Vi povas specifi la pordnumeron per algluante ĝin ĉe la fino:\"retpoŝto."
-"ekzemplo.com:25\""
+msgid "You can specify the port number by appending it at the end: \"mail.example.com:25\""
+msgstr "Vi povas specifi la pordnumeron per algluante ĝin ĉe la fino:\"retpoŝto.ekzemplo.com:25\""
 
 #: ../src/wizard.c:1104
 msgid "<span weight=\"bold\">SMTP server address:</span>"
@@ -20093,7 +19553,7 @@ msgstr "<span weight=\"bold\">SMTP servila adreso:</span>"
 
 #: ../src/wizard.c:1110
 msgid "Use authentication"
-msgstr "Uzi aŭtentigon"
+msgstr "Uzu aŭtentigon"
 
 #: ../src/wizard.c:1118
 msgid "<span size=\"small\">(empty to use the same as receive)</span>"
@@ -20109,11 +19569,11 @@ msgstr "SMTP pasvorto:"
 
 #: ../src/wizard.c:1156
 msgid "Use SSL to connect to SMTP server"
-msgstr "Uzi SSL por konekti al SMTP servilo"
+msgstr "Uzu SSL por konekti al SMTP servilo"
 
 #: ../src/wizard.c:1167 ../src/wizard.c:1581
 msgid "Use SSL via STARTTLS"
-msgstr "Uzi SSL pere de STARTTLS"
+msgstr "Uzu SSL pere de STARTTLS"
 
 #: ../src/wizard.c:1179 ../src/wizard.c:1593
 msgid "Client SSL certificate (optional)"
@@ -20136,12 +19596,8 @@ msgid "IMAP"
 msgstr "IMAP"
 
 #: ../src/wizard.c:1540
-msgid ""
-"You can specify the port number by appending it at the end: \"mail.example."
-"com:110\""
-msgstr ""
-"Vi povas specifi la pordan numeron per almeto de ĝi ĉe la fino: \"retpoŝto."
-"ekzemplo.com:110\""
+msgid "You can specify the port number by appending it at the end: \"mail.example.com:110\""
+msgstr "Vi povas specifi la pordan numeron per almeto de ĝi ĉe la fino: \"retpoŝto.ekzemplo.com:110\""
 
 #: ../src/wizard.c:1545
 msgid "<span weight=\"bold\">Username:</span>"
@@ -20149,7 +19605,7 @@ msgstr "<span weight=\"bold\">Uzantnomo:</span>"
 
 #: ../src/wizard.c:1570
 msgid "Use SSL to connect to receiving server"
-msgstr "Uzi SSL por konekti al ricevanta servilo"
+msgstr "Uzu SSL por konekti al ricevanta servilo"
 
 #: ../src/wizard.c:1635
 msgid "IMAP server directory:"
@@ -20157,7 +19613,7 @@ msgstr "IMAP servila dosierujo:"
 
 #: ../src/wizard.c:1646
 msgid "Show only subscribed folders"
-msgstr "Montri nur subskribitajn dosierujojn"
+msgstr "Montru nur subskribitajn dosierujojn"
 
 #: ../src/wizard.c:1654
 msgid ""
@@ -20179,15 +19635,11 @@ msgstr "Bonvenon al Claws Mail"
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
-"We will begin by defining some basic information about you and your most "
-"common mail options so that you can start to use Claws Mail in less than "
-"five minutes."
+"We will begin by defining some basic information about you and your most common mail options so that you can start to use Claws Mail in less than five minutes."
 msgstr ""
 "Bonvenon al la Claws Mail agorda asistanto.\n"
 "\n"
-"Ni komencos per difino de ia baza informo pri vi kaj viaj plej oftaj "
-"retpoŝtaj opcioj tiel ke vi povas komenci uzi Claws Mail post malpli ol kvin "
-"minutoj."
+"Ni komencos per difino de ia baza informo pri vi kaj viaj plej oftaj retpoŝtaj opcioj tiel ke vi povas komenci uzi Claws Mail post malpli ol kvin minutoj."
 
 #: ../src/wizard.c:1827
 msgid "About You"
@@ -20220,4 +19672,132 @@ msgid ""
 "Click Save to start."
 msgstr ""
 "Claws Mail nun estas preta.\n"
-"Alklaki Konservi por komenci."
+"Alklaku Konservu por komenci."
+
+#~ msgid "%ld byte"
+
+#~ msgid_plural "%ld bytes"
+#~ msgstr[0] "%ld bitoko"
+#~ msgstr[1] "%ld bitokoj"
+
+#~ msgid ""
+#~ "<b>Number of expired entries to keep:</b>\n"
+#~ "<small>(Set to -1 if you want to keep expired entries)</small>"
+#~ msgstr ""
+#~ "<b>Nombro da finiĝintaj enigoj por konservi:</b>\n"
+#~ "<small>(Fiksu al -1 se vi volas konservi finiĝintajn enigojn)</small>"
+
+#~ msgid "Can't remove feed '%s'."
+#~ msgstr "Ne povas forigi fluon `%s'."
+
+#~ msgid "Can't subscribe feed '%s'."
+#~ msgstr "Ne povas subskribi fluon `%s'."
+
+#~ msgid "Cannot init libCURL"
+#~ msgstr "Ne povas pravalorizi na libCURL"
+
+#~ msgid "Cannot open temporary file"
+#~ msgstr "Ne povas malfermi provizoran dosieron"
+
+#~ msgid "Couldn't fetch URL %s\n"
+#~ msgstr "Ne povis alporti retadreson %s\n"
+
+#~ msgid ""
+#~ "Couldn't fetch URL '%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne povis alporti retadreson `%s':\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Couldn't fetch URL '%s':\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Ne povis alporti retadreson `%s':\n"
+#~ "%s\n"
+
+#~ msgid "Default number of expired items to keep"
+#~ msgstr "Defaŭlta nombro da finiĝantaj eroj por konservi"
+
+#~ msgid "Do you really want to remove feed"
+#~ msgstr "Ĉu vi vere volas forigi la fluon"
+
+#~ msgid "Error parsing feed from URL %s\n"
+#~ msgstr "Eraro sintakse analizante fluon de retadreso %s\n"
+
+#~ msgid "Fetching '%s'..."
+#~ msgstr "Alportas `%s'..."
+
+#~ msgid "Good signature (untrusted) from %s."
+#~ msgstr "Bona subskribo (nefidinda) de %s."
+
+#~ msgid "Keep default number of expired entries"
+#~ msgstr "Retenu defaŭltan nombron da finiĝintaj enigaĵoj"
+
+#~ msgid "Malformed feed"
+#~ msgstr "Misformita fluo"
+
+#~ msgid "N/A"
+#~ msgstr "Ne aplikebla"
+
+#~ msgid "RSSyl"
+#~ msgstr "RSSyl"
+
+#~ msgid "RSSyl..."
+#~ msgstr "RSSyl..."
+
+#~ msgid ""
+#~ "RSSyl: Cannot update feed %s:\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "RSSyl: Ne povas ĝisdatigi fluon %s:\n"
+#~ "%s\n"
+
+#~ msgid "RSSyl: Feed update aborted, application is exiting.\n"
+#~ msgstr "RSSyl: Flua ĝisdatigo abortita, aplikaĵo eliras.\n"
+
+#~ msgid ""
+#~ "RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
+#~ "comments of '%s'"
+#~ msgstr ""
+#~ "RSSyl: Alporti komentojn ne estas subtenata por RDF fluoj. Ne povas "
+#~ "alporti komentojn de `%s'"
+
+#~ msgid "Refresh _all feeds"
+#~ msgstr "Refreŝigu ĉiujn fluojn"
+
+#~ msgid "Remove cached entries"
+#~ msgstr "Forigu kaŝitajn enskribojn"
+
+#~ msgid "Remove folder _tree..."
+#~ msgstr "Forigu dosierujan arbon..."
+
+#~ msgid "Set to -1 to keep expired items"
+#~ msgstr "Fiksu al -1 por teni finiĝintajn erojn"
+
+#~ msgid "Set to 0 to disable automatic refreshing"
+#~ msgstr "Fiksu al 0 por malebligi aŭtomatan refreŝigon"
+
+#~ msgid "This feed format is not supported yet."
+#~ msgstr "Ĉi tiu flua aranĝo estas ankoraŭ ne subtenata."
+
+#~ msgid "Time out connecting to URL %s\n"
+#~ msgstr "Eltempiĝo konektante al retadreso %s\n"
+
+#~ msgid "Unsubscribe feed"
+#~ msgstr "Malsubskribu fluon"
+
+#~ msgid "Unsupported feed type at URL %s\n"
+#~ msgstr "Nesubtenata flua tipo ĉe retadreso %s\n"
+
+#~ msgid "You are already subscribed to this feed."
+#~ msgstr "Vi jam estas  subskribata al ĉi tiu fluo."
+
+#~ msgid "_Unsubscribe feed..."
+#~ msgstr "Mals_ubskribu fluon..."
+
+#~ msgid "messages which contain header S"
+#~ msgstr "mesaĝoj kiuj enhavas ĉapon S"
+
+#~ msgid "size unknown"
+#~ msgstr "grando nekonata"
diff --git a/po/es.po b/po/es.po
index cead756..6b560be 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Claws Mail 3.10.1\n"
+"Project-Id-Version: Claws Mail 3.11.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2014-06-13 03:15+0400\n"
-"PO-Revision-Date: 2014-05-25 14:07+0100\n"
+"POT-Creation-Date: 2014-10-13 09:04+0100\n"
+"PO-Revision-Date: 2014-10-17 23:27+0100\n"
 "Last-Translator: Ricardo Mones <ricardo at mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo at mones.org>\n"
 "Language: es\n"
@@ -19,37 +19,206 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../claws-mail.appdata.xml.in.h:1
-#, fuzzy
+#: ../claws-mail.desktop.in.h:1
+msgid "E-mail client"
+msgstr "Cliente de correo electrónico"
+
+#: ../claws-mail.desktop.in.h:2
+msgid "Lightweight and Fast GTK+ based Mail Client"
+msgstr "Cliente de correo rápido y ligero con GTK+"
+
+#: ../claws-mail.desktop.in.h:3
+msgid "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
+msgstr "ligero;rápido;gui;extensible;módulo;pop;pop3;imap;imap4;nntp;noticias;"
+
+#: ../appdata/claws-mail.appdata.xml.in.h:1
 msgid "Claws Mail is a fast, powerful and very extensible email client."
-msgstr "Se har registrado Claws Mail como cliente por defecto."
+msgstr "Claws Mail es un cliente de correo rápido, potente y muy extensible."
 
-#: ../claws-mail.appdata.xml.in.h:2
+#: ../appdata/claws-mail.appdata.xml.in.h:2
 msgid ""
 "It is highly configurable and handles hundreds of thousands of emails "
 "easily. Messages are managed in an open format, and are easy to interact "
 "with."
 msgstr ""
+"Es muy configurable y maneja cientos de miles de mensajes con facilidad. "
+"Los mensajes se gestionan en un formato abierto y se puede interactuar con "
+"ellos fácilmente."
 
-#: ../claws-mail.appdata.xml.in.h:3
+#: ../appdata/claws-mail.appdata.xml.in.h:3
 msgid ""
 "Lots of extra functionality is provided by plugins, such as PGP signatures "
 "and encryption, an RSS aggregator, a calendar, powerful spam filtering, Perl "
 "and Python interactions, HTML and PDF rendering, and more."
 msgstr ""
+"Los módulos proporcionan montones de funcionalidades adicionales, como las "
+"firmas y cifrado PGP, un agregador de RSS, un calendario, filtrado de correo "
+"basura, interfaces con Perl y Python, presentación de HTML y PDFs y más."
 
-#: ../claws-mail.desktop.in.h:1
-msgid "E-mail client"
+#: ../appdata/claws-mail-acpi_notifier.metainfo.xml.in.h:1
+msgid "Enables mail notification via LEDs on some laptops"
+msgstr "Activa el uso de los LEDs de notificación de correo de algunos portátiles"
+
+#: ../appdata/claws-mail-address_keeper.metainfo.xml.in.h:1
+msgid ""
+"Allows saving outgoing addresses to a designated folder in the address book"
+msgstr "Permite guardar las direcciones salientes en una carpeta dedicada de la agenda de direcciones"
+
+#: ../appdata/claws-mail-archive.metainfo.xml.in.h:1
+msgid "Allows to make tars or zips of old folders"
+msgstr "Permite hacer ficheros comprimidos con las carpetas antiguas"
+
+#: ../appdata/claws-mail-att_remover.metainfo.xml.in.h:1
+msgid "Lets you remove attachments from emails"
+msgstr "Permite eliminar los adjuntos de los mensajes"
+
+#: ../appdata/claws-mail-attachwarner.metainfo.xml.in.h:1
+msgid ""
+"Warns when a message mentioning an attachment in the message body without "
+"attaching any files"
 msgstr ""
+"Avisa cuando se menciona un adjunto en el cuerpo de un mensaje pero no se "
+"adjunta ningún fichero"
 
-#: ../claws-mail.desktop.in.h:2
-msgid "Lightweight and Fast GTK+ based Mail Client"
+#: ../appdata/claws-mail-bogofilter.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using Bogofilter"
+msgstr ""
+"Activa el escaneo con BogoFilter del correo recibido de cuentas POP, IMAP "
+"o locales"
+
+#: ../appdata/claws-mail-bsfilter.metainfo.xml.in.h:1
+msgid ""
+"Check all messages that are received from an IMAP, LOCAL or POP account for "
+"spam using Bsfilter"
+msgstr ""
+"Comprueba los mensajes de spam con Bsfilter en el correo recibido de cuentas "
+"POP, IMAP o locales"
+
+#: ../appdata/claws-mail-clamd.metainfo.xml.in.h:1
+msgid ""
+"Scans all messages that are received from an IMAP, LOCAL or POP account "
+"using clamd (Clam AV)"
+msgstr ""
+"Comprueba con clamd (Anti-virus Clam) todos los mensajes recibidos de cuentas "
+"POP, IMAP o locales"
+
+#: ../appdata/claws-mail-fancy.metainfo.xml.in.h:1
+msgid "Renders HTML e-mail using the WebKit library"
+msgstr "Muestra los correos HTML usando la biblioteca WebKit"
+
+#: ../appdata/claws-mail-fetchinfo.metainfo.xml.in.h:1
+msgid ""
+"Inserts headers containing: UIDL, Claws' account name, POP server, user ID "
+"and retrieval time"
+msgstr ""
+"Inserta cabeceras conteniendo: UIDL, el nombre de la cuenta de Claws Mail, "
+"el servidor POP, el ID de usuario y el momento de recuperación."
+
+#: ../appdata/claws-mail-gdata.metainfo.xml.in.h:1
+msgid "Provides an interface to Google services"
+msgstr "Proporciona un interfaz con los servicios de Google"
+
+#: ../appdata/claws-mail-geolocation.metainfo.xml.in.h:1
+msgid "Provides GeoLocation functionality"
+msgstr "Proporciona funciones de localización geográfica"
+
+#: ../appdata/claws-mail-libravatar.metainfo.xml.in.h:1
+msgid ""
+"Displays libravatar/gravatar profiles' images or a dynamically generated or "
+"predefined alternative"
+msgstr ""
+"Muestra las imágenes de los perfiles de libravatar/gravatar o una alternativa "
+"generada dinámicamente o predefinida"
+
+#: ../appdata/claws-mail-mailmbox.metainfo.xml.in.h:1
+msgid "Direct support for mailboxes in mbox format"
+msgstr "Soporte directo para gestionar buzones en formato mbox."
+
+#: ../appdata/claws-mail-newmail.metainfo.xml.in.h:1
+msgid ""
+"Writes a msg header summary to a log file on arrival of new mail after "
+"sorting"
+msgstr ""
+"Escribe un resumen de cabeceras en un fichero de traza cuando llega correo nuevo, después de ordenarlo"
+
+#: ../appdata/claws-mail-notification.metainfo.xml.in.h:1
+msgid "Provides various ways to notify the user of new and unread email"
+msgstr "Proporciona varias maneras de notificar al usuario sobre correo nuevo o no leído"
+
+#: ../appdata/claws-mail-pdf_viewer.metainfo.xml.in.h:1
+msgid ""
+"Enables the viewing of PDF and PostScript attachments using the Poppler "
+"library and GhostScript"
+msgstr ""
+"Permite la visualización de adjuntos PDF y PostScript usando la biblioteca "
+"Poppler y GhostScript"
+
+#: ../appdata/claws-mail-perl.metainfo.xml.in.h:1
+msgid "Allowing the use of full Perl power in email filters"
+msgstr "Permite el uso de toda la potencia de Perl en los filtros de correo"
+
+#: ../appdata/claws-mail-pgpcore.metainfo.xml.in.h:1
+msgid ""
+"Handles core PGP functions and is a dependency of both the PGP/Inline and "
+"PGP/MIME plugins."
+msgstr ""
+"Contiene el núcleo común de funcionalidad para PGP y es una dependencia de "
+"los módulos PGP/Inline y PGP/MIME."
+
+#: ../appdata/claws-mail-pgpinline.metainfo.xml.in.h:1
+msgid "Handles PGP/Inline signed and/or encrypted mails"
+msgstr "Gestiona los correos cifrados y/o firmados con PGP/Inline"
+
+#: ../appdata/claws-mail-pgpmime.metainfo.xml.in.h:1
+msgid "Handles PGP/MIME signed and/or encrypted mails"
+msgstr "Gestiona los correos cifrados y/o firmados con PGP/MIME"
+
+#: ../appdata/claws-mail-python.metainfo.xml.in.h:1
+msgid ""
+"Offers a Python scripting. Code can be entered into an embedded Python "
+"console or stored"
+msgstr ""
+"Permite programas en Python. El código se puede introducir en la consola "
+"integrada o almacenado"
+
+#: ../appdata/claws-mail-rssyl.metainfo.xml.in.h:1
+msgid "Read your RSS favourite newsfeeds"
+msgstr "Leer sus fuentes de noticias favoritas en RSS"
+
+#: ../appdata/claws-mail-smime.metainfo.xml.in.h:1
+msgid "Handles S/MIME signed and/or encrypted mails"
+msgstr "Gestiona los correos cifrados y/o firmados con S/MIME"
+
+#: ../appdata/claws-mail-spam_report.metainfo.xml.in.h:1
+msgid "Reports spam to various places"
+msgstr "Informa de correo basura en varios sitios"
+
+#: ../appdata/claws-mail-spamassassin.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using SpamAssassin"
 msgstr ""
+"Activa el escaneo con SpamAssassin del correo recibido de cuentas POP, IMAP "
+"o locales"
 
-#: ../src/account.c:392
+#: ../appdata/claws-mail-tnef_parse.metainfo.xml.in.h:1
+msgid "Enables reading application/ms-tnef attachments"
+msgstr "Activa la lectura de adjuntos «application/ms-tnef»"
+
+#: ../appdata/claws-mail-vcalendar.metainfo.xml.in.h:1
+msgid ""
+"Enables vCalendar message handling and handles webCal subscriptions. "
+"Provides a calendar import"
+msgstr ""
+"Activa la gestión de mensajes vCalendar y subscripciones WebCal. Proporciona "
+"importación de calendarios"
+
+#: ../src/account.c:392 ../src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
+"Please close all the composing windows before editing accounts."
 msgstr ""
 "Hay ventanas de composición abiertas.\n"
 "Cierre todas las ventanas de composición antes de editar las cuentas."
@@ -58,11 +227,11 @@ msgstr ""
 msgid "Can't create folder."
 msgstr "No se puede crear la carpeta."
 
-#: ../src/account.c:717
+#: ../src/account.c:724
 msgid "Edit accounts"
 msgstr "Editar cuentas"
 
-#: ../src/account.c:734
+#: ../src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -72,44 +241,44 @@ msgstr ""
 "orden dado, la casilla indica que cuentas se incluirán. El texto en negrita "
 "indica la cuenta por defecto."
 
-#: ../src/account.c:805
+#: ../src/account.c:812
 msgid " _Set as default account "
 msgstr " _Establecer como primaria "
 
-#: ../src/account.c:897
+#: ../src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Las cuentas con carpetas remotas no se pueden copiar."
 
 #. copy fields
-#: ../src/account.c:904
+#: ../src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Copia de %s"
 
-#: ../src/account.c:1064
+#: ../src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "¿Realmente quiere borrar la cuenta «%s»?"
 
-#: ../src/account.c:1066
+#: ../src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
-#: ../src/account.c:1067
+#: ../src/account.c:1074
 msgid "Delete account"
 msgstr "Borrar cuenta"
 
-#: ../src/account.c:1537
+#: ../src/account.c:1544
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "R"
 
-#: ../src/account.c:1543
+#: ../src/account.c:1550
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "«Recibir correo» recupera el correo de las cuentas marcadas"
 
-#: ../src/account.c:1550 ../src/addrduplicates.c:471 ../src/addressadd.c:215
-#: ../src/addressbook.c:125 ../src/compose.c:7144 ../src/editaddress.c:1263
+#: ../src/account.c:1557 ../src/addrduplicates.c:471 ../src/addressadd.c:215
+#: ../src/addressbook.c:125 ../src/compose.c:7148 ../src/editaddress.c:1263
 #: ../src/editaddress.c:1320 ../src/editaddress.c:1340
 #: ../src/editaddress_other_attributes_ldap.c:302
 #: ../src/editaddress_other_attributes_ldap.c:350 ../src/editbook.c:170
@@ -117,16 +286,16 @@ msgstr "«Recibir correo» recupera el correo de las cuentas marcadas"
 #: ../src/editvcard.c:173 ../src/importmutt.c:223 ../src/importpine.c:222
 #: ../src/mimeview.c:275 ../src/plugins/pdf_viewer/poppler_viewer.c:1797
 #: ../src/plugins/pgpcore/select-keys.c:396 ../src/prefs_filtering.c:384
-#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:78
+#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:79
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/account.c:1558 ../src/prefs_account.c:1103
+#: ../src/account.c:1565 ../src/prefs_account.c:1103
 #: ../src/prefs_account.c:4058
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/account.c:1566 ../src/ssl_manager.c:102
+#: ../src/account.c:1573 ../src/ssl_manager.c:102
 msgid "Server"
 msgstr "Servidor"
 
@@ -178,8 +347,8 @@ msgstr ""
 "%s"
 
 #: ../src/action.c:990 ../src/ldaputil.c:326
-#: ../src/plugins/bogofilter/bogofilter.c:876 ../src/plugins/rssyl/feed.c:1739
-#: ../src/plugins/rssyl/feed.c:1743 ../src/plugins/tnef_parse/tnef_parse.c:67
+#: ../src/plugins/bogofilter/bogofilter.c:876
+#: ../src/plugins/tnef_parse/tnef_parse.c:67
 #: ../src/plugins/vcalendar/vcal_folder.c:1803
 #: ../src/plugins/vcalendar/vcal_folder.c:1807
 #: ../src/plugins/vcalendar/vcal_folder.c:1818
@@ -236,22 +405,19 @@ msgid "Action's user argument"
 msgstr "Parámetro de usuario para la acción"
 
 #: ../src/addrclip.c:479
-#, fuzzy
 msgid "Cannot copy a folder to itself or to its sub-structure."
-msgstr "No se puede copiar una carpeta a una de sus subcarpetas."
+msgstr "No se puede copiar una carpeta a si misma o su sub-estructura."
 
 #: ../src/addrclip.c:502
-#, fuzzy
 msgid "Cannot copy an address book to itself."
-msgstr "No puedo pegar. El libro de direcciones destino es solo de lectura."
+msgstr "No se puede copiar una agenda a si misma."
 
 #: ../src/addrclip.c:593
-#, fuzzy
 msgid "Cannot move a folder to itself or to its sub-structure."
-msgstr "No se puede mover la carpeta a una de sus subcarpetas."
+msgstr "No se puede mover la carpeta a si misma o a su sub-estructura."
 
 #. that's a group
-#: ../src/addr_compl.c:620 ../src/addressbook.c:4866
+#: ../src/addr_compl.c:685 ../src/addressbook.c:4866
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "Grupo"
@@ -326,14 +492,14 @@ msgstr ""
 
 #: ../src/addrcustomattr.c:212 ../src/addressbook.c:435
 #: ../src/addressbook.c:463 ../src/addressbook.c:480 ../src/edittags.c:272
-#: ../src/plugins/archive/archiver_gtk.c:1193 ../src/prefs_actions.c:1090
-#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1099
+#: ../src/plugins/archive/archiver_gtk.c:1194 ../src/prefs_actions.c:1090
+#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1119
 msgid "_Delete"
 msgstr "_Borrar"
 
 #: ../src/addrcustomattr.c:213 ../src/edittags.c:273
 #: ../src/prefs_actions.c:1091 ../src/prefs_filtering.c:1694
-#: ../src/prefs_template.c:1100
+#: ../src/prefs_template.c:1120
 msgid "Delete _all"
 msgstr "_Borrar todo"
 
@@ -432,7 +598,7 @@ msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
 #: ../src/addressadd.c:485 ../src/editaddress.c:1582 ../src/headerview.c:281
-#: ../src/textview.c:2064
+#: ../src/textview.c:2043
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -463,17 +629,17 @@ msgstr "_Agenda"
 
 #. {"Address/---",			NULL, "---", NULL, NULL, NULL },
 #: ../src/addressbook.c:403 ../src/addressbook.c:434 ../src/addressbook.c:462
-#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:504
+#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:506
 #: ../src/messageview.c:210
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:507
+#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:509
 #: ../src/messageview.c:213
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:509
+#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:511
 #: ../src/messageview.c:214
 msgid "_Help"
 msgstr "_Ayuda"
@@ -531,7 +697,7 @@ msgstr "C_ortar"
 
 #. Edit menu
 #: ../src/addressbook.c:431 ../src/addressbook.c:470 ../src/addressbook.c:486
-#: ../src/compose.c:610 ../src/mainwindow.c:538 ../src/messageview.c:226
+#: ../src/compose.c:610 ../src/mainwindow.c:540 ../src/messageview.c:226
 msgid "_Copy"
 msgstr "_Copiar"
 
@@ -587,7 +753,7 @@ msgid "Edit custom attributes..."
 msgstr "Editar atributos de usuario..."
 
 #. Help menu
-#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:801
+#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:803
 #: ../src/messageview.c:339
 msgid "_About"
 msgstr "_Acerca de"
@@ -597,9 +763,10 @@ msgid "_Browse Entry"
 msgstr "_Ver entrada"
 
 #. then add the appointment
-#: ../src/addressbook.c:504 ../src/crash.c:454 ../src/crash.c:473
+#: ../src/addressbook.c:504 ../src/crash.c:457 ../src/crash.c:476
 #: ../src/importldif.c:115 ../src/plugins/pgpcore/select-keys.c:251
-#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/vcalendar/day-view.c:402
+#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/pgpcore/sgpgme.c:168
+#: ../src/plugins/vcalendar/day-view.c:402
 #: ../src/plugins/vcalendar/month-view.c:428 ../src/prefs_themes.c:707
 #: ../src/prefs_themes.c:739 ../src/prefs_themes.c:740
 msgid "Unknown"
@@ -699,13 +866,13 @@ msgstr "Ya existe un contacto con esa clave"
 
 #: ../src/addressbook.c:543
 msgid "Strong(er) authentication required"
-msgstr "Se necesita autentificación (más) fuerte"
+msgstr "Se necesita autenticación (más) fuerte"
 
 #: ../src/addressbook.c:910
 msgid "Sources"
 msgstr "Fuentes"
 
-#: ../src/addressbook.c:914 ../src/prefs_matcher.c:629
+#: ../src/addressbook.c:914 ../src/prefs_matcher.c:632
 #: ../src/prefs_other.c:475 ../src/toolbar.c:225 ../src/toolbar.c:2142
 msgid "Address book"
 msgstr "Agenda de direcciones"
@@ -756,7 +923,7 @@ msgstr ""
 
 #: ../src/addressbook.c:2921 ../src/imap_gtk.c:363 ../src/mh_gtk.c:202
 #: ../src/plugins/mailmbox/plugin_gtk.c:324
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:236
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:152
 #: ../src/plugins/vcalendar/vcal_folder.c:1966
 msgid "Delete folder"
 msgstr "Borrar carpeta"
@@ -845,7 +1012,7 @@ msgstr ""
 
 #: ../src/addressbook.c:4072 ../src/addressbook.c:4078
 msgid "Addressbook conversion error"
-msgstr "Error en la conversión de la agenda de Sylpheed"
+msgstr "Error en la conversión de la agenda"
 
 #: ../src/addressbook.c:4185
 msgid "Addressbook Error"
@@ -920,10 +1087,10 @@ msgstr "Petición LDAP"
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:443
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:490
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:613
-#: ../src/prefs_matcher.c:672 ../src/prefs_matcher.c:707
-#: ../src/prefs_matcher.c:1607 ../src/prefs_matcher.c:1614
-#: ../src/prefs_matcher.c:1622 ../src/prefs_matcher.c:1624
-#: ../src/prefs_matcher.c:2504 ../src/prefs_matcher.c:2508
+#: ../src/prefs_matcher.c:675 ../src/prefs_matcher.c:710
+#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:1626
+#: ../src/prefs_matcher.c:1634 ../src/prefs_matcher.c:1636
+#: ../src/prefs_matcher.c:2524 ../src/prefs_matcher.c:2528
 msgid "Any"
 msgstr "Cualquiera"
 
@@ -1028,21 +1195,21 @@ msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Falló la actualización. No se escribieron los cambios en el directorio."
 
-#: ../src/alertpanel.c:146 ../src/compose.c:9293
+#: ../src/alertpanel.c:146 ../src/compose.c:9324
 msgid "Notice"
 msgstr "Notificación"
 
 #: ../src/alertpanel.c:159 ../src/compose.c:5656 ../src/compose.c:6133
-#: ../src/compose.c:11662 ../src/file_checker.c:78 ../src/file_checker.c:100
+#: ../src/compose.c:11670 ../src/file_checker.c:78 ../src/file_checker.c:100
 #: ../src/messageview.c:853 ../src/messageview.c:866
-#: ../src/plugins/pgpcore/sgpgme.c:719
+#: ../src/plugins/pgpcore/sgpgme.c:717
 #: ../src/plugins/vcalendar/vcalendar.c:125 ../src/summaryview.c:4863
 msgid "Warning"
 msgstr "Aviso"
 
 #: ../src/alertpanel.c:172 ../src/alertpanel.c:195 ../src/compose.c:5597
 #: ../src/inc.c:669 ../src/plugins/pgpcore/sgpgme.c:152
-#: ../src/plugins/pgpcore/sgpgme.c:249
+#: ../src/plugins/pgpcore/sgpgme.c:253
 msgid "Error"
 msgstr "Error"
 
@@ -1054,15 +1221,10 @@ msgstr "_Ver traza"
 msgid "Show this message next time"
 msgstr "Mostrar este mensaje de nuevo"
 
-#: ../src/avatars.c:97
-msgid "Internal avatars rendering already initialized"
-msgstr ""
-
 #: ../src/avatars.c:102
-#, fuzzy
 msgid "Failed to register avatars internal rendering hook"
 msgstr ""
-"Falló el registro de la función de representación de imágenes de avatar"
+"Falló el registro de la función de presentación de imágenes de avatares"
 
 #: ../src/browseldap.c:218
 msgid "Browse Directory Entry"
@@ -1169,7 +1331,7 @@ msgstr "Su versión de Claws Mail es demasiado antigua para el módulo «%s»."
 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:177 ../src/imap.c:1171
+#: ../src/common/session.c:177 ../src/imap.c:1177
 msgid "SSL handshake failed\n"
 msgstr "Negociación SSL fallida\n"
 
@@ -1191,7 +1353,7 @@ msgstr "hubo un error en la sesión SMTP\n"
 
 #: ../src/common/smtp.c:559 ../src/pop.c:899
 msgid "error occurred on authentication\n"
-msgstr "hubo un error en la autentificación\n"
+msgstr "hubo un error en la autenticación\n"
 
 #: ../src/common/smtp.c:609
 #, c-format
@@ -1204,7 +1366,7 @@ msgstr "no se pudo iniciar la sesión TLS\n"
 
 #: ../src/common/socket.c:573
 msgid "Socket IO timeout.\n"
-msgstr "Tiempo límite de E/S en el socket.\n"
+msgstr "Tiempo límite de E/S en el conector.\n"
 
 #: ../src/common/socket.c:602
 msgid "Connection timed out.\n"
@@ -1213,7 +1375,7 @@ msgstr "La conexión excedió el límite de tiempo.\n"
 #: ../src/common/socket.c:630
 #, c-format
 msgid "%s: host lookup timed out.\n"
-msgstr "%s: la búsqueda de la máquina exceció el límite de tiempo.\n"
+msgstr "%s: la búsqueda de la máquina excedió el límite de tiempo.\n"
 
 #: ../src/common/socket.c:643
 #, c-format
@@ -1328,229 +1490,229 @@ msgstr "(Asunto vacío por expr. reg.)"
 #: ../src/common/utils.c:379
 #, c-format
 msgid "%dB"
-msgstr "%d b"
+msgstr "%d B"
 
 #: ../src/common/utils.c:380
 #, c-format
 msgid "%d.%02dKB"
-msgstr "%d.%02d Kb"
+msgstr "%d.%02d kB"
 
 #: ../src/common/utils.c:381
 #, c-format
 msgid "%d.%02dMB"
-msgstr "%d.%02d Mb"
+msgstr "%d.%02d MB"
 
 #: ../src/common/utils.c:382
 #, c-format
 msgid "%.2fGB"
-msgstr "%.2f Gb"
+msgstr "%.2f GB"
 
-#: ../src/common/utils.c:4967
+#: ../src/common/utils.c:5000
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Domingo"
 
-#: ../src/common/utils.c:4968
+#: ../src/common/utils.c:5001
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Lunes"
 
-#: ../src/common/utils.c:4969
+#: ../src/common/utils.c:5002
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Martes"
 
-#: ../src/common/utils.c:4970
+#: ../src/common/utils.c:5003
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: ../src/common/utils.c:4971
+#: ../src/common/utils.c:5004
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Jueves"
 
-#: ../src/common/utils.c:4972
+#: ../src/common/utils.c:5005
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Viernes"
 
-#: ../src/common/utils.c:4973
+#: ../src/common/utils.c:5006
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sábado"
 
-#: ../src/common/utils.c:4975
+#: ../src/common/utils.c:5008
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Enero"
 
-#: ../src/common/utils.c:4976
+#: ../src/common/utils.c:5009
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Febrero"
 
-#: ../src/common/utils.c:4977
+#: ../src/common/utils.c:5010
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marzo"
 
-#: ../src/common/utils.c:4978
+#: ../src/common/utils.c:5011
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Abril"
 
-#: ../src/common/utils.c:4979
+#: ../src/common/utils.c:5012
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mayo"
 
-#: ../src/common/utils.c:4980
+#: ../src/common/utils.c:5013
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Junio"
 
-#: ../src/common/utils.c:4981
+#: ../src/common/utils.c:5014
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Julio"
 
-#: ../src/common/utils.c:4982
+#: ../src/common/utils.c:5015
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Agosto"
 
-#: ../src/common/utils.c:4983
+#: ../src/common/utils.c:5016
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Septiembre"
 
-#: ../src/common/utils.c:4984
+#: ../src/common/utils.c:5017
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octubre"
 
-#: ../src/common/utils.c:4985
+#: ../src/common/utils.c:5018
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Noviembre"
 
-#: ../src/common/utils.c:4986
+#: ../src/common/utils.c:5019
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Diciembre"
 
-#: ../src/common/utils.c:4988
+#: ../src/common/utils.c:5021
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dom"
 
-#: ../src/common/utils.c:4989
+#: ../src/common/utils.c:5022
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Lun"
 
-#: ../src/common/utils.c:4990
+#: ../src/common/utils.c:5023
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Mar"
 
-#: ../src/common/utils.c:4991
+#: ../src/common/utils.c:5024
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mié"
 
-#: ../src/common/utils.c:4992
+#: ../src/common/utils.c:5025
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Jue"
 
-#: ../src/common/utils.c:4993
+#: ../src/common/utils.c:5026
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Vie"
 
-#: ../src/common/utils.c:4994
+#: ../src/common/utils.c:5027
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sáb"
 
-#: ../src/common/utils.c:4996
+#: ../src/common/utils.c:5029
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Ene"
 
-#: ../src/common/utils.c:4997
+#: ../src/common/utils.c:5030
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: ../src/common/utils.c:4998
+#: ../src/common/utils.c:5031
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: ../src/common/utils.c:4999
+#: ../src/common/utils.c:5032
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Abr"
 
-#: ../src/common/utils.c:5000
+#: ../src/common/utils.c:5033
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "May"
 
-#: ../src/common/utils.c:5001
+#: ../src/common/utils.c:5034
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: ../src/common/utils.c:5002
+#: ../src/common/utils.c:5035
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: ../src/common/utils.c:5003
+#: ../src/common/utils.c:5036
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ago"
 
-#: ../src/common/utils.c:5004
+#: ../src/common/utils.c:5037
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: ../src/common/utils.c:5005
+#: ../src/common/utils.c:5038
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Oct"
 
-#: ../src/common/utils.c:5006
+#: ../src/common/utils.c:5039
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: ../src/common/utils.c:5007
+#: ../src/common/utils.c:5040
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dic"
 
-#: ../src/common/utils.c:5018
+#: ../src/common/utils.c:5051
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: ../src/common/utils.c:5019
+#: ../src/common/utils.c:5052
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: ../src/common/utils.c:5020
+#: ../src/common/utils.c:5053
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: ../src/common/utils.c:5021
+#: ../src/common/utils.c:5054
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
@@ -1561,7 +1723,7 @@ msgstr "_Añadir..."
 
 #: ../src/compose.c:571 ../src/mh_gtk.c:361
 #: ../src/plugins/mailmbox/plugin_gtk.c:293
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:140
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:307
 msgid "_Remove"
 msgstr "Elimina_r"
 
@@ -1570,7 +1732,7 @@ msgid "_Properties..."
 msgstr "_Propiedades..."
 
 #. menus
-#: ../src/compose.c:580 ../src/mainwindow.c:506 ../src/messageview.c:212
+#: ../src/compose.c:580 ../src/mainwindow.c:508 ../src/messageview.c:212
 msgid "_Message"
 msgstr "_Mensaje"
 
@@ -1642,7 +1804,7 @@ msgstr "_Recortado"
 msgid "_Unwrapped"
 msgstr "_Sin recortar"
 
-#: ../src/compose.c:618 ../src/mainwindow.c:539
+#: ../src/compose.c:618 ../src/mainwindow.c:541
 msgid "Select _all"
 msgstr "_Seleccionar todo"
 
@@ -1774,48 +1936,48 @@ msgstr "_Prioridad"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
 #. {"View/Scroll/---",          NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:666 ../src/mainwindow.c:603 ../src/messageview.c:265
+#: ../src/compose.c:666 ../src/mainwindow.c:605 ../src/messageview.c:265
 msgid "Character _encoding"
 msgstr "Codificación de caract_eres"
 
-#: ../src/compose.c:671 ../src/mainwindow.c:608 ../src/messageview.c:270
+#: ../src/compose.c:671 ../src/mainwindow.c:610 ../src/messageview.c:270
 msgid "Western European"
 msgstr "Europeo Occidental"
 
-#: ../src/compose.c:672 ../src/mainwindow.c:609 ../src/messageview.c:271
+#: ../src/compose.c:672 ../src/mainwindow.c:611 ../src/messageview.c:271
 msgid "Baltic"
 msgstr "Báltico"
 
-#: ../src/compose.c:673 ../src/mainwindow.c:610 ../src/messageview.c:272
+#: ../src/compose.c:673 ../src/mainwindow.c:612 ../src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../src/compose.c:674 ../src/mainwindow.c:611 ../src/messageview.c:273
+#: ../src/compose.c:674 ../src/mainwindow.c:613 ../src/messageview.c:273
 msgid "Arabic"
 msgstr "Árabe"
 
-#: ../src/compose.c:675 ../src/mainwindow.c:612 ../src/messageview.c:274
+#: ../src/compose.c:675 ../src/mainwindow.c:614 ../src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: ../src/compose.c:676 ../src/mainwindow.c:613 ../src/messageview.c:275
+#: ../src/compose.c:676 ../src/mainwindow.c:615 ../src/messageview.c:275
 msgid "Japanese"
 msgstr "Japonés"
 
-#: ../src/compose.c:677 ../src/mainwindow.c:614 ../src/messageview.c:276
+#: ../src/compose.c:677 ../src/mainwindow.c:616 ../src/messageview.c:276
 msgid "Chinese"
 msgstr "Chino"
 
-#: ../src/compose.c:678 ../src/mainwindow.c:615 ../src/messageview.c:277
+#: ../src/compose.c:678 ../src/mainwindow.c:617 ../src/messageview.c:277
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../src/compose.c:679 ../src/mainwindow.c:616 ../src/messageview.c:278
+#: ../src/compose.c:679 ../src/mainwindow.c:618 ../src/messageview.c:278
 msgid "Thai"
 msgstr "Tailandés"
 
 #. Tools menu
-#: ../src/compose.c:682 ../src/mainwindow.c:723 ../src/messageview.c:314
+#: ../src/compose.c:682 ../src/mainwindow.c:725 ../src/messageview.c:314
 msgid "_Address book"
 msgstr "_Agenda de direcciones"
 
@@ -1824,7 +1986,7 @@ msgid "_Template"
 msgstr "Plan_tilla"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:686 ../src/mainwindow.c:751 ../src/messageview.c:335
+#: ../src/compose.c:686 ../src/mainwindow.c:753 ../src/messageview.c:335
 msgid "Actio_ns"
 msgstr "Accio_nes"
 
@@ -1868,13 +2030,13 @@ msgid "_Normal"
 msgstr "_Normal"
 
 #. RADIO compose_reply_change_mode_cb
-#: ../src/compose.c:707 ../src/mainwindow.c:657 ../src/messageview.c:303
+#: ../src/compose.c:707 ../src/mainwindow.c:659 ../src/messageview.c:303
 msgid "_All"
 msgstr "_Todo"
 
 #. RADIO compose_reply_change_mode_cb
 #. COMPOSE_REPLY_TO_ALL
-#: ../src/compose.c:708 ../src/mainwindow.c:658 ../src/messageview.c:304
+#: ../src/compose.c:708 ../src/mainwindow.c:660 ../src/messageview.c:304
 msgid "_Sender"
 msgstr "_Remitente"
 
@@ -1902,19 +2064,19 @@ msgstr "_Baja"
 msgid "_Lowest"
 msgstr "M_uy baja"
 
-#: ../src/compose.c:723 ../src/mainwindow.c:865 ../src/messageview.c:352
+#: ../src/compose.c:723 ../src/mainwindow.c:868 ../src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automático"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:724 ../src/mainwindow.c:866 ../src/messageview.c:353
+#: ../src/compose.c:724 ../src/mainwindow.c:869 ../src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:725 ../src/mainwindow.c:867 ../src/messageview.c:354
+#: ../src/compose.c:725 ../src/mainwindow.c:870 ../src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
@@ -1926,7 +2088,7 @@ msgstr "Unicode (_UTF-8)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:729 ../src/mainwindow.c:871 ../src/messageview.c:358
+#: ../src/compose.c:729 ../src/mainwindow.c:874 ../src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centroeuropeo (ISO-8859-_2)"
 
@@ -1936,7 +2098,7 @@ msgstr "Centroeuropeo (ISO-8859-_2)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:732 ../src/mainwindow.c:874 ../src/messageview.c:361
+#: ../src/compose.c:732 ../src/mainwindow.c:877 ../src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Griego (ISO-8859-_7)"
 
@@ -1950,7 +2112,7 @@ msgstr "Griego (ISO-8859-_7)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:737 ../src/mainwindow.c:879 ../src/messageview.c:366
+#: ../src/compose.c:737 ../src/mainwindow.c:882 ../src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turco (ISO-8859-_9)"
 
@@ -1999,40 +2161,40 @@ msgstr "Error en el cuerpo de la plantilla de «Reenviar» en la línea %d."
 
 #: ../src/compose.c:2044
 msgid "Fw: multiple emails"
-msgstr "Fw: múltiples correos"
+msgstr "Rv: múltiples correos"
 
 #: ../src/compose.c:2524
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
-msgstr "Error en el cuerpo de la plantilla de «Redirijir» en la línea %d."
+msgstr "Error en el cuerpo de la plantilla de «Redirigir» en la línea %d."
 
-#: ../src/compose.c:2591 ../src/gtk/headers.h:13
+#: ../src/compose.c:2591 ../src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: ../src/compose.c:2594 ../src/gtk/headers.h:14
+#: ../src/compose.c:2594 ../src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: ../src/compose.c:2597 ../src/gtk/headers.h:11
+#: ../src/compose.c:2597 ../src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Responder a:"
 
 #: ../src/compose.c:2600 ../src/compose.c:4911 ../src/compose.c:4913
-#: ../src/gtk/headers.h:32
+#: ../src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Grupos de noticias:"
 
-#: ../src/compose.c:2603 ../src/gtk/headers.h:33
+#: ../src/compose.c:2603 ../src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Enviar a:"
 
-#: ../src/compose.c:2606 ../src/gtk/headers.h:16
+#: ../src/compose.c:2606 ../src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "En-Respuesta-A:"
 
 #: ../src/compose.c:2610 ../src/compose.c:4908 ../src/compose.c:4916
-#: ../src/gtk/headers.h:12 ../src/summary_search.c:433
+#: ../src/gtk/headers.h:13 ../src/summary_search.c:433
 msgid "To:"
 msgstr "Para:"
 
@@ -2077,7 +2239,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
-#: ../src/compose.c:3603 ../src/compose.c:11144
+#: ../src/compose.c:3603 ../src/compose.c:11152
 msgid "+_Insert"
 msgstr "+_Insertar"
 
@@ -2104,16 +2266,16 @@ msgstr "No puedo leer %s."
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:432
+#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:435
+#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 
-#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:438
+#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sin asunto] - Componer mensaje%s"
@@ -2122,7 +2284,7 @@ msgstr "[sin asunto] - Componer mensaje%s"
 #. * This partly duplicates functionality in compose.c::compose_set_title().
 #. * While it's nice to not have to modify Claws Mail for this to work,
 #. * it would be cleaner to export that function in Claws Mail.
-#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:426
+#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Componer un mensaje nuevo"
 
@@ -2182,7 +2344,7 @@ msgstr "¿Ponerlo en la cola igualmente?"
 msgid "Send later"
 msgstr "Enviar después"
 
-#: ../src/compose.c:5134 ../src/compose.c:9719
+#: ../src/compose.c:5134 ../src/compose.c:9750
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2192,7 +2354,7 @@ msgstr ""
 "\n"
 "Falló la conversión del conjunto caracteres."
 
-#: ../src/compose.c:5137 ../src/compose.c:9722
+#: ../src/compose.c:5137 ../src/compose.c:9753
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2202,7 +2364,7 @@ msgstr ""
 "\n"
 "No se pudo obtener la clave de cifrado del destinatario."
 
-#: ../src/compose.c:5143 ../src/compose.c:9716
+#: ../src/compose.c:5143 ../src/compose.c:9747
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2234,7 +2396,7 @@ msgid ""
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "El mensaje está en la cola pero no se pudo enviar.\n"
-"Utilize «Enviar mensaje(s) en cola» en la ventana principal para enviarlo"
+"Utilice «Enviar mensaje(s) en cola» en la ventana principal para enviarlo"
 
 #: ../src/compose.c:5219
 #, c-format
@@ -2243,7 +2405,7 @@ msgid ""
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "%s\n"
-"Utilize «Enviar mensaje(s) en cola» en la ventana principal para reintentar."
+"Utilice «Enviar mensaje(s) en cola» en la ventana principal para reintentar."
 
 #: ../src/compose.c:5594
 #, c-format
@@ -2290,7 +2452,7 @@ msgstr "La cuenta seleccionada no es NNTP: es imposible enviar el post."
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "El adjunto %s ya no existe. ¿Ignorar?"
 
-#: ../src/compose.c:6133 ../src/mainwindow.c:648 ../src/toolbar.c:231
+#: ../src/compose.c:6133 ../src/mainwindow.c:650 ../src/toolbar.c:231
 #: ../src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Cancelar envío"
@@ -2308,34 +2470,34 @@ msgstr "Parte original %s"
 msgid "Add to address _book"
 msgstr "Añadir a la agen_da"
 
-#: ../src/compose.c:6908
+#: ../src/compose.c:6912
 msgid "Delete entry contents"
 msgstr "Borrar contenidos de la cuenta"
 
-#: ../src/compose.c:6912 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: ../src/compose.c:6916 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Usar «tab» para autocompletar con la agenda"
 
-#: ../src/compose.c:7132
+#: ../src/compose.c:7136
 msgid "Mime type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: ../src/compose.c:7138 ../src/mimeview.c:274
-#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:627
+#: ../src/compose.c:7142 ../src/mimeview.c:274
+#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:630
 #: ../src/prefs_summary_column.c:85 ../src/summaryview.c:445
 msgid "Size"
 msgstr "Tamaño"
 
 #. Save Message to folder
-#: ../src/compose.c:7201
+#: ../src/compose.c:7205
 msgid "Save Message to "
 msgstr "Guardar mensaje en "
 
-#: ../src/compose.c:7238 ../src/editjpilot.c:276 ../src/editldap.c:520
+#: ../src/compose.c:7242 ../src/editjpilot.c:276 ../src/editldap.c:520
 #: ../src/editvcard.c:192 ../src/export.c:164 ../src/import.c:163
 #: ../src/importmutt.c:239 ../src/importpine.c:238
-#: ../src/plugins/archive/archiver_gtk.c:1028
+#: ../src/plugins/archive/archiver_gtk.c:1029
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:188
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:208
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:181
@@ -2344,24 +2506,23 @@ msgstr "Guardar mensaje en "
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: ../src/compose.c:7710
+#: ../src/compose.c:7714
 msgid "Hea_der"
 msgstr "_Cabecera"
 
-#: ../src/compose.c:7715
+#: ../src/compose.c:7719
 msgid "_Attachments"
 msgstr "_Adjuntos"
 
-#: ../src/compose.c:7729
+#: ../src/compose.c:7733
 msgid "Othe_rs"
 msgstr "Ot_ros"
 
-#: ../src/compose.c:7744 ../src/gtk/headers.h:18
-#: ../src/plugins/pdf_viewer/poppler_viewer.c:702 ../src/summary_search.c:440
-msgid "Subject:"
-msgstr "Asunto:"
+#: ../src/compose.c:7748
+msgid "_Subject:"
+msgstr "A_sunto:"
 
-#: ../src/compose.c:7966
+#: ../src/compose.c:7970
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2370,20 +2531,20 @@ msgstr ""
 "No se puede iniciar el corrector ortográfico.\n"
 "%s"
 
-#: ../src/compose.c:8072
+#: ../src/compose.c:8076
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Desde: <i>%s</i>"
 
-#: ../src/compose.c:8106
+#: ../src/compose.c:8119
 msgid "Account to use for this email"
 msgstr "Cuenta a usar para este correo"
 
-#: ../src/compose.c:8108
+#: ../src/compose.c:8121
 msgid "Sender address to be used"
 msgstr "Dirección del remitente a usar"
 
-#: ../src/compose.c:8272
+#: ../src/compose.c:8285
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2392,64 +2553,68 @@ msgstr ""
 "No se ha podido cargar el sistema de privacidad «%s». No será posible firmar "
 "o cifrar este mensaje."
 
-#: ../src/compose.c:8372 ../src/plugins/archive/archiver_gtk.c:1082
+#: ../src/compose.c:8385 ../src/plugins/archive/archiver_gtk.c:1083
 msgid "_None"
 msgstr "_Ninguno"
 
-#: ../src/compose.c:8473 ../src/prefs_template.c:753
+#: ../src/compose.c:8486 ../src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla en la línea %d."
 
-#: ../src/compose.c:8589
+#: ../src/compose.c:8602
 msgid "Template From format error."
 msgstr "Error de formato en el Desde de la plantilla."
 
-#: ../src/compose.c:8607
+#: ../src/compose.c:8620
 msgid "Template To format error."
 msgstr "Error de formato en el Para de la plantilla."
 
-#: ../src/compose.c:8625
+#: ../src/compose.c:8638
 msgid "Template Cc format error."
 msgstr "Error de formato en el Cc de la plantilla."
 
-#: ../src/compose.c:8643
+#: ../src/compose.c:8656
 msgid "Template Bcc format error."
 msgstr "Error de formato en el Bcc de la plantilla."
 
-#: ../src/compose.c:8662
+#: ../src/compose.c:8674
+msgid "Template Reply-To format error."
+msgstr "Error de formato en el Reply-To de la plantilla."
+
+#: ../src/compose.c:8693
 msgid "Template subject format error."
 msgstr "Error de formato en el asunto de la plantilla."
 
-#: ../src/compose.c:8930
+#: ../src/compose.c:8961
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: ../src/compose.c:8945
+#: ../src/compose.c:8976
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: ../src/compose.c:9019
+#: ../src/compose.c:9050
 msgid "Properties"
 msgstr "Propiedades"
 
-#: ../src/compose.c:9036
+#: ../src/compose.c:9067
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: ../src/compose.c:9077
+#: ../src/compose.c:9108
 msgid "Encoding"
 msgstr "Codificación"
 
-#: ../src/compose.c:9097
+#: ../src/compose.c:9128
 msgid "Path"
 msgstr "Ruta"
 
-#: ../src/compose.c:9098
+#: ../src/compose.c:9129
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: ../src/compose.c:9290
+#: ../src/compose.c:9321
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2460,15 +2625,15 @@ msgstr ""
 "¿Desea terminar el proceso?\n"
 "Id. de proceso: %d"
 
-#: ../src/compose.c:9685 ../src/messageview.c:1095
+#: ../src/compose.c:9716 ../src/messageview.c:1095
 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:9711
+#: ../src/compose.c:9742
 msgid "Could not queue message."
 msgstr "El mensaje no se pudo poner en la cola."
 
-#: ../src/compose.c:9713
+#: ../src/compose.c:9744
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2479,15 +2644,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../src/compose.c:9891
+#: ../src/compose.c:9922
 msgid "Could not save draft."
 msgstr "No se puede guardar el borrador."
 
-#: ../src/compose.c:9895
+#: ../src/compose.c:9926
 msgid "Could not save draft"
 msgstr "No se puede guardar el borrador"
 
-#: ../src/compose.c:9896
+#: ../src/compose.c:9927
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2495,24 +2660,24 @@ msgstr ""
 "No se ha podido guardar el borrador.\n"
 "¿Desea cancelar la salida o descartar este correo?"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Cancel exit"
 msgstr "_Cancelar salida"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Discard email"
 msgstr "_Descartar correo"
 
-#: ../src/compose.c:10058 ../src/compose.c:10072
+#: ../src/compose.c:10089 ../src/compose.c:10103
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: ../src/compose.c:10086
+#: ../src/compose.c:10117
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No se puede leer el fichero «%s»."
 
-#: ../src/compose.c:10088
+#: ../src/compose.c:10119
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2521,63 +2686,63 @@ msgstr ""
 "El fichero «%s» contenía caracteres inválidos para\n"
 "la codificación actual, la inserción puede ser incorrecta."
 
-#: ../src/compose.c:10175
+#: ../src/compose.c:10206
 msgid "Discard message"
 msgstr "Descartar mensaje"
 
-#: ../src/compose.c:10176
+#: ../src/compose.c:10207
 msgid "This message has been modified. Discard it?"
 msgstr "Este mensaje se ha modificado. ¿Desea descartarlo?"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Save to Drafts"
 msgstr "Guardar en _Borradores"
 
-#: ../src/compose.c:10179
+#: ../src/compose.c:10210
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: ../src/compose.c:10180
+#: ../src/compose.c:10211
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Este mensaje se ha modificado. ¿Guardar los últimos cambios?"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "_Don't save"
 msgstr "_No guardar"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "+_Save to Drafts"
 msgstr "+Guardar en _Borradores"
 
-#: ../src/compose.c:10251
+#: ../src/compose.c:10282
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: ../src/compose.c:10253
+#: ../src/compose.c:10284
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: ../src/compose.c:10254 ../src/prefs_actions.c:329
+#: ../src/compose.c:10285 ../src/prefs_actions.c:329
 #: ../src/prefs_filtering_action.c:610 ../src/prefs_filtering.c:477
-#: ../src/prefs_matcher.c:772 ../src/prefs_template.c:309
+#: ../src/prefs_matcher.c:775 ../src/prefs_template.c:311
 #: ../src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: ../src/compose.c:10254
+#: ../src/compose.c:10285
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ../src/compose.c:11141
+#: ../src/compose.c:11149
 msgid "Insert or attach?"
 msgstr "¿Insertar o adjuntar?"
 
-#: ../src/compose.c:11142
+#: ../src/compose.c:11150
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2585,16 +2750,16 @@ msgstr ""
 "¿Quiere insertar el contenido de este/os fichero/s en el cuerpo del correo o "
 "prefiere adjuntarlo/s al mismo?"
 
-#: ../src/compose.c:11144
+#: ../src/compose.c:11152
 msgid "_Attach"
 msgstr "_Adjuntar"
 
-#: ../src/compose.c:11361
+#: ../src/compose.c:11369
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Error de formato de cita en la línea %d."
 
-#: ../src/compose.c:11656
+#: ../src/compose.c:11664
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2853,15 +3018,15 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: ../src/editgroup.c:556 ../src/foldersel.c:581 ../src/imap_gtk.c:195
+#: ../src/editgroup.c:556 ../src/foldersel.c:585 ../src/imap_gtk.c:195
 #: ../src/mh_gtk.c:145 ../src/plugins/mailmbox/plugin_gtk.c:239
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:89
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: ../src/editgroup.c:557 ../src/foldersel.c:582 ../src/mh_gtk.c:146
+#: ../src/editgroup.c:557 ../src/foldersel.c:586 ../src/mh_gtk.c:146
 #: ../src/plugins/mailmbox/plugin_gtk.c:240
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:90
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -3055,7 +3220,7 @@ msgid ""
 "more memory to cache results."
 msgstr ""
 "Define el periodo de tiempo máximo (en segundos) de validez del resultado de "
-"una búsqueda de direcciónes a efectos de autocompletar. Los resultados de la "
+"una búsqueda de direcciones a efectos de autocompletar. Los resultados de la "
 "búsqueda se almacenan en una caché durante este tiempo y después se "
 "eliminan. Esto mejorará el tiempo de respuesta intentando buscar el mismo "
 "nombre o dirección en peticiones de autocompletar posteriores. Se buscará "
@@ -3215,7 +3380,7 @@ msgstr "Añadir nueva entrada vCard"
 
 #: ../src/etpan/etpan-ssl.c:167
 msgid "Impossible to set the client certificate.\n"
-msgstr ""
+msgstr "Imposible establecer el certificado de cliente.\n"
 
 #: ../src/exphtmldlg.c:106
 msgid "Please specify output directory and file to create."
@@ -3286,9 +3451,9 @@ msgstr "Hoja de estilos"
 #. * can always get back the SummaryView pointer.
 #: ../src/exphtmldlg.c:453 ../src/gtk/colorlabel.c:406
 #: ../src/gtk/gtkaspell.c:1571 ../src/gtk/gtkaspell.c:2231
-#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1174
+#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1177
 #: ../src/plugins/archive/archiver_prefs.c:241
-#: ../src/plugins/libravatar/libravatar_prefs.c:187 ../src/prefs_account.c:949
+#: ../src/plugins/libravatar/libravatar_prefs.c:206 ../src/prefs_account.c:949
 #: ../src/prefs_toolbar.c:780 ../src/prefs_toolbar.c:1465
 #: ../src/summaryview.c:6008
 msgid "None"
@@ -3300,7 +3465,7 @@ msgid "Default"
 msgstr "Por omisión"
 
 #: ../src/exphtmldlg.c:455 ../src/plugins/pgpcore/select-keys.c:244
-#: ../src/plugins/pgpcore/sgpgme.c:148
+#: ../src/plugins/pgpcore/sgpgme.c:148 ../src/plugins/pgpcore/sgpgme.c:164
 msgid "Full"
 msgstr "Completo"
 
@@ -3506,7 +3671,7 @@ msgid ""
 "above will be used if the DN user attribute is not found."
 msgstr ""
 "La agenda puede contener entradas que fueron importadas previamente desde un "
-"fichero LDIF. El atributo de usuarii \"Nombre Distinguido\" (DN), si se "
+"fichero LDIF. El atributo de usuario \"Nombre Distinguido\" (DN), si se "
 "encuentra en los datos de la agenda, se puede usar en el fichero LDIF "
 "exportado. Se usará el RDN seleccionado arriba si no se encuentra el "
 "atributo DN."
@@ -3531,7 +3696,7 @@ msgstr "Exportar agenda a un fichero LDIF"
 msgid "Distinguished Name"
 msgstr "Nombre distinguido"
 
-#: ../src/export.c:113 ../src/summaryview.c:8117
+#: ../src/export.c:113 ../src/summaryview.c:8120
 msgid "Export to mbox file"
 msgstr "Exportar a fichero mbox"
 
@@ -3568,7 +3733,7 @@ msgid "Full Name"
 msgstr "Nombre completo"
 
 #: ../src/exporthtml.c:771 ../src/importldif.c:1022
-#: ../src/plugins/archive/archiver_gtk.c:736
+#: ../src/plugins/archive/archiver_gtk.c:737
 msgid "Attributes"
 msgstr "Atributos"
 
@@ -3613,7 +3778,7 @@ msgstr ""
 
 #: ../src/filtering.c:619 ../src/filtering.c:694 ../src/filtering.c:723
 msgid "rule is not account-based\n"
-msgstr ""
+msgstr "la regla no está basada en una cuenta\n"
 
 #: ../src/filtering.c:623
 #, c-format
@@ -3621,18 +3786,20 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
 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:625 ../src/filtering.c:642 ../src/filtering.c:643
 #: ../src/filtering.c:667 ../src/filtering.c:685 ../src/filtering.c:712
 #: ../src/filtering.c:713 ../src/filtering.c:730 ../src/filtering.c:731
 msgid "NON_EXISTENT"
-msgstr ""
+msgstr "NO_EXISTENTE"
 
 #: ../src/filtering.c:633
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
+"la regla está basada en una cuenta, que no coincide con la cuenta usada actualmente para recuperar mensajes\n"
 
 #: ../src/filtering.c:640
 #, c-format
@@ -3640,11 +3807,13 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
 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:659
 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:665
 #, c-format
@@ -3652,15 +3821,16 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
 "request\n"
 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:683
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
-msgstr ""
+msgstr "la regla está basada en una cuenta [id=%d, nombre=«%s»], omitida a petición del usuario\n"
 
 #: ../src/filtering.c:688
 msgid "rule is account-based, skipped on user request\n"
-msgstr ""
+msgstr "la regla está basada en una cuenta, omitida a petición del usuario\n"
 
 #: ../src/filtering.c:710
 #, c-format
@@ -3668,10 +3838,11 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching current account [id="
 "%d, name='%s']\n"
 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:716
 msgid "rule is account-based, not matching current account\n"
-msgstr ""
+msgstr "la regla está basada en una cuenta, que no coincide con la cuenta actual\n"
 
 #: ../src/filtering.c:728
 #, c-format
@@ -3679,70 +3850,65 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], current account [id=%d, "
 "name='%s']\n"
 msgstr ""
+"la regla está basada en una cuenta [id=%d, nombre=«%s»], cuenta actual [id=%d, nombre=«%s»]\n"
 
 #: ../src/filtering.c:768
 #, c-format
 msgid "applying action [ %s ]\n"
-msgstr ""
+msgstr "aplicando acción [ %s ]\n"
 
 #: ../src/filtering.c:773
 msgid "action could not apply\n"
-msgstr ""
+msgstr "la acción no se pudo aplicar\n"
 
 #: ../src/filtering.c:775
 #, c-format
 msgid "no further processing after action [ %s ]\n"
-msgstr ""
+msgstr "no se sigue procesando después de la acción [ %s ]\n"
 
 #: ../src/filtering.c:826
-#, fuzzy, c-format
+#, c-format
 msgid "processing rule '%s' [ %s ]\n"
-msgstr "Ejec_utar reglas de procesamiento"
+msgstr "procesando regla «%s» [ %s ]\n"
 
 #: ../src/filtering.c:830
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "procesando regla <sinnombre> [ %s ]\n"
 
 #: ../src/filtering.c:848
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
-msgstr ""
+msgstr "desactivada regla «%s» [ %s ]\n"
 
 #: ../src/filtering.c:852
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "desactivada regla <sinnombre> [ %s ]\n"
 
 #: ../src/filtering.c:890
-#, fuzzy
 msgid "undetermined"
-msgstr "Indefinida"
+msgstr "indeterminada"
 
 #: ../src/filtering.c:894
-#, fuzzy
 msgid "incorporation"
-msgstr "se filtre en la incorporación"
+msgstr "incorporación"
 
 #: ../src/filtering.c:898
-#, fuzzy
 msgid "manually"
-msgstr "_Manual"
+msgstr "manualmente"
 
 #: ../src/filtering.c:902
-#, fuzzy
 msgid "folder processing"
-msgstr "Ejecutar reglas de procesamiento de la carpeta"
+msgstr "procesamiento de la carpeta"
 
 #: ../src/filtering.c:906
-#, fuzzy
 msgid "pre-processing"
-msgstr "Pre-pr_ocesamiento..."
+msgstr "pre-procesamiento"
 
 #: ../src/filtering.c:910
-#, fuzzy
 msgid "post-processing"
-msgstr "Post-pro_cesamiento..."
+msgstr "post-procesamiento"
 
 #: ../src/filtering.c:927
 #, c-format
@@ -3754,10 +3920,16 @@ msgid ""
 "%s%s %s\n"
 "%s%s %s\n"
 msgstr ""
+"filtrando mensaje (%s%s%s)\n"
+"%sfichero de mensaje: %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
 
 #: ../src/filtering.c:929 ../src/filtering.c:938
 msgid ": "
-msgstr ""
+msgstr ": "
 
 #: ../src/filtering.c:936
 #, c-format
@@ -3765,6 +3937,8 @@ msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
 msgstr ""
+"filtrando mensaje (%s%s%s)\n"
+"%sfichero de mensaje: %s\n"
 
 #: ../src/folder.c:1564 ../src/foldersel.c:403 ../src/prefs_folder_item.c:306
 msgid "Inbox"
@@ -3822,38 +3996,37 @@ msgstr "Sincronizando %s para uso sin conexión...\n"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: ../src/foldersel.c:583 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
+#: ../src/foldersel.c:587 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
 #: ../src/plugins/mailmbox/plugin_gtk.c:241
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: ../src/foldersel.c:591 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
+#: ../src/foldersel.c:595 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
 #: ../src/imap_gtk.c:272 ../src/imap_gtk.c:277 ../src/mh_gtk.c:155
 #: ../src/mh_gtk.c:259 ../src/news_gtk.c:315
 #: ../src/plugins/mailmbox/plugin_gtk.c:249
 #: ../src/plugins/mailmbox/plugin_gtk.c:416
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:97
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:339
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
 #: ../src/plugins/vcalendar/vcal_folder.c:2040
 #, 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:601 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
+#: ../src/foldersel.c:605 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
 #: ../src/mh_gtk.c:165 ../src/mh_gtk.c:266 ../src/news_gtk.c:322
 #: ../src/plugins/mailmbox/plugin_gtk.c:261
 #: ../src/plugins/mailmbox/plugin_gtk.c:425
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:107
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:346
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:211
 #: ../src/plugins/vcalendar/vcal_folder.c:2047
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La carpeta «%s» ya existe."
 
-#: ../src/foldersel.c:608 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
+#: ../src/foldersel.c:612 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
 #: ../src/plugins/mailmbox/plugin_gtk.c:268
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:113
+#: ../src/plugins/rssyl/opml_import.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:121
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "No se puede crear la carpeta «%s»."
@@ -3866,7 +4039,7 @@ msgstr "Marcar todos como l_eídos"
 msgid "R_un processing rules"
 msgstr "Ejec_utar reglas de procesamiento"
 
-#: ../src/folderview.c:233 ../src/mainwindow.c:544
+#: ../src/folderview.c:233 ../src/mainwindow.c:546
 msgid "_Search folder..."
 msgstr "_Buscar en carpeta..."
 
@@ -3885,7 +4058,7 @@ msgstr "Enviar _cola..."
 #. F_COL_FOLDER
 #: ../src/folderview.c:380 ../src/folderview.c:427
 #: ../src/plugins/notification/notification_lcdproc.c:141
-#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:388
+#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:391
 #: ../src/summaryview.c:6284
 msgid "New"
 msgstr "Nuevos"
@@ -3893,7 +4066,7 @@ msgstr "Nuevos"
 #. F_COL_NEW
 #: ../src/folderview.c:381 ../src/folderview.c:428
 #: ../src/plugins/notification/notification_lcdproc.c:145
-#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:387
+#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:390
 #: ../src/summaryview.c:6286
 msgid "Unread"
 msgstr "No leídos"
@@ -3915,21 +4088,21 @@ msgstr "Nº"
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 
-#: ../src/folderview.c:823 ../src/summaryview.c:4117 ../src/summaryview.c:4119
+#: ../src/folderview.c:823 ../src/summaryview.c:4119 ../src/summaryview.c:4121
 msgid "Mark all as read"
 msgstr "Marcar todo como leído"
 
-#: ../src/folderview.c:824 ../src/summaryview.c:4118
+#: ../src/folderview.c:824 ../src/summaryview.c:4120
 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:982 ../src/imap.c:4528 ../src/mainwindow.c:5134
+#: ../src/folderview.c:982 ../src/imap.c:4574 ../src/mainwindow.c:5157
 #: ../src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Revisando carpeta %s%c%s..."
 
-#: ../src/folderview.c:986 ../src/imap.c:4533 ../src/mainwindow.c:5139
+#: ../src/folderview.c:986 ../src/imap.c:4579 ../src/mainwindow.c:5162
 #: ../src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
@@ -3962,60 +4135,60 @@ msgstr "No se puede explorar la carpeta %s\n"
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar mensajes nuevos en todas las carpetas..."
 
-#: ../src/folderview.c:2005
+#: ../src/folderview.c:2046
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Cerrando carpeta %s..."
 
 #. Open Folder
 #. TODO: wwp: avoid displaying (null) in the status bar
-#: ../src/folderview.c:2100
+#: ../src/folderview.c:2141
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Abriendo carpeta %s..."
 
-#: ../src/folderview.c:2118
+#: ../src/folderview.c:2159
 msgid "Folder could not be opened."
 msgstr "No se puede abrir la carpeta."
 
-#: ../src/folderview.c:2261 ../src/mainwindow.c:2877 ../src/mainwindow.c:2881
+#: ../src/folderview.c:2302 ../src/mainwindow.c:2887 ../src/mainwindow.c:2891
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: ../src/folderview.c:2262
+#: ../src/folderview.c:2303
 msgid "Delete all messages in trash?"
 msgstr "¿Borrar todos los mensajes de la papelera?"
 
-#: ../src/folderview.c:2263
+#: ../src/folderview.c:2304
 msgid "+_Empty trash"
 msgstr "+_Vaciar papelera"
 
-#: ../src/folderview.c:2307 ../src/inc.c:1540 ../src/toolbar.c:2607
+#: ../src/folderview.c:2348 ../src/inc.c:1540 ../src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Notificación conexión"
 
-#: ../src/folderview.c:2308 ../src/toolbar.c:2608
+#: ../src/folderview.c:2349 ../src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Está trabajando sin conexión ¿Ignorar?"
 
-#: ../src/folderview.c:2319 ../src/toolbar.c:2627
+#: ../src/folderview.c:2360 ../src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Enviar mensajes en la cola"
 
-#: ../src/folderview.c:2320 ../src/toolbar.c:2628
+#: ../src/folderview.c:2361 ../src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "¿Enviar todos los mensajes en la cola?"
 
-#: ../src/folderview.c:2321 ../src/messageview.c:854 ../src/messageview.c:871
+#: ../src/folderview.c:2362 ../src/messageview.c:854 ../src/messageview.c:871
 #: ../src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../src/folderview.c:2329 ../src/toolbar.c:2647
+#: ../src/folderview.c:2370 ../src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocurrieron algunos errores enviando los mensajes en la cola."
 
-#: ../src/folderview.c:2332 ../src/main.c:2714 ../src/toolbar.c:2650
+#: ../src/folderview.c:2373 ../src/main.c:2714 ../src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4024,65 +4197,65 @@ msgstr ""
 "Hubo algún error enviando los mensajes en la cola:\n"
 "%s"
 
-#: ../src/folderview.c:2409
+#: ../src/folderview.c:2450
 #, 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:2410
+#: ../src/folderview.c:2451
 #, 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:2412
+#: ../src/folderview.c:2453
 msgid "Copy folder"
 msgstr "Copiar carpeta"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Move folder"
 msgstr "Mover carpeta"
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s a %s..."
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Moviendo %s a %s..."
 
-#: ../src/folderview.c:2454
+#: ../src/folderview.c:2495
 msgid "Source and destination are the same."
 msgstr "El destino y el origen son la misma."
 
-#: ../src/folderview.c:2457
+#: ../src/folderview.c:2498
 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:2458
+#: ../src/folderview.c:2499
 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:2461
+#: ../src/folderview.c:2502
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "No se pueden mover carpetas entre buzones distintos."
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Copy failed!"
 msgstr "¡Copiar falló!"
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Move failed!"
 msgstr "¡Mover falló!"
 
-#: ../src/folderview.c:2515
+#: ../src/folderview.c:2556
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuración de procesamiento para la carpeta «%s»"
 
-#: ../src/folderview.c:2943 ../src/summaryview.c:4558
-#: ../src/summaryview.c:4657
+#: ../src/folderview.c:2984 ../src/summaryview.c:4560
+#: ../src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr "La carpeta destino sólo puede usarse para almacenar subcarpetas."
 
@@ -4160,7 +4333,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Para soporte y discusión subscríbase a la lista de usuarios de Claws Mail:\n"
+"Para soporte y discusión suscríbase a la lista de usuarios de Claws Mail:\n"
 
 #: ../src/gtk/about.c:143
 msgid ""
@@ -4308,7 +4481,7 @@ msgstr "Añade soporte para servidores IMAP y NNTP\n"
 #: ../src/gtk/about.c:502
 msgctxt "libSM"
 msgid "adds support for session handling\n"
-msgstr "Añade soporte para el manejo de sesion\n"
+msgstr "Añade soporte para el manejo de sesión\n"
 
 #: ../src/gtk/about.c:512
 msgctxt "NetworkManager"
@@ -4388,7 +4561,7 @@ msgstr "Tráfico saliente\n"
 #: ../src/gtk/about.c:732 ../src/main.c:2569
 #, c-format
 msgid "New/redirected messages: %d\n"
-msgstr "Mensajes nuevos/redirijidos: %d\n"
+msgstr "Mensajes nuevos/redirigidos: %d\n"
 
 #: ../src/gtk/about.c:737 ../src/main.c:2573
 #, c-format
@@ -4628,92 +4801,91 @@ msgstr ""
 
 #: ../src/gtk/gtkutils.c:1907
 msgid "Failed."
-msgstr ""
+msgstr "Falló."
 
 #: ../src/gtk/gtkutils.c:1970
-#, fuzzy
 msgid "Configuring..."
-msgstr "_Configuración"
+msgstr "Configurando..."
 
 #. RFC2822
 #. S_COL_TO
 #. date expression
 #. S_COL_TO
-#: ../src/gtk/headers.h:8 ../src/prefs_filtering_action.c:1259
-#: ../src/prefs_matcher.c:2158 ../src/prefs_summary_column.c:84
+#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1259
+#: ../src/prefs_matcher.c:2174 ../src/prefs_summary_column.c:84
 #: ../src/quote_fmt.c:49 ../src/summaryview.c:444
 msgid "Date"
 msgstr "Fecha"
 
-#: ../src/gtk/headers.h:8
+#: ../src/gtk/headers.h:9
 msgid "Date:"
 msgstr "Fecha:"
 
 #. S_COL_SUBJECT
 #. date
 #. S_COL_SUBJECT
-#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1256
-#: ../src/prefs_matcher.c:2155 ../src/prefs_summary_column.c:82
+#: ../src/gtk/headers.h:10 ../src/prefs_filtering_action.c:1256
+#: ../src/prefs_matcher.c:2171 ../src/prefs_summary_column.c:82
 #: ../src/quote_fmt.c:50 ../src/summaryview.c:442
 msgid "From"
 msgstr "Desde"
 
-#: ../src/gtk/headers.h:9 ../src/summary_search.c:426
+#: ../src/gtk/headers.h:10 ../src/summary_search.c:426
 msgid "From:"
 msgstr "Desde:"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender"
 msgstr "Remitente"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender:"
 msgstr "Remitente:"
 
-#: ../src/gtk/headers.h:11
+#: ../src/gtk/headers.h:12
 msgid "Reply-To"
 msgstr "Responder a"
 
 #. S_COL_FROM
 #. subject
 #. S_COL_FROM
-#: ../src/gtk/headers.h:12 ../src/prefs_filtering_action.c:1257
-#: ../src/prefs_matcher.c:2156 ../src/prefs_summary_column.c:83
+#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1257
+#: ../src/prefs_matcher.c:2172 ../src/prefs_summary_column.c:83
 #: ../src/quote_fmt.c:57 ../src/summaryview.c:443
 msgid "To"
 msgstr "Para"
 
 #. to
-#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1258
-#: ../src/prefs_matcher.c:2157 ../src/quote_fmt.c:58
+#: ../src/gtk/headers.h:14 ../src/prefs_filtering_action.c:1258
+#: ../src/prefs_matcher.c:2173 ../src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
-#: ../src/gtk/headers.h:14
+#: ../src/gtk/headers.h:15
 msgid "Bcc"
 msgstr "Bcc"
 
 #. references
-#: ../src/gtk/headers.h:15 ../src/prefs_filtering_action.c:1260
-#: ../src/prefs_matcher.c:2159 ../src/quote_fmt.c:61
+#: ../src/gtk/headers.h:16 ../src/prefs_filtering_action.c:1260
+#: ../src/prefs_matcher.c:2175 ../src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "ID-Mensaje"
 
-#: ../src/gtk/headers.h:15
+#: ../src/gtk/headers.h:16
 msgid "Message-ID:"
 msgstr "ID-Mensaje:"
 
-#: ../src/gtk/headers.h:16
+#: ../src/gtk/headers.h:17
 msgid "In-Reply-To"
 msgstr "En-Respuesta-A"
 
 #. newsgroups
-#: ../src/gtk/headers.h:17 ../src/prefs_filtering_action.c:1262
-#: ../src/prefs_matcher.c:2161 ../src/quote_fmt.c:60
+#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1262
+#: ../src/prefs_matcher.c:2177 ../src/quote_fmt.c:60
 msgid "References"
 msgstr "Referencias"
 
-#: ../src/gtk/headers.h:17
+#: ../src/gtk/headers.h:18
 msgid "References:"
 msgstr "Referencias:"
 
@@ -4721,328 +4893,333 @@ msgstr "Referencias:"
 #. initial of sender
 #. S_COL_STATUS
 #. S_COL_MIME
-#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1255
-#: ../src/prefs_matcher.c:2154 ../src/prefs_summary_column.c:81
+#: ../src/gtk/headers.h:19 ../src/prefs_filtering_action.c:1255
+#: ../src/prefs_matcher.c:2170 ../src/prefs_summary_column.c:81
 #: ../src/quote_fmt.c:56 ../src/summaryview.c:441
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:19 ../src/plugins/pdf_viewer/poppler_viewer.c:702
+#: ../src/summary_search.c:440
+msgid "Subject:"
+msgstr "Asunto:"
+
+#: ../src/gtk/headers.h:20
 msgid "Comments"
 msgstr "Comentarios"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:20
 msgid "Comments:"
 msgstr "Comentarios:"
 
-#: ../src/gtk/headers.h:20
+#: ../src/gtk/headers.h:21
 msgid "Keywords"
 msgstr "Palabras clave"
 
-#: ../src/gtk/headers.h:20 ../src/plugins/pdf_viewer/poppler_viewer.c:704
+#: ../src/gtk/headers.h:21 ../src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Keywords:"
 msgstr "Palabras clave:"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date"
 msgstr "Reenvío-Fecha"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date:"
 msgstr "Reenvío-Fecha:"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From"
 msgstr "Reenvío-Desde"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From:"
 msgstr "Reenvío-Desde:"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender"
 msgstr "Reenvío-Remitente"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender:"
 msgstr "Reenvío-Remitente:"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To"
 msgstr "Reenvío-Para"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To:"
 msgstr "Reenvío-Para:"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc"
 msgstr "Reenvío-Cc"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc:"
 msgstr "Reenvío-Cc:"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc"
 msgstr "Reenvío-Bcc"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc:"
 msgstr "Reenvío-Bcc:"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID"
 msgstr "Reenvío-ID-Mensaje"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID:"
 msgstr "Reenvío-ID-Mensaje:"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path"
 msgstr "Ruta-Retorno:"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path:"
 msgstr "Ruta-Retorno:"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received"
 msgstr "Recibido"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received:"
 msgstr "Recibido:"
 
 #. more
 #. cc
-#: ../src/gtk/headers.h:32 ../src/prefs_filtering_action.c:1261
-#: ../src/prefs_matcher.c:2160 ../src/quote_fmt.c:59
+#: ../src/gtk/headers.h:33 ../src/prefs_filtering_action.c:1261
+#: ../src/prefs_matcher.c:2176 ../src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
-#: ../src/gtk/headers.h:33
+#: ../src/gtk/headers.h:34
 msgid "Followup-To"
 msgstr "Subsiguiente-Para"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To"
 msgstr "Distribuido-A"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To:"
 msgstr "Distribuido-A:"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen"
 msgstr "Visto"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen:"
 msgstr "Visto:"
 
 #. S_COL_MARK
-#: ../src/gtk/headers.h:36 ../src/gtk/progressdialog.c:149
+#: ../src/gtk/headers.h:37 ../src/gtk/progressdialog.c:149
 #: ../src/gtk/sslcertwindow.c:164 ../src/prefs_summary_column.c:79
 #: ../src/summaryview.c:2793
 msgid "Status"
 msgstr "Estado"
 
-#: ../src/gtk/headers.h:36 ../src/prefs_themes.c:906
+#: ../src/gtk/headers.h:37 ../src/prefs_themes.c:906
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face"
 msgstr "Cara"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face:"
 msgstr "Cara:"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To"
 msgstr "Notificación-Disposición-A"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To:"
 msgstr "Notificación-Disposición-Para:"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To"
 msgstr "Acuse-Recibo-Para"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To:"
 msgstr "Acuse-Recibo-Para:"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent"
 msgstr "Agente-Usuario"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent:"
 msgstr "Agente-Usuario:"
 
-#: ../src/gtk/headers.h:41
+#: ../src/gtk/headers.h:42
 msgid "Content-Type"
 msgstr "Tipo-Contenido"
 
-#: ../src/gtk/headers.h:41 ../src/image_viewer.c:327
+#: ../src/gtk/headers.h:42 ../src/image_viewer.c:327
 msgid "Content-Type:"
 msgstr "Tipo-Contenido:"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding"
 msgstr "Codificación-Transferencia-Contenido"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding:"
 msgstr "Codificación-Transferencia-Contenido:"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version"
 msgstr "Versión-MIME"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version:"
 msgstr "Versión-MIME:"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence"
 msgstr "Precedencia"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence:"
 msgstr "Precedencia:"
 
-#: ../src/gtk/headers.h:45 ../src/prefs_account.c:1073
+#: ../src/gtk/headers.h:46 ../src/prefs_account.c:1073
 msgid "Organization"
 msgstr "Organización"
 
-#: ../src/gtk/headers.h:45
+#: ../src/gtk/headers.h:46
 msgid "Organization:"
 msgstr "Organización:"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List"
 msgstr "Lista-Correo"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List:"
 msgstr "Lista-Correo:"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post"
 msgstr "Lista-Enviar"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post:"
 msgstr "Lista-Enviar:"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe"
 msgstr "Lista-Suscribir"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe:"
 msgstr "Lista-Suscribir:"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe"
 msgstr "Lista-Desuscribir"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe:"
 msgstr "Lista-Desuscribir:"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help"
 msgstr "Lista-Ayuda"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help:"
 msgstr "Lista-Ayuda:"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive"
 msgstr "Lista-Archivo"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive:"
 msgstr "Lista-Archivo:"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner"
 msgstr "Lista-Propietario"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner:"
 msgstr "Lista-Propietario:"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label"
 msgstr "X-Etiqueta"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label:"
 msgstr "X-Etiqueta:"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer"
 msgstr "X-Mailer"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer:"
 msgstr "X-Mailer:"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status"
 msgstr "X-Estado"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status:"
 msgstr "X-Estado:"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face"
 msgstr "X-Cara"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face:"
 msgstr "X-Cara:"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive"
 msgstr "X-No-Archivar"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive:"
 msgstr "X-No-Archivar:"
 
 #. some common logical names referring to real header names
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to"
 msgstr "En respuesta a"
 
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to:"
 msgstr "En respuesta a:"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc"
 msgstr "Para o Cc"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc:"
 msgstr "Para o Cc:"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject"
 msgstr "Desde, Para o Asunto"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject:"
 msgstr "Desde, Para o Asunto:"
 
@@ -5231,10 +5408,10 @@ msgstr ""
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:457
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:400
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:550
-#: ../src/plugins/fancy/fancy_prefs.c:109
+#: ../src/plugins/fancy/fancy_prefs.c:114
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:178
 #: ../src/plugins/gdata/cm_gdata_prefs.c:145
-#: ../src/plugins/libravatar/libravatar_prefs.c:399
+#: ../src/plugins/libravatar/libravatar_prefs.c:439
 #: ../src/plugins/notification/notification_prefs.c:396
 #: ../src/plugins/notification/notification_prefs.c:410
 #: ../src/plugins/notification/notification_prefs.c:428
@@ -5244,9 +5421,9 @@ msgstr ""
 #: ../src/plugins/notification/notification_prefs.c:496
 #: ../src/plugins/notification/notification_prefs.c:513
 #: ../src/plugins/pgpcore/prefs_gpg.c:569
-#: ../src/plugins/rssyl/rssyl_prefs.c:65
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
+#: ../src/plugins/rssyl/rssyl_prefs.c:69
 #: ../src/plugins/spam_report/spam_report_prefs.c:79
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
 #: ../src/plugins/vcalendar/vcal_prefs.c:680 ../src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Módulos"
@@ -5288,7 +5465,7 @@ msgstr "Módulos cargados"
 msgid "Page Index"
 msgstr "Página índice"
 
-#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:828
+#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:831
 msgid "_Hide"
 msgstr "_Ocultar"
 
@@ -5301,70 +5478,74 @@ msgstr "_Ocultar"
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../src/gtk/quicksearch.c:452
+#: ../src/gtk/quicksearch.c:451
 msgid "all messages"
 msgstr "todos los mensajes"
 
-#: ../src/gtk/quicksearch.c:453
+#: ../src/gtk/quicksearch.c:452
 msgid "messages whose age is greater than # days"
 msgstr "mensajes cuya edad es mayor que # días"
 
-#: ../src/gtk/quicksearch.c:454
+#: ../src/gtk/quicksearch.c:453
 msgid "messages whose age is less than # days"
 msgstr "mensajes cuya edad es menor que # días"
 
-#: ../src/gtk/quicksearch.c:455
+#: ../src/gtk/quicksearch.c:454
 msgid "messages whose age is greater than # hours"
 msgstr "mensajes cuya edad es mayor que # horas"
 
-#: ../src/gtk/quicksearch.c:456
+#: ../src/gtk/quicksearch.c:455
 msgid "messages whose age is less than # hours"
 msgstr "mensajes cuya edad es menor que # horas"
 
-#: ../src/gtk/quicksearch.c:457
+#: ../src/gtk/quicksearch.c:456
 msgid "messages which contain S in the message body"
 msgstr "mensajes que contienen S en el cuerpo del mensaje"
 
-#: ../src/gtk/quicksearch.c:458
+#: ../src/gtk/quicksearch.c:457
 msgid "messages which contain S in the whole message"
 msgstr "mensajes que contienen S en el mensaje completo"
 
-#: ../src/gtk/quicksearch.c:459
+#: ../src/gtk/quicksearch.c:458
 msgid "messages carbon-copied to S"
 msgstr "mensajes con copia-carbón a S"
 
-#: ../src/gtk/quicksearch.c:460
+#: ../src/gtk/quicksearch.c:459
 msgid "message is either to: or cc: to S"
 msgstr "mensaje con Para: o Cc: a S"
 
-#: ../src/gtk/quicksearch.c:461
+#: ../src/gtk/quicksearch.c:460
 msgid "deleted messages"
 msgstr "mensajes borrados"
 
 #. * how I can filter deleted messages *
-#: ../src/gtk/quicksearch.c:462
+#: ../src/gtk/quicksearch.c:461
 msgid "messages which contain S in the Sender field"
 msgstr "mensajes que contienen S en el campo remitente"
 
-#: ../src/gtk/quicksearch.c:463
+#: ../src/gtk/quicksearch.c:462
 msgid "true if execute \"S\" succeeds"
 msgstr "cierto si ejecutar \"S\" tiene éxito"
 
-#: ../src/gtk/quicksearch.c:464
+#: ../src/gtk/quicksearch.c:463
 msgid "messages originating from user S"
-msgstr "mensajes provinientes del usuario S"
+msgstr "mensajes provenientes del usuario S"
 
-#: ../src/gtk/quicksearch.c:465
+#: ../src/gtk/quicksearch.c:464
 msgid "forwarded messages"
 msgstr "mensajes reenviados"
 
-#: ../src/gtk/quicksearch.c:466
+#: ../src/gtk/quicksearch.c:465
 msgid "messages which have attachments"
 msgstr "mensajes que tienen adjuntos"
 
+#: ../src/gtk/quicksearch.c:466
+msgid "messages which contain S in any header name or value"
+msgstr "mensajes que contienen S en el nombre o el valor de cualquier cabecera"
+
 #: ../src/gtk/quicksearch.c:467
-msgid "messages which contain header S"
-msgstr "mensajes que contienen la cabecera S"
+msgid "messages which contain S in the value of any header"
+msgstr "mensajes que contienen S en el valor de cualquier cabecera"
 
 #: ../src/gtk/quicksearch.c:468
 msgid "messages which contain S in Message-ID header"
@@ -5487,7 +5668,7 @@ msgstr "sensible a mayús./minús."
 
 #: ../src/gtk/quicksearch.c:498
 msgid "match using regular expressions instead of substring search"
-msgstr "buscar coindidencias con expresiones regulares en lugar de subcadenas"
+msgstr "buscar coincidencias con expresiones regulares en lugar de sub-cadenas"
 
 #: ../src/gtk/quicksearch.c:500
 msgid "all filtering expressions are allowed"
@@ -5553,7 +5734,7 @@ msgstr "E_ditar"
 
 #: ../src/gtk/quicksearch.c:819 ../src/gtk/quicksearch.c:834
 #: ../src/prefs_actions.c:347 ../src/prefs_filtering.c:495
-#: ../src/prefs_template.c:328
+#: ../src/prefs_template.c:330
 msgid "C_lear"
 msgstr "_Limpiar"
 
@@ -5704,8 +5885,8 @@ msgstr "Etiquetas:"
 #: ../src/plugins/notification/notification_popup.c:316
 #: ../src/plugins/notification/notification_popup.c:621
 #: ../src/plugins/notification/notification_trayicon.c:851
-#: ../src/summaryview.c:3351 ../src/summaryview.c:3369
-#: ../src/summaryview.c:3390
+#: ../src/summaryview.c:3353 ../src/summaryview.c:3371
+#: ../src/summaryview.c:3392
 msgid "(No From)"
 msgstr "(Sin remite)"
 
@@ -5713,7 +5894,7 @@ msgstr "(Sin remite)"
 #: ../src/plugins/notification/notification_popup.c:318
 #: ../src/plugins/notification/notification_popup.c:625
 #: ../src/plugins/notification/notification_trayicon.c:854
-#: ../src/summaryview.c:3403 ../src/summaryview.c:3407
+#: ../src/summaryview.c:3405 ../src/summaryview.c:3409
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -5721,7 +5902,7 @@ msgstr "(Sin asunto)"
 msgid "Error:"
 msgstr "Error:"
 
-#: ../src/image_viewer.c:299 ../src/mimeview.c:2544
+#: ../src/image_viewer.c:299 ../src/mimeview.c:2545
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:698
 msgid "Filename:"
 msgstr "Nombre:"
@@ -5734,31 +5915,31 @@ msgstr "Tamaño:"
 msgid "Load Image"
 msgstr "Cargar imagen"
 
-#: ../src/imap.c:577
+#: ../src/imap.c:583
 msgid "IMAP4 connection broken\n"
 msgstr "La conexión IMAP4 se rompió\n"
 
-#: ../src/imap.c:616
+#: ../src/imap.c:622
 #, c-format
 msgid "IMAP error on %s: authenticated\n"
 msgstr "Error IMAP en %s: autentificado\n"
 
-#: ../src/imap.c:619
+#: ../src/imap.c:625
 #, c-format
 msgid "IMAP error on %s: not authenticated\n"
 msgstr "Error IMAP en %s: no autentificado\n"
 
-#: ../src/imap.c:622
+#: ../src/imap.c:628
 #, c-format
 msgid "IMAP error on %s: bad state\n"
 msgstr "Error IMAP en %s: estado incorrecto\n"
 
-#: ../src/imap.c:625
+#: ../src/imap.c:631
 #, c-format
 msgid "IMAP error on %s: stream error\n"
 msgstr "Error IMAP en %s: error del flujo\n"
 
-#: ../src/imap.c:628
+#: ../src/imap.c:634
 #, c-format
 msgid ""
 "IMAP error on %s: parse error (very probably non-RFC compliance from the "
@@ -5767,22 +5948,22 @@ msgstr ""
 "Error IMAP en %s: error interpretando (seguramente el servidor no es "
 "conforme a los RFC)\n"
 
-#: ../src/imap.c:632
+#: ../src/imap.c:638
 #, c-format
 msgid "IMAP error on %s: connection refused\n"
 msgstr "Error IMAP en %s: conexión rechazada\n"
 
-#: ../src/imap.c:635
+#: ../src/imap.c:641
 #, c-format
 msgid "IMAP error on %s: memory error\n"
 msgstr "Error IMAP en %s: error de memoria\n"
 
-#: ../src/imap.c:638
+#: ../src/imap.c:644
 #, c-format
 msgid "IMAP error on %s: fatal error\n"
 msgstr "Error IMAP en %s: error fatal\n"
 
-#: ../src/imap.c:641
+#: ../src/imap.c:647
 #, c-format
 msgid ""
 "IMAP error on %s: protocol error(very probably non-RFC compliance from the "
@@ -5791,172 +5972,172 @@ msgstr ""
 "Error IMAP en %s: error de protocolo (seguramente el servidor no es conforme "
 "a los RFC)\n"
 
-#: ../src/imap.c:645
+#: ../src/imap.c:651
 #, c-format
 msgid "IMAP error on %s: connection not accepted\n"
 msgstr "Error IMAP en %s: la conexión no fue aceptada\n"
 
-#: ../src/imap.c:648
+#: ../src/imap.c:654
 #, c-format
 msgid "IMAP error on %s: APPEND error\n"
 msgstr "Error IMAP en %s: error de APPEND\n"
 
-#: ../src/imap.c:651
+#: ../src/imap.c:657
 #, c-format
 msgid "IMAP error on %s: NOOP error\n"
 msgstr "Error IMAP en %s: error de NOOP\n"
 
-#: ../src/imap.c:654
+#: ../src/imap.c:660
 #, c-format
 msgid "IMAP error on %s: LOGOUT error\n"
 msgstr "Error IMAP en %s: error de LOGOUT\n"
 
-#: ../src/imap.c:657
+#: ../src/imap.c:663
 #, c-format
 msgid "IMAP error on %s: CAPABILITY error\n"
 msgstr "Error IMAP en %s: error de CAPABILITY\n"
 
-#: ../src/imap.c:660
+#: ../src/imap.c:666
 #, c-format
 msgid "IMAP error on %s: CHECK error\n"
 msgstr "Error IMAP en %s: error de CHECK\n"
 
-#: ../src/imap.c:663
+#: ../src/imap.c:669
 #, c-format
 msgid "IMAP error on %s: CLOSE error\n"
 msgstr "Error IMAP en %s: error de CLOSE\n"
 
-#: ../src/imap.c:666
+#: ../src/imap.c:672
 #, c-format
 msgid "IMAP error on %s: EXPUNGE error\n"
 msgstr "Error IMAP en %s: error de EXPUNGE\n"
 
-#: ../src/imap.c:669
+#: ../src/imap.c:675
 #, c-format
 msgid "IMAP error on %s: COPY error\n"
 msgstr "Error IMAP en %s: error de COPY\n"
 
-#: ../src/imap.c:672
+#: ../src/imap.c:678
 #, c-format
 msgid "IMAP error on %s: UID COPY error\n"
 msgstr "Error IMAP en %s: error de UID COPY\n"
 
-#: ../src/imap.c:675
+#: ../src/imap.c:681
 #, c-format
 msgid "IMAP error on %s: CREATE error\n"
 msgstr "Error IMAP en %s: error de CREATE\n"
 
-#: ../src/imap.c:678
+#: ../src/imap.c:684
 #, c-format
 msgid "IMAP error on %s: DELETE error\n"
 msgstr "Error IMAP en %s: error de DELETE\n"
 
-#: ../src/imap.c:681
+#: ../src/imap.c:687
 #, c-format
 msgid "IMAP error on %s: EXAMINE error\n"
 msgstr "Error IMAP en %s: error de EXAMINE\n"
 
-#: ../src/imap.c:684
+#: ../src/imap.c:690
 #, c-format
 msgid "IMAP error on %s: FETCH error\n"
 msgstr "Error IMAP en %s: error de FETCH\n"
 
-#: ../src/imap.c:687
+#: ../src/imap.c:693
 #, c-format
 msgid "IMAP error on %s: UID FETCH error\n"
 msgstr "Error IMAP en %s: error de UID FETCH\n"
 
-#: ../src/imap.c:690
+#: ../src/imap.c:696
 #, c-format
 msgid "IMAP error on %s: LIST error\n"
 msgstr "Error IMAP en %s: error de LIST\n"
 
-#: ../src/imap.c:693
+#: ../src/imap.c:699
 #, c-format
 msgid "IMAP error on %s: LOGIN error\n"
 msgstr "Error IMAP en %s: error de LOGIN\n"
 
-#: ../src/imap.c:696
+#: ../src/imap.c:702
 #, c-format
 msgid "IMAP error on %s: LSUB error\n"
 msgstr "Error IMAP en %s: error de LSUB\n"
 
-#: ../src/imap.c:699
+#: ../src/imap.c:705
 #, c-format
 msgid "IMAP error on %s: RENAME error\n"
 msgstr "Error IMAP en %s: error de RENAME\n"
 
-#: ../src/imap.c:702
+#: ../src/imap.c:708
 #, c-format
 msgid "IMAP error on %s: SEARCH error\n"
 msgstr "Error IMAP en %s: error de SEARCH\n"
 
-#: ../src/imap.c:705
+#: ../src/imap.c:711
 #, c-format
 msgid "IMAP error on %s: UID SEARCH error\n"
 msgstr "Error IMAP en %s: error de UID SEARCH\n"
 
-#: ../src/imap.c:708
+#: ../src/imap.c:714
 #, c-format
 msgid "IMAP error on %s: SELECT error\n"
 msgstr "Error IMAP en %s: error de SELECT\n"
 
-#: ../src/imap.c:711
+#: ../src/imap.c:717
 #, c-format
 msgid "IMAP error on %s: STATUS error\n"
 msgstr "Error IMAP en %s: error de STATUS\n"
 
-#: ../src/imap.c:714
+#: ../src/imap.c:720
 #, c-format
 msgid "IMAP error on %s: STORE error\n"
 msgstr "Error IMAP en %s: error de STORE\n"
 
-#: ../src/imap.c:717
+#: ../src/imap.c:723
 #, c-format
 msgid "IMAP error on %s: UID STORE error\n"
 msgstr "Error IMAP en %s: error de UID STORE\n"
 
-#: ../src/imap.c:720
+#: ../src/imap.c:726
 #, c-format
 msgid "IMAP error on %s: SUBSCRIBE error\n"
 msgstr "Error IMAP en %s: error de SUBSCRIBE\n"
 
-#: ../src/imap.c:723
+#: ../src/imap.c:729
 #, c-format
 msgid "IMAP error on %s: UNSUBSCRIBE error\n"
 msgstr "Error IMAP en %s: error de UNSUBSCRIBE\n"
 
-#: ../src/imap.c:726
+#: ../src/imap.c:732
 #, c-format
 msgid "IMAP error on %s: STARTTLS error\n"
 msgstr "Error IMAP en %s: error de STARTTLS\n"
 
-#: ../src/imap.c:729
+#: ../src/imap.c:735
 #, c-format
 msgid "IMAP error on %s: INVAL error\n"
 msgstr "Error IMAP en %s: error de INVAL\n"
 
-#: ../src/imap.c:732
+#: ../src/imap.c:738
 #, c-format
 msgid "IMAP error on %s: EXTENSION error\n"
 msgstr "Error IMAP en %s: error de EXTENSION\n"
 
-#: ../src/imap.c:735
+#: ../src/imap.c:741
 #, c-format
 msgid "IMAP error on %s: SASL error\n"
 msgstr "Error IMAP en %s: error de SASL\n"
 
-#: ../src/imap.c:739
+#: ../src/imap.c:745
 #, c-format
 msgid "IMAP error on %s: SSL error\n"
 msgstr "Error IMAP en %s: error de SSL\n"
 
-#: ../src/imap.c:743
+#: ../src/imap.c:749
 #, c-format
 msgid "IMAP error on %s: Unknown error [%d]\n"
 msgstr "Error IMAP en %s: error desconocido [%d]\n"
 
-#: ../src/imap.c:928
+#: ../src/imap.c:934
 msgid ""
 "\n"
 "\n"
@@ -5965,10 +6146,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Las autentificaciones con CRAM-MD5 sólo funcionarán si libetpan ha sido "
+"Las autenticaciones con CRAM-MD5 sólo funcionarán si libetpan ha sido "
 "compilada con soporte SASL y el módulo CRAM-MD5 de SASL está instalado."
 
-#: ../src/imap.c:934
+#: ../src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5977,41 +6158,41 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Las autentificaciones con DIGEST-MD5 sólo funcionarán si libetpan ha sido "
+"Las autenticaciones con DIGEST-MD5 sólo funcionarán si libetpan ha sido "
 "compilada con soporte SASL y el módulo DIGEST-MD5 de SASL está instalado."
 
-#: ../src/imap.c:941
+#: ../src/imap.c:947
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Falló la conexión con %s: login rechazado.%s"
 
-#: ../src/imap.c:945
+#: ../src/imap.c:951
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Falló la conexión con %s: login rechazado.%s\n"
 
-#: ../src/imap.c:963
+#: ../src/imap.c:969
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Falló la conexión con %s"
 
-#: ../src/imap.c:970 ../src/imap.c:973
+#: ../src/imap.c:976 ../src/imap.c:979
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La conexión IMAP4 con %s se ha desconectado. Reconectando...\n"
 
-#: ../src/imap.c:1003 ../src/imap.c:3583 ../src/imap.c:4242 ../src/imap.c:4339
-#: ../src/imap.c:4517 ../src/imap.c:5314
+#: ../src/imap.c:1009 ../src/imap.c:3619 ../src/imap.c:4278 ../src/imap.c:4375
+#: ../src/imap.c:4555 ../src/imap.c:5364
 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:1112 ../src/inc.c:818 ../src/news.c:387
+#: ../src/imap.c:1118 ../src/inc.c:818 ../src/news.c:387
 #: ../src/send_message.c:278
 msgid "Insecure connection"
 msgstr "Conexión insegura"
 
-#: ../src/imap.c:1113 ../src/inc.c:819 ../src/news.c:388
+#: ../src/imap.c:1119 ../src/inc.c:819 ../src/news.c:388
 #: ../src/send_message.c:279
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
@@ -6025,111 +6206,111 @@ msgstr ""
 "\n"
 "¿Quiere seguir conectando con este servidor? La comunicación no sería segura."
 
-#: ../src/imap.c:1119 ../src/inc.c:825 ../src/news.c:394
+#: ../src/imap.c:1125 ../src/inc.c:825 ../src/news.c:394
 #: ../src/send_message.c:285
 msgid "Con_tinue connecting"
 msgstr "Seguir conec_tando"
 
-#: ../src/imap.c:1129
+#: ../src/imap.c:1135
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Cuenta «%s»: Conectando al servidor IMAP4: %s:%d..."
 
-#: ../src/imap.c:1177
+#: ../src/imap.c:1183
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "No se puede conectar al servidor IMAP4: %s:%d"
 
-#: ../src/imap.c:1180
+#: ../src/imap.c:1186
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No se puede conectar al servidor IMAP4: %s:%d\n"
 
-#: ../src/imap.c:1213 ../src/imap.c:4004
+#: ../src/imap.c:1219 ../src/imap.c:4040
 msgid "Can't start TLS session.\n"
 msgstr "No se puede iniciar la sesión TLS.\n"
 
-#: ../src/imap.c:1276
+#: ../src/imap.c:1282
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "No se puede entrar al servidor IMAP %s.\n"
 
-#: ../src/imap.c:1279
+#: ../src/imap.c:1285
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "No se puede entrar al servidor IMAP %s."
 
-#: ../src/imap.c:1679
+#: ../src/imap.c:1703
 msgid "Adding messages..."
 msgstr "Añadiendo mensajes..."
 
-#: ../src/imap.c:1883 ../src/mh.c:520
+#: ../src/imap.c:1908 ../src/mh.c:526
 msgid "Copying messages..."
 msgstr "Copiando mensajes..."
 
-#: ../src/imap.c:2465
+#: ../src/imap.c:2492
 msgid "can't set deleted flags\n"
 msgstr "no se pueden establecer los flags «borrado»\n"
 
-#: ../src/imap.c:2472 ../src/imap.c:4944
+#: ../src/imap.c:2499 ../src/imap.c:4994
 msgid "can't expunge\n"
 msgstr "no puedo purgar\n"
 
-#: ../src/imap.c:2823
+#: ../src/imap.c:2850
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscando carpetas no suscritas en %s..."
 
-#: ../src/imap.c:2826
+#: ../src/imap.c:2853
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscando subcarpetas de %s..."
 
-#: ../src/imap.c:3123
+#: ../src/imap.c:3159
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 
-#: ../src/imap.c:3138
+#: ../src/imap.c:3174
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 
-#: ../src/imap.c:3229
+#: ../src/imap.c:3265
 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 "El nuevo nombre de la carpeta no debe contener el separador del espacio de "
 "nombres"
 
-#: ../src/imap.c:3269
+#: ../src/imap.c:3305
 #, 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:3382
+#: ../src/imap.c:3418
 msgid "can't delete mailbox\n"
 msgstr "no se puede borrar el buzón\n"
 
-#: ../src/imap.c:3661
+#: ../src/imap.c:3697
 msgid "LIST failed\n"
 msgstr "LIST falló\n"
 
-#: ../src/imap.c:3746
+#: ../src/imap.c:3782
 msgid "Flagging messages..."
 msgstr "Etiquetando mensajes..."
 
-#: ../src/imap.c:3849
+#: ../src/imap.c:3885
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: ../src/imap.c:4001
+#: ../src/imap.c:4037
 msgid "Server requires TLS to log in.\n"
 msgstr "El servidor necesita TLS para acceder a él.\n"
 
-#: ../src/imap.c:4011
+#: ../src/imap.c:4047
 msgid "Can't refresh capabilities.\n"
 msgstr "No se pueden refrescar las capacidades.\n"
 
-#: ../src/imap.c:4016
+#: ../src/imap.c:4052
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -6138,20 +6319,20 @@ msgstr ""
 "La conexión con %s falló: el servidor necesita TLS, pero Claws Mail ha sido "
 "compilado sin soporte OpenSSL.\n"
 
-#: ../src/imap.c:4024
+#: ../src/imap.c:4060
 msgid "Server logins are disabled.\n"
 msgstr "Los accesos al servidor están deshabilitados.\n"
 
-#: ../src/imap.c:4247
+#: ../src/imap.c:4283
 msgid "Fetching message..."
 msgstr "Recuperando mensaje..."
 
-#: ../src/imap.c:4937
+#: ../src/imap.c:4987
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no se pueden establecer los flags 'borrado': %d\n"
 
-#: ../src/imap.c:5973
+#: ../src/imap.c:6023
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6159,8 +6340,8 @@ msgid ""
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
-"Tiene definidas una o más cuentas IMAP. Sin embargo esta versión de Sylpheed-"
-"Claws ha sido compilada sin soporte IMAP. Sus cuentas IMAP están "
+"Tiene definidas una o más cuentas IMAP. Sin embargo esta versión de Claws"
+"Mail ha sido compilada sin soporte IMAP. Sus cuentas IMAP están "
 "deshabilitadas.\n"
 "\n"
 "Probablemente deberá instalar libetpan y recompilar Claws Mail."
@@ -6186,7 +6367,7 @@ msgid "Cop_y folder..."
 msgstr "Cop_iar carpeta..."
 
 #: ../src/imap_gtk.c:69 ../src/mh_gtk.c:59
-#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:61
+#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:55
 msgid "_Delete folder..."
 msgstr "_Borrar carpeta..."
 
@@ -6247,7 +6428,7 @@ msgstr "Heredar las propiedades de la carpeta padre"
 
 #: ../src/imap_gtk.c:261 ../src/mh_gtk.c:249 ../src/news_gtk.c:306
 #: ../src/plugins/mailmbox/plugin_gtk.c:405
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:331
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:196
 #: ../src/plugins/vcalendar/vcal_folder.c:2032
 #, c-format
 msgid "Input new name for '%s':"
@@ -6255,14 +6436,14 @@ msgstr "Introduzca el nuevo nombre para «%s»:"
 
 #: ../src/imap_gtk.c:263 ../src/mh_gtk.c:251
 #: ../src/plugins/mailmbox/plugin_gtk.c:406
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:332
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:197
 #: ../src/plugins/vcalendar/vcal_folder.c:2033
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
 #: ../src/imap_gtk.c:292 ../src/mh_gtk.c:274 ../src/news_gtk.c:328
 #: ../src/plugins/mailmbox/plugin_gtk.c:433
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:352
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:217
 #: ../src/plugins/vcalendar/vcal_folder.c:2053
 msgid ""
 "The folder could not be renamed.\n"
@@ -6272,7 +6453,7 @@ msgstr ""
 "El nuevo nombre no está permitido."
 
 #: ../src/imap_gtk.c:360 ../src/mh_gtk.c:199
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:233
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:149
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6287,7 +6468,7 @@ msgstr ""
 
 #: ../src/imap_gtk.c:381 ../src/mh_gtk.c:220 ../src/news_gtk.c:281
 #: ../src/plugins/mailmbox/plugin_gtk.c:341
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:254
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:170
 #: ../src/plugins/vcalendar/vcal_folder.c:1986
 #, c-format
 msgid "Can't remove the folder '%s'."
@@ -6315,7 +6496,7 @@ msgstr "+_Buscar"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Elija una subcarpeta de %s a la que suscribirse: "
 
-#: ../src/imap_gtk.c:537 ../src/mainwindow.c:672
+#: ../src/imap_gtk.c:537 ../src/mainwindow.c:674
 msgid "Subscribe"
 msgstr "Suscribir"
 
@@ -6332,7 +6513,7 @@ msgid ""
 msgstr ""
 "Esta carpeta ya está suscrita y no tiene subcarpetas sin suscribir.\n"
 "\n"
-"Si hay nuevas carpetas, creadas y suscritas desde otro cliente, utilize "
+"Si hay nuevas carpetas, creadas y suscritas desde otro cliente, utilice "
 "«Comprobar si hay carpetas nuevas» en la raíz del buzón."
 
 #: ../src/imap_gtk.c:566
@@ -6587,10 +6768,10 @@ msgstr "Conexión fallida"
 
 #: ../src/inc.c:655
 msgid "Auth failed"
-msgstr "Authorización fallida"
+msgstr "Autorización fallida"
 
 #. S_COL_SCORE
-#: ../src/inc.c:662 ../src/prefs_matcher.c:393
+#: ../src/inc.c:662 ../src/prefs_matcher.c:396
 #: ../src/prefs_summary_column.c:88 ../src/summaryview.c:2789
 #: ../src/summaryview.c:6310
 msgid "Locked"
@@ -6702,12 +6883,12 @@ msgstr "No se puede escribir el fichero."
 
 #: ../src/inc.c:1185
 msgid "Socket error."
-msgstr "Error de socket."
+msgstr "Error de conector."
 
 #: ../src/inc.c:1188
 #, c-format
 msgid "Socket error on connection to %s:%d."
-msgstr "Error de socket conectando con %s:%d."
+msgstr "Error de conector conectando con %s:%d."
 
 #. consider EOF right after QUIT successful
 #: ../src/inc.c:1193 ../src/send_message.c:423 ../src/send_message.c:686
@@ -6734,7 +6915,7 @@ msgstr ""
 
 #: ../src/inc.c:1211 ../src/send_message.c:671
 msgid "Authentication failed."
-msgstr "La autentificación falló."
+msgstr "La autenticación falló."
 
 #: ../src/inc.c:1217 ../src/send_message.c:674
 #, c-format
@@ -6742,7 +6923,7 @@ msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr ""
-"La autentificación falló:\n"
+"La autenticación falló:\n"
 "%s"
 
 #: ../src/inc.c:1222 ../src/send_message.c:690
@@ -6776,23 +6957,9 @@ msgstr "%s%sEstá trabajando sin conexión ¿Ignorar?"
 msgid "On_ly once"
 msgstr "Só_lo una vez"
 
-#: ../src/ldapupdate.c:189
-#, c-format
-msgid "ldapsvr_retrieve_item_person->Unknown status: %d"
-msgstr ""
-
-#: ../src/ldapupdate.c:472
-msgid "ldapsvr_update_book: Could not clean cache\n"
-msgstr ""
-
 #: ../src/ldapupdate.c:1056
 msgid "Some SN"
-msgstr ""
-
-#: ../src/ldapupdate.c:1440
-#, c-format
-msgid "ldapsvr_update_book->Unknown status: %s\n"
-msgstr ""
+msgstr "Algún SN"
 
 #: ../src/ldif.c:776
 msgid "Nick Name"
@@ -6909,7 +7076,7 @@ msgid ""
 "mailbox parent folder's context menu to try to fix it."
 msgstr ""
 "Claws Mail ha detectado un buzón configurado, pero está incompleto. Puede "
-"ser debido a una cuenta IMAP que esté fallando. Utilize «Reconstruir árbol "
+"ser debido a una cuenta IMAP que esté fallando. Utilice «Reconstruir árbol "
 "de carpetas» en la carpeta padre del buzón para intentar arreglarlo."
 
 #: ../src/main.c:1476
@@ -7009,13 +7176,13 @@ msgid ""
 "                         request: search string\n"
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr ""
-"  --search carpeta tipo peticion [recursivo]\n"
+"  --search carpeta tipo petición [recursivo]\n"
 "                         busca en el correo\n"
 "                         carpeta: p.ej.: \"#mh/Correo/inbox\" o \"Mail\"\n"
 "                         tipo: s (asunto), f (desde), t (para), e "
 "(extendido)\n"
 "                               m (mezclado) o g (etiqueta)\n"
-"                         peticion: la cadena a buscar\n"
+"                         petición: la cadena a buscar\n"
 "                         recursivo: falso si parám. empieza por: 0, n, N, f "
 "o F"
 
@@ -7130,328 +7297,328 @@ msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: la red está desconectada.\n"
 
 #. menus
-#: ../src/mainwindow.c:503 ../src/messageview.c:209
+#: ../src/mainwindow.c:505 ../src/messageview.c:209
 msgid "_File"
 msgstr "_Fichero"
 
-#: ../src/mainwindow.c:505 ../src/messageview.c:211 ../src/summaryview.c:434
+#: ../src/mainwindow.c:507 ../src/messageview.c:211 ../src/summaryview.c:434
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/mainwindow.c:508
+#: ../src/mainwindow.c:510
 msgid "_Configuration"
 msgstr "_Configuración"
 
 #. File menu
-#: ../src/mainwindow.c:512
+#: ../src/mainwindow.c:514
 msgid "_Add mailbox"
 msgstr "_Añadir buzón"
 
-#: ../src/mainwindow.c:513
+#: ../src/mainwindow.c:515
 msgid "MH..."
 msgstr "MH..."
 
-#: ../src/mainwindow.c:516
+#: ../src/mainwindow.c:518
 msgid "Change mailbox order..."
 msgstr "Reorganizar buzones..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:519
+#: ../src/mainwindow.c:521
 msgid "_Import mbox file..."
 msgstr "_Importar fichero mbox..."
 
-#: ../src/mainwindow.c:520
+#: ../src/mainwindow.c:522
 msgid "_Export to mbox file..."
 msgstr "_Exportar a fichero mbox..."
 
-#: ../src/mainwindow.c:521
+#: ../src/mainwindow.c:523
 msgid "_Export selected to mbox file..."
 msgstr "_Exportar la selección a un fichero mbox..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:523
+#: ../src/mainwindow.c:525
 msgid "Empty all _Trash folders"
 msgstr "Vaciar _todas las papeleras"
 
 #. {"File/---",				NULL, "---" },
 #. File menu
-#: ../src/mainwindow.c:526 ../src/messageview.c:218
+#: ../src/mainwindow.c:528 ../src/messageview.c:218
 msgid "_Save email as..."
 msgstr "_Guardar mensaje como..."
 
-#: ../src/mainwindow.c:527 ../src/messageview.c:219
+#: ../src/mainwindow.c:529 ../src/messageview.c:219
 msgid "_Save part as..."
 msgstr "_Guardar parte como..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:530 ../src/messageview.c:220
+#: ../src/mainwindow.c:532 ../src/messageview.c:220
 msgid "Page setup..."
 msgstr "Configurar página..."
 
-#: ../src/mainwindow.c:531 ../src/messageview.c:221
+#: ../src/mainwindow.c:533 ../src/messageview.c:221
 msgid "_Print..."
 msgstr "_Imprimir..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:533
+#: ../src/mainwindow.c:535
 msgid "Synchronise folders"
 msgstr "Sincronizar carpetas"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:535
+#: ../src/mainwindow.c:537
 msgid "E_xit"
 msgstr "_Salir"
 
-#: ../src/mainwindow.c:540
+#: ../src/mainwindow.c:542
 msgid "Select _thread"
 msgstr "Seleccionar _hilo"
 
-#: ../src/mainwindow.c:541
+#: ../src/mainwindow.c:543
 msgid "_Delete thread"
 msgstr "_Borrar hilo"
 
-#: ../src/mainwindow.c:543
+#: ../src/mainwindow.c:545
 msgid "_Find in current message..."
 msgstr "_Buscar en el mensaje actual..."
 
-#: ../src/mainwindow.c:545
+#: ../src/mainwindow.c:547
 msgid "_Quick search"
 msgstr "Búsqueda _rápida"
 
 #. View menu
-#: ../src/mainwindow.c:548
+#: ../src/mainwindow.c:550
 msgid "Show or hi_de"
 msgstr "Mostrar u o_cultar"
 
-#: ../src/mainwindow.c:549
+#: ../src/mainwindow.c:551
 msgid "_Toolbar"
 msgstr "_Barra de herramientas"
 
-#: ../src/mainwindow.c:551
+#: ../src/mainwindow.c:553
 msgid "Set displayed _columns"
 msgstr "Establecer _columnas visibles"
 
-#: ../src/mainwindow.c:552
+#: ../src/mainwindow.c:554
 msgid "In _folder list..."
 msgstr "En la lista de _carpetas..."
 
-#: ../src/mainwindow.c:553
+#: ../src/mainwindow.c:555
 msgid "In _message list..."
 msgstr "En la lista de _mensajes..."
 
-#: ../src/mainwindow.c:558
+#: ../src/mainwindow.c:560
 msgid "La_yout"
 msgstr "_Aspecto"
 
-#: ../src/mainwindow.c:561
+#: ../src/mainwindow.c:563
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: ../src/mainwindow.c:563
+#: ../src/mainwindow.c:565
 msgid "_Attract by subject"
 msgstr "_Atraer por asunto"
 
-#: ../src/mainwindow.c:565
+#: ../src/mainwindow.c:567
 msgid "E_xpand all threads"
 msgstr "E_xpandir todos los hilos"
 
-#: ../src/mainwindow.c:566
+#: ../src/mainwindow.c:568
 msgid "Co_llapse all threads"
 msgstr "Co_lapsar todos los hilos"
 
 #. View menu
-#: ../src/mainwindow.c:568 ../src/messageview.c:232
+#: ../src/mainwindow.c:570 ../src/messageview.c:232
 msgid "_Go to"
 msgstr "_Ir a"
 
-#: ../src/mainwindow.c:569 ../src/messageview.c:233
+#: ../src/mainwindow.c:571 ../src/messageview.c:233
 msgid "_Previous message"
 msgstr "Mensaje _anterior"
 
-#: ../src/mainwindow.c:570 ../src/messageview.c:234
+#: ../src/mainwindow.c:572 ../src/messageview.c:234
 msgid "_Next message"
 msgstr "Mensaje _siguiente"
 
-#: ../src/mainwindow.c:572 ../src/messageview.c:236
+#: ../src/mainwindow.c:574 ../src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "Mensaje a_nterior no leído"
 
-#: ../src/mainwindow.c:573 ../src/messageview.c:237
+#: ../src/mainwindow.c:575 ../src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Mensaje s_iguiente no leído"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:575 ../src/messageview.c:239
+#: ../src/mainwindow.c:577 ../src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Mensaje nue_vo anterior"
 
-#: ../src/mainwindow.c:576 ../src/messageview.c:240
+#: ../src/mainwindow.c:578 ../src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Mensaje nuev_o siguiente"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:578 ../src/messageview.c:242
+#: ../src/mainwindow.c:580 ../src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Mensaje _marcado anterior"
 
-#: ../src/mainwindow.c:579 ../src/messageview.c:243
+#: ../src/mainwindow.c:581 ../src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Mensaje m_arcado siguiente"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:581 ../src/messageview.c:245
+#: ../src/mainwindow.c:583 ../src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Mensaje _etiquetado anterior"
 
-#: ../src/mainwindow.c:582 ../src/messageview.c:246
+#: ../src/mainwindow.c:584 ../src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Mensaje e_tiquetado siguiente"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:584 ../src/messageview.c:248
+#: ../src/mainwindow.c:586 ../src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Mensaje abierto anterior"
 
-#: ../src/mainwindow.c:585 ../src/messageview.c:249
+#: ../src/mainwindow.c:587 ../src/messageview.c:249
 msgid "Next opened message"
 msgstr "Mensaje abierto siguiente"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:587 ../src/messageview.c:251
+#: ../src/mainwindow.c:589 ../src/messageview.c:251
 msgid "Parent message"
 msgstr "Mensaje padre"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:589 ../src/messageview.c:253
+#: ../src/mainwindow.c:591 ../src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Siguiente _carpeta sin leer"
 
-#: ../src/mainwindow.c:590 ../src/messageview.c:254
+#: ../src/mainwindow.c:592 ../src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Otra carpeta..."
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:592 ../src/messageview.c:256 ../src/mimeview.c:201
+#: ../src/mainwindow.c:594 ../src/messageview.c:256 ../src/mimeview.c:201
 msgid "Next part"
 msgstr "Parte siguiente"
 
-#: ../src/mainwindow.c:593 ../src/messageview.c:257 ../src/mimeview.c:202
+#: ../src/mainwindow.c:595 ../src/messageview.c:257 ../src/mimeview.c:202
 msgid "Previous part"
 msgstr "Parte anterior"
 
 #. {"View/Scroll/---",                  NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:596 ../src/messageview.c:258
+#: ../src/mainwindow.c:598 ../src/messageview.c:258
 msgid "Message scroll"
 msgstr "Desplazamiento del mensaje"
 
-#: ../src/mainwindow.c:597 ../src/messageview.c:259
+#: ../src/mainwindow.c:599 ../src/messageview.c:259
 msgid "Previous line"
 msgstr "Línea anterior"
 
-#: ../src/mainwindow.c:598 ../src/messageview.c:260
+#: ../src/mainwindow.c:600 ../src/messageview.c:260
 msgid "Next line"
 msgstr "Línea siguiente"
 
-#: ../src/mainwindow.c:599 ../src/messageview.c:261 ../src/printing.c:481
+#: ../src/mainwindow.c:601 ../src/messageview.c:261 ../src/printing.c:481
 msgid "Previous page"
 msgstr "Página anterior"
 
-#: ../src/mainwindow.c:600 ../src/messageview.c:262 ../src/printing.c:488
+#: ../src/mainwindow.c:602 ../src/messageview.c:262 ../src/printing.c:488
 msgid "Next page"
 msgstr "Página siguiente"
 
-#: ../src/mainwindow.c:618 ../src/messageview.c:280
+#: ../src/mainwindow.c:620 ../src/messageview.c:280
 msgid "Decode"
 msgstr "Decodificar"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:625
+#: ../src/mainwindow.c:627
 msgid "Open in new _window"
 msgstr "Abrir en ventana _nueva"
 
-#: ../src/mainwindow.c:626 ../src/messageview.c:287
+#: ../src/mainwindow.c:628 ../src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Fuente del mens_aje"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:628 ../src/messageview.c:288
+#: ../src/mainwindow.c:630 ../src/messageview.c:288
 msgid "Message part"
 msgstr "Parte del mensaje"
 
-#: ../src/mainwindow.c:629 ../src/messageview.c:289
+#: ../src/mainwindow.c:631 ../src/messageview.c:289
 msgid "View as text"
 msgstr "Mostrar como texto"
 
-#: ../src/mainwindow.c:630 ../src/messageview.c:290 ../src/toolbar.c:403
+#: ../src/mainwindow.c:632 ../src/messageview.c:290 ../src/toolbar.c:403
 msgid "Open"
 msgstr "Abrir"
 
-#: ../src/mainwindow.c:632 ../src/messageview.c:292
+#: ../src/mainwindow.c:634 ../src/messageview.c:292
 msgid "Open with..."
 msgstr "Abrir con..."
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:636 ../src/messageview.c:295
+#: ../src/mainwindow.c:638 ../src/messageview.c:295
 msgid "Quotes"
 msgstr "Citas"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:638
+#: ../src/mainwindow.c:640
 msgid "_Update summary"
 msgstr "_Actualizar resumen"
 
 #. Message menu
-#: ../src/mainwindow.c:641
+#: ../src/mainwindow.c:643
 msgid "Recei_ve"
 msgstr "Reci_bir"
 
-#: ../src/mainwindow.c:642
+#: ../src/mainwindow.c:644
 msgid "Get from _current account"
 msgstr "De la cuenta _actual"
 
-#: ../src/mainwindow.c:643
+#: ../src/mainwindow.c:645
 msgid "Get from _all accounts"
 msgstr "De _todas las cuentas"
 
-#: ../src/mainwindow.c:644
+#: ../src/mainwindow.c:646
 msgid "Cancel receivin_g"
 msgstr "Cancelar re_cepción"
 
-#: ../src/mainwindow.c:647
+#: ../src/mainwindow.c:649
 msgid "_Send queued messages"
 msgstr "_Enviar mensajes en la cola"
 
-#: ../src/mainwindow.c:652
+#: ../src/mainwindow.c:654
 msgid "Compose a_n email message"
 msgstr "Compo_ner un mensaje de correo"
 
-#: ../src/mainwindow.c:653
+#: ../src/mainwindow.c:655
 msgid "Compose a news message"
 msgstr "Componer un mensaje de noticias"
 
-#: ../src/mainwindow.c:655 ../src/messageview.c:301
+#: ../src/mainwindow.c:657 ../src/messageview.c:301
 #: ../src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Responder"
 
 #. COMPOSE_REPLY
-#: ../src/mainwindow.c:656 ../src/messageview.c:302 ../src/summaryview.c:426
+#: ../src/mainwindow.c:658 ../src/messageview.c:302 ../src/summaryview.c:426
 msgid "Repl_y to"
 msgstr "Respon_der a"
 
 #. COMPOSE_REPLY_TO_SENDER
-#: ../src/mainwindow.c:659 ../src/messageview.c:305
+#: ../src/mainwindow.c:661 ../src/messageview.c:305
 msgid "Mailing _list"
 msgstr "_Lista-Correo"
 
 #. COMPOSE_REPLY_TO_LIST
-#: ../src/mainwindow.c:660
+#: ../src/mainwindow.c:662
 msgid "Follow-up and reply to"
 msgstr "Seguir y responder a"
 
@@ -7459,177 +7626,177 @@ msgstr "Seguir y responder a"
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REPLY_TO_LIST
 #. {"Message/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:663 ../src/messageview.c:308 ../src/toolbar.c:2069
+#: ../src/mainwindow.c:665 ../src/messageview.c:308 ../src/toolbar.c:2069
 msgid "_Forward"
 msgstr "Reen_viar"
 
 #. COMPOSE_FORWARD_INLINE
-#: ../src/mainwindow.c:664 ../src/messageview.c:309 ../src/toolbar.c:2070
+#: ../src/mainwindow.c:666 ../src/messageview.c:309 ../src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "Reen_viar como adjunto"
 
 #. COMPOSE_FORWARD_AS_ATTACH
-#: ../src/mainwindow.c:665 ../src/messageview.c:310 ../src/toolbar.c:2071
+#: ../src/mainwindow.c:667 ../src/messageview.c:310 ../src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Redirigi_r"
 
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:667
+#: ../src/mainwindow.c:669
 msgid "Mailing-_List"
 msgstr "Lista-Correo"
 
-#: ../src/mainwindow.c:668
+#: ../src/mainwindow.c:670
 msgid "Post"
 msgstr "Postear"
 
-#: ../src/mainwindow.c:670
+#: ../src/mainwindow.c:672
 msgid "Help"
 msgstr "_Ayuda"
 
-#: ../src/mainwindow.c:674
+#: ../src/mainwindow.c:676
 msgid "Unsubscribe"
 msgstr "Desuscribir"
 
-#: ../src/mainwindow.c:676
+#: ../src/mainwindow.c:678
 msgid "View archive"
 msgstr "Ver archivo"
 
-#: ../src/mainwindow.c:678
+#: ../src/mainwindow.c:680
 msgid "Contact owner"
 msgstr "Contactar proprietario"
 
 #. separation
-#: ../src/mainwindow.c:682
+#: ../src/mainwindow.c:684
 msgid "M_ove..."
 msgstr "M_over..."
 
-#: ../src/mainwindow.c:683
+#: ../src/mainwindow.c:685
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../src/mainwindow.c:684
+#: ../src/mainwindow.c:686
 msgid "Move to _trash"
 msgstr "Mover a la p_apelera"
 
-#: ../src/mainwindow.c:685
+#: ../src/mainwindow.c:687
 msgid "_Delete..."
 msgstr "_Borrar..."
 
-#: ../src/mainwindow.c:686
+#: ../src/mainwindow.c:688
 msgid "Cancel a news message"
 msgstr "Cancelar una noticia"
 
 #. separation
-#: ../src/mainwindow.c:689 ../src/mainwindow.c:690 ../src/summaryview.c:427
+#: ../src/mainwindow.c:691 ../src/mainwindow.c:692 ../src/summaryview.c:427
 msgid "_Mark"
 msgstr "_Marcar"
 
-#: ../src/mainwindow.c:691
+#: ../src/mainwindow.c:693
 msgid "_Unmark"
 msgstr "_Desmarcar"
 
-#: ../src/mainwindow.c:694
+#: ../src/mainwindow.c:696
 msgid "Mark as unr_ead"
 msgstr "Marcar como _no leído"
 
-#: ../src/mainwindow.c:695
+#: ../src/mainwindow.c:697
 msgid "Mark as rea_d"
 msgstr "Marcar como _leído"
 
 #. separation
-#: ../src/mainwindow.c:697
+#: ../src/mainwindow.c:699
 msgid "Mark all read"
 msgstr "Marcar todos como leídos"
 
 #. separation
-#: ../src/mainwindow.c:699 ../src/prefs_filtering_action.c:199
+#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:199
 #: ../src/toolbar.c:208 ../src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Ignorar hilo"
 
-#: ../src/mainwindow.c:700
+#: ../src/mainwindow.c:702
 msgid "Unignore thread"
 msgstr "Dejar de ignorar hilo"
 
-#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:200
+#: ../src/mainwindow.c:703 ../src/prefs_filtering_action.c:200
 #: ../src/toolbar.c:209 ../src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Observar hilo"
 
-#: ../src/mainwindow.c:702
+#: ../src/mainwindow.c:704
 msgid "Unwatch thread"
 msgstr "Dejar de observar hilo"
 
 #. separation
-#: ../src/mainwindow.c:705
+#: ../src/mainwindow.c:707
 msgid "Mark as _spam"
 msgstr "Marcar como ba_sura"
 
-#: ../src/mainwindow.c:706
+#: ../src/mainwindow.c:708
 msgid "Mark as _ham"
 msgstr "Marcar como _bueno"
 
 #. separation
-#: ../src/mainwindow.c:709 ../src/prefs_filtering_action.c:181
+#: ../src/mainwindow.c:711 ../src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Bloquear"
 
-#: ../src/mainwindow.c:710 ../src/prefs_filtering_action.c:182
+#: ../src/mainwindow.c:712 ../src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: ../src/mainwindow.c:712 ../src/summaryview.c:428
+#: ../src/mainwindow.c:714 ../src/summaryview.c:428
 msgid "Color la_bel"
 msgstr "Etiqueta de co_lor"
 
-#: ../src/mainwindow.c:713 ../src/summaryview.c:429
+#: ../src/mainwindow.c:715 ../src/summaryview.c:429
 msgid "Ta_gs"
 msgstr "Eti_quetas"
 
 #. {"Message/---",			NULL, "---" },
-#: ../src/mainwindow.c:716
+#: ../src/mainwindow.c:718
 msgid "Re-_edit"
 msgstr "Re_editar"
 
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:719 ../src/messageview.c:311 ../src/mimeview.c:1027
+#: ../src/mainwindow.c:721 ../src/messageview.c:311 ../src/mimeview.c:1027
 msgid "Check signature"
 msgstr "Verificar firma"
 
-#: ../src/mainwindow.c:724 ../src/messageview.c:315
+#: ../src/mainwindow.c:726 ../src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "Añadir _remitente a la agenda"
 
-#: ../src/mainwindow.c:726
+#: ../src/mainwindow.c:728
 msgid "C_ollect addresses"
-msgstr "Rec_olectar direcciónes"
+msgstr "Rec_olectar direcciones"
 
-#: ../src/mainwindow.c:727
+#: ../src/mainwindow.c:729
 msgid "From current _folder..."
 msgstr "De la _carpeta actual..."
 
-#: ../src/mainwindow.c:728
+#: ../src/mainwindow.c:730
 msgid "From selected _messages..."
-msgstr "De los _mensajes selecionados..."
+msgstr "De los _mensajes seleccionados..."
 
-#: ../src/mainwindow.c:731
+#: ../src/mainwindow.c:733
 msgid "_Filter all messages in folder"
 msgstr "_Filtrar todos los mensajes en la carpeta"
 
-#: ../src/mainwindow.c:732
+#: ../src/mainwindow.c:734
 msgid "Filter _selected messages"
 msgstr "_Filtrar los mensajes seleccionados"
 
-#: ../src/mainwindow.c:733
+#: ../src/mainwindow.c:735
 msgid "Run folder pr_ocessing rules"
 msgstr "Ejecutar reglas de procesamiento de la carpeta"
 
-#: ../src/mainwindow.c:735 ../src/messageview.c:318
+#: ../src/mainwindow.c:737 ../src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "Crear regla de f_iltrado"
 
-#: ../src/mainwindow.c:736 ../src/mainwindow.c:742 ../src/messageview.c:319
+#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/messageview.c:319
 #: ../src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automático"
@@ -7637,7 +7804,7 @@ msgstr "_Automático"
 #. FILTER_BY_AUTO
 #. radio SORT_BY_THREAD_DATE
 #. FILTER_BY_AUTO
-#: ../src/mainwindow.c:737 ../src/mainwindow.c:743 ../src/mainwindow.c:845
+#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/mainwindow.c:848
 #: ../src/messageview.c:320 ../src/messageview.c:326
 msgid "By _From"
 msgstr "Por el Desde"
@@ -7645,386 +7812,391 @@ msgstr "Por el Desde"
 #. FILTER_BY_FROM
 #. radio SORT_BY_FROM
 #. FILTER_BY_FROM
-#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/mainwindow.c:846
+#: ../src/mainwindow.c:740 ../src/mainwindow.c:746 ../src/mainwindow.c:849
 #: ../src/messageview.c:321 ../src/messageview.c:327
 msgid "By _To"
 msgstr "Por el Para"
 
 #. FILTER_BY_TO
-#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/messageview.c:322
+#: ../src/mainwindow.c:741 ../src/mainwindow.c:747 ../src/messageview.c:322
 #: ../src/messageview.c:328
 msgid "By _Subject"
 msgstr "Por el Asunto"
 
 #. FILTER_BY_SUBJECT
-#: ../src/mainwindow.c:741 ../src/messageview.c:324 ../src/summaryview.c:432
+#: ../src/mainwindow.c:743 ../src/messageview.c:324 ../src/summaryview.c:432
 msgid "Create processing rule"
 msgstr "Crear regla de procesamiento"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:748 ../src/messageview.c:332
+#: ../src/mainwindow.c:750 ../src/messageview.c:332
 msgid "List _URLs..."
 msgstr "Listar _URLs..."
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:755
+#: ../src/mainwindow.c:757
 msgid "Ch_eck for new messages in all folders"
 msgstr "Comprobar m_ensajes nuevos en todas las carpetas"
 
-#: ../src/mainwindow.c:756
+#: ../src/mainwindow.c:758
 msgid "Delete du_plicated messages"
 msgstr "Borrar los mensajes re_petidos"
 
-#: ../src/mainwindow.c:757
+#: ../src/mainwindow.c:759
 msgid "In selected folder"
 msgstr "En la carpeta seleccionada"
 
-#: ../src/mainwindow.c:758
+#: ../src/mainwindow.c:760
 msgid "In all folders"
 msgstr "En todas las carpetas"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:761
+#: ../src/mainwindow.c:763
 msgid "E_xecute"
 msgstr "E_jecutar"
 
-#: ../src/mainwindow.c:762
+#: ../src/mainwindow.c:764
 msgid "Exp_unge"
 msgstr "P_urgar"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:765
+#: ../src/mainwindow.c:767
 msgid "SSL cer_tificates"
 msgstr "Cer_tificados SSL"
 
-#: ../src/mainwindow.c:769
+#: ../src/mainwindow.c:771
 msgid "Filtering Lo_g"
 msgstr "Traza de f_iltrado"
 
-#: ../src/mainwindow.c:771
+#: ../src/mainwindow.c:773
 msgid "Network _Log"
 msgstr "Tra_za de red"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:773
+#: ../src/mainwindow.c:775
 msgid "_Forget all session passwords"
 msgstr "_Olvidar todas las contraseñas de sesión"
 
 #. Configuration menu
-#: ../src/mainwindow.c:776
+#: ../src/mainwindow.c:778
 msgid "C_hange current account"
 msgstr "_Cambiar cuenta actual"
 
-#: ../src/mainwindow.c:778
+#: ../src/mainwindow.c:780
 msgid "_Preferences for current account..."
 msgstr "_Preferencias de la cuenta actual..."
 
-#: ../src/mainwindow.c:779
+#: ../src/mainwindow.c:781
 msgid "Create _new account..."
 msgstr "Crear _nueva cuenta..."
 
-#: ../src/mainwindow.c:780
+#: ../src/mainwindow.c:782
 msgid "_Edit accounts..."
 msgstr "_Editar cuentas..."
 
-#: ../src/mainwindow.c:783
+#: ../src/mainwindow.c:785
 msgid "P_references..."
 msgstr "P_referencias..."
 
-#: ../src/mainwindow.c:784
+#: ../src/mainwindow.c:786
 msgid "Pre-pr_ocessing..."
 msgstr "Pre-pr_ocesamiento..."
 
-#: ../src/mainwindow.c:785
+#: ../src/mainwindow.c:787
 msgid "Post-pro_cessing..."
 msgstr "Post-pro_cesamiento..."
 
-#: ../src/mainwindow.c:786
+#: ../src/mainwindow.c:788
 msgid "_Filtering..."
 msgstr "_Filtrado..."
 
-#: ../src/mainwindow.c:787
+#: ../src/mainwindow.c:789
 msgid "_Templates..."
 msgstr "_Plantillas..."
 
-#: ../src/mainwindow.c:788
+#: ../src/mainwindow.c:790
 msgid "_Actions..."
 msgstr "_Acciones..."
 
-#: ../src/mainwindow.c:789
+#: ../src/mainwindow.c:791
 msgid "Tag_s..."
 msgstr "Etiqueta_s..."
 
 #. {"Configuration/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:791
+#: ../src/mainwindow.c:793
 msgid "Plu_gins..."
 msgstr "_Módulos..."
 
 #. Help menu
-#: ../src/mainwindow.c:794
+#: ../src/mainwindow.c:796
 msgid "_Manual"
 msgstr "_Manual"
 
-#: ../src/mainwindow.c:795
+#: ../src/mainwindow.c:797
 msgid "_Online User-contributed FAQ"
 msgstr "P_F de usuarios en línea (FAQ)"
 
-#: ../src/mainwindow.c:796
+#: ../src/mainwindow.c:798
 msgid "Icon _Legend"
 msgstr "_Leyenda de iconos"
 
-#: ../src/mainwindow.c:798
+#: ../src/mainwindow.c:800
 msgid "Set as default client"
 msgstr "Establecer como cliente por defecto"
 
-#: ../src/mainwindow.c:805
+#: ../src/mainwindow.c:807
 msgid "Offline _mode"
 msgstr "_Modo sin conexión"
 
 #. toggle
-#: ../src/mainwindow.c:806
+#: ../src/mainwindow.c:808
+msgid "Men_ubar"
+msgstr "Barra de men_u"
+
+#. toggle
+#: ../src/mainwindow.c:809
 msgid "_Message view"
 msgstr "Vista de _mensaje"
 
-#: ../src/mainwindow.c:808
+#: ../src/mainwindow.c:811
 msgid "Status _bar"
 msgstr "_Barra de estado"
 
-#: ../src/mainwindow.c:810
+#: ../src/mainwindow.c:813
 msgid "Column headers"
 msgstr "Cabeceras de columna"
 
 #. toggle
-#: ../src/mainwindow.c:811
+#: ../src/mainwindow.c:814
 msgid "Th_read view"
 msgstr "_Vista jerárquica"
 
 #. toggle
-#: ../src/mainwindow.c:812
+#: ../src/mainwindow.c:815
 msgid "Hide read threads"
 msgstr "Esconder los hilos leídos"
 
 #. toggle
-#: ../src/mainwindow.c:813
+#: ../src/mainwindow.c:816
 msgid "_Hide read messages"
 msgstr "_Esconder los mensajes leídos"
 
 #. toggle
-#: ../src/mainwindow.c:814
+#: ../src/mainwindow.c:817
 msgid "Hide deleted messages"
 msgstr "Ocultar mensajes borrados"
 
 #. toggle
-#: ../src/mainwindow.c:815
+#: ../src/mainwindow.c:818
 msgid "_Fullscreen"
 msgstr "Pantalla _completa"
 
 #. toggle
-#: ../src/mainwindow.c:816 ../src/messageview.c:344
+#: ../src/mainwindow.c:819 ../src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Mostrar todas las ca_beceras"
 
 #. toggle
-#: ../src/mainwindow.c:817 ../src/messageview.c:345
+#: ../src/mainwindow.c:820 ../src/messageview.c:345
 msgid "_Collapse all"
 msgstr "Co_lapsar todos"
 
 #. 1 toggle
-#: ../src/mainwindow.c:818 ../src/messageview.c:346
+#: ../src/mainwindow.c:821 ../src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Colapsar desde el nivel _2"
 
 #. 2 toggle
-#: ../src/mainwindow.c:819 ../src/messageview.c:347
+#: ../src/mainwindow.c:822 ../src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Colapsar desde el nivel _3"
 
 #. toggle_toolbar_cb
-#: ../src/mainwindow.c:823
+#: ../src/mainwindow.c:826
 msgid "Text _below icons"
 msgstr "Texto _bajo los iconos"
 
 #. radio TOOLBAR_BOTH
-#: ../src/mainwindow.c:824
+#: ../src/mainwindow.c:827
 msgid "Text be_side icons"
 msgstr "Texto _junto a los iconos"
 
 #. radio TOOLBAR_BOTH_HORIZ
-#: ../src/mainwindow.c:825
+#: ../src/mainwindow.c:828
 msgid "_Icons only"
 msgstr "Sólo _iconos"
 
 #. radio TOOLBAR_ICON
-#: ../src/mainwindow.c:826
+#: ../src/mainwindow.c:829
 msgid "_Text only"
 msgstr "Sólo _texto"
 
 #. set_layout_cb
-#: ../src/mainwindow.c:833
+#: ../src/mainwindow.c:836
 msgid "_Standard"
 msgstr "_Estándar"
 
 #. radio NORMAL_LAYOUT
-#: ../src/mainwindow.c:834
+#: ../src/mainwindow.c:837
 msgid "_Three columns"
 msgstr "_Tres columnas"
 
 #. radio VERTICAL_LAYOUT
-#: ../src/mainwindow.c:835
+#: ../src/mainwindow.c:838
 msgid "_Wide message"
 msgstr "Mensaje _ancho"
 
 #. radio WIDE_LAYOUT
-#: ../src/mainwindow.c:836
+#: ../src/mainwindow.c:839
 msgid "W_ide message list"
 msgstr "L_ista de mensajes ancha"
 
 #. radio WIDE_MSGLIST_LAYOUT
-#: ../src/mainwindow.c:837
+#: ../src/mainwindow.c:840
 msgid "S_mall screen"
 msgstr "_Pantalla pequeña"
 
 #. sort_summary_cb
-#: ../src/mainwindow.c:841
+#: ../src/mainwindow.c:844
 msgid "By _number"
 msgstr "Por _número"
 
 #. radio SORT_BY_NUMBER
-#: ../src/mainwindow.c:842
+#: ../src/mainwindow.c:845
 msgid "By s_ize"
 msgstr "Por _tamaño"
 
 #. radio SORT_BY_SIZE
-#: ../src/mainwindow.c:843
+#: ../src/mainwindow.c:846
 msgid "By _date"
 msgstr "Por _fecha"
 
 #. radio SORT_BY_DATE
-#: ../src/mainwindow.c:844
+#: ../src/mainwindow.c:847
 msgid "By thread date"
 msgstr "Por fecha del hilo"
 
 #. radio SORT_BY_TO
-#: ../src/mainwindow.c:847
+#: ../src/mainwindow.c:850
 msgid "By s_ubject"
 msgstr "Por el as_unto"
 
 #. radio SORT_BY_SUBJECT
-#: ../src/mainwindow.c:848
+#: ../src/mainwindow.c:851
 msgid "By _color label"
 msgstr "Por el _color"
 
 #. radio SORT_BY_LABEL
-#: ../src/mainwindow.c:849
+#: ../src/mainwindow.c:852
 msgid "By tag"
 msgstr "Por la etiqueta"
 
 #. radio SORT_BY_TAGS
-#: ../src/mainwindow.c:850
+#: ../src/mainwindow.c:853
 msgid "By _mark"
 msgstr "Por _marca"
 
 #. radio SORT_BY_MARK
-#: ../src/mainwindow.c:851
+#: ../src/mainwindow.c:854
 msgid "By _status"
 msgstr "Por e_stado"
 
 #. radio SORT_BY_STATUS
-#: ../src/mainwindow.c:852
+#: ../src/mainwindow.c:855
 msgid "By a_ttachment"
 msgstr "Por adjun_to"
 
 #. radio SORT_BY_MIME
-#: ../src/mainwindow.c:853
+#: ../src/mainwindow.c:856
 msgid "By score"
 msgstr "Por puntuación"
 
 #. radio SORT_BY_SCORE
-#: ../src/mainwindow.c:854
+#: ../src/mainwindow.c:857
 msgid "By locked"
 msgstr "Por bloqueado"
 
 #. radio SORT_BY_LOCKED
-#: ../src/mainwindow.c:855
+#: ../src/mainwindow.c:858
 msgid "D_on't sort"
 msgstr "N_o ordenar"
 
 #. sort_summary_type_cb
-#: ../src/mainwindow.c:859
+#: ../src/mainwindow.c:862
 msgid "Ascending"
 msgstr "Ascendente"
 
 #. radio SORT_ASCENDING
-#: ../src/mainwindow.c:860
+#: ../src/mainwindow.c:863
 msgid "Descending"
 msgstr "Descendente"
 
-#: ../src/mainwindow.c:901 ../src/messageview.c:388
+#: ../src/mainwindow.c:904 ../src/messageview.c:388
 msgid "_Auto detect"
 msgstr "_Auto detectar"
 
-#: ../src/mainwindow.c:1298 ../src/summaryview.c:6236
+#: ../src/mainwindow.c:1301 ../src/summaryview.c:6236
 msgid "Apply tags..."
 msgstr "Aplicar etiquetas..."
 
-#: ../src/mainwindow.c:1936
+#: ../src/mainwindow.c:1943
 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:1951
+#: ../src/mainwindow.c:1958
 msgid "You are online. Click the icon to go offline"
 msgstr "Esta conectado. Pulse en el icono para desconectarse"
 
-#: ../src/mainwindow.c:1954
+#: ../src/mainwindow.c:1961
 msgid "You are offline. Click the icon to go online"
 msgstr "Esta desconectado. Pulse en el icono para conectarse"
 
-#: ../src/mainwindow.c:1968
+#: ../src/mainwindow.c:1975
 msgid "Select account"
 msgstr "Seleccionar cuenta"
 
 #. init log instances data before creating log views
 #. Protocol log
-#: ../src/mainwindow.c:1995 ../src/prefs_logging.c:140
+#: ../src/mainwindow.c:2002 ../src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Traza del protocolo"
 
-#: ../src/mainwindow.c:1999
+#: ../src/mainwindow.c:2006
 msgid "Filtering/Processing debug log"
 msgstr "Traza de depuración de filtrado/procesamiento"
 
-#: ../src/mainwindow.c:2018 ../src/prefs_logging.c:392
+#: ../src/mainwindow.c:2025 ../src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "traza de filtrado activada\n"
 
-#: ../src/mainwindow.c:2020 ../src/prefs_logging.c:394
+#: ../src/mainwindow.c:2027 ../src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "traza de filtrado desactivada\n"
 
-#: ../src/mainwindow.c:2460 ../src/mainwindow.c:2467 ../src/mainwindow.c:2510
-#: ../src/mainwindow.c:2543 ../src/mainwindow.c:2575 ../src/mainwindow.c:2620
+#: ../src/mainwindow.c:2470 ../src/mainwindow.c:2477 ../src/mainwindow.c:2520
+#: ../src/mainwindow.c:2553 ../src/mainwindow.c:2585 ../src/mainwindow.c:2630
 #: ../src/plugins/notification/notification_trayicon.c:360
-#: ../src/prefs_folder_item.c:1065
+#: ../src/plugins/rssyl/opml_import.c:73 ../src/prefs_folder_item.c:1065
 msgid "Untitled"
 msgstr "Sin título"
 
-#: ../src/mainwindow.c:2621 ../src/prefs_summary_open.c:114
+#: ../src/mainwindow.c:2631 ../src/prefs_summary_open.c:114
 msgid "none"
 msgstr "ninguna"
 
-#: ../src/mainwindow.c:2878 ../src/mainwindow.c:2882
+#: ../src/mainwindow.c:2888 ../src/mainwindow.c:2892
 msgid "Delete all messages in trash folders?"
 msgstr "¿Borrar todos los mensajes de las papeleras?"
 
-#: ../src/mainwindow.c:2879
+#: ../src/mainwindow.c:2889
 msgid "Don't quit"
 msgstr "No salir"
 
-#: ../src/mainwindow.c:2908 ../src/plugins/mailmbox/plugin_gtk.c:189
+#: ../src/mainwindow.c:2918 ../src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: ../src/mainwindow.c:2909
+#: ../src/mainwindow.c:2919
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -8034,18 +8206,18 @@ msgstr ""
 "Si especifica un buzón existente será\n"
 "escaneado automáticamente."
 
-#: ../src/mainwindow.c:2915 ../src/plugins/mailmbox/plugin_gtk.c:196
-#: ../src/plugins/rssyl/rssyl_gtk.c:158
+#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:196
+#: ../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:2920 ../src/plugins/mailmbox/plugin_gtk.c:202
+#: ../src/mainwindow.c:2930 ../src/plugins/mailmbox/plugin_gtk.c:202
 #: ../src/setup.c:52 ../src/wizard.c:741
 msgid "Mailbox"
 msgstr "Correo"
 
-#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:209
+#: ../src/mainwindow.c:2935 ../src/plugins/mailmbox/plugin_gtk.c:209
 #: ../src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
@@ -8056,137 +8228,137 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: ../src/mainwindow.c:3377
+#: ../src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "No esta permitido enviar"
 
-#: ../src/mainwindow.c:3955
+#: ../src/mainwindow.c:3965
 msgid "Mbox import has failed."
 msgstr "La importación de mbox ha fallado."
 
-#: ../src/mainwindow.c:3964 ../src/mainwindow.c:3973
+#: ../src/mainwindow.c:3974 ../src/mainwindow.c:3983
 msgid "Export to mbox has failed."
 msgstr "La exportación a mbox ha fallado."
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit"
 msgstr "Salir"
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit Claws Mail?"
 msgstr "¿Salir de Claws Mail?"
 
-#: ../src/mainwindow.c:4205
+#: ../src/mainwindow.c:4215
 msgid "Folder synchronisation"
 msgstr "Sincronización de carpeta"
 
-#: ../src/mainwindow.c:4206
+#: ../src/mainwindow.c:4216
 msgid "Do you want to synchronise your folders now?"
 msgstr "¿Quiere sincronizar sus carpetas ahora?"
 
-#: ../src/mainwindow.c:4207
+#: ../src/mainwindow.c:4217
 msgid "+_Synchronise"
 msgstr "+_Sincronizar"
 
-#: ../src/mainwindow.c:4636
+#: ../src/mainwindow.c:4659
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: ../src/mainwindow.c:4673
+#: ../src/mainwindow.c:4696
 #, 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:4928 ../src/summaryview.c:5725
+#: ../src/mainwindow.c:4951 ../src/summaryview.c:5725
 msgid "Processing rules to apply before folder rules"
 msgstr "Reglas de procesamiento a aplicar antes de las de las carpetas"
 
-#: ../src/mainwindow.c:4936
+#: ../src/mainwindow.c:4959
 msgid "Processing rules to apply after folder rules"
 msgstr "Reglas de procesamiento a aplicar después de las de las carpetas"
 
-#: ../src/mainwindow.c:4944 ../src/summaryview.c:5736
+#: ../src/mainwindow.c:4967 ../src/summaryview.c:5736
 msgid "Filtering configuration"
 msgstr "Configuración de filtrado"
 
-#: ../src/mainwindow.c:5059
+#: ../src/mainwindow.c:5082
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "No se puede registrar como cliente por defecto: imposible obtener la ruta al "
 "ejecutable."
 
-#: ../src/mainwindow.c:5118
+#: ../src/mainwindow.c:5141
 msgid "Claws Mail has been registered as default client."
-msgstr "Se har registrado Claws Mail como cliente por defecto."
+msgstr "Se ha registrado Claws Mail como cliente por defecto."
 
-#: ../src/mainwindow.c:5120
+#: ../src/mainwindow.c:5143
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "No se puede registrar como cliente por defecto: imposible escribir en el "
 "registro."
 
-#: ../src/mainwindow.c:5278
+#: ../src/mainwindow.c:5301
 #, 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:209 ../src/matcher.c:210 ../src/matcher.c:211
-#: ../src/matcher.c:212 ../src/matcher.c:213 ../src/matcher.c:214
-#: ../src/matcher.c:215
+#: ../src/matcher.c:211 ../src/matcher.c:212 ../src/matcher.c:213
+#: ../src/matcher.c:214 ../src/matcher.c:215 ../src/matcher.c:216
+#: ../src/matcher.c:217
 #, c-format
 msgid "%s header"
 msgstr "cabecera %s"
 
-#: ../src/matcher.c:216
+#: ../src/matcher.c:218
 msgid "header"
 msgstr "cabecera"
 
-#: ../src/matcher.c:217
+#: ../src/matcher.c:219
 msgid "header line"
 msgstr "línea de cabecera"
 
-#: ../src/matcher.c:218
+#: ../src/matcher.c:220
 msgid "body line"
 msgstr "línea de cuerpo"
 
-#: ../src/matcher.c:219
+#: ../src/matcher.c:221
 msgid "tag"
 msgstr "etiqueta"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553 ../src/message_search.c:205 ../src/prefs_matcher.c:739
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555 ../src/message_search.c:205 ../src/prefs_matcher.c:742
 #: ../src/summary_search.c:466
 msgid "Case sensitive"
 msgstr "Sensible a mayús./minús."
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555
 msgid "Case insensitive"
 msgstr "Ignorar mayús./minús."
 
-#: ../src/matcher.c:1818
+#: ../src/matcher.c:1843
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "comprobando si el mensaje coincide [ %s ]\n"
 
-#: ../src/matcher.c:1887 ../src/matcher.c:1906 ../src/matcher.c:1919
+#: ../src/matcher.c:1912 ../src/matcher.c:1931 ../src/matcher.c:1944
 msgid "message matches\n"
 msgstr "el mensaje coincide\n"
 
-#: ../src/matcher.c:1894 ../src/matcher.c:1912 ../src/matcher.c:1921
+#: ../src/matcher.c:1919 ../src/matcher.c:1937 ../src/matcher.c:1946
 msgid "message does not match\n"
 msgstr "el mensaje no coincide\n"
 
-#: ../src/matcher.c:2184 ../src/matcher.c:2185 ../src/matcher.c:2186
-#: ../src/matcher.c:2187 ../src/matcher.c:2188 ../src/matcher.c:2189
-#: ../src/matcher.c:2190 ../src/matcher.c:2191
+#: ../src/matcher.c:2209 ../src/matcher.c:2210 ../src/matcher.c:2211
+#: ../src/matcher.c:2212 ../src/matcher.c:2213 ../src/matcher.c:2214
+#: ../src/matcher.c:2215 ../src/matcher.c:2216
 msgid "(none)"
 msgstr "(ninguna)"
 
@@ -8214,8 +8386,8 @@ msgstr "Sobreescribir fichero mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Este fichero ya existe. ¿Desea sobreescribir su contenido?"
 
-#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1843
-#: ../src/prefs_themes.c:555 ../src/textview.c:3075
+#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1844
+#: ../src/prefs_themes.c:555 ../src/textview.c:3054
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
@@ -8310,7 +8482,7 @@ msgstr ""
 msgid "Fetching message (%s)..."
 msgstr "Recuperando mensaje (%s)..."
 
-#: ../src/messageview.c:1357 ../src/procmime.c:1004
+#: ../src/messageview.c:1357 ../src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "No se puede descifrar: %s"
@@ -8320,9 +8492,9 @@ msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "El mensaje no cumple el estándar MIME. Puede mostrarse incorrectamente."
 
-#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1996
-#: ../src/plugins/fancy/fancy_viewer.c:667 ../src/summaryview.c:4808
-#: ../src/summaryview.c:4811 ../src/textview.c:3063
+#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1997
+#: ../src/plugins/fancy/fancy_viewer.c:669 ../src/summaryview.c:4808
+#: ../src/summaryview.c:4811 ../src/textview.c:3042
 msgid "Save as"
 msgstr "Guardar como"
 
@@ -8430,7 +8602,7 @@ msgstr ""
 "Por favor, elija la cuenta que desea utilizar para enviar la notificación de "
 "acuse de recibo:"
 
-#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_gtk.c:494
+#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_feed_props.c:533
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -8467,20 +8639,20 @@ msgstr ""
 "  El mensaje se ha borrado o movido a otra carpeta"
 
 #: ../src/messageview.c:2971 ../src/messageview.c:2977
-#: ../src/summaryview.c:4191 ../src/summaryview.c:6964
+#: ../src/summaryview.c:4193 ../src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "Ocurrió un error mientras se aprendía.\n"
 
-#: ../src/mh.c:432
+#: ../src/mh.c:438
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "no puedo copiar el mensaje %s a %s\n"
 
-#: ../src/mh.c:518
+#: ../src/mh.c:524
 msgid "Moving messages..."
 msgstr "Moviendo mensajes..."
 
-#: ../src/mh.c:662 ../src/plugins/mailmbox/mailmbox_folder.c:839
+#: ../src/mh.c:668 ../src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Borrando mensajes..."
 
@@ -8570,32 +8742,32 @@ msgstr "Verificando firma..."
 msgid "Go back to email"
 msgstr "Volver al correo"
 
-#: ../src/mimeview.c:1762 ../src/mimeview.c:1851 ../src/mimeview.c:2043
-#: ../src/mimeview.c:2079 ../src/mimeview.c:2191
-#: ../src/plugins/fancy/fancy_viewer.c:420
+#: ../src/mimeview.c:1763 ../src/mimeview.c:1852 ../src/mimeview.c:2044
+#: ../src/mimeview.c:2080 ../src/mimeview.c:2192
+#: ../src/plugins/fancy/fancy_viewer.c:422
 #, 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:1840 ../src/textview.c:3073
+#: ../src/mimeview.c:1841 ../src/textview.c:3052
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "¿Sobreescribir el fichero existente «%s»?"
 
-#: ../src/mimeview.c:1882 ../src/plugins/archive/archiver_prefs.c:128
+#: ../src/mimeview.c:1883 ../src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
 msgstr "Seleccionar carpeta destino"
 
-#: ../src/mimeview.c:1889 ../src/plugins/archive/archiver_prefs.c:134
+#: ../src/mimeview.c:1890 ../src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "«%s» no es un directorio."
 
-#: ../src/mimeview.c:2126 ../src/mimeview.c:2133 ../src/textview.c:2994
+#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2973
 msgid "Open with"
 msgstr "Abrir con"
 
-#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2995
+#: ../src/mimeview.c:2128 ../src/mimeview.c:2135 ../src/textview.c:2974
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8604,11 +8776,11 @@ msgstr ""
 "Teclee la orden para abrir el fichero:\n"
 "(«%s» será sustituido por el fichero)"
 
-#: ../src/mimeview.c:2225
+#: ../src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "¿Ejecutar binario no fiable?"
 
-#: ../src/mimeview.c:2226
+#: ../src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8616,23 +8788,23 @@ msgid ""
 "Do you want to run this file?"
 msgstr ""
 "Este adjunto es un fichero ejecutable. Ejecutar binarios no fiables es "
-"peligroso y probablemente podria comprometer la seguridad de su ordenador.\n"
+"peligroso y probablemente podría comprometer la seguridad de su ordenador.\n"
 "\n"
 "¿Desea ejecutar este fichero?"
 
-#: ../src/mimeview.c:2230
+#: ../src/mimeview.c:2231
 msgid "Run binary"
 msgstr "Ejecutar binario"
 
-#: ../src/mimeview.c:2529
+#: ../src/mimeview.c:2530
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/mimeview.c:2530 ../src/plugins/pdf_viewer/poppler_viewer.c:699
+#: ../src/mimeview.c:2531 ../src/plugins/pdf_viewer/poppler_viewer.c:699
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: ../src/mimeview.c:2544 ../src/plugins/vcalendar/vcalendar.c:1271
+#: ../src/mimeview.c:2545 ../src/plugins/vcalendar/vcalendar.c:1271
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1722
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1732
 msgid "Description:"
@@ -8692,7 +8864,7 @@ msgstr "Error creando sesión con %s:%d\n"
 #: ../src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
-msgstr "Error autentificándose en %s:%d...\n"
+msgstr "Error autenticándose en %s:%d...\n"
 
 #: ../src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
@@ -8763,7 +8935,7 @@ msgstr "¿Desuscribirse realmente del grupo «%s»?"
 msgid "Unsubscribe newsgroup"
 msgstr "Desuscribir grupo de noticias"
 
-#: ../src/news_gtk.c:268 ../src/plugins/rssyl/rssyl_gtk.c:695
+#: ../src/news_gtk.c:268
 msgid "_Unsubscribe"
 msgstr "Des_uscribir"
 
@@ -8910,7 +9082,7 @@ msgstr "Ruta en la agenda donde se guardarán las direcciones"
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:201
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:447
 #: ../src/prefs_filtering_action.c:573 ../src/prefs_filtering_action.c:580
-#: ../src/prefs_matcher.c:676
+#: ../src/prefs_matcher.c:679
 msgid "Select..."
 msgstr "Seleccionar..."
 
@@ -9023,36 +9195,36 @@ msgstr "Pulse el botón Cancelar para detener el archivado"
 msgid "Archiving:"
 msgstr "Archivando:"
 
-#: ../src/plugins/archive/archiver_gtk.c:506
+#: ../src/plugins/archive/archiver_gtk.c:507
 msgid "Folder and archive must be selected"
 msgstr "Debe seleccionar una carpeta y un archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:515
+#: ../src/plugins/archive/archiver_gtk.c:516
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s : ya existe. ¿Continuar de todas formas?"
 
-#: ../src/plugins/archive/archiver_gtk.c:518
+#: ../src/plugins/archive/archiver_gtk.c:519
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: es un enlace. No se puede continuar"
 
-#: ../src/plugins/archive/archiver_gtk.c:521
+#: ../src/plugins/archive/archiver_gtk.c:522
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: es un directorio. No se puede continuar"
 
-#: ../src/plugins/archive/archiver_gtk.c:524
+#: ../src/plugins/archive/archiver_gtk.c:525
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: no hay permisos. No se puede continuar"
 
-#: ../src/plugins/archive/archiver_gtk.c:527
+#: ../src/plugins/archive/archiver_gtk.c:528
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: error desconocido. No se puede continuar"
 
-#: ../src/plugins/archive/archiver_gtk.c:564
+#: ../src/plugins/archive/archiver_gtk.c:565
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -9061,7 +9233,7 @@ msgstr ""
 "Nombre de fichero inválido:\n"
 "%s."
 
-#: ../src/plugins/archive/archiver_gtk.c:577
+#: ../src/plugins/archive/archiver_gtk.c:578
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -9070,7 +9242,7 @@ msgstr ""
 "Nombre de carpeta de Claws Mail inválida:\n"
 "%s."
 
-#: ../src/plugins/archive/archiver_gtk.c:606
+#: ../src/plugins/archive/archiver_gtk.c:607
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -9085,182 +9257,182 @@ msgstr ""
 "\n"
 "¿Continuar de todas formas?"
 
-#: ../src/plugins/archive/archiver_gtk.c:710
+#: ../src/plugins/archive/archiver_gtk.c:711
 msgid "Archive result"
 msgstr "Resultado del archivado"
 
-#: ../src/plugins/archive/archiver_gtk.c:740
+#: ../src/plugins/archive/archiver_gtk.c:741
 msgid "Values"
 msgstr "Valores"
 
-#: ../src/plugins/archive/archiver_gtk.c:749
+#: ../src/plugins/archive/archiver_gtk.c:750
 msgid "Archive"
 msgstr "Archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:755
+#: ../src/plugins/archive/archiver_gtk.c:756
 msgid "Archive format"
 msgstr "Formato de archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:762
+#: ../src/plugins/archive/archiver_gtk.c:763
 msgid "Compression method"
 msgstr "Método de compresión"
 
-#: ../src/plugins/archive/archiver_gtk.c:770
+#: ../src/plugins/archive/archiver_gtk.c:771
 msgid "Number of files"
 msgstr "Número de ficheros"
 
-#: ../src/plugins/archive/archiver_gtk.c:778
+#: ../src/plugins/archive/archiver_gtk.c:779
 msgid "Archive Size"
 msgstr "Tamaño del archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:786
+#: ../src/plugins/archive/archiver_gtk.c:787
 msgid "Folder Size"
 msgstr "Tamaño de la carpeta"
 
-#: ../src/plugins/archive/archiver_gtk.c:795
+#: ../src/plugins/archive/archiver_gtk.c:796
 msgid "Compression level"
 msgstr "Nivel de compresión"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:718
 #: ../src/prefs_folder_item.c:514
 msgid "Yes"
 msgstr "Sí"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:721
 #: ../src/prefs_folder_item.c:513 ../src/prefs_summaries.c:369
 msgid "No"
 msgstr "No"
 
-#: ../src/plugins/archive/archiver_gtk.c:803
+#: ../src/plugins/archive/archiver_gtk.c:804
 msgid "MD5 checksum"
 msgstr "Suma de control MD5"
 
-#: ../src/plugins/archive/archiver_gtk.c:811
+#: ../src/plugins/archive/archiver_gtk.c:812
 msgid "Descriptive names"
 msgstr "Nombres descriptivos"
 
-#: ../src/plugins/archive/archiver_gtk.c:819
+#: ../src/plugins/archive/archiver_gtk.c:820
 msgid "Delete selected files"
 msgstr "Borrar los ficheros seleccionados"
 
-#: ../src/plugins/archive/archiver_gtk.c:828
-#: ../src/plugins/archive/archiver_gtk.c:1210
+#: ../src/plugins/archive/archiver_gtk.c:829
+#: ../src/plugins/archive/archiver_gtk.c:1211
 msgid "Select mails before"
 msgstr "Seleccionar correos antes de"
 
-#: ../src/plugins/archive/archiver_gtk.c:904
+#: ../src/plugins/archive/archiver_gtk.c:905
 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:952
+#: ../src/plugins/archive/archiver_gtk.c:953
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld de %ld"
 
-#: ../src/plugins/archive/archiver_gtk.c:991
+#: ../src/plugins/archive/archiver_gtk.c:992
 msgid "Create Archive"
 msgstr "Crear un archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1006
+#: ../src/plugins/archive/archiver_gtk.c:1007
 msgid "Enter Archiver arguments"
 msgstr "Parámetros de archivado"
 
-#: ../src/plugins/archive/archiver_gtk.c:1019
+#: ../src/plugins/archive/archiver_gtk.c:1020
 msgid "Folder to archive"
 msgstr "Carpeta a archivar"
 
-#: ../src/plugins/archive/archiver_gtk.c:1026
+#: ../src/plugins/archive/archiver_gtk.c:1027
 msgid "Folder which is the root of the archive"
 msgstr "Carpeta raíz del archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1031
+#: ../src/plugins/archive/archiver_gtk.c:1032
 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:1037
+#: ../src/plugins/archive/archiver_gtk.c:1038
 msgid "Name for archive"
 msgstr "Nombre del archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1043
+#: ../src/plugins/archive/archiver_gtk.c:1044
 msgid "Archive location and name"
 msgstr "Ubicación y nombre del archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1045
+#: ../src/plugins/archive/archiver_gtk.c:1046
 #: ../src/plugins/archive/archiver_prefs.c:198
 #: ../src/plugins/pgpcore/select-keys.c:422
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: ../src/plugins/archive/archiver_gtk.c:1048
+#: ../src/plugins/archive/archiver_gtk.c:1049
 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:1050
+#: ../src/plugins/archive/archiver_gtk.c:1051
 msgid "Choose compression"
 msgstr "Elija la compresión"
 
-#: ../src/plugins/archive/archiver_gtk.c:1063
+#: ../src/plugins/archive/archiver_gtk.c:1064
 msgid "Choose this option to use ZIP compression for the archive"
 msgstr "Utilizar compresión ZIP en el archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1070
+#: ../src/plugins/archive/archiver_gtk.c:1071
 msgid "Choose this option to use BZIP2 compression for the archive"
 msgstr "Utilizar compresión BZIP2 en el archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1078
+#: ../src/plugins/archive/archiver_gtk.c:1079
 msgid "Choose this to use Compress compression for your archive"
 msgstr "Utilizar compresión Compress en el archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1086
+#: ../src/plugins/archive/archiver_gtk.c:1087
 msgid "Choose this option to disable compression for the archive"
 msgstr "Desactivar la compresión en el archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1108
+#: ../src/plugins/archive/archiver_gtk.c:1109
 msgid "Choose format"
 msgstr "Elegir formato"
 
-#: ../src/plugins/archive/archiver_gtk.c:1121
+#: ../src/plugins/archive/archiver_gtk.c:1122
 msgid "Choose this option to use TAR as format for the archive"
 msgstr "Utilizar el formato TAR en el archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1128
+#: ../src/plugins/archive/archiver_gtk.c:1129
 msgid "Choose this to use SHAR as format for the archive"
 msgstr "Utilizar el formato SHAR en el archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1135
+#: ../src/plugins/archive/archiver_gtk.c:1136
 msgid "Choose this option to use CPIO as format for the archive"
 msgstr "Utilizar el formato CPIO en el archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1142
+#: ../src/plugins/archive/archiver_gtk.c:1143
 msgid "Choose this option to use PAX as format for the archive"
 msgstr "Utilizar el formato PAX en el archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1162
+#: ../src/plugins/archive/archiver_gtk.c:1163
 msgid "Miscellaneous options"
 msgstr "Opciones adicionales"
 
-#: ../src/plugins/archive/archiver_gtk.c:1171
+#: ../src/plugins/archive/archiver_gtk.c:1172
 msgid "_Recursive"
 msgstr "_Recursivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1175
+#: ../src/plugins/archive/archiver_gtk.c:1176
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Incluir las subcarpetas en el archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1177
+#: ../src/plugins/archive/archiver_gtk.c:1178
 msgid "_MD5sum"
 msgstr "Suma de control _MD5"
 
-#: ../src/plugins/archive/archiver_gtk.c:1181
+#: ../src/plugins/archive/archiver_gtk.c:1182
 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"
@@ -9270,11 +9442,11 @@ msgstr ""
 "Cuidado: esta opción incrementa dramáticamente el tiempo que se tardará\n"
 "en crear el archivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1185
+#: ../src/plugins/archive/archiver_gtk.c:1186
 msgid "R_ename"
 msgstr "R_enombrar"
 
-#: ../src/plugins/archive/archiver_gtk.c:1189
+#: ../src/plugins/archive/archiver_gtk.c:1190
 #: ../src/plugins/archive/archiver_prefs.c:333
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9285,7 +9457,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:1197
+#: ../src/plugins/archive/archiver_gtk.c:1198
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9293,11 +9465,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:1201
+#: ../src/plugins/archive/archiver_gtk.c:1202
 msgid "Selection options"
 msgstr "Opciones de selección"
 
-#: ../src/plugins/archive/archiver_gtk.c:1217
+#: ../src/plugins/archive/archiver_gtk.c:1218
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9387,29 +9559,100 @@ msgstr "Renombrar"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Borrar los correos después de realizar el archivado"
 
-#: ../src/plugins/attachwarner/attachwarner.c:216
-#, c-format
-msgid ""
-"An attachment is mentioned in the mail you're sending, but no file was "
-"attached. Mention appears on line %d, which begins with text: <span weight="
-"\"bold\">%.20s</span>...\n"
-"\n"
-"%s it anyway?"
-msgstr ""
-"Se menciona un adjunto en el correo que está a punto de enviar, pero no se "
-"adjuntó ningún fichero. La mención aparece en la línea %d, que comienza con "
-"el texto <span weight=\"bold\">%.20s</span>…\n"
-"\n"
-"¿%s de todas formas?"
+#: ../src/plugins/att_remover/att_remover.c:299
+msgid "<b>Type: </b>"
+msgstr "<b>Tipo: </b> "
 
-#: ../src/plugins/attachwarner/attachwarner.c:220
-msgid "Attachment warning"
-msgstr "Aviso de adjuntos"
+#: ../src/plugins/att_remover/att_remover.c:300
+msgid "<b>Size: </b>"
+msgstr "<b>Tamaño: </b> "
 
-#: ../src/plugins/attachwarner/attachwarner.c:245
-#: ../src/plugins/attachwarner/attachwarner.c:282
-#: ../src/plugins/attachwarner/attachwarner.c:334
-msgid "Attach warner"
+#: ../src/plugins/att_remover/att_remover.c:301
+msgid "<b>Filename: </b>"
+msgstr "<b>Nombre de fichero: </b>"
+
+#: ../src/plugins/att_remover/att_remover.c:332
+msgid "Remove attachments"
+msgstr "Eliminar adjuntos"
+
+#: ../src/plugins/att_remover/att_remover.c:357
+#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
+msgid "Remove"
+msgstr "Eliminar"
+
+#. S_COL_STATUS
+#: ../src/plugins/att_remover/att_remover.c:365
+#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
+msgid "Attachment"
+msgstr "Adjunto"
+
+#: ../src/plugins/att_remover/att_remover.c:417
+msgid "Destroy attachments"
+msgstr "Destruir adjuntos"
+
+#: ../src/plugins/att_remover/att_remover.c:418
+msgid ""
+"Do you really want to remove all attachments from the selected messages?\n"
+"\n"
+"The deleted data will be unrecoverable."
+msgstr ""
+"¿Quiere realmente eliminar todos los adjuntos de los mensajes "
+"seleccionados?\n"
+"\n"
+"Los datos borrados no se podrán recuperar."
+
+#: ../src/plugins/att_remover/att_remover.c:479
+msgid "This message doesn't have any attachments."
+msgstr "Este mensaje no tiene ningún adjunto"
+
+#: ../src/plugins/att_remover/att_remover.c:494
+msgid "Remove attachments..."
+msgstr "Eliminar adjuntos..."
+
+#: ../src/plugins/att_remover/att_remover.c:506
+#: ../src/plugins/att_remover/att_remover.c:566
+msgid "AttRemover"
+msgstr "Eliminador de adjuntos"
+
+#: ../src/plugins/att_remover/att_remover.c:571
+msgid ""
+"This plugin removes attachments from mails.\n"
+"\n"
+"Warning: this operation will be completely un-cancellable and the deleted "
+"attachments will be lost forever, and ever, and ever."
+msgstr ""
+"Este módulo elimina los adjuntos de los correos.\n"
+"\n"
+"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:595
+msgid "Attachment handling"
+msgstr "Gestión de adjuntos"
+
+#: ../src/plugins/attachwarner/attachwarner.c:216
+#, c-format
+msgid ""
+"An attachment is mentioned in the mail you're sending, but no file was "
+"attached. Mention appears on line %d, which begins with text: <span weight="
+"\"bold\">%.20s</span>...\n"
+"\n"
+"%s it anyway?"
+msgstr ""
+"Se menciona un adjunto en el correo que está a punto de enviar, pero no se "
+"adjuntó ningún fichero. La mención aparece en la línea %d, que comienza con "
+"el texto <span weight=\"bold\">%.20s</span>…\n"
+"\n"
+"¿%s de todas formas?"
+
+#: ../src/plugins/attachwarner/attachwarner.c:220
+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"
 msgstr "Aviso de adjuntos"
 
 #: ../src/plugins/attachwarner/attachwarner.c:292
@@ -9436,7 +9679,8 @@ msgstr "Expresiones diferencian mayúsculas y minúsculas"
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:96
 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"
+"Sensible a mayús./minús. cuando se busca con las expresiones regulares de la "
+"lista"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:114
 msgid "Lines starting with quotation marks"
@@ -9459,7 +9703,7 @@ msgstr "Mensajes reenviados o redirigidos"
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:131
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
-msgstr "No comprueba si faltan adjuntos al reenviar o redirijir mensajes"
+msgstr "No comprueba si faltan adjuntos al reenviar o redirigir mensajes"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:134
 #: ../src/prefs_msg_colors.c:362
@@ -9486,77 +9730,6 @@ msgstr "Excluyendo"
 msgid "Attach Warner"
 msgstr "Aviso de adjuntos"
 
-#: ../src/plugins/att_remover/att_remover.c:299
-msgid "<b>Type: </b>"
-msgstr "<b>Tipo: </b> "
-
-#: ../src/plugins/att_remover/att_remover.c:300
-msgid "<b>Size: </b>"
-msgstr "<b>Tamaño: </b> "
-
-#: ../src/plugins/att_remover/att_remover.c:301
-msgid "<b>Filename: </b>"
-msgstr "<b>Nombre de fichero: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:332
-msgid "Remove attachments"
-msgstr "Eliminar adjuntos"
-
-#: ../src/plugins/att_remover/att_remover.c:357
-#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
-msgid "Remove"
-msgstr "Eliminar"
-
-#. S_COL_STATUS
-#: ../src/plugins/att_remover/att_remover.c:365
-#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
-msgid "Attachment"
-msgstr "Adjunto"
-
-#: ../src/plugins/att_remover/att_remover.c:417
-msgid "Destroy attachments"
-msgstr "Destruir adjuntos"
-
-#: ../src/plugins/att_remover/att_remover.c:418
-msgid ""
-"Do you really want to remove all attachments from the selected messages?\n"
-"\n"
-"The deleted data will be unrecoverable."
-msgstr ""
-"¿Quiere realmente eliminar todos los adjuntos de los mensajes "
-"seleccionados?\n"
-"\n"
-"Los datos borrados no se podrán recuperar."
-
-#: ../src/plugins/att_remover/att_remover.c:479
-msgid "This message doesn't have any attachments."
-msgstr "Este mensaje no tiene ningún adjunto"
-
-#: ../src/plugins/att_remover/att_remover.c:494
-msgid "Remove attachments..."
-msgstr "Eliminar adjuntos..."
-
-#: ../src/plugins/att_remover/att_remover.c:506
-#: ../src/plugins/att_remover/att_remover.c:566
-msgid "AttRemover"
-msgstr "Eliminador de adjuntos"
-
-#: ../src/plugins/att_remover/att_remover.c:571
-msgid ""
-"This plugin removes attachments from mails.\n"
-"\n"
-"Warning: this operation will be completely un-cancellable and the deleted "
-"attachments will be lost forever, and ever, and ever."
-msgstr ""
-"Este módulo elimina los adjuntos de los correos.\n"
-"\n"
-"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:595
-msgid "Attachment handling"
-msgstr "Gestión de adjuntos"
-
 #: ../src/plugins/bogofilter/bogofilter.c:81
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:458
 msgid "Bogofilter"
@@ -9580,7 +9753,7 @@ msgid ""
 msgstr ""
 "El módulo Bogofilter no pudo filtrar un mensaje. La causa probable del error "
 "es que no haya aprendido de ningún correo.\n"
-"Utilize «/Marcar/Marcar como correo basura» y «/Marcar/Marcar como bueno» "
+"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:611
@@ -9681,7 +9854,7 @@ msgstr "No se comprobarán los mensajes mayores de este tamaño"
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:370
 #: ../src/prefs_account.c:1508
 msgid "KB"
-msgstr "Kb"
+msgstr "kB"
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:178
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:171
@@ -9765,7 +9938,7 @@ msgid ""
 "If Bogofilter thought an email was spam or unsure, but it was whitelisted, "
 "learn it as ham."
 msgstr ""
-"Si Bogofilter cree que un correo es basura o no está seguro pero estña en la "
+"Si Bogofilter cree que un correo es basura o no está seguro pero esta en la "
 "lista blanca se aprende como bueno."
 
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:251
@@ -9805,7 +9978,7 @@ msgid ""
 msgstr ""
 "El módulo Bsfilter no pudo filtrar un mensaje. La causa probable del error "
 "es que no haya aprendido de ningún correo.\n"
-"Utilize «/Marcar/Marcar como correo basura» y «/Marcar/Marcar como bueno» "
+"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:400
@@ -9878,7 +10051,7 @@ msgid ""
 "Antivirus disabled."
 msgstr ""
 "Verificación\n"
-"No hay información de socket.\n"
+"No hay información de conector.\n"
 "Antivirus desactivado."
 
 #: ../src/plugins/clamd/clamav_plugin.c:114
@@ -9925,7 +10098,7 @@ msgid ""
 "Antivirus disabled."
 msgstr ""
 "Inicio\n"
-"No hay información de socket.\n"
+"No hay información de conector.\n"
 "Antivirus desactivado."
 
 #: ../src/plugins/clamd/clamav_plugin.c:297
@@ -9967,16 +10140,16 @@ msgstr ""
 "guardarse en una carpeta designada al efecto.\n"
 "\n"
 "Debido a que el módulo se comunica con clamd a\n"
-"través de un socket hay unos requisitos mínimos\n"
+"través de un conector hay unos requisitos mínimos\n"
 "para los permisos de su carpeta de usuario y la\n"
 "carpeta «.claws-mail» suponiendo que el demonio\n"
 "clamav esté configurado para comunicarse usando\n"
-"un socket. Es necesario que éstas tengan permisos\n"
+"un conector. Es necesario que éstas tengan permisos\n"
 "de ejecución para todos los usuarios.\n"
 "\n"
 "Para evitar el cambio de permisos podría configurar\n"
 "el demonio clamav para comunicarse a través de un\n"
-"socket TCP y configuración manual para clamd.\n"
+"conector TCP y configuración manual para clamd.\n"
 "\n"
 "Las opciones se encuentran en «/Configuración/Preferencias/Módulos/Antivirus "
 "Clam»"
@@ -10000,7 +10173,7 @@ msgstr "Los adjuntos mayores de este tamaño no se verificarán"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:272
 msgid "MB"
-msgstr "Mb"
+msgstr "MB"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:281
 msgid "Save infected mail in"
@@ -10079,7 +10252,7 @@ msgid ""
 "Antivirus disabled."
 msgstr ""
 "Nueva configuración\n"
-"No hay información de socket.\n"
+"No hay información de conector.\n"
 "Antivirus desactivado."
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:530
@@ -10115,7 +10288,7 @@ msgstr ""
 #. g_error("%s: Not able to find required information", path);
 #: ../src/plugins/clamd/libclamd/clamd-plugin.c:249
 msgid "Could not create socket"
-msgstr "No se pudo crear el socket"
+msgstr "No se pudo crear el conector"
 
 #: ../src/plugins/clamd/libclamd/clamd-plugin.c:421
 msgid ": File does not exist"
@@ -10130,7 +10303,7 @@ msgstr ": No se puede abrir"
 #: ../src/plugins/clamd/libclamd/clamd-plugin.c:459
 #: ../src/plugins/clamd/libclamd/clamd-plugin.c:473
 msgid "Socket write error"
-msgstr "Error de escritura en el socket"
+msgstr "Error de escritura en el conector"
 
 #: ../src/plugins/clamd/libclamd/clamd-plugin.c:466
 #, c-format
@@ -10139,7 +10312,7 @@ msgstr "%s: Error leyendo"
 
 #: ../src/plugins/clamd/libclamd/clamd-plugin.c:480
 msgid "Socket read error"
-msgstr "Error de lectura en el socket"
+msgstr "Error de lectura en el conector"
 
 #: ../src/plugins/demo/demo.c:31 ../src/plugins/demo/demo.c:100
 msgid "Demo"
@@ -10162,63 +10335,63 @@ msgstr ""
 "\n"
 "No es realmente útil."
 
-#: ../src/plugins/fancy/fancy_prefs.c:141
+#: ../src/plugins/fancy/fancy_prefs.c:146
 msgid "Display images"
 msgstr "Mostrar imágenes"
 
-#: ../src/plugins/fancy/fancy_prefs.c:142
+#: ../src/plugins/fancy/fancy_prefs.c:147
 msgid "Display embedded images"
 msgstr "Mostrar imágenes incrustadas"
 
-#: ../src/plugins/fancy/fancy_prefs.c:146
+#: ../src/plugins/fancy/fancy_prefs.c:151
 msgid "Execute javascript"
 msgstr "Ejecutar JavaScript"
 
-#: ../src/plugins/fancy/fancy_prefs.c:147
+#: ../src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute embedded javascript"
 msgstr "Ejecutar JavaScript incrustado"
 
-#: ../src/plugins/fancy/fancy_prefs.c:151
+#: ../src/plugins/fancy/fancy_prefs.c:156
 msgid "Execute Java applets"
 msgstr "Ejecutar applets de Java"
 
-#: ../src/plugins/fancy/fancy_prefs.c:152
+#: ../src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute embedded Java applets"
 msgstr "Ejecutar applets de Java incrustadas"
 
-#: ../src/plugins/fancy/fancy_prefs.c:156
+#: ../src/plugins/fancy/fancy_prefs.c:161
 msgid "Render objects using plugins"
 msgstr "Dibujar objetos que usan extensiones"
 
-#: ../src/plugins/fancy/fancy_prefs.c:157
+#: ../src/plugins/fancy/fancy_prefs.c:162
 msgid "Render embedded objects using plugins"
 msgstr "Dibujar objetos incrustados que usan extensiones"
 
-#: ../src/plugins/fancy/fancy_prefs.c:164
+#: ../src/plugins/fancy/fancy_prefs.c:169
 msgid "Open in viewer (remote content is enabled)"
 msgstr "Abrir en el visor (contenidos remotos activados)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:167
+#: ../src/plugins/fancy/fancy_prefs.c:172
 msgid "Do nothing (remote content is disabled)"
 msgstr "No hacer nada (contenidos remotos desactivados)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:200
+#: ../src/plugins/fancy/fancy_prefs.c:209
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/plugins/fancy/fancy_prefs.c:202
+#: ../src/plugins/fancy/fancy_prefs.c:211
 msgid "Use GNOME's proxy settings"
 msgstr "Utilizar la configuración del proxy de GNOME"
 
-#: ../src/plugins/fancy/fancy_prefs.c:210
+#: ../src/plugins/fancy/fancy_prefs.c:219
 msgid "Use proxy:"
 msgstr "Usar proxy:"
 
-#: ../src/plugins/fancy/fancy_prefs.c:228
+#: ../src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
 msgstr "Recursos remotos"
 
-#: ../src/plugins/fancy/fancy_prefs.c:229
+#: ../src/plugins/fancy/fancy_prefs.c:238
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10232,106 +10405,124 @@ msgstr ""
 "objetos que requieren extensiones aún se puede activar para el contenido\n"
 "adjunto al correo."
 
-#: ../src/plugins/fancy/fancy_prefs.c:235
+#: ../src/plugins/fancy/fancy_prefs.c:244
 msgid "Enable loading of remote content"
 msgstr "Permitir la carga de contenidos remotos"
 
-#: ../src/plugins/fancy/fancy_prefs.c:267
+#: ../src/plugins/fancy/fancy_prefs.c:276
 msgid "When clicking on a link, by default:"
 msgstr "Al pulsar en un enlace, por omisión:"
 
-#: ../src/plugins/fancy/fancy_prefs.c:275
+#: ../src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
 msgstr "Abrir con el navegador externo"
 
-#: ../src/plugins/fancy/fancy_viewer.c:391
+#: ../src/plugins/fancy/fancy_prefs.c:298
+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:300
+msgid "Stylesheet:"
+msgstr "Hoja de estilos:"
+
+#: ../src/plugins/fancy/fancy_prefs.c:308 ../src/prefs_account.c:1442
+#: ../src/prefs_account.c:1531 ../src/prefs_account.c:1991
+#: ../src/prefs_customheader.c:237
+msgid "Bro_wse"
+msgstr "E_xplorar"
+
+#: ../src/plugins/fancy/fancy_prefs.c:350
+msgid "Select stylesheet"
+msgstr "Seleccionar estilos"
+
+#: ../src/plugins/fancy/fancy_viewer.c:393
 msgid "Remote content loading is disabled."
 msgstr "Carga de contenidos remotos desactivada."
 
-#: ../src/plugins/fancy/fancy_viewer.c:468
+#: ../src/plugins/fancy/fancy_viewer.c:470
 msgid "Load images"
 msgstr "Cargar imágenes"
 
-#: ../src/plugins/fancy/fancy_viewer.c:470
+#: ../src/plugins/fancy/fancy_viewer.c:472
 msgid "Enable remote content"
 msgstr "Activar contenidos remotos"
 
-#: ../src/plugins/fancy/fancy_viewer.c:472
+#: ../src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable Javascript"
 msgstr "Activar Javascript"
 
-#: ../src/plugins/fancy/fancy_viewer.c:474
+#: ../src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Plugins"
 msgstr "Activar módulos"
 
-#: ../src/plugins/fancy/fancy_viewer.c:476
+#: ../src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Java"
 msgstr "Activar Java"
 
-#: ../src/plugins/fancy/fancy_viewer.c:478
+#: ../src/plugins/fancy/fancy_viewer.c:480
 msgid "Open links with external browser"
 msgstr "Abrir enlaces con el navegador externo"
 
-#: ../src/plugins/fancy/fancy_viewer.c:647
+#: ../src/plugins/fancy/fancy_viewer.c:649
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ocurrió un error: %d\n"
 
-#: ../src/plugins/fancy/fancy_viewer.c:703
+#: ../src/plugins/fancy/fancy_viewer.c:705
 #, 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:714
+#: ../src/plugins/fancy/fancy_viewer.c:716
 msgid "Search the Web"
 msgstr "Buscar en la web"
 
-#: ../src/plugins/fancy/fancy_viewer.c:726
+#: ../src/plugins/fancy/fancy_viewer.c:728
 msgid "Open in Viewer"
 msgstr "Abrir en el visor"
 
-#: ../src/plugins/fancy/fancy_viewer.c:728
+#: ../src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer (enable remote content)"
 msgstr "Abrir en el visor (activar contenidos remotos)"
 
-#: ../src/plugins/fancy/fancy_viewer.c:737
+#: ../src/plugins/fancy/fancy_viewer.c:739
 msgid "Open in Browser"
 msgstr "Abrir con el navegador"
 
-#: ../src/plugins/fancy/fancy_viewer.c:747
+#: ../src/plugins/fancy/fancy_viewer.c:749
 msgid "Open Image"
 msgstr "Abrir imagen"
 
-#: ../src/plugins/fancy/fancy_viewer.c:756
+#: ../src/plugins/fancy/fancy_viewer.c:758
 msgid "Copy Link"
 msgstr "Copiar enlace"
 
-#: ../src/plugins/fancy/fancy_viewer.c:760
+#: ../src/plugins/fancy/fancy_viewer.c:762
 msgid "Download Link"
 msgstr "Descargar enlace"
 
-#: ../src/plugins/fancy/fancy_viewer.c:771
+#: ../src/plugins/fancy/fancy_viewer.c:773
 msgid "Save Image As"
 msgstr "Descargar imagen como"
 
-#: ../src/plugins/fancy/fancy_viewer.c:781
+#: ../src/plugins/fancy/fancy_viewer.c:783
 msgid "Copy Image"
 msgstr "Copiar imagen"
 
-#: ../src/plugins/fancy/fancy_viewer.c:799
+#: ../src/plugins/fancy/fancy_viewer.c:801
 msgid "Import feed"
 msgstr "Importar canal"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1012
+#: ../src/plugins/fancy/fancy_viewer.c:1014
 msgid "Fancy"
 msgstr "Fancy"
 
 #. i18n: 'Fancy' here is name of the plugin, not the english word.
-#: ../src/plugins/fancy/fancy_viewer.c:1040
+#: ../src/plugins/fancy/fancy_viewer.c:1042
 msgid "Fancy HTML Viewer"
 msgstr "Visor HTML Fancy"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1045
+#: ../src/plugins/fancy/fancy_viewer.c:1047
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10467,7 +10658,7 @@ msgstr "Módulo GData: comenzando la identificación asíncrona\n"
 #. auth frame
 #: ../src/plugins/gdata/cm_gdata_prefs.c:78 ../src/prefs_account.c:1745
 msgid "Authentication"
-msgstr "Autentificación"
+msgstr "Autenticación"
 
 #: ../src/plugins/gdata/cm_gdata_prefs.c:84
 #: ../src/plugins/spam_report/spam_report_prefs.c:152
@@ -10535,1025 +10726,999 @@ msgstr "Integración con GData"
 #: ../src/plugins/geolocation/geolocation_plugin.c:349
 #, c-format
 msgid "Found location: (%.2f,%.2f)"
-msgstr ""
+msgstr "Encontrada ubicación: (%.2f,%.2f)"
 
 #. TRANSLATORS: The country name is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:369
 msgid "Alleged country of origin: "
-msgstr ""
+msgstr "Supuesto país de origen:"
 
 #. TRANSLATORS: The IP address is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:373
-#, fuzzy
 msgid "Could not resolve location of IP address "
-msgstr "No se puede leer el índice de direcciones"
+msgstr "No se puede resolver la ubicación de la dirección IP"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:512
-#, fuzzy
 msgid "Try to locate sender"
-msgstr "nombre del remitente"
+msgstr "Intentar localizar al remitente"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:528
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:529
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Emiratos Árabes Unidos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:530
 msgid "Afghanistan"
-msgstr ""
+msgstr "Afganistán"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:531
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "Antigua y Barbuda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:532
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguila"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:533
 msgid "Albania"
-msgstr ""
+msgstr "Albania"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:534
 msgid "Armenia"
-msgstr ""
+msgstr "Armenia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:535
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Antillas Holandesas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:536
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:537
 msgid "Antarctica"
-msgstr ""
+msgstr "Antártida"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:538
-#, fuzzy
 msgid "Argentina"
-msgstr "Magenta"
+msgstr "Argentina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:539
 msgid "American Samoa"
-msgstr ""
+msgstr "Samoa americana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:540
 msgid "Austria"
-msgstr ""
+msgstr "Austria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:541
 msgid "Australia"
-msgstr ""
+msgstr "Australia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:542
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:543
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbaiyán"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:544
 msgid "Bosnia And Herzegovina"
-msgstr ""
+msgstr "Bosnia y Herzegovina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:545
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:546
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladesh"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:547
 msgid "Belgium"
-msgstr ""
+msgstr "Bélgica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:548
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:549
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgaria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:550
 msgid "Bahrain"
-msgstr ""
+msgstr "Baréin"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:551
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:552
 msgid "Benin"
-msgstr ""
+msgstr "Benín"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:553
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermuda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:554
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Estado de Brunéi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:555
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolivia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:556
 msgid "Brazil"
-msgstr ""
+msgstr "Brasil"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:557
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahamas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:558
 msgid "Bhutan"
-msgstr ""
+msgstr "Bután"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:559
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Isla Bouvet"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:560
 msgid "Botswana"
-msgstr ""
+msgstr "Botsuana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:561
 msgid "Belarus"
-msgstr ""
+msgstr "Bielorrusia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:562
 msgid "Belize"
-msgstr ""
+msgstr "Belice"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:563
 msgid "Canada"
-msgstr ""
+msgstr "Canadá"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:564
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Islas Cocos (Keeling)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:565
 msgid "Central African Republic"
-msgstr ""
+msgstr "República Central Africana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:566
 msgid "Congo"
-msgstr ""
+msgstr "Congo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:567
 msgid "Switzerland"
-msgstr ""
+msgstr "Suiza"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:568
 msgid "Cote D'Ivoire"
-msgstr ""
+msgstr "Costa de Marfil"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:569
 msgid "Cook Islands"
-msgstr ""
+msgstr "Islas Cook"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:570
 msgid "Chile"
-msgstr ""
+msgstr "Chile"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:571
 msgid "Cameroon"
-msgstr ""
+msgstr "Camerún"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:572
-#, fuzzy
 msgid "China"
-msgstr "Chino"
+msgstr "China"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:573
-#, fuzzy
 msgid "Colombia"
-msgstr "Colorear"
+msgstr "Colombia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:574
 msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:575
 msgid "Cuba"
-msgstr ""
+msgstr "Cuba"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:576
 msgid "Cape Verde"
-msgstr ""
+msgstr "Cabo Verde"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:577
 msgid "Christmas Island"
-msgstr ""
+msgstr "Isla Navidad"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:578
 msgid "Cyprus"
-msgstr ""
+msgstr "Chipre"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:579
 msgid "Czech Republic"
-msgstr ""
+msgstr "República Checa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:580
 msgid "Germany"
-msgstr ""
+msgstr "Alemania"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:581
 msgid "Djibouti"
-msgstr ""
+msgstr "Yibuti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:582
-#, fuzzy
 msgid "Denmark"
-msgstr "Desmarca"
+msgstr "Dinamarca"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:583
 msgid "Dominica"
-msgstr ""
+msgstr "Dominica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:584
 msgid "Dominican Republic"
-msgstr ""
+msgstr "República Dominicana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:585
 msgid "Algeria"
-msgstr ""
+msgstr "Argelia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:586
 msgid "Ecuador"
-msgstr ""
+msgstr "Ecuador"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:587
 msgid "Estonia"
-msgstr ""
+msgstr "Estonia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:588
 msgid "Egypt"
-msgstr ""
+msgstr "Egipto"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:589
-#, fuzzy
 msgid "Western Sahara"
-msgstr "Europeo Occidental"
+msgstr "Sáhara Occidental"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:590
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:591
 msgid "Spain"
-msgstr ""
+msgstr "España"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:592
 msgid "Ethiopia"
-msgstr ""
+msgstr "Etiopía"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:593
 msgid "Finland"
-msgstr ""
+msgstr "Finlandia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:594
 msgid "Fiji"
-msgstr ""
+msgstr "Fiyi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:595
 msgid "Falkland Islands (Malvinas)"
-msgstr ""
+msgstr "Islas Malvinas (Falkland)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:596
 msgid "Micronesia, Federated States Of"
-msgstr ""
+msgstr "Estados Federados de Micronesia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:597
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Islas Faroe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:598
-#, fuzzy
 msgid "France"
-msgstr "Cancelar"
+msgstr "Francia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:599
 msgid "France, Metropolitan"
-msgstr ""
+msgstr "Francia (Metrópolitana)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:600
 msgid "Gabon"
-msgstr ""
+msgstr "Gabón"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:601
 #: ../src/plugins/geolocation/geolocation_plugin.c:747
 msgid "United Kingdom"
-msgstr ""
+msgstr "Reino Unido"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:602
 msgid "Grenada"
-msgstr ""
+msgstr "Granada"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:603
 msgid "Georgia"
-msgstr ""
+msgstr "Georgia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:604
 msgid "French Guiana"
-msgstr ""
+msgstr "Guyana Francesa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:605
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:606
-#, fuzzy
 msgid "Gibraltar"
-msgstr "Libravatar"
+msgstr "Gibraltar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:607
-#, fuzzy
 msgid "Greenland"
-msgstr "Verde"
+msgstr "Groenlandia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:608
 msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:609
 msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:610
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Guadalupe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:611
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Guinea Ecuatorial"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:612
-#, fuzzy
 msgid "Greece"
-msgstr "Verde"
+msgstr "Grecia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:613
 msgid "South Georgia And The South Sandwich Islands"
-msgstr ""
+msgstr "Georgia del Sur e Islas Sandwich del Sur"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:614
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:615
 msgid "Guam"
-msgstr ""
+msgstr "Guam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:616
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Guinea-Bissau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:617
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:618
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:619
 msgid "Heard Island And Mcdonald Islands"
-msgstr ""
+msgstr "Isla Heard e Islas Mcdonald"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:620
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:621
 msgid "Croatia"
-msgstr ""
+msgstr "Croacia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:622
 msgid "Haiti"
-msgstr ""
+msgstr "Haití"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:623
 msgid "Hungary"
-msgstr ""
+msgstr "Hungría"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:624
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonesia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:625
 msgid "Ireland"
-msgstr ""
+msgstr "Irlanda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:626
 msgid "Israel"
-msgstr ""
+msgstr "Israel"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:627
-#, fuzzy
 msgid "India"
-msgstr "Indicador"
+msgstr "India"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:628
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Territorio Británico del Océano Índico"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:629
 msgid "Iraq"
-msgstr ""
+msgstr "Irak"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:630
 msgid "Iran, Islamic Republic Of"
-msgstr ""
+msgstr "República Islámica de Irán"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:631
 msgid "Iceland"
-msgstr ""
+msgstr "Islandia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:632
 msgid "Italy"
-msgstr ""
+msgstr "Italia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:633
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamaica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:634
 msgid "Jordan"
-msgstr ""
+msgstr "Jordania"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:635
-#, fuzzy
 msgid "Japan"
-msgstr "Japonés"
+msgstr "Japón"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:636
 msgid "Kenya"
-msgstr ""
+msgstr "Kenia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:637
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kirguistán"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:638
 msgid "Cambodia"
-msgstr ""
+msgstr "Camboya"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:639
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:640
-#, fuzzy
 msgid "Comoros"
-msgstr "mañana"
+msgstr "Comores"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:641
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "San Cristóbal y Nieves"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:642
 msgid "Korea, Democratic People'S Republic Of"
-msgstr ""
+msgstr "República Democratica Popular de Korea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:643
 msgid "Korea, Republic Of"
-msgstr ""
+msgstr "República de Korea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:644
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuwait"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:645
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Islas Caimán"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:646
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazajistán"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:647
 msgid "Lao People'S Democratic Republic"
-msgstr ""
+msgstr "República Democrática del Pueblo de Lao"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:648
 msgid "Lebanon"
-msgstr ""
+msgstr "Líbano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:649
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Santa Lucía"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:650
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:651
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:652
 msgid "Liberia"
-msgstr ""
+msgstr "Liberia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:653
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesoto"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:654
 msgid "Lithuania"
-msgstr ""
+msgstr "Lituania"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:655
 msgid "Luxembourg"
-msgstr ""
+msgstr "Luxemburgo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:656
 msgid "Latvia"
-msgstr ""
+msgstr "Letonia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:657
 msgid "Libyan Arab Jamahiriya"
-msgstr ""
+msgstr "Jamahiriya Árabe Libia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:658
 msgid "Morocco"
-msgstr ""
+msgstr "Marruecos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:659
 msgid "Monaco"
-msgstr ""
+msgstr "Mónaco"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:660
 msgid "Moldova, Republic Of"
-msgstr ""
+msgstr "República de Moldavia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:661
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagascar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:662
-#, fuzzy
 msgid "Marshall Islands"
-msgstr "Marcar todo como leído"
+msgstr "Islas Marshall"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:663
 msgid "Macedonia, The Former Yugoslav Republic Of"
-msgstr ""
+msgstr "Macedonia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:664
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:665
-#, fuzzy
 msgid "Myanmar"
-msgstr "Desmarca"
+msgstr "Myanmar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:666
 msgid "Mongolia"
-msgstr ""
+msgstr "Mogolia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:667
 msgid "Macao"
-msgstr ""
+msgstr "Macao"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:668
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Islas Marianas del Norte"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:669
 msgid "Martinique"
-msgstr ""
+msgstr "Martinica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:670
 msgid "Mauritania"
-msgstr ""
+msgstr "Mauritania"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:671
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:672
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:673
 msgid "Mauritius"
-msgstr ""
+msgstr "Mauricio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:674
 msgid "Maldives"
-msgstr ""
+msgstr "Maldivas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:675
 msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:676
 msgid "Mexico"
-msgstr ""
+msgstr "México"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:677
 msgid "Malaysia"
-msgstr ""
+msgstr "Malasia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:678
 msgid "Mozambique"
-msgstr ""
+msgstr "Mozambique"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:679
 msgid "Namibia"
-msgstr ""
+msgstr "Namibia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:680
-#, fuzzy
 msgid "New Caledonia"
-msgstr "Nuevos contactos"
+msgstr "Nueva Caledonia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:681
 msgid "Niger"
-msgstr ""
+msgstr "Niger"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:682
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Isla Norfolk"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:683
 msgid "Nigeria"
-msgstr ""
+msgstr "Nigeria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:684
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicaragua"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:685
 msgid "Netherlands"
-msgstr ""
+msgstr "Paises bajos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:686
-#, fuzzy
 msgid "Norway"
-msgstr "Reenviar"
+msgstr "Noruega"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:687
 msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:688
 msgid "Nauru"
-msgstr ""
+msgstr "Naurú"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:689
 msgid "Niue"
-msgstr ""
+msgstr "Niué"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:690
 msgid "New Zealand"
-msgstr ""
+msgstr "Nueva Zelanda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:691
 msgid "Oman"
-msgstr ""
+msgstr "Omán"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:692
 msgid "Panama"
-msgstr ""
+msgstr "Panamá"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:693
 msgid "Peru"
-msgstr ""
+msgstr "Perú"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:694
 msgid "French Polynesia"
-msgstr ""
+msgstr "Polinesia Francesa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:695
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papúa Nueva Guinea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:696
-#, fuzzy
 msgid "Philippines"
-msgstr "líneas"
+msgstr "Filipinas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:697
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakistán"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:698
 msgid "Poland"
-msgstr ""
+msgstr "Polonia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:699
 msgid "Saint Pierre And Miquelon"
-msgstr ""
+msgstr "San Pedro y Miquelón"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:700
 msgid "Pitcairn"
-msgstr ""
+msgstr "Islas Pitcairn"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:701
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Puerto Rico"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:702
-#, fuzzy
 msgid "Portugal"
-msgstr "Puerto"
+msgstr "Portugal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:703
 msgid "Palau"
-msgstr ""
+msgstr "Palaos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:704
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguay"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:705
-#, fuzzy
 msgid "Qatar"
-msgstr "Wavatar"
+msgstr "Catar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:706
 msgid "Reunion"
-msgstr ""
+msgstr "Islas Reunión"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:707
 msgid "Romania"
-msgstr ""
+msgstr "Rumanía"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:708
 msgid "Russian Federation"
-msgstr ""
+msgstr "Federación Rusa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:709
 msgid "Rwanda"
-msgstr ""
+msgstr "Ruanda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:710
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Arabia Saudí"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:711
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Islas Salomón"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:712
 msgid "Seychelles"
-msgstr ""
+msgstr "Seychelles"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:713
 msgid "Sudan"
-msgstr ""
+msgstr "Sudán"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:714
 msgid "Sweden"
-msgstr ""
+msgstr "Suecia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:715
 msgid "Singapore"
-msgstr ""
+msgstr "Singapur"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:716
 msgid "Saint Helena"
-msgstr ""
+msgstr "Santa Elena"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:717
 msgid "Slovenia"
-msgstr ""
+msgstr "Eslovenia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:718
 msgid "Svalbard And Jan Mayen"
-msgstr ""
+msgstr "Archipiélago Svalbard"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:719
 msgid "Slovakia"
-msgstr ""
+msgstr "Eslovaquia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:720
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leona"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:721
 msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:722
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:723
 msgid "Somalia"
-msgstr ""
+msgstr "Somalia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:724
-#, fuzzy
 msgid "Suriname"
-msgstr "Usuario SMTP:"
+msgstr "Surinam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:725
 msgid "Sao Tome And Principe"
-msgstr ""
+msgstr "Santo Tomé y Príncipe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:726
 msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:727
 msgid "Syrian Arab Republic"
-msgstr ""
+msgstr "República Árabe de Siria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:728
 msgid "Swaziland"
-msgstr ""
+msgstr "Suazilandia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:729
 msgid "Turks And Caicos Islands"
-msgstr ""
+msgstr "Islas Turcas y Caicos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:730
 msgid "Chad"
-msgstr ""
+msgstr "Chad"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:731
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Territorios Franceses del Sur"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:732
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:733
-#, fuzzy
 msgid "Thailand"
-msgstr "Tailandés"
+msgstr "Tailandia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:734
 msgid "Tajikistan"
-msgstr ""
+msgstr "Tayikistán"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:735
 msgid "Tokelau"
-msgstr ""
+msgstr "Tolekau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:736
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turmekistán"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:737
 msgid "Tunisia"
-msgstr ""
+msgstr "Túnez"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:738
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:739
 msgid "East Timor"
-msgstr ""
+msgstr "Timor del Este"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:740
 msgid "Turkey"
-msgstr ""
+msgstr "Turquía"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:741
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "Trinidad y Tobago"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:742
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:743
 msgid "Taiwan, Province Of China"
-msgstr ""
+msgstr "Provincia China de Taiwan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:744
 msgid "Tanzania, United Republic Of"
-msgstr ""
+msgstr "República Unida de Tanzania"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:745
 msgid "Ukraine"
-msgstr ""
+msgstr "Ucrania"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:746
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:748
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "Islas Menores Exteriores de los Estados Unidos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:749
 msgid "United States"
-msgstr ""
+msgstr "Estados Unidos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:750
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguay"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:751
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekistán"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:752
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Santa Sede (Ciudad del Vaticano)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:753
 msgid "Saint Vincent And The Grenadines"
-msgstr ""
+msgstr "San Vicente y Granadina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:754
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:755
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "Islas Vírgenes Británicas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:756
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "Islas Vírgenes Estadounidenses"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:757
-#, fuzzy
 msgid "Viet Nam"
-msgstr "Nombre del fichero"
+msgstr "Viet Nam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:758
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:759
 msgid "Wallis And Futuna"
-msgstr ""
+msgstr "Wallis y Futuna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:760
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:761
 msgid "Yemen"
-msgstr ""
+msgstr "Yemen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:762
 msgid "Mayotte"
-msgstr ""
+msgstr "Mayotte"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:763
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "Serbia y Montenegro"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:764
 msgid "South Africa"
-msgstr ""
+msgstr "Sudáfrica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:765
 msgid "Zambia"
-msgstr ""
+msgstr "Zambia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:766
 msgid "Democratic Republic Of The Congo"
-msgstr ""
+msgstr "República Democrática del Congo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:767
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:777
 #: ../src/plugins/geolocation/geolocation_plugin.c:862
-#, fuzzy
 msgid "GeoLocation"
-msgstr "Ubicación:"
+msgstr "Geolocalización"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:782
-#, fuzzy, c-format
+#, c-format
 msgid "Could not initialize clutter"
-msgstr "No se pudo inicializar el corrector %s."
+msgstr "No se pudo inicializar clutter"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:788
 #: ../src/plugins/geolocation/geolocation_plugin.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create regular expression: %s\n"
-msgstr "No se puede crear el fichero temporal: %s"
+msgstr "No se pudo crear la expresión regular: %s\n"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:803
-#, fuzzy
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
 msgstr ""
-"Falló el registro del enlace de cambio de tema en el módulo de notificación"
+"Falló el registro de la función messageview_show en el módulo de geolocalización"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:867
 msgid ""
@@ -11571,38 +11736,51 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome (but only if it's not about marital "
 "quarrels)."
 msgstr ""
+"Este módulo provee funcionalidades de ubicación geográfica para Claws Mail.\n"
+"\n"
+"Aviso: es técnicamente imposible deducir la ubicación geográfica de los "
+"remitentes a partir de sus correos electrónicos con cualquier grado de "
+"certeza. Los resultados que presenta este módulo son meras estimaciones. En "
+"particular, los gestores de listas de correo a menudo eliminan información "
+"del remitente de los correos, por lo que los mensajes provenientes de listas "
+"pueden ser asignados a la ubicación del servidor de la lista en vez de a la "
+"del remitente.\n"
+"Cuando tenga dudas no confíe en los resultados de este módulo, y no confíe "
+"en esta información para divorciarse de su pareja.\n"
+"\n"
+"Los comentarios para <berndth at gmx.de> son bienvenidos (pero sólo si no son "
+"sobre disputas conyugales)."
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:900
-#, fuzzy
 msgid "GeoLocation integration"
-msgstr "Integración con GData"
+msgstr "Integración de geolocalización"
 
-#: ../src/plugins/libravatar/libravatar.c:374
-#: ../src/plugins/libravatar/libravatar.c:445
-#: ../src/plugins/libravatar/libravatar.c:505
-#: ../src/plugins/libravatar/libravatar_prefs.c:400
+#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:452
+#: ../src/plugins/libravatar/libravatar.c:512
+#: ../src/plugins/libravatar/libravatar_prefs.c:440
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:388
 msgid "Failed to register avatar header update hook"
 msgstr ""
 "Falló el registro de la función de actualización de cabeceras de avatar"
 
-#: ../src/plugins/libravatar/libravatar.c:389
+#: ../src/plugins/libravatar/libravatar.c:396
 msgid "Failed to register avatar image render hook"
 msgstr ""
 "Falló el registro de la función de representación de imágenes de avatar"
 
-#: ../src/plugins/libravatar/libravatar.c:394
+#: ../src/plugins/libravatar/libravatar.c:401
 msgid "Failed to create avatar image cache directory"
 msgstr "Fallo al crear el directorio de caché de imágenes"
 
-#: ../src/plugins/libravatar/libravatar.c:403
+#: ../src/plugins/libravatar/libravatar.c:410
 msgid "Failed to load missing items cache"
 msgstr "Fallo al cargar la caché de elementos ausentes"
 
-#: ../src/plugins/libravatar/libravatar.c:455
+#: ../src/plugins/libravatar/libravatar.c:462
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -11631,87 +11809,87 @@ msgstr ""
 "\n"
 "Comentarios y sugerencias para <ricardo at mones.org> serán bienvenidas.\n"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:112
+#: ../src/plugins/libravatar/libravatar_prefs.c:138
 msgid "_Use cached icons"
 msgstr "_Usar caché de imágenes"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:113
+#: ../src/plugins/libravatar/libravatar_prefs.c:139
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr ""
 "Mantiene las imágenes en disco para reutilizarlas en vez de realizar otra "
 "petición de red"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:121
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
 msgid "Cache refresh interval"
 msgstr "Intervalo de refresco de la caché"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:123
-#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:333
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
+#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:335
 msgid "hours"
 msgstr "horas"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:188
+#: ../src/plugins/libravatar/libravatar_prefs.c:207
 msgid "Mystery man"
 msgstr "Hombre misterioso"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:189
+#: ../src/plugins/libravatar/libravatar_prefs.c:208
 msgid "Identicon"
 msgstr "Identicon"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:190
+#: ../src/plugins/libravatar/libravatar_prefs.c:209
 msgid "MonsterID"
 msgstr "MonsterID"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:191
+#: ../src/plugins/libravatar/libravatar_prefs.c:210
 msgid "Wavatar"
 msgstr "Wavatar"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:192
+#: ../src/plugins/libravatar/libravatar_prefs.c:211
 msgid "Retro"
 msgstr "Retro"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:193
+#: ../src/plugins/libravatar/libravatar_prefs.c:212
 msgid "Custom URL"
 msgstr "URL de usuario"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:196
+#: ../src/plugins/libravatar/libravatar_prefs.c:215
 msgid "A blank image"
 msgstr "Una imagen en blanco"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:197
+#: ../src/plugins/libravatar/libravatar_prefs.c:216
 msgid "The unobtrusive low-contrast greyish silhouette"
 msgstr "La silueta gris de bajo contraste que no molesta"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:198
+#: ../src/plugins/libravatar/libravatar_prefs.c:217
 msgid "A generated geometric pattern"
 msgstr "Genera una trama geométrica"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:199
+#: ../src/plugins/libravatar/libravatar_prefs.c:218
 msgid "A generated full-body monster"
 msgstr "Genera un monstruo de cuerpo completo"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:200
+#: ../src/plugins/libravatar/libravatar_prefs.c:219
 msgid "A generated almost unique face"
 msgstr "Genera una cara casi única"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:201
+#: ../src/plugins/libravatar/libravatar_prefs.c:220
 msgid "A generated 8-bit arcade-style pixelated image"
 msgstr "Genera una imagen pixelada al estilo de los arcades de 8 bits"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:202
+#: ../src/plugins/libravatar/libravatar_prefs.c:221
 msgid "Redirect to a user provided URL"
 msgstr "Redirigir a una URL proporcionada por el usuario"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:229 ../src/prefs_themes.c:878
+#: ../src/plugins/libravatar/libravatar_prefs.c:248 ../src/prefs_themes.c:878
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:256
+#: ../src/plugins/libravatar/libravatar_prefs.c:276
 msgid "_Allow redirects to other sites"
 msgstr "Permitir redirecciones _a otros sitios"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:257
+#: ../src/plugins/libravatar/libravatar_prefs.c:277
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
@@ -11719,23 +11897,43 @@ msgstr ""
 "Sigue las respuestas de redirección recibidas del servidor libravatar a "
 "otros servicios de avatar como gravatar.com"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:266
+#: ../src/plugins/libravatar/libravatar_prefs.c:286
 msgid "_Enable federated servers"
 msgstr "Activar servidores f_ederados"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:267
+#: ../src/plugins/libravatar/libravatar_prefs.c:287
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr "Intenta recuperar el avatar del servidor libravatar del dominio"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:312
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+msgid "Request timeout"
+msgstr "Tiempo límite de la petición"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+#: ../src/plugins/notification/notification_prefs.c:1028
+#: ../src/plugins/notification/notification_prefs.c:1300
+#: ../src/plugins/notification/notification_prefs.c:1608
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
+#: ../src/prefs_summaries.c:496
+msgid "seconds"
+msgstr "segundos"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:305
+msgid ""
+"Set to 0 to use global socket I/O timeout. Maximum value must be also less "
+"than global socket I/O timeout."
+msgstr ""
+"Establecer a 0 para usar el tiempo límite global para E/S del conector. El valor máximo debe ser también inferior que el tiempo límite global para E/S del conector."
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:349
 msgid "Icon cache"
 msgstr "Caché de avatares"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:316
+#: ../src/plugins/libravatar/libravatar_prefs.c:353
 msgid "Default missing icon mode"
 msgstr "Modo por omisión cuando no hay avatar"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:320
+#: ../src/plugins/libravatar/libravatar_prefs.c:357
 msgid "Network"
 msgstr "Red"
 
@@ -12062,7 +12260,6 @@ msgstr "Carpetas de calendario"
 
 #. Warning-Label
 #: ../src/plugins/notification/notification_prefs.c:639
-#, fuzzy
 msgid "These settings override folder-specific selections."
 msgstr ""
 "Esta configuración sobreescribe la seleccionada específicamente para cada "
@@ -12197,14 +12394,6 @@ msgstr "Activar emergente"
 msgid "Popup timeout:"
 msgstr "Tiempo límite del emergente:"
 
-#: ../src/plugins/notification/notification_prefs.c:1028
-#: ../src/plugins/notification/notification_prefs.c:1300
-#: ../src/plugins/notification/notification_prefs.c:1608
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
-#: ../src/prefs_summaries.c:496
-msgid "seconds"
-msgstr "segundos"
-
 #. Sticky check button
 #: ../src/plugins/notification/notification_prefs.c:1057
 msgid "Make popup sticky"
@@ -12455,7 +12644,7 @@ msgstr "de %d"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1359
 msgid "PDF rendering failed for an unknown reason."
-msgstr ""
+msgstr "La presentación del PDF falló por razones desconocidas."
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1722
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1940
@@ -12550,7 +12739,7 @@ msgstr ""
 
 #: ../src/plugins/perl/perl_gtk.c:50
 msgid "Edit perl filter rules (ext)..."
-msgstr ""
+msgstr "Editar reglas de filtrado perl (ext)..."
 
 #: ../src/plugins/pgpcore/autocompletion.c:125
 msgid "Failed to register PGP address autocompletion hook"
@@ -12751,7 +12940,7 @@ msgstr "Caduca después de"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:149
 msgid "Setting to '0' will store the passphrase for the whole session"
-msgstr "Estableciendolo a '0' guarda la contraseña durante toda la sesión"
+msgstr "Estableciéndolo a '0' guarda la contraseña durante toda la sesión"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:153 ../src/prefs_receive.c:159
 msgid "minute(s)"
@@ -12813,12 +13002,12 @@ msgid "Undefined"
 msgstr "Indefinida"
 
 #: ../src/plugins/pgpcore/select-keys.c:241
-#: ../src/plugins/pgpcore/sgpgme.c:146
+#: ../src/plugins/pgpcore/sgpgme.c:146 ../src/plugins/pgpcore/sgpgme.c:162
 msgid "Marginal"
 msgstr "Marginal"
 
 #: ../src/plugins/pgpcore/select-keys.c:247
-#: ../src/plugins/pgpcore/sgpgme.c:150
+#: ../src/plugins/pgpcore/sgpgme.c:150 ../src/plugins/pgpcore/sgpgme.c:166
 msgid "Ultimate"
 msgstr "Absoluta"
 
@@ -12879,147 +13068,155 @@ msgstr ""
 msgid "No signature found"
 msgstr "No se encontró firma"
 
-#: ../src/plugins/pgpcore/sgpgme.c:184 ../src/plugins/pgpcore/sgpgme.c:203
+#: ../src/plugins/pgpcore/sgpgme.c:160
+msgid "Untrusted"
+msgstr "No fiable"
+
+#: ../src/plugins/pgpcore/sgpgme.c:200 ../src/plugins/pgpcore/sgpgme.c:219
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "La firma no se puede comprobar - %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:188 ../src/plugins/pgpcore/sgpgme.c:192
-#: ../src/plugins/pgpcore/sgpgme.c:245
+#: ../src/plugins/pgpcore/sgpgme.c:204 ../src/plugins/pgpcore/sgpgme.c:208
+#: ../src/plugins/pgpcore/sgpgme.c:249
 msgid "The signature has not been checked."
 msgstr "La firma no ha sido comprobada."
 
-#: ../src/plugins/pgpcore/sgpgme.c:198 ../src/plugins/pgpcore/sgpgme.c:200
+#: ../src/plugins/pgpcore/sgpgme.c:214 ../src/plugins/pgpcore/sgpgme.c:216
 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:215
+#: ../src/plugins/pgpcore/sgpgme.c:228
 #, c-format
 msgid "Good signature from %s."
 msgstr "Firma válida de %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:222
-#, c-format
-msgid "Good signature (untrusted) from %s."
-msgstr "Firma válida (no fiable) de %s."
-
-#: ../src/plugins/pgpcore/sgpgme.c:227
+#: ../src/plugins/pgpcore/sgpgme.c:231
 #, c-format
 msgid "Expired signature from %s."
 msgstr "Firma caducada de %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:230
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:234
+#, c-format
 msgid "Good signature from %s, but the key has expired."
-msgstr "Firma válida de %s."
+msgstr "Firma válida de %s, pero la clave ha expirado."
 
-#: ../src/plugins/pgpcore/sgpgme.c:233
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:237
+#, c-format
 msgid "Good signature from %s, but the key has been revoked."
-msgstr "Firma válida de %s."
+msgstr "Firma válida de %s, pero la clave ha sido revocada."
 
-#: ../src/plugins/pgpcore/sgpgme.c:236
+#: ../src/plugins/pgpcore/sgpgme.c:240
 #, c-format
 msgid "Bad signature from %s."
 msgstr "Firma inválida de %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:240
+#: ../src/plugins/pgpcore/sgpgme.c:244
 #, 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:264
+#: ../src/plugins/pgpcore/sgpgme.c:268
 #, c-format
 msgid "Error checking signature: no status\n"
 msgstr "Error verificando la firma digital: no hay estado\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:283
+#: ../src/plugins/pgpcore/sgpgme.c:287
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Error verificando la firma digital: %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:302
+#: ../src/plugins/pgpcore/sgpgme.c:306
 #, 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:308
+#: ../src/plugins/pgpcore/sgpgme.c:312
 #, 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:313
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:317
+#, c-format
 msgid "Expired key uid \"%s\"\n"
-msgstr "Firma caducada de %s."
+msgstr "UID de clave caducado «%s»\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:318
+#: ../src/plugins/pgpcore/sgpgme.c:322
 #, 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:323
+#: ../src/plugins/pgpcore/sgpgme.c:327
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
-msgstr ""
+msgstr "UID de clave revocado «%s»\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:328
+#: ../src/plugins/pgpcore/sgpgme.c:332
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Firma INVÁLIDA de «%s»\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:339
+#: ../src/plugins/pgpcore/sgpgme.c:343
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "               UID «%s» (Validez: %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:346
+#: ../src/plugins/pgpcore/sgpgme.c:345
+msgid "Revoked"
+msgstr "Revocado"
+
+#: ../src/plugins/pgpcore/sgpgme.c:349
+#, c-format
+msgid "Owner Trust: %s\n"
+msgstr "Confianza del propietario: %s\n"
+
+#: ../src/plugins/pgpcore/sgpgme.c:352
 msgid "Primary key fingerprint:"
 msgstr "Huella de clave primaria:"
 
-#: ../src/plugins/pgpcore/sgpgme.c:364
+#: ../src/plugins/pgpcore/sgpgme.c:370
 #, 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:370
+#: ../src/plugins/pgpcore/sgpgme.c:376
 #, 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:412
+#: ../src/plugins/pgpcore/sgpgme.c:410
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "No se puede obtener datos del mensaje, %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:428
+#: ../src/plugins/pgpcore/sgpgme.c:426
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "No se puede inicializar datos, %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:583
+#: ../src/plugins/pgpcore/sgpgme.c:581
 msgid "Secret key specification is ambiguous"
 msgstr "La especificación de clave secreta es ambigua"
 
-#: ../src/plugins/pgpcore/sgpgme.c:593
+#: ../src/plugins/pgpcore/sgpgme.c:591
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Clave secreta no encontrada (%s)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:606
+#: ../src/plugins/pgpcore/sgpgme.c:604
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Error estableciendo clave secreta: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:690
+#: ../src/plugins/pgpcore/sgpgme.c:688
 #, 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:696
+#: ../src/plugins/pgpcore/sgpgme.c:694
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -13028,12 +13225,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:704
+#: ../src/plugins/pgpcore/sgpgme.c:702
 #, 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:720
+#: ../src/plugins/pgpcore/sgpgme.c:718
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -13041,7 +13238,7 @@ msgstr ""
 "GnuPG no esta adecuadamente instalado o necesita actualizarse.\n"
 "Soporte de OpenPGP deshabilitado."
 
-#: ../src/plugins/pgpcore/sgpgme.c:754
+#: ../src/plugins/pgpcore/sgpgme.c:752
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -13049,26 +13246,26 @@ 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:759
+#: ../src/plugins/pgpcore/sgpgme.c:757
 msgid "No PGP key found"
 msgstr "No se encontró ninguna clave PGP"
 
-#: ../src/plugins/pgpcore/sgpgme.c:760
+#: ../src/plugins/pgpcore/sgpgme.c:758
 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"
 "Do you want to create a new key pair now?"
 msgstr ""
-"Claws Mail no encontro una clave secreta PGP, lo que significa que no será "
+"Claws Mail no encontró una clave secreta PGP, lo que significa que no será "
 "capaz de firmar correos o recibir correos cifrados.\n"
 "¿Quiere crear un nuevo par de claves ahora?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:830 ../src/plugins/pgpcore/sgpgme.c:846
+#: ../src/plugins/pgpcore/sgpgme.c:828 ../src/plugins/pgpcore/sgpgme.c:844
 #, 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:837
+#: ../src/plugins/pgpcore/sgpgme.c:835
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -13076,11 +13273,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:852
+#: ../src/plugins/pgpcore/sgpgme.c:850
 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:856
+#: ../src/plugins/pgpcore/sgpgme.c:854
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -13093,19 +13290,19 @@ msgstr ""
 "\n"
 "¿Desea exportarla a un servidor de claves?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:860
+#: ../src/plugins/pgpcore/sgpgme.c:858
 msgid "Key generated"
 msgstr "Clave generada"
 
-#: ../src/plugins/pgpcore/sgpgme.c:899
+#: ../src/plugins/pgpcore/sgpgme.c:897
 msgid "Key exported."
 msgstr "Clave exportada."
 
-#: ../src/plugins/pgpcore/sgpgme.c:901
+#: ../src/plugins/pgpcore/sgpgme.c:899
 msgid "Couldn't export key."
 msgstr "No se pudo exportar la clave."
 
-#: ../src/plugins/pgpcore/sgpgme.c:905
+#: ../src/plugins/pgpcore/sgpgme.c:903
 msgid "Key export isn't implemented in Windows."
 msgstr "La exportación de claves no está implementada en Windows."
 
@@ -13132,7 +13329,7 @@ msgstr "No se puede convertir el texto a un conjunto de caracteres válido."
 #: ../src/plugins/pgpinline/pgpinline.c:716
 #: ../src/plugins/pgpmime/pgpmime.c:74 ../src/plugins/pgpmime/pgpmime.c:184
 #: ../src/plugins/pgpmime/pgpmime.c:330 ../src/plugins/pgpmime/pgpmime.c:510
-#: ../src/plugins/pgpmime/pgpmime.c:655 ../src/plugins/smime/smime.c:415
+#: ../src/plugins/pgpmime/pgpmime.c:651 ../src/plugins/smime/smime.c:415
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "No se pudo inicializar el contexto GPG, %s"
@@ -13192,7 +13389,7 @@ msgstr "No se pueden escanear las partes del fichero descifrado ."
 #: ../src/plugins/pgpinline/pgpinline.c:495
 #: ../src/plugins/pgpinline/pgpinline.c:687
 msgid "Malformed message"
-msgstr "Mensaje malformado"
+msgstr "Mensaje mal formado"
 
 #: ../src/plugins/pgpinline/pgpinline.c:506
 msgid "Couldn't create temporary file."
@@ -13208,7 +13405,7 @@ msgstr "Falló la firma de los datos, %s"
 #: ../src/plugins/pgpmime/pgpmime.c:562
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
-msgstr "La firma de los datos fallño debido a un firmante inválido: %s"
+msgstr "La firma de los datos falló debido a un firmante inválido: %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:572
 #: ../src/plugins/pgpmime/pgpmime.c:571
@@ -13229,19 +13426,19 @@ msgstr ""
 "PGP/Inline, ni tampoco las cabeceras de correo, como el Asunto."
 
 #: ../src/plugins/pgpinline/pgpinline.c:670
-#: ../src/plugins/pgpmime/pgpmime.c:665
+#: ../src/plugins/pgpmime/pgpmime.c:661
 #, 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:698
-#: ../src/plugins/pgpmime/pgpmime.c:694
+#: ../src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "No se puede crear el fichero temporal, %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:729
-#: ../src/plugins/pgpmime/pgpmime.c:721
+#: ../src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Falló el cifrado, %s"
@@ -13297,7 +13494,11 @@ msgstr "No se pueden interpretar las partes del fichero."
 msgid "Couldn't create temporary file: %s"
 msgstr "No se puede crear el fichero temporal: %s"
 
-#: ../src/plugins/pgpmime/pgpmime.c:621
+#: ../src/plugins/pgpmime/pgpmime.c:595
+msgid "OpenPGP digital signature"
+msgstr "Firma digital OpenPGP"
+
+#: ../src/plugins/pgpmime/pgpmime.c:617
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -13305,7 +13506,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:793
+#: ../src/plugins/pgpmime/pgpmime.c:789
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -13374,7 +13575,7 @@ msgid ""
 "\n"
 "These scripts are then available via the menu. You can assign keyboard "
 "shortcuts to them just like it is done with other menu items. You can also "
-"put buttons for script invokation into the toolbars using Claws Mail's "
+"put buttons for script invocation into the toolbars using Claws Mail's "
 "builtin toolbar editor.\n"
 "\n"
 "You can provide scripts working on the main window by placing files into ~/."
@@ -13459,151 +13660,48 @@ msgstr ""
 msgid "Python integration"
 msgstr "Integración con Python"
 
-#: ../src/plugins/rssyl/feed.c:126
-msgid "Cannot open temporary file"
-msgstr "No se puede abrir el fichero temporal"
-
-#: ../src/plugins/rssyl/feed.c:137
-msgid "Cannot init libCURL"
-msgstr "No se puede inicializar libCURL"
-
-#: ../src/plugins/rssyl/feed.c:234 ../src/plugins/vcalendar/vcal_folder.c:1596
-msgid "401 (Authorisation required)"
-msgstr "401 (Se requiere autorización)"
-
-#: ../src/plugins/rssyl/feed.c:237 ../src/plugins/vcalendar/vcal_folder.c:1599
-msgid "403 (Unauthorised)"
-msgstr "403 (No autorizado)"
-
-#: ../src/plugins/rssyl/feed.c:240 ../src/plugins/vcalendar/vcal_folder.c:1602
-msgid "404 (Not found)"
-msgstr "404 (No encontrado)"
-
-#: ../src/plugins/rssyl/feed.c:243 ../src/plugins/vcalendar/vcal_folder.c:1605
-#, c-format
-msgid "Error %ld"
-msgstr "Error %ld"
-
-#: ../src/plugins/rssyl/feed.c:328
-#, c-format
-msgid "Fetching '%s'..."
-msgstr "Recuperando «%s»..."
-
-#: ../src/plugins/rssyl/feed.c:387
-msgid "Malformed feed"
-msgstr "Canal mal formado"
-
-#: ../src/plugins/rssyl/feed.c:1203
-#, c-format
-msgid "Refreshing feed '%s'..."
-msgstr "Refrescando canal «%s»..."
-
-#: ../src/plugins/rssyl/feed.c:1218
-#, c-format
-msgid ""
-"RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-"comments of '%s'"
-msgstr ""
-"RSSyl: La recuperación de comentarios no esta soportada en canales RDF. No "
-"se pueden recuperar los comentarios de «%s»"
-
-#: ../src/plugins/rssyl/feed.c:1227
-msgid "This feed format is not supported yet."
-msgstr "El formato de este canal no esta aún soportado."
-
-#: ../src/plugins/rssyl/feed.c:1258
-msgid "N/A"
-msgstr "N/D"
-
-#: ../src/plugins/rssyl/feed.c:1378
-#, c-format
-msgid "%ld byte"
-msgid_plural "%ld bytes"
-msgstr[0] "%ld byte"
-msgstr[1] "%ld bytes"
-
-#: ../src/plugins/rssyl/feed.c:1381
-msgid "size unknown"
-msgstr "tamaño desconocido"
-
-#: ../src/plugins/rssyl/feed.c:1555
-#, c-format
-msgid ""
-"RSSyl: Cannot update feed %s:\n"
-"%s\n"
-msgstr ""
-"RSSyl: No se puede actualizar el canal %s:\n"
-"%s\n"
-
-#: ../src/plugins/rssyl/feed.c:1727
-msgid "You are already subscribed to this feed."
-msgstr "Ya está suscrito a este canal."
-
-#: ../src/plugins/rssyl/feed.c:1738
+#: ../src/plugins/rssyl/old_feeds.c:90
 #, c-format
 msgid ""
-"Couldn't fetch URL '%s':\n"
+"Couldn't read contents of old feeds.xml file:\n"
 "%s"
 msgstr ""
-"No se pudo recuperar la URL «%s»:\n"
+"No se pudo leer el contenido del fichero antiguo «feeds.xml»:\n"
 "%s"
 
-#: ../src/plugins/rssyl/feed.c:1743
-#, c-format
-msgid ""
-"Couldn't fetch URL '%s':\n"
-"%s\n"
-msgstr ""
-"No se pudo recuperar la URL «%s»:\n"
-"%s\n"
-
-#: ../src/plugins/rssyl/feed.c:1759
-#, c-format
-msgid "Can't subscribe feed '%s'."
-msgstr "No puedo suscribir el canal «%s»."
-
-#: ../src/plugins/rssyl/feed.c:1861 ../src/plugins/rssyl/rssyl_cb_menu.c:281
-msgid "Claws Mail needs network access in order to update the feed."
-msgid_plural "Claws Mail needs network access in order to update the 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/feed.h:20
-#, c-format
-msgid "Time out connecting to URL %s\n"
-msgstr "Se agotó el tiempo contectando a la URL %s\n"
-
-#: ../src/plugins/rssyl/feed.h:21
+#: ../src/plugins/rssyl/opml_export.c:110
 #, c-format
-msgid "Couldn't fetch URL %s\n"
-msgstr "No se pudo recuperar la URL %s\n"
+msgid "RSSyl: Error while writing '%s' to feed export list.\n"
+msgstr "RSSyl: error escribiendo «%s» a la lista de exportación de canales.\n"
 
-#: ../src/plugins/rssyl/feed.h:22
+#: ../src/plugins/rssyl/opml_export.c:131
 #, c-format
-msgid "Error parsing feed from URL %s\n"
-msgstr "Error al procesar el canal de la URL %s\n"
+msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
+msgstr "RSSyl: no se pudo borrar el antiguo fichero OPML: «%s»: %s\n"
 
-#: ../src/plugins/rssyl/feed.h:23
+#: ../src/plugins/rssyl/opml_export.c:141
 #, c-format
-msgid "Unsupported feed type at URL %s\n"
-msgstr "Tipo de canal no soportado en la URL %s\n"
+msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
+msgstr "RSSyl: no se pudo abrir el fichero «%s» para exportar la lista de canales: %s\n"
 
-#: ../src/plugins/rssyl/feed.h:25
-#, c-format
-msgid "RSSyl: Updating feed %s\n"
-msgstr "RSSyl: Actualizando canal %s\n"
+#: ../src/plugins/rssyl/opml_export.c:182
+msgid "RSSyl: Error during writing feed export file.\n"
+msgstr "RSSyl: error escribiendo el fichero de exportación de canales.\n"
 
-#: ../src/plugins/rssyl/feed.h:26
+#: ../src/plugins/rssyl/opml_import.c:109
 #, c-format
-msgid "RSSyl: Feed update finished: %s\n"
-msgstr "RSSyl: Actualización del canal finalizada: %s\n"
-
-#: ../src/plugins/rssyl/feed.h:27
-msgid "RSSyl: Feed update aborted, application is exiting.\n"
+msgid ""
+"Error while subscribing feed\n"
+"%s\n"
+"\n"
+"Folder name '%s' is not allowed."
 msgstr ""
-"RSSyl: Cancelada actualización del canal, la aplicación está finalizando.\n"
+"Error suscribiendo el canal\n"
+"%s\n"
+"\n"
+"El nombre de carpeta «%s» no está permitido."
 
-#: ../src/plugins/rssyl/plugin.c:63
+#: ../src/plugins/rssyl/plugin.c:65
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13617,117 +13715,160 @@ msgstr ""
 "Cada canal de noticias creará una carpeta con las entradas apropiadas, "
 "obtenidas de la web. Puede leerlas, y borrar o mantener las antiguas."
 
-#: ../src/plugins/rssyl/plugin.c:87
+#: ../src/plugins/rssyl/plugin.c:89
 msgid "RSS feed"
 msgstr "Canal RSS"
 
-#: ../src/plugins/rssyl/rssyl.c:133 ../src/plugins/rssyl/rssyl.c:145
+#: ../src/plugins/rssyl/rssyl_add_item.c:295
+msgctxt "Empty RSS feed title placeholder"
+msgid "(empty)"
+msgstr "(vacío)"
+
+#: ../src/plugins/rssyl/rssyl.c:154 ../src/plugins/rssyl/rssyl.c:165
 msgid "Refresh all feeds"
 msgstr "Refrescar todos los canales"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:62
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Subscribe feed"
 msgstr "Suscribir canal"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:63
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:67
 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:138
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:100
 #, c-format
-msgid "Really remove the folder tree '%s'?\n"
-msgstr "¿Quiere realmente eliminar el árbol de carpetas «%s»?\n"
+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:139
-msgid "Remove folder tree"
-msgstr "Eliminar árbol de carpetas"
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:242
+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:204
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:305
 #, c-format
-msgid "Can't remove feed '%s'."
-msgstr "No se puede eliminar el canal «%s»."
-
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:374
-msgid "Select a .opml file"
-msgstr "Seleccionar un fichero .opml"
+msgid "Really remove the feed tree `%s' ?\n"
+msgstr "¿Quiere realmente eliminar el árbol de canales «%s»?\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:53
-msgid "_Refresh feed"
-msgstr "_Refrescar canal"
-
-#: ../src/plugins/rssyl/rssyl_gtk.c:54
-msgid "Refresh _all feeds"
-msgstr "Refrescar _todos los canales"
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:306
+msgid "Remove feed tree"
+msgstr "Eliminar árbol de canales"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:55
-msgid "Subscribe _new feed..."
-msgstr "Suscribir _nuevo canal..."
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:341
+msgid "Select an OPML file"
+msgstr "Seleccionar un fichero OPML"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:56
-msgid "_Unsubscribe feed..."
-msgstr "_Desuscribir canal..."
+#: ../src/plugins/rssyl/rssyl_feed.c:75
+#: ../src/plugins/rssyl/rssyl_subscribe.c:139
+#, c-format
+msgid "Couldn't create folder for new feed '%s'."
+msgstr "No se pudo crear la carpeta para el nuevo canal «%s»."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:57
-msgid "Feed pr_operties..."
-msgstr "Pr_opiedades del canal..."
+#: ../src/plugins/rssyl/rssyl_feed.h:10
+#, c-format
+msgid "RSSyl: Subscribing new feed: %s\n"
+msgstr "RSSyl: Suscribiendo nuevo canal: %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:58
-msgid "Import feed list..."
-msgstr "Importar lista de canales..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:59
-msgid "Rena_me..."
-msgstr "Reno_mbrar..."
+#: ../src/plugins/rssyl/rssyl_feed.h:11
+#, c-format
+msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
+msgstr "RSSyl: Nuevo canal suscrito «%s» (%s)\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:60
-msgid "_Create new folder..."
-msgstr "_Crear nueva carpeta..."
+#: ../src/plugins/rssyl/rssyl_feed.h:12
+#, c-format
+msgid "RSSyl: Updating feed: %s\n"
+msgstr "RSSyl: Actualizando canal: %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:62
-msgid "Remove folder _tree..."
-msgstr "Eliminar ár_bol de carpetas..."
+#: ../src/plugins/rssyl/rssyl_feed.h:13
+#, c-format
+msgid "RSSyl: Feed update finished: %s\n"
+msgstr "RSSyl: Actualización del canal finalizada: %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:152
-msgid "Add RSS folder tree"
-msgstr "Añadir árbol de carpetas RSS"
+#: ../src/plugins/rssyl/rssyl_feed.h:14
+#, c-format
+msgid "RSSyl: Error fetching feed at '%s': %s\n"
+msgstr "RSSyl: Error actualizando el canal en «%s»: %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:153
-msgid "Enter name for a new RSS folder tree."
-msgstr "Introduzca el nombre del nuevo árbol de carpetas RSS."
+#: ../src/plugins/rssyl/rssyl_feed.h:15
+#, c-format
+msgid "RSSyl: No valid feed found at '%s'\n"
+msgstr "RSSyl: Canal no válido encontrado en «%s»\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:169
-msgid ""
-"Creation of folder tree failed.\n"
-"Maybe some files already exist, or you don't have the permission to write "
-"there?"
-msgstr ""
-"Falló la creación del árbol de carpetas.\n"
-"¿Quizás existan todavía algunos ficheros o no tiene permisos de escritura en "
-"el directorio?"
+#: ../src/plugins/rssyl/rssyl_feed.h:16
+#, c-format
+msgid "RSSyl: Couldn't process feed at '%s'\n"
+msgstr "RSSyl: No se pudo procesar el canal en «%s»\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:184
-msgid "RSSyl..."
-msgstr "RSSyl..."
+#: ../src/plugins/rssyl/rssyl_feed.h:17
+#, c-format
+msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
+msgstr "RSSyl: La aplicación está finalizando, no se pudo finalizar la actualización del canal en «%s»\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:257
+#: ../src/plugins/rssyl/rssyl_feed_props.c:243
 msgid "Use default refresh interval"
 msgstr "Usar el intervalo de refresco predeterminado"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:269
-msgid "Keep default number of expired entries"
-msgstr "Mantener el número predeterminado de entradas caducadas"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:255
+msgid "Keep old items"
+msgstr "Guardar elementos antiguos"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:275
+#. "Trim" button
+#: ../src/plugins/rssyl/rssyl_feed_props.c:261
+msgid "_Trim"
+msgstr "Recor_tar"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:264
+#: ../src/plugins/rssyl/rssyl_feed_props.c:267
+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:271
 msgid "Fetch comments if possible"
 msgstr "Recuperar los comentarios si es posible"
 
+#: ../src/plugins/rssyl/rssyl_feed_props.c:296
+msgid "Always mark as new"
+msgstr "Marcar siempre como nuevo"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:302
+msgid "If only its text changed"
+msgstr "Sólo si el texto ha cambiado"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:308
+msgid "Never mark as new"
+msgstr "Nunca marcar como nuevo"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:313
+msgid "Add item title to top of message"
+msgstr "Añadir el título del elemento encima del mensaje"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:320
+msgid "Ignore title rename"
+msgstr "Ignorar el renombrado del título"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:326
+#: ../src/plugins/rssyl/rssyl_feed_props.c:329
+msgid ""
+"Enable this to keep current folder name, even if feed author changes title "
+"of the feed."
+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:334
+#: ../src/plugins/vcalendar/vcal_prefs.c:518
+msgid "Verify SSL certificate validity"
+msgstr "Verificar la validez del certificado SSL"
+
 #. Label for URL frame
-#: ../src/plugins/rssyl/rssyl_gtk.c:308
+#: ../src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "<b>Source URL:</b>"
 msgstr "<b>URL de origen:</b>"
 
-#. Fetch comments for - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:336
+#. Fetch comments max age - label
+#: ../src/plugins/rssyl/rssyl_feed_props.c:378
 msgid ""
 "<b>Fetch comments on posts aged less than:</b>\n"
 "<small>(In days; set to -1 to fetch all comments)</small>"
@@ -13736,7 +13877,7 @@ msgstr ""
 "<small>(En días; establecer a -1 para recuperarlos todos)</small>"
 
 #. Refresh interval - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:370
+#: ../src/plugins/rssyl/rssyl_feed_props.c:436
 msgid ""
 "<b>Refresh interval in minutes:</b>\n"
 "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
@@ -13745,97 +13886,192 @@ msgstr ""
 "<small>(Establecer a 0 para desactivar el refresco automático de este "
 "canal)</small>"
 
-#. Expired items - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:403
-msgid ""
-"<b>Number of expired entries to keep:</b>\n"
-"<small>(Set to -1 if you want to keep expired entries)</small>"
-msgstr ""
-"<b>Número de entradas caducadas a mantener:</b>\n"
-"<small>(Establecer a -1 para mantener todas las entradas caducadas)</small>"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:462
+msgid "<b>If an item changes, do not mark it as new:</b>"
+msgstr "<b>Si un elemento cambia, no marcarlo como nuevo:</b>"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:554
+msgid "_OK"
+msgstr "_Aceptar"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:429
-msgid "<b>If an item changes, do not mark it as unread:</b>"
-msgstr "<b>Si un elemento cambia, no marcar como no leído:</b>"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:562
+msgid "Set feed properties"
+msgstr "Establecer las propiedades del canal"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:439
-msgid "Always mark as unread"
-msgstr "Marcar siempre como no leído"
+#: ../src/plugins/rssyl/rssyl_gtk.c:48
+msgid "_Refresh feed"
+msgstr "_Refrescar canal"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:441
-msgid "If only its text has changed"
-msgstr "Sólo si el texto ha cambiado"
+#: ../src/plugins/rssyl/rssyl_gtk.c:49
+msgid "Feed pr_operties"
+msgstr "Pr_opiedades del canal"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:443
-msgid "Never mark as unread"
-msgstr "Nunca marcar como no leído"
+#: ../src/plugins/rssyl/rssyl_gtk.c:50
+msgid "Rena_me..."
+msgstr "Reno_mbrar..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:459
-#: ../src/plugins/vcalendar/vcal_prefs.c:518
-msgid "Verify SSL certificate validity"
-msgstr "Verificar la validez del certificado SSL"
+#: ../src/plugins/rssyl/rssyl_gtk.c:51
+msgid "R_efresh recursively"
+msgstr "R_efrescar recursivamente"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:515
-msgid "_OK"
-msgstr "_Aceptar"
+#: ../src/plugins/rssyl/rssyl_gtk.c:52
+msgid "Subscribe _new feed..."
+msgstr "Suscribir _nuevo canal..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:523
-msgid "Set feed properties"
-msgstr "Establecer las propiedades del canal"
+#: ../src/plugins/rssyl/rssyl_gtk.c:53
+msgid "Create new _folder..."
+msgstr "_Crear nueva carpeta..."
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:54
+msgid "Import feed list..."
+msgstr "Importar lista de canales..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:651 ../src/plugins/rssyl/rssyl_gtk.c:675
-msgid "Unsubscribe feed"
-msgstr "Desuscribir el canal"
+#: ../src/plugins/rssyl/rssyl_gtk.c:56
+msgid "Remove tree"
+msgstr "Eliminar árbol"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:676
-msgid "Do you really want to remove feed"
-msgstr "¿Realmente quiere eliminar el canal?"
+#: ../src/plugins/rssyl/rssyl_gtk.c:126
+msgid "Add RSS folder tree"
+msgstr "Añadir árbol de carpetas RSS"
 
-#. Remove cache checkbutton
-#: ../src/plugins/rssyl/rssyl_gtk.c:682
-msgid "Remove cached entries"
-msgstr "Eliminar entradas almacenadas temporalmente"
+#: ../src/plugins/rssyl/rssyl_gtk.c:127
+msgid "Enter name for a new RSS folder tree."
+msgstr "Introduzca el nombre del nuevo árbol de carpetas RSS."
 
-#: ../src/plugins/rssyl/rssyl.h:8
-msgid "RSSyl"
-msgstr "RSSyl"
+#: ../src/plugins/rssyl/rssyl_gtk.c:143
+msgid ""
+"Creation of folder tree failed.\n"
+"Maybe some files already exist, or you don't have the permission to write "
+"there?"
+msgstr ""
+"Falló la creación del árbol de carpetas.\n"
+"¿Quizás existan todavía algunos ficheros o no tiene permisos de escritura en "
+"el directorio?"
 
 #. Default RSSyl mailbox name
-#: ../src/plugins/rssyl/rssyl.h:14
+#: ../src/plugins/rssyl/rssyl.h:17
 msgid "My Feeds"
 msgstr "Mis canales"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:106
+#: ../src/plugins/rssyl/rssyl_prefs.c:128
 msgid "Default refresh interval in minutes"
 msgstr "Intervalo de refresco predeterminado en minutos"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:117
-msgid "Set to 0 to disable automatic refreshing"
-msgstr "Establecer a 0 para desactivar el refresco automático"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:119
-msgid "Default number of expired items to keep"
-msgstr "Número predeterminado de entradas caducadas a mantener"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:130
-msgid "Set to -1 to keep expired items"
-msgstr "Establecer a -1 para mantener todas las entradas caducadas"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:133
+#: ../src/plugins/rssyl/rssyl_prefs.c:147
 msgid "Refresh all feeds on application start"
 msgstr "Refrescar todos los canales al iniciar la aplicación"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:139
+#. Path to cookies file for libcurl to use
+#: ../src/plugins/rssyl/rssyl_prefs.c:155
 msgid "Path to cookies file"
 msgstr "Ruta al fichero de cookies"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:149
+#: ../src/plugins/rssyl/rssyl_prefs.c:166
+#: ../src/plugins/rssyl/rssyl_prefs.c:169
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr "Ruta al fichero cookies.txt estilo Netscape que contiene sus cookies"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:152
-msgid "Verify SSL certificate validity for new feeds"
-msgstr "Verificar la validez del certificado SSL para los canales nuevos"
+#: ../src/plugins/rssyl/rssyl_prefs.c:176
+msgid "Verify SSL certificates validity for new feeds"
+msgstr "Verificar la validez de los certificados SSL para los canales nuevos"
+
+#. Create window
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+msgid "Subscribe new feed?"
+msgstr "¿Suscribir nuevo canal?"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:72
+msgid "<b>Feed folder:</b>"
+msgstr "<b>Carpeta del canal:</b> "
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:82
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:86
+msgid ""
+"Instead of using official title, you can enter a different folder name for "
+"the feed."
+msgstr ""
+"En lugar de usar el título oficial puede introducir un nombre diferente para el canal."
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:91
+msgid "_Edit feed properties after subscribing"
+msgstr "_Editar propiedades del canal después de suscribirse"
+
+#: ../src/plugins/rssyl/rssyl_update_comments.c:99
+#, c-format
+msgid "Updating comments for '%s'..."
+msgstr "Actualizando comentarios para «%s»..."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:102
+#: ../src/plugins/vcalendar/vcal_folder.c:1596
+msgid "401 (Authorisation required)"
+msgstr "401 (Se requiere autorización)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:105
+#: ../src/plugins/vcalendar/vcal_folder.c:1599
+msgid "403 (Unauthorised)"
+msgstr "403 (No autorizado)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:108
+#: ../src/plugins/vcalendar/vcal_folder.c:1602
+msgid "404 (Not found)"
+msgstr "404 (No encontrado)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:111
+#, c-format
+msgid "Error %d"
+msgstr "Error %d"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:123
+#, c-format
+msgctxt "First parameter is URL, second is error text"
+msgid ""
+"Error fetching feed at\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
+msgstr ""
+"Error recuperando canal en\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:134
+#, c-format
+msgid ""
+"No valid feed found at\n"
+"<b>%s</b>"
+msgstr ""
+"Canal no válido encontrado en\n"
+"<b>%s</b>"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:200
+#, c-format
+msgid "Updating feed '%s'..."
+msgstr "Actualizando canal «%s»..."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:221
+#, c-format
+msgid ""
+"Couldn't process feed at\n"
+"<b>%s</b>\n"
+"\n"
+"Please contact developers, this should not happen."
+msgstr ""
+"No se pudo procesar el canal en\n"
+"<b>%s</b>\n"
+"\n"
+"Por favor contacte con los desarrolladores, esto no debería suceder."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:301
+msgid "Claws Mail needs network access in order to update your feeds."
+msgstr "Claws Mail necesita acceso a la red para actualizar los canales."
+
+#: ../src/plugins/rssyl/rssyl_update_format.c:127
+msgid ""
+"Internal problem while upgrading storage format. This should not happen. "
+"Please report this, with debug output attached.\n"
+msgstr ""
+"Problema interno al actualizar el formato de almacenamiento. Esto no debería suceder. Por favor informe de esto, con la información de depuración adjunta.\n"
 
 #: ../src/plugins/smime/plugin.c:38 ../src/plugins/smime/plugin.c:54
 #: ../src/plugins/smime/smime.c:911
@@ -13903,6 +14139,48 @@ 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:295
+msgid "Reporting spam..."
+msgstr "Informando de correo basura..."
+
+#: ../src/plugins/spam_report/spam_report.c:330
+msgid "Report spam online..."
+msgstr "Informar de correo basura en línea..."
+
+#: ../src/plugins/spam_report/spam_report.c:341
+#: ../src/plugins/spam_report/spam_report.c:379
+#: ../src/plugins/spam_report/spam_report_prefs.c:80
+msgid "SpamReport"
+msgstr "Informe de correo basura"
+
+#: ../src/plugins/spam_report/spam_report.c:384
+msgid ""
+"This plugin reports spam to various places.\n"
+"Currently the following sites or methods are supported:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * lists.debian.org nomination system"
+msgstr ""
+"Este módulo informa sobre correo basura en varios lugares.\n"
+"Actualmente se soportan los siguientes sitios o métodos:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * sistema de nominación de lists.debian.org"
+
+#: ../src/plugins/spam_report/spam_report.c:409
+msgid "Spam reporting"
+msgstr "Informe de correo basura"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:122
+msgid "Enabled"
+msgstr "Habilitado"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:149
+msgid "Forward to:"
+msgstr "Reenviar a:"
+
 #: ../src/plugins/spamassassin/spamassassin.c:77
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:649
 msgid "SpamAssassin"
@@ -13910,7 +14188,7 @@ msgstr "SpamAssassin"
 
 #: ../src/plugins/spamassassin/spamassassin.c:169
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
-msgstr "El módulo Spamassassin no pudo conectar con spamd.\n"
+msgstr "El módulo SpamAssassin no pudo conectar con spamd.\n"
 
 #: ../src/plugins/spamassassin/spamassassin.c:185
 msgid "SpamAssassin plugin filtering failed.\n"
@@ -13918,7 +14196,7 @@ msgstr "Falló el filtrado con el módulo SpamAssassin.\n"
 
 #: ../src/plugins/spamassassin/spamassassin.c:238
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
-msgstr "El módulo Spamassassin esta deshabilitado por sus preferencias.\n"
+msgstr "El módulo SpamAssassin esta deshabilitado por sus preferencias.\n"
 
 #: ../src/plugins/spamassassin/spamassassin.c:243
 msgid "SpamAssassin: filtering message..."
@@ -13949,7 +14227,7 @@ msgstr "Fallo al obtener en nombre de usuario"
 #: ../src/plugins/spamassassin/spamassassin.c:586
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
-"El módulo Spamassassin esta cargado pero deshabilitado por sus "
+"El módulo SpamAssassin esta cargado pero deshabilitado por sus "
 "preferencias.\n"
 
 #: ../src/plugins/spamassassin/spamassassin.c:620
@@ -13987,7 +14265,7 @@ msgstr "TCP"
 
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:93
 msgid "Unix Socket"
-msgstr "Socket Unix"
+msgstr "Conector Unix"
 
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:269
 msgid "Enable SpamAssassin plugin"
@@ -14023,7 +14301,7 @@ msgstr "Puerto del servidor spamd"
 
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:352
 msgid "Path of Unix socket"
-msgstr "Ruta al socket Unix"
+msgstr "Ruta al conector Unix"
 
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:387
 msgid ""
@@ -14033,48 +14311,6 @@ msgstr ""
 "Tiempo máximo permitido para la comprobación. Si la comprobación lleva más "
 "tiempo será cancelada."
 
-#: ../src/plugins/spam_report/spam_report.c:293
-msgid "Reporting spam..."
-msgstr "Informando de correo basura..."
-
-#: ../src/plugins/spam_report/spam_report.c:328
-msgid "Report spam online..."
-msgstr "Informar de correo basura en línea..."
-
-#: ../src/plugins/spam_report/spam_report.c:339
-#: ../src/plugins/spam_report/spam_report.c:377
-#: ../src/plugins/spam_report/spam_report_prefs.c:80
-msgid "SpamReport"
-msgstr "Informe de correo basura"
-
-#: ../src/plugins/spam_report/spam_report.c:382
-msgid ""
-"This plugin reports spam to various places.\n"
-"Currently the following sites or methods are supported:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * lists.debian.org nomination system"
-msgstr ""
-"Este módulo informa sobre correo basura en varios lugares.\n"
-"Actualmente se soportan los siguientes sitios o métodos:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * sistema de nominación de lists.debian.org"
-
-#: ../src/plugins/spam_report/spam_report.c:407
-msgid "Spam reporting"
-msgstr "Informe de correo basura"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:122
-msgid "Enabled"
-msgstr "Habilitado"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:149
-msgid "Forward to:"
-msgstr "Reenviar a:"
-
 #: ../src/plugins/tnef_parse/tnef_parse.c:65
 #, c-format
 msgid ""
@@ -14151,7 +14387,7 @@ msgstr "Mostrar"
 
 #: ../src/plugins/vcalendar/day-view.c:614
 #: ../src/plugins/vcalendar/month-view.c:711 ../src/prefs_account.c:1477
-#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:334
+#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:336
 msgid "days"
 msgstr "días"
 
@@ -14217,7 +14453,7 @@ msgstr "Agosto"
 
 #: ../src/plugins/vcalendar/month-view.c:126
 msgid "September"
-msgstr "Septiempre"
+msgstr "Septiembre"
 
 #: ../src/plugins/vcalendar/month-view.c:127
 msgid "October"
@@ -14393,7 +14629,7 @@ msgstr "¿Está seguro de que quiere cancelar esta reunión?"
 
 #: ../src/plugins/vcalendar/vcalendar.c:1087
 msgid "No account found"
-msgstr "No se encontro ninguna cuenta"
+msgstr "No se encontró ninguna cuenta"
 
 #: ../src/plugins/vcalendar/vcalendar.c:1088
 msgid ""
@@ -14538,6 +14774,11 @@ msgstr ""
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Excedido el tiempo (%d segundos) conectando a %s\n"
 
+#: ../src/plugins/vcalendar/vcal_folder.c:1605
+#, c-format
+msgid "Error %ld"
+msgstr "Error %ld"
+
 #: ../src/plugins/vcalendar/vcal_folder.c:1802
 #, c-format
 msgid ""
@@ -14588,9 +14829,9 @@ msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1849
 #: ../src/plugins/vcalendar/vcal_folder.c:1852
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create directory %s"
-msgstr "No se puede crear el directorio de destino %s."
+msgstr "No se puede crear el directorio %s"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1890
 msgid "Claws Mail needs network access in order to update the Webcal feed."
@@ -15101,7 +15342,7 @@ msgstr "Opciones SSL"
 
 #: ../src/pop.c:152
 msgid "Required APOP timestamp not found in greeting\n"
-msgstr "No se encontro en el saludo la marca de tiempo APOP necesaria\n"
+msgstr "No se encontró en el saludo la marca de tiempo APOP necesaria\n"
 
 #: ../src/pop.c:159
 msgid "Timestamp syntax error in greeting\n"
@@ -15216,11 +15457,11 @@ msgstr ""
 
 #: ../src/prefs_account.c:1177
 msgid "This server requires authentication"
-msgstr "Este servidor requiere autentificación"
+msgstr "Este servidor requiere autenticación"
 
 #: ../src/prefs_account.c:1184
 msgid "Authenticate on connect"
-msgstr "Autentificación al conectar"
+msgstr "Autenticación al conectar"
 
 #: ../src/prefs_account.c:1238
 msgid "News server"
@@ -15265,14 +15506,9 @@ msgstr "Entrada por defecto"
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Los mensajes sin filtrar se guardarán en esta carpeta"
 
-#: ../src/prefs_account.c:1442 ../src/prefs_account.c:1531
-#: ../src/prefs_account.c:1991 ../src/prefs_customheader.c:237
-msgid "Bro_wse"
-msgstr "E_xplorar"
-
 #: ../src/prefs_account.c:1453
 msgid "Use secure authentication (APOP)"
-msgstr "Utilizar autentificación segura (APOP)"
+msgstr "Utilizar autenticación segura (APOP)"
 
 #: ../src/prefs_account.c:1456
 msgid "Remove messages on server when received"
@@ -15312,7 +15548,7 @@ msgstr "sin límite si se especifica 0"
 
 #: ../src/prefs_account.c:1570 ../src/prefs_account.c:1763
 msgid "Authentication method"
-msgstr "Método de autentificación"
+msgstr "Método de autenticación"
 
 #: ../src/prefs_account.c:1580 ../src/prefs_account.c:1772
 #: ../src/prefs_send.c:290
@@ -15355,8 +15591,8 @@ 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:1718 ../src/prefs_customheader.c:209
-#: ../src/prefs_matcher.c:620 ../src/prefs_matcher.c:1958
-#: ../src/prefs_matcher.c:1980
+#: ../src/prefs_matcher.c:623 ../src/prefs_matcher.c:1974
+#: ../src/prefs_matcher.c:1996
 msgid "Header"
 msgstr "Cabecera"
 
@@ -15378,7 +15614,7 @@ msgstr "Añadir cabecera de usuario"
 
 #: ../src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "Autentificación SMTP (SMTP AUTH)"
+msgstr "Autenticación SMTP (SMTP AUTH)"
 
 #: ../src/prefs_account.c:1833
 msgid ""
@@ -15390,11 +15626,11 @@ msgstr ""
 
 #: ../src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
-msgstr "Autentificación con POP3 antes de enviar"
+msgstr "Autenticación con POP3 antes de enviar"
 
 #: ../src/prefs_account.c:1859
 msgid "POP authentication timeout: "
-msgstr "Tiempo límite para autentificación POP: "
+msgstr "Tiempo límite para autenticación POP: "
 
 #: ../src/prefs_account.c:1867
 msgid "minutes"
@@ -15422,7 +15658,7 @@ msgstr "Establecer las siguientes direcciones automáticamente"
 
 #: ../src/prefs_account.c:2055
 msgid "Spell check dictionaries"
-msgstr "Diccionarios de correción ortográfica"
+msgstr "Diccionarios de corrección ortográfica"
 
 #. Default dictionary
 #: ../src/prefs_account.c:2065 ../src/prefs_folder_item.c:1092
@@ -15729,8 +15965,8 @@ msgid "Replace the selected action in list with the action above"
 msgstr "Sustituir la acción seleccionada en la lista con la acción de arriba"
 
 #: ../src/prefs_actions.c:337 ../src/prefs_filtering_action.c:616
-#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:778
-#: ../src/prefs_template.c:318 ../src/prefs_toolbar.c:1056
+#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:781
+#: ../src/prefs_template.c:320 ../src/prefs_toolbar.c:1056
 msgid "Re_move"
 msgstr "Eli_minar"
 
@@ -15739,7 +15975,7 @@ msgid "Delete the selected action from the list"
 msgstr "Borrar la acción seleccionada de la lista"
 
 #: ../src/prefs_actions.c:355 ../src/prefs_filtering.c:503
-#: ../src/prefs_template.c:336
+#: ../src/prefs_template.c:338
 msgid "Clear all the input fields in the dialog"
 msgstr "Limpiar todos los campos de entrada en el diálogo"
 
@@ -15760,7 +15996,7 @@ msgstr "Mover abajo la acción seleccionada"
 #: ../src/prefs_actions.c:535 ../src/prefs_filtering_action.c:704
 #: ../src/prefs_filtering.c:836 ../src/prefs_filtering.c:838
 #: ../src/prefs_filtering.c:839 ../src/prefs_filtering.c:949
-#: ../src/prefs_matcher.c:897 ../src/prefs_template.c:469
+#: ../src/prefs_matcher.c:900 ../src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Nueva)"
 
@@ -15821,22 +16057,22 @@ msgstr "¿Realmente quiere borrar todas las acciones?"
 
 #: ../src/prefs_actions.c:898 ../src/prefs_actions.c:929
 #: ../src/prefs_filtering.c:1497 ../src/prefs_filtering.c:1519
-#: ../src/prefs_matcher.c:2109 ../src/prefs_template.c:569
-#: ../src/prefs_template.c:594
+#: ../src/prefs_matcher.c:2125 ../src/prefs_template.c:572
+#: ../src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Entrada no guardada"
 
 #: ../src/prefs_actions.c:899 ../src/prefs_actions.c:930
 #: ../src/prefs_filtering.c:1498 ../src/prefs_filtering.c:1520
-#: ../src/prefs_template.c:570 ../src/prefs_template.c:595
+#: ../src/prefs_template.c:573 ../src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "La entrada no fue guardada. ¿Cerrar igualmente?"
 
 #: ../src/prefs_actions.c:900 ../src/prefs_actions.c:905
 #: ../src/prefs_actions.c:931 ../src/prefs_filtering.c:1477
 #: ../src/prefs_filtering.c:1499 ../src/prefs_filtering.c:1521
-#: ../src/prefs_matcher.c:2111 ../src/prefs_template.c:571
-#: ../src/prefs_template.c:596 ../src/prefs_template.c:601
+#: ../src/prefs_matcher.c:2127 ../src/prefs_template.c:574
+#: ../src/prefs_template.c:599 ../src/prefs_template.c:604
 msgid "+_Continue editing"
 msgstr "+_Seguir editando"
 
@@ -15854,7 +16090,7 @@ msgstr "<span weight=\"bold\" underline=\"single\">Nombre de menú:</span>"
 
 #: ../src/prefs_actions.c:975
 msgid "Use / in menu name to make submenus."
-msgstr "Utilize / en el nombre de menú para crear submenús."
+msgstr "Utilice / en el nombre de menú para crear sub-menús."
 
 #: ../src/prefs_actions.c:977
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
@@ -15947,7 +16183,7 @@ msgstr ""
 "que procesen un fichero de mensaje o alguna de sus partes."
 
 #: ../src/prefs_actions.c:1092 ../src/prefs_filtering.c:1695
-#: ../src/prefs_template.c:1101
+#: ../src/prefs_template.c:1121
 msgid "D_uplicate"
 msgstr "D_uplicar"
 
@@ -16082,7 +16318,7 @@ msgid "Custom header configuration"
 msgstr "Configuración de cabeceras de usuario"
 
 #: ../src/prefs_customheader.c:507 ../src/prefs_display_header.c:599
-#: ../src/prefs_matcher.c:1583 ../src/prefs_matcher.c:1598
+#: ../src/prefs_matcher.c:1595 ../src/prefs_matcher.c:1610
 msgid "Header name is not set."
 msgstr "No se estableció el nombre de cabecera"
 
@@ -16269,7 +16505,7 @@ msgstr "Redirigir"
 
 #. S_COL_NUMBER
 #: ../src/prefs_filtering_action.c:194 ../src/prefs_filtering_action.c:195
-#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:626
+#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:629
 #: ../src/prefs_summary_column.c:87 ../src/summaryview.c:447
 msgid "Score"
 msgstr "Puntos"
@@ -16286,7 +16522,7 @@ msgstr "Establecer puntos"
 #. S_COL_SCORE
 #. S_COL_LOCKED
 #: ../src/prefs_filtering_action.c:196 ../src/prefs_filtering_action.c:197
-#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:630
+#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:633
 #: ../src/prefs_summary_column.c:89 ../src/summaryview.c:449
 msgid "Tags"
 msgstr "Etiquetas"
@@ -16316,7 +16552,7 @@ msgid "Action configuration"
 msgstr "Configuración de la acción"
 
 #: ../src/prefs_filtering_action.c:427 ../src/prefs_filtering.c:1886
-#: ../src/prefs_matcher.c:583
+#: ../src/prefs_matcher.c:586
 msgid "Rule"
 msgstr "Regla"
 
@@ -16358,25 +16594,25 @@ msgid "No action was defined."
 msgstr "No se definió ninguna acción."
 
 #. completion of 'To' from address book
-#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2153
+#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2169
 #: ../src/quote_fmt.c:79
 msgid "literal %"
 msgstr "carácter %"
 
-#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2162
+#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2178
 msgid "filename (should not be modified)"
 msgstr "nombre de fichero (no debe modificarse)"
 
-#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2163
+#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2179
 #: ../src/quote_fmt.c:87
 msgid "new line"
 msgstr "nueva línea"
 
-#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2164
+#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2180
 msgid "escape character for quotes"
 msgstr "carácter de escape para citas"
 
-#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2165
+#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2181
 msgid "quote character"
 msgstr "carácter de cita"
 
@@ -16392,7 +16628,7 @@ msgid ""
 msgstr ""
 "«Ejecutar» permite enviar un mensaje o elemento del mismo a un programa "
 "externo o script.\n"
-"Se puden usar los siguientes símbolos:"
+"Se pueden usar los siguientes símbolos:"
 
 #: ../src/prefs_filtering_action.c:1422
 msgid "Recipient"
@@ -16446,7 +16682,7 @@ msgstr "Sustituir la regla seleccionada en la lista con la regla de arriba"
 
 #: ../src/prefs_filtering.c:493
 msgid "Delete the selected rule from the list"
-msgstr "Borrar la relga seleccionada de la lista"
+msgstr "Borrar la regla seleccionada de la lista"
 
 #: ../src/prefs_filtering.c:532
 msgid "Move the selected rule to the top"
@@ -16613,7 +16849,7 @@ msgstr "Color de la carpeta"
 
 #: ../src/prefs_folder_item.c:433 ../src/prefs_folder_item.c:1670
 msgid "Pick color for folder"
-msgstr "Elejir color para la carpeta"
+msgstr "Elegir color para la carpeta"
 
 #: ../src/prefs_folder_item.c:451
 msgid "Run Processing rules at start-up"
@@ -16724,7 +16960,7 @@ msgid "Folder and Message Lists"
 msgstr "Carpeta y listas de mensajes"
 
 #. message font label
-#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2030
+#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2046
 msgid "Message"
 msgstr "Mensaje"
 
@@ -16919,245 +17155,249 @@ msgstr "Otras"
 msgid "Logging"
 msgstr "Depuración"
 
-#: ../src/prefs_matcher.c:328
+#: ../src/prefs_matcher.c:330
 msgid "more than"
 msgstr "más que"
 
-#: ../src/prefs_matcher.c:329
+#: ../src/prefs_matcher.c:331
 msgid "less than"
 msgstr "menos que"
 
-#: ../src/prefs_matcher.c:335
+#: ../src/prefs_matcher.c:337
 msgid "weeks"
 msgstr "semanas"
 
-#: ../src/prefs_matcher.c:339
+#: ../src/prefs_matcher.c:341
 msgid "higher than"
 msgstr "más alto que"
 
-#: ../src/prefs_matcher.c:340
+#: ../src/prefs_matcher.c:342
 msgid "lower than"
 msgstr "más bajo que"
 
-#: ../src/prefs_matcher.c:341 ../src/prefs_matcher.c:347
+#: ../src/prefs_matcher.c:343 ../src/prefs_matcher.c:349
 msgid "exactly"
 msgstr "exactamente"
 
-#: ../src/prefs_matcher.c:345
+#: ../src/prefs_matcher.c:347
 msgid "greater than"
 msgstr "mayor que"
 
-#: ../src/prefs_matcher.c:346
+#: ../src/prefs_matcher.c:348
 msgid "smaller than"
 msgstr "menor que"
 
-#: ../src/prefs_matcher.c:351
+#: ../src/prefs_matcher.c:353
 msgid "bytes"
 msgstr "bytes"
 
-#: ../src/prefs_matcher.c:352
+#: ../src/prefs_matcher.c:354
 msgid "kilobytes"
 msgstr "kilobytes"
 
-#: ../src/prefs_matcher.c:353
+#: ../src/prefs_matcher.c:355
 msgid "megabytes"
 msgstr "megabytes"
 
-#: ../src/prefs_matcher.c:357
+#: ../src/prefs_matcher.c:359
 msgid "contains"
 msgstr "contiene"
 
-#: ../src/prefs_matcher.c:358
+#: ../src/prefs_matcher.c:360
 msgid "doesn't contain"
 msgstr "no contiene"
 
-#: ../src/prefs_matcher.c:381
+#: ../src/prefs_matcher.c:383
 msgid "headers part"
 msgstr "sección cabeceras"
 
-#: ../src/prefs_matcher.c:382
+#: ../src/prefs_matcher.c:384
+msgid "headers values"
+msgstr "valores de cabeceras"
+
+#: ../src/prefs_matcher.c:385
 msgid "body part"
 msgstr "sección cuerpo"
 
-#: ../src/prefs_matcher.c:383
+#: ../src/prefs_matcher.c:386
 msgid "whole message"
 msgstr "mensaje completo"
 
-#: ../src/prefs_matcher.c:389 ../src/summaryview.c:6300
+#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6300
 msgid "Marked"
 msgstr "Marcado"
 
-#: ../src/prefs_matcher.c:390 ../src/summaryview.c:6298
+#: ../src/prefs_matcher.c:393 ../src/summaryview.c:6298
 msgid "Deleted"
 msgstr "Borrado"
 
-#: ../src/prefs_matcher.c:391
+#: ../src/prefs_matcher.c:394
 msgid "Replied"
 msgstr "Respondido"
 
-#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6292
+#: ../src/prefs_matcher.c:395 ../src/summaryview.c:6292
 msgid "Forwarded"
 msgstr "Reenviado"
 
-#: ../src/prefs_matcher.c:394 ../src/summaryview.c:6282 ../src/toolbar.c:416
+#: ../src/prefs_matcher.c:397 ../src/summaryview.c:6282 ../src/toolbar.c:416
 #: ../src/toolbar.c:934 ../src/toolbar.c:1978
 msgid "Spam"
 msgstr "Basura"
 
-#: ../src/prefs_matcher.c:395
+#: ../src/prefs_matcher.c:398
 msgid "Has attachment"
 msgstr "Tiene adjunto"
 
-#: ../src/prefs_matcher.c:396 ../src/summaryview.c:6318
+#: ../src/prefs_matcher.c:399 ../src/summaryview.c:6318
 msgid "Signed"
 msgstr "Firmado"
 
-#: ../src/prefs_matcher.c:400
+#: ../src/prefs_matcher.c:403
 msgid "set"
 msgstr "establecido"
 
-#: ../src/prefs_matcher.c:401
+#: ../src/prefs_matcher.c:404
 msgid "not set"
 msgstr "no establecido"
 
-#: ../src/prefs_matcher.c:405
+#: ../src/prefs_matcher.c:408
 msgid "yes"
 msgstr "si"
 
-#: ../src/prefs_matcher.c:406
+#: ../src/prefs_matcher.c:409
 msgid "no"
 msgstr "no"
 
-#: ../src/prefs_matcher.c:410
+#: ../src/prefs_matcher.c:413
 msgid "Any tags"
 msgstr "Cualquier etiqueta"
 
-#: ../src/prefs_matcher.c:411
+#: ../src/prefs_matcher.c:414
 msgid "Specific tag"
 msgstr "Etiqueta específica"
 
-#: ../src/prefs_matcher.c:415
+#: ../src/prefs_matcher.c:418
 msgid "ignored"
 msgstr "ignorado"
 
-#: ../src/prefs_matcher.c:416
+#: ../src/prefs_matcher.c:419
 msgid "not ignored"
 msgstr "no ignorado"
 
-#: ../src/prefs_matcher.c:417
+#: ../src/prefs_matcher.c:420
 msgid "watched"
 msgstr "observado"
 
-#: ../src/prefs_matcher.c:418
+#: ../src/prefs_matcher.c:421
 msgid "not watched"
 msgstr "no observado"
 
-#: ../src/prefs_matcher.c:422
+#: ../src/prefs_matcher.c:425
 msgid "found"
 msgstr "encontrado"
 
-#: ../src/prefs_matcher.c:423
+#: ../src/prefs_matcher.c:426
 msgid "not found"
 msgstr "no encontrado"
 
-#: ../src/prefs_matcher.c:427
+#: ../src/prefs_matcher.c:430
 msgid "0 (Passed)"
 msgstr "0 (Pasado)"
 
-#: ../src/prefs_matcher.c:428
+#: ../src/prefs_matcher.c:431
 msgid "non-0 (Failed)"
 msgstr "no-0 (Fallido)"
 
-#: ../src/prefs_matcher.c:566
+#: ../src/prefs_matcher.c:569
 msgid "Condition configuration"
 msgstr "Configuración de la condición"
 
 #. criteria combo box
-#: ../src/prefs_matcher.c:610
+#: ../src/prefs_matcher.c:613
 msgid "Match criteria:"
 msgstr "Criterio de búsqueda:"
 
-#: ../src/prefs_matcher.c:619
+#: ../src/prefs_matcher.c:622
 msgid "All messages"
 msgstr "Todos los mensajes"
 
-#: ../src/prefs_matcher.c:621
+#: ../src/prefs_matcher.c:624
 msgid "Age"
 msgstr "Edad"
 
-#: ../src/prefs_matcher.c:622
+#: ../src/prefs_matcher.c:625
 msgid "Phrase"
 msgstr "Frase"
 
-#: ../src/prefs_matcher.c:623
+#: ../src/prefs_matcher.c:626
 msgid "Flags"
 msgstr "Marcas"
 
-#: ../src/prefs_matcher.c:624 ../src/prefs_msg_colors.c:410
+#: ../src/prefs_matcher.c:627 ../src/prefs_msg_colors.c:410
 msgid "Color labels"
 msgstr "Etiquetas de colores"
 
-#: ../src/prefs_matcher.c:625
+#: ../src/prefs_matcher.c:628
 msgid "Thread"
 msgstr "Hilo"
 
-#: ../src/prefs_matcher.c:628
+#: ../src/prefs_matcher.c:631
 msgid "Partially downloaded"
 msgstr "Parcialmente descargado"
 
-#: ../src/prefs_matcher.c:631
+#: ../src/prefs_matcher.c:634
 msgid "External program test"
 msgstr "Prueba con un programa externo"
 
 #. store UNtranslated "Any"/"All" in matcher expressions
-#: ../src/prefs_matcher.c:707 ../src/prefs_matcher.c:1604
-#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:2501
+#: ../src/prefs_matcher.c:710 ../src/prefs_matcher.c:1616
+#: ../src/prefs_matcher.c:1631 ../src/prefs_matcher.c:2521
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Todos"
 
-#: ../src/prefs_matcher.c:741
+#: ../src/prefs_matcher.c:744
 msgid "Use regexp"
 msgstr "Usar exp.reg."
 
-#: ../src/prefs_matcher.c:818
+#: ../src/prefs_matcher.c:821
 msgid "Message must match"
 msgstr "El mensaje debe cumplir"
 
-#: ../src/prefs_matcher.c:822
+#: ../src/prefs_matcher.c:825
 msgid "at least one"
 msgstr "al menos una de"
 
-#: ../src/prefs_matcher.c:823
+#: ../src/prefs_matcher.c:826
 msgid "all"
 msgstr "todas"
 
-#: ../src/prefs_matcher.c:826
+#: ../src/prefs_matcher.c:829
 msgid "of above rules"
 msgstr "las reglas anteriores"
 
-#: ../src/prefs_matcher.c:1522 ../src/prefs_matcher.c:1588
+#: ../src/prefs_matcher.c:1534 ../src/prefs_matcher.c:1600
 msgid "Search pattern is not set."
 msgstr "No se estableció el patrón de búsqueda."
 
-#: ../src/prefs_matcher.c:1531
+#: ../src/prefs_matcher.c:1543
 msgid "Test command is not set."
 msgstr "No se estableció la orden de prueba."
 
-#: ../src/prefs_matcher.c:1605
+#: ../src/prefs_matcher.c:1617
 msgid "all addresses in all headers"
 msgstr "todas las direcciones en todas las cabeceras"
 
-#: ../src/prefs_matcher.c:1608
+#: ../src/prefs_matcher.c:1620
 msgid "any address in any header"
 msgstr "cualquier dirección en cualquier cabecera"
 
-#: ../src/prefs_matcher.c:1610
+#: ../src/prefs_matcher.c:1622
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "la(s) dirección(es) en la cabecera «%s»"
 
-#: ../src/prefs_matcher.c:1611
+#: ../src/prefs_matcher.c:1623
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -17170,79 +17410,83 @@ msgstr ""
 "Si quiere encontrar coincidencias de «%s» en todo el libro de direcciones "
 "deberá seleccionar «%s» en la lista desplegable de agenda/carpeta."
 
-#: ../src/prefs_matcher.c:1830
+#: ../src/prefs_matcher.c:1842
 msgid "Headers part"
 msgstr "Sección cabeceras"
 
-#: ../src/prefs_matcher.c:1834
+#: ../src/prefs_matcher.c:1846
+msgid "Headers values"
+msgstr "Valores de cabeceras"
+
+#: ../src/prefs_matcher.c:1850
 msgid "Body part"
 msgstr "Sección cuerpo"
 
-#: ../src/prefs_matcher.c:1838
+#: ../src/prefs_matcher.c:1854
 msgid "Whole message"
 msgstr "Mensaje completo"
 
-#: ../src/prefs_matcher.c:1957 ../src/prefs_matcher.c:2001
+#: ../src/prefs_matcher.c:1973 ../src/prefs_matcher.c:2017
 msgid "in"
 msgstr "en"
 
-#: ../src/prefs_matcher.c:1959
+#: ../src/prefs_matcher.c:1975
 msgid "content is"
 msgstr "contenido es"
 
-#: ../src/prefs_matcher.c:1968
+#: ../src/prefs_matcher.c:1984
 msgid "Age is"
 msgstr "Edad es"
 
-#: ../src/prefs_matcher.c:1973
+#: ../src/prefs_matcher.c:1989
 msgid "Flag"
 msgstr "Marca"
 
-#: ../src/prefs_matcher.c:1974 ../src/prefs_matcher.c:1991
+#: ../src/prefs_matcher.c:1990 ../src/prefs_matcher.c:2007
 msgid "is"
 msgstr "es"
 
-#: ../src/prefs_matcher.c:1979
+#: ../src/prefs_matcher.c:1995
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../src/prefs_matcher.c:1990
+#: ../src/prefs_matcher.c:2006
 msgid "Label"
 msgstr "Etiqueta"
 
-#: ../src/prefs_matcher.c:1996
+#: ../src/prefs_matcher.c:2012
 msgid "Value:"
 msgstr "Valor:"
 
-#: ../src/prefs_matcher.c:2013
+#: ../src/prefs_matcher.c:2029
 msgid "Score is"
 msgstr "Puntuación es"
 
-#: ../src/prefs_matcher.c:2014
+#: ../src/prefs_matcher.c:2030
 msgid "points"
 msgstr "puntos"
 
-#: ../src/prefs_matcher.c:2024
+#: ../src/prefs_matcher.c:2040
 msgid "Size is"
 msgstr "Tamaño es"
 
-#: ../src/prefs_matcher.c:2029
+#: ../src/prefs_matcher.c:2045
 msgid "Scope:"
 msgstr "Alcance:"
 
-#: ../src/prefs_matcher.c:2031
+#: ../src/prefs_matcher.c:2047
 msgid "tags"
 msgstr "etiquetas"
 
-#: ../src/prefs_matcher.c:2036
+#: ../src/prefs_matcher.c:2052
 msgid "type is"
 msgstr "tipo es"
 
-#: ../src/prefs_matcher.c:2040
+#: ../src/prefs_matcher.c:2056
 msgid "Program returns"
 msgstr "El programa devuelve"
 
-#: ../src/prefs_matcher.c:2110
+#: ../src/prefs_matcher.c:2126
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -17250,11 +17494,11 @@ msgstr ""
 "La entrada no fue guardada.\n"
 "¿Cerrar igualmente?"
 
-#: ../src/prefs_matcher.c:2174
+#: ../src/prefs_matcher.c:2190
 msgid "Match Type: 'Test'"
 msgstr "Tipo de coincidencia: «Probar»"
 
-#: ../src/prefs_matcher.c:2175
+#: ../src/prefs_matcher.c:2191
 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"
@@ -17266,7 +17510,7 @@ msgstr ""
 "\n"
 "Se pueden usar los siguientes símbolos:"
 
-#: ../src/prefs_matcher.c:2274
+#: ../src/prefs_matcher.c:2290
 msgid "Current condition rules"
 msgstr "Reglas de condición actuales"
 
@@ -17308,7 +17552,7 @@ msgstr "Seleccionar la parte HTML en mensajes «multipart/alternative»"
 
 #: ../src/prefs_message.c:175
 msgid "Line space"
-msgstr "Interlineado"
+msgstr "Entrelineado"
 
 #: ../src/prefs_message.c:189 ../src/prefs_message.c:223
 msgid "pixel(s)"
@@ -17345,7 +17589,7 @@ msgstr "Colapsar el texto citado al hacer doble clic"
 
 #: ../src/prefs_message.c:249
 msgid "Treat these characters as quotation marks: "
-msgstr "Tratar estos carácteres como marcas de cita: "
+msgstr "Tratar estos caracteres como marcas de cita: "
 
 #: ../src/prefs_message.c:355
 msgid "Text Options"
@@ -17383,7 +17627,7 @@ msgstr "Texto"
 #: ../src/prefs_msg_colors.c:204
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text"
-msgstr "Elejir el color para el texto de primer nivel"
+msgstr "Elegir el color para el texto de primer nivel"
 
 #: ../src/prefs_msg_colors.c:210
 msgid "2nd Level"
@@ -17392,7 +17636,7 @@ msgstr "Segundo nivel"
 #: ../src/prefs_msg_colors.c:230
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text"
-msgstr "Elejir el color para el texto de segundo nivel"
+msgstr "Elegir el color para el texto de segundo nivel"
 
 #: ../src/prefs_msg_colors.c:236
 msgid "3rd Level"
@@ -17401,7 +17645,7 @@ msgstr "Tercer nivel"
 #: ../src/prefs_msg_colors.c:256
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text"
-msgstr "Elejir el color para el texto de tercer nivel"
+msgstr "Elegir el color para el texto de tercer nivel"
 
 #: ../src/prefs_msg_colors.c:263
 msgid "Enable coloration of text background"
@@ -17410,22 +17654,22 @@ msgstr "Habilitar el color en el fondo del texto"
 #: ../src/prefs_msg_colors.c:279
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text background"
-msgstr "Elejir el color para el fondo del texto de primer nivel"
+msgstr "Elegir el color para el fondo del texto de primer nivel"
 
 #: ../src/prefs_msg_colors.c:300
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text background"
-msgstr "Elejir el color para el fondo del texto de segundo nivel"
+msgstr "Elegir el color para el fondo del texto de segundo nivel"
 
 #: ../src/prefs_msg_colors.c:321
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text background"
-msgstr "Elejir el color para el fondo del texto de tercer nivel"
+msgstr "Elegir el color para el fondo del texto de tercer nivel"
 
 #: ../src/prefs_msg_colors.c:341
 msgctxt "Tooltip"
 msgid "Pick color for links"
-msgstr "Elejir el color para los enlaces"
+msgstr "Elegir el color para los enlaces"
 
 #: ../src/prefs_msg_colors.c:343
 msgid "URI link"
@@ -17434,7 +17678,7 @@ msgstr "Enlace URI"
 #: ../src/prefs_msg_colors.c:360
 msgctxt "Tooltip"
 msgid "Pick color for signatures"
-msgstr "Elejir el color para las firmas"
+msgstr "Elegir el color para las firmas"
 
 #: ../src/prefs_msg_colors.c:367 ../src/prefs_summaries.c:354
 msgid "Folder list"
@@ -17445,7 +17689,7 @@ msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"
 msgstr ""
-"Elejir color para la carpeta de destino. La carpeta de destino se usa cuando "
+"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"
 
@@ -17455,7 +17699,7 @@ msgstr "Carpeta de destino"
 
 #: ../src/prefs_msg_colors.c:399
 msgid "Pick color for folders containing new messages"
-msgstr "Elejir el color para las carpetas que contiene mensajes nuevos"
+msgstr "Elegir el color para las carpetas que contiene mensajes nuevos"
 
 #: ../src/prefs_msg_colors.c:401
 msgid "Folder containing new messages"
@@ -17482,57 +17726,57 @@ msgstr "Establecer la etiqueta para el «color %d»"
 #, c-format
 msgctxt "Dialog title"
 msgid "Pick color for 'color %d'"
-msgstr "Elejir el color para el «color %d»"
+msgstr "Elegir el color para el «color %d»"
 
 #: ../src/prefs_msg_colors.c:600
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text"
-msgstr "Elejir color del texto de primer nivel"
+msgstr "Elegir color del texto de primer nivel"
 
 #: ../src/prefs_msg_colors.c:603
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text"
-msgstr "Elejir color del texto de segundo nivel"
+msgstr "Elegir color del texto de segundo nivel"
 
 #: ../src/prefs_msg_colors.c:606
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text"
-msgstr "Elejir color del texto de tercer nivel"
+msgstr "Elegir color del texto de tercer nivel"
 
 #: ../src/prefs_msg_colors.c:609
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text background"
-msgstr "Elejir color de fondo del texto de primer nivel"
+msgstr "Elegir color de fondo del texto de primer nivel"
 
 #: ../src/prefs_msg_colors.c:612
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text background"
-msgstr "Elejir color de fondo del texto de segundo nivel"
+msgstr "Elegir color de fondo del texto de segundo nivel"
 
 #: ../src/prefs_msg_colors.c:615
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text background"
-msgstr "Elejir color de fondo del texto de tercer nivel"
+msgstr "Elegir color de fondo del texto de tercer nivel"
 
 #: ../src/prefs_msg_colors.c:618
 msgctxt "Dialog title"
 msgid "Pick color for links"
-msgstr "Elejir color para «color %d»"
+msgstr "Elegir color para «color %d»"
 
 #: ../src/prefs_msg_colors.c:621
 msgctxt "Dialog title"
 msgid "Pick color for target folder"
-msgstr "Elejir color de la carpeta destino"
+msgstr "Elegir color de la carpeta destino"
 
 #: ../src/prefs_msg_colors.c:624
 msgctxt "Dialog title"
 msgid "Pick color for signatures"
-msgstr "Elejir color de las firmas"
+msgstr "Elegir color de las firmas"
 
 #: ../src/prefs_msg_colors.c:627
 msgctxt "Dialog title"
 msgid "Pick color for folder"
-msgstr "Elejir color para «color %d»"
+msgstr "Elegir color para «color %d»"
 
 #: ../src/prefs_msg_colors.c:840
 msgid "Colors"
@@ -17540,7 +17784,7 @@ msgstr "Colores"
 
 #: ../src/prefs_other.c:97
 msgid "Choose preset keyboard shortcuts"
-msgstr "Elegir configuracide atajos de teclado"
+msgstr "Elegir configuración de atajos de teclado"
 
 #: ../src/prefs_other.c:111
 msgid "Select preset:"
@@ -17621,7 +17865,7 @@ msgstr "Más rápido"
 
 #: ../src/prefs_other.c:545
 msgid "Socket I/O timeout"
-msgstr "Tiempo límite de E/S en el socket"
+msgstr "Tiempo límite de E/S del conector"
 
 #: ../src/prefs_other.c:567
 msgid "Ask before emptying trash"
@@ -17921,7 +18165,7 @@ msgstr "Enviando"
 
 #: ../src/prefs_spelling.c:81
 msgid "Pick color for misspelled word"
-msgstr "Elejir color de las palabras incorrectas"
+msgstr "Elegir color de las palabras incorrectas"
 
 #: ../src/prefs_spelling.c:129
 msgid "Enable spell checker"
@@ -17961,7 +18205,7 @@ msgstr "Color de las faltas ortográficas"
 
 #: ../src/prefs_spelling.c:220
 msgid "Pick color for misspelled word. Use black to underline"
-msgstr "Elejir color de los fallos ortográficos. Usar negro para subrayar"
+msgstr "Elegir color de los fallos ortográficos. Usar negro para subrayar"
 
 #: ../src/prefs_spelling.c:337
 msgid "Spell Checking"
@@ -18121,7 +18365,7 @@ msgid ""
 "Defers moving, copying and deleting of messages until you choose 'Tools/"
 "Execute'"
 msgstr ""
-"Postpone los movimientos, copiados y borrados de mensajes hasta que se "
+"Pospone los movimientos, copiados y borrados de mensajes hasta que se "
 "seleccione «Herramientas/Ejecutar»"
 
 #: ../src/prefs_summaries.c:479
@@ -18221,11 +18465,11 @@ msgstr "Selecciones posibles"
 msgid "Selection on folder opening"
 msgstr "Selección al abrir una carpeta"
 
-#: ../src/prefs_template.c:79
+#: ../src/prefs_template.c:80
 msgid "This name is used as the Menu item"
 msgstr "Este nombre se utiliza como el elemento de menú"
 
-#: ../src/prefs_template.c:81
+#: ../src/prefs_template.c:82
 msgid ""
 "Override composing account's From header. This doesn't change the composing "
 "account."
@@ -18233,100 +18477,106 @@ msgstr ""
 "Sobreescribir la cabecera Desde de la cuenta de composición. Esto no cambia "
 "la cuenta de composición."
 
-#: ../src/prefs_template.c:307
+#: ../src/prefs_template.c:309
 msgid "Append the new template above to the list"
 msgstr "Añadir la nueva plantilla de arriba a la lista"
 
-#: ../src/prefs_template.c:316
+#: ../src/prefs_template.c:318
 msgid "Replace the selected template in list with the template above"
 msgstr ""
 "Sustituir la plantilla seleccionada en la lista con la plantilla de arriba"
 
-#: ../src/prefs_template.c:326
+#: ../src/prefs_template.c:328
 msgid "Delete the selected template from the list"
 msgstr "Borrar la plantilla seleccionada de la lista"
 
-#: ../src/prefs_template.c:344
+#: ../src/prefs_template.c:346
 msgid "Show information on configuring templates"
 msgstr "Mostrar información sobre cómo configurar plantillas"
 
-#: ../src/prefs_template.c:368
+#: ../src/prefs_template.c:370
 msgid "Move the selected template to the top"
 msgstr "Mover la plantilla seleccionada encima de todas"
 
-#: ../src/prefs_template.c:378
+#: ../src/prefs_template.c:380
 msgid "Move the selected template up"
 msgstr "Mover la plantilla seleccionada arriba"
 
-#: ../src/prefs_template.c:386
+#: ../src/prefs_template.c:388
 msgid "Move the selected template down"
 msgstr "Mover la plantilla seleccionada abajo"
 
-#: ../src/prefs_template.c:396
+#: ../src/prefs_template.c:398
 msgid "Move the selected template to the bottom"
 msgstr "Mover la plantilla seleccionada al fondo"
 
-#: ../src/prefs_template.c:412
+#: ../src/prefs_template.c:414
 msgid "Template configuration"
 msgstr "Configuración de plantilla"
 
-#: ../src/prefs_template.c:599
+#: ../src/prefs_template.c:602
 msgid "Templates list not saved"
 msgstr "Lista de plantillas no guardada"
 
-#: ../src/prefs_template.c:600
+#: ../src/prefs_template.c:603
 msgid "The templates list has been modified. Close anyway?"
 msgstr "La lista de plantillas ha sido modificada. ¿Cerrar igualmente?"
 
-#: ../src/prefs_template.c:761
+#: ../src/prefs_template.c:768
 msgid "The template's name is not set."
 msgstr "No se estableció el nombre de la plantilla."
 
-#: ../src/prefs_template.c:798
+#: ../src/prefs_template.c:811
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr ""
-"El campo «Desde» de la plantilla contiene una dirección de correo inválida"
+"El campo «Desde» de la plantilla contiene una dirección de correo inválida."
 
-#: ../src/prefs_template.c:804
+#: ../src/prefs_template.c:817
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr ""
-"El campo «Para» de la plantilla contiene una dirección de correo inválida"
+"El campo «Para» de la plantilla contiene una dirección de correo inválida."
 
-#: ../src/prefs_template.c:810
+#: ../src/prefs_template.c:823
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr ""
-"El campo «Cc» de la plantilla contiene una dirección de correo inválida"
+"El campo «Cc» de la plantilla contiene una dirección de correo inválida."
 
-#: ../src/prefs_template.c:816
+#: ../src/prefs_template.c:829
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr ""
-"El campo «Bcc» de la plantilla contiene una dirección de correo inválida"
+"El campo «Bcc» de la plantilla contiene una dirección de correo inválida."
+
+#: ../src/prefs_template.c:835
+msgid ""
+"The \"Reply-To\" field of the template contains an invalid email address."
+msgstr ""
+"El campo «Reply-To» de la plantilla contiene una dirección de correo inválida."
 
-#: ../src/prefs_template.c:822
+#: ../src/prefs_template.c:841
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "El campo «Asunto» de la plantilla no es válido."
 
-#: ../src/prefs_template.c:892
+#: ../src/prefs_template.c:912
 msgid "Delete template"
 msgstr "Borrar plantilla"
 
-#: ../src/prefs_template.c:893
+#: ../src/prefs_template.c:913
 msgid "Do you really want to delete this template?"
 msgstr "¿Quiere borrar realmente esta plantilla?"
 
-#: ../src/prefs_template.c:905
+#: ../src/prefs_template.c:925
 msgid "Delete all templates"
 msgstr "Borrar todas las plantillas"
 
-#: ../src/prefs_template.c:906
+#: ../src/prefs_template.c:926
 msgid "Do you really want to delete all the templates?"
 msgstr "¿Quiere borrar realmente todas las plantillas?"
 
-#: ../src/prefs_template.c:1221
+#: ../src/prefs_template.c:1241
 msgid "Current templates"
 msgstr "Plantillas actuales"
 
-#: ../src/prefs_template.c:1249
+#: ../src/prefs_template.c:1269
 msgid "Template"
 msgstr "Plantilla"
 
@@ -18506,12 +18756,12 @@ msgstr "El elemento no tiene un texto definido."
 
 #: ../src/prefs_toolbar.c:916
 msgid "Toolbar item"
-msgstr "Item de herramientas"
+msgstr "Ítem de herramientas"
 
 #. toolbar item type
 #: ../src/prefs_toolbar.c:932
 msgid "Item type"
-msgstr "Tipo de item"
+msgstr "Tipo de ítem"
 
 #: ../src/prefs_toolbar.c:942
 msgid "Internal Function"
@@ -18570,7 +18820,7 @@ msgstr "Evento mapeado"
 
 #: ../src/prefs_toolbar.c:1710
 msgid "Toolbar item icon"
-msgstr "Icono de item de herramientas"
+msgstr "Icono de ítem de herramientas"
 
 #: ../src/prefs_wrapping.c:80
 msgid "Auto wrapping"
@@ -18637,7 +18887,7 @@ msgstr "No hay información disponible"
 msgid "No recipient keys defined."
 msgstr "No se definió ninguna clave para el destinatario."
 
-#: ../src/procmime.c:430 ../src/procmime.c:432 ../src/procmime.c:433
+#: ../src/procmime.c:433 ../src/procmime.c:435 ../src/procmime.c:436
 msgid "[Error decoding BASE64]\n"
 msgstr "[Error decodificando BASE64]\n"
 
@@ -18822,7 +19072,7 @@ msgstr "<span style=\"oblique\">autocompletado</span> de la agenda: Para"
 
 #: ../src/quote_fmt.c:80
 msgid "literal backslash"
-msgstr "caracter \\"
+msgstr "carácter \\"
 
 #: ../src/quote_fmt.c:81
 msgid "literal question mark"
@@ -18951,7 +19201,7 @@ msgid ""
 msgstr ""
 "el autocompletado de la agenda sólo funciona con la primera\n"
 "dirección de cada cabecera, devuelve el nombre completo del\n"
-"contacto si la dirección coincide exáctamente con un contacto\n"
+"contacto si la dirección coincide exactamente con un contacto\n"
 "en la agenda"
 
 #: ../src/quote_fmt.c:109
@@ -18976,7 +19226,7 @@ msgstr ""
 
 #: ../src/quote_fmt.c:299
 msgid "Use template when replying to messages"
-msgstr "Usar plantilla al respoder a mensajes"
+msgstr "Usar plantilla al responder a mensajes"
 
 #: ../src/quote_fmt.c:323
 msgid "Override From header. This doesn't change the account used to reply."
@@ -19076,7 +19326,7 @@ msgstr "Enviando HELO..."
 #: ../src/send_message.c:485 ../src/send_message.c:490
 #: ../src/send_message.c:495
 msgid "Authenticating"
-msgstr "Autentificándose"
+msgstr "Autenticándose"
 
 #: ../src/send_message.c:486 ../src/send_message.c:491
 msgid "Sending message..."
@@ -19198,7 +19448,7 @@ msgstr "Buscando en %s...\n"
 
 #: ../src/summary_search.c:787
 msgid "Beginning of list reached; continue from end?"
-msgstr "Se llegó al principio de la lista, ¿siguir desde el final?"
+msgstr "Se llegó al principio de la lista, ¿seguir desde el final?"
 
 #: ../src/summary_search.c:789
 msgid "End of list reached; continue from beginning?"
@@ -19370,23 +19620,23 @@ msgstr ""
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d seleccionados (%s/%s), %d sin leer"
 
-#: ../src/summaryview.c:2979
+#: ../src/summaryview.c:2981
 msgid "Sorting summary..."
 msgstr "Ordenando el resumen..."
 
-#: ../src/summaryview.c:3118
+#: ../src/summaryview.c:3120
 msgid "Setting summary from message data..."
 msgstr "Estableciendo el resumen de los mensajes..."
 
-#: ../src/summaryview.c:3323
+#: ../src/summaryview.c:3325
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
-#: ../src/summaryview.c:3375
+#: ../src/summaryview.c:3377
 msgid "(No Recipient)"
 msgstr "(Sin destinatario)"
 
-#: ../src/summaryview.c:3410
+#: ../src/summaryview.c:3412
 #, c-format
 msgid ""
 "%s\n"
@@ -19395,7 +19645,7 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Desde: %s, en %s</span>"
 
-#: ../src/summaryview.c:3417
+#: ../src/summaryview.c:3419
 #, c-format
 msgid ""
 "%s\n"
@@ -19404,26 +19654,26 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Desde: %s, en %s</span>"
 
-#: ../src/summaryview.c:4294
+#: ../src/summaryview.c:4296
 msgid "You're not the author of the article.\n"
 msgstr "Usted no es el autor del artículo.\n"
 
-#: ../src/summaryview.c:4387
+#: ../src/summaryview.c:4389
 #, 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:4390
+#: ../src/summaryview.c:4392
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
-#: ../src/summaryview.c:4553
+#: ../src/summaryview.c:4555
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: ../src/summaryview.c:4652
+#: ../src/summaryview.c:4653
 msgid "Destination to copy is same as current folder."
 msgstr "El destino de copia es la carpeta actual."
 
@@ -19530,7 +19780,7 @@ msgstr "Cifrado"
 msgid "Has attachment(s)"
 msgstr "Tiene adjunto(s)"
 
-#: ../src/summaryview.c:7929
+#: ../src/summaryview.c:7932
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19539,11 +19789,11 @@ msgstr ""
 "Error en la expresión regular (regexp):\n"
 "%s"
 
-#: ../src/summaryview.c:8034
+#: ../src/summaryview.c:8037
 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:8039
+#: ../src/summaryview.c:8042
 msgid "Go back to the folder list"
 msgstr "Volver a la lista de carpetas"
 
@@ -19597,7 +19847,7 @@ msgstr ""
 "  No se puede mostrar este mensaje.\n"
 "  Probablemente sea debido a un error de red.\n"
 "\n"
-"  Utilize "
+"  Utilice "
 
 #: ../src/textview.c:910
 msgid "'Network Log'"
@@ -19655,7 +19905,7 @@ msgstr "central del ratón)\n"
 
 #: ../src/textview.c:1015
 msgid "     - Or use "
-msgstr "     - O utilize"
+msgstr "     - O utilice"
 
 #: ../src/textview.c:1016
 msgid "'Open with...'"
@@ -19672,11 +19922,11 @@ msgstr ""
 "    %s\n"
 "Código de salida %d\n"
 
-#: ../src/textview.c:2194
+#: ../src/textview.c:2173
 msgid "Tags: "
 msgstr "Etiquetas: "
 
-#: ../src/textview.c:2896
+#: ../src/textview.c:2875
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
@@ -19695,11 +19945,11 @@ msgstr ""
 "\n"
 "¿Abrirla de todas formas?"
 
-#: ../src/textview.c:2905
+#: ../src/textview.c:2884
 msgid "Phishing attempt warning"
 msgstr "Aviso de intento de «phishing»"
 
-#: ../src/textview.c:2906
+#: ../src/textview.c:2885
 msgid "_Open URL"
 msgstr "_Abrir URL"
 
@@ -20171,7 +20421,7 @@ msgstr "<span weight=\"bold\">Dirección del servidor SMTP:</span>"
 
 #: ../src/wizard.c:1110
 msgid "Use authentication"
-msgstr "Usar autentificación"
+msgstr "Usar autenticación"
 
 #: ../src/wizard.c:1118
 msgid "<span size=\"small\">(empty to use the same as receive)</span>"
diff --git a/po/fi.po b/po/fi.po
index 312dbf9..c45c4b2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -33,8 +33,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2014-06-13 03:15+0400\n"
-"PO-Revision-Date: 2014-05-20 04:01+0100\n"
+"POT-Creation-Date: 2014-10-13 09:04+0100\n"
+"PO-Revision-Date: 2014-10-15 03:20+0100\n"
 "Last-Translator: Flammie Pirinen <flammie at iki.fi>\n"
 "Language-Team: Finnish <laatu at lokalisointi.org>\n"
 "Language: fi\n"
@@ -43,37 +43,200 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../claws-mail.appdata.xml.in.h:1
-#, fuzzy
+#: ../claws-mail.desktop.in.h:1
+msgid "E-mail client"
+msgstr "Sähköpostisovellus"
+
+#: ../claws-mail.desktop.in.h:2
+msgid "Lightweight and Fast GTK+ based Mail Client"
+msgstr "Kevyt ja nopea GTK+-sähköpostisovellus"
+
+#: ../claws-mail.desktop.in.h:3
+msgid "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
+msgstr "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
+
+#: ../appdata/claws-mail.appdata.xml.in.h:1
 msgid "Claws Mail is a fast, powerful and very extensible email client."
-msgstr "Claws Mail on rekisteröity oletusohjelmaksi."
+msgstr "Claws Mail on nopea, tehokas ja laajennettava sähköpostiohjelma."
 
-#: ../claws-mail.appdata.xml.in.h:2
+#: ../appdata/claws-mail.appdata.xml.in.h:2
 msgid ""
 "It is highly configurable and handles hundreds of thousands of emails "
 "easily. Messages are managed in an open format, and are easy to interact "
 "with."
 msgstr ""
+"Säädettävä ja käsittelee tuhansittain sähköposteja. Viestit tallennetaan "
+"avoimessa muodossa jota on helppo käsitellä."
 
-#: ../claws-mail.appdata.xml.in.h:3
+#: ../appdata/claws-mail.appdata.xml.in.h:3
 msgid ""
 "Lots of extra functionality is provided by plugins, such as PGP signatures "
 "and encryption, an RSS aggregator, a calendar, powerful spam filtering, Perl "
 "and Python interactions, HTML and PDF rendering, and more."
 msgstr ""
+"Iso osa toiminallisuudesta tulee liitännäisistä. Tämä sisältää "
+"PGP-allekirjoitukset, RSS-lukimen, kalenerin, spämmin suodatuksen, Perl-, "
+"ja Python-tuet, HTML- ja PDF-näytön ja niin edelleen."
 
-#: ../claws-mail.desktop.in.h:1
-msgid "E-mail client"
+#: ../appdata/claws-mail-acpi_notifier.metainfo.xml.in.h:1
+msgid "Enables mail notification via LEDs on some laptops"
+msgstr "Mahdollistaa ledien käytön sähköpostin saapumisilmoituksissa"
+
+#: ../appdata/claws-mail-address_keeper.metainfo.xml.in.h:1
+msgid ""
+"Allows saving outgoing addresses to a designated folder in the address book"
+msgstr "Mahdollistaa osoitteiden tallentamisen lähetyksistä"
+
+#: ../appdata/claws-mail-archive.metainfo.xml.in.h:1
+msgid "Allows to make tars or zips of old folders"
+msgstr "Tekee tar- ja zip-tiedostoja vanhoista hakemistoista"
+
+#: ../appdata/claws-mail-att_remover.metainfo.xml.in.h:1
+msgid "Lets you remove attachments from emails"
+msgstr "Poistaa liitteitä sähköposteista"
+
+#: ../appdata/claws-mail-attachwarner.metainfo.xml.in.h:1
+msgid ""
+"Warns when a message mentioning an attachment in the message body without "
+"attaching any files"
 msgstr ""
+"Varoittaa jos viestissä mainitaan liitteet muttei liitteitä ole liitetty."
 
-#: ../claws-mail.desktop.in.h:2
-msgid "Lightweight and Fast GTK+ based Mail Client"
+#: ../appdata/claws-mail-bogofilter.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using Bogofilter"
+msgstr ""
+"Mahdollistaa tulevan postin skannauksen Bogofilterillä"
+
+#: ../appdata/claws-mail-bsfilter.metainfo.xml.in.h:1
+msgid ""
+"Check all messages that are received from an IMAP, LOCAL or POP account for "
+"spam using Bsfilter"
+msgstr ""
+"Tarkistaa viestit Bsfilterillä"
+
+#: ../appdata/claws-mail-clamd.metainfo.xml.in.h:1
+msgid ""
+"Scans all messages that are received from an IMAP, LOCAL or POP account "
+"using clamd (Clam AV)"
+msgstr ""
+"Skannaa saapuvat viestit clamd:llä"
+
+#: ../appdata/claws-mail-fancy.metainfo.xml.in.h:1
+msgid "Renders HTML e-mail using the WebKit library"
+msgstr "Näyttää HTML-viestit Webkitin avulla"
+
+#: ../appdata/claws-mail-fetchinfo.metainfo.xml.in.h:1
+msgid ""
+"Inserts headers containing: UIDL, Claws' account name, POP server, user ID "
+"and retrieval time"
+msgstr ""
+"Lisää otsakkeita kuten: UIDL:n, Claws-tilin nimen, POP-palvelimen, "
+"Käyttäjätunnuksen ja hakuajan"
+
+#: ../appdata/claws-mail-gdata.metainfo.xml.in.h:1
+msgid "Provides an interface to Google services"
+msgstr "Tarjoaa rajapinnan Googlen palveluihin"
+
+#: ../appdata/claws-mail-geolocation.metainfo.xml.in.h:1
+msgid "Provides GeoLocation functionality"
+msgstr "Tarjoaa rajapinnan GeoLocationiin"
+
+#: ../appdata/claws-mail-libravatar.metainfo.xml.in.h:1
+msgid ""
+"Displays libravatar/gravatar profiles' images or a dynamically generated or "
+"predefined alternative"
+msgstr ""
+"Näyttä libravatar- tai gravatar-kuvia tai dynaamisesti generoituja "
+"vaihtoehtoja"
+
+#: ../appdata/claws-mail-mailmbox.metainfo.xml.in.h:1
+msgid "Direct support for mailboxes in mbox format"
+msgstr "Tuki mbox-muotoisille viestikansioille"
+
+#: ../appdata/claws-mail-newmail.metainfo.xml.in.h:1
+msgid ""
+"Writes a msg header summary to a log file on arrival of new mail after "
+"sorting"
+msgstr ""
+"Kirjoittaa otsakkeista yhteenvedon lokiin viestin saavuttua järjestelyn "
+"jälkeen"
+
+#: ../appdata/claws-mail-notification.metainfo.xml.in.h:1
+msgid "Provides various ways to notify the user of new and unread email"
+msgstr "Tarjoaa eri tapoja ilmoittaa saapuneesta ja lukemattomasta "
+"viestistä"
+
+#: ../appdata/claws-mail-pdf_viewer.metainfo.xml.in.h:1
+msgid ""
+"Enables the viewing of PDF and PostScript attachments using the Poppler "
+"library and GhostScript"
+msgstr ""
+"Mahdollistaa PDF:ien ja PostScriptien katselun Poppler‐kirjaston "
+"ja GhostScriptin kanssa."
+
+#: ../appdata/claws-mail-perl.metainfo.xml.in.h:1
+msgid "Allowing the use of full Perl power in email filters"
+msgstr "Mahdollistaa Perlin käutöm suodattimissa"
+
+#: ../appdata/claws-mail-pgpcore.metainfo.xml.in.h:1
+msgid ""
+"Handles core PGP functions and is a dependency of both the PGP/Inline and "
+"PGP/MIME plugins."
+msgstr ""
+"Hoitaa PGP:n ydintoiminnot ja on PGP/Inlinen ja PGP/MIMEn riippuvuus"
+
+#: ../appdata/claws-mail-pgpinline.metainfo.xml.in.h:1
+msgid "Handles PGP/Inline signed and/or encrypted mails"
+msgstr "Hoitaa PGP/Inline-allekirjoitukset ja -salaukset"
+
+#: ../appdata/claws-mail-pgpmime.metainfo.xml.in.h:1
+msgid "Handles PGP/MIME signed and/or encrypted mails"
+msgstr "Hoitaa PGP/MIME-allekirjoitukset ja -salaukset"
+
+#: ../appdata/claws-mail-python.metainfo.xml.in.h:1
+msgid ""
+"Offers a Python scripting. Code can be entered into an embedded Python "
+"console or stored"
+msgstr ""
+"Mahdollistaa Python-skriptauksen. Pythonia voi käyttää konsolilta tai "
+"tiedostoista"
+
+#: ../appdata/claws-mail-rssyl.metainfo.xml.in.h:1
+msgid "Read your RSS favourite newsfeeds"
+msgstr "Lukee RSS-syötteitä"
+
+#: ../appdata/claws-mail-smime.metainfo.xml.in.h:1
+msgid "Handles S/MIME signed and/or encrypted mails"
+msgstr "Käsittelee S/MIME-allekirjoitukset ja -salaukset"
+
+#: ../appdata/claws-mail-spam_report.metainfo.xml.in.h:1
+msgid "Reports spam to various places"
+msgstr "Lähettää spämmit paikkoihin"
+
+#: ../appdata/claws-mail-spamassassin.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using SpamAssassin"
 msgstr ""
+"Mahdollistaa tulevien viestien skannauksen SpamAssassinilla"
+
+#: ../appdata/claws-mail-tnef_parse.metainfo.xml.in.h:1
+msgid "Enables reading application/ms-tnef attachments"
+msgstr "Mahdollistaa application/ms-tnef-liitteiden luvun"
+
+#: ../appdata/claws-mail-vcalendar.metainfo.xml.in.h:1
+msgid ""
+"Enables vCalendar message handling and handles webCal subscriptions. "
+"Provides a calendar import"
+msgstr "Mahdollistaa vCalendar-viestien käsittelyn ja hoitaa "
+"webCal-tilaukset. Mahdollistaa kalenterin tuonnin"
 
-#: ../src/account.c:392
+#: ../src/account.c:392 ../src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
+"Please close all the composing windows before editing accounts."
 msgstr ""
 "Viestinmuokkausikkunoita on vielä auki.\n"
 "Ne pitää sulkea ennen kuin tilejä voidaan muokata."
@@ -82,11 +245,11 @@ msgstr ""
 msgid "Can't create folder."
 msgstr "Kansiota ei voi luoda."
 
-#: ../src/account.c:717
+#: ../src/account.c:724
 msgid "Edit accounts"
 msgstr "Muokkaa tilejä"
 
-#: ../src/account.c:734
+#: ../src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -95,44 +258,44 @@ msgstr ""
 "Hae viestit hakee järjestyksessä viestit tileiltä. Rastiruutu kertoo "
 "haettavat tilit ja lihavoitu teksti oletustilin."
 
-#: ../src/account.c:805
+#: ../src/account.c:812
 msgid " _Set as default account "
 msgstr " _Valitse oletustiliksi "
 
-#: ../src/account.c:897
+#: ../src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Tilejä, joissa on etäkansioita, ei voi kopioida."
 
 #. copy fields
-#: ../src/account.c:904
+#: ../src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Kentän %s kopio"
 
-#: ../src/account.c:1064
+#: ../src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Poistetaanko tili %s?"
 
-#: ../src/account.c:1066
+#: ../src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Nimetön)"
 
-#: ../src/account.c:1067
+#: ../src/account.c:1074
 msgid "Delete account"
 msgstr "Poista tili"
 
-#: ../src/account.c:1537
+#: ../src/account.c:1544
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "H"
 
-#: ../src/account.c:1543
+#: ../src/account.c:1550
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "Hae viestit hakee viestit merkityiltä tileiltä"
 
-#: ../src/account.c:1550 ../src/addrduplicates.c:471 ../src/addressadd.c:215
-#: ../src/addressbook.c:125 ../src/compose.c:7144 ../src/editaddress.c:1263
+#: ../src/account.c:1557 ../src/addrduplicates.c:471 ../src/addressadd.c:215
+#: ../src/addressbook.c:125 ../src/compose.c:7148 ../src/editaddress.c:1263
 #: ../src/editaddress.c:1320 ../src/editaddress.c:1340
 #: ../src/editaddress_other_attributes_ldap.c:302
 #: ../src/editaddress_other_attributes_ldap.c:350 ../src/editbook.c:170
@@ -140,16 +303,16 @@ msgstr "Hae viestit hakee viestit merkityiltä tileiltä"
 #: ../src/editvcard.c:173 ../src/importmutt.c:223 ../src/importpine.c:222
 #: ../src/mimeview.c:275 ../src/plugins/pdf_viewer/poppler_viewer.c:1797
 #: ../src/plugins/pgpcore/select-keys.c:396 ../src/prefs_filtering.c:384
-#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:78
+#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:79
 msgid "Name"
 msgstr "Nimi"
 
-#: ../src/account.c:1558 ../src/prefs_account.c:1103
+#: ../src/account.c:1565 ../src/prefs_account.c:1103
 #: ../src/prefs_account.c:4058
 msgid "Protocol"
 msgstr "Käytäntö"
 
-#: ../src/account.c:1566 ../src/ssl_manager.c:102
+#: ../src/account.c:1573 ../src/ssl_manager.c:102
 msgid "Server"
 msgstr "Palvelin"
 
@@ -200,8 +363,8 @@ msgstr ""
 "%s"
 
 #: ../src/action.c:990 ../src/ldaputil.c:326
-#: ../src/plugins/bogofilter/bogofilter.c:876 ../src/plugins/rssyl/feed.c:1739
-#: ../src/plugins/rssyl/feed.c:1743 ../src/plugins/tnef_parse/tnef_parse.c:67
+#: ../src/plugins/bogofilter/bogofilter.c:876
+#: ../src/plugins/tnef_parse/tnef_parse.c:67
 #: ../src/plugins/vcalendar/vcal_folder.c:1803
 #: ../src/plugins/vcalendar/vcal_folder.c:1807
 #: ../src/plugins/vcalendar/vcal_folder.c:1818
@@ -258,22 +421,19 @@ msgid "Action's user argument"
 msgstr "Toiminnon käyttäjäparametri"
 
 #: ../src/addrclip.c:479
-#, fuzzy
 msgid "Cannot copy a folder to itself or to its sub-structure."
-msgstr "Ei voida kopioida hakemistoa lapsekseen."
+msgstr "Ei voida kopioida hakemistoa lapsekseen tai sen aliosaan."
 
 #: ../src/addrclip.c:502
-#, fuzzy
 msgid "Cannot copy an address book to itself."
-msgstr "Liittäminen ei onnistu: kohdeosoitekirja on kirjoitussuojattu."
+msgstr "Ei voida kopioida osoitekirjaa itsekseen."
 
 #: ../src/addrclip.c:593
-#, fuzzy
 msgid "Cannot move a folder to itself or to its sub-structure."
-msgstr "Ei voida siirtää hakemistoa lapsekseen."
+msgstr "Ei voida siirtää hakemistoa lapsekseen tai aliosaan."
 
 #. that's a group
-#: ../src/addr_compl.c:620 ../src/addressbook.c:4866
+#: ../src/addr_compl.c:685 ../src/addressbook.c:4866
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "Ryhmä"
@@ -346,14 +506,14 @@ msgstr "Korvataanko kaikki attribuutit oletuksilla?"
 
 #: ../src/addrcustomattr.c:212 ../src/addressbook.c:435
 #: ../src/addressbook.c:463 ../src/addressbook.c:480 ../src/edittags.c:272
-#: ../src/plugins/archive/archiver_gtk.c:1193 ../src/prefs_actions.c:1090
-#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1099
+#: ../src/plugins/archive/archiver_gtk.c:1194 ../src/prefs_actions.c:1090
+#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1119
 msgid "_Delete"
 msgstr "_Poista"
 
 #: ../src/addrcustomattr.c:213 ../src/edittags.c:273
 #: ../src/prefs_actions.c:1091 ../src/prefs_filtering.c:1694
-#: ../src/prefs_template.c:1100
+#: ../src/prefs_template.c:1120
 msgid "Delete _all"
 msgstr "Poist_a kaikki"
 
@@ -451,7 +611,7 @@ msgid "Select Address Book Folder"
 msgstr "Valitse osoitekirjan hakemisto"
 
 #: ../src/addressadd.c:485 ../src/editaddress.c:1582 ../src/headerview.c:281
-#: ../src/textview.c:2064
+#: ../src/textview.c:2043
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -482,17 +642,17 @@ msgstr "_Osoitekirja"
 
 #. {"Address/---",			NULL, "---", NULL, NULL, NULL },
 #: ../src/addressbook.c:403 ../src/addressbook.c:434 ../src/addressbook.c:462
-#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:504
+#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:506
 #: ../src/messageview.c:210
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:507
+#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:509
 #: ../src/messageview.c:213
 msgid "_Tools"
 msgstr "_Työkalut"
 
-#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:509
+#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:511
 #: ../src/messageview.c:214
 msgid "_Help"
 msgstr "O_hje"
@@ -550,7 +710,7 @@ msgstr "_Leikkaa"
 
 #. Edit menu
 #: ../src/addressbook.c:431 ../src/addressbook.c:470 ../src/addressbook.c:486
-#: ../src/compose.c:610 ../src/mainwindow.c:538 ../src/messageview.c:226
+#: ../src/compose.c:610 ../src/mainwindow.c:540 ../src/messageview.c:226
 msgid "_Copy"
 msgstr "_Kopioi"
 
@@ -606,7 +766,7 @@ msgid "Edit custom attributes..."
 msgstr "Muokkaa attribuutteja…"
 
 #. Help menu
-#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:801
+#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:803
 #: ../src/messageview.c:339
 msgid "_About"
 msgstr "_Tietoja"
@@ -616,9 +776,10 @@ msgid "_Browse Entry"
 msgstr "_Selaa osoitteita"
 
 #. then add the appointment
-#: ../src/addressbook.c:504 ../src/crash.c:454 ../src/crash.c:473
+#: ../src/addressbook.c:504 ../src/crash.c:457 ../src/crash.c:476
 #: ../src/importldif.c:115 ../src/plugins/pgpcore/select-keys.c:251
-#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/vcalendar/day-view.c:402
+#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/pgpcore/sgpgme.c:168
+#: ../src/plugins/vcalendar/day-view.c:402
 #: ../src/plugins/vcalendar/month-view.c:428 ../src/prefs_themes.c:707
 #: ../src/prefs_themes.c:739 ../src/prefs_themes.c:740
 msgid "Unknown"
@@ -724,7 +885,7 @@ msgstr "Vahvempi todennus vaaditaan"
 msgid "Sources"
 msgstr "Lähteet"
 
-#: ../src/addressbook.c:914 ../src/prefs_matcher.c:629
+#: ../src/addressbook.c:914 ../src/prefs_matcher.c:632
 #: ../src/prefs_other.c:475 ../src/toolbar.c:225 ../src/toolbar.c:2142
 msgid "Address book"
 msgstr "Osoitekirja"
@@ -775,7 +936,7 @@ msgstr ""
 
 #: ../src/addressbook.c:2921 ../src/imap_gtk.c:363 ../src/mh_gtk.c:202
 #: ../src/plugins/mailmbox/plugin_gtk.c:324
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:236
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:152
 #: ../src/plugins/vcalendar/vcal_folder.c:1966
 msgid "Delete folder"
 msgstr "Poista kansio"
@@ -939,10 +1100,10 @@ msgstr "LDAP-haku"
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:443
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:490
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:613
-#: ../src/prefs_matcher.c:672 ../src/prefs_matcher.c:707
-#: ../src/prefs_matcher.c:1607 ../src/prefs_matcher.c:1614
-#: ../src/prefs_matcher.c:1622 ../src/prefs_matcher.c:1624
-#: ../src/prefs_matcher.c:2504 ../src/prefs_matcher.c:2508
+#: ../src/prefs_matcher.c:675 ../src/prefs_matcher.c:710
+#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:1626
+#: ../src/prefs_matcher.c:1634 ../src/prefs_matcher.c:1636
+#: ../src/prefs_matcher.c:2524 ../src/prefs_matcher.c:2528
 msgid "Any"
 msgstr "Mikä tahansa"
 
@@ -1046,21 +1207,21 @@ msgstr "Osoitteiden päivitys"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Päivitys epäonnistui. Muutoksia ei kirjoitettu hakemistoon."
 
-#: ../src/alertpanel.c:146 ../src/compose.c:9293
+#: ../src/alertpanel.c:146 ../src/compose.c:9324
 msgid "Notice"
 msgstr "Huomautus"
 
 #: ../src/alertpanel.c:159 ../src/compose.c:5656 ../src/compose.c:6133
-#: ../src/compose.c:11662 ../src/file_checker.c:78 ../src/file_checker.c:100
+#: ../src/compose.c:11670 ../src/file_checker.c:78 ../src/file_checker.c:100
 #: ../src/messageview.c:853 ../src/messageview.c:866
-#: ../src/plugins/pgpcore/sgpgme.c:719
+#: ../src/plugins/pgpcore/sgpgme.c:717
 #: ../src/plugins/vcalendar/vcalendar.c:125 ../src/summaryview.c:4863
 msgid "Warning"
 msgstr "Varoitus"
 
 #: ../src/alertpanel.c:172 ../src/alertpanel.c:195 ../src/compose.c:5597
 #: ../src/inc.c:669 ../src/plugins/pgpcore/sgpgme.c:152
-#: ../src/plugins/pgpcore/sgpgme.c:249
+#: ../src/plugins/pgpcore/sgpgme.c:253
 msgid "Error"
 msgstr "Virhe"
 
@@ -1072,12 +1233,7 @@ msgstr "_Katsele lokia"
 msgid "Show this message next time"
 msgstr "Näytä tämä viesti ensi kerralla"
 
-#: ../src/avatars.c:97
-msgid "Internal avatars rendering already initialized"
-msgstr ""
-
 #: ../src/avatars.c:102
-#, fuzzy
 msgid "Failed to register avatars internal rendering hook"
 msgstr "Avatarnäytinkoukun rekisteröinti epäonnistui"
 
@@ -1181,7 +1337,7 @@ msgstr "Claws Mail on liian vanha liitännäiselle %s"
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Claws Mail on liian vanha liitännäiselle"
 
-#: ../src/common/session.c:177 ../src/imap.c:1171
+#: ../src/common/session.c:177 ../src/imap.c:1177
 msgid "SSL handshake failed\n"
 msgstr "SSL-kättely epäonnistui\n"
 
@@ -1357,212 +1513,212 @@ msgstr "%d,%02d Mt"
 msgid "%.2fGB"
 msgstr "%.2f Gt"
 
-#: ../src/common/utils.c:4967
+#: ../src/common/utils.c:5000
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "sunnuntai"
 
-#: ../src/common/utils.c:4968
+#: ../src/common/utils.c:5001
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "maanantai"
 
-#: ../src/common/utils.c:4969
+#: ../src/common/utils.c:5002
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "tiistai"
 
-#: ../src/common/utils.c:4970
+#: ../src/common/utils.c:5003
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "keskiviikko"
 
-#: ../src/common/utils.c:4971
+#: ../src/common/utils.c:5004
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "torstai"
 
-#: ../src/common/utils.c:4972
+#: ../src/common/utils.c:5005
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "perjantai"
 
-#: ../src/common/utils.c:4973
+#: ../src/common/utils.c:5006
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "lauantai"
 
-#: ../src/common/utils.c:4975
+#: ../src/common/utils.c:5008
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "tammikuu"
 
-#: ../src/common/utils.c:4976
+#: ../src/common/utils.c:5009
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "helmikuu"
 
-#: ../src/common/utils.c:4977
+#: ../src/common/utils.c:5010
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "maaliskuu"
 
-#: ../src/common/utils.c:4978
+#: ../src/common/utils.c:5011
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "huhtikuu"
 
-#: ../src/common/utils.c:4979
+#: ../src/common/utils.c:5012
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "toukokuu"
 
-#: ../src/common/utils.c:4980
+#: ../src/common/utils.c:5013
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "kesäkuu"
 
-#: ../src/common/utils.c:4981
+#: ../src/common/utils.c:5014
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "heinäkuu"
 
-#: ../src/common/utils.c:4982
+#: ../src/common/utils.c:5015
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "elokuu"
 
-#: ../src/common/utils.c:4983
+#: ../src/common/utils.c:5016
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "syyskuu"
 
-#: ../src/common/utils.c:4984
+#: ../src/common/utils.c:5017
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "lokakuu"
 
-#: ../src/common/utils.c:4985
+#: ../src/common/utils.c:5018
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "marraskuu"
 
-#: ../src/common/utils.c:4986
+#: ../src/common/utils.c:5019
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "joulukuu"
 
-#: ../src/common/utils.c:4988
+#: ../src/common/utils.c:5021
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "su"
 
-#: ../src/common/utils.c:4989
+#: ../src/common/utils.c:5022
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "ma"
 
-#: ../src/common/utils.c:4990
+#: ../src/common/utils.c:5023
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "ti"
 
-#: ../src/common/utils.c:4991
+#: ../src/common/utils.c:5024
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "ke"
 
-#: ../src/common/utils.c:4992
+#: ../src/common/utils.c:5025
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "to"
 
-#: ../src/common/utils.c:4993
+#: ../src/common/utils.c:5026
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "pe"
 
-#: ../src/common/utils.c:4994
+#: ../src/common/utils.c:5027
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "la"
 
-#: ../src/common/utils.c:4996
+#: ../src/common/utils.c:5029
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "tammi"
 
-#: ../src/common/utils.c:4997
+#: ../src/common/utils.c:5030
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "helmi"
 
-#: ../src/common/utils.c:4998
+#: ../src/common/utils.c:5031
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "maalis"
 
-#: ../src/common/utils.c:4999
+#: ../src/common/utils.c:5032
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "huhti"
 
-#: ../src/common/utils.c:5000
+#: ../src/common/utils.c:5033
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "touko"
 
-#: ../src/common/utils.c:5001
+#: ../src/common/utils.c:5034
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "kesä"
 
-#: ../src/common/utils.c:5002
+#: ../src/common/utils.c:5035
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "heinä"
 
-#: ../src/common/utils.c:5003
+#: ../src/common/utils.c:5036
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "elo"
 
-#: ../src/common/utils.c:5004
+#: ../src/common/utils.c:5037
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "syys"
 
-#: ../src/common/utils.c:5005
+#: ../src/common/utils.c:5038
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "loka"
 
-#: ../src/common/utils.c:5006
+#: ../src/common/utils.c:5039
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "marras"
 
-#: ../src/common/utils.c:5007
+#: ../src/common/utils.c:5040
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "joulu"
 
-#: ../src/common/utils.c:5018
+#: ../src/common/utils.c:5051
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "Ap."
 
-#: ../src/common/utils.c:5019
+#: ../src/common/utils.c:5052
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "Ip."
 
-#: ../src/common/utils.c:5020
+#: ../src/common/utils.c:5053
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "ap."
 
-#: ../src/common/utils.c:5021
+#: ../src/common/utils.c:5054
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "ip."
@@ -1573,7 +1729,7 @@ msgstr "_Lisää…"
 
 #: ../src/compose.c:571 ../src/mh_gtk.c:361
 #: ../src/plugins/mailmbox/plugin_gtk.c:293
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:140
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:307
 msgid "_Remove"
 msgstr "_Poista"
 
@@ -1582,7 +1738,7 @@ msgid "_Properties..."
 msgstr "_Asetukset"
 
 #. menus
-#: ../src/compose.c:580 ../src/mainwindow.c:506 ../src/messageview.c:212
+#: ../src/compose.c:580 ../src/mainwindow.c:508 ../src/messageview.c:212
 msgid "_Message"
 msgstr "_Viesti"
 
@@ -1654,7 +1810,7 @@ msgstr "_rivitettynä"
 msgid "_Unwrapped"
 msgstr "_rivittämättä"
 
-#: ../src/compose.c:618 ../src/mainwindow.c:539
+#: ../src/compose.c:618 ../src/mainwindow.c:541
 msgid "Select _all"
 msgstr "Valitse _kaikki"
 
@@ -1786,48 +1942,48 @@ msgstr "_Tärkeysarvo"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
 #. {"View/Scroll/---",          NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:666 ../src/mainwindow.c:603 ../src/messageview.c:265
+#: ../src/compose.c:666 ../src/mainwindow.c:605 ../src/messageview.c:265
 msgid "Character _encoding"
 msgstr "_Merkistökoodaus"
 
-#: ../src/compose.c:671 ../src/mainwindow.c:608 ../src/messageview.c:270
+#: ../src/compose.c:671 ../src/mainwindow.c:610 ../src/messageview.c:270
 msgid "Western European"
 msgstr "Länsieurooppalainen"
 
-#: ../src/compose.c:672 ../src/mainwindow.c:609 ../src/messageview.c:271
+#: ../src/compose.c:672 ../src/mainwindow.c:611 ../src/messageview.c:271
 msgid "Baltic"
 msgstr "Balttilainen"
 
-#: ../src/compose.c:673 ../src/mainwindow.c:610 ../src/messageview.c:272
+#: ../src/compose.c:673 ../src/mainwindow.c:612 ../src/messageview.c:272
 msgid "Hebrew"
 msgstr "Heprealainen"
 
-#: ../src/compose.c:674 ../src/mainwindow.c:611 ../src/messageview.c:273
+#: ../src/compose.c:674 ../src/mainwindow.c:613 ../src/messageview.c:273
 msgid "Arabic"
 msgstr "Arabialainen"
 
-#: ../src/compose.c:675 ../src/mainwindow.c:612 ../src/messageview.c:274
+#: ../src/compose.c:675 ../src/mainwindow.c:614 ../src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Kyrillinen"
 
-#: ../src/compose.c:676 ../src/mainwindow.c:613 ../src/messageview.c:275
+#: ../src/compose.c:676 ../src/mainwindow.c:615 ../src/messageview.c:275
 msgid "Japanese"
 msgstr "Japanilainen"
 
-#: ../src/compose.c:677 ../src/mainwindow.c:614 ../src/messageview.c:276
+#: ../src/compose.c:677 ../src/mainwindow.c:616 ../src/messageview.c:276
 msgid "Chinese"
 msgstr "Kiinalainen"
 
-#: ../src/compose.c:678 ../src/mainwindow.c:615 ../src/messageview.c:277
+#: ../src/compose.c:678 ../src/mainwindow.c:617 ../src/messageview.c:277
 msgid "Korean"
 msgstr "Korealainen"
 
-#: ../src/compose.c:679 ../src/mainwindow.c:616 ../src/messageview.c:278
+#: ../src/compose.c:679 ../src/mainwindow.c:618 ../src/messageview.c:278
 msgid "Thai"
 msgstr "Thailainen"
 
 #. Tools menu
-#: ../src/compose.c:682 ../src/mainwindow.c:723 ../src/messageview.c:314
+#: ../src/compose.c:682 ../src/mainwindow.c:725 ../src/messageview.c:314
 msgid "_Address book"
 msgstr "_Osoitekirja"
 
@@ -1836,7 +1992,7 @@ msgid "_Template"
 msgstr "_Malline"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:686 ../src/mainwindow.c:751 ../src/messageview.c:335
+#: ../src/compose.c:686 ../src/mainwindow.c:753 ../src/messageview.c:335
 msgid "Actio_ns"
 msgstr "_Toiminnot"
 
@@ -1880,13 +2036,13 @@ msgid "_Normal"
 msgstr "_Normaali"
 
 #. RADIO compose_reply_change_mode_cb
-#: ../src/compose.c:707 ../src/mainwindow.c:657 ../src/messageview.c:303
+#: ../src/compose.c:707 ../src/mainwindow.c:659 ../src/messageview.c:303
 msgid "_All"
 msgstr "_Kaikille"
 
 #. RADIO compose_reply_change_mode_cb
 #. COMPOSE_REPLY_TO_ALL
-#: ../src/compose.c:708 ../src/mainwindow.c:658 ../src/messageview.c:304
+#: ../src/compose.c:708 ../src/mainwindow.c:660 ../src/messageview.c:304
 msgid "_Sender"
 msgstr "_Välittäjä"
 
@@ -1914,19 +2070,19 @@ msgstr "_Matala"
 msgid "_Lowest"
 msgstr "Mata_lin"
 
-#: ../src/compose.c:723 ../src/mainwindow.c:865 ../src/messageview.c:352
+#: ../src/compose.c:723 ../src/mainwindow.c:868 ../src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automaattinen"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:724 ../src/mainwindow.c:866 ../src/messageview.c:353
+#: ../src/compose.c:724 ../src/mainwindow.c:869 ../src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7‐bittinen ASCII (US‐ASC_II)"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:725 ../src/mainwindow.c:867 ../src/messageview.c:354
+#: ../src/compose.c:725 ../src/mainwindow.c:870 ../src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF‐8)"
 
@@ -1938,7 +2094,7 @@ msgstr "Unicode (_UTF‐8)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:729 ../src/mainwindow.c:871 ../src/messageview.c:358
+#: ../src/compose.c:729 ../src/mainwindow.c:874 ../src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Keskieurooppalainen (ISO‐8859‐_2)"
 
@@ -1948,7 +2104,7 @@ msgstr "Keskieurooppalainen (ISO‐8859‐_2)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:732 ../src/mainwindow.c:874 ../src/messageview.c:361
+#: ../src/compose.c:732 ../src/mainwindow.c:877 ../src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Kreikkalainen (ISO‐8859‐_7)"
 
@@ -1962,7 +2118,7 @@ msgstr "Kreikkalainen (ISO‐8859‐_7)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:737 ../src/mainwindow.c:879 ../src/messageview.c:366
+#: ../src/compose.c:737 ../src/mainwindow.c:882 ../src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turkkilainen (ISO‐8859‐_9)"
 
@@ -2014,33 +2170,33 @@ msgstr "Ed: useita sähköposteja"
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Uudelleenohjaus-mallineen sisällön muodon virhe rivillä %d."
 
-#: ../src/compose.c:2591 ../src/gtk/headers.h:13
+#: ../src/compose.c:2591 ../src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kopio:"
 
-#: ../src/compose.c:2594 ../src/gtk/headers.h:14
+#: ../src/compose.c:2594 ../src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Piilokopio:"
 
-#: ../src/compose.c:2597 ../src/gtk/headers.h:11
+#: ../src/compose.c:2597 ../src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 
 #: ../src/compose.c:2600 ../src/compose.c:4911 ../src/compose.c:4913
-#: ../src/gtk/headers.h:32
+#: ../src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Uutisryhmät:"
 
-#: ../src/compose.c:2603 ../src/gtk/headers.h:33
+#: ../src/compose.c:2603 ../src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Keskustelunsiirto:"
 
-#: ../src/compose.c:2606 ../src/gtk/headers.h:16
+#: ../src/compose.c:2606 ../src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Vastauksena viestiin:"
 
 #: ../src/compose.c:2610 ../src/compose.c:4908 ../src/compose.c:4916
-#: ../src/gtk/headers.h:12 ../src/summary_search.c:433
+#: ../src/gtk/headers.h:13 ../src/summary_search.c:433
 msgid "To:"
 msgstr "Vastaanottaja:"
 
@@ -2084,7 +2240,7 @@ msgstr "Olet lisäämässä tiedostoa %s viestiin. Jatketaanko?"
 msgid "Are you sure?"
 msgstr "Toteutetaanko?"
 
-#: ../src/compose.c:3603 ../src/compose.c:11144
+#: ../src/compose.c:3603 ../src/compose.c:11152
 msgid "+_Insert"
 msgstr "_Sisällytä"
 
@@ -2111,17 +2267,17 @@ msgstr "Tiedostoa %s ei voitu lukea."
 msgid "Message: %s"
 msgstr "Viesti: %s"
 
-#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:432
+#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Muokattu]"
 
 # "sylpheed-claws - Muokataan viestiä (MUOKATTU)"
-#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:435
+#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s — Muokataan viestiä%s"
 
-#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:438
+#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[ei aihetta] — Muokataan viestiä%s"
@@ -2130,7 +2286,7 @@ msgstr "[ei aihetta] — Muokataan viestiä%s"
 #. * This partly duplicates functionality in compose.c::compose_set_title().
 #. * While it's nice to not have to modify Claws Mail for this to work,
 #. * it would be cleaner to export that function in Claws Mail.
-#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:426
+#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Muokkaa viestiä"
 
@@ -2186,7 +2342,7 @@ msgstr "Lisätäänkö jonoon?"
 msgid "Send later"
 msgstr "Lähetä myöhemmin"
 
-#: ../src/compose.c:5134 ../src/compose.c:9719
+#: ../src/compose.c:5134 ../src/compose.c:9750
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2196,7 +2352,7 @@ msgstr ""
 "\n"
 "Merkistön muunnos epäonnistui."
 
-#: ../src/compose.c:5137 ../src/compose.c:9722
+#: ../src/compose.c:5137 ../src/compose.c:9753
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2206,7 +2362,7 @@ msgstr ""
 "\n"
 "Vastaanottajan salausavainta ei saatu."
 
-#: ../src/compose.c:5143 ../src/compose.c:9716
+#: ../src/compose.c:5143 ../src/compose.c:9747
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2295,7 +2451,7 @@ msgstr "Tili ei ole NNTP:lle joten lähetys ei onnistu."
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Liitetiedostoa %s ei enää ole, ohitetaanko?"
 
-#: ../src/compose.c:6133 ../src/mainwindow.c:648 ../src/toolbar.c:231
+#: ../src/compose.c:6133 ../src/mainwindow.c:650 ../src/toolbar.c:231
 #: ../src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Peruuta lähetys"
@@ -2313,34 +2469,34 @@ msgstr "Alkuperäinen osa %s"
 msgid "Add to address _book"
 msgstr "Lisää osoitekirj_aan"
 
-#: ../src/compose.c:6908
+#: ../src/compose.c:6912
 msgid "Delete entry contents"
 msgstr "Poista kohteen sisältö"
 
-#: ../src/compose.c:6912 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: ../src/compose.c:6916 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Käytä tabulaattoria automaattiseen täydennykseen osoitekirjasta"
 
-#: ../src/compose.c:7132
+#: ../src/compose.c:7136
 msgid "Mime type"
 msgstr "MIME-tyyppi"
 
 #. S_COL_DATE
-#: ../src/compose.c:7138 ../src/mimeview.c:274
-#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:627
+#: ../src/compose.c:7142 ../src/mimeview.c:274
+#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:630
 #: ../src/prefs_summary_column.c:85 ../src/summaryview.c:445
 msgid "Size"
 msgstr "Koko"
 
 #. Save Message to folder
-#: ../src/compose.c:7201
+#: ../src/compose.c:7205
 msgid "Save Message to "
 msgstr "Tallenna viesti kohteeseen "
 
-#: ../src/compose.c:7238 ../src/editjpilot.c:276 ../src/editldap.c:520
+#: ../src/compose.c:7242 ../src/editjpilot.c:276 ../src/editldap.c:520
 #: ../src/editvcard.c:192 ../src/export.c:164 ../src/import.c:163
 #: ../src/importmutt.c:239 ../src/importpine.c:238
-#: ../src/plugins/archive/archiver_gtk.c:1028
+#: ../src/plugins/archive/archiver_gtk.c:1029
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:188
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:208
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:181
@@ -2349,24 +2505,23 @@ msgstr "Tallenna viesti kohteeseen "
 msgid "_Browse"
 msgstr "_Selaa"
 
-#: ../src/compose.c:7710
+#: ../src/compose.c:7714
 msgid "Hea_der"
 msgstr "_Otsake"
 
-#: ../src/compose.c:7715
+#: ../src/compose.c:7719
 msgid "_Attachments"
 msgstr "_Liitteet"
 
-#: ../src/compose.c:7729
+#: ../src/compose.c:7733
 msgid "Othe_rs"
 msgstr "_Muut"
 
-#: ../src/compose.c:7744 ../src/gtk/headers.h:18
-#: ../src/plugins/pdf_viewer/poppler_viewer.c:702 ../src/summary_search.c:440
-msgid "Subject:"
-msgstr "Aihe:"
+#: ../src/compose.c:7748
+msgid "_Subject:"
+msgstr "_Aihe:"
 
-#: ../src/compose.c:7966
+#: ../src/compose.c:7970
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2375,20 +2530,20 @@ msgstr ""
 "Oikolukua ei voitu käynnistää.\n"
 "%s"
 
-#: ../src/compose.c:8072
+#: ../src/compose.c:8076
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Lähettäjä: <i>%s</i>"
 
-#: ../src/compose.c:8106
+#: ../src/compose.c:8119
 msgid "Account to use for this email"
 msgstr "Viestissä käytettävä tili"
 
-#: ../src/compose.c:8108
+#: ../src/compose.c:8121
 msgid "Sender address to be used"
 msgstr "Käytettävä lähettäjäosoite"
 
-#: ../src/compose.c:8272
+#: ../src/compose.c:8285
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2397,64 +2552,68 @@ msgstr ""
 "Salausjärjestelmää %s ei voi ladata. Viestien salaus tai allekirjoitus tälle "
 "viestille ei onnistu."
 
-#: ../src/compose.c:8372 ../src/plugins/archive/archiver_gtk.c:1082
+#: ../src/compose.c:8385 ../src/plugins/archive/archiver_gtk.c:1083
 msgid "_None"
 msgstr "_Ei mitään"
 
-#: ../src/compose.c:8473 ../src/prefs_template.c:753
+#: ../src/compose.c:8486 ../src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Mallineen sisällön muotovirhe rivillä %d."
 
-#: ../src/compose.c:8589
+#: ../src/compose.c:8602
 msgid "Template From format error."
 msgstr "Mallineen lähettäjän muodon virhe."
 
-#: ../src/compose.c:8607
+#: ../src/compose.c:8620
 msgid "Template To format error."
 msgstr "Mallineen vastaanottajan muodon virhe."
 
-#: ../src/compose.c:8625
+#: ../src/compose.c:8638
 msgid "Template Cc format error."
 msgstr "Mallineen kopioiden muodon virhe."
 
-#: ../src/compose.c:8643
+#: ../src/compose.c:8656
 msgid "Template Bcc format error."
 msgstr "Mallineen piilokopioiden muodon virhe."
 
-#: ../src/compose.c:8662
+#: ../src/compose.c:8674
+msgid "Template Reply-To format error."
+msgstr "Mallineen paluuosoitteen muodon virhe."
+
+#: ../src/compose.c:8693
 msgid "Template subject format error."
 msgstr "Viestin aiheen muodon virhe."
 
-#: ../src/compose.c:8930
+#: ../src/compose.c:8961
 msgid "Invalid MIME type."
 msgstr "Virheellinen MIME-tyyppi."
 
-#: ../src/compose.c:8945
+#: ../src/compose.c:8976
 msgid "File doesn't exist or is empty."
 msgstr "Tiedostoa ei ole tai se on tyhjä"
 
-#: ../src/compose.c:9019
+#: ../src/compose.c:9050
 msgid "Properties"
 msgstr "Asetukset"
 
-#: ../src/compose.c:9036
+#: ../src/compose.c:9067
 msgid "MIME type"
 msgstr "MIME-tyyppi"
 
-#: ../src/compose.c:9077
+#: ../src/compose.c:9108
 msgid "Encoding"
 msgstr "Koodaus"
 
-#: ../src/compose.c:9097
+#: ../src/compose.c:9128
 msgid "Path"
 msgstr "Polku"
 
-#: ../src/compose.c:9098
+#: ../src/compose.c:9129
 msgid "File name"
 msgstr "Tiedostonimi"
 
-#: ../src/compose.c:9290
+#: ../src/compose.c:9321
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2465,15 +2624,15 @@ msgstr ""
 "Suljetaanko se väkisin?\n"
 "prosessiryhmän id: %d"
 
-#: ../src/compose.c:9685 ../src/messageview.c:1095
+#: ../src/compose.c:9716 ../src/messageview.c:1095
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Sähköpostin lähettämiseen tarvitaan verkkoyhteyttä."
 
-#: ../src/compose.c:9711
+#: ../src/compose.c:9742
 msgid "Could not queue message."
 msgstr "Viestin lisääminen jonoon ei onnistunut."
 
-#: ../src/compose.c:9713
+#: ../src/compose.c:9744
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2484,15 +2643,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../src/compose.c:9891
+#: ../src/compose.c:9922
 msgid "Could not save draft."
 msgstr "Ei voitu tallentaa luonnosta."
 
-#: ../src/compose.c:9895
+#: ../src/compose.c:9926
 msgid "Could not save draft"
 msgstr "Ei voitu tallentaa luonnosta"
 
-#: ../src/compose.c:9896
+#: ../src/compose.c:9927
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2500,24 +2659,24 @@ msgstr ""
 "Luonnosta ei voitu tallentaa.\n"
 "Perutaanko lopetus vai poistetaanko viestin?"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Cancel exit"
 msgstr "_Peru lopetus"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Discard email"
 msgstr "_Poista viesti"
 
-#: ../src/compose.c:10058 ../src/compose.c:10072
+#: ../src/compose.c:10089 ../src/compose.c:10103
 msgid "Select file"
 msgstr "Valitse tiedosto"
 
-#: ../src/compose.c:10086
+#: ../src/compose.c:10117
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Tiedostoa ”%s” ei voitu lukea."
 
-#: ../src/compose.c:10088
+#: ../src/compose.c:10119
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2526,79 +2685,79 @@ msgstr ""
 "Tiedosto ”%s” sisältää nykyiseen koodaukseen\n"
 "sopimattomia merkkejä, lisäykset saattavat olla virheellisiä."
 
-#: ../src/compose.c:10175
+#: ../src/compose.c:10206
 msgid "Discard message"
 msgstr "Poista viesti"
 
-#: ../src/compose.c:10176
+#: ../src/compose.c:10207
 msgid "This message has been modified. Discard it?"
 msgstr "Tätä viestiä on muokattu, poistetaanko se?"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Discard"
 msgstr "_Poista"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Save to Drafts"
 msgstr "_Pane luonnoksiin"
 
-#: ../src/compose.c:10179
+#: ../src/compose.c:10210
 msgid "Save changes"
 msgstr "Tallenna muutokset"
 
-#: ../src/compose.c:10180
+#: ../src/compose.c:10211
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Tätä viestiä on muokattu, tallennetaanko muutokset?"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "_Don't save"
 msgstr "_Älä tallenna"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "+_Save to Drafts"
 msgstr "_Tallenna luonnoksiin"
 
-#: ../src/compose.c:10251
+#: ../src/compose.c:10282
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Haluatko käyttää mallinetta ”%s”?"
 
-#: ../src/compose.c:10253
+#: ../src/compose.c:10284
 msgid "Apply template"
 msgstr "Käytä mallinetta"
 
-#: ../src/compose.c:10254 ../src/prefs_actions.c:329
+#: ../src/compose.c:10285 ../src/prefs_actions.c:329
 #: ../src/prefs_filtering_action.c:610 ../src/prefs_filtering.c:477
-#: ../src/prefs_matcher.c:772 ../src/prefs_template.c:309
+#: ../src/prefs_matcher.c:775 ../src/prefs_template.c:311
 #: ../src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Korvaa"
 
-#: ../src/compose.c:10254
+#: ../src/compose.c:10285
 msgid "_Insert"
 msgstr "_Lisää"
 
-#: ../src/compose.c:11141
+#: ../src/compose.c:11149
 msgid "Insert or attach?"
 msgstr "Liitä vai sisällytä?"
 
-#: ../src/compose.c:11142
+#: ../src/compose.c:11150
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr ""
 "Haluatko sisällyttää tiedostot viestin sisältöön vai liitetiedostoiksi?"
 
-#: ../src/compose.c:11144
+#: ../src/compose.c:11152
 msgid "_Attach"
 msgstr "_Liitä"
 
-#: ../src/compose.c:11361
+#: ../src/compose.c:11369
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Lainausten merkintöjen muotovirhe rivillä %d."
 
-#: ../src/compose.c:11656
+#: ../src/compose.c:11664
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2857,15 +3016,15 @@ msgstr "Muokkaa hakemistoa"
 msgid "Input the new name of folder:"
 msgstr "Anna hakemistolle uusi nimi:"
 
-#: ../src/editgroup.c:556 ../src/foldersel.c:581 ../src/imap_gtk.c:195
+#: ../src/editgroup.c:556 ../src/foldersel.c:585 ../src/imap_gtk.c:195
 #: ../src/mh_gtk.c:145 ../src/plugins/mailmbox/plugin_gtk.c:239
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:89
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "New folder"
 msgstr "Uusi hakemisto"
 
-#: ../src/editgroup.c:557 ../src/foldersel.c:582 ../src/mh_gtk.c:146
+#: ../src/editgroup.c:557 ../src/foldersel.c:586 ../src/mh_gtk.c:146
 #: ../src/plugins/mailmbox/plugin_gtk.c:240
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:90
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Input the name of new folder:"
 msgstr "Anna uudelle hakemistolle nimi:"
 
@@ -3210,7 +3369,7 @@ msgstr "Lisää vCard-tieto"
 
 #: ../src/etpan/etpan-ssl.c:167
 msgid "Impossible to set the client certificate.\n"
-msgstr ""
+msgstr "Ei voi asettaa asiakassertifikaattia.\n"
 
 #: ../src/exphtmldlg.c:106
 msgid "Please specify output directory and file to create."
@@ -3281,9 +3440,9 @@ msgstr "Tyylisivu"
 #. * can always get back the SummaryView pointer.
 #: ../src/exphtmldlg.c:453 ../src/gtk/colorlabel.c:406
 #: ../src/gtk/gtkaspell.c:1571 ../src/gtk/gtkaspell.c:2231
-#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1174
+#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1177
 #: ../src/plugins/archive/archiver_prefs.c:241
-#: ../src/plugins/libravatar/libravatar_prefs.c:187 ../src/prefs_account.c:949
+#: ../src/plugins/libravatar/libravatar_prefs.c:206 ../src/prefs_account.c:949
 #: ../src/prefs_toolbar.c:780 ../src/prefs_toolbar.c:1465
 #: ../src/summaryview.c:6008
 msgid "None"
@@ -3295,7 +3454,7 @@ msgid "Default"
 msgstr "Oletus"
 
 #: ../src/exphtmldlg.c:455 ../src/plugins/pgpcore/select-keys.c:244
-#: ../src/plugins/pgpcore/sgpgme.c:148
+#: ../src/plugins/pgpcore/sgpgme.c:148 ../src/plugins/pgpcore/sgpgme.c:164
 msgid "Full"
 msgstr "Täysi"
 
@@ -3518,7 +3677,7 @@ msgstr "Vie osoitekirja LDIF-tiedostoon"
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: ../src/export.c:113 ../src/summaryview.c:8117
+#: ../src/export.c:113 ../src/summaryview.c:8120
 msgid "Export to mbox file"
 msgstr "Vie mbox-tiedostoon"
 
@@ -3555,7 +3714,7 @@ msgid "Full Name"
 msgstr "Koko nimi"
 
 #: ../src/exporthtml.c:771 ../src/importldif.c:1022
-#: ../src/plugins/archive/archiver_gtk.c:736
+#: ../src/plugins/archive/archiver_gtk.c:737
 msgid "Attributes"
 msgstr "Attribuutit"
 
@@ -3598,7 +3757,7 @@ msgstr "Tiedosto %s on tyhjä tai viallinen, käytetäänkövarmuuskopiota %s?"
 
 #: ../src/filtering.c:619 ../src/filtering.c:694 ../src/filtering.c:723
 msgid "rule is not account-based\n"
-msgstr ""
+msgstr "viesti ei ole tilikohtainen\n"
 
 #: ../src/filtering.c:623
 #, c-format
@@ -3606,18 +3765,21 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
 msgstr ""
+"sääntö on tilikohtainen [id=%d, nimi=%s], ja täsmää tiliin jolla nyt "
+"haetaan viestejä\n"
 
 #: ../src/filtering.c:625 ../src/filtering.c:642 ../src/filtering.c:643
 #: ../src/filtering.c:667 ../src/filtering.c:685 ../src/filtering.c:712
 #: ../src/filtering.c:713 ../src/filtering.c:730 ../src/filtering.c:731
 msgid "NON_EXISTENT"
-msgstr ""
+msgstr "PUUTTUVA"
 
 #: ../src/filtering.c:633
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
+"sääntö on tilikohtainen, eikä täsmää tiliin jolla nyt haetaan viestejä\n"
 
 #: ../src/filtering.c:640
 #, c-format
@@ -3625,11 +3787,15 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
 msgstr ""
+"sääntö on tilikohtainen [id=%d, nimi=%s], eikä vastaa tiliin jolla nyt "
+"haetaan viestejä [id=%d, nimi=%s]\n"
 
 #: ../src/filtering.c:659
 msgid ""
 "rule is not account-based, all rules are applied on user request anyway\n"
 msgstr ""
+"sääntö ei ole tilikohtainen, kaikki säännöt sovelletaan käyttäjän "
+"pyynnöstä joka tapauksessa\n"
 
 #: ../src/filtering.c:665
 #, c-format
@@ -3637,26 +3803,29 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
 "request\n"
 msgstr ""
+"sääntö on tilikohtainen [id=%d, nimi=%s], mutta kaikki säännöt sovelletaan "
+"käyttäjän pyynnöstä\n"
 
 #: ../src/filtering.c:683
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
-msgstr ""
+msgstr "sääntö on tilikohtainen [id=%d, nimi=%s], ohitetaan pyynnöstä\n"
 
 #: ../src/filtering.c:688
 msgid "rule is account-based, skipped on user request\n"
-msgstr ""
+msgstr "sääntö on tilikohtainen, ohitetaan pyynnöstä\n"
 
 #: ../src/filtering.c:710
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching current account [id="
 "%d, name='%s']\n"
-msgstr ""
+msgstr "sääntö on tilikohtainen [id=%d, nimi=%s], eikä täsmää tähän tiliin "
+"[id=%d, nimi=%s]\n"
 
 #: ../src/filtering.c:716
 msgid "rule is account-based, not matching current account\n"
-msgstr ""
+msgstr "sääntö on tilikohtainen eikä täsmää nykyiseen tiliin\n"
 
 #: ../src/filtering.c:728
 #, c-format
@@ -3664,70 +3833,66 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], current account [id=%d, "
 "name='%s']\n"
 msgstr ""
+"sääntö on tilikohtainen [id=%d, nimi=%s], nykyinen tili [id=%d, "
+"nimi=%s]\n"
 
 #: ../src/filtering.c:768
 #, c-format
 msgid "applying action [ %s ]\n"
-msgstr ""
+msgstr "sovelletaan toimintoa [ %s ]\n"
 
 #: ../src/filtering.c:773
 msgid "action could not apply\n"
-msgstr ""
+msgstr "toiminto ei soveltunut\n"
 
 #: ../src/filtering.c:775
 #, c-format
 msgid "no further processing after action [ %s ]\n"
-msgstr ""
+msgstr "ei enää sovellettavaa toiminnon jälkeen [ %s ]\n"
 
 #: ../src/filtering.c:826
-#, fuzzy, c-format
+#, c-format
 msgid "processing rule '%s' [ %s ]\n"
-msgstr "S_uorita käsittelysäännöt"
+msgstr "Käsittelysääntö %s [ %s ]\n"
 
 #: ../src/filtering.c:830
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "sovelletaan sääntöä <nimetön> [ %s ]\n"
 
 #: ../src/filtering.c:848
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
-msgstr ""
+msgstr "poistetaan käytöstä sääntö %s [ %s ]\n"
 
 #: ../src/filtering.c:852
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "poistetaan käytöstä sääntö <nimetön> [ %s ]\n"
 
 #: ../src/filtering.c:890
-#, fuzzy
 msgid "undetermined"
-msgstr "Määrittelemättä"
+msgstr "määrittelemättä"
 
 #: ../src/filtering.c:894
-#, fuzzy
 msgid "incorporation"
-msgstr "suodatetaan haettaessa"
+msgstr "yhdistely"
 
 #: ../src/filtering.c:898
-#, fuzzy
 msgid "manually"
-msgstr "_Ohjekirja"
+msgstr "käsin"
 
 #: ../src/filtering.c:902
-#, fuzzy
 msgid "folder processing"
-msgstr "Suorita _käsittelysäännöt"
+msgstr "kansion käsittely"
 
 #: ../src/filtering.c:906
-#, fuzzy
 msgid "pre-processing"
-msgstr "_Esikäsittely…"
+msgstr "esikäsittely"
 
 #: ../src/filtering.c:910
-#, fuzzy
 msgid "post-processing"
-msgstr "_Jälkikäsittely…"
+msgstr "jälkikäsittely"
 
 #: ../src/filtering.c:927
 #, c-format
@@ -3739,10 +3904,16 @@ msgid ""
 "%s%s %s\n"
 "%s%s %s\n"
 msgstr ""
+"suodatetaan viestiä (%s%s%s)\n"
+"%sviestitiedosto: %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
 
 #: ../src/filtering.c:929 ../src/filtering.c:938
 msgid ": "
-msgstr ""
+msgstr ": "
 
 #: ../src/filtering.c:936
 #, c-format
@@ -3750,6 +3921,8 @@ msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
 msgstr ""
+"suodatetaan viesitä (%s%s%s)\n"
+"%sviestitiedosto: %s\n"
 
 #: ../src/folder.c:1564 ../src/foldersel.c:403 ../src/prefs_folder_item.c:306
 msgid "Inbox"
@@ -3807,38 +3980,37 @@ msgstr "Ajantasaistetaan %s yhteydetöntä käyttöä varten…\n"
 msgid "Select folder"
 msgstr "Valitse hakemisto"
 
-#: ../src/foldersel.c:583 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
+#: ../src/foldersel.c:587 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
 #: ../src/plugins/mailmbox/plugin_gtk.c:241
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "NewFolder"
 msgstr "UusiKansio"
 
-#: ../src/foldersel.c:591 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
+#: ../src/foldersel.c:595 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
 #: ../src/imap_gtk.c:272 ../src/imap_gtk.c:277 ../src/mh_gtk.c:155
 #: ../src/mh_gtk.c:259 ../src/news_gtk.c:315
 #: ../src/plugins/mailmbox/plugin_gtk.c:249
 #: ../src/plugins/mailmbox/plugin_gtk.c:416
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:97
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:339
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
 #: ../src/plugins/vcalendar/vcal_folder.c:2040
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "merkkiä ’%c’ ei voi sisällyttää kansion nimeen."
 
-#: ../src/foldersel.c:601 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
+#: ../src/foldersel.c:605 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
 #: ../src/mh_gtk.c:165 ../src/mh_gtk.c:266 ../src/news_gtk.c:322
 #: ../src/plugins/mailmbox/plugin_gtk.c:261
 #: ../src/plugins/mailmbox/plugin_gtk.c:425
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:107
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:346
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:211
 #: ../src/plugins/vcalendar/vcal_folder.c:2047
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Kansio ”%s” on jo olemassa."
 
-#: ../src/foldersel.c:608 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
+#: ../src/foldersel.c:612 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
 #: ../src/plugins/mailmbox/plugin_gtk.c:268
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:113
+#: ../src/plugins/rssyl/opml_import.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:121
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Kansiota ”%s” ei voi luoda."
@@ -3851,7 +4023,7 @@ msgstr "Merkitse kaikki _luetuiksi"
 msgid "R_un processing rules"
 msgstr "S_uorita käsittelysäännöt"
 
-#: ../src/folderview.c:233 ../src/mainwindow.c:544
+#: ../src/folderview.c:233 ../src/mainwindow.c:546
 msgid "_Search folder..."
 msgstr "_Hae hakemistosta…"
 
@@ -3870,7 +4042,7 @@ msgstr "Lähetä _jonottavat…"
 #. F_COL_FOLDER
 #: ../src/folderview.c:380 ../src/folderview.c:427
 #: ../src/plugins/notification/notification_lcdproc.c:141
-#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:388
+#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:391
 #: ../src/summaryview.c:6284
 msgid "New"
 msgstr "Uusi"
@@ -3878,7 +4050,7 @@ msgstr "Uusi"
 #. F_COL_NEW
 #: ../src/folderview.c:381 ../src/folderview.c:428
 #: ../src/plugins/notification/notification_lcdproc.c:145
-#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:387
+#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:390
 #: ../src/summaryview.c:6286
 msgid "Unread"
 msgstr "Lukematta"
@@ -3900,21 +4072,21 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Asetetaan hakemiston tietoja…"
 
-#: ../src/folderview.c:823 ../src/summaryview.c:4117 ../src/summaryview.c:4119
+#: ../src/folderview.c:823 ../src/summaryview.c:4119 ../src/summaryview.c:4121
 msgid "Mark all as read"
 msgstr "Merkitse kaikki luetuksi"
 
-#: ../src/folderview.c:824 ../src/summaryview.c:4118
+#: ../src/folderview.c:824 ../src/summaryview.c:4120
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Merkitäänkö kaikki kansion viestit luetuiksi?"
 
-#: ../src/folderview.c:982 ../src/imap.c:4528 ../src/mainwindow.c:5134
+#: ../src/folderview.c:982 ../src/imap.c:4574 ../src/mainwindow.c:5157
 #: ../src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Luetaan hakemistoa %s%c%s..."
 
-#: ../src/folderview.c:986 ../src/imap.c:4533 ../src/mainwindow.c:5139
+#: ../src/folderview.c:986 ../src/imap.c:4579 ../src/mainwindow.c:5162
 #: ../src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
@@ -3946,60 +4118,60 @@ msgstr "Kansiota %s ei pysty lukemaan\n"
 msgid "Checking for new messages in all folders..."
 msgstr "Tarkastetaan uudet viestit kaikissa kansioissa…"
 
-#: ../src/folderview.c:2005
+#: ../src/folderview.c:2046
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Suljetaan kansiota %s..."
 
 #. Open Folder
 #. TODO: wwp: avoid displaying (null) in the status bar
-#: ../src/folderview.c:2100
+#: ../src/folderview.c:2141
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Avataan kansiota %s..."
 
-#: ../src/folderview.c:2118
+#: ../src/folderview.c:2159
 msgid "Folder could not be opened."
 msgstr "Kansiota ei voitu avata."
 
-#: ../src/folderview.c:2261 ../src/mainwindow.c:2877 ../src/mainwindow.c:2881
+#: ../src/folderview.c:2302 ../src/mainwindow.c:2887 ../src/mainwindow.c:2891
 msgid "Empty trash"
 msgstr "Tyhjä roskis"
 
-#: ../src/folderview.c:2262
+#: ../src/folderview.c:2303
 msgid "Delete all messages in trash?"
 msgstr "Poistetaanko kaikki viestit roskiksesta?"
 
-#: ../src/folderview.c:2263
+#: ../src/folderview.c:2304
 msgid "+_Empty trash"
 msgstr "_Tyhjää roskat"
 
-#: ../src/folderview.c:2307 ../src/inc.c:1540 ../src/toolbar.c:2607
+#: ../src/folderview.c:2348 ../src/inc.c:1540 ../src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Yhteydettömyysvaroitus"
 
-#: ../src/folderview.c:2308 ../src/toolbar.c:2608
+#: ../src/folderview.c:2349 ../src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Olet poissa linjoilta. Palataanko?"
 
-#: ../src/folderview.c:2319 ../src/toolbar.c:2627
+#: ../src/folderview.c:2360 ../src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Lähetä jonottavat viestit"
 
-#: ../src/folderview.c:2320 ../src/toolbar.c:2628
+#: ../src/folderview.c:2361 ../src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Lähetetäänkö kaikki jonottavat viestit?"
 
-#: ../src/folderview.c:2321 ../src/messageview.c:854 ../src/messageview.c:871
+#: ../src/folderview.c:2362 ../src/messageview.c:854 ../src/messageview.c:871
 #: ../src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Lähetä"
 
-#: ../src/folderview.c:2329 ../src/toolbar.c:2647
+#: ../src/folderview.c:2370 ../src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Jonottavien viestien lähetyksessä tapahtui virheitä."
 
-#: ../src/folderview.c:2332 ../src/main.c:2714 ../src/toolbar.c:2650
+#: ../src/folderview.c:2373 ../src/main.c:2714 ../src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4008,65 +4180,65 @@ msgstr ""
 "Jonottavien viestien lähetyksessä tapahtui virheitä:\n"
 "%s"
 
-#: ../src/folderview.c:2409
+#: ../src/folderview.c:2450
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Kopioidaanko kansio %s kohteessa %s?"
 
-#: ../src/folderview.c:2410
+#: ../src/folderview.c:2451
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Tehdäänkö kansiosta %s kansion %s alikansio?"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Copy folder"
 msgstr "Kopioi kansio"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Move folder"
 msgstr "Siirrä kansio"
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopioidaan kohteesta %s kohteeseen %s…"
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Siirretään kohteesta %s kohteeseen %s…"
 
-#: ../src/folderview.c:2454
+#: ../src/folderview.c:2495
 msgid "Source and destination are the same."
 msgstr "Lähde ja kohde ovat samoja."
 
-#: ../src/folderview.c:2457
+#: ../src/folderview.c:2498
 msgid "Can't copy a folder to one of its children."
 msgstr "Ei voida kopioida hakemistoa lapsekseen."
 
-#: ../src/folderview.c:2458
+#: ../src/folderview.c:2499
 msgid "Can't move a folder to one of its children."
 msgstr "Ei voida siirtää hakemistoa lapsekseen."
 
-#: ../src/folderview.c:2461
+#: ../src/folderview.c:2502
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Kansiota ei voida siirtää postilaatikkojen välillä."
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Copy failed!"
 msgstr "Kopiointi epäonnistui!"
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Move failed!"
 msgstr "Siirto epäonnistui!"
 
-#: ../src/folderview.c:2515
+#: ../src/folderview.c:2556
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Kansion %s asetuksia luetaan"
 
-#: ../src/folderview.c:2943 ../src/summaryview.c:4558
-#: ../src/summaryview.c:4657
+#: ../src/folderview.c:2984 ../src/summaryview.c:4560
+#: ../src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Kohdekansiota voidaan käyttää vain alikansioiden säilytykseen."
 
@@ -4609,92 +4781,91 @@ msgstr ""
 
 #: ../src/gtk/gtkutils.c:1907
 msgid "Failed."
-msgstr ""
+msgstr "Epäonnistui."
 
 #: ../src/gtk/gtkutils.c:1970
-#, fuzzy
 msgid "Configuring..."
-msgstr "_Asetukset"
+msgstr "Tehdään asetuksia..."
 
 #. RFC2822
 #. S_COL_TO
 #. date expression
 #. S_COL_TO
-#: ../src/gtk/headers.h:8 ../src/prefs_filtering_action.c:1259
-#: ../src/prefs_matcher.c:2158 ../src/prefs_summary_column.c:84
+#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1259
+#: ../src/prefs_matcher.c:2174 ../src/prefs_summary_column.c:84
 #: ../src/quote_fmt.c:49 ../src/summaryview.c:444
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../src/gtk/headers.h:8
+#: ../src/gtk/headers.h:9
 msgid "Date:"
 msgstr "Päiväys:"
 
 #. S_COL_SUBJECT
 #. date
 #. S_COL_SUBJECT
-#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1256
-#: ../src/prefs_matcher.c:2155 ../src/prefs_summary_column.c:82
+#: ../src/gtk/headers.h:10 ../src/prefs_filtering_action.c:1256
+#: ../src/prefs_matcher.c:2171 ../src/prefs_summary_column.c:82
 #: ../src/quote_fmt.c:50 ../src/summaryview.c:442
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../src/gtk/headers.h:9 ../src/summary_search.c:426
+#: ../src/gtk/headers.h:10 ../src/summary_search.c:426
 msgid "From:"
 msgstr "Lähettäjä:"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender"
 msgstr "Välittäjä"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender:"
 msgstr "Välittäjä:"
 
-#: ../src/gtk/headers.h:11
+#: ../src/gtk/headers.h:12
 msgid "Reply-To"
 msgstr "Vastausosoite"
 
 #. S_COL_FROM
 #. subject
 #. S_COL_FROM
-#: ../src/gtk/headers.h:12 ../src/prefs_filtering_action.c:1257
-#: ../src/prefs_matcher.c:2156 ../src/prefs_summary_column.c:83
+#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1257
+#: ../src/prefs_matcher.c:2172 ../src/prefs_summary_column.c:83
 #: ../src/quote_fmt.c:57 ../src/summaryview.c:443
 msgid "To"
 msgstr "Vastaanottaja"
 
 #. to
-#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1258
-#: ../src/prefs_matcher.c:2157 ../src/quote_fmt.c:58
+#: ../src/gtk/headers.h:14 ../src/prefs_filtering_action.c:1258
+#: ../src/prefs_matcher.c:2173 ../src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Kopiot"
 
-#: ../src/gtk/headers.h:14
+#: ../src/gtk/headers.h:15
 msgid "Bcc"
 msgstr "Piilokopiot"
 
 #. references
-#: ../src/gtk/headers.h:15 ../src/prefs_filtering_action.c:1260
-#: ../src/prefs_matcher.c:2159 ../src/quote_fmt.c:61
+#: ../src/gtk/headers.h:16 ../src/prefs_filtering_action.c:1260
+#: ../src/prefs_matcher.c:2175 ../src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Viestin tunniste"
 
-#: ../src/gtk/headers.h:15
+#: ../src/gtk/headers.h:16
 msgid "Message-ID:"
 msgstr "Viestin tunniste:"
 
-#: ../src/gtk/headers.h:16
+#: ../src/gtk/headers.h:17
 msgid "In-Reply-To"
 msgstr "Vastauksena viestiin"
 
 #. newsgroups
-#: ../src/gtk/headers.h:17 ../src/prefs_filtering_action.c:1262
-#: ../src/prefs_matcher.c:2161 ../src/quote_fmt.c:60
+#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1262
+#: ../src/prefs_matcher.c:2177 ../src/quote_fmt.c:60
 msgid "References"
 msgstr "Viittaukset"
 
-#: ../src/gtk/headers.h:17
+#: ../src/gtk/headers.h:18
 msgid "References:"
 msgstr "Viittaukset:"
 
@@ -4702,328 +4873,333 @@ msgstr "Viittaukset:"
 #. initial of sender
 #. S_COL_STATUS
 #. S_COL_MIME
-#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1255
-#: ../src/prefs_matcher.c:2154 ../src/prefs_summary_column.c:81
+#: ../src/gtk/headers.h:19 ../src/prefs_filtering_action.c:1255
+#: ../src/prefs_matcher.c:2170 ../src/prefs_summary_column.c:81
 #: ../src/quote_fmt.c:56 ../src/summaryview.c:441
 msgid "Subject"
 msgstr "Aihe"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:19 ../src/plugins/pdf_viewer/poppler_viewer.c:702
+#: ../src/summary_search.c:440
+msgid "Subject:"
+msgstr "Aihe:"
+
+#: ../src/gtk/headers.h:20
 msgid "Comments"
 msgstr "Kommentit"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:20
 msgid "Comments:"
 msgstr "Kommentit:"
 
-#: ../src/gtk/headers.h:20
+#: ../src/gtk/headers.h:21
 msgid "Keywords"
 msgstr "Avainsanat"
 
-#: ../src/gtk/headers.h:20 ../src/plugins/pdf_viewer/poppler_viewer.c:704
+#: ../src/gtk/headers.h:21 ../src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Keywords:"
 msgstr "Avainsanat:"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date"
 msgstr "Uudelleenlähetyspäiväys"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date:"
 msgstr "Uudelleenlähetyspäiväys:"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From"
 msgstr "Uudelleenlähetyslähettäjä"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From:"
 msgstr "Uudelleenlähetyslähettäjä:"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender"
 msgstr "Uudelleenlähetysvälittäjä"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender:"
 msgstr "Uudelleenlähetysvälittäjä:"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To"
 msgstr "Uudelleenlähetysvastaanottaja"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To:"
 msgstr "Uudelleenlähetysvastaanottaja:"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc"
 msgstr "Uudellenlähetyskopiot"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc:"
 msgstr "Uudelleenlähetyskopiot:"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc"
 msgstr "Uudelleenlähetyspiilokopiot"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc:"
 msgstr "Uudelleenlähetyspiilokopiot:"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID"
 msgstr "Uudellenlähetyksen viestin tunniste"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID:"
 msgstr "Uudelleenlähetyksen viestin tunniste:"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path"
 msgstr "Paluupolku"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path:"
 msgstr "Paluupolku"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received"
 msgstr "Saanut"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received:"
 msgstr "Saanut:"
 
 #. more
 #. cc
-#: ../src/gtk/headers.h:32 ../src/prefs_filtering_action.c:1261
-#: ../src/prefs_matcher.c:2160 ../src/quote_fmt.c:59
+#: ../src/gtk/headers.h:33 ../src/prefs_filtering_action.c:1261
+#: ../src/prefs_matcher.c:2176 ../src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Keskusteluryhmä"
 
-#: ../src/gtk/headers.h:33
+#: ../src/gtk/headers.h:34
 msgid "Followup-To"
 msgstr "Keskustelunsiirto"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To"
 msgstr "Toimitusosoite"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To:"
 msgstr "Toimitusosoite:"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen"
 msgstr "Nähnyt"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen:"
 msgstr "Nähnyt:"
 
 #. S_COL_MARK
-#: ../src/gtk/headers.h:36 ../src/gtk/progressdialog.c:149
+#: ../src/gtk/headers.h:37 ../src/gtk/progressdialog.c:149
 #: ../src/gtk/sslcertwindow.c:164 ../src/prefs_summary_column.c:79
 #: ../src/summaryview.c:2793
 msgid "Status"
 msgstr "Tila"
 
-#: ../src/gtk/headers.h:36 ../src/prefs_themes.c:906
+#: ../src/gtk/headers.h:37 ../src/prefs_themes.c:906
 msgid "Status:"
 msgstr "Tila:"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face"
 msgstr "Naama"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face:"
 msgstr "Naama:"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To"
 msgstr "Toimitusilmoitusosoite"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To:"
 msgstr "Toimitusilmoitusosoite:"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To"
 msgstr "Saapumisilmoitusosoite"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To:"
 msgstr "Saapumisilmoitusosoite:"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent"
 msgstr "Postiohjelma"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent:"
 msgstr "Postiohjelma:"
 
-#: ../src/gtk/headers.h:41
+#: ../src/gtk/headers.h:42
 msgid "Content-Type"
 msgstr "Sisältömuoto"
 
-#: ../src/gtk/headers.h:41 ../src/image_viewer.c:327
+#: ../src/gtk/headers.h:42 ../src/image_viewer.c:327
 msgid "Content-Type:"
 msgstr "Sisältömuoto:"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding"
 msgstr "Siirroskoodaus"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding:"
 msgstr "Siirroskoodaus:"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version"
 msgstr "MIME-versio"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version:"
 msgstr "MIME-Versio:"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence"
 msgstr "Järjestys"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence:"
 msgstr "Järjestys:"
 
-#: ../src/gtk/headers.h:45 ../src/prefs_account.c:1073
+#: ../src/gtk/headers.h:46 ../src/prefs_account.c:1073
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: ../src/gtk/headers.h:45
+#: ../src/gtk/headers.h:46
 msgid "Organization:"
 msgstr "Organisaatio:"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List"
 msgstr "Postituslista"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List:"
 msgstr "Postituslista:"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post"
 msgstr "Postituslistaviestiosoite"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post:"
 msgstr "Postituslistaviestiosoite:"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe"
 msgstr "Postituslistatilausosoite"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe:"
 msgstr "Postituslistatilausosoite:"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe"
 msgstr "Postituslistan perumisosoite"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe:"
 msgstr "Postituslistan perumisosoite:"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help"
 msgstr "Postituslistaohje"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help:"
 msgstr "Postituslistaohje:"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive"
 msgstr "Postituslista-arkisto"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive:"
 msgstr "Postituslista-arkisto:"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner"
 msgstr "Postituslistan omistaja"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner:"
 msgstr "Postituslistan omistaja:"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label"
 msgstr "X-Nimiö"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label:"
 msgstr "X-Nimiö:"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer"
 msgstr "X-Sähköpostitin"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer:"
 msgstr "X-Sähköpostitin:"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status"
 msgstr "X-Tila"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status:"
 msgstr "X-Tila:"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face"
 msgstr "X-Naama"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face:"
 msgstr "X-Naama:"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive"
 msgstr "X-Arkistointikielto"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive:"
 msgstr "X-Arkistointikielto"
 
 #. some common logical names referring to real header names
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to"
 msgstr "Vastauksena viestiin"
 
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to:"
 msgstr "Vastauksena viestiin:"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc"
 msgstr "Vastaanottaja tai kopiot"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc:"
 msgstr "Vastaanottaja tai kopiot:"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject"
 msgstr "Lähettäjä, vastaanottaja tai aihe"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject:"
 msgstr "Lähettäjä, vastaanottaja tai aihe:"
 
@@ -5212,10 +5388,10 @@ msgstr ""
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:457
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:400
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:550
-#: ../src/plugins/fancy/fancy_prefs.c:109
+#: ../src/plugins/fancy/fancy_prefs.c:114
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:178
 #: ../src/plugins/gdata/cm_gdata_prefs.c:145
-#: ../src/plugins/libravatar/libravatar_prefs.c:399
+#: ../src/plugins/libravatar/libravatar_prefs.c:439
 #: ../src/plugins/notification/notification_prefs.c:396
 #: ../src/plugins/notification/notification_prefs.c:410
 #: ../src/plugins/notification/notification_prefs.c:428
@@ -5225,9 +5401,9 @@ msgstr ""
 #: ../src/plugins/notification/notification_prefs.c:496
 #: ../src/plugins/notification/notification_prefs.c:513
 #: ../src/plugins/pgpcore/prefs_gpg.c:569
-#: ../src/plugins/rssyl/rssyl_prefs.c:65
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
+#: ../src/plugins/rssyl/rssyl_prefs.c:69
 #: ../src/plugins/spam_report/spam_report_prefs.c:79
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
 #: ../src/plugins/vcalendar/vcal_prefs.c:680 ../src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Liitännäiset"
@@ -5269,7 +5445,7 @@ msgstr "Ladatut liitännäiset"
 msgid "Page Index"
 msgstr "Hakemisto"
 
-#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:828
+#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:831
 msgid "_Hide"
 msgstr "_Piilota"
 
@@ -5282,70 +5458,74 @@ msgstr "_Piilota"
 msgid "Account"
 msgstr "Tili"
 
-#: ../src/gtk/quicksearch.c:452
+#: ../src/gtk/quicksearch.c:451
 msgid "all messages"
 msgstr "kaikki viestit"
 
-#: ../src/gtk/quicksearch.c:453
+#: ../src/gtk/quicksearch.c:452
 msgid "messages whose age is greater than # days"
 msgstr "viestit, jotka ovat vanhempia kuin # päivää"
 
-#: ../src/gtk/quicksearch.c:454
+#: ../src/gtk/quicksearch.c:453
 msgid "messages whose age is less than # days"
 msgstr "viestit, jotka ovat uudempia kuin # päivää"
 
-#: ../src/gtk/quicksearch.c:455
+#: ../src/gtk/quicksearch.c:454
 msgid "messages whose age is greater than # hours"
 msgstr "viestit, jotka ovat vanhempia kuin # tuntia"
 
-#: ../src/gtk/quicksearch.c:456
+#: ../src/gtk/quicksearch.c:455
 msgid "messages whose age is less than # hours"
 msgstr "viestit, jotka ovat uudempia kuin # tuntia"
 
-#: ../src/gtk/quicksearch.c:457
+#: ../src/gtk/quicksearch.c:456
 msgid "messages which contain S in the message body"
 msgstr "viestit, jotka sisältävät S:n viestitekstissään"
 
-#: ../src/gtk/quicksearch.c:458
+#: ../src/gtk/quicksearch.c:457
 msgid "messages which contain S in the whole message"
 msgstr "viestit, jotka sisältävät S:n jossakin"
 
-#: ../src/gtk/quicksearch.c:459
+#: ../src/gtk/quicksearch.c:458
 msgid "messages carbon-copied to S"
 msgstr "viestit, jonka kopiot on lähetty S:lle"
 
-#: ../src/gtk/quicksearch.c:460
+#: ../src/gtk/quicksearch.c:459
 msgid "message is either to: or cc: to S"
 msgstr "viestit, jotka on lähetty tai kopioitu S:lle"
 
-#: ../src/gtk/quicksearch.c:461
+#: ../src/gtk/quicksearch.c:460
 msgid "deleted messages"
 msgstr "poistetut viestit"
 
 #. * how I can filter deleted messages *
-#: ../src/gtk/quicksearch.c:462
+#: ../src/gtk/quicksearch.c:461
 msgid "messages which contain S in the Sender field"
 msgstr "viestit, jotka on lähettänyt S"
 
-#: ../src/gtk/quicksearch.c:463
+#: ../src/gtk/quicksearch.c:462
 msgid "true if execute \"S\" succeeds"
 msgstr "tosi, jos ”S”:n suorittaminen onnistuu"
 
-#: ../src/gtk/quicksearch.c:464
+#: ../src/gtk/quicksearch.c:463
 msgid "messages originating from user S"
 msgstr "viestit, jotka ovat lähtöisin käyttäjältä S"
 
-#: ../src/gtk/quicksearch.c:465
+#: ../src/gtk/quicksearch.c:464
 msgid "forwarded messages"
 msgstr "edelleenvälitetyt viestit"
 
-#: ../src/gtk/quicksearch.c:466
+#: ../src/gtk/quicksearch.c:465
 msgid "messages which have attachments"
 msgstr "viestit, joissa on liitteitä"
 
+#: ../src/gtk/quicksearch.c:466
+msgid "messages which contain S in any header name or value"
+msgstr "viestit, joiden otsakkeissa tai arvoissa on S"
+
 #: ../src/gtk/quicksearch.c:467
-msgid "messages which contain header S"
-msgstr "viestit, joissa on otsake S"
+msgid "messages which contain S in the value of any header"
+msgstr "viestit, joiden otsakkeissa on S"
 
 #: ../src/gtk/quicksearch.c:468
 msgid "messages which contain S in Message-ID header"
@@ -5532,7 +5712,7 @@ msgstr "_Muokkaa"
 
 #: ../src/gtk/quicksearch.c:819 ../src/gtk/quicksearch.c:834
 #: ../src/prefs_actions.c:347 ../src/prefs_filtering.c:495
-#: ../src/prefs_template.c:328
+#: ../src/prefs_template.c:330
 msgid "C_lear"
 msgstr "_Tyhjennä"
 
@@ -5684,8 +5864,8 @@ msgstr "Tägit:"
 #: ../src/plugins/notification/notification_popup.c:316
 #: ../src/plugins/notification/notification_popup.c:621
 #: ../src/plugins/notification/notification_trayicon.c:851
-#: ../src/summaryview.c:3351 ../src/summaryview.c:3369
-#: ../src/summaryview.c:3390
+#: ../src/summaryview.c:3353 ../src/summaryview.c:3371
+#: ../src/summaryview.c:3392
 msgid "(No From)"
 msgstr "(Ei lähettäjää)"
 
@@ -5693,7 +5873,7 @@ msgstr "(Ei lähettäjää)"
 #: ../src/plugins/notification/notification_popup.c:318
 #: ../src/plugins/notification/notification_popup.c:625
 #: ../src/plugins/notification/notification_trayicon.c:854
-#: ../src/summaryview.c:3403 ../src/summaryview.c:3407
+#: ../src/summaryview.c:3405 ../src/summaryview.c:3409
 msgid "(No Subject)"
 msgstr "(Ei aihetta)"
 
@@ -5701,7 +5881,7 @@ msgstr "(Ei aihetta)"
 msgid "Error:"
 msgstr "Virhe:"
 
-#: ../src/image_viewer.c:299 ../src/mimeview.c:2544
+#: ../src/image_viewer.c:299 ../src/mimeview.c:2545
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:698
 msgid "Filename:"
 msgstr "Tiedostonimi:"
@@ -5714,31 +5894,31 @@ msgstr "Tiedoston koko:"
 msgid "Load Image"
 msgstr "Lataa kuva"
 
-#: ../src/imap.c:577
+#: ../src/imap.c:583
 msgid "IMAP4 connection broken\n"
 msgstr "IMAP4-yhteys rikki\n"
 
-#: ../src/imap.c:616
+#: ../src/imap.c:622
 #, c-format
 msgid "IMAP error on %s: authenticated\n"
 msgstr "IMAP-virhe kohteelle %s: varmennettu\n"
 
-#: ../src/imap.c:619
+#: ../src/imap.c:625
 #, c-format
 msgid "IMAP error on %s: not authenticated\n"
 msgstr "IMAP-virhe kohteelle %s: ei varmennettu\n"
 
-#: ../src/imap.c:622
+#: ../src/imap.c:628
 #, c-format
 msgid "IMAP error on %s: bad state\n"
 msgstr "IMAP-virhe kohteelle %s: huono tila\n"
 
-#: ../src/imap.c:625
+#: ../src/imap.c:631
 #, c-format
 msgid "IMAP error on %s: stream error\n"
 msgstr "IMAP-virhe kohteelle %s: virtavirhe\n"
 
-#: ../src/imap.c:628
+#: ../src/imap.c:634
 #, c-format
 msgid ""
 "IMAP error on %s: parse error (very probably non-RFC compliance from the "
@@ -5746,22 +5926,22 @@ msgid ""
 msgstr ""
 "IMAP-virhe kohteelle %s: jäsennysvirhe (RFC-epäyhteensopiva palvelin)\n"
 
-#: ../src/imap.c:632
+#: ../src/imap.c:638
 #, c-format
 msgid "IMAP error on %s: connection refused\n"
 msgstr "IMAP-virhe kohteelle %s: yhteys estettiin\n"
 
-#: ../src/imap.c:635
+#: ../src/imap.c:641
 #, c-format
 msgid "IMAP error on %s: memory error\n"
 msgstr "IMAP-virhe kohteelle %s: muistivirhe\n"
 
-#: ../src/imap.c:638
+#: ../src/imap.c:644
 #, c-format
 msgid "IMAP error on %s: fatal error\n"
 msgstr "IMAP-virhe kohteelle %s: kriittinen virhe\n"
 
-#: ../src/imap.c:641
+#: ../src/imap.c:647
 #, c-format
 msgid ""
 "IMAP error on %s: protocol error(very probably non-RFC compliance from the "
@@ -5769,172 +5949,172 @@ msgid ""
 msgstr ""
 "IMAP-virhe kohteelle %s: protokollavirhe (RFC-epäyhteensopiva palvelin)\n"
 
-#: ../src/imap.c:645
+#: ../src/imap.c:651
 #, c-format
 msgid "IMAP error on %s: connection not accepted\n"
 msgstr "IMAP-virhe kohteelle %s: yhteyttä ei hyväksytty\n"
 
-#: ../src/imap.c:648
+#: ../src/imap.c:654
 #, c-format
 msgid "IMAP error on %s: APPEND error\n"
 msgstr "IMAP-virhe kohteelle %s: APPEND-virhe\n"
 
-#: ../src/imap.c:651
+#: ../src/imap.c:657
 #, c-format
 msgid "IMAP error on %s: NOOP error\n"
 msgstr "IMAP-virhe kohteelle %s: NOOP-virhe\n"
 
-#: ../src/imap.c:654
+#: ../src/imap.c:660
 #, c-format
 msgid "IMAP error on %s: LOGOUT error\n"
 msgstr "IMAP-virhe kohteelle %s: LOGOUT-virhe\n"
 
-#: ../src/imap.c:657
+#: ../src/imap.c:663
 #, c-format
 msgid "IMAP error on %s: CAPABILITY error\n"
 msgstr "IMAP-virhe kohteelle %s: CAPABILITY-virhe\n"
 
-#: ../src/imap.c:660
+#: ../src/imap.c:666
 #, c-format
 msgid "IMAP error on %s: CHECK error\n"
 msgstr "IMAP-virhe kohteelle %s: CHECK-virhe\n"
 
-#: ../src/imap.c:663
+#: ../src/imap.c:669
 #, c-format
 msgid "IMAP error on %s: CLOSE error\n"
 msgstr "IMAP-virhe kohteelle %s: CLOSE-virhe\n"
 
-#: ../src/imap.c:666
+#: ../src/imap.c:672
 #, c-format
 msgid "IMAP error on %s: EXPUNGE error\n"
 msgstr "IMAP-virhe kohteelle %s: EXPUNGE-virhe\n"
 
-#: ../src/imap.c:669
+#: ../src/imap.c:675
 #, c-format
 msgid "IMAP error on %s: COPY error\n"
 msgstr "IMAP-virhe kohteelle %s: COPY-virhe\n"
 
-#: ../src/imap.c:672
+#: ../src/imap.c:678
 #, c-format
 msgid "IMAP error on %s: UID COPY error\n"
 msgstr "IMAP-virhe kohteelle %s: UID COPY -virhe\n"
 
-#: ../src/imap.c:675
+#: ../src/imap.c:681
 #, c-format
 msgid "IMAP error on %s: CREATE error\n"
 msgstr "IMAP-virhe kohteelle %s: CREATE-virhe\n"
 
-#: ../src/imap.c:678
+#: ../src/imap.c:684
 #, c-format
 msgid "IMAP error on %s: DELETE error\n"
 msgstr "IMAP-virhe kohteelle %s: DELETE-virhe\n"
 
-#: ../src/imap.c:681
+#: ../src/imap.c:687
 #, c-format
 msgid "IMAP error on %s: EXAMINE error\n"
 msgstr "IMAP-virhe kohteelle %s: EXAMINE-virhe\n"
 
-#: ../src/imap.c:684
+#: ../src/imap.c:690
 #, c-format
 msgid "IMAP error on %s: FETCH error\n"
 msgstr "IMAP-virhe kohteelle %s: FETCH-virhe\n"
 
-#: ../src/imap.c:687
+#: ../src/imap.c:693
 #, c-format
 msgid "IMAP error on %s: UID FETCH error\n"
 msgstr "IMAP-virhe kohteelle %s: UID FETCH -virhe\n"
 
-#: ../src/imap.c:690
+#: ../src/imap.c:696
 #, c-format
 msgid "IMAP error on %s: LIST error\n"
 msgstr "IMAP-virhe kohteelle %s: LIST-virhe\n"
 
-#: ../src/imap.c:693
+#: ../src/imap.c:699
 #, c-format
 msgid "IMAP error on %s: LOGIN error\n"
 msgstr "IMAP-virhe kohteelle %s: LOGIN-virhe\n"
 
-#: ../src/imap.c:696
+#: ../src/imap.c:702
 #, c-format
 msgid "IMAP error on %s: LSUB error\n"
 msgstr "IMAP-virhe kohteelle %s: LSUB-virhe\n"
 
-#: ../src/imap.c:699
+#: ../src/imap.c:705
 #, c-format
 msgid "IMAP error on %s: RENAME error\n"
 msgstr "IMAP-virhe kohteelle %s: RENAME-virhe\n"
 
-#: ../src/imap.c:702
+#: ../src/imap.c:708
 #, c-format
 msgid "IMAP error on %s: SEARCH error\n"
 msgstr "IMAP-virhe kohteelle %s: SEARCH-virhe\n"
 
-#: ../src/imap.c:705
+#: ../src/imap.c:711
 #, c-format
 msgid "IMAP error on %s: UID SEARCH error\n"
 msgstr "IMAP-virhe kohteelle %s: UID SEARCH -virhe\n"
 
-#: ../src/imap.c:708
+#: ../src/imap.c:714
 #, c-format
 msgid "IMAP error on %s: SELECT error\n"
 msgstr "IMAP-virhe kohteelle %s: SELECT-virhe\n"
 
-#: ../src/imap.c:711
+#: ../src/imap.c:717
 #, c-format
 msgid "IMAP error on %s: STATUS error\n"
 msgstr "IMAP-virhe kohteelle %s: STATUS-virhe\n"
 
-#: ../src/imap.c:714
+#: ../src/imap.c:720
 #, c-format
 msgid "IMAP error on %s: STORE error\n"
 msgstr "IMAP-virhe kohteelle %s: STORE-virhe\n"
 
-#: ../src/imap.c:717
+#: ../src/imap.c:723
 #, c-format
 msgid "IMAP error on %s: UID STORE error\n"
 msgstr "IMAP-virhe kohteelle %s: UID STORE -virhe\n"
 
-#: ../src/imap.c:720
+#: ../src/imap.c:726
 #, c-format
 msgid "IMAP error on %s: SUBSCRIBE error\n"
 msgstr "IMAP-virhe kohteelle %s: SUBSCRIBE-virhe\n"
 
-#: ../src/imap.c:723
+#: ../src/imap.c:729
 #, c-format
 msgid "IMAP error on %s: UNSUBSCRIBE error\n"
 msgstr "IMAP-virhe kohteelle %s: UNSUBSCRIBE-virhe\n"
 
-#: ../src/imap.c:726
+#: ../src/imap.c:732
 #, c-format
 msgid "IMAP error on %s: STARTTLS error\n"
 msgstr "IMAP-virhe kohteelle %s: STARTTLS-virhe\n"
 
-#: ../src/imap.c:729
+#: ../src/imap.c:735
 #, c-format
 msgid "IMAP error on %s: INVAL error\n"
 msgstr "IMAP-virhe kohteelle %s: INVAL-virhe\n"
 
-#: ../src/imap.c:732
+#: ../src/imap.c:738
 #, c-format
 msgid "IMAP error on %s: EXTENSION error\n"
 msgstr "IMAP-virhe kohteelle %s: EXTENSION-virhe\n"
 
-#: ../src/imap.c:735
+#: ../src/imap.c:741
 #, c-format
 msgid "IMAP error on %s: SASL error\n"
 msgstr "IMAP-virhe kohteelle %s: SASL-virhe\n"
 
-#: ../src/imap.c:739
+#: ../src/imap.c:745
 #, c-format
 msgid "IMAP error on %s: SSL error\n"
 msgstr "IMAP-virhe kohteelle %s: SSL-virhe\n"
 
-#: ../src/imap.c:743
+#: ../src/imap.c:749
 #, c-format
 msgid "IMAP error on %s: Unknown error [%d]\n"
 msgstr "IMAP-virhe kohteelle %s: tuntematon virhe [%d]\n"
 
-#: ../src/imap.c:928
+#: ../src/imap.c:934
 msgid ""
 "\n"
 "\n"
@@ -5946,7 +6126,7 @@ msgstr ""
 "CRAM-MD5-kirjautumiset toimivat vain jos libetpanissa on SASL-tuki ja CRAM-"
 "MD5 SASL-liitännäinen on on asennettu."
 
-#: ../src/imap.c:934
+#: ../src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5958,39 +6138,39 @@ msgstr ""
 "DIGEST-MD5-kirjautumiset toimivat vain jos libetpanissa on SASL-tuki "
 "jaDIGEST-MD5 SASL -liitännäinen on on asennettu."
 
-#: ../src/imap.c:941
+#: ../src/imap.c:947
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr ""
 "Yhdistäminen kohteeseen %s epäonnistui: kirjautuminen sisään ei toiminut.%s"
 
-#: ../src/imap.c:945
+#: ../src/imap.c:951
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr ""
 "Yhdistäminen kohteeseen %s epäonnistui: kirjautuminen sisään ei toiminut.%s\n"
 
-#: ../src/imap.c:963
+#: ../src/imap.c:969
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Yhteydenotto kohteeseen %s epäonnistui"
 
-#: ../src/imap.c:970 ../src/imap.c:973
+#: ../src/imap.c:976 ../src/imap.c:979
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-yhteys kohteeseen %s on katkennut, yhdistetään uudelleen…\n"
 
-#: ../src/imap.c:1003 ../src/imap.c:3583 ../src/imap.c:4242 ../src/imap.c:4339
-#: ../src/imap.c:4517 ../src/imap.c:5314
+#: ../src/imap.c:1009 ../src/imap.c:3619 ../src/imap.c:4278 ../src/imap.c:4375
+#: ../src/imap.c:4555 ../src/imap.c:5364
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "IMAP-palvelimeen ei saada yhteyttä ilman verkkoyhteyttä."
 
-#: ../src/imap.c:1112 ../src/inc.c:818 ../src/news.c:387
+#: ../src/imap.c:1118 ../src/inc.c:818 ../src/news.c:387
 #: ../src/send_message.c:278
 msgid "Insecure connection"
 msgstr "Suojaamaton yhteys"
 
-#: ../src/imap.c:1113 ../src/inc.c:819 ../src/news.c:388
+#: ../src/imap.c:1119 ../src/inc.c:819 ../src/news.c:388
 #: ../src/send_message.c:279
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
@@ -6004,109 +6184,109 @@ msgstr ""
 "\n"
 "Haluatko silti yhdistää palvelimelle? Yhteys ei ole silloin suojattua."
 
-#: ../src/imap.c:1119 ../src/inc.c:825 ../src/news.c:394
+#: ../src/imap.c:1125 ../src/inc.c:825 ../src/news.c:394
 #: ../src/send_message.c:285
 msgid "Con_tinue connecting"
 msgstr "_Yhdistä joka tapauksessa"
 
-#: ../src/imap.c:1129
+#: ../src/imap.c:1135
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Tili %s: Yhdistetään IMAP4-palvelimeen: %s:%d..."
 
-#: ../src/imap.c:1177
+#: ../src/imap.c:1183
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "IMAP4-palvelimeen %s:%d ei saada yhteyttä"
 
-#: ../src/imap.c:1180
+#: ../src/imap.c:1186
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4-palvelimeen %s:%d ei saada yhteyttä\n"
 
-#: ../src/imap.c:1213 ../src/imap.c:4004
+#: ../src/imap.c:1219 ../src/imap.c:4040
 msgid "Can't start TLS session.\n"
 msgstr "TLS-session aloitus ei onnistu.\n"
 
-#: ../src/imap.c:1276
+#: ../src/imap.c:1282
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Yhdistetään IMAP-palvelimeen: %s…\n"
 
-#: ../src/imap.c:1279
+#: ../src/imap.c:1285
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Yhdistetään IMAP-palvelimeen: %s…"
 
-#: ../src/imap.c:1679
+#: ../src/imap.c:1703
 msgid "Adding messages..."
 msgstr "Lisätään viestejä…"
 
-#: ../src/imap.c:1883 ../src/mh.c:520
+#: ../src/imap.c:1908 ../src/mh.c:526
 msgid "Copying messages..."
 msgstr "Kopioidaan viestejä…"
 
-#: ../src/imap.c:2465
+#: ../src/imap.c:2492
 msgid "can't set deleted flags\n"
 msgstr "poistomerkkejä ei voitu asettaa\n"
 
-#: ../src/imap.c:2472 ../src/imap.c:4944
+#: ../src/imap.c:2499 ../src/imap.c:4994
 msgid "can't expunge\n"
 msgstr "ei voida hävittää\n"
 
-#: ../src/imap.c:2823
+#: ../src/imap.c:2850
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Haetaan tilaamattomia kansioita kohteesta %s…"
 
-#: ../src/imap.c:2826
+#: ../src/imap.c:2853
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Haetaan kansion %s alikansioita…"
 
-#: ../src/imap.c:3123
+#: ../src/imap.c:3159
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ei voitu luoda postilaatikkoa: LIST epäonnistui\n"
 
-#: ../src/imap.c:3138
+#: ../src/imap.c:3174
 msgid "can't create mailbox\n"
 msgstr "ei voitu luoda postilaatikkoa\n"
 
-#: ../src/imap.c:3229
+#: ../src/imap.c:3265
 msgid "New folder name must not contain the namespace path separator"
 msgstr "Uuden kansion nimessä ei saa olla nimiavaruuden polkuerotinta"
 
-#: ../src/imap.c:3269
+#: ../src/imap.c:3305
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ei voida uudelleennimetä postilaatikkoa %s %s:ksi\n"
 
-#: ../src/imap.c:3382
+#: ../src/imap.c:3418
 msgid "can't delete mailbox\n"
 msgstr "ei voida poistaa postilaatikkoa\n"
 
-#: ../src/imap.c:3661
+#: ../src/imap.c:3697
 msgid "LIST failed\n"
 msgstr "LIST epäonnistui\n"
 
-#: ../src/imap.c:3746
+#: ../src/imap.c:3782
 msgid "Flagging messages..."
 msgstr "Merkitään viestejä…"
 
-#: ../src/imap.c:3849
+#: ../src/imap.c:3885
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "hakemistoa %s ei voida valita\n"
 
-#: ../src/imap.c:4001
+#: ../src/imap.c:4037
 msgid "Server requires TLS to log in.\n"
 msgstr "Palvelin vaatii TLS:ää kirjautumiseen\n"
 
-#: ../src/imap.c:4011
+#: ../src/imap.c:4047
 msgid "Can't refresh capabilities.\n"
 msgstr "Ominaisuuksia ei voida päivittää.\n"
 
-#: ../src/imap.c:4016
+#: ../src/imap.c:4052
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -6115,20 +6295,20 @@ msgstr ""
 "Yhteydenotto palvelimelle %s epäonnistui: palvelin vaatii TLS:ää, mutta "
 "Claws Mail on käännetty ilman OpenSSL-tukea.\n"
 
-#: ../src/imap.c:4024
+#: ../src/imap.c:4060
 msgid "Server logins are disabled.\n"
 msgstr "Palvelimelle kirjautuminen on poissa käytöstä.\n"
 
-#: ../src/imap.c:4247
+#: ../src/imap.c:4283
 msgid "Fetching message..."
 msgstr "Haetaan viestiä…"
 
-#: ../src/imap.c:4937
+#: ../src/imap.c:4987
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "poistomerkkejä ei voitu asettaa: %d\n"
 
-#: ../src/imap.c:5973
+#: ../src/imap.c:6023
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6162,7 +6342,7 @@ msgid "Cop_y folder..."
 msgstr "_Kopioi kansio…"
 
 #: ../src/imap_gtk.c:69 ../src/mh_gtk.c:59
-#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:61
+#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:55
 msgid "_Delete folder..."
 msgstr "_Poista kansio…"
 
@@ -6223,7 +6403,7 @@ msgstr "Peri ylemmän kansion asetukset"
 
 #: ../src/imap_gtk.c:261 ../src/mh_gtk.c:249 ../src/news_gtk.c:306
 #: ../src/plugins/mailmbox/plugin_gtk.c:405
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:331
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:196
 #: ../src/plugins/vcalendar/vcal_folder.c:2032
 #, c-format
 msgid "Input new name for '%s':"
@@ -6231,14 +6411,14 @@ msgstr "Anna uusi nimi kansiolle ”%s”:"
 
 #: ../src/imap_gtk.c:263 ../src/mh_gtk.c:251
 #: ../src/plugins/mailmbox/plugin_gtk.c:406
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:332
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:197
 #: ../src/plugins/vcalendar/vcal_folder.c:2033
 msgid "Rename folder"
 msgstr "Uudelleennimeä kansio"
 
 #: ../src/imap_gtk.c:292 ../src/mh_gtk.c:274 ../src/news_gtk.c:328
 #: ../src/plugins/mailmbox/plugin_gtk.c:433
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:352
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:217
 #: ../src/plugins/vcalendar/vcal_folder.c:2053
 msgid ""
 "The folder could not be renamed.\n"
@@ -6248,7 +6428,7 @@ msgstr ""
 "Uuden kansion nimi ei ole sallittu."
 
 #: ../src/imap_gtk.c:360 ../src/mh_gtk.c:199
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:233
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:149
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6263,7 +6443,7 @@ msgstr ""
 
 #: ../src/imap_gtk.c:381 ../src/mh_gtk.c:220 ../src/news_gtk.c:281
 #: ../src/plugins/mailmbox/plugin_gtk.c:341
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:254
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:170
 #: ../src/plugins/vcalendar/vcal_folder.c:1986
 #, c-format
 msgid "Can't remove the folder '%s'."
@@ -6291,7 +6471,7 @@ msgstr "_Hae"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Valitse tilattava kansion %s alikansio: "
 
-#: ../src/imap_gtk.c:537 ../src/mainwindow.c:672
+#: ../src/imap_gtk.c:537 ../src/mainwindow.c:674
 msgid "Subscribe"
 msgstr "Tilaa"
 
@@ -6563,7 +6743,7 @@ msgid "Auth failed"
 msgstr "Autentikointi epäonnistui"
 
 #. S_COL_SCORE
-#: ../src/inc.c:662 ../src/prefs_matcher.c:393
+#: ../src/inc.c:662 ../src/prefs_matcher.c:396
 #: ../src/prefs_summary_column.c:88 ../src/summaryview.c:2789
 #: ../src/summaryview.c:6310
 msgid "Locked"
@@ -6749,23 +6929,9 @@ msgstr "%s%sOlet poissa linjoilta. Palataanko?"
 msgid "On_ly once"
 msgstr "_Vain kerran"
 
-#: ../src/ldapupdate.c:189
-#, c-format
-msgid "ldapsvr_retrieve_item_person->Unknown status: %d"
-msgstr ""
-
-#: ../src/ldapupdate.c:472
-msgid "ldapsvr_update_book: Could not clean cache\n"
-msgstr ""
-
 #: ../src/ldapupdate.c:1056
 msgid "Some SN"
-msgstr ""
-
-#: ../src/ldapupdate.c:1440
-#, c-format
-msgid "ldapsvr_update_book->Unknown status: %s\n"
-msgstr ""
+msgstr "Joku SN"
 
 #: ../src/ldif.c:776
 msgid "Nick Name"
@@ -7099,328 +7265,328 @@ msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: verkko on yhdistämättä.\n"
 
 #. menus
-#: ../src/mainwindow.c:503 ../src/messageview.c:209
+#: ../src/mainwindow.c:505 ../src/messageview.c:209
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../src/mainwindow.c:505 ../src/messageview.c:211 ../src/summaryview.c:434
+#: ../src/mainwindow.c:507 ../src/messageview.c:211 ../src/summaryview.c:434
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../src/mainwindow.c:508
+#: ../src/mainwindow.c:510
 msgid "_Configuration"
 msgstr "_Asetukset"
 
 #. File menu
-#: ../src/mainwindow.c:512
+#: ../src/mainwindow.c:514
 msgid "_Add mailbox"
 msgstr "_Lisää postilaatikko"
 
-#: ../src/mainwindow.c:513
+#: ../src/mainwindow.c:515
 msgid "MH..."
 msgstr "MH…"
 
-#: ../src/mainwindow.c:516
+#: ../src/mainwindow.c:518
 msgid "Change mailbox order..."
 msgstr "Vaihda viestilaatikoiden järjestystä..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:519
+#: ../src/mainwindow.c:521
 msgid "_Import mbox file..."
 msgstr "_Tuo mbox-tiedostosta..."
 
-#: ../src/mainwindow.c:520
+#: ../src/mainwindow.c:522
 msgid "_Export to mbox file..."
 msgstr "_Vie mbox-tiedostoon..."
 
-#: ../src/mainwindow.c:521
+#: ../src/mainwindow.c:523
 msgid "_Export selected to mbox file..."
 msgstr "_Vie valitut mbox-tiedostoon…"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:523
+#: ../src/mainwindow.c:525
 msgid "Empty all _Trash folders"
 msgstr "Tyhjennä _roskat"
 
 #. {"File/---",				NULL, "---" },
 #. File menu
-#: ../src/mainwindow.c:526 ../src/messageview.c:218
+#: ../src/mainwindow.c:528 ../src/messageview.c:218
 msgid "_Save email as..."
 msgstr "_Tallenna viesti nimellä..."
 
-#: ../src/mainwindow.c:527 ../src/messageview.c:219
+#: ../src/mainwindow.c:529 ../src/messageview.c:219
 msgid "_Save part as..."
 msgstr "_Tallenna osa nimellä..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:530 ../src/messageview.c:220
+#: ../src/mainwindow.c:532 ../src/messageview.c:220
 msgid "Page setup..."
 msgstr "Sivun asetukset…"
 
-#: ../src/mainwindow.c:531 ../src/messageview.c:221
+#: ../src/mainwindow.c:533 ../src/messageview.c:221
 msgid "_Print..."
 msgstr "T_ulosta…"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:533
+#: ../src/mainwindow.c:535
 msgid "Synchronise folders"
 msgstr "Ajantasaista kansiot"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:535
+#: ../src/mainwindow.c:537
 msgid "E_xit"
 msgstr "Poistu"
 
-#: ../src/mainwindow.c:540
+#: ../src/mainwindow.c:542
 msgid "Select _thread"
 msgstr "Valitse _säie"
 
-#: ../src/mainwindow.c:541
+#: ../src/mainwindow.c:543
 msgid "_Delete thread"
 msgstr "Poista otsake"
 
-#: ../src/mainwindow.c:543
+#: ../src/mainwindow.c:545
 msgid "_Find in current message..."
 msgstr "_Etsi nykyisestä viestistä..."
 
-#: ../src/mainwindow.c:545
+#: ../src/mainwindow.c:547
 msgid "_Quick search"
 msgstr "_Pikahaku"
 
 #. View menu
-#: ../src/mainwindow.c:548
+#: ../src/mainwindow.c:550
 msgid "Show or hi_de"
 msgstr "Näytä tai _piilota"
 
-#: ../src/mainwindow.c:549
+#: ../src/mainwindow.c:551
 msgid "_Toolbar"
 msgstr "_Työkalupalkki"
 
-#: ../src/mainwindow.c:551
+#: ../src/mainwindow.c:553
 msgid "Set displayed _columns"
 msgstr "Valitse _näytettävät tiedot"
 
-#: ../src/mainwindow.c:552
+#: ../src/mainwindow.c:554
 msgid "In _folder list..."
 msgstr "_Kansioluettelossa..."
 
-#: ../src/mainwindow.c:553
+#: ../src/mainwindow.c:555
 msgid "In _message list..."
 msgstr "_Viestiluettelossa..."
 
-#: ../src/mainwindow.c:558
+#: ../src/mainwindow.c:560
 msgid "La_yout"
 msgstr "_Asettelu"
 
-#: ../src/mainwindow.c:561
+#: ../src/mainwindow.c:563
 msgid "_Sort"
 msgstr "Järjestä"
 
-#: ../src/mainwindow.c:563
+#: ../src/mainwindow.c:565
 msgid "_Attract by subject"
 msgstr "Otsikonmukainen järjestely"
 
-#: ../src/mainwindow.c:565
+#: ../src/mainwindow.c:567
 msgid "E_xpand all threads"
 msgstr "_Avaa kaikki säikeet"
 
-#: ../src/mainwindow.c:566
+#: ../src/mainwindow.c:568
 msgid "Co_llapse all threads"
 msgstr "_Sulje kaikki säikeet"
 
 #. View menu
-#: ../src/mainwindow.c:568 ../src/messageview.c:232
+#: ../src/mainwindow.c:570 ../src/messageview.c:232
 msgid "_Go to"
 msgstr "_Siirry"
 
-#: ../src/mainwindow.c:569 ../src/messageview.c:233
+#: ../src/mainwindow.c:571 ../src/messageview.c:233
 msgid "_Previous message"
 msgstr "_Edellinen sivu"
 
-#: ../src/mainwindow.c:570 ../src/messageview.c:234
+#: ../src/mainwindow.c:572 ../src/messageview.c:234
 msgid "_Next message"
 msgstr "Seuraava viesti"
 
-#: ../src/mainwindow.c:572 ../src/messageview.c:236
+#: ../src/mainwindow.c:574 ../src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "_Mene edelliseen lukemattomaan viestiin"
 
-#: ../src/mainwindow.c:573 ../src/messageview.c:237
+#: ../src/mainwindow.c:575 ../src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Mene _seuraavaan lukemattomaan viestiin"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:575 ../src/messageview.c:239
+#: ../src/mainwindow.c:577 ../src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Edelliseen _uuteen viestiin"
 
-#: ../src/mainwindow.c:576 ../src/messageview.c:240
+#: ../src/mainwindow.c:578 ../src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Seuraavaan uuteen _viestiin"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:578 ../src/messageview.c:242
+#: ../src/mainwindow.c:580 ../src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Edelliseen merk_ittyyn viestiin"
 
-#: ../src/mainwindow.c:579 ../src/messageview.c:243
+#: ../src/mainwindow.c:581 ../src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Seuraavaan mekrittyyn viestiin"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:581 ../src/messageview.c:245
+#: ../src/mainwindow.c:583 ../src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Edelliseen nim_ettyyn viestiin"
 
-#: ../src/mainwindow.c:582 ../src/messageview.c:246
+#: ../src/mainwindow.c:584 ../src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Seuraavaan nimettyyn _viestiin"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:584 ../src/messageview.c:248
+#: ../src/mainwindow.c:586 ../src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Edelliseen avattuun viestiin"
 
-#: ../src/mainwindow.c:585 ../src/messageview.c:249
+#: ../src/mainwindow.c:587 ../src/messageview.c:249
 msgid "Next opened message"
 msgstr "Seuraavaan avattuun viestiin"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:587 ../src/messageview.c:251
+#: ../src/mainwindow.c:589 ../src/messageview.c:251
 msgid "Parent message"
 msgstr "Yläviesti"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:589 ../src/messageview.c:253
+#: ../src/mainwindow.c:591 ../src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Se_uraavaan lukemattomaan kansioon"
 
-#: ../src/mainwindow.c:590 ../src/messageview.c:254
+#: ../src/mainwindow.c:592 ../src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Muu kansio…"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:592 ../src/messageview.c:256 ../src/mimeview.c:201
+#: ../src/mainwindow.c:594 ../src/messageview.c:256 ../src/mimeview.c:201
 msgid "Next part"
 msgstr "Seuraava osa"
 
-#: ../src/mainwindow.c:593 ../src/messageview.c:257 ../src/mimeview.c:202
+#: ../src/mainwindow.c:595 ../src/messageview.c:257 ../src/mimeview.c:202
 msgid "Previous part"
 msgstr "Edellinen osa"
 
 #. {"View/Scroll/---",                  NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:596 ../src/messageview.c:258
+#: ../src/mainwindow.c:598 ../src/messageview.c:258
 msgid "Message scroll"
 msgstr "Viestin vieritys"
 
-#: ../src/mainwindow.c:597 ../src/messageview.c:259
+#: ../src/mainwindow.c:599 ../src/messageview.c:259
 msgid "Previous line"
 msgstr "Edellinen rivi"
 
-#: ../src/mainwindow.c:598 ../src/messageview.c:260
+#: ../src/mainwindow.c:600 ../src/messageview.c:260
 msgid "Next line"
 msgstr "Uusi rivi"
 
-#: ../src/mainwindow.c:599 ../src/messageview.c:261 ../src/printing.c:481
+#: ../src/mainwindow.c:601 ../src/messageview.c:261 ../src/printing.c:481
 msgid "Previous page"
 msgstr "Edellinen sivu"
 
-#: ../src/mainwindow.c:600 ../src/messageview.c:262 ../src/printing.c:488
+#: ../src/mainwindow.c:602 ../src/messageview.c:262 ../src/printing.c:488
 msgid "Next page"
 msgstr "Seuraava sivu"
 
-#: ../src/mainwindow.c:618 ../src/messageview.c:280
+#: ../src/mainwindow.c:620 ../src/messageview.c:280
 msgid "Decode"
 msgstr "Pura"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:625
+#: ../src/mainwindow.c:627
 msgid "Open in new _window"
 msgstr "_Avaa uudessa ikkunassa"
 
-#: ../src/mainwindow.c:626 ../src/messageview.c:287
+#: ../src/mainwindow.c:628 ../src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Viestin _raakamuoto"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:628 ../src/messageview.c:288
+#: ../src/mainwindow.c:630 ../src/messageview.c:288
 msgid "Message part"
 msgstr "Viestin osa"
 
-#: ../src/mainwindow.c:629 ../src/messageview.c:289
+#: ../src/mainwindow.c:631 ../src/messageview.c:289
 msgid "View as text"
 msgstr "Näytä tekstinä"
 
-#: ../src/mainwindow.c:630 ../src/messageview.c:290 ../src/toolbar.c:403
+#: ../src/mainwindow.c:632 ../src/messageview.c:290 ../src/toolbar.c:403
 msgid "Open"
 msgstr "Avaa"
 
-#: ../src/mainwindow.c:632 ../src/messageview.c:292
+#: ../src/mainwindow.c:634 ../src/messageview.c:292
 msgid "Open with..."
 msgstr "Avaa ohjelmalla…"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:636 ../src/messageview.c:295
+#: ../src/mainwindow.c:638 ../src/messageview.c:295
 msgid "Quotes"
 msgstr "Lainaus"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:638
+#: ../src/mainwindow.c:640
 msgid "_Update summary"
 msgstr "Päivitä _yhteenveto"
 
 #. Message menu
-#: ../src/mainwindow.c:641
+#: ../src/mainwindow.c:643
 msgid "Recei_ve"
 msgstr "_Hae"
 
-#: ../src/mainwindow.c:642
+#: ../src/mainwindow.c:644
 msgid "Get from _current account"
 msgstr "Hae nykyiseltä tililt_ä"
 
-#: ../src/mainwindow.c:643
+#: ../src/mainwindow.c:645
 msgid "Get from _all accounts"
 msgstr "Hae kaikilta _tileiltä"
 
-#: ../src/mainwindow.c:644
+#: ../src/mainwindow.c:646
 msgid "Cancel receivin_g"
 msgstr "_Peruuta haku"
 
-#: ../src/mainwindow.c:647
+#: ../src/mainwindow.c:649
 msgid "_Send queued messages"
 msgstr "_Lähetä jonottavat viestit"
 
-#: ../src/mainwindow.c:652
+#: ../src/mainwindow.c:654
 msgid "Compose a_n email message"
 msgstr "_Kirjoita sähköpostiviesti"
 
-#: ../src/mainwindow.c:653
+#: ../src/mainwindow.c:655
 msgid "Compose a news message"
 msgstr "_Kirjoita keskusteluryhmäviesti"
 
-#: ../src/mainwindow.c:655 ../src/messageview.c:301
+#: ../src/mainwindow.c:657 ../src/messageview.c:301
 #: ../src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Vastaa"
 
 #. COMPOSE_REPLY
-#: ../src/mainwindow.c:656 ../src/messageview.c:302 ../src/summaryview.c:426
+#: ../src/mainwindow.c:658 ../src/messageview.c:302 ../src/summaryview.c:426
 msgid "Repl_y to"
 msgstr "_Vastaa kohteeseen"
 
 #. COMPOSE_REPLY_TO_SENDER
-#: ../src/mainwindow.c:659 ../src/messageview.c:305
+#: ../src/mainwindow.c:661 ../src/messageview.c:305
 msgid "Mailing _list"
 msgstr "_Postituslista"
 
 #. COMPOSE_REPLY_TO_LIST
-#: ../src/mainwindow.c:660
+#: ../src/mainwindow.c:662
 msgid "Follow-up and reply to"
 msgstr "Vastaukset ja keskustelunsiirto"
 
@@ -7428,177 +7594,177 @@ msgstr "Vastaukset ja keskustelunsiirto"
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REPLY_TO_LIST
 #. {"Message/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:663 ../src/messageview.c:308 ../src/toolbar.c:2069
+#: ../src/mainwindow.c:665 ../src/messageview.c:308 ../src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Edelleenlähetä"
 
 #. COMPOSE_FORWARD_INLINE
-#: ../src/mainwindow.c:664 ../src/messageview.c:309 ../src/toolbar.c:2070
+#: ../src/mainwindow.c:666 ../src/messageview.c:309 ../src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "_Edelleenlähetä liitteenä"
 
 #. COMPOSE_FORWARD_AS_ATTACH
-#: ../src/mainwindow.c:665 ../src/messageview.c:310 ../src/toolbar.c:2071
+#: ../src/mainwindow.c:667 ../src/messageview.c:310 ../src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "_Uudelleenohjaa"
 
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:667
+#: ../src/mainwindow.c:669
 msgid "Mailing-_List"
 msgstr "_Postituslista"
 
-#: ../src/mainwindow.c:668
+#: ../src/mainwindow.c:670
 msgid "Post"
 msgstr "Posti"
 
-#: ../src/mainwindow.c:670
+#: ../src/mainwindow.c:672
 msgid "Help"
 msgstr "Ohje"
 
-#: ../src/mainwindow.c:674
+#: ../src/mainwindow.c:676
 msgid "Unsubscribe"
 msgstr "Poista ryhmän tilaus"
 
-#: ../src/mainwindow.c:676
+#: ../src/mainwindow.c:678
 msgid "View archive"
 msgstr "Katso arkisto"
 
-#: ../src/mainwindow.c:678
+#: ../src/mainwindow.c:680
 msgid "Contact owner"
 msgstr "Omistajan yhteystieto"
 
 #. separation
-#: ../src/mainwindow.c:682
+#: ../src/mainwindow.c:684
 msgid "M_ove..."
 msgstr "S_iirrä…"
 
-#: ../src/mainwindow.c:683
+#: ../src/mainwindow.c:685
 msgid "_Copy..."
 msgstr "_Kopioi…"
 
-#: ../src/mainwindow.c:684
+#: ../src/mainwindow.c:686
 msgid "Move to _trash"
 msgstr "Siirrä _roskiin"
 
-#: ../src/mainwindow.c:685
+#: ../src/mainwindow.c:687
 msgid "_Delete..."
 msgstr "_Poista…"
 
-#: ../src/mainwindow.c:686
+#: ../src/mainwindow.c:688
 msgid "Cancel a news message"
 msgstr "Peruuta keskusteluryhmäviesti"
 
 #. separation
-#: ../src/mainwindow.c:689 ../src/mainwindow.c:690 ../src/summaryview.c:427
+#: ../src/mainwindow.c:691 ../src/mainwindow.c:692 ../src/summaryview.c:427
 msgid "_Mark"
 msgstr "_Merkitse"
 
-#: ../src/mainwindow.c:691
+#: ../src/mainwindow.c:693
 msgid "_Unmark"
 msgstr "_Poista merkintä"
 
-#: ../src/mainwindow.c:694
+#: ../src/mainwindow.c:696
 msgid "Mark as unr_ead"
 msgstr "Merkitse luk_emattomaksi"
 
-#: ../src/mainwindow.c:695
+#: ../src/mainwindow.c:697
 msgid "Mark as rea_d"
 msgstr "Merkitse _luetuksi"
 
 #. separation
-#: ../src/mainwindow.c:697
+#: ../src/mainwindow.c:699
 msgid "Mark all read"
 msgstr "Merkitse kaikki luetuiksi"
 
 #. separation
-#: ../src/mainwindow.c:699 ../src/prefs_filtering_action.c:199
+#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:199
 #: ../src/toolbar.c:208 ../src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Ohita säie"
 
-#: ../src/mainwindow.c:700
+#: ../src/mainwindow.c:702
 msgid "Unignore thread"
 msgstr "Poista säikeen ohitus"
 
-#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:200
+#: ../src/mainwindow.c:703 ../src/prefs_filtering_action.c:200
 #: ../src/toolbar.c:209 ../src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Tarkkaile säiettä"
 
-#: ../src/mainwindow.c:702
+#: ../src/mainwindow.c:704
 msgid "Unwatch thread"
 msgstr "Poista säikeen tarkkailu"
 
 #. separation
-#: ../src/mainwindow.c:705
+#: ../src/mainwindow.c:707
 msgid "Mark as _spam"
 msgstr "Merkitse ro_skapostiksi"
 
-#: ../src/mainwindow.c:706
+#: ../src/mainwindow.c:708
 msgid "Mark as _ham"
 msgstr "Merkitse _ei‐roskapostiksi"
 
 #. separation
-#: ../src/mainwindow.c:709 ../src/prefs_filtering_action.c:181
+#: ../src/mainwindow.c:711 ../src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Lukitse"
 
-#: ../src/mainwindow.c:710 ../src/prefs_filtering_action.c:182
+#: ../src/mainwindow.c:712 ../src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Poista lukitus"
 
-#: ../src/mainwindow.c:712 ../src/summaryview.c:428
+#: ../src/mainwindow.c:714 ../src/summaryview.c:428
 msgid "Color la_bel"
 msgstr "_Värimerkintä"
 
-#: ../src/mainwindow.c:713 ../src/summaryview.c:429
+#: ../src/mainwindow.c:715 ../src/summaryview.c:429
 msgid "Ta_gs"
 msgstr "Tä_git"
 
 #. {"Message/---",			NULL, "---" },
-#: ../src/mainwindow.c:716
+#: ../src/mainwindow.c:718
 msgid "Re-_edit"
 msgstr "Uudelleen_muokkaa"
 
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:719 ../src/messageview.c:311 ../src/mimeview.c:1027
+#: ../src/mainwindow.c:721 ../src/messageview.c:311 ../src/mimeview.c:1027
 msgid "Check signature"
 msgstr "Lisää allekirjoitus"
 
-#: ../src/mainwindow.c:724 ../src/messageview.c:315
+#: ../src/mainwindow.c:726 ../src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "Lisää lähettäjä _osoitekirjaan"
 
-#: ../src/mainwindow.c:726
+#: ../src/mainwindow.c:728
 msgid "C_ollect addresses"
 msgstr "Kerää _osoitteita"
 
-#: ../src/mainwindow.c:727
+#: ../src/mainwindow.c:729
 msgid "From current _folder..."
 msgstr "_Nykyisestä kansiosta..."
 
-#: ../src/mainwindow.c:728
+#: ../src/mainwindow.c:730
 msgid "From selected _messages..."
 msgstr "_Valituista viesteistä..."
 
-#: ../src/mainwindow.c:731
+#: ../src/mainwindow.c:733
 msgid "_Filter all messages in folder"
 msgstr "_Suodata kaikki kansion viestit"
 
-#: ../src/mainwindow.c:732
+#: ../src/mainwindow.c:734
 msgid "Filter _selected messages"
 msgstr "Suodata _valitut viestit"
 
-#: ../src/mainwindow.c:733
+#: ../src/mainwindow.c:735
 msgid "Run folder pr_ocessing rules"
 msgstr "Suorita _käsittelysäännöt"
 
-#: ../src/mainwindow.c:735 ../src/messageview.c:318
+#: ../src/mainwindow.c:737 ../src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "Luo suoda_tussääntö"
 
-#: ../src/mainwindow.c:736 ../src/mainwindow.c:742 ../src/messageview.c:319
+#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/messageview.c:319
 #: ../src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automaattinen"
@@ -7606,7 +7772,7 @@ msgstr "_Automaattinen"
 #. FILTER_BY_AUTO
 #. radio SORT_BY_THREAD_DATE
 #. FILTER_BY_AUTO
-#: ../src/mainwindow.c:737 ../src/mainwindow.c:743 ../src/mainwindow.c:845
+#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/mainwindow.c:848
 #: ../src/messageview.c:320 ../src/messageview.c:326
 msgid "By _From"
 msgstr "_Lähettäjän mukaan"
@@ -7614,386 +7780,391 @@ msgstr "_Lähettäjän mukaan"
 #. FILTER_BY_FROM
 #. radio SORT_BY_FROM
 #. FILTER_BY_FROM
-#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/mainwindow.c:846
+#: ../src/mainwindow.c:740 ../src/mainwindow.c:746 ../src/mainwindow.c:849
 #: ../src/messageview.c:321 ../src/messageview.c:327
 msgid "By _To"
 msgstr "Vas_taanottajan mukaan"
 
 #. FILTER_BY_TO
-#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/messageview.c:322
+#: ../src/mainwindow.c:741 ../src/mainwindow.c:747 ../src/messageview.c:322
 #: ../src/messageview.c:328
 msgid "By _Subject"
 msgstr "_Aiheen mukaan"
 
 #. FILTER_BY_SUBJECT
-#: ../src/mainwindow.c:741 ../src/messageview.c:324 ../src/summaryview.c:432
+#: ../src/mainwindow.c:743 ../src/messageview.c:324 ../src/summaryview.c:432
 msgid "Create processing rule"
 msgstr "Luo käsittelysääntö"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:748 ../src/messageview.c:332
+#: ../src/mainwindow.c:750 ../src/messageview.c:332
 msgid "List _URLs..."
 msgstr "Luettele _URLit…"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:755
+#: ../src/mainwindow.c:757
 msgid "Ch_eck for new messages in all folders"
 msgstr "Tarkasta _uudet viestit kaikissa kansioissa"
 
-#: ../src/mainwindow.c:756
+#: ../src/mainwindow.c:758
 msgid "Delete du_plicated messages"
 msgstr "Poista _kaksoiskappaleet"
 
-#: ../src/mainwindow.c:757
+#: ../src/mainwindow.c:759
 msgid "In selected folder"
 msgstr "Valitussa kansiossa"
 
-#: ../src/mainwindow.c:758
+#: ../src/mainwindow.c:760
 msgid "In all folders"
 msgstr "Kaikissa kansioissa"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:761
+#: ../src/mainwindow.c:763
 msgid "E_xecute"
 msgstr "_Suorita"
 
-#: ../src/mainwindow.c:762
+#: ../src/mainwindow.c:764
 msgid "Exp_unge"
 msgstr "_Poista lopullisesti"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:765
+#: ../src/mainwindow.c:767
 msgid "SSL cer_tificates"
 msgstr "_SSL-varmenteet"
 
-#: ../src/mainwindow.c:769
+#: ../src/mainwindow.c:771
 msgid "Filtering Lo_g"
 msgstr "_Suodatusloki"
 
-#: ../src/mainwindow.c:771
+#: ../src/mainwindow.c:773
 msgid "Network _Log"
 msgstr "_Verkkoloki"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:773
+#: ../src/mainwindow.c:775
 msgid "_Forget all session passwords"
 msgstr "_Unohda istunnon salasanat"
 
 #. Configuration menu
-#: ../src/mainwindow.c:776
+#: ../src/mainwindow.c:778
 msgid "C_hange current account"
 msgstr "_Vaihda nykyistä tiliä"
 
-#: ../src/mainwindow.c:778
+#: ../src/mainwindow.c:780
 msgid "_Preferences for current account..."
 msgstr "_Asetukset tälle tilille…"
 
-#: ../src/mainwindow.c:779
+#: ../src/mainwindow.c:781
 msgid "Create _new account..."
 msgstr "Luo _uusi tili…"
 
-#: ../src/mainwindow.c:780
+#: ../src/mainwindow.c:782
 msgid "_Edit accounts..."
 msgstr "Muokkaa tilejä"
 
-#: ../src/mainwindow.c:783
+#: ../src/mainwindow.c:785
 msgid "P_references..."
 msgstr "Asetukset"
 
-#: ../src/mainwindow.c:784
+#: ../src/mainwindow.c:786
 msgid "Pre-pr_ocessing..."
 msgstr "_Esikäsittely…"
 
-#: ../src/mainwindow.c:785
+#: ../src/mainwindow.c:787
 msgid "Post-pro_cessing..."
 msgstr "_Jälkikäsittely…"
 
-#: ../src/mainwindow.c:786
+#: ../src/mainwindow.c:788
 msgid "_Filtering..."
 msgstr "_Suodatus…"
 
-#: ../src/mainwindow.c:787
+#: ../src/mainwindow.c:789
 msgid "_Templates..."
 msgstr "_Mallineet"
 
-#: ../src/mainwindow.c:788
+#: ../src/mainwindow.c:790
 msgid "_Actions..."
 msgstr "_Toiminnot"
 
-#: ../src/mainwindow.c:789
+#: ../src/mainwindow.c:791
 msgid "Tag_s..."
 msgstr "_Tägit"
 
 #. {"Configuration/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:791
+#: ../src/mainwindow.c:793
 msgid "Plu_gins..."
 msgstr "_Liitännäiset..."
 
 #. Help menu
-#: ../src/mainwindow.c:794
+#: ../src/mainwindow.c:796
 msgid "_Manual"
 msgstr "_Ohjekirja"
 
-#: ../src/mainwindow.c:795
+#: ../src/mainwindow.c:797
 msgid "_Online User-contributed FAQ"
 msgstr "_Käyttäjien tekemä VUKK verkossa"
 
-#: ../src/mainwindow.c:796
+#: ../src/mainwindow.c:798
 msgid "Icon _Legend"
 msgstr "_Kuvakkeiden merkitykset"
 
-#: ../src/mainwindow.c:798
+#: ../src/mainwindow.c:800
 msgid "Set as default client"
 msgstr "Aseta oletusohjelmaksi"
 
-#: ../src/mainwindow.c:805
+#: ../src/mainwindow.c:807
 msgid "Offline _mode"
 msgstr "Pois verkosta"
 
 #. toggle
-#: ../src/mainwindow.c:806
+#: ../src/mainwindow.c:808
+msgid "Men_ubar"
+msgstr "Men_uvalikko"
+
+#. toggle
+#: ../src/mainwindow.c:809
 msgid "_Message view"
 msgstr "_Viestinäkymä"
 
-#: ../src/mainwindow.c:808
+#: ../src/mainwindow.c:811
 msgid "Status _bar"
 msgstr "_Tilapalkki"
 
-#: ../src/mainwindow.c:810
+#: ../src/mainwindow.c:813
 msgid "Column headers"
 msgstr "Sarakkeiden otsikot"
 
 #. toggle
-#: ../src/mainwindow.c:811
+#: ../src/mainwindow.c:814
 msgid "Th_read view"
 msgstr "_Säikeistä viestiketjut"
 
 #. toggle
-#: ../src/mainwindow.c:812
+#: ../src/mainwindow.c:815
 msgid "Hide read threads"
 msgstr "Piilota luetut säikeet"
 
 #. toggle
-#: ../src/mainwindow.c:813
+#: ../src/mainwindow.c:816
 msgid "_Hide read messages"
 msgstr "_Piilota luetut viestit"
 
 #. toggle
-#: ../src/mainwindow.c:814
+#: ../src/mainwindow.c:817
 msgid "Hide deleted messages"
 msgstr "Piilota poistetu viestit"
 
 #. toggle
-#: ../src/mainwindow.c:815
+#: ../src/mainwindow.c:818
 msgid "_Fullscreen"
 msgstr "_Kokonäyttö"
 
 #. toggle
-#: ../src/mainwindow.c:816 ../src/messageview.c:344
+#: ../src/mainwindow.c:819 ../src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Näytä kaikki _otsakkeet"
 
 #. toggle
-#: ../src/mainwindow.c:817 ../src/messageview.c:345
+#: ../src/mainwindow.c:820 ../src/messageview.c:345
 msgid "_Collapse all"
 msgstr "_Sulje kaikki säikeet"
 
 #. 1 toggle
-#: ../src/mainwindow.c:818 ../src/messageview.c:346
+#: ../src/mainwindow.c:821 ../src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Taittele tasolta _2"
 
 #. 2 toggle
-#: ../src/mainwindow.c:819 ../src/messageview.c:347
+#: ../src/mainwindow.c:822 ../src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Taittele tasolta _3"
 
 #. toggle_toolbar_cb
-#: ../src/mainwindow.c:823
+#: ../src/mainwindow.c:826
 msgid "Text _below icons"
 msgstr "Teksti kuvien _alla"
 
 #. radio TOOLBAR_BOTH
-#: ../src/mainwindow.c:824
+#: ../src/mainwindow.c:827
 msgid "Text be_side icons"
 msgstr "Teksti kuvien _sivulla"
 
 #. radio TOOLBAR_BOTH_HORIZ
-#: ../src/mainwindow.c:825
+#: ../src/mainwindow.c:828
 msgid "_Icons only"
 msgstr "Vain _kuvat"
 
 #. radio TOOLBAR_ICON
-#: ../src/mainwindow.c:826
+#: ../src/mainwindow.c:829
 msgid "_Text only"
 msgstr "Vain _teksti"
 
 #. set_layout_cb
-#: ../src/mainwindow.c:833
+#: ../src/mainwindow.c:836
 msgid "_Standard"
 msgstr "_Standardi"
 
 #. radio NORMAL_LAYOUT
-#: ../src/mainwindow.c:834
+#: ../src/mainwindow.c:837
 msgid "_Three columns"
 msgstr "_Kolmisarakkeinen"
 
 #. radio VERTICAL_LAYOUT
-#: ../src/mainwindow.c:835
+#: ../src/mainwindow.c:838
 msgid "_Wide message"
 msgstr "Leveä _viesti"
 
 #. radio WIDE_LAYOUT
-#: ../src/mainwindow.c:836
+#: ../src/mainwindow.c:839
 msgid "W_ide message list"
 msgstr "Leveä viesti_luettelo"
 
 #. radio WIDE_MSGLIST_LAYOUT
-#: ../src/mainwindow.c:837
+#: ../src/mainwindow.c:840
 msgid "S_mall screen"
 msgstr "_Pieni näyttö"
 
 #. sort_summary_cb
-#: ../src/mainwindow.c:841
+#: ../src/mainwindow.c:844
 msgid "By _number"
 msgstr "_Määrän mukaan"
 
 #. radio SORT_BY_NUMBER
-#: ../src/mainwindow.c:842
+#: ../src/mainwindow.c:845
 msgid "By s_ize"
 msgstr "Koon mukaan"
 
 #. radio SORT_BY_SIZE
-#: ../src/mainwindow.c:843
+#: ../src/mainwindow.c:846
 msgid "By _date"
 msgstr "_Päiväyksen mukaan"
 
 #. radio SORT_BY_DATE
-#: ../src/mainwindow.c:844
+#: ../src/mainwindow.c:847
 msgid "By thread date"
 msgstr "Säikeen päiväyksen mukaan"
 
 #. radio SORT_BY_TO
-#: ../src/mainwindow.c:847
+#: ../src/mainwindow.c:850
 msgid "By s_ubject"
 msgstr "_Aiheen mukaan"
 
 #. radio SORT_BY_SUBJECT
-#: ../src/mainwindow.c:848
+#: ../src/mainwindow.c:851
 msgid "By _color label"
 msgstr "_Värin mukaan"
 
 #. radio SORT_BY_LABEL
-#: ../src/mainwindow.c:849
+#: ../src/mainwindow.c:852
 msgid "By tag"
 msgstr "Tägin mukaan"
 
 #. radio SORT_BY_TAGS
-#: ../src/mainwindow.c:850
+#: ../src/mainwindow.c:853
 msgid "By _mark"
 msgstr "_Merkintöjen mukaan"
 
 #. radio SORT_BY_MARK
-#: ../src/mainwindow.c:851
+#: ../src/mainwindow.c:854
 msgid "By _status"
 msgstr "_Tilan mukaan"
 
 #. radio SORT_BY_STATUS
-#: ../src/mainwindow.c:852
+#: ../src/mainwindow.c:855
 msgid "By a_ttachment"
 msgstr "_Liitteiden mukaan"
 
 #. radio SORT_BY_MIME
-#: ../src/mainwindow.c:853
+#: ../src/mainwindow.c:856
 msgid "By score"
 msgstr "Pisteiden mukaan"
 
 #. radio SORT_BY_SCORE
-#: ../src/mainwindow.c:854
+#: ../src/mainwindow.c:857
 msgid "By locked"
 msgstr "Lukittuuden mukaan"
 
 #. radio SORT_BY_LOCKED
-#: ../src/mainwindow.c:855
+#: ../src/mainwindow.c:858
 msgid "D_on't sort"
 msgstr "Älä järjestele"
 
 #. sort_summary_type_cb
-#: ../src/mainwindow.c:859
+#: ../src/mainwindow.c:862
 msgid "Ascending"
 msgstr "Nousevaan"
 
 #. radio SORT_ASCENDING
-#: ../src/mainwindow.c:860
+#: ../src/mainwindow.c:863
 msgid "Descending"
 msgstr "Laskevaan"
 
-#: ../src/mainwindow.c:901 ../src/messageview.c:388
+#: ../src/mainwindow.c:904 ../src/messageview.c:388
 msgid "_Auto detect"
 msgstr "Tunnista _automaattisesti"
 
-#: ../src/mainwindow.c:1298 ../src/summaryview.c:6236
+#: ../src/mainwindow.c:1301 ../src/summaryview.c:6236
 msgid "Apply tags..."
 msgstr "Toteuta tägit…"
 
-#: ../src/mainwindow.c:1936
+#: ../src/mainwindow.c:1943
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Virheitä havaittiin. Avaa loki tästä."
 
-#: ../src/mainwindow.c:1951
+#: ../src/mainwindow.c:1958
 msgid "You are online. Click the icon to go offline"
 msgstr "Yhteystila päällä. Paina kuvaketta siirtyäksesi pois yhteystilasta."
 
-#: ../src/mainwindow.c:1954
+#: ../src/mainwindow.c:1961
 msgid "You are offline. Click the icon to go online"
 msgstr "Yhteystila pois päältä. Paina kuvaketta yhteystilaan."
 
-#: ../src/mainwindow.c:1968
+#: ../src/mainwindow.c:1975
 msgid "Select account"
 msgstr "Valitse tili"
 
 #. init log instances data before creating log views
 #. Protocol log
-#: ../src/mainwindow.c:1995 ../src/prefs_logging.c:140
+#: ../src/mainwindow.c:2002 ../src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Verkkoloki"
 
-#: ../src/mainwindow.c:1999
+#: ../src/mainwindow.c:2006
 msgid "Filtering/Processing debug log"
 msgstr "Suodatus- ja käsittelyloki"
 
-#: ../src/mainwindow.c:2018 ../src/prefs_logging.c:392
+#: ../src/mainwindow.c:2025 ../src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "suodatusloki päällä\n"
 
-#: ../src/mainwindow.c:2020 ../src/prefs_logging.c:394
+#: ../src/mainwindow.c:2027 ../src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "suodatusloki pois päältä.\n"
 
-#: ../src/mainwindow.c:2460 ../src/mainwindow.c:2467 ../src/mainwindow.c:2510
-#: ../src/mainwindow.c:2543 ../src/mainwindow.c:2575 ../src/mainwindow.c:2620
+#: ../src/mainwindow.c:2470 ../src/mainwindow.c:2477 ../src/mainwindow.c:2520
+#: ../src/mainwindow.c:2553 ../src/mainwindow.c:2585 ../src/mainwindow.c:2630
 #: ../src/plugins/notification/notification_trayicon.c:360
-#: ../src/prefs_folder_item.c:1065
+#: ../src/plugins/rssyl/opml_import.c:73 ../src/prefs_folder_item.c:1065
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: ../src/mainwindow.c:2621 ../src/prefs_summary_open.c:114
+#: ../src/mainwindow.c:2631 ../src/prefs_summary_open.c:114
 msgid "none"
 msgstr "ei mitään"
 
-#: ../src/mainwindow.c:2878 ../src/mainwindow.c:2882
+#: ../src/mainwindow.c:2888 ../src/mainwindow.c:2892
 msgid "Delete all messages in trash folders?"
 msgstr "Poistetaanko kaikki viestit roskiksesta?"
 
-#: ../src/mainwindow.c:2879
+#: ../src/mainwindow.c:2889
 msgid "Don't quit"
 msgstr "Älä lopeta"
 
-#: ../src/mainwindow.c:2908 ../src/plugins/mailmbox/plugin_gtk.c:189
+#: ../src/mainwindow.c:2918 ../src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Lisää postilaatikko"
 
-#: ../src/mainwindow.c:2909
+#: ../src/mainwindow.c:2919
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -8003,18 +8174,18 @@ msgstr ""
 "Jos se on olemassaoleva postilaatikko,\n"
 "se skannataan automaattisesti."
 
-#: ../src/mainwindow.c:2915 ../src/plugins/mailmbox/plugin_gtk.c:196
-#: ../src/plugins/rssyl/rssyl_gtk.c:158
+#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:196
+#: ../src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Postilaatikko ”%s” on jo olemassa."
 
-#: ../src/mainwindow.c:2920 ../src/plugins/mailmbox/plugin_gtk.c:202
+#: ../src/mainwindow.c:2930 ../src/plugins/mailmbox/plugin_gtk.c:202
 #: ../src/setup.c:52 ../src/wizard.c:741
 msgid "Mailbox"
 msgstr "Postilaatikko"
 
-#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:209
+#: ../src/mainwindow.c:2935 ../src/plugins/mailmbox/plugin_gtk.c:209
 #: ../src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
@@ -8025,136 +8196,136 @@ msgstr ""
 "Jotkin tiedostot saattavat jo olla olemassa, tai sinulta puuttuu "
 "kirjoitusoikeus."
 
-#: ../src/mainwindow.c:3377
+#: ../src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "Viestien lähetys kielletty"
 
-#: ../src/mainwindow.c:3955
+#: ../src/mainwindow.c:3965
 msgid "Mbox import has failed."
 msgstr "Virhe tuotaessa mbox-tiedostoa."
 
-#: ../src/mainwindow.c:3964 ../src/mainwindow.c:3973
+#: ../src/mainwindow.c:3974 ../src/mainwindow.c:3983
 msgid "Export to mbox has failed."
 msgstr "Mbox-vienti epäonnistui"
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit"
 msgstr "Poistu"
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit Claws Mail?"
 msgstr "Poistutaanko Claws Mailista?"
 
-#: ../src/mainwindow.c:4205
+#: ../src/mainwindow.c:4215
 msgid "Folder synchronisation"
 msgstr "Kansion ajantasaistus"
 
-#: ../src/mainwindow.c:4206
+#: ../src/mainwindow.c:4216
 msgid "Do you want to synchronise your folders now?"
 msgstr "Ajantasaistentaanko kansiot?"
 
-#: ../src/mainwindow.c:4207
+#: ../src/mainwindow.c:4217
 msgid "+_Synchronise"
 msgstr "_Ajantasaista"
 
-#: ../src/mainwindow.c:4636
+#: ../src/mainwindow.c:4659
 msgid "Deleting duplicated messages..."
 msgstr "Poistetaan kaksoiskappaleet…"
 
-#: ../src/mainwindow.c:4673
+#: ../src/mainwindow.c:4696
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Poistettiin %d kaksoiskappale %d kansiosta.\n"
 msgstr[1] "Poistettiin %d kappaletta %d kansiosta.\n"
 
-#: ../src/mainwindow.c:4928 ../src/summaryview.c:5725
+#: ../src/mainwindow.c:4951 ../src/summaryview.c:5725
 msgid "Processing rules to apply before folder rules"
 msgstr "Käsittelysäännöt, jotka merkitsevät ennen kansion sääntöjä"
 
-#: ../src/mainwindow.c:4936
+#: ../src/mainwindow.c:4959
 msgid "Processing rules to apply after folder rules"
 msgstr "Käsittelysäännöt, jotka merkitsevät kansion sääntöjen jälkeen"
 
-#: ../src/mainwindow.c:4944 ../src/summaryview.c:5736
+#: ../src/mainwindow.c:4967 ../src/summaryview.c:5736
 msgid "Filtering configuration"
 msgstr "Suodatusasetukset"
 
-#: ../src/mainwindow.c:5059
+#: ../src/mainwindow.c:5082
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Ei voitu rekisteröidä oletusohjelmaksi. Suorituspolun selvittäminen ei "
 "onnistu."
 
-#: ../src/mainwindow.c:5118
+#: ../src/mainwindow.c:5141
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail on rekisteröity oletusohjelmaksi."
 
-#: ../src/mainwindow.c:5120
+#: ../src/mainwindow.c:5143
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Ei voitu rekisteröidä oletusohjelmaksi, koska rekisteriin ei voi kirjoittaa."
 
-#: ../src/mainwindow.c:5278
+#: ../src/mainwindow.c:5301
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "Unohdettu %d salasana %d tilissä.\n"
 msgstr[1] "Unohdettu %d salasanaa %d tilissä.\n"
 
-#: ../src/matcher.c:209 ../src/matcher.c:210 ../src/matcher.c:211
-#: ../src/matcher.c:212 ../src/matcher.c:213 ../src/matcher.c:214
-#: ../src/matcher.c:215
+#: ../src/matcher.c:211 ../src/matcher.c:212 ../src/matcher.c:213
+#: ../src/matcher.c:214 ../src/matcher.c:215 ../src/matcher.c:216
+#: ../src/matcher.c:217
 #, c-format
 msgid "%s header"
 msgstr "%s-otsake"
 
-#: ../src/matcher.c:216
+#: ../src/matcher.c:218
 msgid "header"
 msgstr "otsake"
 
-#: ../src/matcher.c:217
+#: ../src/matcher.c:219
 msgid "header line"
 msgstr "otsakerivi"
 
-#: ../src/matcher.c:218
+#: ../src/matcher.c:220
 msgid "body line"
 msgstr "sisältörivi"
 
-#: ../src/matcher.c:219
+#: ../src/matcher.c:221
 msgid "tag"
 msgstr "tägi"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553 ../src/message_search.c:205 ../src/prefs_matcher.c:739
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555 ../src/message_search.c:205 ../src/prefs_matcher.c:742
 #: ../src/summary_search.c:466
 msgid "Case sensitive"
 msgstr "Kirjaintasot erotteleva"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555
 msgid "Case insensitive"
 msgstr "Kirjaintasot erottelematon"
 
-#: ../src/matcher.c:1818
+#: ../src/matcher.c:1843
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "tarkasteaan täsmääkö viesti [ %s ]\n"
 
-#: ../src/matcher.c:1887 ../src/matcher.c:1906 ../src/matcher.c:1919
+#: ../src/matcher.c:1912 ../src/matcher.c:1931 ../src/matcher.c:1944
 msgid "message matches\n"
 msgstr "viesti täsmää\n"
 
-#: ../src/matcher.c:1894 ../src/matcher.c:1912 ../src/matcher.c:1921
+#: ../src/matcher.c:1919 ../src/matcher.c:1937 ../src/matcher.c:1946
 msgid "message does not match\n"
 msgstr "viesti ei täsmää.\n"
 
-#: ../src/matcher.c:2184 ../src/matcher.c:2185 ../src/matcher.c:2186
-#: ../src/matcher.c:2187 ../src/matcher.c:2188 ../src/matcher.c:2189
-#: ../src/matcher.c:2190 ../src/matcher.c:2191
+#: ../src/matcher.c:2209 ../src/matcher.c:2210 ../src/matcher.c:2211
+#: ../src/matcher.c:2212 ../src/matcher.c:2213 ../src/matcher.c:2214
+#: ../src/matcher.c:2215 ../src/matcher.c:2216
 msgid "(none)"
 msgstr "(ei mitään)"
 
@@ -8182,8 +8353,8 @@ msgstr "Korvaa olemassaoleva mbox-tiedosto"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tiedosto on jo olemassa, korvataanko?"
 
-#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1843
-#: ../src/prefs_themes.c:555 ../src/textview.c:3075
+#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1844
+#: ../src/prefs_themes.c:555 ../src/textview.c:3054
 msgid "Overwrite"
 msgstr "Korvaa"
 
@@ -8277,7 +8448,7 @@ msgstr ""
 msgid "Fetching message (%s)..."
 msgstr "Haetaan viestiä (%s)…"
 
-#: ../src/messageview.c:1357 ../src/procmime.c:1004
+#: ../src/messageview.c:1357 ../src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Ei voitu salata: %s"
@@ -8286,9 +8457,9 @@ msgstr "Ei voitu salata: %s"
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Viesti ei noudata MIME-standardia ja saattaa hajota."
 
-#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1996
-#: ../src/plugins/fancy/fancy_viewer.c:667 ../src/summaryview.c:4808
-#: ../src/summaryview.c:4811 ../src/textview.c:3063
+#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1997
+#: ../src/plugins/fancy/fancy_viewer.c:669 ../src/summaryview.c:4808
+#: ../src/summaryview.c:4811 ../src/textview.c:3042
 msgid "Save as"
 msgstr "Tallenna nimellä"
 
@@ -8393,7 +8564,7 @@ msgstr ""
 "Viesti on lähetetty useille tileistäsi.\n"
 "Valitse mitä niistä käytät saapumisilmoituksen lähettämiseen:"
 
-#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_gtk.c:494
+#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_feed_props.c:533
 msgid "_Cancel"
 msgstr "_Peru"
 
@@ -8430,20 +8601,20 @@ msgstr ""
 "  Viesti on poistettu tai siirretty toiseen kansioon"
 
 #: ../src/messageview.c:2971 ../src/messageview.c:2977
-#: ../src/summaryview.c:4191 ../src/summaryview.c:6964
+#: ../src/summaryview.c:4193 ../src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "Virhe luokiteltaessa roskapostia muistiin.\n"
 
-#: ../src/mh.c:432
+#: ../src/mh.c:438
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ei voida kopioida viestiä %s kohteeseen %s\n"
 
-#: ../src/mh.c:518
+#: ../src/mh.c:524
 msgid "Moving messages..."
 msgstr "Siirretään viestejä…"
 
-#: ../src/mh.c:662 ../src/plugins/mailmbox/mailmbox_folder.c:839
+#: ../src/mh.c:668 ../src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Poistetaan viestiä…"
 
@@ -8534,32 +8705,32 @@ msgstr "Haetaan viestiä…"
 msgid "Go back to email"
 msgstr "Palaa sähköpostiin"
 
-#: ../src/mimeview.c:1762 ../src/mimeview.c:1851 ../src/mimeview.c:2043
-#: ../src/mimeview.c:2079 ../src/mimeview.c:2191
-#: ../src/plugins/fancy/fancy_viewer.c:420
+#: ../src/mimeview.c:1763 ../src/mimeview.c:1852 ../src/mimeview.c:2044
+#: ../src/mimeview.c:2080 ../src/mimeview.c:2192
+#: ../src/plugins/fancy/fancy_viewer.c:422
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Ei voida tallentaa osaa moniosaviestistä: %s"
 
-#: ../src/mimeview.c:1840 ../src/textview.c:3073
+#: ../src/mimeview.c:1841 ../src/textview.c:3052
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Korvataanko tiedosto ”%s”?"
 
-#: ../src/mimeview.c:1882 ../src/plugins/archive/archiver_prefs.c:128
+#: ../src/mimeview.c:1883 ../src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
 msgstr "Valitse kohdekansio"
 
-#: ../src/mimeview.c:1889 ../src/plugins/archive/archiver_prefs.c:134
+#: ../src/mimeview.c:1890 ../src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "”%s” ei ole hakemisto."
 
-#: ../src/mimeview.c:2126 ../src/mimeview.c:2133 ../src/textview.c:2994
+#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2973
 msgid "Open with"
 msgstr "Avaa ohjelmalla"
 
-#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2995
+#: ../src/mimeview.c:2128 ../src/mimeview.c:2135 ../src/textview.c:2974
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8568,11 +8739,11 @@ msgstr ""
 "Anna tiedostonavauskomento:\n"
 "(”%s” korvautuu tiedostonimellä)"
 
-#: ../src/mimeview.c:2225
+#: ../src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "Suoritetaanko ei-luotettu vieras ohjelma?"
 
-#: ../src/mimeview.c:2226
+#: ../src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8584,19 +8755,19 @@ msgstr ""
 "\n"
 "Suoritetaanko tiedosto?"
 
-#: ../src/mimeview.c:2230
+#: ../src/mimeview.c:2231
 msgid "Run binary"
 msgstr "Suorita tiedosto"
 
-#: ../src/mimeview.c:2529
+#: ../src/mimeview.c:2530
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: ../src/mimeview.c:2530 ../src/plugins/pdf_viewer/poppler_viewer.c:699
+#: ../src/mimeview.c:2531 ../src/plugins/pdf_viewer/poppler_viewer.c:699
 msgid "Size:"
 msgstr "Koko:"
 
-#: ../src/mimeview.c:2544 ../src/plugins/vcalendar/vcalendar.c:1271
+#: ../src/mimeview.c:2545 ../src/plugins/vcalendar/vcalendar.c:1271
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1722
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1732
 msgid "Description:"
@@ -8723,7 +8894,7 @@ msgstr "Poistetaanko ryhmän ”%s” tilaus?"
 msgid "Unsubscribe newsgroup"
 msgstr "Poista ryhmätilauksia"
 
-#: ../src/news_gtk.c:268 ../src/plugins/rssyl/rssyl_gtk.c:695
+#: ../src/news_gtk.c:268
 msgid "_Unsubscribe"
 msgstr "_Poista ryhmän tilaus"
 
@@ -8869,7 +9040,7 @@ msgstr "Osoitekirjan hakemisto mihin osoitteet lisätään"
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:201
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:447
 #: ../src/prefs_filtering_action.c:573 ../src/prefs_filtering_action.c:580
-#: ../src/prefs_matcher.c:676
+#: ../src/prefs_matcher.c:679
 msgid "Select..."
 msgstr "Valitse..."
 
@@ -8980,36 +9151,36 @@ msgstr "Pysäytä arkistointi valitsemalla peru"
 msgid "Archiving:"
 msgstr "Arkistoidaan:"
 
-#: ../src/plugins/archive/archiver_gtk.c:506
+#: ../src/plugins/archive/archiver_gtk.c:507
 msgid "Folder and archive must be selected"
 msgstr "Kansio ja arkisto pitää valita"
 
-#: ../src/plugins/archive/archiver_gtk.c:515
+#: ../src/plugins/archive/archiver_gtk.c:516
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s on olemassa, jatketaanko?"
 
-#: ../src/plugins/archive/archiver_gtk.c:518
+#: ../src/plugins/archive/archiver_gtk.c:519
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s on linkki, ei voida jatkaa."
 
-#: ../src/plugins/archive/archiver_gtk.c:521
+#: ../src/plugins/archive/archiver_gtk.c:522
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s on hakemisto, ei voida jatkaa."
 
-#: ../src/plugins/archive/archiver_gtk.c:524
+#: ../src/plugins/archive/archiver_gtk.c:525
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "ei oikeuksia kohteeseen %s, ei voida jatkaa."
 
-#: ../src/plugins/archive/archiver_gtk.c:527
+#: ../src/plugins/archive/archiver_gtk.c:528
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "Tuntematon virhe kohteessa %s, ei voida jatkaa"
 
-#: ../src/plugins/archive/archiver_gtk.c:564
+#: ../src/plugins/archive/archiver_gtk.c:565
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -9018,7 +9189,7 @@ msgstr ""
 "Tiedostonimi ei ole toimiva:\n"
 "%s"
 
-#: ../src/plugins/archive/archiver_gtk.c:577
+#: ../src/plugins/archive/archiver_gtk.c:578
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -9027,7 +9198,7 @@ msgstr ""
 "Claws Mail -kansio ei ole toimiva:\n"
 "%s"
 
-#: ../src/plugins/archive/archiver_gtk.c:606
+#: ../src/plugins/archive/archiver_gtk.c:607
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -9042,181 +9213,181 @@ msgstr ""
 "\n"
 "Jatketaanko?"
 
-#: ../src/plugins/archive/archiver_gtk.c:710
+#: ../src/plugins/archive/archiver_gtk.c:711
 msgid "Archive result"
 msgstr "Arkistoinnin tulos"
 
-#: ../src/plugins/archive/archiver_gtk.c:740
+#: ../src/plugins/archive/archiver_gtk.c:741
 msgid "Values"
 msgstr "Arvot"
 
-#: ../src/plugins/archive/archiver_gtk.c:749
+#: ../src/plugins/archive/archiver_gtk.c:750
 msgid "Archive"
 msgstr "Arkisto"
 
-#: ../src/plugins/archive/archiver_gtk.c:755
+#: ../src/plugins/archive/archiver_gtk.c:756
 msgid "Archive format"
 msgstr "Arkistomuoto"
 
-#: ../src/plugins/archive/archiver_gtk.c:762
+#: ../src/plugins/archive/archiver_gtk.c:763
 msgid "Compression method"
 msgstr "Pakkausalgoritmi"
 
-#: ../src/plugins/archive/archiver_gtk.c:770
+#: ../src/plugins/archive/archiver_gtk.c:771
 msgid "Number of files"
 msgstr "Tiedostoja"
 
-#: ../src/plugins/archive/archiver_gtk.c:778
+#: ../src/plugins/archive/archiver_gtk.c:779
 msgid "Archive Size"
 msgstr "Arkiston koko"
 
-#: ../src/plugins/archive/archiver_gtk.c:786
+#: ../src/plugins/archive/archiver_gtk.c:787
 msgid "Folder Size"
 msgstr "Kansion koko"
 
-#: ../src/plugins/archive/archiver_gtk.c:795
+#: ../src/plugins/archive/archiver_gtk.c:796
 msgid "Compression level"
 msgstr "Pakkausaste"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:718
 #: ../src/prefs_folder_item.c:514
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:721
 #: ../src/prefs_folder_item.c:513 ../src/prefs_summaries.c:369
 msgid "No"
 msgstr "Ei"
 
-#: ../src/plugins/archive/archiver_gtk.c:803
+#: ../src/plugins/archive/archiver_gtk.c:804
 msgid "MD5 checksum"
 msgstr "MD5-summa"
 
-#: ../src/plugins/archive/archiver_gtk.c:811
+#: ../src/plugins/archive/archiver_gtk.c:812
 msgid "Descriptive names"
 msgstr "Kuvaavat nimet"
 
-#: ../src/plugins/archive/archiver_gtk.c:819
+#: ../src/plugins/archive/archiver_gtk.c:820
 msgid "Delete selected files"
 msgstr "Poista valitut tiedostot"
 
-#: ../src/plugins/archive/archiver_gtk.c:828
-#: ../src/plugins/archive/archiver_gtk.c:1210
+#: ../src/plugins/archive/archiver_gtk.c:829
+#: ../src/plugins/archive/archiver_gtk.c:1211
 msgid "Select mails before"
 msgstr "Valitse viestit ensin"
 
-#: ../src/plugins/archive/archiver_gtk.c:904
+#: ../src/plugins/archive/archiver_gtk.c:905
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Valitse tiedostonimi arkistolla [käytä formaatin mukaista tarkennetta, "
 "kuten .tgz:aa]"
 
-#: ../src/plugins/archive/archiver_gtk.c:952
+#: ../src/plugins/archive/archiver_gtk.c:953
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld/%ld"
 
-#: ../src/plugins/archive/archiver_gtk.c:991
+#: ../src/plugins/archive/archiver_gtk.c:992
 msgid "Create Archive"
 msgstr "Luo arkisto"
 
-#: ../src/plugins/archive/archiver_gtk.c:1006
+#: ../src/plugins/archive/archiver_gtk.c:1007
 msgid "Enter Archiver arguments"
 msgstr "Anna arkistoinnin argumentit"
 
-#: ../src/plugins/archive/archiver_gtk.c:1019
+#: ../src/plugins/archive/archiver_gtk.c:1020
 msgid "Folder to archive"
 msgstr "Arkistoitava kansio"
 
-#: ../src/plugins/archive/archiver_gtk.c:1026
+#: ../src/plugins/archive/archiver_gtk.c:1027
 msgid "Folder which is the root of the archive"
 msgstr "Arkiston säilytyshakemisto"
 
-#: ../src/plugins/archive/archiver_gtk.c:1031
+#: ../src/plugins/archive/archiver_gtk.c:1032
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr "Valitse tästä kansio joka on arkiston juuri"
 
-#: ../src/plugins/archive/archiver_gtk.c:1037
+#: ../src/plugins/archive/archiver_gtk.c:1038
 msgid "Name for archive"
 msgstr "Nimi arkistolle"
 
-#: ../src/plugins/archive/archiver_gtk.c:1043
+#: ../src/plugins/archive/archiver_gtk.c:1044
 msgid "Archive location and name"
 msgstr "Arkiston sijainti ja nimi"
 
-#: ../src/plugins/archive/archiver_gtk.c:1045
+#: ../src/plugins/archive/archiver_gtk.c:1046
 #: ../src/plugins/archive/archiver_prefs.c:198
 #: ../src/plugins/pgpcore/select-keys.c:422
 msgid "_Select"
 msgstr "_Valitse"
 
-#: ../src/plugins/archive/archiver_gtk.c:1048
+#: ../src/plugins/archive/archiver_gtk.c:1049
 msgid "Click this button to select a name and location for the archive"
 msgstr "Valitse tästä nimi ja sijainti arkistolle"
 
-#: ../src/plugins/archive/archiver_gtk.c:1050
+#: ../src/plugins/archive/archiver_gtk.c:1051
 msgid "Choose compression"
 msgstr "Valitse pakkaus"
 
-#: ../src/plugins/archive/archiver_gtk.c:1063
+#: ../src/plugins/archive/archiver_gtk.c:1064
 msgid "Choose this option to use ZIP compression for the archive"
 msgstr "Valitse tästä ZIP-pakkaus"
 
-#: ../src/plugins/archive/archiver_gtk.c:1070
+#: ../src/plugins/archive/archiver_gtk.c:1071
 msgid "Choose this option to use BZIP2 compression for the archive"
 msgstr "Valitse tästä BZIP2-pakkaus"
 
-#: ../src/plugins/archive/archiver_gtk.c:1078
+#: ../src/plugins/archive/archiver_gtk.c:1079
 msgid "Choose this to use Compress compression for your archive"
 msgstr "Valitse tästä Compress-pakkaus"
 
-#: ../src/plugins/archive/archiver_gtk.c:1086
+#: ../src/plugins/archive/archiver_gtk.c:1087
 msgid "Choose this option to disable compression for the archive"
 msgstr "Valitse tämä poistaaksesi pakkaus käytöstä"
 
-#: ../src/plugins/archive/archiver_gtk.c:1108
+#: ../src/plugins/archive/archiver_gtk.c:1109
 msgid "Choose format"
 msgstr "Valitse formaatti"
 
-#: ../src/plugins/archive/archiver_gtk.c:1121
+#: ../src/plugins/archive/archiver_gtk.c:1122
 msgid "Choose this option to use TAR as format for the archive"
 msgstr "Valitse tästä TAR paketin muodoksi"
 
-#: ../src/plugins/archive/archiver_gtk.c:1128
+#: ../src/plugins/archive/archiver_gtk.c:1129
 msgid "Choose this to use SHAR as format for the archive"
 msgstr "Valitse tästä SHAR paketin muodoksi"
 
-#: ../src/plugins/archive/archiver_gtk.c:1135
+#: ../src/plugins/archive/archiver_gtk.c:1136
 msgid "Choose this option to use CPIO as format for the archive"
 msgstr "Valitse tästä CPIO paketin muodoksi"
 
-#: ../src/plugins/archive/archiver_gtk.c:1142
+#: ../src/plugins/archive/archiver_gtk.c:1143
 msgid "Choose this option to use PAX as format for the archive"
 msgstr "Valitse tästä PAX paketin muodoksi"
 
-#: ../src/plugins/archive/archiver_gtk.c:1162
+#: ../src/plugins/archive/archiver_gtk.c:1163
 msgid "Miscellaneous options"
 msgstr "Muut asetukset"
 
-#: ../src/plugins/archive/archiver_gtk.c:1171
+#: ../src/plugins/archive/archiver_gtk.c:1172
 msgid "_Recursive"
 msgstr "_Rekursiivinen"
 
-#: ../src/plugins/archive/archiver_gtk.c:1175
+#: ../src/plugins/archive/archiver_gtk.c:1176
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Valitse tästä ottaaksesi mukaan alikansiot"
 
-#: ../src/plugins/archive/archiver_gtk.c:1177
+#: ../src/plugins/archive/archiver_gtk.c:1178
 msgid "_MD5sum"
 msgstr "_MD5-summa"
 
-#: ../src/plugins/archive/archiver_gtk.c:1181
+#: ../src/plugins/archive/archiver_gtk.c:1182
 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"
@@ -9225,11 +9396,11 @@ msgstr ""
 "Valitse tästä laskeaksesti MD5-summat jokaiselle arkiston tiedostolle.\n"
 "Huomaa, että tämä valinta kasvattaa arkiston kokoa ja käsittelyaikaa."
 
-#: ../src/plugins/archive/archiver_gtk.c:1185
+#: ../src/plugins/archive/archiver_gtk.c:1186
 msgid "R_ename"
 msgstr "_Uudelleennimeä"
 
-#: ../src/plugins/archive/archiver_gtk.c:1189
+#: ../src/plugins/archive/archiver_gtk.c:1190
 #: ../src/plugins/archive/archiver_prefs.c:333
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9240,7 +9411,7 @@ msgstr ""
 "Nimeämistapa: päiväys_lähettäjä@vastaanottaja at otsikko.\n"
 "Nimet lyhennetään 96 merkkiin"
 
-#: ../src/plugins/archive/archiver_gtk.c:1197
+#: ../src/plugins/archive/archiver_gtk.c:1198
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9248,11 +9419,11 @@ msgstr ""
 "Valitse tästä poistaaksesi viestit arkistoinnin jälkeen\n"
 "Tämä toimii vain IMAP4-, POP3- ja paikallisille postilaatikoille"
 
-#: ../src/plugins/archive/archiver_gtk.c:1201
+#: ../src/plugins/archive/archiver_gtk.c:1202
 msgid "Selection options"
 msgstr "Valintojen asetukset"
 
-#: ../src/plugins/archive/archiver_gtk.c:1217
+#: ../src/plugins/archive/archiver_gtk.c:1218
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9338,29 +9509,98 @@ msgstr "Uudelleennimeä"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Valitset tämä poistaaksesi viestit arkistoinnin lopuksi"
 
-#: ../src/plugins/attachwarner/attachwarner.c:216
-#, c-format
-msgid ""
-"An attachment is mentioned in the mail you're sending, but no file was "
-"attached. Mention appears on line %d, which begins with text: <span weight="
-"\"bold\">%.20s</span>...\n"
-"\n"
-"%s it anyway?"
-msgstr ""
-"Viestissä puhutaan liitteistä, mutta liitetiedostoja ei ole. Maininta "
-"viitteestä on rivillä %d, joka alkaa seuraavasti: <span weight=\"bold\">"
-"%.20s</span>...\n"
-"\n"
-"%s joka tapauksessa?"
+#: ../src/plugins/att_remover/att_remover.c:299
+msgid "<b>Type: </b>"
+msgstr "<b>Tyyppi: </b>"
 
-#: ../src/plugins/attachwarner/attachwarner.c:220
-msgid "Attachment warning"
-msgstr "Liitetiedostovaroitus"
+#: ../src/plugins/att_remover/att_remover.c:300
+msgid "<b>Size: </b>"
+msgstr "<b>Koko: </b>"
 
-#: ../src/plugins/attachwarner/attachwarner.c:245
-#: ../src/plugins/attachwarner/attachwarner.c:282
-#: ../src/plugins/attachwarner/attachwarner.c:334
-msgid "Attach warner"
+#: ../src/plugins/att_remover/att_remover.c:301
+msgid "<b>Filename: </b>"
+msgstr "<b>Tiedostonimi: </b>"
+
+#: ../src/plugins/att_remover/att_remover.c:332
+msgid "Remove attachments"
+msgstr "Poista liitteet"
+
+#: ../src/plugins/att_remover/att_remover.c:357
+#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
+msgid "Remove"
+msgstr "Poista"
+
+#. S_COL_STATUS
+#: ../src/plugins/att_remover/att_remover.c:365
+#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
+msgid "Attachment"
+msgstr "Liite"
+
+#: ../src/plugins/att_remover/att_remover.c:417
+msgid "Destroy attachments"
+msgstr "Tuhoa liitteet"
+
+#: ../src/plugins/att_remover/att_remover.c:418
+msgid ""
+"Do you really want to remove all attachments from the selected messages?\n"
+"\n"
+"The deleted data will be unrecoverable."
+msgstr ""
+"Poistetaanko kaikki liitännäiset valituista viesteistä?\n"
+"\n"
+"Poistettuja tietoja ei voi palauttaa."
+
+#: ../src/plugins/att_remover/att_remover.c:479
+msgid "This message doesn't have any attachments."
+msgstr "viestit, joissa ei ole liitteitä"
+
+#: ../src/plugins/att_remover/att_remover.c:494
+msgid "Remove attachments..."
+msgstr "Poista liitteitä..."
+
+#: ../src/plugins/att_remover/att_remover.c:506
+#: ../src/plugins/att_remover/att_remover.c:566
+msgid "AttRemover"
+msgstr "AttRemover"
+
+#: ../src/plugins/att_remover/att_remover.c:571
+msgid ""
+"This plugin removes attachments from mails.\n"
+"\n"
+"Warning: this operation will be completely un-cancellable and the deleted "
+"attachments will be lost forever, and ever, and ever."
+msgstr ""
+"Tällä liitännäisellä voi poistaa liitetiedostoja viesteistä.\n"
+"\n"
+"Huomaa: poisto on peruuttamaton eikä tietoja voi palauttaa sen jälkeen."
+
+#: ../src/plugins/att_remover/att_remover.c:595
+msgid "Attachment handling"
+msgstr "Liitekäsittely"
+
+#: ../src/plugins/attachwarner/attachwarner.c:216
+#, c-format
+msgid ""
+"An attachment is mentioned in the mail you're sending, but no file was "
+"attached. Mention appears on line %d, which begins with text: <span weight="
+"\"bold\">%.20s</span>...\n"
+"\n"
+"%s it anyway?"
+msgstr ""
+"Viestissä puhutaan liitteistä, mutta liitetiedostoja ei ole. Maininta "
+"viitteestä on rivillä %d, joka alkaa seuraavasti: <span weight=\"bold\">"
+"%.20s</span>...\n"
+"\n"
+"%s joka tapauksessa?"
+
+#: ../src/plugins/attachwarner/attachwarner.c:220
+msgid "Attachment warning"
+msgstr "Liitetiedostovaroitus"
+
+#: ../src/plugins/attachwarner/attachwarner.c:245
+#: ../src/plugins/attachwarner/attachwarner.c:282
+#: ../src/plugins/attachwarner/attachwarner.c:334
+msgid "Attach warner"
 msgstr "Liitevaroitin"
 
 #: ../src/plugins/attachwarner/attachwarner.c:292
@@ -9438,75 +9678,6 @@ msgstr "Paitsi"
 msgid "Attach Warner"
 msgstr "Liitä varoitin"
 
-#: ../src/plugins/att_remover/att_remover.c:299
-msgid "<b>Type: </b>"
-msgstr "<b>Tyyppi: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:300
-msgid "<b>Size: </b>"
-msgstr "<b>Koko: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:301
-msgid "<b>Filename: </b>"
-msgstr "<b>Tiedostonimi: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:332
-msgid "Remove attachments"
-msgstr "Poista liitteet"
-
-#: ../src/plugins/att_remover/att_remover.c:357
-#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
-msgid "Remove"
-msgstr "Poista"
-
-#. S_COL_STATUS
-#: ../src/plugins/att_remover/att_remover.c:365
-#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
-msgid "Attachment"
-msgstr "Liite"
-
-#: ../src/plugins/att_remover/att_remover.c:417
-msgid "Destroy attachments"
-msgstr "Tuhoa liitteet"
-
-#: ../src/plugins/att_remover/att_remover.c:418
-msgid ""
-"Do you really want to remove all attachments from the selected messages?\n"
-"\n"
-"The deleted data will be unrecoverable."
-msgstr ""
-"Poistetaanko kaikki liitännäiset valituista viesteistä?\n"
-"\n"
-"Poistettuja tietoja ei voi palauttaa."
-
-#: ../src/plugins/att_remover/att_remover.c:479
-msgid "This message doesn't have any attachments."
-msgstr "viestit, joissa ei ole liitteitä"
-
-#: ../src/plugins/att_remover/att_remover.c:494
-msgid "Remove attachments..."
-msgstr "Poista liitteitä..."
-
-#: ../src/plugins/att_remover/att_remover.c:506
-#: ../src/plugins/att_remover/att_remover.c:566
-msgid "AttRemover"
-msgstr "AttRemover"
-
-#: ../src/plugins/att_remover/att_remover.c:571
-msgid ""
-"This plugin removes attachments from mails.\n"
-"\n"
-"Warning: this operation will be completely un-cancellable and the deleted "
-"attachments will be lost forever, and ever, and ever."
-msgstr ""
-"Tällä liitännäisellä voi poistaa liitetiedostoja viesteistä.\n"
-"\n"
-"Huomaa: poisto on peruuttamaton eikä tietoja voi palauttaa sen jälkeen."
-
-#: ../src/plugins/att_remover/att_remover.c:595
-msgid "Attachment handling"
-msgstr "Liitekäsittely"
-
 #: ../src/plugins/bogofilter/bogofilter.c:81
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:458
 msgid "Bogofilter"
@@ -10098,63 +10269,63 @@ msgstr ""
 "\n"
 "Tällä ei voi tehdä mitään hyödyllistä."
 
-#: ../src/plugins/fancy/fancy_prefs.c:141
+#: ../src/plugins/fancy/fancy_prefs.c:146
 msgid "Display images"
 msgstr "Näytä kuvat"
 
-#: ../src/plugins/fancy/fancy_prefs.c:142
+#: ../src/plugins/fancy/fancy_prefs.c:147
 msgid "Display embedded images"
 msgstr "Näytetyt mukana tulevat kuvat"
 
-#: ../src/plugins/fancy/fancy_prefs.c:146
+#: ../src/plugins/fancy/fancy_prefs.c:151
 msgid "Execute javascript"
 msgstr "Suorita javaskriptit"
 
-#: ../src/plugins/fancy/fancy_prefs.c:147
+#: ../src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute embedded javascript"
 msgstr "Suorita mukana tuleva javaskripti"
 
-#: ../src/plugins/fancy/fancy_prefs.c:151
+#: ../src/plugins/fancy/fancy_prefs.c:156
 msgid "Execute Java applets"
 msgstr "Suorita Java-appletit"
 
-#: ../src/plugins/fancy/fancy_prefs.c:152
+#: ../src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute embedded Java applets"
 msgstr "Suorita mukana tulevat Java-appletit"
 
-#: ../src/plugins/fancy/fancy_prefs.c:156
+#: ../src/plugins/fancy/fancy_prefs.c:161
 msgid "Render objects using plugins"
 msgstr "Piirrä object-sisällöt liitännäisillä"
 
-#: ../src/plugins/fancy/fancy_prefs.c:157
+#: ../src/plugins/fancy/fancy_prefs.c:162
 msgid "Render embedded objects using plugins"
 msgstr "Piirrä mukana tulevat object-sisällöt liitännäisillä"
 
-#: ../src/plugins/fancy/fancy_prefs.c:164
+#: ../src/plugins/fancy/fancy_prefs.c:169
 msgid "Open in viewer (remote content is enabled)"
 msgstr "Avaa katselimessa (etäsisältö sallitaan)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:167
+#: ../src/plugins/fancy/fancy_prefs.c:172
 msgid "Do nothing (remote content is disabled)"
 msgstr "Älä tee mitään (etäsisältö pois käytöstä)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:200
+#: ../src/plugins/fancy/fancy_prefs.c:209
 msgid "Proxy"
 msgstr "Välipalvelin"
 
-#: ../src/plugins/fancy/fancy_prefs.c:202
+#: ../src/plugins/fancy/fancy_prefs.c:211
 msgid "Use GNOME's proxy settings"
 msgstr "Käytä Gnomen välipalvelinasetuksia"
 
-#: ../src/plugins/fancy/fancy_prefs.c:210
+#: ../src/plugins/fancy/fancy_prefs.c:219
 msgid "Use proxy:"
 msgstr "Käytä välipalvelinta:"
 
-#: ../src/plugins/fancy/fancy_prefs.c:228
+#: ../src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
 msgstr "Etäresurssit"
 
-#: ../src/plugins/fancy/fancy_prefs.c:229
+#: ../src/plugins/fancy/fancy_prefs.c:238
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10167,106 +10338,124 @@ msgstr ""
 "Kuvat, skriptit, liitännäisdata ja java-appletit jotka ovat\n"
 "viestin liitteenä toimivat silti."
 
-#: ../src/plugins/fancy/fancy_prefs.c:235
+#: ../src/plugins/fancy/fancy_prefs.c:244
 msgid "Enable loading of remote content"
 msgstr "Salli etäsisällön noutaminen"
 
-#: ../src/plugins/fancy/fancy_prefs.c:267
+#: ../src/plugins/fancy/fancy_prefs.c:276
 msgid "When clicking on a link, by default:"
 msgstr "Oletustoiminto linkin aktivoinnille:"
 
-#: ../src/plugins/fancy/fancy_prefs.c:275
+#: ../src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
 msgstr "Avaa linkit ulkoisessa selaimessa"
 
-#: ../src/plugins/fancy/fancy_viewer.c:391
+#: ../src/plugins/fancy/fancy_prefs.c:298
+msgid "The CSS in this file will be applied to all HTML parts"
+msgstr "CSS tässä tiedostossa sovelletaan kaikkiin HTML-osiin"
+
+#: ../src/plugins/fancy/fancy_prefs.c:300
+msgid "Stylesheet:"
+msgstr "Tyylisivu:"
+
+#: ../src/plugins/fancy/fancy_prefs.c:308 ../src/prefs_account.c:1442
+#: ../src/prefs_account.c:1531 ../src/prefs_account.c:1991
+#: ../src/prefs_customheader.c:237
+msgid "Bro_wse"
+msgstr "_Selaa"
+
+#: ../src/plugins/fancy/fancy_prefs.c:350
+msgid "Select stylesheet"
+msgstr "Valitse tyylisivu"
+
+#: ../src/plugins/fancy/fancy_viewer.c:393
 msgid "Remote content loading is disabled."
 msgstr "Etäsisällön haku on pois päältä."
 
-#: ../src/plugins/fancy/fancy_viewer.c:468
+#: ../src/plugins/fancy/fancy_viewer.c:470
 msgid "Load images"
 msgstr "Lataa kuvat"
 
-#: ../src/plugins/fancy/fancy_viewer.c:470
+#: ../src/plugins/fancy/fancy_viewer.c:472
 msgid "Enable remote content"
 msgstr "Näytä etäsisällöt"
 
-#: ../src/plugins/fancy/fancy_viewer.c:472
+#: ../src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable Javascript"
 msgstr "Salli javaskriptit"
 
-#: ../src/plugins/fancy/fancy_viewer.c:474
+#: ../src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Plugins"
 msgstr "Salli liitännäiset"
 
-#: ../src/plugins/fancy/fancy_viewer.c:476
+#: ../src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Java"
 msgstr "Salli Java"
 
-#: ../src/plugins/fancy/fancy_viewer.c:478
+#: ../src/plugins/fancy/fancy_viewer.c:480
 msgid "Open links with external browser"
 msgstr "Avaa linkit ulkoisessa selaimessa"
 
-#: ../src/plugins/fancy/fancy_viewer.c:647
+#: ../src/plugins/fancy/fancy_viewer.c:649
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Virhe: %d\n"
 
-#: ../src/plugins/fancy/fancy_viewer.c:703
+#: ../src/plugins/fancy/fancy_viewer.c:705
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s on rikkinäinen tai sitä ei tueta"
 
-#: ../src/plugins/fancy/fancy_viewer.c:714
+#: ../src/plugins/fancy/fancy_viewer.c:716
 msgid "Search the Web"
 msgstr "Etsi verkosta"
 
-#: ../src/plugins/fancy/fancy_viewer.c:726
+#: ../src/plugins/fancy/fancy_viewer.c:728
 msgid "Open in Viewer"
 msgstr "Avaa selaimessa"
 
-#: ../src/plugins/fancy/fancy_viewer.c:728
+#: ../src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer (enable remote content)"
 msgstr "Avaa selaimessa (salli etäsisältö)"
 
-#: ../src/plugins/fancy/fancy_viewer.c:737
+#: ../src/plugins/fancy/fancy_viewer.c:739
 msgid "Open in Browser"
 msgstr "Avaa selaimessa"
 
-#: ../src/plugins/fancy/fancy_viewer.c:747
+#: ../src/plugins/fancy/fancy_viewer.c:749
 msgid "Open Image"
 msgstr "Avaa kuva"
 
-#: ../src/plugins/fancy/fancy_viewer.c:756
+#: ../src/plugins/fancy/fancy_viewer.c:758
 msgid "Copy Link"
 msgstr "Kopioi linkki"
 
-#: ../src/plugins/fancy/fancy_viewer.c:760
+#: ../src/plugins/fancy/fancy_viewer.c:762
 msgid "Download Link"
 msgstr "Hae linkistä"
 
-#: ../src/plugins/fancy/fancy_viewer.c:771
+#: ../src/plugins/fancy/fancy_viewer.c:773
 msgid "Save Image As"
 msgstr "Tallenna kuva nimellä"
 
-#: ../src/plugins/fancy/fancy_viewer.c:781
+#: ../src/plugins/fancy/fancy_viewer.c:783
 msgid "Copy Image"
 msgstr "Kopioi kuva"
 
-#: ../src/plugins/fancy/fancy_viewer.c:799
+#: ../src/plugins/fancy/fancy_viewer.c:801
 msgid "Import feed"
 msgstr "Hae syöte"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1012
+#: ../src/plugins/fancy/fancy_viewer.c:1014
 msgid "Fancy"
 msgstr "Fancy"
 
 #. i18n: 'Fancy' here is name of the plugin, not the english word.
-#: ../src/plugins/fancy/fancy_viewer.c:1040
+#: ../src/plugins/fancy/fancy_viewer.c:1042
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML-selain"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1045
+#: ../src/plugins/fancy/fancy_viewer.c:1047
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10471,1024 +10660,998 @@ msgstr "Gdata-yhteys"
 #: ../src/plugins/geolocation/geolocation_plugin.c:349
 #, c-format
 msgid "Found location: (%.2f,%.2f)"
-msgstr ""
+msgstr "Löydetty sijainti: (%.2f,%.2f)"
 
 #. TRANSLATORS: The country name is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:369
 msgid "Alleged country of origin: "
-msgstr ""
+msgstr "Mahdollisesti lähtömaa: "
 
 #. TRANSLATORS: The IP address is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:373
-#, fuzzy
 msgid "Could not resolve location of IP address "
-msgstr "Ei voitu lukea osoiteindeksiä"
+msgstr "Ei voitu selvittää IP-osoitetta"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:512
-#, fuzzy
 msgid "Try to locate sender"
-msgstr "lähettäjän etunimi"
+msgstr "Yritä paikantaa lähettäjää"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:528
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:529
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Arabiemiraatit"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:530
 msgid "Afghanistan"
-msgstr ""
+msgstr "Afganistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:531
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "Antigua And Barbuda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:532
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguilla"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:533
 msgid "Albania"
-msgstr ""
+msgstr "Albania"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:534
 msgid "Armenia"
-msgstr ""
+msgstr "Armenia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:535
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Hollannin antillit"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:536
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:537
 msgid "Antarctica"
-msgstr ""
+msgstr "Antarctica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:538
-#, fuzzy
 msgid "Argentina"
-msgstr "Magenta"
+msgstr "Argentiina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:539
 msgid "American Samoa"
-msgstr ""
+msgstr "American Samoa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:540
 msgid "Austria"
-msgstr ""
+msgstr "Itävalta"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:541
 msgid "Australia"
-msgstr ""
+msgstr "Australia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:542
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:543
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbaitsan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:544
 msgid "Bosnia And Herzegovina"
-msgstr ""
+msgstr "Bosnia And Hertsegovina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:545
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:546
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladesh"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:547
 msgid "Belgium"
-msgstr ""
+msgstr "Belgia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:548
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:549
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgaria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:550
 msgid "Bahrain"
-msgstr ""
+msgstr "Bahrain"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:551
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:552
 msgid "Benin"
-msgstr ""
+msgstr "Benin"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:553
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermuda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:554
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei Darussalam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:555
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolivia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:556
 msgid "Brazil"
-msgstr ""
+msgstr "Brasilia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:557
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahama"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:558
 msgid "Bhutan"
-msgstr ""
+msgstr "Butan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:559
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Bouvet Island"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:560
 msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:561
 msgid "Belarus"
-msgstr ""
+msgstr "Valkovenäjä"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:562
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:563
 msgid "Canada"
-msgstr ""
+msgstr "Kanada"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:564
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Cocos (Keeling) Islands"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:565
 msgid "Central African Republic"
-msgstr ""
+msgstr "Keski-Afrikka"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:566
 msgid "Congo"
-msgstr ""
+msgstr "Kongo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:567
 msgid "Switzerland"
-msgstr ""
+msgstr "Sveitsi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:568
 msgid "Cote D'Ivoire"
-msgstr ""
+msgstr "Norsunluurannikko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:569
 msgid "Cook Islands"
-msgstr ""
+msgstr "Cook-saaret"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:570
 msgid "Chile"
-msgstr ""
+msgstr "Chile"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:571
 msgid "Cameroon"
-msgstr ""
+msgstr "Cameroon"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:572
-#, fuzzy
 msgid "China"
-msgstr "Kiinalainen"
+msgstr "Kiina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:573
-#, fuzzy
 msgid "Colombia"
-msgstr "Värjää"
+msgstr "Kolumbia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:574
 msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:575
 msgid "Cuba"
-msgstr ""
+msgstr "Kuuba"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:576
 msgid "Cape Verde"
-msgstr ""
+msgstr "Cape Verde"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:577
 msgid "Christmas Island"
-msgstr ""
+msgstr "Joulusaaret"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:578
 msgid "Cyprus"
-msgstr ""
+msgstr "Kypros"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:579
 msgid "Czech Republic"
-msgstr ""
+msgstr "Tšekki"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:580
 msgid "Germany"
-msgstr ""
+msgstr "Saksa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:581
 msgid "Djibouti"
-msgstr ""
+msgstr "Djibouti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:582
-#, fuzzy
 msgid "Denmark"
-msgstr "Poista merkintä"
+msgstr "Tanska"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:583
 msgid "Dominica"
-msgstr ""
+msgstr "Dominica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:584
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Dominikaaninen tasavalta"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:585
 msgid "Algeria"
-msgstr ""
+msgstr "Algeria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:586
 msgid "Ecuador"
-msgstr ""
+msgstr "Ecuador"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:587
 msgid "Estonia"
-msgstr ""
+msgstr "Viro"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:588
 msgid "Egypt"
-msgstr ""
+msgstr "Egypti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:589
-#, fuzzy
 msgid "Western Sahara"
-msgstr "Länsieurooppalainen"
+msgstr "Länsi-Sahara"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:590
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:591
 msgid "Spain"
-msgstr ""
+msgstr "Espanja"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:592
 msgid "Ethiopia"
-msgstr ""
+msgstr "Etiopia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:593
 msgid "Finland"
-msgstr ""
+msgstr "Suomi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:594
 msgid "Fiji"
-msgstr ""
+msgstr "Fidzi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:595
 msgid "Falkland Islands (Malvinas)"
-msgstr ""
+msgstr "Falkland Islands (Malvinas)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:596
 msgid "Micronesia, Federated States Of"
-msgstr ""
+msgstr "Micronesia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:597
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Färsaaret"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:598
-#, fuzzy
 msgid "France"
-msgstr "Peru"
+msgstr "Ranska"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:599
 msgid "France, Metropolitan"
-msgstr ""
+msgstr "Ranska, Metropolitan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:600
 msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:601
 #: ../src/plugins/geolocation/geolocation_plugin.c:747
 msgid "United Kingdom"
-msgstr ""
+msgstr "Yhdistynyt kuningaskunta"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:602
 msgid "Grenada"
-msgstr ""
+msgstr "Grenada"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:603
 msgid "Georgia"
-msgstr ""
+msgstr "Georgia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:604
 msgid "French Guiana"
-msgstr ""
+msgstr "Ranskan Guaiana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:605
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:606
-#, fuzzy
 msgid "Gibraltar"
-msgstr "Libravatar"
+msgstr "Gibraltar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:607
-#, fuzzy
 msgid "Greenland"
-msgstr "Vihreä"
+msgstr "Grönlanti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:608
 msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:609
 msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:610
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Guadeloupe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:611
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Päiväntasaajan Guinea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:612
-#, fuzzy
 msgid "Greece"
-msgstr "Vihreä"
+msgstr "Kreikka"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:613
 msgid "South Georgia And The South Sandwich Islands"
-msgstr ""
+msgstr "South Georgia And The South Sandwich Islands"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:614
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:615
 msgid "Guam"
-msgstr ""
+msgstr "Guam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:616
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Guinea-Bissau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:617
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:618
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:619
 msgid "Heard Island And Mcdonald Islands"
-msgstr ""
+msgstr "Heard Island And Mcdonald Islands"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:620
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:621
 msgid "Croatia"
-msgstr ""
+msgstr "Kroatia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:622
 msgid "Haiti"
-msgstr ""
+msgstr "Haiti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:623
 msgid "Hungary"
-msgstr ""
+msgstr "Unkari"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:624
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonesia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:625
 msgid "Ireland"
-msgstr ""
+msgstr "Irlanti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:626
 msgid "Israel"
-msgstr ""
+msgstr "Israel"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:627
-#, fuzzy
 msgid "India"
-msgstr "Merkki"
+msgstr "Intia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:628
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "British Indian Ocean Territory"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:629
 msgid "Iraq"
-msgstr ""
+msgstr "Irak"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:630
 msgid "Iran, Islamic Republic Of"
-msgstr ""
+msgstr "Iran"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:631
 msgid "Iceland"
-msgstr ""
+msgstr "Islanti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:632
 msgid "Italy"
-msgstr ""
+msgstr "Italia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:633
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamaika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:634
 msgid "Jordan"
-msgstr ""
+msgstr "Jordan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:635
-#, fuzzy
 msgid "Japan"
-msgstr "Japanilainen"
+msgstr "Japani"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:636
 msgid "Kenya"
-msgstr ""
+msgstr "Kenia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:637
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kyrgyzstan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:638
 msgid "Cambodia"
-msgstr ""
+msgstr "Cambodia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:639
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:640
-#, fuzzy
 msgid "Comoros"
-msgstr "huomenna"
+msgstr "Comoros"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:641
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "Saint Kitts And Nevis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:642
 msgid "Korea, Democratic People'S Republic Of"
-msgstr ""
+msgstr "Korea, demokraattinen kansantasavalta"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:643
 msgid "Korea, Republic Of"
-msgstr ""
+msgstr "Korean tasavalta"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:644
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuwait"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:645
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Cayman Islands"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:646
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazakhstan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:647
 msgid "Lao People'S Democratic Republic"
-msgstr ""
+msgstr "Lao People'S Democratic Republic"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:648
 msgid "Lebanon"
-msgstr ""
+msgstr "Lebanon"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:649
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Saint Lucia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:650
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:651
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:652
 msgid "Liberia"
-msgstr ""
+msgstr "Liberia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:653
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:654
 msgid "Lithuania"
-msgstr ""
+msgstr "Liettua"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:655
 msgid "Luxembourg"
-msgstr ""
+msgstr "Luxembourg"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:656
 msgid "Latvia"
-msgstr ""
+msgstr "Latvia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:657
 msgid "Libyan Arab Jamahiriya"
-msgstr ""
+msgstr "Libyan Arab Jamahiriya"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:658
 msgid "Morocco"
-msgstr ""
+msgstr "Marokko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:659
 msgid "Monaco"
-msgstr ""
+msgstr "Monako"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:660
 msgid "Moldova, Republic Of"
-msgstr ""
+msgstr "Moldova"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:661
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagascar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:662
-#, fuzzy
 msgid "Marshall Islands"
-msgstr "Merkitse kaikki luetuksi"
+msgstr "Marshall Islands"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:663
 msgid "Macedonia, The Former Yugoslav Republic Of"
-msgstr ""
+msgstr "Makedonia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:664
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:665
-#, fuzzy
 msgid "Myanmar"
-msgstr "Poista merkintä"
+msgstr "Myanmar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:666
 msgid "Mongolia"
-msgstr ""
+msgstr "Mongolia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:667
 msgid "Macao"
-msgstr ""
+msgstr "Macao"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:668
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Northern Mariana Islands"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:669
 msgid "Martinique"
-msgstr ""
+msgstr "Martinique"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:670
 msgid "Mauritania"
-msgstr ""
+msgstr "Mauritania"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:671
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:672
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:673
 msgid "Mauritius"
-msgstr ""
+msgstr "Mauritius"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:674
 msgid "Maldives"
-msgstr ""
+msgstr "Maldives"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:675
 msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:676
 msgid "Mexico"
-msgstr ""
+msgstr "Meksiko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:677
 msgid "Malaysia"
-msgstr ""
+msgstr "Malesia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:678
 msgid "Mozambique"
-msgstr ""
+msgstr "Mosambik"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:679
 msgid "Namibia"
-msgstr ""
+msgstr "Namibia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:680
-#, fuzzy
 msgid "New Caledonia"
-msgstr "Lisää yhteystietoja"
+msgstr "New Caledonia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:681
 msgid "Niger"
-msgstr ""
+msgstr "Niger"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:682
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Norfolk Island"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:683
 msgid "Nigeria"
-msgstr ""
+msgstr "Nigeria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:684
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicaragua"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:685
 msgid "Netherlands"
-msgstr ""
+msgstr "Hollanti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:686
-#, fuzzy
 msgid "Norway"
-msgstr "Edelleenlähetä"
+msgstr "Norja"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:687
 msgid "Nepal"
-msgstr ""
+msgstr "Nepali"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:688
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:689
 msgid "Niue"
-msgstr ""
+msgstr "Niue"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:690
 msgid "New Zealand"
-msgstr ""
+msgstr "Uusi-Seelanti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:691
 msgid "Oman"
-msgstr ""
+msgstr "Oman"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:692
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:693
 msgid "Peru"
-msgstr ""
+msgstr "Peru"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:694
 msgid "French Polynesia"
-msgstr ""
+msgstr "French Polynesia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:695
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua Uusi-Guinea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:696
-#, fuzzy
 msgid "Philippines"
-msgstr "riviä"
+msgstr "Filippiinit"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:697
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:698
 msgid "Poland"
-msgstr ""
+msgstr "Puola"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:699
 msgid "Saint Pierre And Miquelon"
-msgstr ""
+msgstr "Saint Pierre And Miquelon"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:700
 msgid "Pitcairn"
-msgstr ""
+msgstr "Pitcairn"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:701
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Puerto Rico"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:702
-#, fuzzy
 msgid "Portugal"
-msgstr "Portti"
+msgstr "Portugal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:703
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:704
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguay"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:705
-#, fuzzy
 msgid "Qatar"
-msgstr "Wavatar"
+msgstr "Qatar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:706
 msgid "Reunion"
-msgstr ""
+msgstr "Reunion"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:707
 msgid "Romania"
-msgstr ""
+msgstr "Romania"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:708
 msgid "Russian Federation"
-msgstr ""
+msgstr "Venäjä"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:709
 msgid "Rwanda"
-msgstr ""
+msgstr "Ruanda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:710
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Saudi Arabia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:711
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Solomon Islands"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:712
 msgid "Seychelles"
-msgstr ""
+msgstr "Seychelles"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:713
 msgid "Sudan"
-msgstr ""
+msgstr "Sudan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:714
 msgid "Sweden"
-msgstr ""
+msgstr "Ruotsi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:715
 msgid "Singapore"
-msgstr ""
+msgstr "Singapore"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:716
 msgid "Saint Helena"
-msgstr ""
+msgstr "Saint Helena"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:717
 msgid "Slovenia"
-msgstr ""
+msgstr "Slovenia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:718
 msgid "Svalbard And Jan Mayen"
-msgstr ""
+msgstr "Svalbard And Jan Mayen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:719
 msgid "Slovakia"
-msgstr ""
+msgstr "Slovakia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:720
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:721
 msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:722
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:723
 msgid "Somalia"
-msgstr ""
+msgstr "Somalia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:724
-#, fuzzy
 msgid "Suriname"
-msgstr "SMTP-käyttäjätunnus"
+msgstr "Suriname"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:725
 msgid "Sao Tome And Principe"
-msgstr ""
+msgstr "Sao Tome And Principe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:726
 msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:727
 msgid "Syrian Arab Republic"
-msgstr ""
+msgstr "Syyria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:728
 msgid "Swaziland"
-msgstr ""
+msgstr "Swasimaa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:729
 msgid "Turks And Caicos Islands"
-msgstr ""
+msgstr "Turks And Caicos Islands"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:730
 msgid "Chad"
-msgstr ""
+msgstr "Tšad"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:731
 msgid "French Southern Territories"
-msgstr ""
+msgstr "French Southern Territories"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:732
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:733
-#, fuzzy
 msgid "Thailand"
-msgstr "Thailainen"
+msgstr "Thaimaa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:734
 msgid "Tajikistan"
-msgstr ""
+msgstr "Tajikistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:735
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:736
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkmenistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:737
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunisia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:738
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:739
 msgid "East Timor"
-msgstr ""
+msgstr "Itä-Timor"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:740
 msgid "Turkey"
-msgstr ""
+msgstr "Turkki"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:741
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "Trinidad ja Tobago"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:742
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:743
 msgid "Taiwan, Province Of China"
-msgstr ""
+msgstr "Taiwan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:744
 msgid "Tanzania, United Republic Of"
-msgstr ""
+msgstr "Tansania"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:745
 msgid "Ukraine"
-msgstr ""
+msgstr "Ukraina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:746
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:748
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "United States Minor Outlying Islands"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:749
 msgid "United States"
-msgstr ""
+msgstr "Yhdysvallat"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:750
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguay"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:751
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:752
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Vatikaanivaltio"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:753
 msgid "Saint Vincent And The Grenadines"
-msgstr ""
+msgstr "Saint Vincent And The Grenadines"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:754
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:755
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "Neitsytsaaret, Britannia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:756
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "Neitsytsaaret, USA"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:757
-#, fuzzy
 msgid "Viet Nam"
-msgstr "Tiedostonimi"
+msgstr "Vietnam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:758
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:759
 msgid "Wallis And Futuna"
-msgstr ""
+msgstr "Wallis And Futuna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:760
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:761
 msgid "Yemen"
-msgstr ""
+msgstr "Yemen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:762
 msgid "Mayotte"
-msgstr ""
+msgstr "Mayotte"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:763
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "Serbia ja Montenegro"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:764
 msgid "South Africa"
-msgstr ""
+msgstr "Etelä-Afrikka"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:765
 msgid "Zambia"
-msgstr ""
+msgstr "Zambia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:766
 msgid "Democratic Republic Of The Congo"
-msgstr ""
+msgstr "Kongon demokraattinen tasavalta"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:767
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:777
 #: ../src/plugins/geolocation/geolocation_plugin.c:862
-#, fuzzy
 msgid "GeoLocation"
-msgstr "Sijainti:"
+msgstr "GeoLocation"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:782
-#, fuzzy, c-format
+#, c-format
 msgid "Could not initialize clutter"
-msgstr "Ei voitu alustaa oikaisuluinta %s."
+msgstr "Ei voitu alustaa clutteria."
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:788
 #: ../src/plugins/geolocation/geolocation_plugin.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create regular expression: %s\n"
-msgstr "Väliaikaistiedoston luonti ei onnistunut: %s."
+msgstr "Säännöllisen ilmauksen luonti ei onnistunut: %s\n"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:803
-#, fuzzy
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-msgstr "Teemakoukun rekisteröinti ilmoitusliitännäiselle epäonnistui"
+msgstr "Messageview_show-koukun rekisteröinti GeoLocation-liitännäiselle epäonnistui"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:867
 msgid ""
@@ -11506,36 +11669,43 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome (but only if it's not about marital "
 "quarrels)."
 msgstr ""
+"Tämä liitännäinen tuo GeoLocation-toiminnot Claws-Mailiin.\n"
+"\n"
+"Huomaa: On teknisesti mahdotonta tietää lähettäjän sijaintia sähköpostin "
+"perusteella. Tulokset ovat epätarkkoja arvioita. Eritoten postituslistoilla "
+"saattavat tiedot olla postituslistapalvelimen eivätkä lähettäjän.\n"
+"Jos tiedot näyttävät vääriltä, niihin ei kannata luottaa.\n"
+"\n"
+"Palautetta voi lähettää englannksi osoitteeseen <berndth at gmx.de>."
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:900
-#, fuzzy
 msgid "GeoLocation integration"
-msgstr "Gdata-yhteys"
+msgstr "GeoLocation-integraatio"
 
-#: ../src/plugins/libravatar/libravatar.c:374
-#: ../src/plugins/libravatar/libravatar.c:445
-#: ../src/plugins/libravatar/libravatar.c:505
-#: ../src/plugins/libravatar/libravatar_prefs.c:400
+#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:452
+#: ../src/plugins/libravatar/libravatar.c:512
+#: ../src/plugins/libravatar/libravatar_prefs.c:440
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:388
 msgid "Failed to register avatar header update hook"
 msgstr "Avatarotsakepäivityskoukun rekisteröinti epäonnistui"
 
-#: ../src/plugins/libravatar/libravatar.c:389
+#: ../src/plugins/libravatar/libravatar.c:396
 msgid "Failed to register avatar image render hook"
 msgstr "Avatarnäytinkoukun rekisteröinti epäonnistui"
 
-#: ../src/plugins/libravatar/libravatar.c:394
+#: ../src/plugins/libravatar/libravatar.c:401
 msgid "Failed to create avatar image cache directory"
 msgstr "Avatarkuvavälimuistiakemiston luonti epäonnistui"
 
-#: ../src/plugins/libravatar/libravatar.c:403
+#: ../src/plugins/libravatar/libravatar.c:410
 msgid "Failed to load missing items cache"
 msgstr "Puuttuvien kohteiden välimuistin lataus epäonnistui"
 
-#: ../src/plugins/libravatar/libravatar.c:455
+#: ../src/plugins/libravatar/libravatar.c:462
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -11562,85 +11732,85 @@ msgstr ""
 "\n"
 "Palaute englanniksi osoitteeseen <ricardo at mones.org>.\n"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:112
+#: ../src/plugins/libravatar/libravatar_prefs.c:138
 msgid "_Use cached icons"
 msgstr "Käytä välim_uistissa olevia kuvakkeita"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:113
+#: ../src/plugins/libravatar/libravatar_prefs.c:139
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr "Säilytä kuvakkeet levyllä ja vältä toistuvat verkkokyselyt"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:121
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
 msgid "Cache refresh interval"
 msgstr "Välimuistin päivitysvuoroväli"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:123
-#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:333
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
+#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:335
 msgid "hours"
 msgstr "tunnin jälkeen"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:188
+#: ../src/plugins/libravatar/libravatar_prefs.c:207
 msgid "Mystery man"
 msgstr "Mystery man"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:189
+#: ../src/plugins/libravatar/libravatar_prefs.c:208
 msgid "Identicon"
 msgstr "Identicon"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:190
+#: ../src/plugins/libravatar/libravatar_prefs.c:209
 msgid "MonsterID"
 msgstr "MonsterID"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:191
+#: ../src/plugins/libravatar/libravatar_prefs.c:210
 msgid "Wavatar"
 msgstr "Wavatar"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:192
+#: ../src/plugins/libravatar/libravatar_prefs.c:211
 msgid "Retro"
 msgstr "Retro"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:193
+#: ../src/plugins/libravatar/libravatar_prefs.c:212
 msgid "Custom URL"
 msgstr "Mukautettu URL"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:196
+#: ../src/plugins/libravatar/libravatar_prefs.c:215
 msgid "A blank image"
 msgstr "Tyhjä kuva"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:197
+#: ../src/plugins/libravatar/libravatar_prefs.c:216
 msgid "The unobtrusive low-contrast greyish silhouette"
 msgstr "Himmeä harmaa siluetti"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:198
+#: ../src/plugins/libravatar/libravatar_prefs.c:217
 msgid "A generated geometric pattern"
 msgstr "Generoitu geometrinen kuvio"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:199
+#: ../src/plugins/libravatar/libravatar_prefs.c:218
 msgid "A generated full-body monster"
 msgstr "Generoitu hirviö"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:200
+#: ../src/plugins/libravatar/libravatar_prefs.c:219
 msgid "A generated almost unique face"
 msgstr "Generoitu melkein uniikki naama"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:201
+#: ../src/plugins/libravatar/libravatar_prefs.c:220
 msgid "A generated 8-bit arcade-style pixelated image"
 msgstr "Generoitu 8-bittikonsolityylinen pikseloitu kuva"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:202
+#: ../src/plugins/libravatar/libravatar_prefs.c:221
 msgid "Redirect to a user provided URL"
 msgstr "Uudelleenohjaus käyttäjän URLiin"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:229 ../src/prefs_themes.c:878
+#: ../src/plugins/libravatar/libravatar_prefs.c:248 ../src/prefs_themes.c:878
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:256
+#: ../src/plugins/libravatar/libravatar_prefs.c:276
 msgid "_Allow redirects to other sites"
 msgstr "S_alli uudelleenohjaukset"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:257
+#: ../src/plugins/libravatar/libravatar_prefs.c:277
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
@@ -11648,23 +11818,44 @@ msgstr ""
 "Seuraa uudelleenohjauksia libravatarista toisiin palveluihin kuten gravatar."
 "comiin"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:266
+#: ../src/plugins/libravatar/libravatar_prefs.c:286
 msgid "_Enable federated servers"
 msgstr "Salli yhdistetyt palv_elimet"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:267
+#: ../src/plugins/libravatar/libravatar_prefs.c:287
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr "Yritä hakea avatar lähettäjän verkko-osoitteen palvelimesta"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:312
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+msgid "Request timeout"
+msgstr "Aikakatkaisu"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+#: ../src/plugins/notification/notification_prefs.c:1028
+#: ../src/plugins/notification/notification_prefs.c:1300
+#: ../src/plugins/notification/notification_prefs.c:1608
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
+#: ../src/prefs_summaries.c:496
+msgid "seconds"
+msgstr "sekuntia"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:305
+msgid ""
+"Set to 0 to use global socket I/O timeout. Maximum value must be also less "
+"than global socket I/O timeout."
+msgstr ""
+"Asetus 0 käyttää yleistä i/o-aikakatkaisua. Ylärajan on myös oltava yleistä"
+" aikaa pienempi"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:349
 msgid "Icon cache"
 msgstr "Kuvakevälimuisti"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:316
+#: ../src/plugins/libravatar/libravatar_prefs.c:353
 msgid "Default missing icon mode"
 msgstr "Oletus puuttuvalle kuvakkeelle"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:320
+#: ../src/plugins/libravatar/libravatar_prefs.c:357
 msgid "Network"
 msgstr "Verkko"
 
@@ -11978,7 +12169,6 @@ msgstr "Kalenterikansiot"
 
 #. Warning-Label
 #: ../src/plugins/notification/notification_prefs.c:639
-#, fuzzy
 msgid "These settings override folder-specific selections."
 msgstr "Asetukset korvaavat kansioittaiset valinnat."
 
@@ -12108,14 +12298,6 @@ msgstr "Salli ponnahdus"
 msgid "Popup timeout:"
 msgstr "Ponnahdusaika:"
 
-#: ../src/plugins/notification/notification_prefs.c:1028
-#: ../src/plugins/notification/notification_prefs.c:1300
-#: ../src/plugins/notification/notification_prefs.c:1608
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
-#: ../src/prefs_summaries.c:496
-msgid "seconds"
-msgstr "sekuntia"
-
 #. Sticky check button
 #: ../src/plugins/notification/notification_prefs.c:1057
 msgid "Make popup sticky"
@@ -12366,7 +12548,7 @@ msgstr "/%d"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1359
 msgid "PDF rendering failed for an unknown reason."
-msgstr ""
+msgstr "PDF-näyttö ei onnistunut tuntemattomasta syystä."
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1722
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1940
@@ -12461,7 +12643,7 @@ msgstr ""
 
 #: ../src/plugins/perl/perl_gtk.c:50
 msgid "Edit perl filter rules (ext)..."
-msgstr ""
+msgstr "Muokkaa perl-suodatussääntöjä (ext)..."
 
 #: ../src/plugins/pgpcore/autocompletion.c:125
 msgid "Failed to register PGP address autocompletion hook"
@@ -12721,12 +12903,12 @@ msgid "Undefined"
 msgstr "Määrittelemättä"
 
 #: ../src/plugins/pgpcore/select-keys.c:241
-#: ../src/plugins/pgpcore/sgpgme.c:146
+#: ../src/plugins/pgpcore/sgpgme.c:146 ../src/plugins/pgpcore/sgpgme.c:162
 msgid "Marginal"
 msgstr "Marginaalinen"
 
 #: ../src/plugins/pgpcore/select-keys.c:247
-#: ../src/plugins/pgpcore/sgpgme.c:150
+#: ../src/plugins/pgpcore/sgpgme.c:150 ../src/plugins/pgpcore/sgpgme.c:166
 msgid "Ultimate"
 msgstr "Täysi"
 
@@ -12787,61 +12969,61 @@ msgstr ""
 msgid "No signature found"
 msgstr "Ei allekirjoitusta"
 
-#: ../src/plugins/pgpcore/sgpgme.c:184 ../src/plugins/pgpcore/sgpgme.c:203
+#: ../src/plugins/pgpcore/sgpgme.c:160
+msgid "Untrusted"
+msgstr "Ei luottoa"
+
+#: ../src/plugins/pgpcore/sgpgme.c:200 ../src/plugins/pgpcore/sgpgme.c:219
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Allekirjoitusta ei voida tarkastaa: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:188 ../src/plugins/pgpcore/sgpgme.c:192
-#: ../src/plugins/pgpcore/sgpgme.c:245
+#: ../src/plugins/pgpcore/sgpgme.c:204 ../src/plugins/pgpcore/sgpgme.c:208
+#: ../src/plugins/pgpcore/sgpgme.c:249
 msgid "The signature has not been checked."
 msgstr "Allekirjoitusta ei ole tarkastettu."
 
-#: ../src/plugins/pgpcore/sgpgme.c:198 ../src/plugins/pgpcore/sgpgme.c:200
+#: ../src/plugins/pgpcore/sgpgme.c:214 ../src/plugins/pgpcore/sgpgme.c:216
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP-ydin: Avainta ei saatu — gpg-agent ei ole käynnissä."
 
-#: ../src/plugins/pgpcore/sgpgme.c:215
+#: ../src/plugins/pgpcore/sgpgme.c:228
 #, c-format
 msgid "Good signature from %s."
 msgstr "Toimiva allekirjoitus käyttäjälle %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:222
-#, c-format
-msgid "Good signature (untrusted) from %s."
-msgstr "Toimiva allekirjoitus (ilman luottoa) käyttäjälle %s."
-
-#: ../src/plugins/pgpcore/sgpgme.c:227
+#: ../src/plugins/pgpcore/sgpgme.c:231
 #, c-format
 msgid "Expired signature from %s."
 msgstr "Vanhentunut allekirjoitus käyttäjälle %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:230
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:234
+#, c-format
 msgid "Good signature from %s, but the key has expired."
-msgstr "Toimiva allekirjoitus käyttäjälle %s."
+msgstr "Toimiva allekirjoitus käyttäjälle %s, mutta avain on vanhentunut."
 
-#: ../src/plugins/pgpcore/sgpgme.c:233
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:237
+#, c-format
 msgid "Good signature from %s, but the key has been revoked."
-msgstr "Toimiva allekirjoitus käyttäjälle %s."
+msgstr "Toimiva allekirjoitus käyttäjälle %s, mutta avain on poistettu "
+"käytöstä."
 
-#: ../src/plugins/pgpcore/sgpgme.c:236
+#: ../src/plugins/pgpcore/sgpgme.c:240
 #, c-format
 msgid "Bad signature from %s."
 msgstr "Virheellinen allekirjoitus käyttäjälle ”%s”"
 
-#: ../src/plugins/pgpcore/sgpgme.c:240
+#: ../src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Avain 0x%s tämän allekirjoituksen varmentamiseen puuttuu."
 
-#: ../src/plugins/pgpcore/sgpgme.c:264
+#: ../src/plugins/pgpcore/sgpgme.c:268
 #, c-format
 msgid "Error checking signature: no status\n"
 msgstr "Allekirjoituksen tarkastuksessa virhe: ei tilaa\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:283
+#: ../src/plugins/pgpcore/sgpgme.c:287
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Allekirjoituksen tarkastuksessa virhe: %s\n"
@@ -12849,86 +13031,95 @@ msgstr "Allekirjoituksen tarkastuksessa virhe: %s\n"
 # eg:
 # Allekirjoitus on tehty su 27. maaliskuuta 2005 01:56:28
 # avaimen ... tunnisteelle 1234567890ABCDEF
-#: ../src/plugins/pgpcore/sgpgme.c:302
+#: ../src/plugins/pgpcore/sgpgme.c:306
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Allekirjoitus on tehty %s avaimen %s tunnisteelle %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:308
+#: ../src/plugins/pgpcore/sgpgme.c:312
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Oikea allekirjoitus käyttäjälle %s (Oikeellisuus: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:313
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:317
+#, c-format
 msgid "Expired key uid \"%s\"\n"
-msgstr "Vanhentunut avain käyttäjälle %s."
+msgstr "Vanhentunut avain käyttäjälle %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:318
+#: ../src/plugins/pgpcore/sgpgme.c:322
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Vanhentunut allekirjoitus käyttäjälle ”%s” (Oikeellisuus: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:323
+#: ../src/plugins/pgpcore/sgpgme.c:327
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
-msgstr ""
+msgstr "Avain on poistettu käytöstä, tunniste %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:328
+#: ../src/plugins/pgpcore/sgpgme.c:332
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Virheellinen allekirjoitus käyttäjälle ”%s”\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:339
+#: ../src/plugins/pgpcore/sgpgme.c:343
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                    tunnus %s (Oikeellisuus %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:346
+#: ../src/plugins/pgpcore/sgpgme.c:345
+msgid "Revoked"
+msgstr "Poistettu käytöstä"
+
+#: ../src/plugins/pgpcore/sgpgme.c:349
+#, c-format
+msgid "Owner Trust: %s\n"
+msgstr "Käyttäjän luotto: %s\n"
+
+#: ../src/plugins/pgpcore/sgpgme.c:352
 msgid "Primary key fingerprint:"
 msgstr "Ensiöavaimen sormenjälki:"
 
-#: ../src/plugins/pgpcore/sgpgme.c:364
+#: ../src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "VAROITUS: Allekirjoittajan osoite %s ja DNS-osoite eivät täsmää\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:370
+#: ../src/plugins/pgpcore/sgpgme.c:376
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Allekirjoittajan varmistettu osoite on %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:412
+#: ../src/plugins/pgpcore/sgpgme.c:410
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Ei voitu hakea dataa viestille %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:428
+#: ../src/plugins/pgpcore/sgpgme.c:426
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Ei voitu alustaa dataa %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:583
+#: ../src/plugins/pgpcore/sgpgme.c:581
 msgid "Secret key specification is ambiguous"
 msgstr "Salaisen avaimen määritelmä on moniselitteinen"
 
-#: ../src/plugins/pgpcore/sgpgme.c:593
+#: ../src/plugins/pgpcore/sgpgme.c:591
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Salaista avainta ei löydetty (%s)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:606
+#: ../src/plugins/pgpcore/sgpgme.c:604
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Virhe salaista avainta haettaessa: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:690
+#: ../src/plugins/pgpcore/sgpgme.c:688
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme-käytäntö %s on käyttökelvoton: sovellutusta %s ei ole asennettu oikein"
 
-#: ../src/plugins/pgpcore/sgpgme.c:696
+#: ../src/plugins/pgpcore/sgpgme.c:694
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12937,12 +13128,12 @@ msgstr ""
 "Gpgme-käytäntö %s on käyttökelvoton: sovellutuksen %s versio %s on "
 "asennettu, mutta %s on vaatimuksena.\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:704
+#: ../src/plugins/pgpcore/sgpgme.c:702
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme-käytäntö %s on käyttökelvoton (tuntemattomasta syystä)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:720
+#: ../src/plugins/pgpcore/sgpgme.c:718
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12950,17 +13141,17 @@ msgstr ""
 "GnuPG:tä ei ole asennettu oikein, tai se pitää päivittää.\n"
 "OpenPGP-tuki otettu pois päältä."
 
-#: ../src/plugins/pgpcore/sgpgme.c:754
+#: ../src/plugins/pgpcore/sgpgme.c:752
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr "Tilin tiedot pitää tallentaa napista OK ennen avainparin luontia.\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:759
+#: ../src/plugins/pgpcore/sgpgme.c:757
 msgid "No PGP key found"
 msgstr "PGP-avaimia ei löytynyt"
 
-#: ../src/plugins/pgpcore/sgpgme.c:760
+#: ../src/plugins/pgpcore/sgpgme.c:758
 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"
@@ -12970,22 +13161,22 @@ msgstr ""
 "viestejä voi allekirjoittaa tai vastaanottaa salattuja viestejä.\n"
 "Luodaanko uusi avainpari?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:830 ../src/plugins/pgpcore/sgpgme.c:846
+#: ../src/plugins/pgpcore/sgpgme.c:828 ../src/plugins/pgpcore/sgpgme.c:844
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Avainparia ei voitu luoda: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:837
+#: ../src/plugins/pgpcore/sgpgme.c:835
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr "Avainparia luodaan... Heiluttele hiirtä entropian aikaansaamiseksi..."
 
-#: ../src/plugins/pgpcore/sgpgme.c:852
+#: ../src/plugins/pgpcore/sgpgme.c:850
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Avainparia ei voitu luoda: tuntematon virhe"
 
-#: ../src/plugins/pgpcore/sgpgme.c:856
+#: ../src/plugins/pgpcore/sgpgme.c:854
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12998,19 +13189,19 @@ msgstr ""
 "\n"
 "Lähetetäänkö se avainpalvelimelle?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:860
+#: ../src/plugins/pgpcore/sgpgme.c:858
 msgid "Key generated"
 msgstr "Avain luotu"
 
-#: ../src/plugins/pgpcore/sgpgme.c:899
+#: ../src/plugins/pgpcore/sgpgme.c:897
 msgid "Key exported."
 msgstr "Avain tuotu."
 
-#: ../src/plugins/pgpcore/sgpgme.c:901
+#: ../src/plugins/pgpcore/sgpgme.c:899
 msgid "Couldn't export key."
 msgstr "Ei voi tuoda avainta."
 
-#: ../src/plugins/pgpcore/sgpgme.c:905
+#: ../src/plugins/pgpcore/sgpgme.c:903
 msgid "Key export isn't implemented in Windows."
 msgstr "Avaimen hakua ei tueta Windows-järjestelmissä."
 
@@ -13037,7 +13228,7 @@ msgstr "Tekstidataa ei voitu muuntaa järjelliseen merkistökoodaukseen."
 #: ../src/plugins/pgpinline/pgpinline.c:716
 #: ../src/plugins/pgpmime/pgpmime.c:74 ../src/plugins/pgpmime/pgpmime.c:184
 #: ../src/plugins/pgpmime/pgpmime.c:330 ../src/plugins/pgpmime/pgpmime.c:510
-#: ../src/plugins/pgpmime/pgpmime.c:655 ../src/plugins/smime/smime.c:415
+#: ../src/plugins/pgpmime/pgpmime.c:651 ../src/plugins/smime/smime.c:415
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "GPG-kontekstin alustus epäonnistui, %s"
@@ -13134,19 +13325,19 @@ msgstr ""
 "Inline-menetelmässä."
 
 #: ../src/plugins/pgpinline/pgpinline.c:670
-#: ../src/plugins/pgpmime/pgpmime.c:665
+#: ../src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Ei voitu lisätä GPG-avainta %s, %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:698
-#: ../src/plugins/pgpmime/pgpmime.c:694
+#: ../src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Väliaikaistiedoston luonti ei onnistunut %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:729
-#: ../src/plugins/pgpmime/pgpmime.c:721
+#: ../src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Salaus epäonnistui %s"
@@ -13198,14 +13389,18 @@ msgstr "Purettuja tiedoston osia ei pystytty lukemaan."
 msgid "Couldn't create temporary file: %s"
 msgstr "Väliaikaistiedoston luonti ei onnistunut: %s."
 
-#: ../src/plugins/pgpmime/pgpmime.c:621
+#: ../src/plugins/pgpmime/pgpmime.c:595
+msgid "OpenPGP digital signature"
+msgstr "OpenPGP-allekirjoitus"
+
+#: ../src/plugins/pgpmime/pgpmime.c:617
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
 msgstr ""
 "Huomaa, että otsakkeita kuten aihetta, ei ole salattu PGP/MIME-menetelmässä."
 
-#: ../src/plugins/pgpmime/pgpmime.c:793
+#: ../src/plugins/pgpmime/pgpmime.c:789
 msgid "PGP/Mime"
 msgstr "PGP/MIME"
 
@@ -13275,7 +13470,7 @@ msgid ""
 "\n"
 "These scripts are then available via the menu. You can assign keyboard "
 "shortcuts to them just like it is done with other menu items. You can also "
-"put buttons for script invokation into the toolbars using Claws Mail's "
+"put buttons for script invocation into the toolbars using Claws Mail's "
 "builtin toolbar editor.\n"
 "\n"
 "You can provide scripts working on the main window by placing files into ~/."
@@ -13357,150 +13552,48 @@ msgstr ""
 msgid "Python integration"
 msgstr "Python-liitokset"
 
-#: ../src/plugins/rssyl/feed.c:126
-msgid "Cannot open temporary file"
-msgstr "Väliaikaistiedoston avaus ei onnistu"
-
-#: ../src/plugins/rssyl/feed.c:137
-msgid "Cannot init libCURL"
-msgstr "libCurlin alustus ei onnistu"
-
-#: ../src/plugins/rssyl/feed.c:234 ../src/plugins/vcalendar/vcal_folder.c:1596
-msgid "401 (Authorisation required)"
-msgstr "401 (Tunnistautuminen vaaditaan)"
-
-#: ../src/plugins/rssyl/feed.c:237 ../src/plugins/vcalendar/vcal_folder.c:1599
-msgid "403 (Unauthorised)"
-msgstr "403 (Ei käyttöoikeutta)"
-
-#: ../src/plugins/rssyl/feed.c:240 ../src/plugins/vcalendar/vcal_folder.c:1602
-msgid "404 (Not found)"
-msgstr "404 (Ei löydy)"
-
-#: ../src/plugins/rssyl/feed.c:243 ../src/plugins/vcalendar/vcal_folder.c:1605
-#, c-format
-msgid "Error %ld"
-msgstr "Virhe %ld"
-
-#: ../src/plugins/rssyl/feed.c:328
-#, c-format
-msgid "Fetching '%s'..."
-msgstr "Haetaan syötettä %s…"
-
-#: ../src/plugins/rssyl/feed.c:387
-msgid "Malformed feed"
-msgstr "Viallinen syöte"
-
-#: ../src/plugins/rssyl/feed.c:1203
-#, c-format
-msgid "Refreshing feed '%s'..."
-msgstr "Päivitetään syötettä %s…"
-
-#: ../src/plugins/rssyl/feed.c:1218
+#: ../src/plugins/rssyl/old_feeds.c:90
 #, c-format
 msgid ""
-"RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-"comments of '%s'"
+"Couldn't read contents of old feeds.xml file:\n"
+"%s"
 msgstr ""
-"RSSyl: Kommentien haku ei toimi RDF-syötteillä. Syötteen %s kommentteja ei "
-"haeta."
-
-#: ../src/plugins/rssyl/feed.c:1227
-msgid "This feed format is not supported yet."
-msgstr "Tätä syötemuotoa ei tueta vielä."
-
-#: ../src/plugins/rssyl/feed.c:1258
-msgid "N/A"
-msgstr "—"
+"Vanhaa feeds.xml-tiedostoa ei pystytty lukemaan:\n"
+"%s"
 
-#: ../src/plugins/rssyl/feed.c:1378
+#: ../src/plugins/rssyl/opml_export.c:110
 #, c-format
-msgid "%ld byte"
-msgid_plural "%ld bytes"
-msgstr[0] "%ld tavu"
-msgstr[1] "%ld tavua"
-
-#: ../src/plugins/rssyl/feed.c:1381
-msgid "size unknown"
-msgstr "tuntematon koko"
+msgid "RSSyl: Error while writing '%s' to feed export list.\n"
+msgstr "RSSyl: Ei voitu kirjoittaa kohdetta %s syötelistaan.\n"
 
-#: ../src/plugins/rssyl/feed.c:1555
+#: ../src/plugins/rssyl/opml_export.c:131
 #, c-format
-msgid ""
-"RSSyl: Cannot update feed %s:\n"
-"%s\n"
-msgstr ""
-"RSSyl: Syötettä %s ei voi päivittää:\n"
-"%s\n"
+msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
+msgstr "RSSyl: Ei voitu avata vanhaa OPML-tiedostoa %s: %s\n"
 
-#: ../src/plugins/rssyl/feed.c:1727
-msgid "You are already subscribed to this feed."
-msgstr "Olet jo tilannut tämän syötteen."
-
-#: ../src/plugins/rssyl/feed.c:1738
+#: ../src/plugins/rssyl/opml_export.c:141
 #, c-format
-msgid ""
-"Couldn't fetch URL '%s':\n"
-"%s"
-msgstr ""
-"URLia %s ei voitu hakea:\n"
-"%s"
+msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
+msgstr "RSSyl: Ei voitu avata tiedostoa %s syötelistavientiä varten: %s\n"
+
+#: ../src/plugins/rssyl/opml_export.c:182
+msgid "RSSyl: Error during writing feed export file.\n"
+msgstr "RSSyl: Virhe syötevientitiedostoon kirjoitettaessa.\n"
 
-#: ../src/plugins/rssyl/feed.c:1743
+#: ../src/plugins/rssyl/opml_import.c:109
 #, c-format
 msgid ""
-"Couldn't fetch URL '%s':\n"
+"Error while subscribing feed\n"
 "%s\n"
+"\n"
+"Folder name '%s' is not allowed."
 msgstr ""
-"URLia %s ei voitu hakea.:\n"
+"Syötteen tilaus epäonnistui:\n"
 "%s\n"
+"\n"
+"Kansion nimeksi ei kelpaa '%s'."
 
-#: ../src/plugins/rssyl/feed.c:1759
-#, c-format
-msgid "Can't subscribe feed '%s'."
-msgstr "Syötettä %s ei voida tilata."
-
-#: ../src/plugins/rssyl/feed.c:1861 ../src/plugins/rssyl/rssyl_cb_menu.c:281
-msgid "Claws Mail needs network access in order to update the feed."
-msgid_plural "Claws Mail needs network access in order to update the feeds."
-msgstr[0] "Syötteen päivittämiseksi tarvitaan verkkoyhteyttä."
-msgstr[1] "Syötteiden päivittämiseksi tarvitaan verkkoyhteyttä."
-
-#: ../src/plugins/rssyl/feed.h:20
-#, c-format
-msgid "Time out connecting to URL %s\n"
-msgstr "Aikakatkaistu yhdistettäessä kohteeseen %s\n"
-
-#: ../src/plugins/rssyl/feed.h:21
-#, c-format
-msgid "Couldn't fetch URL %s\n"
-msgstr "URLia %s ei voitu hakea.\n"
-
-#: ../src/plugins/rssyl/feed.h:22
-#, c-format
-msgid "Error parsing feed from URL %s\n"
-msgstr "Virhe jäsennettäessä syötettä osoitteessa %s\n"
-
-#: ../src/plugins/rssyl/feed.h:23
-#, c-format
-msgid "Unsupported feed type at URL %s\n"
-msgstr "Tukematon syötteen tyyppi osoitteessa %s\n"
-
-#: ../src/plugins/rssyl/feed.h:25
-#, c-format
-msgid "RSSyl: Updating feed %s\n"
-msgstr "RSSyl: Päivitetään syötettä %s\n"
-
-#: ../src/plugins/rssyl/feed.h:26
-#, c-format
-msgid "RSSyl: Feed update finished: %s\n"
-msgstr "RSSyl: Syötteen päivitys valmis: %s\n"
-
-#: ../src/plugins/rssyl/feed.h:27
-msgid "RSSyl: Feed update aborted, application is exiting.\n"
-msgstr "RSSyl: Syötteen päivitys peruttu, ohjelma sulkeutuu.\n"
-
-#: ../src/plugins/rssyl/plugin.c:63
+#: ../src/plugins/rssyl/plugin.c:65
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13514,116 +13607,161 @@ msgstr ""
 "Jokainen syöte tekee uuden kansion, joka sisältää omat verkosta haetut "
 "juttunsa. Ne voi lukea, poistaa tai säilyttää."
 
-#: ../src/plugins/rssyl/plugin.c:87
+#: ../src/plugins/rssyl/plugin.c:89
 msgid "RSS feed"
 msgstr "RSS‐syöte"
 
-#: ../src/plugins/rssyl/rssyl.c:133 ../src/plugins/rssyl/rssyl.c:145
+#: ../src/plugins/rssyl/rssyl_add_item.c:295
+msgctxt "Empty RSS feed title placeholder"
+msgid "(empty)"
+msgstr "(tyhjä)"
+
+#: ../src/plugins/rssyl/rssyl.c:154 ../src/plugins/rssyl/rssyl.c:165
 msgid "Refresh all feeds"
 msgstr "Päivitä kaikki syötteet"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:62
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Subscribe feed"
 msgstr "Tilaa syöte"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:63
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:67
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Anna tilattavan syötteen URL, jonka haluat tilata:"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:138
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:100
 #, c-format
-msgid "Really remove the folder tree '%s'?\n"
-msgstr "Poistetaanko hakemistopuu %s?\n"
+msgid "'%c' can't be used in folder name."
+msgstr "merkkiä ’%c’ ei voi sisällyttää kansion nimeen."
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:139
-msgid "Remove folder tree"
-msgstr "Poista kansiopuu"
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:242
+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] "Syötteen päivittämiseksi tarvitaan verkkoyhteyttä."
+msgstr[1] "Syötteiden päivittämiseksi tarvitaan verkkoyhteyttä."
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:305
 #, c-format
-msgid "Can't remove feed '%s'."
-msgstr "Syötettä %s ei voida poistaa"
+msgid "Really remove the feed tree `%s' ?\n"
+msgstr "Poistetaanko syötekansiopuu %s?\n"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:374
-msgid "Select a .opml file"
-msgstr "Valitse .opml-tiedosto"
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:306
+msgid "Remove feed tree"
+msgstr "Poista syötekansiopuu"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:53
-msgid "_Refresh feed"
-msgstr "_Päivitä syöte"
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:341
+msgid "Select an OPML file"
+msgstr "Valitse opml-tiedosto"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:54
-msgid "Refresh _all feeds"
-msgstr "Päivitä _kaikki syötteet"
+#: ../src/plugins/rssyl/rssyl_feed.c:75
+#: ../src/plugins/rssyl/rssyl_subscribe.c:139
+#, c-format
+msgid "Couldn't create folder for new feed '%s'."
+msgstr ""
+"Ei voitu luoda kansiota uudelle syötteelle %s."
+
+#: ../src/plugins/rssyl/rssyl_feed.h:10
+#, c-format
+msgid "RSSyl: Subscribing new feed: %s\n"
+msgstr "RSSyl: Tilataan syötettä: %s\n"
+
+#: ../src/plugins/rssyl/rssyl_feed.h:11
+#, c-format
+msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
+msgstr "RSSyl: uusi syöte tilattu: %s (%s)\n"
+
+#: ../src/plugins/rssyl/rssyl_feed.h:12
+#, c-format
+msgid "RSSyl: Updating feed: %s\n"
+msgstr "RSSyl: Päivitetään syötettä: %s\n"
+
+#: ../src/plugins/rssyl/rssyl_feed.h:13
+#, c-format
+msgid "RSSyl: Feed update finished: %s\n"
+msgstr "RSSyl: Syötteen päivitys valmis: %s\n"
+
+#: ../src/plugins/rssyl/rssyl_feed.h:14
+#, c-format
+msgid "RSSyl: Error fetching feed at '%s': %s\n"
+msgstr "RSSyl: Virhe luettaessa syötettä %s: %s\n"
+
+#: ../src/plugins/rssyl/rssyl_feed.h:15
+#, c-format
+msgid "RSSyl: No valid feed found at '%s'\n"
+msgstr "RSSyl: Ei toimvaa syötettä %s\n"
+
+#: ../src/plugins/rssyl/rssyl_feed.h:16
+#, c-format
+msgid "RSSyl: Couldn't process feed at '%s'\n"
+msgstr "RSSyl: ei voitu käsitellä syötettä %s\n"
+
+#: ../src/plugins/rssyl/rssyl_feed.h:17
+#, c-format
+msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
+msgstr "RSSyl: Sovellus lopettaa, syötteen päivitystä ei voitu lopettaa %s\n"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:243
+msgid "Use default refresh interval"
+msgstr "Käytä oletuspäivitysväliä"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:55
-msgid "Subscribe _new feed..."
-msgstr "Tilaa _uusi syöte…"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:255
+msgid "Keep old items"
+msgstr "Säilytä vanhat viestit"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:56
-msgid "_Unsubscribe feed..."
-msgstr "_Lakkaa tilaamasta syötettä…"
+#. "Trim" button
+#: ../src/plugins/rssyl/rssyl_feed_props.c:261
+msgid "_Trim"
+msgstr "_Trimmaa"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:57
-msgid "Feed pr_operties..."
-msgstr "Syötteen _ominaisuudet…"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:264
+#: ../src/plugins/rssyl/rssyl_feed_props.c:267
+msgid "Update feed, deleting items which are no longer in the source feed"
+msgstr "Päivitä syöte ja poista viestit jotka eivät ole enää syötteessä"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:58
-msgid "Import feed list..."
-msgstr "Hae syötelista…"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:271
+msgid "Fetch comments if possible"
+msgstr "Hae kommentit, jos mahdollista"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:59
-msgid "Rena_me..."
-msgstr "Nimeä _uudelleen…"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:296
+msgid "Always mark as new"
+msgstr "Merkitse aina uudeksi"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:60
-msgid "_Create new folder..."
-msgstr "_Luo uusi kansio…"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:302
+msgid "If only its text changed"
+msgstr "Vain jos sisältöteksti muuttuu"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:62
-msgid "Remove folder _tree..."
-msgstr "Poista kansiop_uu…"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:308
+msgid "Never mark as new"
+msgstr "Älä koskaan merkitse uudeksi"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:152
-msgid "Add RSS folder tree"
-msgstr "Lisää RSS‐syötekansiopuu"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:313
+msgid "Add item title to top of message"
+msgstr "Lisää viestin aihe viestin alkuun"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:153
-msgid "Enter name for a new RSS folder tree."
-msgstr "Anna nimi uudelle RSS‐syötekansiopuulle."
+#: ../src/plugins/rssyl/rssyl_feed_props.c:320
+msgid "Ignore title rename"
+msgstr "Ohita nimen muutos"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:169
+#: ../src/plugins/rssyl/rssyl_feed_props.c:326
+#: ../src/plugins/rssyl/rssyl_feed_props.c:329
 msgid ""
-"Creation of folder tree failed.\n"
-"Maybe some files already exist, or you don't have the permission to write "
-"there?"
+"Enable this to keep current folder name, even if feed author changes title "
+"of the feed."
 msgstr ""
-"Kansiopuun luonti epäonnistui.\n"
-"Ehkä sen tiedostot ovat jo olemassa, tai kansioon ei ole oikeutta kirjoittaa."
-
-#: ../src/plugins/rssyl/rssyl_gtk.c:184
-msgid "RSSyl..."
-msgstr "RSSyl..."
-
-#: ../src/plugins/rssyl/rssyl_gtk.c:257
-msgid "Use default refresh interval"
-msgstr "Käytä oletuspäivitysväliä"
-
-#: ../src/plugins/rssyl/rssyl_gtk.c:269
-msgid "Keep default number of expired entries"
-msgstr "Säilytä oletusmäärä vanhentuneita juttuja"
+"Valitse tämä niin kansion nimi säilytetään vaikka syötteen tekijä muuttaa "
+"sen."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:275
-msgid "Fetch comments if possible"
-msgstr "Hae kommentit, jos mahdollista"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:334
+#: ../src/plugins/vcalendar/vcal_prefs.c:518
+msgid "Verify SSL certificate validity"
+msgstr "Varmista SSL-varmenteen validius"
 
 #. Label for URL frame
-#: ../src/plugins/rssyl/rssyl_gtk.c:308
+#: ../src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "<b>Source URL:</b>"
 msgstr "<b>Lähteen URL:</b>"
 
-#. Fetch comments for - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:336
+#. Fetch comments max age - label
+#: ../src/plugins/rssyl/rssyl_feed_props.c:378
 msgid ""
 "<b>Fetch comments on posts aged less than:</b>\n"
 "<small>(In days; set to -1 to fetch all comments)</small>"
@@ -13632,7 +13770,7 @@ msgstr ""
 "<small>(Päivissä: -1 hakee kaikki kommentit)</small>"
 
 #. Refresh interval - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:370
+#: ../src/plugins/rssyl/rssyl_feed_props.c:436
 msgid ""
 "<b>Refresh interval in minutes:</b>\n"
 "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
@@ -13641,98 +13779,193 @@ msgstr ""
 "<small>(Aseta nollaksi poistaaksesi tämän syötteen automaattisen "
 "päivityksen)</small>"
 
-#. Expired items - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:403
-msgid ""
-"<b>Number of expired entries to keep:</b>\n"
-"<small>(Set to -1 if you want to keep expired entries)</small>"
-msgstr ""
-"<b>Säilytettävien vanhentuneiden juttujen lukumäärä:</b>\n"
-"<small>(Aseta −1:ksi, jos haluat säilyttää kaikki vanhentuneet jutut)</small>"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:462
+msgid "<b>If an item changes, do not mark it as new:</b>"
+msgstr "<b>Jos kohde muuttuu, älä merkitse uudeksi:</b>"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:554
+msgid "_OK"
+msgstr "_OK"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:429
-msgid "<b>If an item changes, do not mark it as unread:</b>"
-msgstr "<b>Jos kohde muuttuu, älä merkitse lukemattomaksi</b>"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:562
+msgid "Set feed properties"
+msgstr "Aseta syötteen ominaisuudet"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:439
-msgid "Always mark as unread"
-msgstr "Merkitse aina lukemattomaksi"
+#: ../src/plugins/rssyl/rssyl_gtk.c:48
+msgid "_Refresh feed"
+msgstr "_Päivitä syöte"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:441
-msgid "If only its text has changed"
-msgstr "Vain jos sisältöteksti muuttuu"
+#: ../src/plugins/rssyl/rssyl_gtk.c:49
+msgid "Feed pr_operties"
+msgstr "Syötteen _ominaisuudet"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:443
-msgid "Never mark as unread"
-msgstr "Älä koskaan merkitse lukemattomaksi"
+#: ../src/plugins/rssyl/rssyl_gtk.c:50
+msgid "Rena_me..."
+msgstr "Nimeä _uudelleen…"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:459
-#: ../src/plugins/vcalendar/vcal_prefs.c:518
-msgid "Verify SSL certificate validity"
-msgstr "Varmista SSL-varmenteen validius"
+#: ../src/plugins/rssyl/rssyl_gtk.c:51
+msgid "R_efresh recursively"
+msgstr "Ha_e rekursiivisesti"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:515
-msgid "_OK"
-msgstr "_OK"
+#: ../src/plugins/rssyl/rssyl_gtk.c:52
+msgid "Subscribe _new feed..."
+msgstr "Tilaa _uusi syöte…"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:523
-msgid "Set feed properties"
-msgstr "Aseta syötteen ominaisuudet"
+#: ../src/plugins/rssyl/rssyl_gtk.c:53
+msgid "Create new _folder..."
+msgstr "_Luo uusi kansio..."
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:54
+msgid "Import feed list..."
+msgstr "Hae syötelista…"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:651 ../src/plugins/rssyl/rssyl_gtk.c:675
-msgid "Unsubscribe feed"
-msgstr "Lakkaa tilaamasta syötettä"
+#: ../src/plugins/rssyl/rssyl_gtk.c:56
+msgid "Remove tree"
+msgstr "Poista puu"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:676
-msgid "Do you really want to remove feed"
-msgstr "Poistetaanko syöte"
+#: ../src/plugins/rssyl/rssyl_gtk.c:126
+msgid "Add RSS folder tree"
+msgstr "Lisää RSS‐syötekansiopuu"
 
-#. Remove cache checkbutton
-#: ../src/plugins/rssyl/rssyl_gtk.c:682
-msgid "Remove cached entries"
-msgstr "Poista jutut välimuistista"
+#: ../src/plugins/rssyl/rssyl_gtk.c:127
+msgid "Enter name for a new RSS folder tree."
+msgstr "Anna nimi uudelle RSS‐syötekansiopuulle."
 
-#: ../src/plugins/rssyl/rssyl.h:8
-msgid "RSSyl"
-msgstr "RSSyl"
+#: ../src/plugins/rssyl/rssyl_gtk.c:143
+msgid ""
+"Creation of folder tree failed.\n"
+"Maybe some files already exist, or you don't have the permission to write "
+"there?"
+msgstr ""
+"Kansiopuun luonti epäonnistui.\n"
+"Ehkä sen tiedostot ovat jo olemassa, tai kansioon ei ole oikeutta kirjoittaa."
 
 #. Default RSSyl mailbox name
-#: ../src/plugins/rssyl/rssyl.h:14
+#: ../src/plugins/rssyl/rssyl.h:17
 msgid "My Feeds"
 msgstr "Syötteet"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:106
+#: ../src/plugins/rssyl/rssyl_prefs.c:128
 msgid "Default refresh interval in minutes"
 msgstr "Oletuspäivitysväli minuuteissa"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:117
-msgid "Set to 0 to disable automatic refreshing"
-msgstr "Aseta 0:ksi estääksesi automaattisen päivityksen"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:119
-msgid "Default number of expired items to keep"
-msgstr "Oletusmäärä vanhentuneita juttuja säilytettäväksi"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:130
-msgid "Set to -1 to keep expired items"
-msgstr "Aseta -1:ksi säilyttääksesi vanhentuneet jutut"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:133
+#: ../src/plugins/rssyl/rssyl_prefs.c:147
 msgid "Refresh all feeds on application start"
 msgstr "Päivitä kaikki syötteet sovelluksen käynnistyessä"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:139
+#. Path to cookies file for libcurl to use
+#: ../src/plugins/rssyl/rssyl_prefs.c:155
 msgid "Path to cookies file"
 msgstr "Polku keksitiedostoon"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:149
+#: ../src/plugins/rssyl/rssyl_prefs.c:166
+#: ../src/plugins/rssyl/rssyl_prefs.c:169
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr "Polku Netscapen cookies.txt‐keksitiedostoon"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:152
-msgid "Verify SSL certificate validity for new feeds"
+#: ../src/plugins/rssyl/rssyl_prefs.c:176
+msgid "Verify SSL certificates validity for new feeds"
 msgstr "Varmista SSL-sertifikaatti uusille syötteille"
 
+#. Create window
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+msgid "Subscribe new feed?"
+msgstr "Tilataanko uusi syöte?"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:72
+msgid "<b>Feed folder:</b>"
+msgstr "<b>Syötekansio:</b>"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:82
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:86
+msgid ""
+"Instead of using official title, you can enter a different folder name for "
+"the feed."
+msgstr ""
+"Voit korvata oikean syötteen nimen toisella."
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:91
+msgid "_Edit feed properties after subscribing"
+msgstr "_Muokkaa syötteen asetuksia tilaamisen jälkeen"
+
+#: ../src/plugins/rssyl/rssyl_update_comments.c:99
+#, c-format
+msgid "Updating comments for '%s'..."
+msgstr "Päivitetään kommentteja kohteelle %s..."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:102
+#: ../src/plugins/vcalendar/vcal_folder.c:1596
+msgid "401 (Authorisation required)"
+msgstr "401 (Tunnistautuminen vaaditaan)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:105
+#: ../src/plugins/vcalendar/vcal_folder.c:1599
+msgid "403 (Unauthorised)"
+msgstr "403 (Ei käyttöoikeutta)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:108
+#: ../src/plugins/vcalendar/vcal_folder.c:1602
+msgid "404 (Not found)"
+msgstr "404 (Ei löydy)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:111
+#, c-format
+msgid "Error %d"
+msgstr "Virhe %d"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:123
+#, c-format
+msgctxt "First parameter is URL, second is error text"
+msgid ""
+"Error fetching feed at\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
+msgstr ""
+"Syötteen haku ei onnistunut\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:134
+#, c-format
+msgid ""
+"No valid feed found at\n"
+"<b>%s</b>"
+msgstr ""
+"Ei löydetty syötettä osoitteesta\n"
+"<b>%s</b>"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:200
+#, c-format
+msgid "Updating feed '%s'..."
+msgstr "Päivitetään syötettä %s..."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:221
+#, c-format
+msgid ""
+"Couldn't process feed at\n"
+"<b>%s</b>\n"
+"\n"
+"Please contact developers, this should not happen."
+msgstr ""
+"Syötettä ei voitu käsitellä\n"
+"<b>%s</b>\n"
+"\n"
+"Ilmoita kehittäjille, näin ei pitäisi käydä."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:301
+msgid "Claws Mail needs network access in order to update your feeds."
+msgstr "Syötteen päivittämiseksi tarvitaan verkkoyhteyttä."
+
+#: ../src/plugins/rssyl/rssyl_update_format.c:127
+msgid ""
+"Internal problem while upgrading storage format. This should not happen. "
+"Please report this, with debug output attached.\n"
+msgstr ""
+"Sisäinen virhe tallennusmuodon päivityksessä. Ilmoita kehittäjille. "
+"Näin ei pitäisi käudä.\n"
+
 #: ../src/plugins/smime/plugin.c:38 ../src/plugins/smime/plugin.c:54
 #: ../src/plugins/smime/smime.c:911
 msgid "S/MIME"
@@ -13794,6 +14027,48 @@ msgid ""
 msgstr ""
 "Huomaa, että otsakkeita kuten aihetta, ei ole salattu S/MIME-menetelmässä."
 
+#: ../src/plugins/spam_report/spam_report.c:295
+msgid "Reporting spam..."
+msgstr "Roskapostin ilmoitus…"
+
+#: ../src/plugins/spam_report/spam_report.c:330
+msgid "Report spam online..."
+msgstr "Ilmoita roskapostista verkossa"
+
+#: ../src/plugins/spam_report/spam_report.c:341
+#: ../src/plugins/spam_report/spam_report.c:379
+#: ../src/plugins/spam_report/spam_report_prefs.c:80
+msgid "SpamReport"
+msgstr "SpamReport"
+
+#: ../src/plugins/spam_report/spam_report.c:384
+msgid ""
+"This plugin reports spam to various places.\n"
+"Currently the following sites or methods are supported:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * lists.debian.org nomination system"
+msgstr ""
+"Tämä liitännäinen ilmoittaa roskapostin paikkoihin.\n"
+"Tällä hetkellä on käytössä:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * lists.debian.org nomination system"
+
+#: ../src/plugins/spam_report/spam_report.c:409
+msgid "Spam reporting"
+msgstr "Roskaposti‐ilmoitus"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:122
+msgid "Enabled"
+msgstr "Käytössä"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:149
+msgid "Forward to:"
+msgstr "Edelleenlähetä:"
+
 #: ../src/plugins/spamassassin/spamassassin.c:77
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:649
 msgid "SpamAssassin"
@@ -13922,48 +14197,6 @@ msgstr ""
 "Aika, jonka tarkistukseen voi käyttää. Jos siinä kestää pidempään, tarkistus "
 "keskeytetään."
 
-#: ../src/plugins/spam_report/spam_report.c:293
-msgid "Reporting spam..."
-msgstr "Roskapostin ilmoitus…"
-
-#: ../src/plugins/spam_report/spam_report.c:328
-msgid "Report spam online..."
-msgstr "Ilmoita roskapostista verkossa"
-
-#: ../src/plugins/spam_report/spam_report.c:339
-#: ../src/plugins/spam_report/spam_report.c:377
-#: ../src/plugins/spam_report/spam_report_prefs.c:80
-msgid "SpamReport"
-msgstr "SpamReport"
-
-#: ../src/plugins/spam_report/spam_report.c:382
-msgid ""
-"This plugin reports spam to various places.\n"
-"Currently the following sites or methods are supported:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * lists.debian.org nomination system"
-msgstr ""
-"Tämä liitännäinen ilmoittaa roskapostin paikkoihin.\n"
-"Tällä hetkellä on käytössä:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * lists.debian.org nomination system"
-
-#: ../src/plugins/spam_report/spam_report.c:407
-msgid "Spam reporting"
-msgstr "Roskaposti‐ilmoitus"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:122
-msgid "Enabled"
-msgstr "Käytössä"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:149
-msgid "Forward to:"
-msgstr "Edelleenlähetä:"
-
 #: ../src/plugins/tnef_parse/tnef_parse.c:65
 #, c-format
 msgid ""
@@ -14040,7 +14273,7 @@ msgstr "Näytä"
 
 #: ../src/plugins/vcalendar/day-view.c:614
 #: ../src/plugins/vcalendar/month-view.c:711 ../src/prefs_account.c:1477
-#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:334
+#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:336
 msgid "days"
 msgstr "päivän jälkeen"
 
@@ -14425,6 +14658,11 @@ msgstr ""
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Aikakatkaistu (%d sekuntia) yhdistettäessä osoitteeseen %s\n"
 
+#: ../src/plugins/vcalendar/vcal_folder.c:1605
+#, c-format
+msgid "Error %ld"
+msgstr "Virhe %ld"
+
 #: ../src/plugins/vcalendar/vcal_folder.c:1802
 #, c-format
 msgid ""
@@ -14475,7 +14713,7 @@ msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1849
 #: ../src/plugins/vcalendar/vcal_folder.c:1852
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create directory %s"
 msgstr "Kohdehakemiston %s luonti epäonnistui."
 
@@ -15145,11 +15383,6 @@ msgstr "Oletusarvoinen saapuneet-kansio"
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Suodattamattomat viestit tallennetaan tänne"
 
-#: ../src/prefs_account.c:1442 ../src/prefs_account.c:1531
-#: ../src/prefs_account.c:1991 ../src/prefs_customheader.c:237
-msgid "Bro_wse"
-msgstr "_Selaa"
-
 #: ../src/prefs_account.c:1453
 msgid "Use secure authentication (APOP)"
 msgstr "Käytä turvallista tunnistautumista (APOP)"
@@ -15234,8 +15467,8 @@ msgid "'Get Mail' checks for new messages on this account"
 msgstr "”Hae kaikki” tarkastaa tämän tilin uudet viestit"
 
 #: ../src/prefs_account.c:1718 ../src/prefs_customheader.c:209
-#: ../src/prefs_matcher.c:620 ../src/prefs_matcher.c:1958
-#: ../src/prefs_matcher.c:1980
+#: ../src/prefs_matcher.c:623 ../src/prefs_matcher.c:1974
+#: ../src/prefs_matcher.c:1996
 msgid "Header"
 msgstr "Otsake"
 
@@ -15417,7 +15650,7 @@ msgstr "Lähetysvarmenne"
 
 #: ../src/prefs_account.c:2558
 msgid "Automatically accept unknown valid SSL certificates"
-msgstr ""
+msgstr "Hyväksy tuntemattomat mutta validit SSL-sertifikaatit"
 
 #: ../src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
@@ -15608,8 +15841,8 @@ msgid "Replace the selected action in list with the action above"
 msgstr "Korvaa valittu toiminto ylläolevalla"
 
 #: ../src/prefs_actions.c:337 ../src/prefs_filtering_action.c:616
-#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:778
-#: ../src/prefs_template.c:318 ../src/prefs_toolbar.c:1056
+#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:781
+#: ../src/prefs_template.c:320 ../src/prefs_toolbar.c:1056
 msgid "Re_move"
 msgstr "_Poista"
 
@@ -15618,7 +15851,7 @@ msgid "Delete the selected action from the list"
 msgstr "Poista valittu toiminto listasta"
 
 #: ../src/prefs_actions.c:355 ../src/prefs_filtering.c:503
-#: ../src/prefs_template.c:336
+#: ../src/prefs_template.c:338
 msgid "Clear all the input fields in the dialog"
 msgstr "Tyhjennä valintaikkunan syötekentät"
 
@@ -15639,7 +15872,7 @@ msgstr "Siirrä valittua toimintoa alas"
 #: ../src/prefs_actions.c:535 ../src/prefs_filtering_action.c:704
 #: ../src/prefs_filtering.c:836 ../src/prefs_filtering.c:838
 #: ../src/prefs_filtering.c:839 ../src/prefs_filtering.c:949
-#: ../src/prefs_matcher.c:897 ../src/prefs_template.c:469
+#: ../src/prefs_matcher.c:900 ../src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Uusi)"
 
@@ -15700,22 +15933,22 @@ msgstr "Poistetaanko kaikki toiminnot?"
 
 #: ../src/prefs_actions.c:898 ../src/prefs_actions.c:929
 #: ../src/prefs_filtering.c:1497 ../src/prefs_filtering.c:1519
-#: ../src/prefs_matcher.c:2109 ../src/prefs_template.c:569
-#: ../src/prefs_template.c:594
+#: ../src/prefs_matcher.c:2125 ../src/prefs_template.c:572
+#: ../src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Kenttää on tallentamatta"
 
 #: ../src/prefs_actions.c:899 ../src/prefs_actions.c:930
 #: ../src/prefs_filtering.c:1498 ../src/prefs_filtering.c:1520
-#: ../src/prefs_template.c:570 ../src/prefs_template.c:595
+#: ../src/prefs_template.c:573 ../src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Kenttää ei ole tallennettu, suljetaanko joka tapauksessa?"
 
 #: ../src/prefs_actions.c:900 ../src/prefs_actions.c:905
 #: ../src/prefs_actions.c:931 ../src/prefs_filtering.c:1477
 #: ../src/prefs_filtering.c:1499 ../src/prefs_filtering.c:1521
-#: ../src/prefs_matcher.c:2111 ../src/prefs_template.c:571
-#: ../src/prefs_template.c:596 ../src/prefs_template.c:601
+#: ../src/prefs_matcher.c:2127 ../src/prefs_template.c:574
+#: ../src/prefs_template.c:599 ../src/prefs_template.c:604
 msgid "+_Continue editing"
 msgstr "_Jatka muokkausta"
 
@@ -15822,7 +16055,7 @@ msgstr ""
 "käsittelee viestin tai sen osan."
 
 #: ../src/prefs_actions.c:1092 ../src/prefs_filtering.c:1695
-#: ../src/prefs_template.c:1101
+#: ../src/prefs_template.c:1121
 msgid "D_uplicate"
 msgstr "K_aksoiskappale"
 
@@ -15958,7 +16191,7 @@ msgid "Custom header configuration"
 msgstr "Mukautetut otsakeasetukset"
 
 #: ../src/prefs_customheader.c:507 ../src/prefs_display_header.c:599
-#: ../src/prefs_matcher.c:1583 ../src/prefs_matcher.c:1598
+#: ../src/prefs_matcher.c:1595 ../src/prefs_matcher.c:1610
 msgid "Header name is not set."
 msgstr "Otsakkeen nimi on asettamatta."
 
@@ -16147,7 +16380,7 @@ msgstr "Uudelleenohjaa"
 
 #. S_COL_NUMBER
 #: ../src/prefs_filtering_action.c:194 ../src/prefs_filtering_action.c:195
-#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:626
+#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:629
 #: ../src/prefs_summary_column.c:87 ../src/summaryview.c:447
 msgid "Score"
 msgstr "Pisteet"
@@ -16164,7 +16397,7 @@ msgstr "Aseta pisteet"
 #. S_COL_SCORE
 #. S_COL_LOCKED
 #: ../src/prefs_filtering_action.c:196 ../src/prefs_filtering_action.c:197
-#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:630
+#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:633
 #: ../src/prefs_summary_column.c:89 ../src/summaryview.c:449
 msgid "Tags"
 msgstr "Tägit"
@@ -16194,7 +16427,7 @@ msgid "Action configuration"
 msgstr "Toimintoasetukset"
 
 #: ../src/prefs_filtering_action.c:427 ../src/prefs_filtering.c:1886
-#: ../src/prefs_matcher.c:583
+#: ../src/prefs_matcher.c:586
 msgid "Rule"
 msgstr "Sääntö"
 
@@ -16236,25 +16469,25 @@ msgid "No action was defined."
 msgstr "Toiminto on määrittelemättä"
 
 #. completion of 'To' from address book
-#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2153
+#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2169
 #: ../src/quote_fmt.c:79
 msgid "literal %"
 msgstr "% sellaisenaan"
 
-#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2162
+#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2178
 msgid "filename (should not be modified)"
 msgstr "Tiedostonimi — kannattaa säilyttää muuttamattomana"
 
-#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2163
+#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2179
 #: ../src/quote_fmt.c:87
 msgid "new line"
 msgstr "uusi rivi"
 
-#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2164
+#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2180
 msgid "escape character for quotes"
 msgstr "lainausmerkkien escape‐merkintä"
 
-#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2165
+#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2181
 msgid "quote character"
 msgstr "lainausmerkki"
 
@@ -16602,7 +16835,7 @@ msgid "Folder and Message Lists"
 msgstr "Hakemisto ja viestiluettelot"
 
 #. message font label
-#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2030
+#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2046
 msgid "Message"
 msgstr "Viesti"
 
@@ -16795,245 +17028,249 @@ msgstr "Muu"
 msgid "Logging"
 msgstr "Lokikirjoitus"
 
-#: ../src/prefs_matcher.c:328
+#: ../src/prefs_matcher.c:330
 msgid "more than"
 msgstr "enemmän kuin"
 
-#: ../src/prefs_matcher.c:329
+#: ../src/prefs_matcher.c:331
 msgid "less than"
 msgstr "vähemmän kuin"
 
-#: ../src/prefs_matcher.c:335
+#: ../src/prefs_matcher.c:337
 msgid "weeks"
 msgstr "viikkoa"
 
-#: ../src/prefs_matcher.c:339
+#: ../src/prefs_matcher.c:341
 msgid "higher than"
 msgstr "enemmän kuin"
 
-#: ../src/prefs_matcher.c:340
+#: ../src/prefs_matcher.c:342
 msgid "lower than"
 msgstr "vähemmän kuin"
 
-#: ../src/prefs_matcher.c:341 ../src/prefs_matcher.c:347
+#: ../src/prefs_matcher.c:343 ../src/prefs_matcher.c:349
 msgid "exactly"
 msgstr "tasan"
 
-#: ../src/prefs_matcher.c:345
+#: ../src/prefs_matcher.c:347
 msgid "greater than"
 msgstr "enemmän kuin"
 
-#: ../src/prefs_matcher.c:346
+#: ../src/prefs_matcher.c:348
 msgid "smaller than"
 msgstr "vähemmän kuin"
 
-#: ../src/prefs_matcher.c:351
+#: ../src/prefs_matcher.c:353
 msgid "bytes"
 msgstr "tavua"
 
-#: ../src/prefs_matcher.c:352
+#: ../src/prefs_matcher.c:354
 msgid "kilobytes"
 msgstr "kilotavua"
 
-#: ../src/prefs_matcher.c:353
+#: ../src/prefs_matcher.c:355
 msgid "megabytes"
 msgstr "megatavua"
 
-#: ../src/prefs_matcher.c:357
+#: ../src/prefs_matcher.c:359
 msgid "contains"
 msgstr "sisältää"
 
-#: ../src/prefs_matcher.c:358
+#: ../src/prefs_matcher.c:360
 msgid "doesn't contain"
 msgstr "ei sisällä"
 
-#: ../src/prefs_matcher.c:381
+#: ../src/prefs_matcher.c:383
 msgid "headers part"
 msgstr "otsakkeet"
 
-#: ../src/prefs_matcher.c:382
+#: ../src/prefs_matcher.c:384
+msgid "headers values"
+msgstr "otsakkeiden arvot"
+
+#: ../src/prefs_matcher.c:385
 msgid "body part"
 msgstr "viestisisältö"
 
-#: ../src/prefs_matcher.c:383
+#: ../src/prefs_matcher.c:386
 msgid "whole message"
 msgstr "koko viesti"
 
-#: ../src/prefs_matcher.c:389 ../src/summaryview.c:6300
+#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6300
 msgid "Marked"
 msgstr "Merkitty"
 
-#: ../src/prefs_matcher.c:390 ../src/summaryview.c:6298
+#: ../src/prefs_matcher.c:393 ../src/summaryview.c:6298
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: ../src/prefs_matcher.c:391
+#: ../src/prefs_matcher.c:394
 msgid "Replied"
 msgstr "Vastattu"
 
-#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6292
+#: ../src/prefs_matcher.c:395 ../src/summaryview.c:6292
 msgid "Forwarded"
 msgstr "Edelleenlähetetty"
 
-#: ../src/prefs_matcher.c:394 ../src/summaryview.c:6282 ../src/toolbar.c:416
+#: ../src/prefs_matcher.c:397 ../src/summaryview.c:6282 ../src/toolbar.c:416
 #: ../src/toolbar.c:934 ../src/toolbar.c:1978
 msgid "Spam"
 msgstr "Roskaposti"
 
-#: ../src/prefs_matcher.c:395
+#: ../src/prefs_matcher.c:398
 msgid "Has attachment"
 msgstr "Liitteellinen viesti"
 
-#: ../src/prefs_matcher.c:396 ../src/summaryview.c:6318
+#: ../src/prefs_matcher.c:399 ../src/summaryview.c:6318
 msgid "Signed"
 msgstr "Allekirjoitettu"
 
-#: ../src/prefs_matcher.c:400
+#: ../src/prefs_matcher.c:403
 msgid "set"
 msgstr "asetettu"
 
-#: ../src/prefs_matcher.c:401
+#: ../src/prefs_matcher.c:404
 msgid "not set"
 msgstr "asettamatta"
 
-#: ../src/prefs_matcher.c:405
+#: ../src/prefs_matcher.c:408
 msgid "yes"
 msgstr "kyllä"
 
-#: ../src/prefs_matcher.c:406
+#: ../src/prefs_matcher.c:409
 msgid "no"
 msgstr "ei"
 
-#: ../src/prefs_matcher.c:410
+#: ../src/prefs_matcher.c:413
 msgid "Any tags"
 msgstr "jokin tägi"
 
-#: ../src/prefs_matcher.c:411
+#: ../src/prefs_matcher.c:414
 msgid "Specific tag"
 msgstr "tietty tägi"
 
-#: ../src/prefs_matcher.c:415
+#: ../src/prefs_matcher.c:418
 msgid "ignored"
 msgstr "ohitettu"
 
-#: ../src/prefs_matcher.c:416
+#: ../src/prefs_matcher.c:419
 msgid "not ignored"
 msgstr "ei ohitettu"
 
-#: ../src/prefs_matcher.c:417
+#: ../src/prefs_matcher.c:420
 msgid "watched"
 msgstr "tarkkailtu"
 
-#: ../src/prefs_matcher.c:418
+#: ../src/prefs_matcher.c:421
 msgid "not watched"
 msgstr "ei tarkkailtu"
 
-#: ../src/prefs_matcher.c:422
+#: ../src/prefs_matcher.c:425
 msgid "found"
 msgstr "löydetty"
 
-#: ../src/prefs_matcher.c:423
+#: ../src/prefs_matcher.c:426
 msgid "not found"
 msgstr "ei löydetty"
 
-#: ../src/prefs_matcher.c:427
+#: ../src/prefs_matcher.c:430
 msgid "0 (Passed)"
 msgstr "0 (Onnistunut)"
 
-#: ../src/prefs_matcher.c:428
+#: ../src/prefs_matcher.c:431
 msgid "non-0 (Failed)"
 msgstr "ei-0 (Epäonnistunut)"
 
-#: ../src/prefs_matcher.c:566
+#: ../src/prefs_matcher.c:569
 msgid "Condition configuration"
 msgstr "Ehtoasetukset"
 
 #. criteria combo box
-#: ../src/prefs_matcher.c:610
+#: ../src/prefs_matcher.c:613
 msgid "Match criteria:"
 msgstr "Muokkaa hakuehtoja:"
 
-#: ../src/prefs_matcher.c:619
+#: ../src/prefs_matcher.c:622
 msgid "All messages"
 msgstr "Kaikki viestit"
 
-#: ../src/prefs_matcher.c:621
+#: ../src/prefs_matcher.c:624
 msgid "Age"
 msgstr "Ikä"
 
-#: ../src/prefs_matcher.c:622
+#: ../src/prefs_matcher.c:625
 msgid "Phrase"
 msgstr "Fraasi"
 
-#: ../src/prefs_matcher.c:623
+#: ../src/prefs_matcher.c:626
 msgid "Flags"
 msgstr "Liput"
 
-#: ../src/prefs_matcher.c:624 ../src/prefs_msg_colors.c:410
+#: ../src/prefs_matcher.c:627 ../src/prefs_msg_colors.c:410
 msgid "Color labels"
 msgstr "Värimerkinnät"
 
-#: ../src/prefs_matcher.c:625
+#: ../src/prefs_matcher.c:628
 msgid "Thread"
 msgstr "Säie"
 
-#: ../src/prefs_matcher.c:628
+#: ../src/prefs_matcher.c:631
 msgid "Partially downloaded"
 msgstr "Osittain noudettu"
 
-#: ../src/prefs_matcher.c:631
+#: ../src/prefs_matcher.c:634
 msgid "External program test"
 msgstr "Ulkoinen ohjelma"
 
 #. store UNtranslated "Any"/"All" in matcher expressions
-#: ../src/prefs_matcher.c:707 ../src/prefs_matcher.c:1604
-#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:2501
+#: ../src/prefs_matcher.c:710 ../src/prefs_matcher.c:1616
+#: ../src/prefs_matcher.c:1631 ../src/prefs_matcher.c:2521
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Kaikki"
 
-#: ../src/prefs_matcher.c:741
+#: ../src/prefs_matcher.c:744
 msgid "Use regexp"
 msgstr "Käytä säännöllisiä lausekkeita"
 
-#: ../src/prefs_matcher.c:818
+#: ../src/prefs_matcher.c:821
 msgid "Message must match"
 msgstr "Viesti täsmää"
 
-#: ../src/prefs_matcher.c:822
+#: ../src/prefs_matcher.c:825
 msgid "at least one"
 msgstr "vähintään yksi"
 
-#: ../src/prefs_matcher.c:823
+#: ../src/prefs_matcher.c:826
 msgid "all"
 msgstr "kaikki"
 
-#: ../src/prefs_matcher.c:826
+#: ../src/prefs_matcher.c:829
 msgid "of above rules"
 msgstr "ylläolevista säännöistä"
 
-#: ../src/prefs_matcher.c:1522 ../src/prefs_matcher.c:1588
+#: ../src/prefs_matcher.c:1534 ../src/prefs_matcher.c:1600
 msgid "Search pattern is not set."
 msgstr "Hakulauseke on asettamatta."
 
-#: ../src/prefs_matcher.c:1531
+#: ../src/prefs_matcher.c:1543
 msgid "Test command is not set."
 msgstr "Testikomento on asettamatta."
 
-#: ../src/prefs_matcher.c:1605
+#: ../src/prefs_matcher.c:1617
 msgid "all addresses in all headers"
 msgstr "kaikki osoitteet kaikissa otsakkeissa"
 
-#: ../src/prefs_matcher.c:1608
+#: ../src/prefs_matcher.c:1620
 msgid "any address in any header"
 msgstr "mikä tahansa osoite missä tahansa otsakkeessa"
 
-#: ../src/prefs_matcher.c:1610
+#: ../src/prefs_matcher.c:1622
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "osoitteita otsakkeessa %s"
 
-#: ../src/prefs_matcher.c:1611
+#: ../src/prefs_matcher.c:1623
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -17046,79 +17283,83 @@ msgstr ""
 "Jos haluat täsmätä kohteen %s koko osoitekirjaan, valitse %s osoitekirja‐"
 "kansiopudotusvalikosta."
 
-#: ../src/prefs_matcher.c:1830
+#: ../src/prefs_matcher.c:1842
 msgid "Headers part"
 msgstr "Otsakeosio"
 
-#: ../src/prefs_matcher.c:1834
+#: ../src/prefs_matcher.c:1846
+msgid "Headers values"
+msgstr "Otsakkeiden arvot"
+
+#: ../src/prefs_matcher.c:1850
 msgid "Body part"
 msgstr "Sisältöosio"
 
-#: ../src/prefs_matcher.c:1838
+#: ../src/prefs_matcher.c:1854
 msgid "Whole message"
 msgstr "Koko viesti"
 
-#: ../src/prefs_matcher.c:1957 ../src/prefs_matcher.c:2001
+#: ../src/prefs_matcher.c:1973 ../src/prefs_matcher.c:2017
 msgid "in"
 msgstr "kohteessa"
 
-#: ../src/prefs_matcher.c:1959
+#: ../src/prefs_matcher.c:1975
 msgid "content is"
 msgstr "sisältää"
 
-#: ../src/prefs_matcher.c:1968
+#: ../src/prefs_matcher.c:1984
 msgid "Age is"
 msgstr "Ikä on"
 
-#: ../src/prefs_matcher.c:1973
+#: ../src/prefs_matcher.c:1989
 msgid "Flag"
 msgstr "Lippu"
 
-#: ../src/prefs_matcher.c:1974 ../src/prefs_matcher.c:1991
+#: ../src/prefs_matcher.c:1990 ../src/prefs_matcher.c:2007
 msgid "is"
 msgstr "on"
 
-#: ../src/prefs_matcher.c:1979
+#: ../src/prefs_matcher.c:1995
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../src/prefs_matcher.c:1990
+#: ../src/prefs_matcher.c:2006
 msgid "Label"
 msgstr "Nimiö"
 
-#: ../src/prefs_matcher.c:1996
+#: ../src/prefs_matcher.c:2012
 msgid "Value:"
 msgstr "Arvo:"
 
-#: ../src/prefs_matcher.c:2013
+#: ../src/prefs_matcher.c:2029
 msgid "Score is"
 msgstr "Pisteet on"
 
-#: ../src/prefs_matcher.c:2014
+#: ../src/prefs_matcher.c:2030
 msgid "points"
 msgstr "pistettä"
 
-#: ../src/prefs_matcher.c:2024
+#: ../src/prefs_matcher.c:2040
 msgid "Size is"
 msgstr "Koko on"
 
-#: ../src/prefs_matcher.c:2029
+#: ../src/prefs_matcher.c:2045
 msgid "Scope:"
 msgstr "Alue:"
 
-#: ../src/prefs_matcher.c:2031
+#: ../src/prefs_matcher.c:2047
 msgid "tags"
 msgstr "tägit"
 
-#: ../src/prefs_matcher.c:2036
+#: ../src/prefs_matcher.c:2052
 msgid "type is"
 msgstr "tyyppi on"
 
-#: ../src/prefs_matcher.c:2040
+#: ../src/prefs_matcher.c:2056
 msgid "Program returns"
 msgstr "Ohjelma palauttaa"
 
-#: ../src/prefs_matcher.c:2110
+#: ../src/prefs_matcher.c:2126
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -17126,11 +17367,11 @@ msgstr ""
 "Kenttää ei ole tallennettu.\n"
 " Suljetaanko joka tapauksessa?"
 
-#: ../src/prefs_matcher.c:2174
+#: ../src/prefs_matcher.c:2190
 msgid "Match Type: 'Test'"
 msgstr "Vastaavuuden tyyppi: Testaa"
 
-#: ../src/prefs_matcher.c:2175
+#: ../src/prefs_matcher.c:2191
 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"
@@ -17142,7 +17383,7 @@ msgstr ""
 "\n"
 "Seuraavia merkintöjä voi käyttää:"
 
-#: ../src/prefs_matcher.c:2274
+#: ../src/prefs_matcher.c:2290
 msgid "Current condition rules"
 msgstr "Nykyiset ehtosäännöt"
 
@@ -18092,105 +18333,110 @@ msgstr "Valintaehdot"
 msgid "Selection on folder opening"
 msgstr "Valinta, joka tehdään kansiota avattaessa"
 
-#: ../src/prefs_template.c:79
+#: ../src/prefs_template.c:80
 msgid "This name is used as the Menu item"
 msgstr "Tämä nimi on käytössä valikkokohtana."
 
-#: ../src/prefs_template.c:81
+#: ../src/prefs_template.c:82
 msgid ""
 "Override composing account's From header. This doesn't change the composing "
 "account."
 msgstr "Korvaa lähettävän tilin lähettäjä-otsake. Tämä ei vaihda tiliä."
 
-#: ../src/prefs_template.c:307
+#: ../src/prefs_template.c:309
 msgid "Append the new template above to the list"
 msgstr "Lisää ylläoleva malline listaan"
 
-#: ../src/prefs_template.c:316
+#: ../src/prefs_template.c:318
 msgid "Replace the selected template in list with the template above"
 msgstr "Korvaa malline listasta ylläolevalla"
 
-#: ../src/prefs_template.c:326
+#: ../src/prefs_template.c:328
 msgid "Delete the selected template from the list"
 msgstr "Poista valittu malline listasta"
 
-#: ../src/prefs_template.c:344
+#: ../src/prefs_template.c:346
 msgid "Show information on configuring templates"
 msgstr "Näytä ohje mallineiden asettamisesta"
 
-#: ../src/prefs_template.c:368
+#: ../src/prefs_template.c:370
 msgid "Move the selected template to the top"
 msgstr "Siirrä valittu malline ylimmäksi"
 
-#: ../src/prefs_template.c:378
+#: ../src/prefs_template.c:380
 msgid "Move the selected template up"
 msgstr "Siirrä valittua mallinetta ylös"
 
-#: ../src/prefs_template.c:386
+#: ../src/prefs_template.c:388
 msgid "Move the selected template down"
 msgstr "Siirrä valittua mallinetta alas"
 
-#: ../src/prefs_template.c:396
+#: ../src/prefs_template.c:398
 msgid "Move the selected template to the bottom"
 msgstr "Siirrä valittu malline alimmaksi"
 
-#: ../src/prefs_template.c:412
+#: ../src/prefs_template.c:414
 msgid "Template configuration"
 msgstr "Mallineasetukset"
 
-#: ../src/prefs_template.c:599
+#: ../src/prefs_template.c:602
 msgid "Templates list not saved"
 msgstr "Malliluetteloa ei tallennettu."
 
-#: ../src/prefs_template.c:600
+#: ../src/prefs_template.c:603
 msgid "The templates list has been modified. Close anyway?"
 msgstr "Malliluetteloa ei ole tallennettu, suljetaanko joka tapauksessa?"
 
-#: ../src/prefs_template.c:761
+#: ../src/prefs_template.c:768
 msgid "The template's name is not set."
 msgstr "Mallineen nimi on asettamatta."
 
-#: ../src/prefs_template.c:798
+#: ../src/prefs_template.c:811
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "Mallineen Lähettäjä-kentässä on epäkelpo sähköpostiosoite."
 
-#: ../src/prefs_template.c:804
+#: ../src/prefs_template.c:817
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "Mallineen Vastaanottaja-kentässä on epäkelpo sähköpostiosoite."
 
-#: ../src/prefs_template.c:810
+#: ../src/prefs_template.c:823
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "Mallineen Kopio-kentässä on epäkelpo sähköpostiosoite."
 
-#: ../src/prefs_template.c:816
+#: ../src/prefs_template.c:829
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "Mallineen Piilokopio-kentässä on epäkelpo sähköpostiosoite."
 
-#: ../src/prefs_template.c:822
+#: ../src/prefs_template.c:835
+msgid ""
+"The \"Reply-To\" field of the template contains an invalid email address."
+msgstr "Mallineen Paluuosoite-kentässä on epäkelpo sähköpostiosoite."
+
+#: ../src/prefs_template.c:841
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "Mallineen Aihe-kenttä on epäkelpo."
 
-#: ../src/prefs_template.c:892
+#: ../src/prefs_template.c:912
 msgid "Delete template"
 msgstr "Poista malline"
 
-#: ../src/prefs_template.c:893
+#: ../src/prefs_template.c:913
 msgid "Do you really want to delete this template?"
 msgstr "Poistetaanko tämä malline?"
 
-#: ../src/prefs_template.c:905
+#: ../src/prefs_template.c:925
 msgid "Delete all templates"
 msgstr "Poista kaikki mallineet"
 
-#: ../src/prefs_template.c:906
+#: ../src/prefs_template.c:926
 msgid "Do you really want to delete all the templates?"
 msgstr "Poistetaanko kaikki mallineet?"
 
-#: ../src/prefs_template.c:1221
+#: ../src/prefs_template.c:1241
 msgid "Current templates"
 msgstr "Nykyiset mallineet"
 
-#: ../src/prefs_template.c:1249
+#: ../src/prefs_template.c:1269
 msgid "Template"
 msgstr "Malline"
 
@@ -18501,7 +18747,7 @@ msgstr "Ei tietoja saatavilla"
 msgid "No recipient keys defined."
 msgstr "Vastaanottaja‐avaimia ei ole määritelty"
 
-#: ../src/procmime.c:430 ../src/procmime.c:432 ../src/procmime.c:433
+#: ../src/procmime.c:433 ../src/procmime.c:435 ../src/procmime.c:436
 msgid "[Error decoding BASE64]\n"
 msgstr "[Virhe BASE64:n purussa]\n"
 
@@ -19233,23 +19479,23 @@ msgstr ""
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d∕%d valittu (%s∕%s), %d lukematta"
 
-#: ../src/summaryview.c:2979
+#: ../src/summaryview.c:2981
 msgid "Sorting summary..."
 msgstr "Järjestellään yhteenvetoa…"
 
-#: ../src/summaryview.c:3118
+#: ../src/summaryview.c:3120
 msgid "Setting summary from message data..."
 msgstr "Laadistaan yhteenvetoja viestidatasta…"
 
-#: ../src/summaryview.c:3323
+#: ../src/summaryview.c:3325
 msgid "(No Date)"
 msgstr "(Ei päiväystä)"
 
-#: ../src/summaryview.c:3375
+#: ../src/summaryview.c:3377
 msgid "(No Recipient)"
 msgstr "(Ei vastaanottajia)"
 
-#: ../src/summaryview.c:3410
+#: ../src/summaryview.c:3412
 #, c-format
 msgid ""
 "%s\n"
@@ -19258,7 +19504,7 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Lähettäjä: %s, ajalla %s</span>"
 
-#: ../src/summaryview.c:3417
+#: ../src/summaryview.c:3419
 #, c-format
 msgid ""
 "%s\n"
@@ -19267,26 +19513,26 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Vastaanottaja: %s, ajalla %s</span>"
 
-#: ../src/summaryview.c:4294
+#: ../src/summaryview.c:4296
 msgid "You're not the author of the article.\n"
 msgstr "Et ole viestin kirjoittaja\n"
 
-#: ../src/summaryview.c:4387
+#: ../src/summaryview.c:4389
 #, 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] "Poistetaanko valittu viesti?"
 msgstr[1] "Poistetaanko %d valittua viestiä?"
 
-#: ../src/summaryview.c:4390
+#: ../src/summaryview.c:4392
 msgid "Delete message(s)"
 msgstr "Poista viestejä"
 
-#: ../src/summaryview.c:4553
+#: ../src/summaryview.c:4555
 msgid "Destination is same as current folder."
 msgstr "Kohdekansio on sama kuin nykyinen kansio."
 
-#: ../src/summaryview.c:4652
+#: ../src/summaryview.c:4653
 msgid "Destination to copy is same as current folder."
 msgstr "Kopioinnin kohde on sama kuin nykyinen kansio."
 
@@ -19392,7 +19638,7 @@ msgstr "Salattu"
 msgid "Has attachment(s)"
 msgstr "Liitteellinen viesti"
 
-#: ../src/summaryview.c:7929
+#: ../src/summaryview.c:7932
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19401,11 +19647,11 @@ msgstr ""
 "Säännöllisessä lausekkeessa (regexpissä siis) virhe:\n"
 "%s"
 
-#: ../src/summaryview.c:8034
+#: ../src/summaryview.c:8037
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Palaa kansioihin (lukemattomia viestejä jäljellä)"
 
-#: ../src/summaryview.c:8039
+#: ../src/summaryview.c:8042
 msgid "Go back to the folder list"
 msgstr "Palaa kansioluetteloon"
 
@@ -19534,11 +19780,11 @@ msgstr ""
 "\t%s\n"
 "Poistumisarvo %d\n"
 
-#: ../src/textview.c:2194
+#: ../src/textview.c:2173
 msgid "Tags: "
 msgstr "Tägit: "
 
-#: ../src/textview.c:2896
+#: ../src/textview.c:2875
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
@@ -19556,11 +19802,11 @@ msgstr ""
 "\n"
 "Avataanko silti?"
 
-#: ../src/textview.c:2905
+#: ../src/textview.c:2884
 msgid "Phishing attempt warning"
 msgstr "Khalasteluyritysvaroitus"
 
-#: ../src/textview.c:2906
+#: ../src/textview.c:2885
 msgid "_Open URL"
 msgstr "_Avaa"
 
@@ -20153,3 +20399,131 @@ msgid ""
 msgstr ""
 "Claws Mail on valmis\n"
 "Tallenna‐painikkeella aloitetaan."
+
+#~ msgid "messages which contain header S"
+#~ msgstr "viestit, joissa on otsake S"
+
+#~ msgid "Good signature (untrusted) from %s."
+#~ msgstr "Toimiva allekirjoitus (ilman luottoa) käyttäjälle %s."
+
+#~ msgid "Cannot open temporary file"
+#~ msgstr "Väliaikaistiedoston avaus ei onnistu"
+
+#~ msgid "Cannot init libCURL"
+#~ msgstr "libCurlin alustus ei onnistu"
+
+#~ msgid "Fetching '%s'..."
+#~ msgstr "Haetaan syötettä %s…"
+
+#~ msgid "Malformed feed"
+#~ msgstr "Viallinen syöte"
+
+#~ msgid ""
+#~ "RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
+#~ "comments of '%s'"
+#~ msgstr ""
+#~ "RSSyl: Kommentien haku ei toimi RDF-syötteillä. Syötteen %s kommentteja "
+#~ "ei haeta."
+
+#~ msgid "This feed format is not supported yet."
+#~ msgstr "Tätä syötemuotoa ei tueta vielä."
+
+#~ msgid "N/A"
+#~ msgstr "—"
+
+#~ msgid "%ld byte"
+#~ msgid_plural "%ld bytes"
+#~ msgstr[0] "%ld tavu"
+#~ msgstr[1] "%ld tavua"
+
+#~ msgid "size unknown"
+#~ msgstr "tuntematon koko"
+
+#~ msgid ""
+#~ "RSSyl: Cannot update feed %s:\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "RSSyl: Syötettä %s ei voi päivittää:\n"
+#~ "%s\n"
+
+#~ msgid "You are already subscribed to this feed."
+#~ msgstr "Olet jo tilannut tämän syötteen."
+
+#~ msgid ""
+#~ "Couldn't fetch URL '%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "URLia %s ei voitu hakea:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Couldn't fetch URL '%s':\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "URLia %s ei voitu hakea.:\n"
+#~ "%s\n"
+
+#~ msgid "Can't subscribe feed '%s'."
+#~ msgstr "Syötettä %s ei voida tilata."
+
+#~ msgid "Time out connecting to URL %s\n"
+#~ msgstr "Aikakatkaistu yhdistettäessä kohteeseen %s\n"
+
+#~ msgid "Couldn't fetch URL %s\n"
+#~ msgstr "URLia %s ei voitu hakea.\n"
+
+#~ msgid "Error parsing feed from URL %s\n"
+#~ msgstr "Virhe jäsennettäessä syötettä osoitteessa %s\n"
+
+#~ msgid "Unsupported feed type at URL %s\n"
+#~ msgstr "Tukematon syötteen tyyppi osoitteessa %s\n"
+
+#~ msgid "RSSyl: Feed update aborted, application is exiting.\n"
+#~ msgstr "RSSyl: Syötteen päivitys peruttu, ohjelma sulkeutuu.\n"
+
+#~ msgid "Can't remove feed '%s'."
+#~ msgstr "Syötettä %s ei voida poistaa"
+
+#~ msgid "Refresh _all feeds"
+#~ msgstr "Päivitä _kaikki syötteet"
+
+#~ msgid "_Unsubscribe feed..."
+#~ msgstr "_Lakkaa tilaamasta syötettä…"
+
+#~ msgid "Remove folder _tree..."
+#~ msgstr "Poista kansiop_uu…"
+
+#~ msgid "RSSyl..."
+#~ msgstr "RSSyl..."
+
+#~ msgid "Keep default number of expired entries"
+#~ msgstr "Säilytä oletusmäärä vanhentuneita juttuja"
+
+#~ msgid ""
+#~ "<b>Number of expired entries to keep:</b>\n"
+#~ "<small>(Set to -1 if you want to keep expired entries)</small>"
+#~ msgstr ""
+#~ "<b>Säilytettävien vanhentuneiden juttujen lukumäärä:</b>\n"
+#~ "<small>(Aseta −1:ksi, jos haluat säilyttää kaikki vanhentuneet jutut)</"
+#~ "small>"
+
+#~ msgid "Unsubscribe feed"
+#~ msgstr "Lakkaa tilaamasta syötettä"
+
+#~ msgid "Do you really want to remove feed"
+#~ msgstr "Poistetaanko syöte"
+
+#~ msgid "Remove cached entries"
+#~ msgstr "Poista jutut välimuistista"
+
+#~ msgid "RSSyl"
+#~ msgstr "RSSyl"
+
+#~ msgid "Set to 0 to disable automatic refreshing"
+#~ msgstr "Aseta 0:ksi estääksesi automaattisen päivityksen"
+
+#~ msgid "Default number of expired items to keep"
+#~ msgstr "Oletusmäärä vanhentuneita juttuja säilytettäväksi"
+
+#~ msgid "Set to -1 to keep expired items"
+#~ msgstr "Aseta -1:ksi säilyttääksesi vanhentuneet jutut"
diff --git a/po/he.po b/po/he.po
index c2e8038..1fb9f30 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,7 +1,7 @@
 # Hebrew translation for claws mail.
 # Copyright (C) 1999-2014 The Claws Mail Team
 # This file is distributed under the same license as the claws mail package.
-# Isratine Citizen <genghiskhan at gmx.ca>, 2012, 2013, 2014.
+# Isratine Citizen <genghiskhan at gmx.ca>, 2012 - 2014.
 #
 msgid ""
 msgstr ""
@@ -15,13 +15,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"
+"X-Language: en_US\n"
+"X-Source-Language: C\n"
 
 #: ../claws-mail.appdata.xml.in.h:1
-#, fuzzy
 msgid "Claws Mail is a fast, powerful and very extensible email client."
-msgstr "‫Claws Mail נרשם בתור לקוח ברירת מחדל."
+msgstr "‏Claws Mail הינו לקוח דואר מהיר, עצמתי וגם ניתן להרחבה באופן טבעי."
 
 #: ../claws-mail.appdata.xml.in.h:2
 msgid ""
@@ -29,6 +30,8 @@ msgid ""
 "easily. Messages are managed in an open format, and are easy to interact "
 "with."
 msgstr ""
+"הוא ניתן להגדרה באופן משמעותי ומסוגל לטפל במאות של אלפים של הודעות דוא״ל "
+"בקלות. הודעות מנוהלות בפורמט פתוח, ונתונות לפעילות הדדית בקלות."
 
 #: ../claws-mail.appdata.xml.in.h:3
 msgid ""
@@ -36,14 +39,17 @@ msgid ""
 "and encryption, an RSS aggregator, a calendar, powerful spam filtering, Perl "
 "and Python interactions, HTML and PDF rendering, and more."
 msgstr ""
+"אפשרויות רבות לפונקציואליות נוספת מסופקות דרך תוספות, כגון חתימות והצפנת "
+"PGP, מאגד RSS, לוח שנה, סינון ספאם עצמתי, שילוב Perl וגם Python, שרטוט HTML "
+"וגם PDF, ועוד."
 
 #: ../claws-mail.desktop.in.h:1
 msgid "E-mail client"
-msgstr ""
+msgstr "לקוח דוא״ל"
 
 #: ../claws-mail.desktop.in.h:2
 msgid "Lightweight and Fast GTK+ based Mail Client"
-msgstr ""
+msgstr "לקוח דואר מהיר וקל משקל מבוסס +GTK"
 
 #: ../src/account.c:392
 msgid ""
@@ -68,7 +74,7 @@ msgid ""
 "given, the checkbox indicates which accounts will be included. Bold text "
 "indicates the default account."
 msgstr ""
-"'קבלת דואר' תאחזר הודעות מתוך חשבונותייך בסדר הנתון, תיבת הסימון\n"
+"באמצעות 'השג דואר' תאחזרו הודעות מתוך חשבונות בסדר נתון, תיבת הסימון\n"
 "מתווה אילו חשבונות יכללו. תמליל בולט מעיד על החשבון השגרתי."
 
 #: ../src/account.c:805
@@ -105,7 +111,7 @@ msgstr "ק"
 
 #: ../src/account.c:1543
 msgid "'Get Mail' retrieves mail from the checked accounts"
-msgstr "'קבלת דואר' מאחזרת דואר מתוך החשבונות הנבחרים"
+msgstr "'השג דואר' מאחזרת דואר מתוך החשבונות הנבחרים"
 
 #: ../src/account.c:1550 ../src/addrduplicates.c:471 ../src/addressadd.c:215
 #: ../src/addressbook.c:125 ../src/compose.c:7144 ../src/editaddress.c:1263
@@ -120,8 +126,7 @@ msgstr "'קבלת דואר' מאחזרת דואר מתוך החשבונות הנ
 msgid "Name"
 msgstr "שם"
 
-#: ../src/account.c:1558 ../src/prefs_account.c:1103
-#: ../src/prefs_account.c:4058
+#: ../src/account.c:1558 ../src/prefs_account.c:1103 ../src/prefs_account.c:4058
 msgid "Protocol"
 msgstr "פרוטוקול"
 
@@ -237,21 +242,16 @@ msgid "Action's user argument"
 msgstr "ארגומנט משתמש של פעולה"
 
 #: ../src/addrclip.c:479
-#, fuzzy
 msgid "Cannot copy a folder to itself or to its sub-structure."
-msgstr "אין אפשרות להעתיק תיקייה אל אחד מן צאצאיה."
+msgstr "אין אפשרות להעתיק תיקייה אל עצמה או אל אחד מן צאצאיה."
 
-# מוגדר לקריאה בלבד
-# אין אפשרות
 #: ../src/addrclip.c:502
-#, fuzzy
 msgid "Cannot copy an address book to itself."
-msgstr "אין אפשרות להעתיק. פנקס כתובות יעד הינו לקריאה בלבד."
+msgstr "אין אפשרות להעתיק פנקס כתובות אל עצמו."
 
 #: ../src/addrclip.c:593
-#, fuzzy
 msgid "Cannot move a folder to itself or to its sub-structure."
-msgstr "אין אפשרות להעביר תיקייה אל אחד מן צאצאיה."
+msgstr "אין אפשרות להעביר תיקייה אל עצמה או אל אחד מן צאצאיה."
 
 #. that's a group
 #: ../src/addr_compl.c:620 ../src/addressbook.c:4866
@@ -454,10 +454,9 @@ msgstr "הוסף כתוב(ו)ת"
 msgid "Can't add the specified address"
 msgstr "אין אפשרות להוסיף את הכתובת שצוינה"
 
-#: ../src/addressbook.c:126 ../src/addressbook.c:4854
-#: ../src/editaddress.c:1052 ../src/editaddress.c:1113 ../src/editgroup.c:289
-#: ../src/expldifdlg.c:517 ../src/exporthtml.c:600 ../src/exporthtml.c:764
-#: ../src/ldif.c:780
+#: ../src/addressbook.c:126 ../src/addressbook.c:4854 ../src/editaddress.c:1052
+#: ../src/editaddress.c:1113 ../src/editgroup.c:289 ../src/expldifdlg.c:517
+#: ../src/exporthtml.c:600 ../src/exporthtml.c:764 ../src/ldif.c:780
 msgid "Email Address"
 msgstr "כתובת דוא״ל"
 
@@ -633,7 +632,6 @@ msgid "Error reading file"
 msgstr "שגיאה בקריאת קובץ"
 
 #: ../src/addressbook.c:516 ../src/importldif.c:127
-#, fuzzy
 msgid "End of file encountered"
 msgstr "סוף של קובץ נחווה"
 
@@ -714,8 +712,8 @@ msgstr "אימות חזק (יותר) נדרש"
 msgid "Sources"
 msgstr "מקורות"
 
-#: ../src/addressbook.c:914 ../src/prefs_matcher.c:629
-#: ../src/prefs_other.c:475 ../src/toolbar.c:225 ../src/toolbar.c:2142
+#: ../src/addressbook.c:914 ../src/prefs_matcher.c:629 ../src/prefs_other.c:475
+#: ../src/toolbar.c:225 ../src/toolbar.c:2142
 msgid "Address book"
 msgstr "פנקס כתובות"
 
@@ -735,11 +733,9 @@ msgstr ""
 "באמת למחוק את הקבוצה(ות)?\n"
 "הכתובות המוכלות בתוכה לא יאבדו."
 
-# מוגדר לקריאה בלבד
-# אין אפשרות
 #: ../src/addressbook.c:2190
 msgid "Cannot paste. Target address book is readonly."
-msgstr "אין אפשרות להעתיק. פנקס כתובות יעד הינו לקריאה בלבד."
+msgstr "אין אפשרות להעתיק. פנקס כתובות יעד מוגדר לקריאה בלבד."
 
 #: ../src/addressbook.c:2200
 msgid "Cannot paste into an address group."
@@ -895,7 +891,6 @@ msgstr "אישיות"
 msgid "Folder"
 msgstr "תיקייה"
 
-# כרטיס וירטואלי
 #: ../src/addressbook.c:4890
 #, fuzzy
 msgid "vCard"
@@ -1053,8 +1048,8 @@ msgstr "התראה"
 #: ../src/alertpanel.c:159 ../src/compose.c:5656 ../src/compose.c:6133
 #: ../src/compose.c:11662 ../src/file_checker.c:78 ../src/file_checker.c:100
 #: ../src/messageview.c:853 ../src/messageview.c:866
-#: ../src/plugins/pgpcore/sgpgme.c:719
-#: ../src/plugins/vcalendar/vcalendar.c:125 ../src/summaryview.c:4863
+#: ../src/plugins/pgpcore/sgpgme.c:719 ../src/plugins/vcalendar/vcalendar.c:125
+#: ../src/summaryview.c:4863
 msgid "Warning"
 msgstr "אזהרה"
 
@@ -1074,12 +1069,11 @@ msgstr "הצג הודעה זו בפעם הבאה"
 
 #: ../src/avatars.c:97
 msgid "Internal avatars rendering already initialized"
-msgstr ""
+msgstr " שרטוט פנימי של אווטארים כבר אותחל"
 
 #: ../src/avatars.c:102
-#, fuzzy
 msgid "Failed to register avatars internal rendering hook"
-msgstr "כשל ברישום hook צייר תמונת אווטאר"
+msgstr "כשל ברישום hook שרטוט פנימי של אווטארים"
 
 # עיין ערך
 #: ../src/browseldap.c:218
@@ -2155,7 +2149,7 @@ msgstr ""
 #: ../src/plugins/attachwarner/attachwarner.c:219 ../src/prefs_account.c:3270
 #: ../src/toolbar.c:406 ../src/toolbar.c:424
 msgid "Send"
-msgstr "שליחה"
+msgstr "שלח"
 
 #: ../src/compose.c:5008
 msgid "The only recipient is the default CC address. Send anyway?"
@@ -2194,7 +2188,7 @@ msgstr "להשים בתור למרות זאת?"
 
 #: ../src/compose.c:5081 ../src/toolbar.c:425
 msgid "Send later"
-msgstr "שליחה מאוחרת"
+msgstr "שלח אח״כ"
 
 #: ../src/compose.c:5134 ../src/compose.c:9719
 msgid ""
@@ -2975,7 +2969,7 @@ msgstr "TLS"
 
 #: ../src/editldap.c:471 ../src/prefs_account.c:3343
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: ../src/editldap.c:475
 msgid ""
@@ -3091,16 +3085,17 @@ msgstr "התאם שמות 'מכילים' מונחי חיפוש"
 
 #: ../src/editldap.c:650
 msgid ""
-"Searches for names and addresses can be performed either using \"begins-with"
-"\" or \"contains\" search term. Check this option to perform a \"contains\" "
-"search; this type of search usually takes longer to complete. Note that for "
-"performance reasons, address completion uses \"begins-with\" for all "
-"searches against other address interfaces."
+"Searches for names and addresses can be performed either using "
+"\"begins-with\" or \"contains\" search term. Check this option to perform a "
+"\"contains\" search; this type of search usually takes longer to complete. "
+"Note that for performance reasons, address completion uses \"begins-with\" "
+"for all searches against other address interfaces."
 msgstr ""
-"חיפושים עבור שמות וכתובות ניתנים להתבצע בין באמצעות מונח חיפוש \"begins-with"
-"\" או באמצעות \"contains\". סמן את אפשרות זו כדי לקיים חיפוש \"contains\"; "
-"טיפוס חיפוש זה לוקח לרוב יותר זמן להשלמה. שים לב שמשום טעמים של ביצוע, השלמת "
-"כתובת משתמשת במונח \"begins-with\" עבור כל החיפושים לנגד ממשקי כתובות אחרים."
+"חיפושים עבור שמות וכתובות ניתנים להתבצע בין באמצעות מונח חיפוש "
+"\"begins-with\" או באמצעות \"contains\". סמן את אפשרות זו כדי לקיים חיפוש "
+"\"contains\"; טיפוס חיפוש זה לוקח לרוב יותר זמן להשלמה. שים לב שמשום טעמים "
+"של ביצוע, השלמת כתובת משתמשת במונח \"begins-with\" עבור כל החיפושים לנגד "
+"ממשקי כתובות אחרים."
 
 #: ../src/editldap.c:703
 msgid "Bind DN"
@@ -3114,8 +3109,8 @@ msgid ""
 "performing a search."
 msgstr ""
 "שם משתמש של חשבון LDAP לשימוש להתחברות אל השרת. זו לרוב בשימוש רק בשביל "
-"שרתים מוגנים. באופן אופייני שם זה מעוצב כך: \"cn=user,dc=claws-mail,dc=org"
-"\". זה נשאר לרוב ריק בעת ביצוע חיפוש."
+"שרתים מוגנים. באופן אופייני שם זה מעוצב כך: "
+"\"cn=user,dc=claws-mail,dc=org\". זה נשאר לרוב ריק בעת ביצוע חיפוש."
 
 #: ../src/editldap.c:719
 msgid "Bind Password"
@@ -3217,7 +3212,7 @@ msgstr "הוספת רשומת vCard חדשה"
 
 #: ../src/etpan/etpan-ssl.c:167
 msgid "Impossible to set the client certificate.\n"
-msgstr ""
+msgstr "בלתי אפשרי לקבוע תעודת לקוח.\n"
 
 #: ../src/exphtmldlg.c:106
 msgid "Please specify output directory and file to create."
@@ -3606,15 +3601,18 @@ msgid ""
 msgstr "הקובץ %s הינו ריק או מושחת! האם ברצונך להשתמש בקובץ גיבוי מתוך %s?"
 
 #: ../src/filtering.c:619 ../src/filtering.c:694 ../src/filtering.c:723
+#, fuzzy
 msgid "rule is not account-based\n"
-msgstr ""
+msgstr "חוק אינו מבוסס-חשבון\n"
 
 #: ../src/filtering.c:623
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
 msgstr ""
+"חוק הינו מבוסס-חשבון [מזהה=%d, שם='%s'], תואם את החשבון אשר כעת מצוי תחת "
+"שימוש כדי לאחזר הודעות"
 
 #: ../src/filtering.c:625 ../src/filtering.c:642 ../src/filtering.c:643
 #: ../src/filtering.c:667 ../src/filtering.c:685 ../src/filtering.c:712
@@ -3659,8 +3657,8 @@ msgstr ""
 #: ../src/filtering.c:710
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], not matching current account [id="
-"%d, name='%s']\n"
+"rule is account-based [id=%d, name='%s'], not matching current account "
+"[id=%d, name='%s']\n"
 msgstr ""
 
 #: ../src/filtering.c:716
@@ -3689,9 +3687,9 @@ msgid "no further processing after action [ %s ]\n"
 msgstr ""
 
 #: ../src/filtering.c:826
-#, fuzzy, c-format
+#, c-format
 msgid "processing rule '%s' [ %s ]\n"
-msgstr "ה_רץ חוקי עיבוד"
+msgstr ""
 
 #: ../src/filtering.c:830
 #, c-format
@@ -3709,34 +3707,28 @@ msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr ""
 
 #: ../src/filtering.c:890
-#, fuzzy
 msgid "undetermined"
-msgstr "לא מוגדר"
+msgstr ""
 
 #: ../src/filtering.c:894
-#, fuzzy
 msgid "incorporation"
-msgstr "סינון בעת איחוד"
+msgstr ""
 
 #: ../src/filtering.c:898
-#, fuzzy
 msgid "manually"
-msgstr "_מדריך"
+msgstr ""
 
 #: ../src/filtering.c:902
-#, fuzzy
 msgid "folder processing"
-msgstr "הרץ חוקי _עיבוד של תיקייה"
+msgstr ""
 
 #: ../src/filtering.c:906
-#, fuzzy
 msgid "pre-processing"
-msgstr "_טרום-עיבוד..."
+msgstr ""
 
 #: ../src/filtering.c:910
-#, fuzzy
 msgid "post-processing"
-msgstr "עו_בר-עיבוד..."
+msgstr ""
 
 #: ../src/filtering.c:927
 #, c-format
@@ -3771,8 +3763,7 @@ msgid "Sent"
 msgstr "דואר יוצא"
 
 #: ../src/folder.c:1572 ../src/foldersel.c:411
-#: ../src/plugins/attachwarner/attachwarner.c:219
-#: ../src/prefs_folder_item.c:309
+#: ../src/plugins/attachwarner/attachwarner.c:219 ../src/prefs_folder_item.c:309
 msgid "Queue"
 msgstr "תור"
 
@@ -3798,7 +3789,7 @@ msgstr "כעת מעתיק את %s אל %s...\n"
 #: ../src/folder.c:3255
 #, c-format
 msgid "Moving %s to %s...\n"
-msgstr "כעת מזיז את %s אל %s...\n"
+msgstr "כעת מעביר את %s אל %s...\n"
 
 #: ../src/folder.c:3563
 #, c-format
@@ -3914,11 +3905,11 @@ msgstr "כעת מגדיר מידע תיקייה..."
 
 #: ../src/folderview.c:823 ../src/summaryview.c:4117 ../src/summaryview.c:4119
 msgid "Mark all as read"
-msgstr "סמן את כולן בתור נקראו"
+msgstr "סמן את כולן ככאלה שנקראו"
 
 #: ../src/folderview.c:824 ../src/summaryview.c:4118
 msgid "Do you really want to mark all mails in this folder as read?"
-msgstr "האם אתה בטוח כי ברצונך לסמן את כל הדואר בתיקייה זו בתור נקרא?"
+msgstr "האם אתה בטוח כי ברצונך לסמן את כל הדואר בתיקייה זו ככזה נקרא?"
 
 #: ../src/folderview.c:982 ../src/imap.c:4528 ../src/mainwindow.c:5134
 #: ../src/setup.c:91
@@ -4078,8 +4069,7 @@ msgstr "העברה נכשלה!"
 msgid "Processing configuration for folder %s"
 msgstr "תצורת עיבוד עבור תיקייה %s"
 
-#: ../src/folderview.c:2943 ../src/summaryview.c:4558
-#: ../src/summaryview.c:4657
+#: ../src/folderview.c:2943 ../src/summaryview.c:4558 ../src/summaryview.c:4657
 msgid "The destination folder can only be used to store subfolders."
 msgstr "תיקיית היעד ניתנת לשימוש רק לאחסון תיקיות משנה."
 
@@ -4169,8 +4159,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"‫Claws Mail הינו תוכנה חופשית המשוחרר תחת הרשיון GPL. אם ברצונך לתרום לפרויקט "
-"Claws Mail באפשרותך לעשות כן בכתובת:\n"
+"‫Claws Mail הינו תוכנה חופשית המשוחרר תחת הרשיון GPL. אם ברצונך לתרום "
+"לפרויקט Claws Mail באפשרותך לעשות כן בכתובת:\n"
 
 #: ../src/gtk/about.c:159
 msgid ""
@@ -4620,12 +4610,11 @@ msgstr ""
 
 #: ../src/gtk/gtkutils.c:1907
 msgid "Failed."
-msgstr ""
+msgstr "נכשל."
 
 #: ../src/gtk/gtkutils.c:1970
-#, fuzzy
 msgid "Configuring..."
-msgstr "ת_צורה"
+msgstr "כעת קובע תצורה..."
 
 #. RFC2822
 #. S_COL_TO
@@ -5143,8 +5132,8 @@ msgid ""
 "<span weight=\"bold\">The following icons are used to show the status of "
 "messages and folders:</span>"
 msgstr ""
-"<span weight=\"bold\">הצלמיות הבאות משמשות להצגת המצב של הודעות ותיקיות:</"
-"span>"
+"<span weight=\"bold\">הצלמיות הבאות משמשות להצגת המצב של הודעות "
+"ותיקיות:</span>"
 
 # check
 #: ../src/gtk/inputdialog.c:233 ../src/gtk/inputdialog.c:255
@@ -5244,8 +5233,7 @@ msgstr ""
 #: ../src/plugins/notification/notification_prefs.c:479
 #: ../src/plugins/notification/notification_prefs.c:496
 #: ../src/plugins/notification/notification_prefs.c:513
-#: ../src/plugins/pgpcore/prefs_gpg.c:569
-#: ../src/plugins/rssyl/rssyl_prefs.c:65
+#: ../src/plugins/pgpcore/prefs_gpg.c:569 ../src/plugins/rssyl/rssyl_prefs.c:65
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:648
 #: ../src/plugins/spam_report/spam_report_prefs.c:79
 #: ../src/plugins/vcalendar/vcal_prefs.c:680 ../src/prefs_toolbar.c:944
@@ -5267,8 +5255,8 @@ msgstr "תיאור"
 #: ../src/gtk/pluginwindow.c:374
 #, c-format
 msgid ""
-"For more information about plugins see the <a href=\"%s\"><span underline="
-"\"none\">Claws Mail website</span></a>."
+"For more information about plugins see the <a href=\"%s\"><span "
+"underline=\"none\">Claws Mail website</span></a>."
 msgstr ""
 "למידע נוסף אודות תוספת זו ראה <a href=\"%s\"><span underline=\"none\">אתר "
 "אינטרנט Claws Mail</span></a>."
@@ -5648,7 +5636,7 @@ msgstr "_ביטול התחברות"
 
 #: ../src/gtk/sslcertwindow.c:369 ../src/gtk/sslcertwindow.c:481
 msgid "_Accept and save"
-msgstr "_קבלה ושמירה"
+msgstr "_קבל ושמור"
 
 # פקעה
 #: ../src/gtk/sslcertwindow.c:387
@@ -5670,7 +5658,7 @@ msgstr "תעודת SSL הינה פקועה"
 
 #: ../src/gtk/sslcertwindow.c:419
 msgid "_Accept"
-msgstr "_קבלה"
+msgstr "_קבל"
 
 #: ../src/gtk/sslcertwindow.c:439
 msgid "New certificate:"
@@ -5705,17 +5693,14 @@ msgstr "תעודת SSL שונתה"
 msgid "Tags:"
 msgstr "תגיות:"
 
-#: ../src/headerview.c:194
-#: ../src/plugins/notification/notification_popup.c:316
+#: ../src/headerview.c:194 ../src/plugins/notification/notification_popup.c:316
 #: ../src/plugins/notification/notification_popup.c:621
 #: ../src/plugins/notification/notification_trayicon.c:851
-#: ../src/summaryview.c:3351 ../src/summaryview.c:3369
-#: ../src/summaryview.c:3390
+#: ../src/summaryview.c:3351 ../src/summaryview.c:3369 ../src/summaryview.c:3390
 msgid "(No From)"
 msgstr "(אין ממען)"
 
-#: ../src/headerview.c:209
-#: ../src/plugins/notification/notification_popup.c:318
+#: ../src/headerview.c:209 ../src/plugins/notification/notification_popup.c:318
 #: ../src/plugins/notification/notification_popup.c:625
 #: ../src/plugins/notification/notification_trayicon.c:854
 #: ../src/summaryview.c:3403 ../src/summaryview.c:3407
@@ -5982,8 +5967,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"התחברויות DIGEST-MD5 עובדות רק אם libetpan הודר עם תמיכת SASL והתוספת DIGEST-"
-"MD5 SASL הינה מותקנת."
+"התחברויות DIGEST-MD5 עובדות רק אם libetpan הודר עם תמיכת SASL והתוספת "
+"DIGEST-MD5 SASL הינה מותקנת."
 
 #: ../src/imap.c:941
 #, c-format
@@ -6591,9 +6576,8 @@ msgid "Auth failed"
 msgstr "אימות נכשל"
 
 #. S_COL_SCORE
-#: ../src/inc.c:662 ../src/prefs_matcher.c:393
-#: ../src/prefs_summary_column.c:88 ../src/summaryview.c:2789
-#: ../src/summaryview.c:6310
+#: ../src/inc.c:662 ../src/prefs_matcher.c:393 ../src/prefs_summary_column.c:88
+#: ../src/summaryview.c:2789 ../src/summaryview.c:6310
 msgid "Locked"
 msgstr "נעולה"
 
@@ -6753,8 +6737,8 @@ msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
 msgstr ""
-"זמן סשן פקע. ניתן אולי להשיב על ידי הגברת ערך תפוגת זמן בתוך העדפות/אחרות/"
-"שונות."
+"זמן סשן פקע. ניתן אולי להשיב על ידי הגברת ערך תפוגת זמן בתוך "
+"העדפות/אחרות/שונות."
 
 #: ../src/inc.c:1227
 #, c-format
@@ -6780,22 +6764,24 @@ msgid "On_ly once"
 msgstr "_רק פעם אחת"
 
 #: ../src/ldapupdate.c:189
-#, c-format
+#, fuzzy, c-format
 msgid "ldapsvr_retrieve_item_person->Unknown status: %d"
-msgstr ""
+msgstr "‏ldapsvr_retrieve_item_person->מצב לא ידוע: %d"
 
 #: ../src/ldapupdate.c:472
+#, fuzzy
 msgid "ldapsvr_update_book: Could not clean cache\n"
-msgstr ""
+msgstr "‏ldapsvr_update_book: לא היתה אפשרות לנקות מטמון"
 
 #: ../src/ldapupdate.c:1056
+#, fuzzy
 msgid "Some SN"
-msgstr ""
+msgstr "‏SN מסוים"
 
 #: ../src/ldapupdate.c:1440
-#, c-format
+#, fuzzy, c-format
 msgid "ldapsvr_update_book->Unknown status: %s\n"
-msgstr ""
+msgstr "‏ldapsvr_update_book->מצב לא ידוע: %s\n"
 
 #: ../src/ldif.c:776
 msgid "Nick Name"
@@ -7211,7 +7197,7 @@ msgstr "_מחק שרשור"
 
 #: ../src/mainwindow.c:543
 msgid "_Find in current message..."
-msgstr "_מציאה בהודעה נוכחית..."
+msgstr "_חיפוש בתוך הודעה נוכחית..."
 
 #: ../src/mainwindow.c:545
 msgid "_Quick search"
@@ -7542,7 +7528,7 @@ msgstr "סמן בתור נקר_אה"
 #. separation
 #: ../src/mainwindow.c:697
 msgid "Mark all read"
-msgstr "סמן את כולן בתור נקראו"
+msgstr "סמן את כולן ככאלה שנקראו"
 
 # נכר פתיל דיון
 #. separation
@@ -8251,7 +8237,7 @@ msgstr "כעת מייצא אל mbox..."
 
 #: ../src/message_search.c:155
 msgid "Find in current message"
-msgstr "מציאה בהודעה נוכחית"
+msgstr "מציאה בתוך הודעה נוכחית"
 
 #: ../src/message_search.c:173
 msgid "Find text:"
@@ -8282,8 +8268,7 @@ msgstr "חיפוש סוים"
 msgid "Compose _new message"
 msgstr "הלחן הודעה חדשה"
 
-#: ../src/messageview.c:712 ../src/messageview.c:1391
-#: ../src/messageview.c:1588
+#: ../src/messageview.c:712 ../src/messageview.c:1391 ../src/messageview.c:1588
 msgid "Claws Mail - Message View"
 msgstr "‫Claws Mail - תצוגת הודעה"
 
@@ -8523,7 +8508,7 @@ msgstr "_פתח"
 
 #: ../src/mimeview.c:195
 msgid "Open _with..."
-msgstr "פתיחה באמצעות..."
+msgstr "פתיחה בעזרת..."
 
 #: ../src/mimeview.c:197
 msgid "Send to..."
@@ -8863,7 +8848,6 @@ msgstr "פועל"
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:347
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:356
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:371
-#, fuzzy
 msgid "LED "
 msgstr "LED "
 
@@ -9133,8 +9117,7 @@ msgstr "רמת דחיסה"
 #: ../src/plugins/archive/archiver_gtk.c:800
 #: ../src/plugins/archive/archiver_gtk.c:808
 #: ../src/plugins/archive/archiver_gtk.c:816
-#: ../src/plugins/pdf_viewer/poppler_viewer.c:718
-#: ../src/prefs_folder_item.c:514
+#: ../src/plugins/pdf_viewer/poppler_viewer.c:718 ../src/prefs_folder_item.c:514
 msgid "Yes"
 msgstr "כן"
 
@@ -9225,7 +9208,7 @@ msgstr "בחר באפשרות זו כדי להשתמש בדחיסת BZIP2 עבו
 
 #: ../src/plugins/archive/archiver_gtk.c:1078
 msgid "Choose this to use Compress compression for your archive"
-msgstr "בחר באפשרות זו כדי להשתמש בדחיסת Compress באופן משתמט"
+msgstr "בחר באפשרות זו כדי להשתמש בדחיסת Compress באופן שגרתי"
 
 #: ../src/plugins/archive/archiver_gtk.c:1086
 msgid "Choose this option to disable compression for the archive"
@@ -9264,7 +9247,6 @@ msgid "Choose this option to include subfolders in the archive"
 msgstr "בחר באפשרות זו כדי לכלול תיקיות משנה בתוך הארכיון"
 
 #: ../src/plugins/archive/archiver_gtk.c:1177
-#, fuzzy
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
@@ -9370,7 +9352,6 @@ msgid "Choose this option to include subfolders in the archives by default"
 msgstr "בחר באפשרות זו כדי לכלול תיקיות משנה בתוך הארכיונים באופן שגרתי"
 
 #: ../src/plugins/archive/archiver_prefs.c:325
-#, fuzzy
 msgid "MD5sum"
 msgstr "MD5sum"
 
@@ -9400,8 +9381,8 @@ msgstr "בחר באפשרות זו כדי למחוק דואר לאחר השמה
 #, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
-"attached. Mention appears on line %d, which begins with text: <span weight="
-"\"bold\">%.20s</span>...\n"
+"attached. Mention appears on line %d, which begins with text: <span "
+"weight=\"bold\">%.20s</span>...\n"
 "\n"
 "%s it anyway?"
 msgstr ""
@@ -9434,7 +9415,7 @@ msgstr "ספח"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:85
 msgid "One of the following regular expressions is matched (one per line):"
-msgstr "אחד מתוך הביטויים הרגולריים הבאים הינו מתאים (אחד לכל שורה)"
+msgstr "אחד מתוך הביטויים הרגולריים הבאים הינו מתאים (אחד לכל שורה):"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:89
 msgid "Expressions are case sensitive"
@@ -9541,9 +9522,8 @@ msgstr "הסרת תצריפים..."
 
 #: ../src/plugins/att_remover/att_remover.c:506
 #: ../src/plugins/att_remover/att_remover.c:566
-#, fuzzy
 msgid "AttRemover"
-msgstr "AttRemover"
+msgstr "מסיר תצריף"
 
 # מבצע
 #: ../src/plugins/att_remover/att_remover.c:571
@@ -9587,8 +9567,8 @@ msgid ""
 msgstr ""
 "התוספת Bogofilter לא יכלה לסנן הודעה. הגורם המסתבר של השגיאה הוא שזו לא למדה "
 "מאף דואר.\n"
-"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור לגיטימית"
-"\" בכדי לאמן את Bogofilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
+"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור "
+"לגיטימית\" בכדי לאמן את Bogofilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
 
 #: ../src/plugins/bogofilter/bogofilter.c:611
 #, c-format
@@ -9780,7 +9760,7 @@ msgstr "נתיב אל קובץ בר יישום של bogofilter"
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:232
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:429
 msgid "Mark spam as read"
-msgstr "סמן ספאם בתור נקראה"
+msgstr "סמן ספאם ככזו שנקראה"
 
 #: ../src/plugins/bsfilter/bsfilter.c:82
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:401
@@ -9807,8 +9787,8 @@ msgid ""
 msgstr ""
 "התוספת Bsfilter לא יכלה לסנן הודעה. הגורם המסתבר של השגיאה הוא שזו לא למדה "
 "מאף דואר.\n"
-"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור לגיטימית"
-"\" בכדי לאמן את Bsfilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
+"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור "
+"לגיטימית\" בכדי לאמן את Bsfilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
 
 #: ../src/plugins/bsfilter/bsfilter.c:400
 #, c-format
@@ -10223,7 +10203,7 @@ msgid ""
 msgstr ""
 "טעינת תוכן מרוחק עלולה להוביל לבעיות פרטיות מסוימות.\n"
 "כאשר טעינת תוכן מרוחק הינה מנוטרלת, לא יתבקש שום דבר\n"
-"מן הרשת. ציור של תמונות, תסריטים, אובייקטי תוספות או\n"
+"מתוך הרשת. ציור של תמונות, תסריטים, אובייקטי תוספות או\n"
 "יישומוני Java עדיין ניתנים להפעלה עבור תוכן שהינו מסופח\n"
 "בתוך הדוא״ל."
 
@@ -10332,12 +10312,12 @@ msgstr "‏Fancy צופה HTML"
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
-"By default all remote content is blocked. Options can be found in /"
-"Configuration/Preferences/Plugins/Fancy"
+"By default all remote content is blocked. Options can be found in "
+"/Configuration/Preferences/Plugins/Fancy"
 msgstr ""
 "תוספת זו מציירת דואר HTML באמצעות הספרייה WebKit %d.%d.%d library.\n"
-"באופן רגיל כל תוכן מרוחק הינו חסום. ניתן למצוא אפשרויות בתוך /תצורה/העדפות/"
-"תוספות/Fancy"
+"באופן רגיל כל תוכן מרוחק הינו חסום. ניתן למצוא אפשרויות בתוך "
+"/תצורה/העדפות/תוספות/Fancy"
 
 #. i18n: Possible error message during plugin load
 #: ../src/plugins/fetchinfo/fetchinfo_plugin.c:151
@@ -10384,7 +10364,6 @@ msgstr "הוסף תקורות fetchinfo"
 
 #. i18n: Description of a header to be added
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:101
-#, fuzzy
 msgid "UIDL"
 msgstr "UIDL"
 
@@ -10536,1024 +10515,1001 @@ msgstr "שילוב GData"
 #: ../src/plugins/geolocation/geolocation_plugin.c:349
 #, c-format
 msgid "Found location: (%.2f,%.2f)"
-msgstr ""
+msgstr "נמצא מיקום: (‭%.2f,%.2f‬)"
 
 #. TRANSLATORS: The country name is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:369
 msgid "Alleged country of origin: "
-msgstr ""
+msgstr "ארץ מוצא לכאורית: "
 
 #. TRANSLATORS: The IP address is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:373
-#, fuzzy
 msgid "Could not resolve location of IP address "
-msgstr "לא היתה אפשרות לקרוא מפתח כתובות"
+msgstr "לא היתה אפשרות לפענח מיקום של כתובת IP‏ "
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:512
-#, fuzzy
 msgid "Try to locate sender"
-msgstr "שם פרטי של ממען"
+msgstr "נסה לאתר ממען"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:528
 msgid "Andorra"
-msgstr ""
+msgstr "נסיכות אנדורה"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:529
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "איחוד הנסיכויות הערביות"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:530
 msgid "Afghanistan"
-msgstr ""
+msgstr "אפגניסטן, הרפובליקה האיסלאמית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:531
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "אנטיגואה וברבודה (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:532
 msgid "Anguilla"
-msgstr ""
+msgstr "אנגווילה (טריטוריית בריטניה; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:533
 msgid "Albania"
-msgstr ""
+msgstr "אלבניה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:534
 msgid "Armenia"
-msgstr ""
+msgstr "ארמניה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:535
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "האנטילים ההולנדיים (ממלכת ארצות השפלה)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:536
 msgid "Angola"
-msgstr ""
+msgstr "אנגולה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:537
 msgid "Antarctica"
-msgstr ""
+msgstr "אנטארקטיקה"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:538
-#, fuzzy
 msgid "Argentina"
-msgstr "ארגמן"
+msgstr "ארגנטינה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:539
 msgid "American Samoa"
-msgstr ""
+msgstr "סמואה האמריקנית (טריטוריית ארה״ב)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:540
 msgid "Austria"
-msgstr ""
+msgstr "אוסטריה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:541
 msgid "Australia"
-msgstr ""
+msgstr "קהיליית אוסטרליה (טריטוריית בריטניה; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:542
 msgid "Aruba"
-msgstr ""
+msgstr "ארובה (טריטוריית הולנד; ממלכת ארצות השפלה)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:543
 msgid "Azerbaijan"
-msgstr ""
+msgstr "אזרבייג׳ן, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:544
 msgid "Bosnia And Herzegovina"
-msgstr ""
+msgstr "בוסניה והרצגובינה"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:545
 msgid "Barbados"
-msgstr ""
+msgstr "ברבדוס (אי; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:546
 msgid "Bangladesh"
-msgstr ""
+msgstr "בנגלדש (חבר העמים הבריטי), הרפובליקה העממית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:547
 msgid "Belgium"
-msgstr ""
+msgstr "ממלכת בלגיה"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:548
 msgid "Burkina Faso"
-msgstr ""
+msgstr "בורקינה פאסו"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:549
 msgid "Bulgaria"
-msgstr ""
+msgstr "בולגריה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:550
 msgid "Bahrain"
-msgstr ""
+msgstr "ממלכת בחריין"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:551
 msgid "Burundi"
-msgstr ""
+msgstr "בורונדי, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:552
 msgid "Benin"
-msgstr ""
+msgstr "בנין, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:553
 msgid "Bermuda"
-msgstr ""
+msgstr "איי ברמודה (טריטוריית בריטניה; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:554
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "ברוניי דארוסלאם (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:555
 msgid "Bolivia"
-msgstr ""
+msgstr "בוליביה, מדינה רב לאומית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:556
 msgid "Brazil"
-msgstr ""
+msgstr "ברזיל, הרפובליקה הפדרצית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:557
 msgid "Bahamas"
-msgstr ""
+msgstr "איי בהאמה (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:558
 msgid "Bhutan"
-msgstr ""
+msgstr "ממלכת בהוטן"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:559
 msgid "Bouvet Island"
-msgstr ""
+msgstr "בּוּבֶה (אי; טריטוריית נורבגיה)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:560
 msgid "Botswana"
-msgstr ""
+msgstr "בוֹטְסְוָאנָה (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:561
 msgid "Belarus"
-msgstr ""
+msgstr "בלארוס"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:562
 msgid "Belize"
-msgstr ""
+msgstr "בליז (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:563
 msgid "Canada"
-msgstr ""
+msgstr "קנדה (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:564
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "איי קוקוס (קילינג) (טריטוריית אוסטרליה; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:565
 msgid "Central African Republic"
-msgstr ""
+msgstr "הרפובליקה המרכז אפריקנית"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:566
 msgid "Congo"
-msgstr ""
+msgstr "הקונגו, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:567
 msgid "Switzerland"
-msgstr ""
+msgstr "שווייצריה"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:568
 msgid "Cote D'Ivoire"
-msgstr ""
+msgstr "חוף השנהב, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:569
 msgid "Cook Islands"
-msgstr ""
+msgstr "איי קוק (טריטוריית ניו זילנד; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:570
 msgid "Chile"
-msgstr ""
+msgstr "צ׳ילה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:571
 msgid "Cameroon"
-msgstr ""
+msgstr "קמרון (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:572
-#, fuzzy
 msgid "China"
-msgstr "סיני"
+msgstr "סין, הרפובליקה העממית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:573
-#, fuzzy
 msgid "Colombia"
-msgstr "צבע"
+msgstr "קולומביה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:574
 msgid "Costa Rica"
-msgstr ""
+msgstr "קוסטה ריקה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:575
 msgid "Cuba"
-msgstr ""
+msgstr "קובה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:576
 msgid "Cape Verde"
-msgstr ""
+msgstr "איי כֵּף וֶרְדֶּה"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:577
 msgid "Christmas Island"
-msgstr ""
+msgstr "כריסטמס (אי; טריטוריית אוסטרליה; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:578
 msgid "Cyprus"
-msgstr ""
+msgstr "קפריסין (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:579
 msgid "Czech Republic"
-msgstr ""
+msgstr "הרפובליקה הצ׳כית"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:580
 msgid "Germany"
-msgstr ""
+msgstr "גרמניה, הרפובליקה הפדרלית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:581
 msgid "Djibouti"
-msgstr ""
+msgstr "דג׳יבוטי, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:582
-#, fuzzy
 msgid "Denmark"
-msgstr "אי סימון"
+msgstr "ממלכת דנמרק"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:583
 msgid "Dominica"
-msgstr ""
+msgstr "דומיניקה (חבר העמים הבריטי), הקהילייה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:584
 msgid "Dominican Republic"
-msgstr ""
+msgstr "הרפובליקה הדומיניקנית"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:585
 msgid "Algeria"
-msgstr ""
+msgstr "אלג׳יריה (הרפובליקה האלג׳יראית הדמוקרטית העממית)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:586
 msgid "Ecuador"
-msgstr ""
+msgstr "אקוודור, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:587
 msgid "Estonia"
-msgstr ""
+msgstr "אסטוניה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:588
 msgid "Egypt"
-msgstr ""
+msgstr "מצרים, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:589
-#, fuzzy
 msgid "Western Sahara"
-msgstr "מערב אירופאי"
+msgstr "סהרה המערבית (טריטוריית מרוקו)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:590
 msgid "Eritrea"
-msgstr ""
+msgstr "מדינת אריתריאה"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:591
 msgid "Spain"
-msgstr ""
+msgstr "ממלכת ספרד"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:592
 msgid "Ethiopia"
-msgstr ""
+msgstr "אתיופיה, הרפובליקה הדמוקרטית הפדרלית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:593
 msgid "Finland"
-msgstr ""
+msgstr "פינלנד, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:594
 msgid "Fiji"
-msgstr ""
+msgstr "איי פיג׳י (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:595
 msgid "Falkland Islands (Malvinas)"
-msgstr ""
+msgstr "איי פוקלנד (מלווינס) (טריטוריית בריטניה; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:596
 msgid "Micronesia, Federated States Of"
-msgstr ""
+msgstr "מיקרונזיה, מדינות פדרליות של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:597
 msgid "Faroe Islands"
-msgstr ""
+msgstr "איי פארו (טריטוריית דנמרק)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:598
-#, fuzzy
 msgid "France"
-msgstr "ביטול"
+msgstr "הרפובליקה הצרפתית"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:599
 msgid "France, Metropolitan"
-msgstr ""
+msgstr "צרפת, מטרופולין"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:600
 msgid "Gabon"
-msgstr ""
+msgstr "הרפובליקה הגבונית"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:601
 #: ../src/plugins/geolocation/geolocation_plugin.c:747
 msgid "United Kingdom"
-msgstr ""
+msgstr "הממלכה המאוחדת של בריטניה הגדולה וצפון אירלנד (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:602
 msgid "Grenada"
-msgstr ""
+msgstr "גרנדה (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:603
 msgid "Georgia"
-msgstr ""
+msgstr "גרוזיה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:604
 msgid "French Guiana"
-msgstr ""
+msgstr "גיאנה הצרפתית (טריטוריית צרפת)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:605
 msgid "Ghana"
-msgstr ""
+msgstr "גאנה (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:606
-#, fuzzy
 msgid "Gibraltar"
-msgstr "Libravatar"
+msgstr "ג׳יברלטר (טריטוריית בריטניה; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:607
-#, fuzzy
 msgid "Greenland"
-msgstr "ירוק"
+msgstr "גרינלנד (טריטוריית דנמרק)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:608
 msgid "Gambia"
-msgstr ""
+msgstr "הגמביה (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:609
 msgid "Guinea"
-msgstr ""
+msgstr "גינאה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:610
 msgid "Guadeloupe"
-msgstr ""
+msgstr "איי גוואדלופ (טריטוריית צרפת)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:611
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "גינאה המשוונית, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:612
-#, fuzzy
 msgid "Greece"
-msgstr "ירוק"
+msgstr "יוון (הרפובליקה ההלנית)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:613
 msgid "South Georgia And The South Sandwich Islands"
-msgstr ""
+msgstr "דרום ג׳ורגיה ואיי דרום סנדביץ' (טריטוריית בריטניה; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:614
 msgid "Guatemala"
-msgstr ""
+msgstr "גואטמלה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:615
 msgid "Guam"
-msgstr ""
+msgstr "גואם (טריטוריית ארה״ב)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:616
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "גינאה-ביסאו, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:617
 msgid "Guyana"
-msgstr ""
+msgstr "גיאנה (חבר העמים הבריטי), הרפובליקה השיתופית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:618
 msgid "Hong Kong"
-msgstr ""
+msgstr "הונג קונג (טריטוריית סין)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:619
 msgid "Heard Island And Mcdonald Islands"
-msgstr ""
+msgstr "הרד (אי) ואיי מקדונלד (טריטוריית אוסטרליה; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:620
 msgid "Honduras"
-msgstr ""
+msgstr "הונדורס, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:621
 msgid "Croatia"
-msgstr ""
+msgstr "קרואטיה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:622
 msgid "Haiti"
-msgstr ""
+msgstr "האיטי, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:623
 msgid "Hungary"
-msgstr ""
+msgstr "הונגריה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:624
 msgid "Indonesia"
-msgstr ""
+msgstr "אינדונזיה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:625
 msgid "Ireland"
-msgstr ""
+msgstr "אירלנד (טריטוריית בריטניה), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:626
 msgid "Israel"
-msgstr ""
+msgstr "מדינת ישראל"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:627
-#, fuzzy
 msgid "India"
-msgstr "מחוון"
+msgstr "הודו (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:628
 msgid "British Indian Ocean Territory"
 msgstr ""
+"הטריטוריה הבריטית באוקיינוס ההודי (איי צ׳גוס) (טריטוריית בריטניה; חבר העמים "
+"הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:629
 msgid "Iraq"
-msgstr ""
+msgstr "עיראק, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:630
 msgid "Iran, Islamic Republic Of"
-msgstr ""
+msgstr "איראן, הרפובליקה האיסלאמית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:631
 msgid "Iceland"
-msgstr ""
+msgstr "איסלנד, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:632
 msgid "Italy"
-msgstr ""
+msgstr "איטליה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:633
 msgid "Jamaica"
-msgstr ""
+msgstr "ג׳מייקה (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:634
 msgid "Jordan"
-msgstr ""
+msgstr "ירדן, הממלכה ההאשמית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:635
-#, fuzzy
 msgid "Japan"
-msgstr "יפני"
+msgstr "ממלכת יפן"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:636
 msgid "Kenya"
-msgstr ""
+msgstr "קניה (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:637
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "קירגיסטן, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:638
 msgid "Cambodia"
-msgstr ""
+msgstr "ממלכת קמבודיה"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:639
 msgid "Kiribati"
-msgstr ""
+msgstr "קיריבאטי (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:640
-#, fuzzy
 msgid "Comoros"
-msgstr "מחר"
+msgstr "איי קומורו, איחוד של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:641
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "סיינט קיטס ונביס (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:642
 msgid "Korea, Democratic People'S Republic Of"
-msgstr ""
+msgstr "קוריאה, הרפובליקה העממית דמוקרטית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:643
 msgid "Korea, Republic Of"
-msgstr ""
+msgstr "קוריאה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:644
 msgid "Kuwait"
-msgstr ""
+msgstr "מדינת כווית"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:645
 msgid "Cayman Islands"
-msgstr ""
+msgstr "איי קימן (טריטוריית בריטניה; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:646
 msgid "Kazakhstan"
-msgstr ""
+msgstr "קזחסטן, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:647
 msgid "Lao People'S Democratic Republic"
-msgstr ""
+msgstr "לאוס, הרפובליקה הדמוקרטית העממית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:648
 msgid "Lebanon"
-msgstr ""
+msgstr "הרפובליקה הלבנונית"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:649
 msgid "Saint Lucia"
-msgstr ""
+msgstr "סיינט לוסיה (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:650
 msgid "Liechtenstein"
-msgstr ""
+msgstr "נסיכות ליכטנשטיין"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:651
 msgid "Sri Lanka"
-msgstr ""
+msgstr "סרי לנקה (חבר העמים הבריטי), הרפובליקה הדמוקרטית הסוציאליסטית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:652
 msgid "Liberia"
-msgstr ""
+msgstr "ליבריה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:653
 msgid "Lesotho"
-msgstr ""
+msgstr "ממלכת לסוטו (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:654
 msgid "Lithuania"
-msgstr ""
+msgstr "ליטא, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:655
 msgid "Luxembourg"
-msgstr ""
+msgstr "לוקסמבורג, הדוכסות הגדולה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:656
 msgid "Latvia"
-msgstr ""
+msgstr "לטוויה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:657
 msgid "Libyan Arab Jamahiriya"
-msgstr ""
+msgstr "לוב, הג׳מהיריה הלובית ערבית"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:658
 msgid "Morocco"
-msgstr ""
+msgstr "ממלכת רוקו"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:659
 msgid "Monaco"
-msgstr ""
+msgstr "נסיכות מונקו"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:660
 msgid "Moldova, Republic Of"
-msgstr ""
+msgstr "מולדובה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:661
 msgid "Madagascar"
-msgstr ""
+msgstr "מדגסקר, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:662
-#, fuzzy
 msgid "Marshall Islands"
-msgstr "סמן את כולן בתור נקראו"
+msgstr "איי מרשל, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:663
 msgid "Macedonia, The Former Yugoslav Republic Of"
-msgstr ""
+msgstr "מקדוניה, הרפובליקה היוגוסלבית לשעבר של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:664
 msgid "Mali"
-msgstr ""
+msgstr "מאלי, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:665
-#, fuzzy
 msgid "Myanmar"
-msgstr "אי סימון"
+msgstr "איחוד מיאנמר (לשעבר בורמה)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:666
 msgid "Mongolia"
-msgstr ""
+msgstr "מונגוליה"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:667
 msgid "Macao"
-msgstr ""
+msgstr "מקאו (טריטוריית סין)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:668
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "איי מרינה הצפונים (טריטוריית ארה״ב), הקהילייה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:669
 msgid "Martinique"
-msgstr ""
+msgstr "מרטיניק (טריטוריית צרפת)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:670
 msgid "Mauritania"
-msgstr ""
+msgstr "מאוריטניה, הרפובליקה האיסלאמית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:671
 msgid "Montserrat"
-msgstr ""
+msgstr "מונטסראט (אי; טריטוריית בריטניה; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:672
 msgid "Malta"
-msgstr ""
+msgstr "מלטה (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:673
 msgid "Mauritius"
-msgstr ""
+msgstr "מאוריציוס (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:674
 msgid "Maldives"
-msgstr ""
+msgstr "המלדיביים (האיים המלדיביים; חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:675
 msgid "Malawi"
-msgstr ""
+msgstr "מלאווי (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:676
 msgid "Mexico"
-msgstr ""
+msgstr "המדינות המקסיקניות המאוחדות"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:677
 msgid "Malaysia"
-msgstr ""
+msgstr "מלזיה (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:678
 msgid "Mozambique"
-msgstr ""
+msgstr "מוזמביק (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:679
 msgid "Namibia"
-msgstr ""
+msgstr "נמיביה (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:680
-#, fuzzy
 msgid "New Caledonia"
-msgstr "אנשי קשר חדשים"
+msgstr "קלדוניה החדשה (טריטוריית צרפת)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:681
 msgid "Niger"
-msgstr ""
+msgstr "ניז׳ר, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:682
 msgid "Norfolk Island"
-msgstr ""
+msgstr "נורפולק (אי; טריטוריית אוסטרליה; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:683
 msgid "Nigeria"
-msgstr ""
+msgstr "ניגריה (חבר העמים הבריטי), הרפובליקה הפדרלית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:684
 msgid "Nicaragua"
-msgstr ""
+msgstr "ניקרגואה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:685
 msgid "Netherlands"
-msgstr ""
+msgstr "הולנד (ממלכת ארצות השפלה)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:686
-#, fuzzy
 msgid "Norway"
-msgstr "קידום"
+msgstr "ממלכת נורבגיה"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:687
 msgid "Nepal"
-msgstr ""
+msgstr "נפאל, הרפובליקה הפדרלית דמוקרטית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:688
 msgid "Nauru"
-msgstr ""
+msgstr "נאורו (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:689
 msgid "Niue"
-msgstr ""
+msgstr "ניווה (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:690
 msgid "New Zealand"
-msgstr ""
+msgstr "ניו זילנד (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:691
 msgid "Oman"
-msgstr ""
+msgstr "סולטנות עומאן"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:692
 msgid "Panama"
-msgstr ""
+msgstr "פנמה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:693
 msgid "Peru"
-msgstr ""
+msgstr "פרו, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:694
 msgid "French Polynesia"
-msgstr ""
+msgstr "פולינזיה הצרפתית (טריטוריית צרפת)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:695
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "פאפואה גינאה החדשה (חבר העמים הבריטי), המדינה העצמאית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:696
-#, fuzzy
 msgid "Philippines"
-msgstr "שורות"
+msgstr "הפיליפינים, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:697
 msgid "Pakistan"
-msgstr ""
+msgstr "פקיסטן (חבר העמים הבריטי), הרפובליקה האיסלאמית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:698
 msgid "Poland"
-msgstr ""
+msgstr "פולין, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:699
 msgid "Saint Pierre And Miquelon"
-msgstr ""
+msgstr "סיינט פייר ומיקלון (טריטוריית צרפת)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:700
 msgid "Pitcairn"
 msgstr ""
+"האיים פיטקרן, הנדרסון, דוצ׳י, ואואנו (טריטוריית בריטניה; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:701
 msgid "Puerto Rico"
-msgstr ""
+msgstr "קהיליית פוארטו ריקו (טריטוריית ארה״ב)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:702
-#, fuzzy
 msgid "Portugal"
-msgstr "פורט"
+msgstr "הרפובליקה הפורטוגזית"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:703
 msgid "Palau"
-msgstr ""
+msgstr "פָּלָאו, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:704
 msgid "Paraguay"
-msgstr ""
+msgstr "פרגוואי, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:705
-#, fuzzy
 msgid "Qatar"
-msgstr "Wavatar"
+msgstr "נסיכות קטאר"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:706
 msgid "Reunion"
-msgstr ""
+msgstr "ראוניון (אי; טריטוריית צרפת)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:707
 msgid "Romania"
-msgstr ""
+msgstr "רומניה"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:708
 msgid "Russian Federation"
-msgstr ""
+msgstr "הפדרציה הרוסית"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:709
 msgid "Rwanda"
-msgstr ""
+msgstr "רואנדה (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:710
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "ממלכת ערב הסעודית"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:711
 msgid "Solomon Islands"
-msgstr ""
+msgstr "איי שלמה (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:712
 msgid "Seychelles"
-msgstr ""
+msgstr "איי סיישל (טריטוריית בריטניה; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:713
 msgid "Sudan"
-msgstr ""
+msgstr "הסודאן, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:714
 msgid "Sweden"
-msgstr ""
+msgstr "ממלכת שׁבדיה"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:715
 msgid "Singapore"
-msgstr ""
+msgstr "סינגפור (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:716
 msgid "Saint Helena"
-msgstr ""
+msgstr "סיינט הלנה (טריטוריית בריטניה; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:717
 msgid "Slovenia"
-msgstr ""
+msgstr "סלובניה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:718
 msgid "Svalbard And Jan Mayen"
-msgstr ""
+msgstr "סוולברד ויאן מאין"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:719
 msgid "Slovakia"
-msgstr ""
+msgstr "סלובקיה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:720
 msgid "Sierra Leone"
-msgstr ""
+msgstr "סיירה ליאון (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:721
 msgid "San Marino"
-msgstr ""
+msgstr "סאן מארינו, הרפובליקה המרוממת ביותר של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:722
 msgid "Senegal"
-msgstr ""
+msgstr "סנגל, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:723
 msgid "Somalia"
-msgstr ""
+msgstr "סומליה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:724
-#, fuzzy
 msgid "Suriname"
-msgstr "שם משתמש SMTP:"
+msgstr "סורינאם, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:725
 msgid "Sao Tome And Principe"
-msgstr ""
+msgstr "סאו תומה ופרינסיפה, הרפובליקה הדמוקרטית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:726
 msgid "El Salvador"
-msgstr ""
+msgstr "אל סלבדור, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:727
 msgid "Syrian Arab Republic"
-msgstr ""
+msgstr "הרפובליקה הסורית ערבית"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:728
 msgid "Swaziland"
-msgstr ""
+msgstr "ממלכת סְוָוזִילַנְד (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:729
 msgid "Turks And Caicos Islands"
-msgstr ""
+msgstr "איי טורק וקייקוס (טריטוריית בריטניה; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:730
 msgid "Chad"
-msgstr ""
+msgstr "צ׳אד, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:731
 msgid "French Southern Territories"
-msgstr ""
+msgstr "הטריטוריות הדרומיות של צרפת"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:732
 msgid "Togo"
-msgstr ""
+msgstr "טוגו, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:733
-#, fuzzy
 msgid "Thailand"
-msgstr "תאילנדי"
+msgstr "ממלכת תאילנד"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:734
 msgid "Tajikistan"
-msgstr ""
+msgstr "טג׳יקיסטן, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:735
 msgid "Tokelau"
-msgstr ""
+msgstr "טוקלאו (טריטוריית ניו זילנד; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:736
 msgid "Turkmenistan"
-msgstr ""
+msgstr "טורקמניסטן, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:737
 msgid "Tunisia"
-msgstr ""
+msgstr "טוניסיה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:738
 msgid "Tonga"
-msgstr ""
+msgstr "ממלכת טונגה (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:739
 msgid "East Timor"
-msgstr ""
+msgstr "מזרח טימור, הרפובליקה הדמוקרטית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:740
 msgid "Turkey"
-msgstr ""
+msgstr "טורקיה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:741
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "טרינידד וטובגו (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:742
 msgid "Tuvalu"
-msgstr ""
+msgstr "טובאלו (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:743
 msgid "Taiwan, Province Of China"
-msgstr ""
+msgstr "טאייואן, מחוז של סין"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:744
 msgid "Tanzania, United Republic Of"
-msgstr ""
+msgstr "טנזניה (חבר העמים הבריטי), הרפובליקה המאוחדת של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:745
 msgid "Ukraine"
-msgstr ""
+msgstr "אוקראינה"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:746
 msgid "Uganda"
-msgstr ""
+msgstr "אוגנדה (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:748
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "איים חיצוניים זוטרים של ארצות הברית"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:749
 msgid "United States"
-msgstr ""
+msgstr "ארצות הברית של אמריקה"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:750
 msgid "Uruguay"
-msgstr ""
+msgstr "אורוגוואי, הרפובליקה המזרחית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:751
 msgid "Uzbekistan"
-msgstr ""
+msgstr "אוזבקיסטן, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:752
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "בישופות קדושות (עיר מדינה של הוותיקן)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:753
 msgid "Saint Vincent And The Grenadines"
-msgstr ""
+msgstr "סיינט וינסנט והגרנדינים (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:754
 msgid "Venezuela"
-msgstr ""
+msgstr "ונצואלה, הרפובליקה הבוליברית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:755
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "איי הבתולה, בריטניה (טריטוריית בריטניה; חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:756
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "איי הבתולה, ארה״ב (טריטוריית ארה״ב)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:757
-#, fuzzy
 msgid "Viet Nam"
-msgstr "שם קובץ"
+msgstr "וייט נאם, הרפובליקה הסוציאליסטית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:758
 msgid "Vanuatu"
-msgstr ""
+msgstr "ונואטו (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:759
 msgid "Wallis And Futuna"
-msgstr ""
+msgstr "ואליס ופוטונה (טריטוריית צרפת), טריטוריה של האיים של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:760
 msgid "Samoa"
-msgstr ""
+msgstr "מדינת סמואה העצמאית (חבר העמים הבריטי)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:761
 msgid "Yemen"
-msgstr ""
+msgstr "תימן, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:762
 msgid "Mayotte"
-msgstr ""
+msgstr "מאיוט (טריטוריית צרפת)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:763
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "סרביה ומונטנגרו, מדינת איחוד של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:764
 msgid "South Africa"
-msgstr ""
+msgstr "דרום אפריקה (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:765
 msgid "Zambia"
-msgstr ""
+msgstr "זמביה (חבר העמים הבריטי), הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:766
 msgid "Democratic Republic Of The Congo"
-msgstr ""
+msgstr "הקונגו, הרפובליקה הדמוקרטית של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:767
 msgid "Zimbabwe"
-msgstr ""
+msgstr "זימבבואה, הרפובליקה של"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:777
 #: ../src/plugins/geolocation/geolocation_plugin.c:862
-#, fuzzy
 msgid "GeoLocation"
-msgstr "מיקום:"
+msgstr "מיקום גאוגרפי"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:782
-#, fuzzy, c-format
+#, c-format
 msgid "Could not initialize clutter"
-msgstr "לא היתה אפשרות לאתחל מאיית %s."
+msgstr "לא היתה אפשרות לאתחל clutter"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:788
 #: ../src/plugins/geolocation/geolocation_plugin.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create regular expression: %s\n"
-msgstr "לא היתה אפשרות ליצור קובץ זמני: %s"
+msgstr "לא היתה אפשרותן ליצור ביטוי רגולרי: %s\n"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:803
-#, fuzzy
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-msgstr "כשל ברישום hook שינוי מוטיב בתוספת התראה"
+msgstr "כשל ברישום hook של messageview_show בתוספת GeoLocation"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:867
 msgid ""
@@ -11571,18 +11527,27 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome (but only if it's not about marital "
 "quarrels)."
 msgstr ""
+"תוספת זו מספקת פונקציונליות של GeoLocation עבור Claws Mail.\n"
+"\n"
+"אזהרה: טכנית זה בלתי אפשרי לשאוב נתונים של מיקום גיאוגרפי של ממען מתוך "
+"הודעות הדוא״ל שלהם עם כל כמות של ודאות. התוצאות אשר מוצגות על ידי תוספת זו "
+"הינן בגדר של הערכות גסות. בייחוד, מנהלי רשימות דיוור לעיתים מסירים מידע ממען "
+"מתוך הודעות דואר, כך שדואר מתוך רשימות דיוור עשוי להיות מוקצה למקום של השרת "
+"של רשימת הדיוור במקום זה של שולח הדואר.\n"
+"כאשר קיים ספק, אנא אל תסמכו בתוצאות של תוספת זו, ואל תסמכו על מידע זה כדי "
+"להתגרש מן בן/בת הזוג שלך.\n"
+"\n"
+"משוב אל <berndth at gmx.de> מקודם בברכה (רק כאשר העניין אינו בסכסוכים של "
+"נישואין)."
 
-# אינטגרציית GeoLocation
 #: ../src/plugins/geolocation/geolocation_plugin.c:900
-#, fuzzy
 msgid "GeoLocation integration"
-msgstr "שילוב GData"
+msgstr "שילוב GeoLocation"
 
 #: ../src/plugins/libravatar/libravatar.c:374
 #: ../src/plugins/libravatar/libravatar.c:445
 #: ../src/plugins/libravatar/libravatar.c:505
 #: ../src/plugins/libravatar/libravatar_prefs.c:400
-#, fuzzy
 msgid "Libravatar"
 msgstr "Libravatar"
 
@@ -11643,8 +11608,8 @@ msgstr "שמור צלמיות בכונן לשם שימוש חוזר במקום 
 msgid "Cache refresh interval"
 msgstr "תדירות רענון מטמון"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:123
-#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:333
+#: ../src/plugins/libravatar/libravatar_prefs.c:123 ../src/prefs_account.c:1487
+#: ../src/prefs_matcher.c:333
 msgid "hours"
 msgstr "שעות"
 
@@ -11661,7 +11626,6 @@ msgid "MonsterID"
 msgstr "מזהה מפלצת"
 
 #: ../src/plugins/libravatar/libravatar_prefs.c:191
-#, fuzzy
 msgid "Wavatar"
 msgstr "Wavatar"
 
@@ -11747,7 +11711,6 @@ msgid "This is a plugin to handle mailboxes in mbox format."
 msgstr "זוהי תוספת שמטפלת בתיבת דואר בפורמט של mbox."
 
 #: ../src/plugins/mailmbox/plugin.c:84
-#, fuzzy
 msgid "MBOX"
 msgstr "MBOX"
 
@@ -11999,7 +11962,6 @@ msgid "Command"
 msgstr "פקודה"
 
 #: ../src/plugins/notification/notification_prefs.c:481
-#, fuzzy
 msgid "LCD"
 msgstr "LCD"
 
@@ -12046,9 +12008,8 @@ msgstr "תיקיות לוח שנה"
 
 #. Warning-Label
 #: ../src/plugins/notification/notification_prefs.c:639
-#, fuzzy
 msgid "These settings override folder-specific selections."
-msgstr "הגדרות אלו מחליפות בחירות סגוליות-לתיקייה."
+msgstr "הגדרות אלו עוקפות בחירות תיקייה סגוליות."
 
 #. Frame
 #: ../src/plugins/notification/notification_prefs.c:650
@@ -12075,9 +12036,8 @@ msgid "Show banner"
 msgstr "הצג כרזה"
 
 #: ../src/plugins/notification/notification_prefs.c:746
-#: ../src/plugins/pgpcore/select-keys.c:238
-#: ../src/plugins/pgpcore/sgpgme.c:144 ../src/prefs_receive.c:183
-#: ../src/prefs_summaries.c:462
+#: ../src/plugins/pgpcore/select-keys.c:238 ../src/plugins/pgpcore/sgpgme.c:144
+#: ../src/prefs_receive.c:183 ../src/prefs_summaries.c:462
 msgid "Never"
 msgstr "אף פעם"
 
@@ -12293,12 +12253,10 @@ msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
 msgstr "דוגמאות למקשים חמים כוללות ‪<b>%s</b>‬ וגם ‪<b>%s</b>‬"
 
 #: ../src/plugins/notification/notification_prefs.c:1894
-#, fuzzy
 msgid "<control><shift>F11"
 msgstr "<control><shift>F11"
 
 #: ../src/plugins/notification/notification_prefs.c:1894
-#, fuzzy
 msgid "<alt>N"
 msgstr "<alt>N"
 
@@ -12311,7 +12269,7 @@ msgstr "שינוי מצב ממוזער:"
 
 #: ../src/plugins/notification/notification_trayicon.c:114
 msgid "_Get Mail"
-msgstr "_קבל דואר"
+msgstr "_השג דואר"
 
 #: ../src/plugins/notification/notification_trayicon.c:116
 msgid "_Email"
@@ -12438,7 +12396,7 @@ msgstr "מתוך %d"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1359
 msgid "PDF rendering failed for an unknown reason."
-msgstr ""
+msgstr "שרטוט PDF נכשל משום סיבה לא ידועה."
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1722
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1940
@@ -12534,14 +12492,13 @@ msgstr ""
 
 #: ../src/plugins/perl/perl_gtk.c:50
 msgid "Edit perl filter rules (ext)..."
-msgstr ""
+msgstr "עריכת חוקי סינון Perl‏ (ext)..."
 
 #: ../src/plugins/pgpcore/autocompletion.c:125
 msgid "Failed to register PGP address autocompletion hook"
 msgstr "כשל ברישום hook השלמה אוטומטית של כתובת PGP"
 
-#: ../src/plugins/pgpcore/passphrase.c:86
-#: ../src/plugins/pgpcore/prefs_gpg.c:116
+#: ../src/plugins/pgpcore/passphrase.c:86 ../src/plugins/pgpcore/prefs_gpg.c:116
 msgid "Passphrase"
 msgstr "מימרת סיסמה"
 
@@ -12582,13 +12539,13 @@ msgstr ""
 #: ../src/plugins/pgpcore/passphrase.c:270
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-"span>\n"
+"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase "
+"for:</span>\n"
 "\n"
 "%.*s\n"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">%sאנא הזן את מימרת הסיסמה עבור:</"
-"span>\n"
+"<span weight=\"bold\" size=\"larger\">%sאנא הזן את מימרת הסיסמה "
+"עבור:</span>\n"
 "\n"
 "%.*s\n"
 
@@ -12695,8 +12652,8 @@ msgid ""
 "This plugin handles PGP core operations and provides address autocompletion "
 "from the GPG keyring. It is used by other plugins, like PGP/Mime.\n"
 "\n"
-"Options can be found in /Configuration/Preferences/Plugins/GPG and /"
-"Configuration/[Account Preferences]/Plugins/GPG\n"
+"Options can be found in /Configuration/Preferences/Plugins/GPG and "
+"/Configuration/[Account Preferences]/Plugins/GPG\n"
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
@@ -12705,8 +12662,8 @@ msgstr ""
 "תוספת זו מטפלת במבצעי ליבה PGP ומספקת השלמת כתובת אוטומטית מתוך מחזיק מפתחות "
 "GPG, זו מנוצלת על ידי תוספת אחרת, כמו PGP/Mime.\n"
 "\n"
-"ניתן למצוא אפשרויות בתוך /תצורה/העדפות/תוספות/GPG וגם /תצורה/[העדפות חשבון]/"
-"תוספות/GPG\n"
+"ניתן למצוא אפשרויות בתוך /תצורה/העדפות/תוספות/GPG וגם /תצורה/[העדפות "
+"חשבון]/תוספות/GPG\n"
 "\n"
 "התוספת עושה שימוש בספרייה GPGME בתור מעטפת עבור GnuPG.\n"
 "\n"
@@ -12783,7 +12740,6 @@ msgid "Generate a new key pair"
 msgstr "הלחן צמד מפתחות חדש"
 
 #: ../src/plugins/pgpcore/prefs_gpg.c:570
-#, fuzzy
 msgid "GPG"
 msgstr "GPG"
 
@@ -12797,18 +12753,15 @@ msgstr "אין תיאום מדויק עבור '%s'; אנא בחר את המפת
 msgid "Collecting info for '%s' ... %c"
 msgstr "כעת אוסף מידע עבור '%s' ... %c"
 
-#: ../src/plugins/pgpcore/select-keys.c:235
-#: ../src/plugins/pgpcore/sgpgme.c:142
+#: ../src/plugins/pgpcore/select-keys.c:235 ../src/plugins/pgpcore/sgpgme.c:142
 msgid "Undefined"
 msgstr "לא מוגדר"
 
-#: ../src/plugins/pgpcore/select-keys.c:241
-#: ../src/plugins/pgpcore/sgpgme.c:146
+#: ../src/plugins/pgpcore/select-keys.c:241 ../src/plugins/pgpcore/sgpgme.c:146
 msgid "Marginal"
 msgstr "שולי"
 
-#: ../src/plugins/pgpcore/select-keys.c:247
-#: ../src/plugins/pgpcore/sgpgme.c:150
+#: ../src/plugins/pgpcore/select-keys.c:247 ../src/plugins/pgpcore/sgpgme.c:150
 msgid "Ultimate"
 msgstr "סופי"
 
@@ -12865,8 +12818,8 @@ msgstr ""
 "\n"
 "האם הינך בוטח מספיק במפתח זה כדי להשתמש בו למרות זאת?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:80 ../src/privacy.c:249
-#: ../src/privacy.c:253 ../src/privacy.c:270 ../src/privacy.c:274
+#: ../src/plugins/pgpcore/sgpgme.c:80 ../src/privacy.c:249 ../src/privacy.c:253
+#: ../src/privacy.c:270 ../src/privacy.c:274
 msgid "No signature found"
 msgstr "לא נמצאה חתימה"
 
@@ -12900,14 +12853,14 @@ msgid "Expired signature from %s."
 msgstr "חתימה פקועה מאת %s."
 
 #: ../src/plugins/pgpcore/sgpgme.c:230
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from %s, but the key has expired."
-msgstr "חתימה טובה מאת %s."
+msgstr "חתימה טובה מאת %s אך המפתח פקע."
 
 #: ../src/plugins/pgpcore/sgpgme.c:233
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from %s, but the key has been revoked."
-msgstr "חתימה טובה מאת %s."
+msgstr "חתימה טובה מאת %s אך המפתח נשלל."
 
 #: ../src/plugins/pgpcore/sgpgme.c:236
 #, c-format
@@ -12940,9 +12893,9 @@ msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "חתימה טובה מאת מזהה משתמש (uid) ‫\"%s\" (תקפות: %s)\n"
 
 #: ../src/plugins/pgpcore/sgpgme.c:313
-#, fuzzy, c-format
+#, c-format
 msgid "Expired key uid \"%s\"\n"
-msgstr "מפתח פקוע מאת %s."
+msgstr "מפתח מזהה משתמש (uid) פקוע \"%s\"\n"
 
 #: ../src/plugins/pgpcore/sgpgme.c:318
 #, c-format
@@ -12952,7 +12905,7 @@ msgstr "חתימה פקועה מאת מזהה משתמש (uid) ‫\"%s\" (תקפ
 #: ../src/plugins/pgpcore/sgpgme.c:323
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
-msgstr ""
+msgstr "מפתח מזהה משתמש (uid) פסול \"%s\"\n"
 
 #: ../src/plugins/pgpcore/sgpgme.c:328
 #, c-format
@@ -13116,10 +13069,10 @@ msgstr "לא היתה אפשרות להמיר מידע תמליל את כל מע
 #: ../src/plugins/pgpinline/pgpinline.c:199
 #: ../src/plugins/pgpinline/pgpinline.c:521
 #: ../src/plugins/pgpinline/pgpinline.c:660
-#: ../src/plugins/pgpinline/pgpinline.c:716
-#: ../src/plugins/pgpmime/pgpmime.c:74 ../src/plugins/pgpmime/pgpmime.c:184
-#: ../src/plugins/pgpmime/pgpmime.c:330 ../src/plugins/pgpmime/pgpmime.c:510
-#: ../src/plugins/pgpmime/pgpmime.c:655 ../src/plugins/smime/smime.c:415
+#: ../src/plugins/pgpinline/pgpinline.c:716 ../src/plugins/pgpmime/pgpmime.c:74
+#: ../src/plugins/pgpmime/pgpmime.c:184 ../src/plugins/pgpmime/pgpmime.c:330
+#: ../src/plugins/pgpmime/pgpmime.c:510 ../src/plugins/pgpmime/pgpmime.c:655
+#: ../src/plugins/smime/smime.c:415
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "לא היתה אפשרות לאתחל הקשר GPG, ‏%s"
@@ -13128,8 +13081,7 @@ msgstr "לא היתה אפשרות לאתחל הקשר GPG, ‏%s"
 msgid "Couldn't parse mime part."
 msgstr "לא היתה אפשרות לנתח אזור mime."
 
-#: ../src/plugins/pgpinline/pgpinline.c:348
-#: ../src/plugins/pgpmime/pgpmime.c:353
+#: ../src/plugins/pgpinline/pgpinline.c:348 ../src/plugins/pgpmime/pgpmime.c:353
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "לא היתה אפשרות לפתוח קובץ מפוענח %s"
@@ -13160,10 +13112,9 @@ msgstr ""
 #: ../src/plugins/pgpinline/pgpinline.c:398
 #: ../src/plugins/pgpinline/pgpinline.c:399
 msgid "--- End of PGP/Inline encrypted data ---\n"
-msgstr "--- סיום של מידע PGP/Inline מוצפן ---\n"
+msgstr "--- סוף של מידע PGP/Inline מוצפן ---\n"
 
-#: ../src/plugins/pgpinline/pgpinline.c:418
-#: ../src/plugins/pgpmime/pgpmime.c:390
+#: ../src/plugins/pgpinline/pgpinline.c:418 ../src/plugins/pgpmime/pgpmime.c:390
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "לא היתה אפשרות לסגור קובץ מפוענח %s"
@@ -13185,25 +13136,21 @@ msgstr "הודעה פגומה"
 msgid "Couldn't create temporary file."
 msgstr "לא היתה אפשרות ליצור קובץ זמני."
 
-#: ../src/plugins/pgpinline/pgpinline.c:545
-#: ../src/plugins/pgpmime/pgpmime.c:537
+#: ../src/plugins/pgpinline/pgpinline.c:545 ../src/plugins/pgpmime/pgpmime.c:537
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "חתימת נתונים נכשלה, %s"
 
-#: ../src/plugins/pgpinline/pgpinline.c:563
-#: ../src/plugins/pgpmime/pgpmime.c:562
+#: ../src/plugins/pgpinline/pgpinline.c:563 ../src/plugins/pgpmime/pgpmime.c:562
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "חתימת נתונים נכשלה עקב חותם שגוי: %s"
 
-#: ../src/plugins/pgpinline/pgpinline.c:572
-#: ../src/plugins/pgpmime/pgpmime.c:571
+#: ../src/plugins/pgpinline/pgpinline.c:572 ../src/plugins/pgpmime/pgpmime.c:571
 msgid "Data signing failed, no results."
 msgstr "חתימת נתונים נכשלה, אין תוצאות."
 
-#: ../src/plugins/pgpinline/pgpinline.c:582
-#: ../src/plugins/pgpmime/pgpmime.c:582
+#: ../src/plugins/pgpinline/pgpinline.c:582 ../src/plugins/pgpmime/pgpmime.c:582
 msgid "Data signing failed, no contents."
 msgstr "חתימת נתונים נכשלה, אין תכולות."
 
@@ -13215,20 +13162,17 @@ msgstr ""
 "לתשומת לבך: תצריפים אינם מוצפנים על ידי המערכת PGP/Inline, וגם לא תקורות של "
 "דוא״ל, כגון נושא."
 
-#: ../src/plugins/pgpinline/pgpinline.c:670
-#: ../src/plugins/pgpmime/pgpmime.c:665
+#: ../src/plugins/pgpinline/pgpinline.c:670 ../src/plugins/pgpmime/pgpmime.c:665
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "לא היתה אפשרות להוסיף מפתח GPG ‫%s, ‫%s"
 
-#: ../src/plugins/pgpinline/pgpinline.c:698
-#: ../src/plugins/pgpmime/pgpmime.c:694
+#: ../src/plugins/pgpinline/pgpinline.c:698 ../src/plugins/pgpmime/pgpmime.c:694
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "לא היתה אפשרות ליצור קובץ זמני, %s"
 
-#: ../src/plugins/pgpinline/pgpinline.c:729
-#: ../src/plugins/pgpmime/pgpmime.c:721
+#: ../src/plugins/pgpinline/pgpinline.c:729 ../src/plugins/pgpmime/pgpmime.c:721
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "הצפנה נכשלה, %s"
@@ -13285,8 +13229,8 @@ msgstr "לא היתה אפשרות ליצור קובץ זמני: %s"
 
 #: ../src/plugins/pgpmime/pgpmime.c:621
 msgid ""
-"Please note that email headers, like Subject, are not encrypted by the PGP/"
-"Mime system."
+"Please note that email headers, like Subject, are not encrypted by the "
+"PGP/Mime system."
 msgstr ""
 "לצומת לבך: תקורות של דוא״ל, כגון נושא, אינן מוצפנות על ידי המערכת PGP/Mime."
 
@@ -13336,15 +13280,14 @@ msgid "Refresh"
 msgstr "רענון"
 
 #: ../src/plugins/python/python_plugin.c:505 ../src/prefs_account.c:2506
-#: ../src/prefs_account.c:2528 ../src/prefs_account.c:2792
-#: ../src/wizard.c:1195 ../src/wizard.c:1609
+#: ../src/prefs_account.c:2528 ../src/prefs_account.c:2792 ../src/wizard.c:1195
+#: ../src/wizard.c:1609
 msgid "Browse"
 msgstr "   עיון   "
 
 #. Version check
 #: ../src/plugins/python/python_plugin.c:646
 #: ../src/plugins/python/python_plugin.c:725
-#, fuzzy
 msgid "Python"
 msgstr "Python"
 
@@ -13363,8 +13306,8 @@ msgid ""
 "put buttons for script invokation into the toolbars using Claws Mail's "
 "builtin toolbar editor.\n"
 "\n"
-"You can provide scripts working on the main window by placing files into ~/."
-"claws-mail/python-scripts/main.\n"
+"You can provide scripts working on the main window by placing files into "
+"~/.claws-mail/python-scripts/main.\n"
 "\n"
 "You can also provide scripts working on an open compose window by placing "
 "files into ~/.claws-mail/python-scripts/compose.\n"
@@ -13841,8 +13784,8 @@ msgstr "לא היתה אפשרות לסגור קובץ זמני"
 
 #: ../src/plugins/smime/smime.c:708
 msgid ""
-"Please note that email headers, like Subject, are not encrypted by the S/"
-"MIME system."
+"Please note that email headers, like Subject, are not encrypted by the "
+"S/MIME system."
 msgstr ""
 "לצומת לבך: תקורות של דוא״ל, כגון נושא, אינן מוצפנות על ידי המערכת S/MIME."
 
@@ -13924,12 +13867,10 @@ msgid "Localhost"
 msgstr "מארח מקומי"
 
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:92
-#, fuzzy
 msgid "TCP"
 msgstr "TCP"
 
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:93
-#, fuzzy
 msgid "Unix Socket"
 msgstr "Unix Socket"
 
@@ -14529,9 +14470,9 @@ msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1849
 #: ../src/plugins/vcalendar/vcal_folder.c:1852
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create directory %s"
-msgstr "לא היתה אפשרות ליצור מדור יעד %s."
+msgstr "לא היתה אפשרות ליצור מדור %s"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1890
 msgid "Claws Mail needs network access in order to update the Webcal feed."
@@ -15092,7 +15033,6 @@ msgstr "פקודת TOP לא נתמכת\n"
 
 #: ../src/prefs_account.c:336 ../src/prefs_account.c:1451
 #: ../src/prefs_account.c:2434 ../src/wizard.c:1505
-#, fuzzy
 msgid "POP3"
 msgstr "POP3"
 
@@ -15100,7 +15040,6 @@ msgstr "POP3"
 #. RPOP, deprecated
 #: ../src/prefs_account.c:339 ../src/prefs_account.c:1564
 #: ../src/prefs_account.c:2449
-#, fuzzy
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -15243,7 +15182,6 @@ msgstr ""
 "במלואן או למוחקן."
 
 #: ../src/prefs_account.c:1540 ../src/prefs_account.c:2464
-#, fuzzy
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -15297,7 +15235,7 @@ msgstr "התר סינון באמצעות תוספות בעת קבלה"
 
 #: ../src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
-msgstr "'קבלת דואר' בודקת עבור הודעות חדשות בחשבון זה"
+msgstr "'השג דואר' בודקת עבור הודעות חדשות בחשבון זה"
 
 # כותר
 #: ../src/prefs_account.c:1718 ../src/prefs_customheader.c:209
@@ -15398,8 +15336,7 @@ msgid "Reply"
 msgstr "מענה"
 
 #: ../src/prefs_account.c:2194 ../src/prefs_filtering_action.c:191
-#: ../src/prefs_folder_item.c:1497 ../src/prefs_quote.c:149
-#: ../src/toolbar.c:413
+#: ../src/prefs_folder_item.c:1497 ../src/prefs_quote.c:149 ../src/toolbar.c:413
 msgid "Forward"
 msgstr "קידום"
 
@@ -15540,7 +15477,7 @@ msgstr ""
 
 #: ../src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
-msgstr "סמן הודעות פרסום-צולב בתור נקראו וצבע:"
+msgstr "סמן הודעות פרסום-צולב ככאלה שנקראו וצבע:"
 
 # השמת
 #: ../src/prefs_account.c:2805
@@ -15633,8 +15570,7 @@ msgstr "נכשל (כתובת שגויה)"
 msgid "Select signature file"
 msgstr "בחירת קובץ חתימה"
 
-#: ../src/prefs_account.c:3949 ../src/prefs_account.c:3966
-#: ../src/wizard.c:1057
+#: ../src/prefs_account.c:3949 ../src/prefs_account.c:3966 ../src/wizard.c:1057
 msgid "Select certificate file"
 msgstr "בחירת קובץ תעודה"
 
@@ -15920,12 +15856,13 @@ msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "ביום %d\\nנכתב על ידי %f כדלקמן:\\n\\n%q\\n%X"
 
 #: ../src/prefs_common.c:302 ../src/prefs_quote.c:85
+#, qt-format
 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"
+"\\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"
 msgstr ""
-"\\n\\nמתחיל הודעה מקודמת:\\n\\n?d{תאריך: %d\\n}?f{מאת: %f\\n}?t{אל: %t\\n}?"
-"c{עותק: %c\\n}?n{קבוצות דיונים: %n\\n}?s{נושא: %s\\n}\\n\\n%M"
+"\\n\\nמתחיל הודעה מקודמת:\\n\\n?d{תאריך: %d\\n}?f{מאת: %f\\n}?t{אל: "
+"%t\\n}?c{עותק: %c\\n}?n{קבוצות דיונים: %n\\n}?s{נושא: %s\\n}\\n\\n%M"
 
 #: ../src/prefs_common.c:442
 msgid "%x(%a) %H:%M"
@@ -16003,7 +15940,7 @@ msgstr "קידום"
 
 #: ../src/prefs_compose_writing.c:227 ../src/prefs_filtering_action.c:192
 msgid "Forward as attachment"
-msgstr "קידום בתור תצריף"
+msgstr "קדם בתור תצריף"
 
 #: ../src/prefs_compose_writing.c:230
 msgid "Keep the original 'From' header when redirecting"
@@ -16351,7 +16288,8 @@ msgid ""
 "program or script.\n"
 "The following symbols can be used:"
 msgstr ""
-"‫'Execute' מתיר לך לשלוח הודעה או אלמנט של הודעה אל תוכנית חיצונית או תסריט.\n"
+"‫'Execute' מתיר לך לשלוח הודעה או אלמנט של הודעה אל תוכנית חיצונית או "
+"תסריט.\n"
 "הסמלים הבאים ניתנים לשימוש:"
 
 #: ../src/prefs_filtering_action.c:1422
@@ -16605,8 +16543,8 @@ msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
 msgstr ""
-"\"ברירת מחדל\" תעקוב אחר העדפה גלובלית (מצויה בתוך /העדפות/תצוגת הודעה/"
-"אפשרויות תמליל)"
+"\"ברירת מחדל\" תעקוב אחר העדפה גלובלית (מצויה בתוך /העדפות/תצוגת "
+"הודעה/אפשרויות תמליל)"
 
 #. Synchronise folder for offline use
 #: ../src/prefs_folder_item.c:529
@@ -16809,7 +16747,7 @@ msgstr "עיבוד תיקיות"
 
 #: ../src/prefs_logging.c:222
 msgid "Log level"
-msgstr "אמת רישום"
+msgstr "רמת רישום"
 
 #: ../src/prefs_logging.c:231
 msgid "Low"
@@ -16991,7 +16929,7 @@ msgstr "לא"
 # tags > tag
 #: ../src/prefs_matcher.c:410
 msgid "Any tags"
-msgstr "כל תגיות"
+msgstr "כל תגית"
 
 #: ../src/prefs_matcher.c:411
 msgid "Specific tag"
@@ -17180,7 +17118,7 @@ msgstr "ערך:"
 
 #: ../src/prefs_matcher.c:2013
 msgid "Score is"
-msgstr "הניקוד"
+msgstr "הניקוד הוא"
 
 #: ../src/prefs_matcher.c:2014
 msgid "points"
@@ -17227,8 +17165,8 @@ msgid ""
 "\n"
 "The following symbols can be used:"
 msgstr ""
-"‫'Test' מתיר לך לבחון הודעה או אלמנט של הודעה באמצעות תכנית חיצונית או תסריט. "
-"התוכנית תחזיר 0 או 1.\n"
+"‫'Test' מתיר לך לבחון הודעה או אלמנט של הודעה באמצעות תכנית חיצונית או "
+"תסריט. התוכנית תחזיר 0 או 1.\n"
 "\n"
 "הסמלים הבאים ניתנים לשימוש:"
 
@@ -17308,7 +17246,7 @@ msgstr "ציטטה"
 
 #: ../src/prefs_message.c:242
 msgid "Collapse quoted text on double click"
-msgstr "צמצום תמליל מצוטט בלחיצה כפולה"
+msgstr "צמצם תמליל מצוטט בלחיצה כפולה"
 
 #: ../src/prefs_message.c:249
 msgid "Treat these characters as quotation marks: "
@@ -18088,13 +18026,13 @@ msgstr "יישום מיידי בעת העברה או מחיקה של הודעו
 
 #: ../src/prefs_summaries.c:476
 msgid ""
-"Defers moving, copying and deleting of messages until you choose 'Tools/"
-"Execute'"
+"Defers moving, copying and deleting of messages until you choose "
+"'Tools/Execute'"
 msgstr "עיכוב העברה, העתקה ומחיקה של הודעות עד שתבחר 'כלים/הוצא אל הפועל'"
 
 #: ../src/prefs_summaries.c:479
 msgid "Mark message as read"
-msgstr "סמן הודעה בתור נקראה"
+msgstr "סמן הודעה ככזו שנקראה"
 
 #: ../src/prefs_summaries.c:482
 msgid "when selected, after"
@@ -18119,7 +18057,7 @@ msgstr "עזרת פורמט תאריך"
 
 #: ../src/prefs_summaries.c:557
 msgid "Confirm before marking all messages in a folder as read"
-msgstr "ודא טרם הפיכת כל ההודעות בתוך תיקייה בתור נקראו"
+msgstr "ודא טרם הפיכת כל ההודעות בתוך תיקייה לכאלה שנקראו"
 
 #: ../src/prefs_summaries.c:560
 msgid "Translate header names"
@@ -18537,7 +18475,7 @@ msgstr "צלמית פריט סרגל כלים"
 
 #: ../src/prefs_wrapping.c:80
 msgid "Auto wrapping"
-msgstr "כריכה אוטומטית"
+msgstr "כרוך אוטומטית"
 
 #: ../src/prefs_wrapping.c:81
 msgid "Wrap quotation"
@@ -18549,7 +18487,7 @@ msgstr "כרוך תמליל מודבק"
 
 #: ../src/prefs_wrapping.c:83
 msgid "Auto indent"
-msgstr "הזחה אוטומטית"
+msgstr "הזח אוטומטית"
 
 #: ../src/prefs_wrapping.c:89
 msgid "Wrap text at"
@@ -18846,7 +18784,8 @@ msgid ""
 "to insert"
 msgstr ""
 "שבץ קובץ:\n"
-"‏<span style=\"oblique\">‏sub_expr</span> הינו מוערך בתור הנתיב של הקובץ לשיבוץ"
+"‏<span style=\"oblique\">‏sub_expr</span> הינו מוערך בתור הנתיב של הקובץ "
+"לשיבוץ"
 
 # להשיג את הקלט
 #. insert file
@@ -18880,7 +18819,8 @@ msgid ""
 "to attach"
 msgstr ""
 "ספח קובץ:\n"
-"<span style=\"oblique\">‏sub_expr</span> הינו מוערך בתור הנתיב של הקובץ לסיפוח"
+"<span style=\"oblique\">‏sub_expr</span> הינו מוערך בתור הנתיב של הקובץ "
+"לסיפוח"
 
 #: ../src/quote_fmt.c:97
 msgid "<span weight=\"bold\">definition of terms:</span>"
@@ -19026,8 +18966,7 @@ msgstr "דואר נשלח בהצלחה."
 msgid "Sending HELO..."
 msgstr "כעת שולח HELO..."
 
-#: ../src/send_message.c:485 ../src/send_message.c:490
-#: ../src/send_message.c:495
+#: ../src/send_message.c:485 ../src/send_message.c:490 ../src/send_message.c:495
 msgid "Authenticating"
 msgstr "מאמת כעת"
 
@@ -19140,7 +19079,6 @@ msgstr "גוף:"
 msgid "Condition:"
 msgstr "תנאי:"
 
-# מציאה _מוחלטת
 #: ../src/summary_search.c:484
 msgid "Find _all"
 msgstr "מצא _הכל"
@@ -19193,8 +19131,7 @@ msgid "No unread message found. Search from the end?"
 msgstr "לא נמצאו הודעות שלא נקראו. לחפש מן הסוף?"
 
 #: ../src/summaryview.c:1850 ../src/summaryview.c:1902
-#: ../src/summaryview.c:1945 ../src/summaryview.c:1997
-#: ../src/summaryview.c:2076
+#: ../src/summaryview.c:1945 ../src/summaryview.c:1997 ../src/summaryview.c:2076
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr "שגיאה פנימית: ערך לא צפוי עבור prefs_common.next_unread_msg_dialog\n"
@@ -19727,11 +19664,11 @@ msgstr "הדפסה"
 
 #: ../src/toolbar.c:211
 msgid "Learn Spam or Ham"
-msgstr "למד בתור ספאם או לגיטימית"
+msgstr "למידה בתור ספאם או לגיטימית"
 
 #: ../src/toolbar.c:212
 msgid "Open folder/Go to folder list"
-msgstr "פתח תיקייה/עבור אל רשימת תיקייה"
+msgstr "פתיחת תיקייה/מעבר אל רשימת תיקייה"
 
 #: ../src/toolbar.c:215 ../src/toolbar.c:2102
 msgid "Send Message"
@@ -19760,11 +19697,11 @@ msgstr "שיבוץ חתימה"
 
 #: ../src/toolbar.c:221 ../src/toolbar.c:2126
 msgid "Replace signature"
-msgstr "החלף חתימה"
+msgstr "החלפת חתימה"
 
 #: ../src/toolbar.c:222 ../src/toolbar.c:2130
 msgid "Edit with external editor"
-msgstr "ערוך באמצעות עורך חיצוני"
+msgstr "עריכה באמצעות עורך חיצוני"
 
 #: ../src/toolbar.c:223 ../src/toolbar.c:2134
 msgid "Wrap long lines of current paragraph"
@@ -19776,7 +19713,7 @@ msgstr "כריכת כל השורות הארוכות"
 
 #: ../src/toolbar.c:227 ../src/toolbar.c:440 ../src/toolbar.c:2147
 msgid "Check spelling"
-msgstr "בדוק איות"
+msgstr "בדיקת איות"
 
 #: ../src/toolbar.c:229
 msgid "Claws Mail Actions Feature"
@@ -19788,7 +19725,7 @@ msgstr "ביטול קבלה"
 
 #: ../src/toolbar.c:232 ../src/toolbar.c:2171
 msgid "Cancel receiving/sending"
-msgstr "בטל קבלה/שליחה"
+msgstr "ביטול קבלה/שליחה"
 
 #: ../src/toolbar.c:233 ../src/toolbar.c:1943
 msgid "Close window"
@@ -19810,7 +19747,7 @@ msgstr "תיקיות"
 # השג
 #: ../src/toolbar.c:404
 msgid "Get Mail"
-msgstr "קבלת דואר"
+msgstr "השג דואר"
 
 #: ../src/toolbar.c:405
 msgid "Get"
@@ -19840,7 +19777,7 @@ msgstr "קודמת"
 
 #: ../src/toolbar.c:418
 msgid "Next"
-msgstr "הבאה"
+msgstr "הלאה"
 
 #: ../src/toolbar.c:426
 msgid "Draft"
@@ -19860,11 +19797,11 @@ msgstr "ערוך"
 
 #: ../src/toolbar.c:432
 msgid "Wrap para."
-msgstr "כריכת פס."
+msgstr "כרוך פס."
 
 #: ../src/toolbar.c:433
 msgid "Wrap all"
-msgstr "כריכה מוחלטת"
+msgstr "כרוך הכל"
 
 #: ../src/toolbar.c:435 ../src/toolbar.c:436
 msgid "Stop"
@@ -20029,7 +19966,7 @@ msgstr ""
 "-----------------------\n"
 "\n"
 "עתה משהסדרת את חשבונך באפשרותך לתפוס דואר על יד הקלקה על\n"
-"הלחצן 'השגת דואר' בימין סרגל הכלים.\n"
+"הלחצן 'השג דואר' בימין סרגל הכלים.\n"
 "\n"
 "‫Claws Mail מכיל תכונות נוספות רבות הנגישות דרך תוספות,\n"
 "כגון אנטי-ספאם סינון ולמידה (דרך התוספות Bogofilter או\n"
@@ -20109,15 +20046,15 @@ msgstr "<span weight=\"bold\">שם תיבת דואר:</span>"
 
 #: ../src/wizard.c:1030
 msgid ""
-"You can also specify an absolute path, for example: \"/home/john/Documents/"
-"Mail\""
+"You can also specify an absolute path, for example: "
+"\"/home/john/Documents/Mail\""
 msgstr ""
 "באפשרותך גם לציין את הנתיב המוחלט, לדוגמא: \"/home/john/Documents/Mail\""
 
 #: ../src/wizard.c:1101
 msgid ""
-"You can specify the port number by appending it at the end: \"mail.example."
-"com:25\""
+"You can specify the port number by appending it at the end: "
+"\"mail.example.com:25\""
 msgstr "באפשרותך לציין מספר פורט על ידי הוספתו בסוף: \"mail.example.com:25\""
 
 #: ../src/wizard.c:1104
@@ -20172,8 +20109,8 @@ msgstr "IMAP"
 
 #: ../src/wizard.c:1540
 msgid ""
-"You can specify the port number by appending it at the end: \"mail.example."
-"com:110\""
+"You can specify the port number by appending it at the end: "
+"\"mail.example.com:110\""
 msgstr ""
 "באפשרותך לציין את מספר הפורט על ידי צירופו בקצה: \"mail.example.com:110\""
 
diff --git a/po/lt.po b/po/lt.po
index bd3c4da..53c0fba 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2014-06-13 03:15+0400\n"
-"PO-Revision-Date: 2014-05-25 23:34+0300\n"
+"POT-Creation-Date: 2014-10-13 09:04+0100\n"
+"PO-Revision-Date: 2014-10-19 19:06+0300\n"
 "Last-Translator: Mindaugas Baranauskas <opensuse.lietuviu.kalba at gmail.com>\n"
 "Language-Team: Lithuanian <komp_lt at konferencijos.lt>\n"
 "Language: lt\n"
@@ -21,37 +21,208 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: ../claws-mail.appdata.xml.in.h:1
-#, fuzzy
+#: ../claws-mail.desktop.in.h:1
+msgid "E-mail client"
+msgstr "Elektroninio pašto programa"
+
+#: ../claws-mail.desktop.in.h:2
+msgid "Lightweight and Fast GTK+ based Mail Client"
+msgstr "Greita elektroninio pašto programa, sukurta GTK+ pagrindu"
+
+#: ../claws-mail.desktop.in.h:3
+msgid "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
+msgstr ""
+"paprasta;greita;grafinė sąsają;plėtiniai;pop;pop3;imap;imap4;nntp;naujienos;"
+
+#: ../appdata/claws-mail.appdata.xml.in.h:1
 msgid "Claws Mail is a fast, powerful and very extensible email client."
-msgstr "Claws Mail įregistruotas kaip pagrindinis klientas."
+msgstr ""
+"Claws Mail yra greita, galinga ir praplečiamo funkcionalumo elektroninio "
+"pašto programa."
 
-#: ../claws-mail.appdata.xml.in.h:2
+#: ../appdata/claws-mail.appdata.xml.in.h:2
 msgid ""
 "It is highly configurable and handles hundreds of thousands of emails "
 "easily. Messages are managed in an open format, and are easy to interact "
 "with."
 msgstr ""
+"Pasižymi didelėmis konfigūravimo galimybėmis, geba nestrigdama apdoroti "
+"tūkstančius laiškų. Laiškai tvarkomi atviru formatu, tad juos lengviau "
+"apdoroti."
 
-#: ../claws-mail.appdata.xml.in.h:3
+#: ../appdata/claws-mail.appdata.xml.in.h:3
 msgid ""
 "Lots of extra functionality is provided by plugins, such as PGP signatures "
 "and encryption, an RSS aggregator, a calendar, powerful spam filtering, Perl "
 "and Python interactions, HTML and PDF rendering, and more."
 msgstr ""
+"Daug papildomų galimybių suteikia papildiniai, pvz., PGP parašai ir "
+"šifravimas, naujienų skaitytuvė, kalendorius, galingas brukalo filtras, Perl "
+"ir Python interpretatorius, HTML ir PDF žiūryklė ir kt."
 
-#: ../claws-mail.desktop.in.h:1
-msgid "E-mail client"
+#: ../appdata/claws-mail-acpi_notifier.metainfo.xml.in.h:1
+msgid "Enables mail notification via LEDs on some laptops"
 msgstr ""
+"Kai kuriuose nešiojamuosiuose kompiuteriuose įgalina pranešimus indikacinėmis "
+"lemputėmis."
 
-#: ../claws-mail.desktop.in.h:2
-msgid "Lightweight and Fast GTK+ based Mail Client"
+#: ../appdata/claws-mail-address_keeper.metainfo.xml.in.h:1
+msgid ""
+"Allows saving outgoing addresses to a designated folder in the address book"
+msgstr ""
+"Leidžia įrašyti adresus, kuriais siunčiami laiškai, į pasirinktą adresų "
+"knygos aplanką"
+
+#: ../appdata/claws-mail-archive.metainfo.xml.in.h:1
+msgid "Allows to make tars or zips of old folders"
+msgstr "Leidžia sukurti senų aplankų zip arba tar archyvus"
+
+#: ../appdata/claws-mail-att_remover.metainfo.xml.in.h:1
+msgid "Lets you remove attachments from emails"
+msgstr "Leidžia iš laiškų pašalinti priedus"
+
+#: ../appdata/claws-mail-attachwarner.metainfo.xml.in.h:1
+msgid ""
+"Warns when a message mentioning an attachment in the message body without "
+"attaching any files"
+msgstr "Įspėja apie laiške paminėtus priedus, jei jie nepridėti"
+
+#: ../appdata/claws-mail-bogofilter.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using Bogofilter"
+msgstr ""
+"Įgalina POP, IMAP ir LOCAL paskyrų laiškų filtravimą naudojant Bogofilter"
+
+#: ../appdata/claws-mail-bsfilter.metainfo.xml.in.h:1
+msgid ""
+"Check all messages that are received from an IMAP, LOCAL or POP account for "
+"spam using Bsfilter"
+msgstr ""
+"Tikrina visus laiškus, kurie gauti IMAP, LOCAL ir POP paskyrose, su Bsfilter"
+
+#: ../appdata/claws-mail-clamd.metainfo.xml.in.h:1
+msgid ""
+"Scans all messages that are received from an IMAP, LOCAL or POP account "
+"using clamd (Clam AV)"
+msgstr ""
+"Tikrina visus laiškus, kurie gauti IMAP, LOCAL ir POP paskyrose, su clamd "
+"(Clam AV)"
+
+#: ../appdata/claws-mail-fancy.metainfo.xml.in.h:1
+msgid "Renders HTML e-mail using the WebKit library"
+msgstr ""
+"Atvaizduoja HTML formato elektroninius laiškus pasitelkiant Webkit biblioteką"
+
+#: ../appdata/claws-mail-fetchinfo.metainfo.xml.in.h:1
+msgid ""
+"Inserts headers containing: UIDL, Claws' account name, POP server, user ID "
+"and retrieval time"
+msgstr ""
+"Įterpia antraštes: UIDL, Claws paskyros vardą, POP serverį, naudotojo "
+"identifikatorių ir gavimo laiką"
+
+#: ../appdata/claws-mail-gdata.metainfo.xml.in.h:1
+msgid "Provides an interface to Google services"
+msgstr "Suteikia sąsają su Google paslaugomis"
+
+#: ../appdata/claws-mail-geolocation.metainfo.xml.in.h:1
+msgid "Provides GeoLocation functionality"
+msgstr "Suteikia GeoLocation galimybes"
+
+#: ../appdata/claws-mail-libravatar.metainfo.xml.in.h:1
+msgid ""
+"Displays libravatar/gravatar profiles' images or a dynamically generated or "
+"predefined alternative"
+msgstr "Parodo naudotojo paveiksliuką"
+
+#: ../appdata/claws-mail-mailmbox.metainfo.xml.in.h:1
+msgid "Direct support for mailboxes in mbox format"
+msgstr "Tiesioginis pašto dėžučių palaikymas mbox formatu"
+
+#: ../appdata/claws-mail-newmail.metainfo.xml.in.h:1
+msgid ""
+"Writes a msg header summary to a log file on arrival of new mail after "
+"sorting"
+msgstr "Gavus naują laišką, laiško antraštę įrašo į žurnalą."
+
+#: ../appdata/claws-mail-notification.metainfo.xml.in.h:1
+msgid "Provides various ways to notify the user of new and unread email"
+msgstr ""
+"Suteikia įvairias galimybes naudotojui pranešti apie naujus ir neskaitytus "
+"laiškus"
+
+#: ../appdata/claws-mail-pdf_viewer.metainfo.xml.in.h:1
+msgid ""
+"Enables the viewing of PDF and PostScript attachments using the Poppler "
+"library and GhostScript"
+msgstr ""
+"Įgalina PDF ir PS priedų peržiūrėjimą. Naudojamos Poppler ir GhostScript "
+"bibliotekos."
+
+#: ../appdata/claws-mail-perl.metainfo.xml.in.h:1
+msgid "Allowing the use of full Perl power in email filters"
+msgstr "Leidžia el.laiškų filtravimui naudoti Perl"
+
+#: ../appdata/claws-mail-pgpcore.metainfo.xml.in.h:1
+msgid ""
+"Handles core PGP functions and is a dependency of both the PGP/Inline and "
+"PGP/MIME plugins."
+msgstr ""
+"Įgalina viešųjų raktų funkcijas. Priklauso PGP/Inline ir PGP/MIME "
+"papildiniams."
+
+#: ../appdata/claws-mail-pgpinline.metainfo.xml.in.h:1
+msgid "Handles PGP/Inline signed and/or encrypted mails"
+msgstr "Apdoroja PGP/Inline pasirašytus ir/arba užšifruotus laiškus"
+
+#: ../appdata/claws-mail-pgpmime.metainfo.xml.in.h:1
+msgid "Handles PGP/MIME signed and/or encrypted mails"
+msgstr "Apdoroja PGP/MIME pasirašytus ir/arba užšifruotus laiškus"
+
+#: ../appdata/claws-mail-python.metainfo.xml.in.h:1
+msgid ""
+"Offers a Python scripting. Code can be entered into an embedded Python "
+"console or stored"
+msgstr ""
+"Suteikia Python scenarijų vykdymo galimybę. Kodas gali būti įterptas į Python "
+"konsolę"
+
+#: ../appdata/claws-mail-rssyl.metainfo.xml.in.h:1
+msgid "Read your RSS favourite newsfeeds"
+msgstr "Skaitykite savo mėgstamus naujienų kanalus"
+
+#: ../appdata/claws-mail-smime.metainfo.xml.in.h:1
+msgid "Handles S/MIME signed and/or encrypted mails"
+msgstr "Apdoroja S/MIME pasirašytus ir/arba užšifruotus laiškus"
+
+#: ../appdata/claws-mail-spam_report.metainfo.xml.in.h:1
+msgid "Reports spam to various places"
+msgstr "Praneša apie brukalą įvairioms tarnyboms"
+
+#: ../appdata/claws-mail-spamassassin.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using SpamAssassin"
+msgstr ""
+"Įgalina POP, IMAP ir LOCAL paskyrų laiškų filtravimą naudojant SpamAssassin"
+
+#: ../appdata/claws-mail-tnef_parse.metainfo.xml.in.h:1
+msgid "Enables reading application/ms-tnef attachments"
+msgstr "Įgalina perskaityti application/ms-tnef laiškų priedus"
+
+#: ../appdata/claws-mail-vcalendar.metainfo.xml.in.h:1
+msgid ""
+"Enables vCalendar message handling and handles webCal subscriptions. "
+"Provides a calendar import"
 msgstr ""
+"Įgalina vCalendar laiškų apdorojimą ir webCal prenumeratas. Leidžia "
+"importuoti kalendorių"
 
-#: ../src/account.c:392
+#: ../src/account.c:392 ../src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
+"Please close all the composing windows before editing accounts."
 msgstr ""
 "Yra atvertų laiško rašymo langų.\n"
 "Prieš redaguodami paskyras turite užverti visus laiškų rašymo langus."
@@ -60,11 +231,11 @@ msgstr ""
 msgid "Can't create folder."
 msgstr "Nepavyksta sukurti aplanko."
 
-#: ../src/account.c:717
+#: ../src/account.c:724
 msgid "Edit accounts"
 msgstr "Redaguoti paskyras"
 
-#: ../src/account.c:734
+#: ../src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -74,44 +245,44 @@ msgstr ""
 "nurodyta eilės tvarka. Varnelė „T“ stulpelyje nurodo, kurias paskyras "
 "tikrinti. Pusjuodžiu šriftu parašyta paskyra yra numatytoji."
 
-#: ../src/account.c:805
+#: ../src/account.c:812
 msgid " _Set as default account "
 msgstr " Padaryti _numatytąja paskyra "
 
-#: ../src/account.c:897
+#: ../src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Paskyrų su nuotoliniais aplankais kopijuoti negalima."
 
 #. copy fields
-#: ../src/account.c:904
+#: ../src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Nukopijuota iš %s"
 
-#: ../src/account.c:1064
+#: ../src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Tikrai pašalinti paskyrą „%s“?"
 
-#: ../src/account.c:1066
+#: ../src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Bevardė)"
 
-#: ../src/account.c:1067
+#: ../src/account.c:1074
 msgid "Delete account"
 msgstr "Pašalinti paskyrą"
 
-#: ../src/account.c:1537
+#: ../src/account.c:1544
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "T"
 
-#: ../src/account.c:1543
+#: ../src/account.c:1550
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "Nuspaudus „Tikrinti paštą“, parsiunčiami laiškai iš pažymėtų paskyrų"
 
-#: ../src/account.c:1550 ../src/addrduplicates.c:471 ../src/addressadd.c:215
-#: ../src/addressbook.c:125 ../src/compose.c:7144 ../src/editaddress.c:1263
+#: ../src/account.c:1557 ../src/addrduplicates.c:471 ../src/addressadd.c:215
+#: ../src/addressbook.c:125 ../src/compose.c:7148 ../src/editaddress.c:1263
 #: ../src/editaddress.c:1320 ../src/editaddress.c:1340
 #: ../src/editaddress_other_attributes_ldap.c:302
 #: ../src/editaddress_other_attributes_ldap.c:350 ../src/editbook.c:170
@@ -119,16 +290,16 @@ msgstr "Nuspaudus „Tikrinti paštą“, parsiunčiami laiškai iš pažymėtų
 #: ../src/editvcard.c:173 ../src/importmutt.c:223 ../src/importpine.c:222
 #: ../src/mimeview.c:275 ../src/plugins/pdf_viewer/poppler_viewer.c:1797
 #: ../src/plugins/pgpcore/select-keys.c:396 ../src/prefs_filtering.c:384
-#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:78
+#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:79
 msgid "Name"
 msgstr "Vardas"
 
-#: ../src/account.c:1558 ../src/prefs_account.c:1103
+#: ../src/account.c:1565 ../src/prefs_account.c:1103
 #: ../src/prefs_account.c:4058
 msgid "Protocol"
 msgstr "Protokolas"
 
-#: ../src/account.c:1566 ../src/ssl_manager.c:102
+#: ../src/account.c:1573 ../src/ssl_manager.c:102
 msgid "Server"
 msgstr "Serveris"
 
@@ -180,8 +351,8 @@ msgstr ""
 "%s"
 
 #: ../src/action.c:990 ../src/ldaputil.c:326
-#: ../src/plugins/bogofilter/bogofilter.c:876 ../src/plugins/rssyl/feed.c:1739
-#: ../src/plugins/rssyl/feed.c:1743 ../src/plugins/tnef_parse/tnef_parse.c:67
+#: ../src/plugins/bogofilter/bogofilter.c:876
+#: ../src/plugins/tnef_parse/tnef_parse.c:67
 #: ../src/plugins/vcalendar/vcal_folder.c:1803
 #: ../src/plugins/vcalendar/vcal_folder.c:1807
 #: ../src/plugins/vcalendar/vcal_folder.c:1818
@@ -238,22 +409,19 @@ msgid "Action's user argument"
 msgstr "Veiksmo argumentas"
 
 #: ../src/addrclip.c:479
-#, fuzzy
 msgid "Cannot copy a folder to itself or to its sub-structure."
-msgstr "Negalima aplanko kopijuoti į jo paaplankį."
+msgstr "Negalima aplanko kopijuoti į jį patį arba jo poaplankį."
 
 #: ../src/addrclip.c:502
-#, fuzzy
 msgid "Cannot copy an address book to itself."
-msgstr "Nepavyksta įdėti. Paskirties adresų knygą galima tik skaityti."
+msgstr "Adresų knygos negalima kopijuoti į ją pačią."
 
 #: ../src/addrclip.c:593
-#, fuzzy
 msgid "Cannot move a folder to itself or to its sub-structure."
-msgstr "Negalima aplanko perkelti į jo paaplankį."
+msgstr "Negalima aplanko perkelti į jį patį ar jo poaplankį."
 
 #. that's a group
-#: ../src/addr_compl.c:620 ../src/addressbook.c:4866
+#: ../src/addr_compl.c:685 ../src/addressbook.c:4866
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "Grupė"
@@ -328,14 +496,14 @@ msgstr ""
 
 #: ../src/addrcustomattr.c:212 ../src/addressbook.c:435
 #: ../src/addressbook.c:463 ../src/addressbook.c:480 ../src/edittags.c:272
-#: ../src/plugins/archive/archiver_gtk.c:1193 ../src/prefs_actions.c:1090
-#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1099
+#: ../src/plugins/archive/archiver_gtk.c:1194 ../src/prefs_actions.c:1090
+#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1119
 msgid "_Delete"
 msgstr "_Šalinti"
 
 #: ../src/addrcustomattr.c:213 ../src/edittags.c:273
 #: ../src/prefs_actions.c:1091 ../src/prefs_filtering.c:1694
-#: ../src/prefs_template.c:1100
+#: ../src/prefs_template.c:1120
 msgid "Delete _all"
 msgstr "_Viską šalinti"
 
@@ -434,7 +602,7 @@ msgid "Select Address Book Folder"
 msgstr "Pasirinkite adresų knygos aplanką"
 
 #: ../src/addressadd.c:485 ../src/editaddress.c:1582 ../src/headerview.c:281
-#: ../src/textview.c:2064
+#: ../src/textview.c:2043
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -465,17 +633,17 @@ msgstr "_Knyga"
 
 #. {"Address/---",			NULL, "---", NULL, NULL, NULL },
 #: ../src/addressbook.c:403 ../src/addressbook.c:434 ../src/addressbook.c:462
-#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:504
+#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:506
 #: ../src/messageview.c:210
 msgid "_Edit"
 msgstr "Redaguo_ti"
 
-#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:507
+#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:509
 #: ../src/messageview.c:213
 msgid "_Tools"
 msgstr "Įran_kiai"
 
-#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:509
+#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:511
 #: ../src/messageview.c:214
 msgid "_Help"
 msgstr "_Pagalba"
@@ -533,7 +701,7 @@ msgstr "_Iškirpti"
 
 #. Edit menu
 #: ../src/addressbook.c:431 ../src/addressbook.c:470 ../src/addressbook.c:486
-#: ../src/compose.c:610 ../src/mainwindow.c:538 ../src/messageview.c:226
+#: ../src/compose.c:610 ../src/mainwindow.c:540 ../src/messageview.c:226
 msgid "_Copy"
 msgstr "_Kopijuoti"
 
@@ -589,7 +757,7 @@ msgid "Edit custom attributes..."
 msgstr "Keisti savitus atributus"
 
 #. Help menu
-#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:801
+#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:803
 #: ../src/messageview.c:339
 msgid "_About"
 msgstr "_Apie"
@@ -599,9 +767,10 @@ msgid "_Browse Entry"
 msgstr "_Naršyti įrašą"
 
 #. then add the appointment
-#: ../src/addressbook.c:504 ../src/crash.c:454 ../src/crash.c:473
+#: ../src/addressbook.c:504 ../src/crash.c:457 ../src/crash.c:476
 #: ../src/importldif.c:115 ../src/plugins/pgpcore/select-keys.c:251
-#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/vcalendar/day-view.c:402
+#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/pgpcore/sgpgme.c:168
+#: ../src/plugins/vcalendar/day-view.c:402
 #: ../src/plugins/vcalendar/month-view.c:428 ../src/prefs_themes.c:707
 #: ../src/prefs_themes.c:739 ../src/prefs_themes.c:740
 msgid "Unknown"
@@ -707,7 +876,7 @@ msgstr "Reikia saugesnio tapatumo nustatymo"
 msgid "Sources"
 msgstr "Ištekliai"
 
-#: ../src/addressbook.c:914 ../src/prefs_matcher.c:629
+#: ../src/addressbook.c:914 ../src/prefs_matcher.c:632
 #: ../src/prefs_other.c:475 ../src/toolbar.c:225 ../src/toolbar.c:2142
 msgid "Address book"
 msgstr "Adresų knyga"
@@ -758,7 +927,7 @@ msgstr ""
 
 #: ../src/addressbook.c:2921 ../src/imap_gtk.c:363 ../src/mh_gtk.c:202
 #: ../src/plugins/mailmbox/plugin_gtk.c:324
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:236
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:152
 #: ../src/plugins/vcalendar/vcal_folder.c:1966
 msgid "Delete folder"
 msgstr "Šalinti aplanką"
@@ -922,10 +1091,10 @@ msgstr "LDAP užklausa"
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:443
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:490
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:613
-#: ../src/prefs_matcher.c:672 ../src/prefs_matcher.c:707
-#: ../src/prefs_matcher.c:1607 ../src/prefs_matcher.c:1614
-#: ../src/prefs_matcher.c:1622 ../src/prefs_matcher.c:1624
-#: ../src/prefs_matcher.c:2504 ../src/prefs_matcher.c:2508
+#: ../src/prefs_matcher.c:675 ../src/prefs_matcher.c:710
+#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:1626
+#: ../src/prefs_matcher.c:1634 ../src/prefs_matcher.c:1636
+#: ../src/prefs_matcher.c:2524 ../src/prefs_matcher.c:2528
 msgid "Any"
 msgstr "Bet koks"
 
@@ -1030,21 +1199,21 @@ msgstr "Atnaujinti adresą(-us)"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Nepavyko atnaujinti. Pakeitimai į aplanką nebuvo įrašyti."
 
-#: ../src/alertpanel.c:146 ../src/compose.c:9293
+#: ../src/alertpanel.c:146 ../src/compose.c:9324
 msgid "Notice"
 msgstr "Pranešimas"
 
 #: ../src/alertpanel.c:159 ../src/compose.c:5656 ../src/compose.c:6133
-#: ../src/compose.c:11662 ../src/file_checker.c:78 ../src/file_checker.c:100
+#: ../src/compose.c:11670 ../src/file_checker.c:78 ../src/file_checker.c:100
 #: ../src/messageview.c:853 ../src/messageview.c:866
-#: ../src/plugins/pgpcore/sgpgme.c:719
+#: ../src/plugins/pgpcore/sgpgme.c:717
 #: ../src/plugins/vcalendar/vcalendar.c:125 ../src/summaryview.c:4863
 msgid "Warning"
 msgstr "Įspėjimas"
 
 #: ../src/alertpanel.c:172 ../src/alertpanel.c:195 ../src/compose.c:5597
 #: ../src/inc.c:669 ../src/plugins/pgpcore/sgpgme.c:152
-#: ../src/plugins/pgpcore/sgpgme.c:249
+#: ../src/plugins/pgpcore/sgpgme.c:253
 msgid "Error"
 msgstr "Klaida"
 
@@ -1056,14 +1225,9 @@ msgstr "_Peržiūrėti žurnalą"
 msgid "Show this message next time"
 msgstr "Ateityje vėl rodyti šį pranešimą"
 
-#: ../src/avatars.c:97
-msgid "Internal avatars rendering already initialized"
-msgstr ""
-
 #: ../src/avatars.c:102
-#, fuzzy
 msgid "Failed to register avatars internal rendering hook"
-msgstr "Nepavyko užregistruoti apipavidalinimo pakeitimo"
+msgstr ""
 
 #: ../src/browseldap.c:218
 msgid "Browse Directory Entry"
@@ -1168,7 +1332,7 @@ msgstr "Jūsų Claws Mail versija yra per sena papildiniui „%s“."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Jūsų Claws Mail versija yra per sena papildiniui."
 
-#: ../src/common/session.c:177 ../src/imap.c:1171
+#: ../src/common/session.c:177 ../src/imap.c:1177
 msgid "SSL handshake failed\n"
 msgstr "SSL prisijungimo klaida\n"
 
@@ -1344,212 +1508,212 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: ../src/common/utils.c:4967
+#: ../src/common/utils.c:5000
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "sekmadienį"
 
-#: ../src/common/utils.c:4968
+#: ../src/common/utils.c:5001
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "pirmadienį"
 
-#: ../src/common/utils.c:4969
+#: ../src/common/utils.c:5002
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "antradienį"
 
-#: ../src/common/utils.c:4970
+#: ../src/common/utils.c:5003
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "trečiadienį"
 
-#: ../src/common/utils.c:4971
+#: ../src/common/utils.c:5004
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "ketvirtadienį"
 
-#: ../src/common/utils.c:4972
+#: ../src/common/utils.c:5005
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "penktadienį"
 
-#: ../src/common/utils.c:4973
+#: ../src/common/utils.c:5006
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "šeštadienį"
 
-#: ../src/common/utils.c:4975
+#: ../src/common/utils.c:5008
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "sausio"
 
-#: ../src/common/utils.c:4976
+#: ../src/common/utils.c:5009
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "vasario"
 
-#: ../src/common/utils.c:4977
+#: ../src/common/utils.c:5010
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "kovo"
 
-#: ../src/common/utils.c:4978
+#: ../src/common/utils.c:5011
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "balandžio"
 
-#: ../src/common/utils.c:4979
+#: ../src/common/utils.c:5012
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "gegužės"
 
-#: ../src/common/utils.c:4980
+#: ../src/common/utils.c:5013
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "birželio"
 
-#: ../src/common/utils.c:4981
+#: ../src/common/utils.c:5014
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "liepos"
 
-#: ../src/common/utils.c:4982
+#: ../src/common/utils.c:5015
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "rugpjūčio"
 
-#: ../src/common/utils.c:4983
+#: ../src/common/utils.c:5016
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "rugsėjo"
 
-#: ../src/common/utils.c:4984
+#: ../src/common/utils.c:5017
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "spalio"
 
-#: ../src/common/utils.c:4985
+#: ../src/common/utils.c:5018
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "lapkričio"
 
-#: ../src/common/utils.c:4986
+#: ../src/common/utils.c:5019
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "gruodžio"
 
-#: ../src/common/utils.c:4988
+#: ../src/common/utils.c:5021
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "S"
 
-#: ../src/common/utils.c:4989
+#: ../src/common/utils.c:5022
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Pr"
 
-#: ../src/common/utils.c:4990
+#: ../src/common/utils.c:5023
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "A"
 
-#: ../src/common/utils.c:4991
+#: ../src/common/utils.c:5024
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "T"
 
-#: ../src/common/utils.c:4992
+#: ../src/common/utils.c:5025
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "K"
 
-#: ../src/common/utils.c:4993
+#: ../src/common/utils.c:5026
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "P"
 
-#: ../src/common/utils.c:4994
+#: ../src/common/utils.c:5027
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Š"
 
-#: ../src/common/utils.c:4996
+#: ../src/common/utils.c:5029
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Sau"
 
-#: ../src/common/utils.c:4997
+#: ../src/common/utils.c:5030
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Vas"
 
-#: ../src/common/utils.c:4998
+#: ../src/common/utils.c:5031
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Kov"
 
-#: ../src/common/utils.c:4999
+#: ../src/common/utils.c:5032
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Bal"
 
-#: ../src/common/utils.c:5000
+#: ../src/common/utils.c:5033
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Geg"
 
-#: ../src/common/utils.c:5001
+#: ../src/common/utils.c:5034
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Bir"
 
-#: ../src/common/utils.c:5002
+#: ../src/common/utils.c:5035
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Lie"
 
-#: ../src/common/utils.c:5003
+#: ../src/common/utils.c:5036
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Rgp"
 
-#: ../src/common/utils.c:5004
+#: ../src/common/utils.c:5037
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Rgs"
 
-#: ../src/common/utils.c:5005
+#: ../src/common/utils.c:5038
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Spa"
 
-#: ../src/common/utils.c:5006
+#: ../src/common/utils.c:5039
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Lap"
 
-#: ../src/common/utils.c:5007
+#: ../src/common/utils.c:5040
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Grd"
 
-#: ../src/common/utils.c:5018
+#: ../src/common/utils.c:5051
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "ryto"
 
-#: ../src/common/utils.c:5019
+#: ../src/common/utils.c:5052
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "vakaro"
 
-#: ../src/common/utils.c:5020
+#: ../src/common/utils.c:5053
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "ryto"
 
-#: ../src/common/utils.c:5021
+#: ../src/common/utils.c:5054
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "vakaro"
@@ -1560,7 +1724,7 @@ msgstr "Pri_dėti..."
 
 #: ../src/compose.c:571 ../src/mh_gtk.c:361
 #: ../src/plugins/mailmbox/plugin_gtk.c:293
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:140
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:307
 msgid "_Remove"
 msgstr "Pa_šalinti"
 
@@ -1569,7 +1733,7 @@ msgid "_Properties..."
 msgstr "_Savybės..."
 
 #. menus
-#: ../src/compose.c:580 ../src/mainwindow.c:506 ../src/messageview.c:212
+#: ../src/compose.c:580 ../src/mainwindow.c:508 ../src/messageview.c:212
 msgid "_Message"
 msgstr "_Laiškas"
 
@@ -1641,7 +1805,7 @@ msgstr "_Apgaubiant"
 msgid "_Unwrapped"
 msgstr "_Neapgaubiant"
 
-#: ../src/compose.c:618 ../src/mainwindow.c:539
+#: ../src/compose.c:618 ../src/mainwindow.c:541
 msgid "Select _all"
 msgstr "Pažymėti _viską"
 
@@ -1773,48 +1937,48 @@ msgstr "_Prioritetas"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
 #. {"View/Scroll/---",          NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:666 ../src/mainwindow.c:603 ../src/messageview.c:265
+#: ../src/compose.c:666 ../src/mainwindow.c:605 ../src/messageview.c:265
 msgid "Character _encoding"
 msgstr "Rašmenų _koduotė"
 
-#: ../src/compose.c:671 ../src/mainwindow.c:608 ../src/messageview.c:270
+#: ../src/compose.c:671 ../src/mainwindow.c:610 ../src/messageview.c:270
 msgid "Western European"
 msgstr "Vakarų Europos"
 
-#: ../src/compose.c:672 ../src/mainwindow.c:609 ../src/messageview.c:271
+#: ../src/compose.c:672 ../src/mainwindow.c:611 ../src/messageview.c:271
 msgid "Baltic"
 msgstr "Baltų"
 
-#: ../src/compose.c:673 ../src/mainwindow.c:610 ../src/messageview.c:272
+#: ../src/compose.c:673 ../src/mainwindow.c:612 ../src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebrajų"
 
-#: ../src/compose.c:674 ../src/mainwindow.c:611 ../src/messageview.c:273
+#: ../src/compose.c:674 ../src/mainwindow.c:613 ../src/messageview.c:273
 msgid "Arabic"
 msgstr "Arabų"
 
-#: ../src/compose.c:675 ../src/mainwindow.c:612 ../src/messageview.c:274
+#: ../src/compose.c:675 ../src/mainwindow.c:614 ../src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Kirilica"
 
-#: ../src/compose.c:676 ../src/mainwindow.c:613 ../src/messageview.c:275
+#: ../src/compose.c:676 ../src/mainwindow.c:615 ../src/messageview.c:275
 msgid "Japanese"
 msgstr "Japonų"
 
-#: ../src/compose.c:677 ../src/mainwindow.c:614 ../src/messageview.c:276
+#: ../src/compose.c:677 ../src/mainwindow.c:616 ../src/messageview.c:276
 msgid "Chinese"
 msgstr "Kinų"
 
-#: ../src/compose.c:678 ../src/mainwindow.c:615 ../src/messageview.c:277
+#: ../src/compose.c:678 ../src/mainwindow.c:617 ../src/messageview.c:277
 msgid "Korean"
 msgstr "Korėjiečių"
 
-#: ../src/compose.c:679 ../src/mainwindow.c:616 ../src/messageview.c:278
+#: ../src/compose.c:679 ../src/mainwindow.c:618 ../src/messageview.c:278
 msgid "Thai"
 msgstr "Tajų"
 
 #. Tools menu
-#: ../src/compose.c:682 ../src/mainwindow.c:723 ../src/messageview.c:314
+#: ../src/compose.c:682 ../src/mainwindow.c:725 ../src/messageview.c:314
 msgid "_Address book"
 msgstr "_Adresų knyga"
 
@@ -1823,7 +1987,7 @@ msgid "_Template"
 msgstr "Ša_blonas"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:686 ../src/mainwindow.c:751 ../src/messageview.c:335
+#: ../src/compose.c:686 ../src/mainwindow.c:753 ../src/messageview.c:335
 msgid "Actio_ns"
 msgstr "_Veiksmai"
 
@@ -1867,13 +2031,13 @@ msgid "_Normal"
 msgstr "_Paprastas"
 
 #. RADIO compose_reply_change_mode_cb
-#: ../src/compose.c:707 ../src/mainwindow.c:657 ../src/messageview.c:303
+#: ../src/compose.c:707 ../src/mainwindow.c:659 ../src/messageview.c:303
 msgid "_All"
 msgstr "_Visiems"
 
 #. RADIO compose_reply_change_mode_cb
 #. COMPOSE_REPLY_TO_ALL
-#: ../src/compose.c:708 ../src/mainwindow.c:658 ../src/messageview.c:304
+#: ../src/compose.c:708 ../src/mainwindow.c:660 ../src/messageview.c:304
 msgid "_Sender"
 msgstr "_Siuntėjui"
 
@@ -1901,19 +2065,19 @@ msgstr "_Žemas"
 msgid "_Lowest"
 msgstr "Že_miausias"
 
-#: ../src/compose.c:723 ../src/mainwindow.c:865 ../src/messageview.c:352
+#: ../src/compose.c:723 ../src/mainwindow.c:868 ../src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automatinė"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:724 ../src/mainwindow.c:866 ../src/messageview.c:353
+#: ../src/compose.c:724 ../src/mainwindow.c:869 ../src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7 bitų ASCII (US-ASC_II)"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:725 ../src/mainwindow.c:867 ../src/messageview.c:354
+#: ../src/compose.c:725 ../src/mainwindow.c:870 ../src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unikodas (_UTF-8)"
 
@@ -1925,7 +2089,7 @@ msgstr "Unikodas (_UTF-8)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:729 ../src/mainwindow.c:871 ../src/messageview.c:358
+#: ../src/compose.c:729 ../src/mainwindow.c:874 ../src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centrinės Europos (ISO-8859-_2)"
 
@@ -1935,7 +2099,7 @@ msgstr "Centrinės Europos (ISO-8859-_2)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:732 ../src/mainwindow.c:874 ../src/messageview.c:361
+#: ../src/compose.c:732 ../src/mainwindow.c:877 ../src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Graikų (ISO-8859-_7)"
 
@@ -1949,7 +2113,7 @@ msgstr "Graikų (ISO-8859-_7)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:737 ../src/mainwindow.c:879 ../src/messageview.c:366
+#: ../src/compose.c:737 ../src/mainwindow.c:882 ../src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turkų (ISO-8859-_9)"
 
@@ -2001,33 +2165,33 @@ msgstr "Persiunčiama: keletas adresų"
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Peradresavimo šablono pagrindinėje dalyje yra klaida ties %d eilute."
 
-#: ../src/compose.c:2591 ../src/gtk/headers.h:13
+#: ../src/compose.c:2591 ../src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kopija:"
 
-#: ../src/compose.c:2594 ../src/gtk/headers.h:14
+#: ../src/compose.c:2594 ../src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Nematoma kopija:"
 
-#: ../src/compose.c:2597 ../src/gtk/headers.h:11
+#: ../src/compose.c:2597 ../src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Kam atsakyti:"
 
 #: ../src/compose.c:2600 ../src/compose.c:4911 ../src/compose.c:4913
-#: ../src/gtk/headers.h:32
+#: ../src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Naujienų grupė:"
 
-#: ../src/compose.c:2603 ../src/gtk/headers.h:33
+#: ../src/compose.c:2603 ../src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Kam peradresuoti:"
 
-#: ../src/compose.c:2606 ../src/gtk/headers.h:16
+#: ../src/compose.c:2606 ../src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Kam atsakant:"
 
 #: ../src/compose.c:2610 ../src/compose.c:4908 ../src/compose.c:4916
-#: ../src/gtk/headers.h:12 ../src/summary_search.c:433
+#: ../src/gtk/headers.h:13 ../src/summary_search.c:433
 msgid "To:"
 msgstr "Kam:"
 
@@ -2073,7 +2237,7 @@ msgstr "Ketinate į laiško turinį įterpti rinkmeną %s. Tęsti?"
 msgid "Are you sure?"
 msgstr "Tikrai?"
 
-#: ../src/compose.c:3603 ../src/compose.c:11144
+#: ../src/compose.c:3603 ../src/compose.c:11152
 msgid "+_Insert"
 msgstr "+Į_terpti"
 
@@ -2100,16 +2264,16 @@ msgstr "Nepavyksta perskaityti %s."
 msgid "Message: %s"
 msgstr "Laiškas: %s"
 
-#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:432
+#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [redaguota]"
 
-#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:435
+#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Laiško rašymas %s"
 
-#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:438
+#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[be temos] - Laiško rašymas %s"
@@ -2118,7 +2282,7 @@ msgstr "[be temos] - Laiško rašymas %s"
 #. * This partly duplicates functionality in compose.c::compose_set_title().
 #. * While it's nice to not have to modify Claws Mail for this to work,
 #. * it would be cleaner to export that function in Claws Mail.
-#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:426
+#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Rašyti laišką"
 
@@ -2174,7 +2338,7 @@ msgstr "Vis tiek įtraukti į siuntimo eilę?"
 msgid "Send later"
 msgstr "Siųsti vėliau"
 
-#: ../src/compose.c:5134 ../src/compose.c:9719
+#: ../src/compose.c:5134 ../src/compose.c:9750
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2184,7 +2348,7 @@ msgstr ""
 "\n"
 "Nepavyko konvertuoti koduotės."
 
-#: ../src/compose.c:5137 ../src/compose.c:9722
+#: ../src/compose.c:5137 ../src/compose.c:9753
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2194,7 +2358,7 @@ msgstr ""
 "\n"
 "Nepavyko gauti gavėjo šifravimo rakto."
 
-#: ../src/compose.c:5143 ../src/compose.c:9716
+#: ../src/compose.c:5143 ../src/compose.c:9747
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2284,7 +2448,7 @@ msgstr "Pasirinkta paskyra nėra NNTP: siųsti neįmanoma."
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Priedo %s nebėra. Nepaisyti?"
 
-#: ../src/compose.c:6133 ../src/mainwindow.c:648 ../src/toolbar.c:231
+#: ../src/compose.c:6133 ../src/mainwindow.c:650 ../src/toolbar.c:231
 #: ../src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Atsisakyti siuntimo"
@@ -2302,34 +2466,34 @@ msgstr "Originali %s dalis"
 msgid "Add to address _book"
 msgstr "Įtraukti į adresų _knygą"
 
-#: ../src/compose.c:6908
+#: ../src/compose.c:6912
 msgid "Delete entry contents"
 msgstr "Šalinti įrašo turinį"
 
-#: ../src/compose.c:6912 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: ../src/compose.c:6916 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Norėdami užbaigti pagal adresų knygą, spauskite <tab>"
 
-#: ../src/compose.c:7132
+#: ../src/compose.c:7136
 msgid "Mime type"
 msgstr "MIME tipas"
 
 #. S_COL_DATE
-#: ../src/compose.c:7138 ../src/mimeview.c:274
-#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:627
+#: ../src/compose.c:7142 ../src/mimeview.c:274
+#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:630
 #: ../src/prefs_summary_column.c:85 ../src/summaryview.c:445
 msgid "Size"
 msgstr "Dydis"
 
 #. Save Message to folder
-#: ../src/compose.c:7201
+#: ../src/compose.c:7205
 msgid "Save Message to "
 msgstr "Laišką įrašyti į"
 
-#: ../src/compose.c:7238 ../src/editjpilot.c:276 ../src/editldap.c:520
+#: ../src/compose.c:7242 ../src/editjpilot.c:276 ../src/editldap.c:520
 #: ../src/editvcard.c:192 ../src/export.c:164 ../src/import.c:163
 #: ../src/importmutt.c:239 ../src/importpine.c:238
-#: ../src/plugins/archive/archiver_gtk.c:1028
+#: ../src/plugins/archive/archiver_gtk.c:1029
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:188
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:208
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:181
@@ -2338,24 +2502,23 @@ msgstr "Laišką įrašyti į"
 msgid "_Browse"
 msgstr "_Naršyti"
 
-#: ../src/compose.c:7710
+#: ../src/compose.c:7714
 msgid "Hea_der"
 msgstr "_Antraštė"
 
-#: ../src/compose.c:7715
+#: ../src/compose.c:7719
 msgid "_Attachments"
 msgstr "_Priedai"
 
-#: ../src/compose.c:7729
+#: ../src/compose.c:7733
 msgid "Othe_rs"
 msgstr "_Kita"
 
-#: ../src/compose.c:7744 ../src/gtk/headers.h:18
-#: ../src/plugins/pdf_viewer/poppler_viewer.c:702 ../src/summary_search.c:440
-msgid "Subject:"
-msgstr "Tema:"
+#: ../src/compose.c:7748
+msgid "_Subject:"
+msgstr "_Tema:"
 
-#: ../src/compose.c:7966
+#: ../src/compose.c:7970
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2364,20 +2527,20 @@ msgstr ""
 "Nepavyksta paleisti rašybos tikrintuvės.\n"
 "%s"
 
-#: ../src/compose.c:8072
+#: ../src/compose.c:8076
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Nuo: <i>%s</i>"
 
-#: ../src/compose.c:8106
+#: ../src/compose.c:8119
 msgid "Account to use for this email"
 msgstr "Šiam laiškui naudotina paskyra"
 
-#: ../src/compose.c:8108
+#: ../src/compose.c:8121
 msgid "Sender address to be used"
 msgstr "Naudotinas siuntėjo adresas"
 
-#: ../src/compose.c:8272
+#: ../src/compose.c:8285
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2386,64 +2549,68 @@ msgstr ""
 "Nepavyksta įkelti privatumo sistemos „%s“. Todėl laiško negalėsite nei "
 "pasirašyti, nei užšifruoti."
 
-#: ../src/compose.c:8372 ../src/plugins/archive/archiver_gtk.c:1082
+#: ../src/compose.c:8385 ../src/plugins/archive/archiver_gtk.c:1083
 msgid "_None"
 msgstr "_Nieko"
 
-#: ../src/compose.c:8473 ../src/prefs_template.c:753
+#: ../src/compose.c:8486 ../src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Šablono pagrindinėje dalyje yra klaida ties %d eilute."
 
-#: ../src/compose.c:8589
+#: ../src/compose.c:8602
 msgid "Template From format error."
 msgstr "Šablone yra siuntėjo formato klaida."
 
-#: ../src/compose.c:8607
+#: ../src/compose.c:8620
 msgid "Template To format error."
 msgstr "Šablone yra gavėjo formato klaida."
 
-#: ../src/compose.c:8625
+#: ../src/compose.c:8638
 msgid "Template Cc format error."
 msgstr "Šablone yra laiško kopijos formato klaida."
 
-#: ../src/compose.c:8643
+#: ../src/compose.c:8656
 msgid "Template Bcc format error."
 msgstr "Šablone yra laiško nematomosios kopijos formato klaida."
 
-#: ../src/compose.c:8662
+#: ../src/compose.c:8674
+msgid "Template Reply-To format error."
+msgstr "Šablone yra atgalinio adreso formato klaida."
+
+#: ../src/compose.c:8693
 msgid "Template subject format error."
 msgstr "Šablone yra laiško temos formato klaida."
 
-#: ../src/compose.c:8930
+#: ../src/compose.c:8961
 msgid "Invalid MIME type."
 msgstr "Netinkamas MIME tipas."
 
-#: ../src/compose.c:8945
+#: ../src/compose.c:8976
 msgid "File doesn't exist or is empty."
 msgstr "Rinkmenos nėra arba ji tuščia."
 
-#: ../src/compose.c:9019
+#: ../src/compose.c:9050
 msgid "Properties"
 msgstr "Savybės"
 
-#: ../src/compose.c:9036
+#: ../src/compose.c:9067
 msgid "MIME type"
 msgstr "MIME tipas"
 
-#: ../src/compose.c:9077
+#: ../src/compose.c:9108
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: ../src/compose.c:9097
+#: ../src/compose.c:9128
 msgid "Path"
 msgstr "Kelias"
 
-#: ../src/compose.c:9098
+#: ../src/compose.c:9129
 msgid "File name"
 msgstr "Rinkmenos vardas"
 
-#: ../src/compose.c:9290
+#: ../src/compose.c:9321
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2454,16 +2621,16 @@ msgstr ""
 "Priverstinai nutraukti šį procesą?\n"
 "proceso grupės id: %d"
 
-#: ../src/compose.c:9685 ../src/messageview.c:1095
+#: ../src/compose.c:9716 ../src/messageview.c:1095
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 "Tam, kad galėtų išsiųsti šį laišką, Claws Mail turi prisijungti prie tinklo."
 
-#: ../src/compose.c:9711
+#: ../src/compose.c:9742
 msgid "Could not queue message."
 msgstr "Nepavyksta laiško įtraukti į siuntimo eilę."
 
-#: ../src/compose.c:9713
+#: ../src/compose.c:9744
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2474,15 +2641,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../src/compose.c:9891
+#: ../src/compose.c:9922
 msgid "Could not save draft."
 msgstr "Nepavyksta įrašyti juodraščio."
 
-#: ../src/compose.c:9895
+#: ../src/compose.c:9926
 msgid "Could not save draft"
 msgstr "Nepavyksta įrašyti juodraščio"
 
-#: ../src/compose.c:9896
+#: ../src/compose.c:9927
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2490,24 +2657,24 @@ msgstr ""
 "Nepavyksta įrašyti juodraščio.\n"
 "Neišeiti ar sunaikinti atmetant šį laišką?"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Cancel exit"
 msgstr "_Neišeiti"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Discard email"
 msgstr "_Atmesti laišką"
 
-#: ../src/compose.c:10058 ../src/compose.c:10072
+#: ../src/compose.c:10089 ../src/compose.c:10103
 msgid "Select file"
 msgstr "Pasirinkite rinkmeną"
 
-#: ../src/compose.c:10086
+#: ../src/compose.c:10117
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Nepavyksta perskaityti rinkmenos „%s“."
 
-#: ../src/compose.c:10088
+#: ../src/compose.c:10119
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2516,63 +2683,63 @@ msgstr ""
 "Rinkmena „%s“ turi šiai koduotei\n"
 "netinkančių rašmenų. Įterpimas gali būti netinkamas."
 
-#: ../src/compose.c:10175
+#: ../src/compose.c:10206
 msgid "Discard message"
 msgstr "Atmesti laišką"
 
-#: ../src/compose.c:10176
+#: ../src/compose.c:10207
 msgid "This message has been modified. Discard it?"
 msgstr "Šis laiškas pakeistas. Atmesti jį?"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Discard"
 msgstr "_Atmesti"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Save to Drafts"
 msgstr "Į_rašyti kaip juodraštį"
 
-#: ../src/compose.c:10179
+#: ../src/compose.c:10210
 msgid "Save changes"
 msgstr "Įrašyti pakeitimus"
 
-#: ../src/compose.c:10180
+#: ../src/compose.c:10211
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Šis laiškas pakeistas. Įrašyti paskutinius pakeitimus?"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "_Don't save"
 msgstr "_Neįrašyti"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "+_Save to Drafts"
 msgstr "+Į_rašyti kaip juodraštį"
 
-#: ../src/compose.c:10251
+#: ../src/compose.c:10282
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Pritaikyti šabloną „%s“?"
 
-#: ../src/compose.c:10253
+#: ../src/compose.c:10284
 msgid "Apply template"
 msgstr "Pritaikyti šabloną"
 
-#: ../src/compose.c:10254 ../src/prefs_actions.c:329
+#: ../src/compose.c:10285 ../src/prefs_actions.c:329
 #: ../src/prefs_filtering_action.c:610 ../src/prefs_filtering.c:477
-#: ../src/prefs_matcher.c:772 ../src/prefs_template.c:309
+#: ../src/prefs_matcher.c:775 ../src/prefs_template.c:311
 #: ../src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "Pa_keisti"
 
-#: ../src/compose.c:10254
+#: ../src/compose.c:10285
 msgid "_Insert"
 msgstr "Į_terpti"
 
-#: ../src/compose.c:11141
+#: ../src/compose.c:11149
 msgid "Insert or attach?"
 msgstr "Įterpti ar pridėti?"
 
-#: ../src/compose.c:11142
+#: ../src/compose.c:11150
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2580,16 +2747,16 @@ msgstr ""
 "Ar rinkmenos(-ų) turinį įtraukti į laiško pagrindinę dalį, ar prisegti kaip "
 "priedą prie laiško?"
 
-#: ../src/compose.c:11144
+#: ../src/compose.c:11152
 msgid "_Attach"
 msgstr "_Pridėti"
 
-#: ../src/compose.c:11361
+#: ../src/compose.c:11369
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Citavimo formato klaida ties %d eilute."
 
-#: ../src/compose.c:11656
+#: ../src/compose.c:11664
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2846,15 +3013,15 @@ msgstr "Redaguoti aplanką"
 msgid "Input the new name of folder:"
 msgstr "Įveskite naują aplanko pavadinimą:"
 
-#: ../src/editgroup.c:556 ../src/foldersel.c:581 ../src/imap_gtk.c:195
+#: ../src/editgroup.c:556 ../src/foldersel.c:585 ../src/imap_gtk.c:195
 #: ../src/mh_gtk.c:145 ../src/plugins/mailmbox/plugin_gtk.c:239
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:89
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "New folder"
 msgstr "Naujas aplankas"
 
-#: ../src/editgroup.c:557 ../src/foldersel.c:582 ../src/mh_gtk.c:146
+#: ../src/editgroup.c:557 ../src/foldersel.c:586 ../src/mh_gtk.c:146
 #: ../src/plugins/mailmbox/plugin_gtk.c:240
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:90
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Input the name of new folder:"
 msgstr "Įveskite naujo aplanko pavadinimą:"
 
@@ -3264,9 +3431,9 @@ msgstr "Stilius"
 #. * can always get back the SummaryView pointer.
 #: ../src/exphtmldlg.c:453 ../src/gtk/colorlabel.c:406
 #: ../src/gtk/gtkaspell.c:1571 ../src/gtk/gtkaspell.c:2231
-#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1174
+#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1177
 #: ../src/plugins/archive/archiver_prefs.c:241
-#: ../src/plugins/libravatar/libravatar_prefs.c:187 ../src/prefs_account.c:949
+#: ../src/plugins/libravatar/libravatar_prefs.c:206 ../src/prefs_account.c:949
 #: ../src/prefs_toolbar.c:780 ../src/prefs_toolbar.c:1465
 #: ../src/summaryview.c:6008
 msgid "None"
@@ -3278,7 +3445,7 @@ msgid "Default"
 msgstr "Numatytasis"
 
 #: ../src/exphtmldlg.c:455 ../src/plugins/pgpcore/select-keys.c:244
-#: ../src/plugins/pgpcore/sgpgme.c:148
+#: ../src/plugins/pgpcore/sgpgme.c:148 ../src/plugins/pgpcore/sgpgme.c:164
 msgid "Full"
 msgstr "Pilnas"
 
@@ -3506,7 +3673,7 @@ msgstr "Adresų knygą eksportuoti į LDIF rinkmeną"
 msgid "Distinguished Name"
 msgstr "Unikalusis vardas (DN)"
 
-#: ../src/export.c:113 ../src/summaryview.c:8117
+#: ../src/export.c:113 ../src/summaryview.c:8120
 msgid "Export to mbox file"
 msgstr "Eksportuoti į mbox rinkmeną"
 
@@ -3545,7 +3712,7 @@ msgid "Full Name"
 msgstr "Pilnas vardas"
 
 #: ../src/exporthtml.c:771 ../src/importldif.c:1022
-#: ../src/plugins/archive/archiver_gtk.c:736
+#: ../src/plugins/archive/archiver_gtk.c:737
 msgid "Attributes"
 msgstr "Atributai"
 
@@ -3601,7 +3768,7 @@ msgstr ""
 #: ../src/filtering.c:667 ../src/filtering.c:685 ../src/filtering.c:712
 #: ../src/filtering.c:713 ../src/filtering.c:730 ../src/filtering.c:731
 msgid "NON_EXISTENT"
-msgstr ""
+msgstr "NĖRA"
 
 #: ../src/filtering.c:633
 msgid ""
@@ -3670,14 +3837,14 @@ msgid "no further processing after action [ %s ]\n"
 msgstr ""
 
 #: ../src/filtering.c:826
-#, fuzzy, c-format
+#, c-format
 msgid "processing rule '%s' [ %s ]\n"
-msgstr "Vyk_dyti apdorojimo taisykles"
+msgstr "apdorojimo taisyklė „%s“ [%s]\n"
 
 #: ../src/filtering.c:830
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "apdorojimo taisyklė <bevardė> [ %s ]\n"
 
 #: ../src/filtering.c:848
 #, c-format
@@ -3690,34 +3857,28 @@ msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr ""
 
 #: ../src/filtering.c:890
-#, fuzzy
 msgid "undetermined"
-msgstr "Neapibrėžta"
+msgstr "neapibrėžtas"
 
 #: ../src/filtering.c:894
-#, fuzzy
 msgid "incorporation"
-msgstr "filtravimas gaunant"
+msgstr "gaunant"
 
 #: ../src/filtering.c:898
-#, fuzzy
 msgid "manually"
-msgstr "_Žinynas"
+msgstr "rankinis"
 
 #: ../src/filtering.c:902
-#, fuzzy
 msgid "folder processing"
-msgstr "Vykdyti aplankų apd_orojimo taisykles"
+msgstr "aplankų apdorojimas"
 
 #: ../src/filtering.c:906
-#, fuzzy
 msgid "pre-processing"
-msgstr "P_irminis apdorojimas..."
+msgstr "pirminis apdorojimas"
 
 #: ../src/filtering.c:910
-#, fuzzy
 msgid "post-processing"
-msgstr "G_alutinis apdorojimas..."
+msgstr "galutinis apdorojimas"
 
 #: ../src/filtering.c:927
 #, c-format
@@ -3732,7 +3893,7 @@ msgstr ""
 
 #: ../src/filtering.c:929 ../src/filtering.c:938
 msgid ": "
-msgstr ""
+msgstr ": "
 
 #: ../src/filtering.c:936
 #, c-format
@@ -3797,38 +3958,37 @@ msgstr "%s sinchronizuojama naudojimui neprisijungus...\n"
 msgid "Select folder"
 msgstr "Pasirinkite aplanką"
 
-#: ../src/foldersel.c:583 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
+#: ../src/foldersel.c:587 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
 #: ../src/plugins/mailmbox/plugin_gtk.c:241
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "NewFolder"
 msgstr "NaujasAplankas"
 
-#: ../src/foldersel.c:591 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
+#: ../src/foldersel.c:595 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
 #: ../src/imap_gtk.c:272 ../src/imap_gtk.c:277 ../src/mh_gtk.c:155
 #: ../src/mh_gtk.c:259 ../src/news_gtk.c:315
 #: ../src/plugins/mailmbox/plugin_gtk.c:249
 #: ../src/plugins/mailmbox/plugin_gtk.c:416
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:97
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:339
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
 #: ../src/plugins/vcalendar/vcal_folder.c:2040
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "Aplanko pavadinime negali būti „%c“."
 
-#: ../src/foldersel.c:601 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
+#: ../src/foldersel.c:605 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
 #: ../src/mh_gtk.c:165 ../src/mh_gtk.c:266 ../src/news_gtk.c:322
 #: ../src/plugins/mailmbox/plugin_gtk.c:261
 #: ../src/plugins/mailmbox/plugin_gtk.c:425
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:107
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:346
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:211
 #: ../src/plugins/vcalendar/vcal_folder.c:2047
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Aplankas „%s“ jau yra."
 
-#: ../src/foldersel.c:608 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
+#: ../src/foldersel.c:612 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
 #: ../src/plugins/mailmbox/plugin_gtk.c:268
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:113
+#: ../src/plugins/rssyl/opml_import.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:121
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Nepavyksta sukurti aplanko „%s“"
@@ -3841,7 +4001,7 @@ msgstr "Visus pa_žymėti skaitytais"
 msgid "R_un processing rules"
 msgstr "Vyk_dyti apdorojimo taisykles"
 
-#: ../src/folderview.c:233 ../src/mainwindow.c:544
+#: ../src/folderview.c:233 ../src/mainwindow.c:546
 msgid "_Search folder..."
 msgstr "_Ieškoti aplanke"
 
@@ -3860,7 +4020,7 @@ msgstr "Į siuntimo _eilę..."
 #. F_COL_FOLDER
 #: ../src/folderview.c:380 ../src/folderview.c:427
 #: ../src/plugins/notification/notification_lcdproc.c:141
-#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:388
+#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:391
 #: ../src/summaryview.c:6284
 msgid "New"
 msgstr "Nauja"
@@ -3868,7 +4028,7 @@ msgstr "Nauja"
 #. F_COL_NEW
 #: ../src/folderview.c:381 ../src/folderview.c:428
 #: ../src/plugins/notification/notification_lcdproc.c:145
-#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:387
+#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:390
 #: ../src/summaryview.c:6286
 msgid "Unread"
 msgstr "Neskaityta"
@@ -3890,21 +4050,21 @@ msgstr "Nr."
 msgid "Setting folder info..."
 msgstr "Ruošiama aplankų informacija..."
 
-#: ../src/folderview.c:823 ../src/summaryview.c:4117 ../src/summaryview.c:4119
+#: ../src/folderview.c:823 ../src/summaryview.c:4119 ../src/summaryview.c:4121
 msgid "Mark all as read"
 msgstr "Visus pažymėti skaitytais"
 
-#: ../src/folderview.c:824 ../src/summaryview.c:4118
+#: ../src/folderview.c:824 ../src/summaryview.c:4120
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Tikrai visus šio aplanko laiškus pažymėti skaitytais?"
 
-#: ../src/folderview.c:982 ../src/imap.c:4528 ../src/mainwindow.c:5134
+#: ../src/folderview.c:982 ../src/imap.c:4574 ../src/mainwindow.c:5157
 #: ../src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Peržvelgiamas aplankas %s%c%s ..."
 
-#: ../src/folderview.c:986 ../src/imap.c:4533 ../src/mainwindow.c:5139
+#: ../src/folderview.c:986 ../src/imap.c:4579 ../src/mainwindow.c:5162
 #: ../src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
@@ -3936,60 +4096,60 @@ msgstr "Nepavyksta peržvelgti aplanko %s\n"
 msgid "Checking for new messages in all folders..."
 msgstr "Visuose aplankuose tikrinama, ar yra naujų laiškų..."
 
-#: ../src/folderview.c:2005
+#: ../src/folderview.c:2046
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Užveriamas aplankas %s..."
 
 #. Open Folder
 #. TODO: wwp: avoid displaying (null) in the status bar
-#: ../src/folderview.c:2100
+#: ../src/folderview.c:2141
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Atveriamas aplankas %s..."
 
-#: ../src/folderview.c:2118
+#: ../src/folderview.c:2159
 msgid "Folder could not be opened."
 msgstr "Nepavyksta atverti aplanko."
 
-#: ../src/folderview.c:2261 ../src/mainwindow.c:2877 ../src/mainwindow.c:2881
+#: ../src/folderview.c:2302 ../src/mainwindow.c:2887 ../src/mainwindow.c:2891
 msgid "Empty trash"
 msgstr "Išvalyti šiukšlinę"
 
-#: ../src/folderview.c:2262
+#: ../src/folderview.c:2303
 msgid "Delete all messages in trash?"
 msgstr "Pašalinti visus šiukšlinės laiškus?"
 
-#: ../src/folderview.c:2263
+#: ../src/folderview.c:2304
 msgid "+_Empty trash"
 msgstr "+Iš_valyti šiukšlinę"
 
-#: ../src/folderview.c:2307 ../src/inc.c:1540 ../src/toolbar.c:2607
+#: ../src/folderview.c:2348 ../src/inc.c:1540 ../src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Įspėjimas apie darbą neprisijungus"
 
-#: ../src/folderview.c:2308 ../src/toolbar.c:2608
+#: ../src/folderview.c:2349 ../src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Esate atsijungę nuo tinklo. Prisijungti?"
 
-#: ../src/folderview.c:2319 ../src/toolbar.c:2627
+#: ../src/folderview.c:2360 ../src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Siųsti eilės laiškus"
 
-#: ../src/folderview.c:2320 ../src/toolbar.c:2628
+#: ../src/folderview.c:2361 ../src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Siųsti visus eilės laiškus?"
 
-#: ../src/folderview.c:2321 ../src/messageview.c:854 ../src/messageview.c:871
+#: ../src/folderview.c:2362 ../src/messageview.c:854 ../src/messageview.c:871
 #: ../src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Siųsti"
 
-#: ../src/folderview.c:2329 ../src/toolbar.c:2647
+#: ../src/folderview.c:2370 ../src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Siunčiant eilės laiškus įvyko klaidų."
 
-#: ../src/folderview.c:2332 ../src/main.c:2714 ../src/toolbar.c:2650
+#: ../src/folderview.c:2373 ../src/main.c:2714 ../src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3998,65 +4158,65 @@ msgstr ""
 "Siunčiant eilės laiškus įvyko klaidų:\n"
 "%s"
 
-#: ../src/folderview.c:2409
+#: ../src/folderview.c:2450
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Tikrai kopijuoti aplanką „%s“ į „%s“? "
 
-#: ../src/folderview.c:2410
+#: ../src/folderview.c:2451
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Tikrai sukurti paaplankį „%s“ aplanke „%s“? "
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Copy folder"
 msgstr "Kopijuoti aplanką"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Move folder"
 msgstr "Perkelti aplanką"
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopijuojama „%s“ į „%s“..."
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Perkeliama „%s“ į „%s“..."
 
-#: ../src/folderview.c:2454
+#: ../src/folderview.c:2495
 msgid "Source and destination are the same."
 msgstr "Paskirtis ir šaltinis yra tas pats."
 
-#: ../src/folderview.c:2457
+#: ../src/folderview.c:2498
 msgid "Can't copy a folder to one of its children."
 msgstr "Negalima aplanko kopijuoti į jo paaplankį."
 
-#: ../src/folderview.c:2458
+#: ../src/folderview.c:2499
 msgid "Can't move a folder to one of its children."
 msgstr "Negalima aplanko perkelti į jo paaplankį."
 
-#: ../src/folderview.c:2461
+#: ../src/folderview.c:2502
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Aplanko negalima kilnoti tarp skirtingų pašto dėžučių."
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Copy failed!"
 msgstr "Nukopijuoti nepavyko!"
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Move failed!"
 msgstr "Perkelti nepavyko!"
 
-#: ../src/folderview.c:2515
+#: ../src/folderview.c:2556
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Aplanko „%s“ apdorojimo konfigūracija"
 
-#: ../src/folderview.c:2943 ../src/summaryview.c:4558
-#: ../src/summaryview.c:4657
+#: ../src/folderview.c:2984 ../src/summaryview.c:4560
+#: ../src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Paskirties aplankas gali turėti tik paaplankius."
 
@@ -4596,92 +4756,91 @@ msgstr ""
 
 #: ../src/gtk/gtkutils.c:1907
 msgid "Failed."
-msgstr ""
+msgstr "Nepavyko."
 
 #: ../src/gtk/gtkutils.c:1970
-#, fuzzy
 msgid "Configuring..."
-msgstr "_Nuostatos"
+msgstr "Konfigūruojama..."
 
 #. RFC2822
 #. S_COL_TO
 #. date expression
 #. S_COL_TO
-#: ../src/gtk/headers.h:8 ../src/prefs_filtering_action.c:1259
-#: ../src/prefs_matcher.c:2158 ../src/prefs_summary_column.c:84
+#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1259
+#: ../src/prefs_matcher.c:2174 ../src/prefs_summary_column.c:84
 #: ../src/quote_fmt.c:49 ../src/summaryview.c:444
 msgid "Date"
 msgstr "Data"
 
-#: ../src/gtk/headers.h:8
+#: ../src/gtk/headers.h:9
 msgid "Date:"
 msgstr "Data:"
 
 #. S_COL_SUBJECT
 #. date
 #. S_COL_SUBJECT
-#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1256
-#: ../src/prefs_matcher.c:2155 ../src/prefs_summary_column.c:82
+#: ../src/gtk/headers.h:10 ../src/prefs_filtering_action.c:1256
+#: ../src/prefs_matcher.c:2171 ../src/prefs_summary_column.c:82
 #: ../src/quote_fmt.c:50 ../src/summaryview.c:442
 msgid "From"
 msgstr "Nuo"
 
-#: ../src/gtk/headers.h:9 ../src/summary_search.c:426
+#: ../src/gtk/headers.h:10 ../src/summary_search.c:426
 msgid "From:"
 msgstr "Nuo:"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender"
 msgstr "Siuntėjas"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender:"
 msgstr "Siuntėjas"
 
-#: ../src/gtk/headers.h:11
+#: ../src/gtk/headers.h:12
 msgid "Reply-To"
 msgstr "Kam atsakyti"
 
 #. S_COL_FROM
 #. subject
 #. S_COL_FROM
-#: ../src/gtk/headers.h:12 ../src/prefs_filtering_action.c:1257
-#: ../src/prefs_matcher.c:2156 ../src/prefs_summary_column.c:83
+#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1257
+#: ../src/prefs_matcher.c:2172 ../src/prefs_summary_column.c:83
 #: ../src/quote_fmt.c:57 ../src/summaryview.c:443
 msgid "To"
 msgstr "Kam"
 
 #. to
-#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1258
-#: ../src/prefs_matcher.c:2157 ../src/quote_fmt.c:58
+#: ../src/gtk/headers.h:14 ../src/prefs_filtering_action.c:1258
+#: ../src/prefs_matcher.c:2173 ../src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Kopija"
 
-#: ../src/gtk/headers.h:14
+#: ../src/gtk/headers.h:15
 msgid "Bcc"
 msgstr "Nematomoji kopija"
 
 #. references
-#: ../src/gtk/headers.h:15 ../src/prefs_filtering_action.c:1260
-#: ../src/prefs_matcher.c:2159 ../src/quote_fmt.c:61
+#: ../src/gtk/headers.h:16 ../src/prefs_filtering_action.c:1260
+#: ../src/prefs_matcher.c:2175 ../src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Laiško ID"
 
-#: ../src/gtk/headers.h:15
+#: ../src/gtk/headers.h:16
 msgid "Message-ID:"
 msgstr "Laiško ID:"
 
-#: ../src/gtk/headers.h:16
+#: ../src/gtk/headers.h:17
 msgid "In-Reply-To"
 msgstr "Kam atsakant"
 
 #. newsgroups
-#: ../src/gtk/headers.h:17 ../src/prefs_filtering_action.c:1262
-#: ../src/prefs_matcher.c:2161 ../src/quote_fmt.c:60
+#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1262
+#: ../src/prefs_matcher.c:2177 ../src/quote_fmt.c:60
 msgid "References"
 msgstr "Nuorodos"
 
-#: ../src/gtk/headers.h:17
+#: ../src/gtk/headers.h:18
 msgid "References:"
 msgstr "Nuorodos:"
 
@@ -4689,328 +4848,333 @@ msgstr "Nuorodos:"
 #. initial of sender
 #. S_COL_STATUS
 #. S_COL_MIME
-#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1255
-#: ../src/prefs_matcher.c:2154 ../src/prefs_summary_column.c:81
+#: ../src/gtk/headers.h:19 ../src/prefs_filtering_action.c:1255
+#: ../src/prefs_matcher.c:2170 ../src/prefs_summary_column.c:81
 #: ../src/quote_fmt.c:56 ../src/summaryview.c:441
 msgid "Subject"
 msgstr "Tema"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:19 ../src/plugins/pdf_viewer/poppler_viewer.c:702
+#: ../src/summary_search.c:440
+msgid "Subject:"
+msgstr "Tema:"
+
+#: ../src/gtk/headers.h:20
 msgid "Comments"
 msgstr "Pastabos"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:20
 msgid "Comments:"
 msgstr "Pastabos:"
 
-#: ../src/gtk/headers.h:20
+#: ../src/gtk/headers.h:21
 msgid "Keywords"
 msgstr "Raktažodžiai"
 
-#: ../src/gtk/headers.h:20 ../src/plugins/pdf_viewer/poppler_viewer.c:704
+#: ../src/gtk/headers.h:21 ../src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Keywords:"
 msgstr "Raktažodžiai:"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date"
 msgstr "Persiuntimo data"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date:"
 msgstr "Persiuntimo data:"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From"
 msgstr "Persiųsta nuo"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From:"
 msgstr "Persiųsta nuo:"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender"
 msgstr ""
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender:"
 msgstr ""
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To"
 msgstr "Kam persiųsta"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To:"
 msgstr "Kam persiųsta:"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc"
 msgstr ""
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc:"
 msgstr ""
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc"
 msgstr ""
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc:"
 msgstr ""
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID"
 msgstr "Persiųsto laiško ID"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID:"
 msgstr "Persiųsto laiško ID:"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path"
 msgstr "Atgalininis"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path:"
 msgstr "Atgalinis:"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received"
 msgstr "Gauta"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received:"
 msgstr "Gauta:"
 
 #. more
 #. cc
-#: ../src/gtk/headers.h:32 ../src/prefs_filtering_action.c:1261
-#: ../src/prefs_matcher.c:2160 ../src/quote_fmt.c:59
+#: ../src/gtk/headers.h:33 ../src/prefs_filtering_action.c:1261
+#: ../src/prefs_matcher.c:2176 ../src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Naujienų grupė"
 
-#: ../src/gtk/headers.h:33
+#: ../src/gtk/headers.h:34
 msgid "Followup-To"
 msgstr "Kam peradresuoti"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To"
 msgstr "Kam įteikta"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To:"
 msgstr "Kam įteikta"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen"
 msgstr "Peržiūrėta"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen:"
 msgstr "Peržiūrėta:"
 
 #. S_COL_MARK
-#: ../src/gtk/headers.h:36 ../src/gtk/progressdialog.c:149
+#: ../src/gtk/headers.h:37 ../src/gtk/progressdialog.c:149
 #: ../src/gtk/sslcertwindow.c:164 ../src/prefs_summary_column.c:79
 #: ../src/summaryview.c:2793
 msgid "Status"
 msgstr "Būsena"
 
-#: ../src/gtk/headers.h:36 ../src/prefs_themes.c:906
+#: ../src/gtk/headers.h:37 ../src/prefs_themes.c:906
 msgid "Status:"
 msgstr "Būsena:"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face"
 msgstr "Veidas"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face:"
 msgstr "Veidas:"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To"
 msgstr "Kam pranešama apie pristatymą"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To:"
 msgstr "Kam pranešama apie pristatymą:"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To"
 msgstr "Kam pranešama apie laiško gavimą"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To:"
 msgstr "Kam pranešama apie laiško gavimą:"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent"
 msgstr "Naudotojo programa"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent:"
 msgstr "Naudotojo programa:"
 
-#: ../src/gtk/headers.h:41
+#: ../src/gtk/headers.h:42
 msgid "Content-Type"
 msgstr "Turinio tipas"
 
-#: ../src/gtk/headers.h:41 ../src/image_viewer.c:327
+#: ../src/gtk/headers.h:42 ../src/image_viewer.c:327
 msgid "Content-Type:"
 msgstr "Turinio tipas:"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding"
 msgstr "Turinio koduotė"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding:"
 msgstr "Turinio koduotė:"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version"
 msgstr "MIME versija"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version:"
 msgstr "MIME versija:"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence"
 msgstr "Pirmenybė"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence:"
 msgstr "Pirmenybė:"
 
-#: ../src/gtk/headers.h:45 ../src/prefs_account.c:1073
+#: ../src/gtk/headers.h:46 ../src/prefs_account.c:1073
 msgid "Organization"
 msgstr "Organizacija"
 
-#: ../src/gtk/headers.h:45
+#: ../src/gtk/headers.h:46
 msgid "Organization:"
 msgstr "Organizacija:"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List"
 msgstr "El. pašto grupė"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List:"
 msgstr "El. pašto grupė:"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post"
 msgstr "Siuntimui į el. pašto grupę"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post:"
 msgstr "Siuntimui į el. pašto grupę:"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe"
 msgstr "El. pašto grupės prenumeravimas"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe:"
 msgstr "El. pašto grupės prenumeravimas:"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe"
 msgstr "El. pašto grupės prenumeratos atsisakymas"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe:"
 msgstr "El. pašto grupės prenumeratos atsisakymas:"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help"
 msgstr "El. pašto grupės pagalba"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help:"
 msgstr "El. pašto grupės pagalba:"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive"
 msgstr "El. pašto grupės archyvas"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive:"
 msgstr "El. pašto grupės archyvas:"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner"
 msgstr "El. pašto grupės savininkas"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner:"
 msgstr "El. pašto grupės savininkas:"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label"
 msgstr "X etiketė"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label:"
 msgstr "X etiketė:"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer"
 msgstr "X pašto tarnyba"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer:"
 msgstr "X pašto tarnyba:"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status"
 msgstr "X būsena"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status:"
 msgstr "X būsena:"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face"
 msgstr "X veidas"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face:"
 msgstr "X veidas:"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive"
 msgstr "X ne archyvas"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive:"
 msgstr "X ne archyvas:"
 
 #. some common logical names referring to real header names
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to"
 msgstr "Kam atsakant"
 
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to:"
 msgstr "Kam atsakant:"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc"
 msgstr "„Kam“ arba „Kopija“"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc:"
 msgstr "„Kam“ arba „Kopija“:"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject"
 msgstr "„Nuo“, „Kam“ arba „Tema“"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject:"
 msgstr "„Nuo“, „Kam“ arba „Tema“:"
 
@@ -5196,10 +5360,10 @@ msgstr ""
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:457
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:400
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:550
-#: ../src/plugins/fancy/fancy_prefs.c:109
+#: ../src/plugins/fancy/fancy_prefs.c:114
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:178
 #: ../src/plugins/gdata/cm_gdata_prefs.c:145
-#: ../src/plugins/libravatar/libravatar_prefs.c:399
+#: ../src/plugins/libravatar/libravatar_prefs.c:439
 #: ../src/plugins/notification/notification_prefs.c:396
 #: ../src/plugins/notification/notification_prefs.c:410
 #: ../src/plugins/notification/notification_prefs.c:428
@@ -5209,9 +5373,9 @@ msgstr ""
 #: ../src/plugins/notification/notification_prefs.c:496
 #: ../src/plugins/notification/notification_prefs.c:513
 #: ../src/plugins/pgpcore/prefs_gpg.c:569
-#: ../src/plugins/rssyl/rssyl_prefs.c:65
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
+#: ../src/plugins/rssyl/rssyl_prefs.c:69
 #: ../src/plugins/spam_report/spam_report_prefs.c:79
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
 #: ../src/plugins/vcalendar/vcal_prefs.c:680 ../src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Papildiniai"
@@ -5251,7 +5415,7 @@ msgstr "Įkelti papildiniai"
 msgid "Page Index"
 msgstr "Turinys"
 
-#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:828
+#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:831
 msgid "_Hide"
 msgstr "_Slėpti"
 
@@ -5264,70 +5428,74 @@ msgstr "_Slėpti"
 msgid "Account"
 msgstr "Paskyra"
 
-#: ../src/gtk/quicksearch.c:452
+#: ../src/gtk/quicksearch.c:451
 msgid "all messages"
 msgstr "visi laiškai"
 
-#: ../src/gtk/quicksearch.c:453
+#: ../src/gtk/quicksearch.c:452
 msgid "messages whose age is greater than # days"
 msgstr "laiškai, senesni nei # d."
 
-#: ../src/gtk/quicksearch.c:454
+#: ../src/gtk/quicksearch.c:453
 msgid "messages whose age is less than # days"
 msgstr "laiškai, naujesni nei # d."
 
-#: ../src/gtk/quicksearch.c:455
+#: ../src/gtk/quicksearch.c:454
 msgid "messages whose age is greater than # hours"
 msgstr "laiškai, senesni nei # val."
 
-#: ../src/gtk/quicksearch.c:456
+#: ../src/gtk/quicksearch.c:455
 msgid "messages whose age is less than # hours"
 msgstr "laiškai, naujesni nei # val."
 
-#: ../src/gtk/quicksearch.c:457
+#: ../src/gtk/quicksearch.c:456
 msgid "messages which contain S in the message body"
 msgstr "laiškai, kurių pagrindinėje dalyje yra S"
 
-#: ../src/gtk/quicksearch.c:458
+#: ../src/gtk/quicksearch.c:457
 msgid "messages which contain S in the whole message"
 msgstr "laiškai, kurių bet kurioje vietoje yra S"
 
-#: ../src/gtk/quicksearch.c:459
+#: ../src/gtk/quicksearch.c:458
 msgid "messages carbon-copied to S"
 msgstr "laiškas kopijos antraštėje turi S"
 
-#: ../src/gtk/quicksearch.c:460
+#: ../src/gtk/quicksearch.c:459
 msgid "message is either to: or cc: to S"
 msgstr "laiškas antraštėje „kam“ arba „kopija“ turi S"
 
-#: ../src/gtk/quicksearch.c:461
+#: ../src/gtk/quicksearch.c:460
 msgid "deleted messages"
 msgstr "pašalintieji laiškai"
 
 #. * how I can filter deleted messages *
-#: ../src/gtk/quicksearch.c:462
+#: ../src/gtk/quicksearch.c:461
 msgid "messages which contain S in the Sender field"
 msgstr "laiškai, kurie siuntėjo antraštėje turi S"
 
-#: ../src/gtk/quicksearch.c:463
+#: ../src/gtk/quicksearch.c:462
 msgid "true if execute \"S\" succeeds"
 msgstr "tiesa, jei pavyksta įvykdyti „S“"
 
-#: ../src/gtk/quicksearch.c:464
+#: ../src/gtk/quicksearch.c:463
 msgid "messages originating from user S"
 msgstr "laiškas atėjo nuo S"
 
-#: ../src/gtk/quicksearch.c:465
+#: ../src/gtk/quicksearch.c:464
 msgid "forwarded messages"
 msgstr "persiųstieji laiškai"
 
-#: ../src/gtk/quicksearch.c:466
+#: ../src/gtk/quicksearch.c:465
 msgid "messages which have attachments"
 msgstr "laiškai, turintys priedų"
 
+#: ../src/gtk/quicksearch.c:466
+msgid "messages which contain S in any header name or value"
+msgstr "laiškai, kurių antraštės pavadinimas arba reikšmė turi S"
+
 #: ../src/gtk/quicksearch.c:467
-msgid "messages which contain header S"
-msgstr "laiškai, kurie turi antraštę S"
+msgid "messages which contain S in the value of any header"
+msgstr "laiškai, kurių antraštės reikšmė turi S"
 
 #: ../src/gtk/quicksearch.c:468
 msgid "messages which contain S in Message-ID header"
@@ -5516,7 +5684,7 @@ msgstr "_Taisa"
 
 #: ../src/gtk/quicksearch.c:819 ../src/gtk/quicksearch.c:834
 #: ../src/prefs_actions.c:347 ../src/prefs_filtering.c:495
-#: ../src/prefs_template.c:328
+#: ../src/prefs_template.c:330
 msgid "C_lear"
 msgstr "Iš_valyti"
 
@@ -5665,8 +5833,8 @@ msgstr "Gairės:"
 #: ../src/plugins/notification/notification_popup.c:316
 #: ../src/plugins/notification/notification_popup.c:621
 #: ../src/plugins/notification/notification_trayicon.c:851
-#: ../src/summaryview.c:3351 ../src/summaryview.c:3369
-#: ../src/summaryview.c:3390
+#: ../src/summaryview.c:3353 ../src/summaryview.c:3371
+#: ../src/summaryview.c:3392
 msgid "(No From)"
 msgstr "(nežinoma nuo ko)"
 
@@ -5674,7 +5842,7 @@ msgstr "(nežinoma nuo ko)"
 #: ../src/plugins/notification/notification_popup.c:318
 #: ../src/plugins/notification/notification_popup.c:625
 #: ../src/plugins/notification/notification_trayicon.c:854
-#: ../src/summaryview.c:3403 ../src/summaryview.c:3407
+#: ../src/summaryview.c:3405 ../src/summaryview.c:3409
 msgid "(No Subject)"
 msgstr "(nežinoma tema)"
 
@@ -5682,7 +5850,7 @@ msgstr "(nežinoma tema)"
 msgid "Error:"
 msgstr "Klaida:"
 
-#: ../src/image_viewer.c:299 ../src/mimeview.c:2544
+#: ../src/image_viewer.c:299 ../src/mimeview.c:2545
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:698
 msgid "Filename:"
 msgstr "Rinkmenos vardas:"
@@ -5695,31 +5863,31 @@ msgstr "Rinkmenos dydis:"
 msgid "Load Image"
 msgstr "Įkelti paveikslą"
 
-#: ../src/imap.c:577
+#: ../src/imap.c:583
 msgid "IMAP4 connection broken\n"
 msgstr "IMAP4 ryšys nutrūko\n"
 
-#: ../src/imap.c:616
+#: ../src/imap.c:622
 #, c-format
 msgid "IMAP error on %s: authenticated\n"
 msgstr "%s IMAP klaida: tapatybė patvirtinta\n"
 
-#: ../src/imap.c:619
+#: ../src/imap.c:625
 #, c-format
 msgid "IMAP error on %s: not authenticated\n"
 msgstr "%s IMAP klaida: tapatybė nepatvirtinta\n"
 
-#: ../src/imap.c:622
+#: ../src/imap.c:628
 #, c-format
 msgid "IMAP error on %s: bad state\n"
 msgstr "%s IMAP klaida: bloga būsena\n"
 
-#: ../src/imap.c:625
+#: ../src/imap.c:631
 #, c-format
 msgid "IMAP error on %s: stream error\n"
 msgstr "%s IMAP klaida: srauto klaida\n"
 
-#: ../src/imap.c:628
+#: ../src/imap.c:634
 #, c-format
 msgid ""
 "IMAP error on %s: parse error (very probably non-RFC compliance from the "
@@ -5727,22 +5895,22 @@ msgid ""
 msgstr ""
 "%s IMAP klaida: nagrinėjimo klaida (greičiausiai serveris nepalaiko RFC)\n"
 
-#: ../src/imap.c:632
+#: ../src/imap.c:638
 #, c-format
 msgid "IMAP error on %s: connection refused\n"
 msgstr "%s IMAP klaida: ryšys atmestas\n"
 
-#: ../src/imap.c:635
+#: ../src/imap.c:641
 #, c-format
 msgid "IMAP error on %s: memory error\n"
 msgstr "%s IMAP klaida: atminties klaida\n"
 
-#: ../src/imap.c:638
+#: ../src/imap.c:644
 #, c-format
 msgid "IMAP error on %s: fatal error\n"
 msgstr "%s IMAP klaida: lemtingoji klaida\n"
 
-#: ../src/imap.c:641
+#: ../src/imap.c:647
 #, c-format
 msgid ""
 "IMAP error on %s: protocol error(very probably non-RFC compliance from the "
@@ -5750,172 +5918,172 @@ msgid ""
 msgstr ""
 "%s IMAP klaida: protokolo klaida (greičiausiai serveris nepalaiko RFC)\n"
 
-#: ../src/imap.c:645
+#: ../src/imap.c:651
 #, c-format
 msgid "IMAP error on %s: connection not accepted\n"
 msgstr "%s IMAP klaida: ryšys nebuvo priimtas\n"
 
-#: ../src/imap.c:648
+#: ../src/imap.c:654
 #, c-format
 msgid "IMAP error on %s: APPEND error\n"
 msgstr "%s IMAP klaida: komandos „APPEND“ klaida\n"
 
-#: ../src/imap.c:651
+#: ../src/imap.c:657
 #, c-format
 msgid "IMAP error on %s: NOOP error\n"
 msgstr "%s IMAP klaida: komandos „NOOP“ klaida\n"
 
-#: ../src/imap.c:654
+#: ../src/imap.c:660
 #, c-format
 msgid "IMAP error on %s: LOGOUT error\n"
 msgstr "%s IMAP klaida: komandos „LOGOUT“ klaida\n"
 
-#: ../src/imap.c:657
+#: ../src/imap.c:663
 #, c-format
 msgid "IMAP error on %s: CAPABILITY error\n"
 msgstr "%s IMAP klaida: komandos „CAPABILITY“ klaida\n"
 
-#: ../src/imap.c:660
+#: ../src/imap.c:666
 #, c-format
 msgid "IMAP error on %s: CHECK error\n"
 msgstr "%s IMAP klaida: komandos „CHECK“ klaida\n"
 
-#: ../src/imap.c:663
+#: ../src/imap.c:669
 #, c-format
 msgid "IMAP error on %s: CLOSE error\n"
 msgstr "%s IMAP klaida: komandos „CLOSE“ klaida\n"
 
-#: ../src/imap.c:666
+#: ../src/imap.c:672
 #, c-format
 msgid "IMAP error on %s: EXPUNGE error\n"
 msgstr "%s IMAP klaida: komandos „EXPUNGE“ klaida\n"
 
-#: ../src/imap.c:669
+#: ../src/imap.c:675
 #, c-format
 msgid "IMAP error on %s: COPY error\n"
 msgstr "%s IMAP klaida: komandos „COPY“ klaida\n"
 
-#: ../src/imap.c:672
+#: ../src/imap.c:678
 #, c-format
 msgid "IMAP error on %s: UID COPY error\n"
 msgstr "%s IMAP klaida: komandos „UID COPY“ klaida\n"
 
-#: ../src/imap.c:675
+#: ../src/imap.c:681
 #, c-format
 msgid "IMAP error on %s: CREATE error\n"
 msgstr "%s IMAP klaida: komandos „CREATE“ klaida\n"
 
-#: ../src/imap.c:678
+#: ../src/imap.c:684
 #, c-format
 msgid "IMAP error on %s: DELETE error\n"
 msgstr "%s IMAP klaida: komandos „DELETE“ klaida\n"
 
-#: ../src/imap.c:681
+#: ../src/imap.c:687
 #, c-format
 msgid "IMAP error on %s: EXAMINE error\n"
 msgstr "%s IMAP klaida: komandos „EXAMINE“ klaida\n"
 
-#: ../src/imap.c:684
+#: ../src/imap.c:690
 #, c-format
 msgid "IMAP error on %s: FETCH error\n"
 msgstr "%s IMAP klaida: komandos „FETCH“ klaida\n"
 
-#: ../src/imap.c:687
+#: ../src/imap.c:693
 #, c-format
 msgid "IMAP error on %s: UID FETCH error\n"
 msgstr "%s IMAP klaida: komandos „UID FETCH“ klaida\n"
 
-#: ../src/imap.c:690
+#: ../src/imap.c:696
 #, c-format
 msgid "IMAP error on %s: LIST error\n"
 msgstr "%s IMAP klaida: komandos „LIST“ klaida\n"
 
-#: ../src/imap.c:693
+#: ../src/imap.c:699
 #, c-format
 msgid "IMAP error on %s: LOGIN error\n"
 msgstr "%s IMAP klaida: komandos „LOGIN“ klaida\n"
 
-#: ../src/imap.c:696
+#: ../src/imap.c:702
 #, c-format
 msgid "IMAP error on %s: LSUB error\n"
 msgstr "%s IMAP klaida: komandos „LSUB“ klaida\n"
 
-#: ../src/imap.c:699
+#: ../src/imap.c:705
 #, c-format
 msgid "IMAP error on %s: RENAME error\n"
 msgstr "%s IMAP klaida: komandos „RENAME“ klaida\n"
 
-#: ../src/imap.c:702
+#: ../src/imap.c:708
 #, c-format
 msgid "IMAP error on %s: SEARCH error\n"
 msgstr "%s IMAP klaida: komandos „SEARCH“ klaida\n"
 
-#: ../src/imap.c:705
+#: ../src/imap.c:711
 #, c-format
 msgid "IMAP error on %s: UID SEARCH error\n"
 msgstr "%s IMAP klaida: komandos „UID SEARCH“ klaida\n"
 
-#: ../src/imap.c:708
+#: ../src/imap.c:714
 #, c-format
 msgid "IMAP error on %s: SELECT error\n"
 msgstr "%s IMAP klaida: komandos „SELECT“ klaida\n"
 
-#: ../src/imap.c:711
+#: ../src/imap.c:717
 #, c-format
 msgid "IMAP error on %s: STATUS error\n"
 msgstr "%s IMAP klaida: komandos „STATUS“ klaida\n"
 
-#: ../src/imap.c:714
+#: ../src/imap.c:720
 #, c-format
 msgid "IMAP error on %s: STORE error\n"
 msgstr "%s IMAP klaida: komandos „STORE“ klaida\n"
 
-#: ../src/imap.c:717
+#: ../src/imap.c:723
 #, c-format
 msgid "IMAP error on %s: UID STORE error\n"
 msgstr "%s IMAP klaida: komandos „UID STORE“ klaida\n"
 
-#: ../src/imap.c:720
+#: ../src/imap.c:726
 #, c-format
 msgid "IMAP error on %s: SUBSCRIBE error\n"
 msgstr "%s IMAP klaida: komandos „SUBSCRIBE“ klaida\n"
 
-#: ../src/imap.c:723
+#: ../src/imap.c:729
 #, c-format
 msgid "IMAP error on %s: UNSUBSCRIBE error\n"
 msgstr "%s IMAP klaida: komandos „UNSUBSCRIBE“ klaida\n"
 
-#: ../src/imap.c:726
+#: ../src/imap.c:732
 #, c-format
 msgid "IMAP error on %s: STARTTLS error\n"
 msgstr "%s IMAP klaida: komandos „STARTTLS“ klaida\n"
 
-#: ../src/imap.c:729
+#: ../src/imap.c:735
 #, c-format
 msgid "IMAP error on %s: INVAL error\n"
 msgstr "%s IMAP klaida: komandos „INVAL“ klaida\n"
 
-#: ../src/imap.c:732
+#: ../src/imap.c:738
 #, c-format
 msgid "IMAP error on %s: EXTENSION error\n"
 msgstr "%s IMAP klaida: komandos „EXTENSION“ klaida\n"
 
-#: ../src/imap.c:735
+#: ../src/imap.c:741
 #, c-format
 msgid "IMAP error on %s: SASL error\n"
 msgstr "%s IMAP klaida: komandos „SASL“ klaida\n"
 
-#: ../src/imap.c:739
+#: ../src/imap.c:745
 #, c-format
 msgid "IMAP error on %s: SSL error\n"
 msgstr "%s IMAP klaida: komandos „SSL“ klaida\n"
 
-#: ../src/imap.c:743
+#: ../src/imap.c:749
 #, c-format
 msgid "IMAP error on %s: Unknown error [%d]\n"
 msgstr "%s IMAP: nežinoma klaida [%d]\n"
 
-#: ../src/imap.c:928
+#: ../src/imap.c:934
 msgid ""
 "\n"
 "\n"
@@ -5927,7 +6095,7 @@ msgstr ""
 "CRAM-MD5 prisijungimas veikia tik tada, jei „libetpan“ biblioteka "
 "sukompiliuota su SASL palaikymu ir įdiegtas CRAM-MD5 SASL papildinys."
 
-#: ../src/imap.c:934
+#: ../src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5939,39 +6107,39 @@ msgstr ""
 "DIGEST-MD5 prisijungimas veikia tik tada, jei „libetpan“ biblioteka "
 "sukompiliuota su SASL palaikymu ir įdiegtas DIGEST-MD5 SASL papildinys."
 
-#: ../src/imap.c:941
+#: ../src/imap.c:947
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Nepavyko prisijungti prie %s: prisijungimo vardas atmestas.%s"
 
-#: ../src/imap.c:945
+#: ../src/imap.c:951
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Nepavyko prisijungti prie %s: prisijungimo vardas atmestas.%s\n"
 
-#: ../src/imap.c:963
+#: ../src/imap.c:969
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Nepavyko prisijungti prie %s"
 
-#: ../src/imap.c:970 ../src/imap.c:973
+#: ../src/imap.c:976 ../src/imap.c:979
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 prisijungimas prie %s nutrūko. Jungiamasi iš naujo...\n"
 
-#: ../src/imap.c:1003 ../src/imap.c:3583 ../src/imap.c:4242 ../src/imap.c:4339
-#: ../src/imap.c:4517 ../src/imap.c:5314
+#: ../src/imap.c:1009 ../src/imap.c:3619 ../src/imap.c:4278 ../src/imap.c:4375
+#: ../src/imap.c:4555 ../src/imap.c:5364
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Tam, kad galėtų pasiekti IMAP serverį, Claws Mail turi prisijungti prie "
 "tinklo."
 
-#: ../src/imap.c:1112 ../src/inc.c:818 ../src/news.c:387
+#: ../src/imap.c:1118 ../src/inc.c:818 ../src/news.c:387
 #: ../src/send_message.c:278
 msgid "Insecure connection"
 msgstr "Nesaugus ryšys"
 
-#: ../src/imap.c:1113 ../src/inc.c:819 ../src/news.c:388
+#: ../src/imap.c:1119 ../src/inc.c:819 ../src/news.c:388
 #: ../src/send_message.c:279
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
@@ -5985,110 +6153,110 @@ msgstr ""
 "\n"
 "Vis tiek jungtis prie šio serverio? Ryšys nebus saugus."
 
-#: ../src/imap.c:1119 ../src/inc.c:825 ../src/news.c:394
+#: ../src/imap.c:1125 ../src/inc.c:825 ../src/news.c:394
 #: ../src/send_message.c:285
 msgid "Con_tinue connecting"
 msgstr "_Tęsti prisijungimą"
 
-#: ../src/imap.c:1129
+#: ../src/imap.c:1135
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "„%s“ paskyra: jungiamasi prie IMAP4 serverio: %s:%d..."
 
-#: ../src/imap.c:1177
+#: ../src/imap.c:1183
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Nepavyksta prisijungti prie IMAP4 serverio: %s:%d"
 
-#: ../src/imap.c:1180
+#: ../src/imap.c:1186
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nepavyksta prisijungti prie IMAP4 serverio: %s:%d\n"
 
-#: ../src/imap.c:1213 ../src/imap.c:4004
+#: ../src/imap.c:1219 ../src/imap.c:4040
 msgid "Can't start TLS session.\n"
 msgstr "Nepavyksta pradėti TLS sesijos.\n"
 
-#: ../src/imap.c:1276
+#: ../src/imap.c:1282
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nepavyksta prisijungti prie IMAP serverio %s.\n"
 
-#: ../src/imap.c:1279
+#: ../src/imap.c:1285
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepavyksta prisijungti prie IMAP serverio %s."
 
-#: ../src/imap.c:1679
+#: ../src/imap.c:1703
 msgid "Adding messages..."
 msgstr "Pridedami laiškai..."
 
-#: ../src/imap.c:1883 ../src/mh.c:520
+#: ../src/imap.c:1908 ../src/mh.c:526
 msgid "Copying messages..."
 msgstr "Kopijuodami laiškai..."
 
-#: ../src/imap.c:2465
+#: ../src/imap.c:2492
 msgid "can't set deleted flags\n"
 msgstr "nepavyksta pažymėti pašalinimui\n"
 
-#: ../src/imap.c:2472 ../src/imap.c:4944
+#: ../src/imap.c:2499 ../src/imap.c:4994
 msgid "can't expunge\n"
 msgstr "negaliu išbraukti\n"
 
-#: ../src/imap.c:2823
+#: ../src/imap.c:2850
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Ieškoma %s neprenumeruotų aplankų..."
 
-#: ../src/imap.c:2826
+#: ../src/imap.c:2853
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Ieškoma %s paaplankių..."
 
-#: ../src/imap.c:3123
+#: ../src/imap.c:3159
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nepavyksta sukurti pašto dėžutės: LIST klaida\n"
 
-#: ../src/imap.c:3138
+#: ../src/imap.c:3174
 msgid "can't create mailbox\n"
 msgstr "nepavyksta sukurti pašto dėžutės\n"
 
-#: ../src/imap.c:3229
+#: ../src/imap.c:3265
 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 "Naujo aplanko pavadinime negali būti simbolių, reiškiančių aplankų skirtukus"
 
-#: ../src/imap.c:3269
+#: ../src/imap.c:3305
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nepavyksta pervadinti pašto dėžutės %s į %s\n"
 
-#: ../src/imap.c:3382
+#: ../src/imap.c:3418
 msgid "can't delete mailbox\n"
 msgstr "nepavyksta pašalinti pašto dėžutės\n"
 
-#: ../src/imap.c:3661
+#: ../src/imap.c:3697
 msgid "LIST failed\n"
 msgstr "LIST klaida\n"
 
-#: ../src/imap.c:3746
+#: ../src/imap.c:3782
 msgid "Flagging messages..."
 msgstr "Žymimi laiškai..."
 
-#: ../src/imap.c:3849
+#: ../src/imap.c:3885
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nepavyksta pasirinkti aplanko: %s\n"
 
-#: ../src/imap.c:4001
+#: ../src/imap.c:4037
 msgid "Server requires TLS to log in.\n"
 msgstr "Prisijungimui serveris reikalauja TLS.\n"
 
-#: ../src/imap.c:4011
+#: ../src/imap.c:4047
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepavyksta atnaujinti charakteristikų.\n"
 
-#: ../src/imap.c:4016
+#: ../src/imap.c:4052
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -6097,20 +6265,20 @@ msgstr ""
 "Nepavyko prisijungti prie %s: serveris reikalauja TLS, tačiau Claws Mail "
 "sukompiliuotas be OpenSSL palaikymo.\n"
 
-#: ../src/imap.c:4024
+#: ../src/imap.c:4060
 msgid "Server logins are disabled.\n"
 msgstr "Prisijungimas prie serverio uždraustas.\n"
 
-#: ../src/imap.c:4247
+#: ../src/imap.c:4283
 msgid "Fetching message..."
 msgstr "Gaunamas laiškas..."
 
-#: ../src/imap.c:4937
+#: ../src/imap.c:4987
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nepavyksta pažymėti pašalinimui: %d\n"
 
-#: ../src/imap.c:5973
+#: ../src/imap.c:6023
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6140,7 +6308,7 @@ msgid "Cop_y folder..."
 msgstr "_Kopijuoti aplanką..."
 
 #: ../src/imap_gtk.c:69 ../src/mh_gtk.c:59
-#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:61
+#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:55
 msgid "_Delete folder..."
 msgstr "Pa_šalinti aplanką..."
 
@@ -6201,7 +6369,7 @@ msgstr "Taikyti aukštesnio lygio aplanko savybes"
 
 #: ../src/imap_gtk.c:261 ../src/mh_gtk.c:249 ../src/news_gtk.c:306
 #: ../src/plugins/mailmbox/plugin_gtk.c:405
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:331
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:196
 #: ../src/plugins/vcalendar/vcal_folder.c:2032
 #, c-format
 msgid "Input new name for '%s':"
@@ -6209,14 +6377,14 @@ msgstr "Įveskite naują „%s“ pavadinimą:"
 
 #: ../src/imap_gtk.c:263 ../src/mh_gtk.c:251
 #: ../src/plugins/mailmbox/plugin_gtk.c:406
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:332
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:197
 #: ../src/plugins/vcalendar/vcal_folder.c:2033
 msgid "Rename folder"
 msgstr "Pervadinti aplanką"
 
 #: ../src/imap_gtk.c:292 ../src/mh_gtk.c:274 ../src/news_gtk.c:328
 #: ../src/plugins/mailmbox/plugin_gtk.c:433
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:352
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:217
 #: ../src/plugins/vcalendar/vcal_folder.c:2053
 msgid ""
 "The folder could not be renamed.\n"
@@ -6226,7 +6394,7 @@ msgstr ""
 "Nurodytas naujas aplanko pavadinimas neleistinas."
 
 #: ../src/imap_gtk.c:360 ../src/mh_gtk.c:199
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:233
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:149
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6241,7 +6409,7 @@ msgstr ""
 
 #: ../src/imap_gtk.c:381 ../src/mh_gtk.c:220 ../src/news_gtk.c:281
 #: ../src/plugins/mailmbox/plugin_gtk.c:341
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:254
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:170
 #: ../src/plugins/vcalendar/vcal_folder.c:1986
 #, c-format
 msgid "Can't remove the folder '%s'."
@@ -6269,7 +6437,7 @@ msgstr "+_Ieškoti"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Pasirinkite %s poaplankį, kurį norite prenumeruoti: "
 
-#: ../src/imap_gtk.c:537 ../src/mainwindow.c:672
+#: ../src/imap_gtk.c:537 ../src/mainwindow.c:674
 msgid "Subscribe"
 msgstr "Prenumeruoti"
 
@@ -6539,7 +6707,7 @@ msgid "Auth failed"
 msgstr "Nepavyko patvirtinti tapatybės"
 
 #. S_COL_SCORE
-#: ../src/inc.c:662 ../src/prefs_matcher.c:393
+#: ../src/inc.c:662 ../src/prefs_matcher.c:396
 #: ../src/prefs_summary_column.c:88 ../src/summaryview.c:2789
 #: ../src/summaryview.c:6310
 msgid "Locked"
@@ -6725,24 +6893,10 @@ msgstr "%s%sDirbate neprisijungę. Nepaisyti?"
 msgid "On_ly once"
 msgstr "Tik _dabar"
 
-#: ../src/ldapupdate.c:189
-#, c-format
-msgid "ldapsvr_retrieve_item_person->Unknown status: %d"
-msgstr ""
-
-#: ../src/ldapupdate.c:472
-msgid "ldapsvr_update_book: Could not clean cache\n"
-msgstr ""
-
 #: ../src/ldapupdate.c:1056
 msgid "Some SN"
 msgstr ""
 
-#: ../src/ldapupdate.c:1440
-#, c-format
-msgid "ldapsvr_update_book->Unknown status: %s\n"
-msgstr ""
-
 #: ../src/ldif.c:776
 msgid "Nick Name"
 msgstr "Slapyvardis"
@@ -7054,328 +7208,328 @@ msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: atsijungta.\n"
 
 #. menus
-#: ../src/mainwindow.c:503 ../src/messageview.c:209
+#: ../src/mainwindow.c:505 ../src/messageview.c:209
 msgid "_File"
 msgstr "_Rinkmena"
 
-#: ../src/mainwindow.c:505 ../src/messageview.c:211 ../src/summaryview.c:434
+#: ../src/mainwindow.c:507 ../src/messageview.c:211 ../src/summaryview.c:434
 msgid "_View"
 msgstr "Ro_dymas"
 
-#: ../src/mainwindow.c:508
+#: ../src/mainwindow.c:510
 msgid "_Configuration"
 msgstr "_Nuostatos"
 
 #. File menu
-#: ../src/mainwindow.c:512
+#: ../src/mainwindow.c:514
 msgid "_Add mailbox"
 msgstr "_Pridėti pašto dėžutę"
 
-#: ../src/mainwindow.c:513
+#: ../src/mainwindow.c:515
 msgid "MH..."
 msgstr "PD..."
 
-#: ../src/mainwindow.c:516
+#: ../src/mainwindow.c:518
 msgid "Change mailbox order..."
 msgstr "Keisti pašto dėžučių tvarką..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:519
+#: ../src/mainwindow.c:521
 msgid "_Import mbox file..."
 msgstr "_Importuoti mbox rinkmeną..."
 
-#: ../src/mainwindow.c:520
+#: ../src/mainwindow.c:522
 msgid "_Export to mbox file..."
 msgstr "_Eksportuoti į mbox rinkmeną..."
 
-#: ../src/mainwindow.c:521
+#: ../src/mainwindow.c:523
 msgid "_Export selected to mbox file..."
 msgstr "_Eksportuoti pasirinktus į mbox rinkmeną..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:523
+#: ../src/mainwindow.c:525
 msgid "Empty all _Trash folders"
 msgstr "Išvalyti visas _šiukšlines"
 
 #. {"File/---",				NULL, "---" },
 #. File menu
-#: ../src/mainwindow.c:526 ../src/messageview.c:218
+#: ../src/mainwindow.c:528 ../src/messageview.c:218
 msgid "_Save email as..."
 msgstr "Laišką įrašyti _kaip..."
 
-#: ../src/mainwindow.c:527 ../src/messageview.c:219
+#: ../src/mainwindow.c:529 ../src/messageview.c:219
 msgid "_Save part as..."
 msgstr "Įrašyti _dalį kaip..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:530 ../src/messageview.c:220
+#: ../src/mainwindow.c:532 ../src/messageview.c:220
 msgid "Page setup..."
 msgstr "Puslapio nuostatos..."
 
-#: ../src/mainwindow.c:531 ../src/messageview.c:221
+#: ../src/mainwindow.c:533 ../src/messageview.c:221
 msgid "_Print..."
 msgstr "_Spausdinti"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:533
+#: ../src/mainwindow.c:535
 msgid "Synchronise folders"
 msgstr "Suvienodinti aplankus"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:535
+#: ../src/mainwindow.c:537
 msgid "E_xit"
 msgstr "_Baigti"
 
-#: ../src/mainwindow.c:540
+#: ../src/mainwindow.c:542
 msgid "Select _thread"
 msgstr "_Pažymėti giją"
 
-#: ../src/mainwindow.c:541
+#: ../src/mainwindow.c:543
 msgid "_Delete thread"
 msgstr "_Šalinti giją"
 
-#: ../src/mainwindow.c:543
+#: ../src/mainwindow.c:545
 msgid "_Find in current message..."
 msgstr "_Ieškoti veikiamajame laiške..."
 
-#: ../src/mainwindow.c:545
+#: ../src/mainwindow.c:547
 msgid "_Quick search"
 msgstr "_Sparčioji paieška"
 
 #. View menu
-#: ../src/mainwindow.c:548
+#: ../src/mainwindow.c:550
 msgid "Show or hi_de"
 msgstr "Ro_dyti arba slėpti"
 
-#: ../src/mainwindow.c:549
+#: ../src/mainwindow.c:551
 msgid "_Toolbar"
 msgstr "Į_rankinė"
 
-#: ../src/mainwindow.c:551
+#: ../src/mainwindow.c:553
 msgid "Set displayed _columns"
 msgstr "R_odytini stulpeliai"
 
-#: ../src/mainwindow.c:552
+#: ../src/mainwindow.c:554
 msgid "In _folder list..."
 msgstr "_Aplankų sąraše..."
 
-#: ../src/mainwindow.c:553
+#: ../src/mainwindow.c:555
 msgid "In _message list..."
 msgstr "_Laiškų sąraše..."
 
-#: ../src/mainwindow.c:558
+#: ../src/mainwindow.c:560
 msgid "La_yout"
 msgstr "_Išdėstymas"
 
-#: ../src/mainwindow.c:561
+#: ../src/mainwindow.c:563
 msgid "_Sort"
 msgstr "_Rikiuoti"
 
-#: ../src/mainwindow.c:563
+#: ../src/mainwindow.c:565
 msgid "_Attract by subject"
 msgstr "_Grupuoti pagal temą"
 
-#: ../src/mainwindow.c:565
+#: ../src/mainwindow.c:567
 msgid "E_xpand all threads"
 msgstr "Išskleisti _visas gijas"
 
-#: ../src/mainwindow.c:566
+#: ../src/mainwindow.c:568
 msgid "Co_llapse all threads"
 msgstr "Susk_leisti visas gijas"
 
 #. View menu
-#: ../src/mainwindow.c:568 ../src/messageview.c:232
+#: ../src/mainwindow.c:570 ../src/messageview.c:232
 msgid "_Go to"
 msgstr "_Eiti į"
 
-#: ../src/mainwindow.c:569 ../src/messageview.c:233
+#: ../src/mainwindow.c:571 ../src/messageview.c:233
 msgid "_Previous message"
 msgstr "_Ankstesnis laiškas"
 
-#: ../src/mainwindow.c:570 ../src/messageview.c:234
+#: ../src/mainwindow.c:572 ../src/messageview.c:234
 msgid "_Next message"
 msgstr "_Tolesnis laiškas"
 
-#: ../src/mainwindow.c:572 ../src/messageview.c:236
+#: ../src/mainwindow.c:574 ../src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "A_nkstesnis neskaitytas laiškas"
 
-#: ../src/mainwindow.c:573 ../src/messageview.c:237
+#: ../src/mainwindow.c:575 ../src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "T_olesnis neskaitytas laiškas"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:575 ../src/messageview.c:239
+#: ../src/mainwindow.c:577 ../src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "An_kstesnis naujas laiškas"
 
-#: ../src/mainwindow.c:576 ../src/messageview.c:240
+#: ../src/mainwindow.c:578 ../src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "To_lesnis naujas laiškas"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:578 ../src/messageview.c:242
+#: ../src/mainwindow.c:580 ../src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Ank_stesnis pažymėtas laiškas"
 
-#: ../src/mainwindow.c:579 ../src/messageview.c:243
+#: ../src/mainwindow.c:581 ../src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Tol_esnis pažymėtas laiškas"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:581 ../src/messageview.c:245
+#: ../src/mainwindow.c:583 ../src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Ankstesnis laiškas s_u etikete"
 
-#: ../src/mainwindow.c:582 ../src/messageview.c:246
+#: ../src/mainwindow.c:584 ../src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Tolesn_is laiškas su etikete"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:584 ../src/messageview.c:248
+#: ../src/mainwindow.c:586 ../src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Ankstesnis atvertas laiškas"
 
-#: ../src/mainwindow.c:585 ../src/messageview.c:249
+#: ../src/mainwindow.c:587 ../src/messageview.c:249
 msgid "Next opened message"
 msgstr "Tolesnis atvertas laiškas"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:587 ../src/messageview.c:251
+#: ../src/mainwindow.c:589 ../src/messageview.c:251
 msgid "Parent message"
 msgstr "Aukštesnis gijos laiškas"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:589 ../src/messageview.c:253
+#: ../src/mainwindow.c:591 ../src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Tolesnis _neskaitytas aplankas"
 
-#: ../src/mainwindow.c:590 ../src/messageview.c:254
+#: ../src/mainwindow.c:592 ../src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Kitas aplankas"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:592 ../src/messageview.c:256 ../src/mimeview.c:201
+#: ../src/mainwindow.c:594 ../src/messageview.c:256 ../src/mimeview.c:201
 msgid "Next part"
 msgstr "Tolesnė dalis"
 
-#: ../src/mainwindow.c:593 ../src/messageview.c:257 ../src/mimeview.c:202
+#: ../src/mainwindow.c:595 ../src/messageview.c:257 ../src/mimeview.c:202
 msgid "Previous part"
 msgstr "Ankstesnė dalis"
 
 #. {"View/Scroll/---",                  NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:596 ../src/messageview.c:258
+#: ../src/mainwindow.c:598 ../src/messageview.c:258
 msgid "Message scroll"
 msgstr "Laiško slinkimas"
 
-#: ../src/mainwindow.c:597 ../src/messageview.c:259
+#: ../src/mainwindow.c:599 ../src/messageview.c:259
 msgid "Previous line"
 msgstr "Ankstesnė eilutė"
 
-#: ../src/mainwindow.c:598 ../src/messageview.c:260
+#: ../src/mainwindow.c:600 ../src/messageview.c:260
 msgid "Next line"
 msgstr "Tolesnė eilutė"
 
-#: ../src/mainwindow.c:599 ../src/messageview.c:261 ../src/printing.c:481
+#: ../src/mainwindow.c:601 ../src/messageview.c:261 ../src/printing.c:481
 msgid "Previous page"
 msgstr "Ankstesnis puslapis"
 
-#: ../src/mainwindow.c:600 ../src/messageview.c:262 ../src/printing.c:488
+#: ../src/mainwindow.c:602 ../src/messageview.c:262 ../src/printing.c:488
 msgid "Next page"
 msgstr "Tolesnis puslapis"
 
-#: ../src/mainwindow.c:618 ../src/messageview.c:280
+#: ../src/mainwindow.c:620 ../src/messageview.c:280
 msgid "Decode"
 msgstr "Iškoduoti"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:625
+#: ../src/mainwindow.c:627
 msgid "Open in new _window"
 msgstr "Atverti naujame _lange"
 
-#: ../src/mainwindow.c:626 ../src/messageview.c:287
+#: ../src/mainwindow.c:628 ../src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Laiško pradinis _tekstas"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:628 ../src/messageview.c:288
+#: ../src/mainwindow.c:630 ../src/messageview.c:288
 msgid "Message part"
 msgstr "Laiško dalis"
 
-#: ../src/mainwindow.c:629 ../src/messageview.c:289
+#: ../src/mainwindow.c:631 ../src/messageview.c:289
 msgid "View as text"
 msgstr "Rodyti kaip tekstą"
 
-#: ../src/mainwindow.c:630 ../src/messageview.c:290 ../src/toolbar.c:403
+#: ../src/mainwindow.c:632 ../src/messageview.c:290 ../src/toolbar.c:403
 msgid "Open"
 msgstr "Atverti"
 
-#: ../src/mainwindow.c:632 ../src/messageview.c:292
+#: ../src/mainwindow.c:634 ../src/messageview.c:292
 msgid "Open with..."
 msgstr "Atverti su..."
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:636 ../src/messageview.c:295
+#: ../src/mainwindow.c:638 ../src/messageview.c:295
 msgid "Quotes"
 msgstr "Citatos"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:638
+#: ../src/mainwindow.c:640
 msgid "_Update summary"
 msgstr "Atna_ujinti santrauką"
 
 #. Message menu
-#: ../src/mainwindow.c:641
+#: ../src/mainwindow.c:643
 msgid "Recei_ve"
 msgstr "T_ikrinti"
 
-#: ../src/mainwindow.c:642
+#: ../src/mainwindow.c:644
 msgid "Get from _current account"
 msgstr "_Tikrinti veikiamojoje paskyroje"
 
-#: ../src/mainwindow.c:643
+#: ../src/mainwindow.c:645
 msgid "Get from _all accounts"
 msgstr "Tikrinti _visose paskyrose"
 
-#: ../src/mainwindow.c:644
+#: ../src/mainwindow.c:646
 msgid "Cancel receivin_g"
 msgstr "_Nutraukti parsiuntimą"
 
-#: ../src/mainwindow.c:647
+#: ../src/mainwindow.c:649
 msgid "_Send queued messages"
 msgstr "_Siųsti eilės laiškus"
 
-#: ../src/mainwindow.c:652
+#: ../src/mainwindow.c:654
 msgid "Compose a_n email message"
 msgstr "_Rašyti el. laišką"
 
-#: ../src/mainwindow.c:653
+#: ../src/mainwindow.c:655
 msgid "Compose a news message"
 msgstr "Rašyti naujienų laišką"
 
-#: ../src/mainwindow.c:655 ../src/messageview.c:301
+#: ../src/mainwindow.c:657 ../src/messageview.c:301
 #: ../src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Atsakyti"
 
 #. COMPOSE_REPLY
-#: ../src/mainwindow.c:656 ../src/messageview.c:302 ../src/summaryview.c:426
+#: ../src/mainwindow.c:658 ../src/messageview.c:302 ../src/summaryview.c:426
 msgid "Repl_y to"
 msgstr "A_tsakyti..."
 
 #. COMPOSE_REPLY_TO_SENDER
-#: ../src/mainwindow.c:659 ../src/messageview.c:305
+#: ../src/mainwindow.c:661 ../src/messageview.c:305
 msgid "Mailing _list"
 msgstr "_el. pašto grupei"
 
 #. COMPOSE_REPLY_TO_LIST
-#: ../src/mainwindow.c:660
+#: ../src/mainwindow.c:662
 msgid "Follow-up and reply to"
 msgstr "Peradresuoti ir atsakyti"
 
@@ -7383,177 +7537,177 @@ msgstr "Peradresuoti ir atsakyti"
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REPLY_TO_LIST
 #. {"Message/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:663 ../src/messageview.c:308 ../src/toolbar.c:2069
+#: ../src/mainwindow.c:665 ../src/messageview.c:308 ../src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Persiųsti"
 
 #. COMPOSE_FORWARD_INLINE
-#: ../src/mainwindow.c:664 ../src/messageview.c:309 ../src/toolbar.c:2070
+#: ../src/mainwindow.c:666 ../src/messageview.c:309 ../src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "Persiųsti kaip prie_dą"
 
 #. COMPOSE_FORWARD_AS_ATTACH
-#: ../src/mainwindow.c:665 ../src/messageview.c:310 ../src/toolbar.c:2071
+#: ../src/mainwindow.c:667 ../src/messageview.c:310 ../src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Per_adresuoti"
 
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:667
+#: ../src/mainwindow.c:669
 msgid "Mailing-_List"
 msgstr "_El. pašto grupė"
 
-#: ../src/mainwindow.c:668
+#: ../src/mainwindow.c:670
 msgid "Post"
 msgstr "Siųsti"
 
-#: ../src/mainwindow.c:670
+#: ../src/mainwindow.c:672
 msgid "Help"
 msgstr "Pagalba"
 
-#: ../src/mainwindow.c:674
+#: ../src/mainwindow.c:676
 msgid "Unsubscribe"
 msgstr "Atsisakyti prenumeratos"
 
-#: ../src/mainwindow.c:676
+#: ../src/mainwindow.c:678
 msgid "View archive"
 msgstr "Rodyti archyvą"
 
-#: ../src/mainwindow.c:678
+#: ../src/mainwindow.c:680
 msgid "Contact owner"
 msgstr "susisiekti su valdytoju"
 
 #. separation
-#: ../src/mainwindow.c:682
+#: ../src/mainwindow.c:684
 msgid "M_ove..."
 msgstr "_Perkelti..."
 
-#: ../src/mainwindow.c:683
+#: ../src/mainwindow.c:685
 msgid "_Copy..."
 msgstr "_Kopijuoti"
 
-#: ../src/mainwindow.c:684
+#: ../src/mainwindow.c:686
 msgid "Move to _trash"
 msgstr "Perkelti į _šiukšlinę"
 
-#: ../src/mainwindow.c:685
+#: ../src/mainwindow.c:687
 msgid "_Delete..."
 msgstr "Paša_linti..."
 
-#: ../src/mainwindow.c:686
+#: ../src/mainwindow.c:688
 msgid "Cancel a news message"
 msgstr "Atsisakyti naujienų laiškų"
 
 #. separation
-#: ../src/mainwindow.c:689 ../src/mainwindow.c:690 ../src/summaryview.c:427
+#: ../src/mainwindow.c:691 ../src/mainwindow.c:692 ../src/summaryview.c:427
 msgid "_Mark"
 msgstr "Pa_žymėti"
 
-#: ../src/mainwindow.c:691
+#: ../src/mainwindow.c:693
 msgid "_Unmark"
 msgstr "_Atžymėti"
 
-#: ../src/mainwindow.c:694
+#: ../src/mainwindow.c:696
 msgid "Mark as unr_ead"
 msgstr "Pažymėtu kaip _neskaitytą"
 
-#: ../src/mainwindow.c:695
+#: ../src/mainwindow.c:697
 msgid "Mark as rea_d"
 msgstr "Pažymėti kaip _skaitytą"
 
 #. separation
-#: ../src/mainwindow.c:697
+#: ../src/mainwindow.c:699
 msgid "Mark all read"
 msgstr "Visus pažymėti skaitytais"
 
 #. separation
-#: ../src/mainwindow.c:699 ../src/prefs_filtering_action.c:199
+#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:199
 #: ../src/toolbar.c:208 ../src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Nepaisyti gijos"
 
-#: ../src/mainwindow.c:700
+#: ../src/mainwindow.c:702
 msgid "Unignore thread"
 msgstr "Paisyti gijos"
 
-#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:200
+#: ../src/mainwindow.c:703 ../src/prefs_filtering_action.c:200
 #: ../src/toolbar.c:209 ../src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Stebėti giją"
 
-#: ../src/mainwindow.c:702
+#: ../src/mainwindow.c:704
 msgid "Unwatch thread"
 msgstr "Nestebėti gijos"
 
 #. separation
-#: ../src/mainwindow.c:705
+#: ../src/mainwindow.c:707
 msgid "Mark as _spam"
 msgstr "Pažymėti kaip _brukalą"
 
-#: ../src/mainwindow.c:706
+#: ../src/mainwindow.c:708
 msgid "Mark as _ham"
 msgstr "Pažymėti _kaip pageidaujamą"
 
 #. separation
-#: ../src/mainwindow.c:709 ../src/prefs_filtering_action.c:181
+#: ../src/mainwindow.c:711 ../src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Užrakinti"
 
-#: ../src/mainwindow.c:710 ../src/prefs_filtering_action.c:182
+#: ../src/mainwindow.c:712 ../src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Atrakinti"
 
-#: ../src/mainwindow.c:712 ../src/summaryview.c:428
+#: ../src/mainwindow.c:714 ../src/summaryview.c:428
 msgid "Color la_bel"
 msgstr "Spal_vota etiketė"
 
-#: ../src/mainwindow.c:713 ../src/summaryview.c:429
+#: ../src/mainwindow.c:715 ../src/summaryview.c:429
 msgid "Ta_gs"
 msgstr "_Gairės"
 
 #. {"Message/---",			NULL, "---" },
-#: ../src/mainwindow.c:716
+#: ../src/mainwindow.c:718
 msgid "Re-_edit"
 msgstr "Vėl re_daguoti"
 
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:719 ../src/messageview.c:311 ../src/mimeview.c:1027
+#: ../src/mainwindow.c:721 ../src/messageview.c:311 ../src/mimeview.c:1027
 msgid "Check signature"
 msgstr "Tikrinti parašą"
 
-#: ../src/mainwindow.c:724 ../src/messageview.c:315
+#: ../src/mainwindow.c:726 ../src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "Siuntėją įtraukti į adresų _knygą"
 
-#: ../src/mainwindow.c:726
+#: ../src/mainwindow.c:728
 msgid "C_ollect addresses"
 msgstr "Surinkti adresus"
 
-#: ../src/mainwindow.c:727
+#: ../src/mainwindow.c:729
 msgid "From current _folder..."
 msgstr "iš _veikiamojo aplanko..."
 
-#: ../src/mainwindow.c:728
+#: ../src/mainwindow.c:730
 msgid "From selected _messages..."
 msgstr "iš pasirinktų _laiškų..."
 
-#: ../src/mainwindow.c:731
+#: ../src/mainwindow.c:733
 msgid "_Filter all messages in folder"
 msgstr "Filtruoti visus apla_nko laiškus"
 
-#: ../src/mainwindow.c:732
+#: ../src/mainwindow.c:734
 msgid "Filter _selected messages"
 msgstr "Filtruoti pasi_rinktus laiškus"
 
-#: ../src/mainwindow.c:733
+#: ../src/mainwindow.c:735
 msgid "Run folder pr_ocessing rules"
 msgstr "Vykdyti aplankų apd_orojimo taisykles"
 
-#: ../src/mainwindow.c:735 ../src/messageview.c:318
+#: ../src/mainwindow.c:737 ../src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "_Sukurti filtro taisyklę"
 
-#: ../src/mainwindow.c:736 ../src/mainwindow.c:742 ../src/messageview.c:319
+#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/messageview.c:319
 #: ../src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automatiškai"
@@ -7561,7 +7715,7 @@ msgstr "_Automatiškai"
 #. FILTER_BY_AUTO
 #. radio SORT_BY_THREAD_DATE
 #. FILTER_BY_AUTO
-#: ../src/mainwindow.c:737 ../src/mainwindow.c:743 ../src/mainwindow.c:845
+#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/mainwindow.c:848
 #: ../src/messageview.c:320 ../src/messageview.c:326
 msgid "By _From"
 msgstr "Pagal „_Nuo“"
@@ -7569,387 +7723,392 @@ msgstr "Pagal „_Nuo“"
 #. FILTER_BY_FROM
 #. radio SORT_BY_FROM
 #. FILTER_BY_FROM
-#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/mainwindow.c:846
+#: ../src/mainwindow.c:740 ../src/mainwindow.c:746 ../src/mainwindow.c:849
 #: ../src/messageview.c:321 ../src/messageview.c:327
 msgid "By _To"
 msgstr "Pagal „_Kam“"
 
 #. FILTER_BY_TO
-#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/messageview.c:322
+#: ../src/mainwindow.c:741 ../src/mainwindow.c:747 ../src/messageview.c:322
 #: ../src/messageview.c:328
 msgid "By _Subject"
 msgstr "Pagal _temą"
 
 #. FILTER_BY_SUBJECT
-#: ../src/mainwindow.c:741 ../src/messageview.c:324 ../src/summaryview.c:432
+#: ../src/mainwindow.c:743 ../src/messageview.c:324 ../src/summaryview.c:432
 msgid "Create processing rule"
 msgstr "Sukurti apdorojimo taisyklę"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:748 ../src/messageview.c:332
+#: ../src/mainwindow.c:750 ../src/messageview.c:332
 msgid "List _URLs..."
 msgstr "_URL adresų sąrašas..."
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:755
+#: ../src/mainwindow.c:757
 msgid "Ch_eck for new messages in all folders"
 msgstr "Visuos_e aplankuose tikrinti, ar yra naujų laiškų"
 
-#: ../src/mainwindow.c:756
+#: ../src/mainwindow.c:758
 msgid "Delete du_plicated messages"
 msgstr "Šalinti besi_dubliuojančius laiškus"
 
-#: ../src/mainwindow.c:757
+#: ../src/mainwindow.c:759
 msgid "In selected folder"
 msgstr "Pasirinktame aplanke"
 
-#: ../src/mainwindow.c:758
+#: ../src/mainwindow.c:760
 msgid "In all folders"
 msgstr "Visuose aplankuose"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:761
+#: ../src/mainwindow.c:763
 msgid "E_xecute"
 msgstr "_Vykdyti"
 
-#: ../src/mainwindow.c:762
+#: ../src/mainwindow.c:764
 msgid "Exp_unge"
 msgstr "_Išvalyti"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:765
+#: ../src/mainwindow.c:767
 msgid "SSL cer_tificates"
 msgstr "SSL _liudijimai"
 
-#: ../src/mainwindow.c:769
+#: ../src/mainwindow.c:771
 msgid "Filtering Lo_g"
 msgstr "_Filtravimo žurnalas"
 
-#: ../src/mainwindow.c:771
+#: ../src/mainwindow.c:773
 msgid "Network _Log"
 msgstr "Tinklo _žurnalas"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:773
+#: ../src/mainwindow.c:775
 msgid "_Forget all session passwords"
 msgstr "Pa_miršti visus sesijos slaptažodžius"
 
 #. Configuration menu
-#: ../src/mainwindow.c:776
+#: ../src/mainwindow.c:778
 msgid "C_hange current account"
 msgstr "_Keisti veikiamąją paskyrą"
 
-#: ../src/mainwindow.c:778
+#: ../src/mainwindow.c:780
 msgid "_Preferences for current account..."
 msgstr "_Veikiamosios paskyros parinktys..."
 
-#: ../src/mainwindow.c:779
+#: ../src/mainwindow.c:781
 msgid "Create _new account..."
 msgstr "Sukurti _naują paskyrą..."
 
-#: ../src/mainwindow.c:780
+#: ../src/mainwindow.c:782
 msgid "_Edit accounts..."
 msgstr "_Redaguoti paskyras"
 
-#: ../src/mainwindow.c:783
+#: ../src/mainwindow.c:785
 msgid "P_references..."
 msgstr "_Nuostatos..."
 
-#: ../src/mainwindow.c:784
+#: ../src/mainwindow.c:786
 msgid "Pre-pr_ocessing..."
 msgstr "P_irminis apdorojimas..."
 
-#: ../src/mainwindow.c:785
+#: ../src/mainwindow.c:787
 msgid "Post-pro_cessing..."
 msgstr "G_alutinis apdorojimas..."
 
-#: ../src/mainwindow.c:786
+#: ../src/mainwindow.c:788
 msgid "_Filtering..."
 msgstr "_Filtravimas..."
 
-#: ../src/mainwindow.c:787
+#: ../src/mainwindow.c:789
 msgid "_Templates..."
 msgstr "Ša_blonai..."
 
-#: ../src/mainwindow.c:788
+#: ../src/mainwindow.c:790
 msgid "_Actions..."
 msgstr "_Veiksmai..."
 
-#: ../src/mainwindow.c:789
+#: ../src/mainwindow.c:791
 msgid "Tag_s..."
 msgstr "_Gairės"
 
 #. {"Configuration/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:791
+#: ../src/mainwindow.c:793
 msgid "Plu_gins..."
 msgstr "_Papildiniai"
 
 #. Help menu
-#: ../src/mainwindow.c:794
+#: ../src/mainwindow.c:796
 msgid "_Manual"
 msgstr "_Žinynas"
 
-#: ../src/mainwindow.c:795
+#: ../src/mainwindow.c:797
 msgid "_Online User-contributed FAQ"
 msgstr "_Naudotojų klausimai ir atsakymai"
 
-#: ../src/mainwindow.c:796
+#: ../src/mainwindow.c:798
 msgid "Icon _Legend"
 msgstr "Ženkliukų _legenda"
 
-#: ../src/mainwindow.c:798
+#: ../src/mainwindow.c:800
 msgid "Set as default client"
 msgstr "Padaryti numatytuoju klientu"
 
-#: ../src/mainwindow.c:805
+#: ../src/mainwindow.c:807
 msgid "Offline _mode"
 msgstr "_Dirbti neprisijungus"
 
 #. toggle
-#: ../src/mainwindow.c:806
+#: ../src/mainwindow.c:808
+msgid "Men_ubar"
+msgstr "Meniu juosta"
+
+#. toggle
+#: ../src/mainwindow.c:809
 msgid "_Message view"
 msgstr "_Laiško rodinys"
 
-#: ../src/mainwindow.c:808
+#: ../src/mainwindow.c:811
 msgid "Status _bar"
 msgstr "_Būsenos juosta"
 
-#: ../src/mainwindow.c:810
+#: ../src/mainwindow.c:813
 msgid "Column headers"
 msgstr "Stulpelių antraštės"
 
 #. toggle
-#: ../src/mainwindow.c:811
+#: ../src/mainwindow.c:814
 msgid "Th_read view"
 msgstr "_Gijų rodinys"
 
 #. toggle
-#: ../src/mainwindow.c:812
+#: ../src/mainwindow.c:815
 msgid "Hide read threads"
 msgstr "Slėpti skaitytas gijas"
 
 #. toggle
-#: ../src/mainwindow.c:813
+#: ../src/mainwindow.c:816
 msgid "_Hide read messages"
 msgstr "_Slėpti skaitytus laiškus"
 
 #. toggle
-#: ../src/mainwindow.c:814
+#: ../src/mainwindow.c:817
 msgid "Hide deleted messages"
 msgstr "Slėpti pašalintus laiškus"
 
 #. toggle
-#: ../src/mainwindow.c:815
+#: ../src/mainwindow.c:818
 msgid "_Fullscreen"
 msgstr "_Visame ekrane"
 
 #. toggle
-#: ../src/mainwindow.c:816 ../src/messageview.c:344
+#: ../src/mainwindow.c:819 ../src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Rodyti visas _antraštes"
 
 #. toggle
-#: ../src/mainwindow.c:817 ../src/messageview.c:345
+#: ../src/mainwindow.c:820 ../src/messageview.c:345
 msgid "_Collapse all"
 msgstr "Susk_leisti viską"
 
 #. 1 toggle
-#: ../src/mainwindow.c:818 ../src/messageview.c:346
+#: ../src/mainwindow.c:821 ../src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Suskleisti nuo _antro lygio"
 
 #. 2 toggle
-#: ../src/mainwindow.c:819 ../src/messageview.c:347
+#: ../src/mainwindow.c:822 ../src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Suskleisti nuo _trečio lygio"
 
 #. toggle_toolbar_cb
-#: ../src/mainwindow.c:823
+#: ../src/mainwindow.c:826
 msgid "Text _below icons"
 msgstr "T_ekstas po ženkliukais"
 
 #. radio TOOLBAR_BOTH
-#: ../src/mainwindow.c:824
+#: ../src/mainwindow.c:827
 msgid "Text be_side icons"
 msgstr "Te_kstas šalia ženkliukų"
 
 #. radio TOOLBAR_BOTH_HORIZ
-#: ../src/mainwindow.c:825
+#: ../src/mainwindow.c:828
 msgid "_Icons only"
 msgstr "Tik _ženkliukai"
 
 #. radio TOOLBAR_ICON
-#: ../src/mainwindow.c:826
+#: ../src/mainwindow.c:829
 msgid "_Text only"
 msgstr "Tik _tekstas"
 
 #. set_layout_cb
-#: ../src/mainwindow.c:833
+#: ../src/mainwindow.c:836
 msgid "_Standard"
 msgstr "_Standartinis"
 
 #. radio NORMAL_LAYOUT
-#: ../src/mainwindow.c:834
+#: ../src/mainwindow.c:837
 msgid "_Three columns"
 msgstr "_Trimis stulpeliais"
 
 #. radio VERTICAL_LAYOUT
-#: ../src/mainwindow.c:835
+#: ../src/mainwindow.c:838
 msgid "_Wide message"
 msgstr "_Platus laiškas"
 
 #. radio WIDE_LAYOUT
-#: ../src/mainwindow.c:836
+#: ../src/mainwindow.c:839
 msgid "W_ide message list"
 msgstr "Platus _laiškų sąrašas"
 
 #. radio WIDE_MSGLIST_LAYOUT
-#: ../src/mainwindow.c:837
+#: ../src/mainwindow.c:840
 msgid "S_mall screen"
 msgstr "_Mažas ekranas"
 
 #. sort_summary_cb
-#: ../src/mainwindow.c:841
+#: ../src/mainwindow.c:844
 msgid "By _number"
 msgstr "pagal n_umerį"
 
 #. radio SORT_BY_NUMBER
-#: ../src/mainwindow.c:842
+#: ../src/mainwindow.c:845
 msgid "By s_ize"
 msgstr "pagal _dydį"
 
 #. radio SORT_BY_SIZE
-#: ../src/mainwindow.c:843
+#: ../src/mainwindow.c:846
 msgid "By _date"
 msgstr "pagal d_atą"
 
 #. radio SORT_BY_DATE
-#: ../src/mainwindow.c:844
+#: ../src/mainwindow.c:847
 msgid "By thread date"
 msgstr "pagal gijos datą"
 
 #. radio SORT_BY_TO
-#: ../src/mainwindow.c:847
+#: ../src/mainwindow.c:850
 msgid "By s_ubject"
 msgstr "Pagal _temą"
 
 #. radio SORT_BY_SUBJECT
-#: ../src/mainwindow.c:848
+#: ../src/mainwindow.c:851
 msgid "By _color label"
 msgstr "pagal spa_lvos etiketę"
 
 #. radio SORT_BY_LABEL
-#: ../src/mainwindow.c:849
+#: ../src/mainwindow.c:852
 msgid "By tag"
 msgstr "Bet gairę"
 
 #. radio SORT_BY_TAGS
-#: ../src/mainwindow.c:850
+#: ../src/mainwindow.c:853
 msgid "By _mark"
 msgstr "pagal žy_mę"
 
 #. radio SORT_BY_MARK
-#: ../src/mainwindow.c:851
+#: ../src/mainwindow.c:854
 msgid "By _status"
 msgstr "pagal _būseną"
 
 #. radio SORT_BY_STATUS
-#: ../src/mainwindow.c:852
+#: ../src/mainwindow.c:855
 msgid "By a_ttachment"
 msgstr "pagal p_riedą"
 
 #. radio SORT_BY_MIME
-#: ../src/mainwindow.c:853
+#: ../src/mainwindow.c:856
 msgid "By score"
 msgstr "pagal įvertį"
 
 #. radio SORT_BY_SCORE
-#: ../src/mainwindow.c:854
+#: ../src/mainwindow.c:857
 msgid "By locked"
 msgstr "pagal užrakinimą"
 
 #. radio SORT_BY_LOCKED
-#: ../src/mainwindow.c:855
+#: ../src/mainwindow.c:858
 msgid "D_on't sort"
 msgstr "_Nerikiuoti"
 
 #. sort_summary_type_cb
-#: ../src/mainwindow.c:859
+#: ../src/mainwindow.c:862
 msgid "Ascending"
 msgstr "Didėjančiai"
 
 #. radio SORT_ASCENDING
-#: ../src/mainwindow.c:860
+#: ../src/mainwindow.c:863
 msgid "Descending"
 msgstr "Mažėjančiai"
 
-#: ../src/mainwindow.c:901 ../src/messageview.c:388
+#: ../src/mainwindow.c:904 ../src/messageview.c:388
 msgid "_Auto detect"
 msgstr "_Automatiškai aptikti"
 
-#: ../src/mainwindow.c:1298 ../src/summaryview.c:6236
+#: ../src/mainwindow.c:1301 ../src/summaryview.c:6236
 msgid "Apply tags..."
 msgstr "Pritaikyti gaires..."
 
-#: ../src/mainwindow.c:1936
+#: ../src/mainwindow.c:1943
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 "Įvyko tam tikrų klaidų. Norėdami peržiūrėti žurnalą, spragtelėkite čia."
 
-#: ../src/mainwindow.c:1951
+#: ../src/mainwindow.c:1958
 msgid "You are online. Click the icon to go offline"
 msgstr "Esate prisijungę. Norėdami atsijungti, spragtelėkite ženkliuką"
 
-#: ../src/mainwindow.c:1954
+#: ../src/mainwindow.c:1961
 msgid "You are offline. Click the icon to go online"
 msgstr "Esate atsijungę Norėdami prisijungti, spragtelėkite ženkliuką"
 
-#: ../src/mainwindow.c:1968
+#: ../src/mainwindow.c:1975
 msgid "Select account"
 msgstr "Pasirinkti paskyrą"
 
 #. init log instances data before creating log views
 #. Protocol log
-#: ../src/mainwindow.c:1995 ../src/prefs_logging.c:140
+#: ../src/mainwindow.c:2002 ../src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Tinklo žurnalas"
 
-#: ../src/mainwindow.c:1999
+#: ../src/mainwindow.c:2006
 msgid "Filtering/Processing debug log"
 msgstr "Filtravimo / apdorojimo žurnalas"
 
-#: ../src/mainwindow.c:2018 ../src/prefs_logging.c:392
+#: ../src/mainwindow.c:2025 ../src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "filtravimo žurnalas įgalintas\n"
 
-#: ../src/mainwindow.c:2020 ../src/prefs_logging.c:394
+#: ../src/mainwindow.c:2027 ../src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "filtravimo žurnalas uždraustas\n"
 
-#: ../src/mainwindow.c:2460 ../src/mainwindow.c:2467 ../src/mainwindow.c:2510
-#: ../src/mainwindow.c:2543 ../src/mainwindow.c:2575 ../src/mainwindow.c:2620
+#: ../src/mainwindow.c:2470 ../src/mainwindow.c:2477 ../src/mainwindow.c:2520
+#: ../src/mainwindow.c:2553 ../src/mainwindow.c:2585 ../src/mainwindow.c:2630
 #: ../src/plugins/notification/notification_trayicon.c:360
-#: ../src/prefs_folder_item.c:1065
+#: ../src/plugins/rssyl/opml_import.c:73 ../src/prefs_folder_item.c:1065
 msgid "Untitled"
 msgstr "Be vardo"
 
-#: ../src/mainwindow.c:2621 ../src/prefs_summary_open.c:114
+#: ../src/mainwindow.c:2631 ../src/prefs_summary_open.c:114
 msgid "none"
 msgstr "nieko"
 
-#: ../src/mainwindow.c:2878 ../src/mainwindow.c:2882
+#: ../src/mainwindow.c:2888 ../src/mainwindow.c:2892
 msgid "Delete all messages in trash folders?"
 msgstr "Pašalinti visus laiškus šiukšlinės aplankuose?"
 
-#: ../src/mainwindow.c:2879
+#: ../src/mainwindow.c:2889
 msgid "Don't quit"
 msgstr "Neišeiti"
 
-#: ../src/mainwindow.c:2908 ../src/plugins/mailmbox/plugin_gtk.c:189
+#: ../src/mainwindow.c:2918 ../src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Pridėti pašto dėžutę"
 
-#: ../src/mainwindow.c:2909
+#: ../src/mainwindow.c:2919
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7959,18 +8118,18 @@ msgstr ""
 "Jei nurodoma esama pašto dėžutė, ji\n"
 "bus išanalizuota automatiškai."
 
-#: ../src/mainwindow.c:2915 ../src/plugins/mailmbox/plugin_gtk.c:196
-#: ../src/plugins/rssyl/rssyl_gtk.c:158
+#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:196
+#: ../src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Pašto dėžutė „%s“ jau yra."
 
-#: ../src/mainwindow.c:2920 ../src/plugins/mailmbox/plugin_gtk.c:202
+#: ../src/mainwindow.c:2930 ../src/plugins/mailmbox/plugin_gtk.c:202
 #: ../src/setup.c:52 ../src/wizard.c:741
 msgid "Mailbox"
 msgstr "Pašto dėžutė"
 
-#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:209
+#: ../src/mainwindow.c:2935 ../src/plugins/mailmbox/plugin_gtk.c:209
 #: ../src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
@@ -7980,45 +8139,45 @@ msgstr ""
 "Nepavyko sukurti pašto dėžutės.\n"
 "Galbūt kai kurios rinkmenos jau yra arba jūs neturite leidimo ten rašyti."
 
-#: ../src/mainwindow.c:3377
+#: ../src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "Siųsti neleidžiama"
 
-#: ../src/mainwindow.c:3955
+#: ../src/mainwindow.c:3965
 msgid "Mbox import has failed."
 msgstr "Nepavyko importuoti mbox."
 
-#: ../src/mainwindow.c:3964 ../src/mainwindow.c:3973
+#: ../src/mainwindow.c:3974 ../src/mainwindow.c:3983
 msgid "Export to mbox has failed."
 msgstr "Nepavyko eksportuoti mbox."
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit"
 msgstr "Baigti"
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit Claws Mail?"
 msgstr "Baigti darbą su Claws Mail programa?"
 
-#: ../src/mainwindow.c:4205
+#: ../src/mainwindow.c:4215
 msgid "Folder synchronisation"
 msgstr "Aplankų sinchronizavimas"
 
-#: ../src/mainwindow.c:4206
+#: ../src/mainwindow.c:4216
 msgid "Do you want to synchronise your folders now?"
 msgstr "Sinchronizuoti aplankus dabar?"
 
-#: ../src/mainwindow.c:4207
+#: ../src/mainwindow.c:4217
 msgid "+_Synchronise"
 msgstr "+_Sinchronizuoti"
 
-#: ../src/mainwindow.c:4636
+#: ../src/mainwindow.c:4659
 msgid "Deleting duplicated messages..."
 msgstr "Šalinami besidubliuojantys laiškai..."
 
-#: ../src/mainwindow.c:4673
+#: ../src/mainwindow.c:4696
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -8026,36 +8185,36 @@ msgstr[0] "Pašalintas %d besiduliuojantis laiškas %d aplanke(-uose).\n"
 msgstr[1] "Pašalinti %d besiduliuojantys laiškai %d aplanke(-uose).\n"
 msgstr[2] "Pašalinta %d besiduliuojančių laiškų %d aplanke(-uose).\n"
 
-#: ../src/mainwindow.c:4928 ../src/summaryview.c:5725
+#: ../src/mainwindow.c:4951 ../src/summaryview.c:5725
 msgid "Processing rules to apply before folder rules"
 msgstr "Apdorojimo taisyklės taikomos prieš aplankų taisykles"
 
-#: ../src/mainwindow.c:4936
+#: ../src/mainwindow.c:4959
 msgid "Processing rules to apply after folder rules"
 msgstr "Apdorojimo taisyklės taikomos po aplankų taisyklių"
 
-#: ../src/mainwindow.c:4944 ../src/summaryview.c:5736
+#: ../src/mainwindow.c:4967 ../src/summaryview.c:5736
 msgid "Filtering configuration"
 msgstr "Filtravimo konfigūracija"
 
-#: ../src/mainwindow.c:5059
+#: ../src/mainwindow.c:5082
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Nepavyksta įregistruoti kaip pagrindinio kliento: neįmanoma gauti vykdomojo "
 "kelio."
 
-#: ../src/mainwindow.c:5118
+#: ../src/mainwindow.c:5141
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail įregistruotas kaip pagrindinis klientas."
 
-#: ../src/mainwindow.c:5120
+#: ../src/mainwindow.c:5143
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Nepavyksta įregistruoti kaip pagrindinio kliento: neįmanoma rašyti į "
 "registrą."
 
-#: ../src/mainwindow.c:5278
+#: ../src/mainwindow.c:5301
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8063,56 +8222,56 @@ msgstr[0] "Užmirštas %d slaptažodis %d paskyroje(-se).\n"
 msgstr[1] "Užmiršti %d slaptažodžiai %d paskyroje(-se).\n"
 msgstr[2] "Užmiršta %d slaptažodžių %d paskyroje(-se).\n"
 
-#: ../src/matcher.c:209 ../src/matcher.c:210 ../src/matcher.c:211
-#: ../src/matcher.c:212 ../src/matcher.c:213 ../src/matcher.c:214
-#: ../src/matcher.c:215
+#: ../src/matcher.c:211 ../src/matcher.c:212 ../src/matcher.c:213
+#: ../src/matcher.c:214 ../src/matcher.c:215 ../src/matcher.c:216
+#: ../src/matcher.c:217
 #, c-format
 msgid "%s header"
 msgstr "Antraštė „%s“"
 
-#: ../src/matcher.c:216
+#: ../src/matcher.c:218
 msgid "header"
 msgstr "antraštė"
 
-#: ../src/matcher.c:217
+#: ../src/matcher.c:219
 msgid "header line"
 msgstr "antraštės eilutė"
 
-#: ../src/matcher.c:218
+#: ../src/matcher.c:220
 msgid "body line"
 msgstr "pagrindinės laiško dalies eilutė"
 
-#: ../src/matcher.c:219
+#: ../src/matcher.c:221
 msgid "tag"
 msgstr "gairė"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553 ../src/message_search.c:205 ../src/prefs_matcher.c:739
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555 ../src/message_search.c:205 ../src/prefs_matcher.c:742
 #: ../src/summary_search.c:466
 msgid "Case sensitive"
 msgstr "Skirti didžiąsias ir mažąsias raides"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555
 msgid "Case insensitive"
 msgstr "Neskirti didžiųjų ir mažųjų raidžių"
 
-#: ../src/matcher.c:1818
+#: ../src/matcher.c:1843
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "tikrinama, ar laiškas atitinka [ %s ]\n"
 
-#: ../src/matcher.c:1887 ../src/matcher.c:1906 ../src/matcher.c:1919
+#: ../src/matcher.c:1912 ../src/matcher.c:1931 ../src/matcher.c:1944
 msgid "message matches\n"
 msgstr "laiškas atitinka\n"
 
-#: ../src/matcher.c:1894 ../src/matcher.c:1912 ../src/matcher.c:1921
+#: ../src/matcher.c:1919 ../src/matcher.c:1937 ../src/matcher.c:1946
 msgid "message does not match\n"
 msgstr "laiškas neatitinka\n"
 
-#: ../src/matcher.c:2184 ../src/matcher.c:2185 ../src/matcher.c:2186
-#: ../src/matcher.c:2187 ../src/matcher.c:2188 ../src/matcher.c:2189
-#: ../src/matcher.c:2190 ../src/matcher.c:2191
+#: ../src/matcher.c:2209 ../src/matcher.c:2210 ../src/matcher.c:2211
+#: ../src/matcher.c:2212 ../src/matcher.c:2213 ../src/matcher.c:2214
+#: ../src/matcher.c:2215 ../src/matcher.c:2216
 msgid "(none)"
 msgstr "(nieko)"
 
@@ -8141,8 +8300,8 @@ msgstr "Perrašyti mbox rinkmeną"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Rinkmena jau yra. Perrašyti ją?"
 
-#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1843
-#: ../src/prefs_themes.c:555 ../src/textview.c:3075
+#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1844
+#: ../src/prefs_themes.c:555 ../src/textview.c:3054
 msgid "Overwrite"
 msgstr "Perrašyti"
 
@@ -8232,7 +8391,7 @@ msgstr ""
 msgid "Fetching message (%s)..."
 msgstr "Gaunamas laiškas (%s)"
 
-#: ../src/messageview.c:1357 ../src/procmime.c:1004
+#: ../src/messageview.c:1357 ../src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Nepavyksta iššifruoti: %s"
@@ -8242,9 +8401,9 @@ msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Laiškas neatitinka MIME standarto. Jis gali būti blogai atvaizduojamas."
 
-#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1996
-#: ../src/plugins/fancy/fancy_viewer.c:667 ../src/summaryview.c:4808
-#: ../src/summaryview.c:4811 ../src/textview.c:3063
+#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1997
+#: ../src/plugins/fancy/fancy_viewer.c:669 ../src/summaryview.c:4808
+#: ../src/summaryview.c:4811 ../src/textview.c:3042
 msgid "Save as"
 msgstr "Įrašyti kaip"
 
@@ -8339,18 +8498,16 @@ msgid "Return Receipt Notification"
 msgstr "Pranešimas apie laiško gavimą"
 
 #: ../src/messageview.c:2095
-#, fuzzy
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
 "Please choose which account you want to use for sending the receipt "
 "notification:"
 msgstr ""
-"Laiškas buvo siųstas į keletą jūsų paskyrų.\n"
-"Pasirinkite paskyrą, kurią norite naudoti siųsdami pranešimą apie gautą "
-"laišką."
+"Laiškas buvo siųstas adresu, sutampančiu jūsų paskyros adresu.\n"
+"Pasirinkite paskyrą, į kurią norite gauti pranešimą apie gautą laišką."
 
-#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_gtk.c:494
+#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_feed_props.c:533
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
@@ -8387,20 +8544,20 @@ msgstr ""
 "  Laiškas perkeltas į šiukšlinę ar kitą aplanką"
 
 #: ../src/messageview.c:2971 ../src/messageview.c:2977
-#: ../src/summaryview.c:4191 ../src/summaryview.c:6964
+#: ../src/summaryview.c:4193 ../src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "Apmokant įvyko klaida.\n"
 
-#: ../src/mh.c:432
+#: ../src/mh.c:438
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "nepavyksta nukopijuoti laiško %s į %s\n"
 
-#: ../src/mh.c:518
+#: ../src/mh.c:524
 msgid "Moving messages..."
 msgstr "Laiškai perkeliami..."
 
-#: ../src/mh.c:662 ../src/plugins/mailmbox/mailmbox_folder.c:839
+#: ../src/mh.c:668 ../src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Laiškai šalinami..."
 
@@ -8476,12 +8633,12 @@ msgstr ""
 "spustelėkite ženkliuką."
 
 #: ../src/mimeview.c:1079
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
 "Baigėsi parašo tikrinimui skirtas laikas. Norėdami tikrinti iš naujo, "
-"spustelėkite ženkliuką."
+"spustelėkite ženkliuką arba „%s“."
 
 #: ../src/mimeview.c:1319
 msgid "Checking signature..."
@@ -8491,32 +8648,32 @@ msgstr "Tikrinamas parašas..."
 msgid "Go back to email"
 msgstr "Grįžti prie laiško"
 
-#: ../src/mimeview.c:1762 ../src/mimeview.c:1851 ../src/mimeview.c:2043
-#: ../src/mimeview.c:2079 ../src/mimeview.c:2191
-#: ../src/plugins/fancy/fancy_viewer.c:420
+#: ../src/mimeview.c:1763 ../src/mimeview.c:1852 ../src/mimeview.c:2044
+#: ../src/mimeview.c:2080 ../src/mimeview.c:2192
+#: ../src/plugins/fancy/fancy_viewer.c:422
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nepavyksta įrašyti daugiadalio laiško dalies: %s"
 
-#: ../src/mimeview.c:1840 ../src/textview.c:3073
+#: ../src/mimeview.c:1841 ../src/textview.c:3052
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Perrašyti esamą rinkmeną „%s“?"
 
-#: ../src/mimeview.c:1882 ../src/plugins/archive/archiver_prefs.c:128
+#: ../src/mimeview.c:1883 ../src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
 msgstr "Pasirinkite paskirties aplanką"
 
-#: ../src/mimeview.c:1889 ../src/plugins/archive/archiver_prefs.c:134
+#: ../src/mimeview.c:1890 ../src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "„%s“ nėra aplankas."
 
-#: ../src/mimeview.c:2126 ../src/mimeview.c:2133 ../src/textview.c:2994
+#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2973
 msgid "Open with"
 msgstr "Atverti su"
 
-#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2995
+#: ../src/mimeview.c:2128 ../src/mimeview.c:2135 ../src/textview.c:2974
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8525,11 +8682,11 @@ msgstr ""
 "Įveskite komandinę eilutę rinkmenos atvėrimui:\n"
 "(„%s“ bus pakeistas į rinkmenos vardą)"
 
-#: ../src/mimeview.c:2225
+#: ../src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "Vykdyti nepatikimą dvejetainę rinkmeną?"
 
-#: ../src/mimeview.c:2226
+#: ../src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8541,19 +8698,19 @@ msgstr ""
 "\n"
 "Vykdyti šią rinkmeną?"
 
-#: ../src/mimeview.c:2230
+#: ../src/mimeview.c:2231
 msgid "Run binary"
 msgstr "Vykdyti dvejetainę rinkmeną"
 
-#: ../src/mimeview.c:2529
+#: ../src/mimeview.c:2530
 msgid "Type:"
 msgstr "Tipas:"
 
-#: ../src/mimeview.c:2530 ../src/plugins/pdf_viewer/poppler_viewer.c:699
+#: ../src/mimeview.c:2531 ../src/plugins/pdf_viewer/poppler_viewer.c:699
 msgid "Size:"
 msgstr "Dydis:"
 
-#: ../src/mimeview.c:2544 ../src/plugins/vcalendar/vcalendar.c:1271
+#: ../src/mimeview.c:2545 ../src/plugins/vcalendar/vcalendar.c:1271
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1722
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1732
 msgid "Description:"
@@ -8678,7 +8835,7 @@ msgstr "Tikrai atsisakyti naujienų grupės „%s“ prenumeratos?"
 msgid "Unsubscribe newsgroup"
 msgstr "Atsisakyti naujienų grupės prenumeratos"
 
-#: ../src/news_gtk.c:268 ../src/plugins/rssyl/rssyl_gtk.c:695
+#: ../src/news_gtk.c:268
 msgid "_Unsubscribe"
 msgstr "_Atsisakyti prenumeratos"
 
@@ -8748,7 +8905,7 @@ msgstr "išjungt"
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:317
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:323
 msgid "blinking"
-msgstr ""
+msgstr "mirksėjimas"
 
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:313
 #: ../src/plugins/acpi_notifier/acpi_notifier.c:319
@@ -8792,77 +8949,66 @@ msgstr "Nešiojamojo kompiuterio LED"
 
 #: ../src/plugins/address_keeper/address_keeper.c:254
 #: ../src/plugins/attachwarner/attachwarner.c:252
-#, fuzzy
 msgid "Failed to register check before send hook"
-msgstr "Nepavyko užregistruoti apipavidalinimo pakeitimo"
+msgstr ""
 
 #: ../src/plugins/address_keeper/address_keeper.c:294
-#, fuzzy
 msgid "Keeps all recipient addresses in an addressbook folder."
-msgstr "Tik kai siuntėjas yra adresų knygoje ar jos aplanke"
+msgstr "Visus gavėjų adresus saugoti adresų knygos aplanke"
 
 #: ../src/plugins/address_keeper/address_keeper.c:335
 #: ../src/plugins/address_keeper/address_keeper.h:34
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:249
-#, fuzzy
 msgid "Address Keeper"
-msgstr "Adresas"
+msgstr "Adresų saugojimas"
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:104
-#, fuzzy
 msgid "Keep to folder"
-msgstr "Šalinti aplanką"
+msgstr "Saugoti aplanke"
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:112
 msgid "Address book path where addresses are kept"
-msgstr ""
+msgstr "Adresų knygos kelias, kuriame saugomi adresai"
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:114
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:234
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:201
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:447
 #: ../src/prefs_filtering_action.c:573 ../src/prefs_filtering_action.c:580
-#: ../src/prefs_matcher.c:676
+#: ../src/prefs_matcher.c:679
 msgid "Select..."
 msgstr "Pasirinkti ..."
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:130
-#, fuzzy
 msgid "Keep 'To' addresses"
-msgstr "Asmeniniai adresai"
+msgstr "Išsaugoti gavėjų („Kam“) adresus"
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:135
-#, fuzzy
 msgid "Keep addresses which appear in 'To' headers"
-msgstr "visi adresai visose antraštėse"
+msgstr ""
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:140
-#, fuzzy
 msgid "Keep 'Cc' addresses"
-msgstr "Surinkti adresus"
+msgstr "Išsaugoti slaptos kopijos adresus"
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:145
-#, fuzzy
 msgid "Keep addresses which appear in 'Cc' headers"
-msgstr "visi adresai visose antraštėse"
+msgstr ""
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:150
-#, fuzzy
 msgid "Keep 'Bcc' addresses"
-msgstr "Surinkti adresus"
+msgstr ""
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:155
-#, fuzzy
 msgid "Keep addresses which appear in 'Bcc' headers"
-msgstr "visi adresai visose antraštėse"
+msgstr ""
 
 #: ../src/plugins/address_keeper/address_keeper_prefs.c:160
-#, fuzzy
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line):"
 msgstr ""
-"Įspėti, kai atitinka šį reguliarųjį reiškinį:\n"
-"(viena eilutė – vienas reiškinys)"
+"Neįtraukti adresų, kurie atitinka šį reguliarųjį reiškinį (viena eilutė – "
+"vienas reiškinys):"
 
 #: ../src/plugins/archive/archiver.c:43
 #: ../src/plugins/archive/archiver_prefs.c:93
@@ -8918,36 +9064,36 @@ msgstr "Norėdami sustabdyti archyvavimą, spauskite „Atšaukti“"
 msgid "Archiving:"
 msgstr "Archyvavimas:"
 
-#: ../src/plugins/archive/archiver_gtk.c:506
+#: ../src/plugins/archive/archiver_gtk.c:507
 msgid "Folder and archive must be selected"
 msgstr "Reikia pasirinkti aplanką ir archyvą"
 
-#: ../src/plugins/archive/archiver_gtk.c:515
+#: ../src/plugins/archive/archiver_gtk.c:516
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s: jau yra. Vis tiek tęsti?"
 
-#: ../src/plugins/archive/archiver_gtk.c:518
+#: ../src/plugins/archive/archiver_gtk.c:519
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: nuoroda. Negalima tęsti"
 
-#: ../src/plugins/archive/archiver_gtk.c:521
+#: ../src/plugins/archive/archiver_gtk.c:522
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: katalogas. Negalima tęsti"
 
-#: ../src/plugins/archive/archiver_gtk.c:524
+#: ../src/plugins/archive/archiver_gtk.c:525
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: nepakanka leidimų. Negalima tęsti"
 
-#: ../src/plugins/archive/archiver_gtk.c:527
+#: ../src/plugins/archive/archiver_gtk.c:528
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: nežinoma klaida. Negalima tęsti"
 
-#: ../src/plugins/archive/archiver_gtk.c:564
+#: ../src/plugins/archive/archiver_gtk.c:565
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -8956,7 +9102,7 @@ msgstr ""
 "Netinkamas rinkmenos vardas:\n"
 "%s."
 
-#: ../src/plugins/archive/archiver_gtk.c:577
+#: ../src/plugins/archive/archiver_gtk.c:578
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -8965,7 +9111,7 @@ msgstr ""
 "Netinkamas Claws Mail aplankas:\n"
 "%s."
 
-#: ../src/plugins/archive/archiver_gtk.c:606
+#: ../src/plugins/archive/archiver_gtk.c:607
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -8980,191 +9126,191 @@ msgstr ""
 "\n"
 "Vistiek tęsti?"
 
-#: ../src/plugins/archive/archiver_gtk.c:710
+#: ../src/plugins/archive/archiver_gtk.c:711
 msgid "Archive result"
 msgstr "Archyvavimo rezultatas"
 
-#: ../src/plugins/archive/archiver_gtk.c:740
+#: ../src/plugins/archive/archiver_gtk.c:741
 msgid "Values"
 msgstr "Reikšmės"
 
-#: ../src/plugins/archive/archiver_gtk.c:749
+#: ../src/plugins/archive/archiver_gtk.c:750
 msgid "Archive"
 msgstr "Archyvas"
 
-#: ../src/plugins/archive/archiver_gtk.c:755
+#: ../src/plugins/archive/archiver_gtk.c:756
 msgid "Archive format"
 msgstr "Archyvo formatas"
 
-#: ../src/plugins/archive/archiver_gtk.c:762
+#: ../src/plugins/archive/archiver_gtk.c:763
 msgid "Compression method"
 msgstr "Glaudinimo metodas"
 
-#: ../src/plugins/archive/archiver_gtk.c:770
+#: ../src/plugins/archive/archiver_gtk.c:771
 msgid "Number of files"
 msgstr "Rinkmenų skaičius"
 
-#: ../src/plugins/archive/archiver_gtk.c:778
+#: ../src/plugins/archive/archiver_gtk.c:779
 msgid "Archive Size"
 msgstr "Dydis suglaudinus"
 
-#: ../src/plugins/archive/archiver_gtk.c:786
+#: ../src/plugins/archive/archiver_gtk.c:787
 msgid "Folder Size"
 msgstr "Aplanko dydis"
 
-#: ../src/plugins/archive/archiver_gtk.c:795
+#: ../src/plugins/archive/archiver_gtk.c:796
 msgid "Compression level"
 msgstr "Glaudinimo lygis"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:718
 #: ../src/prefs_folder_item.c:514
 msgid "Yes"
 msgstr "Taip"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:721
 #: ../src/prefs_folder_item.c:513 ../src/prefs_summaries.c:369
 msgid "No"
 msgstr "Ne"
 
-#: ../src/plugins/archive/archiver_gtk.c:803
+#: ../src/plugins/archive/archiver_gtk.c:804
 msgid "MD5 checksum"
 msgstr "MD5 kontrolinė suma"
 
-#: ../src/plugins/archive/archiver_gtk.c:811
+#: ../src/plugins/archive/archiver_gtk.c:812
 msgid "Descriptive names"
 msgstr "Aprašas"
 
-#: ../src/plugins/archive/archiver_gtk.c:819
+#: ../src/plugins/archive/archiver_gtk.c:820
 msgid "Delete selected files"
 msgstr "Šalinti pasirinktas rinkmenas"
 
-#: ../src/plugins/archive/archiver_gtk.c:828
-#: ../src/plugins/archive/archiver_gtk.c:1210
+#: ../src/plugins/archive/archiver_gtk.c:829
+#: ../src/plugins/archive/archiver_gtk.c:1211
 msgid "Select mails before"
 msgstr "Pirma pasirinkite laiškus"
 
-#: ../src/plugins/archive/archiver_gtk.c:904
+#: ../src/plugins/archive/archiver_gtk.c:905
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Nurodykite archyvo vardą [prievardis turi reikšti archyvo tipą, pvz., .tgz]"
 
-#: ../src/plugins/archive/archiver_gtk.c:952
+#: ../src/plugins/archive/archiver_gtk.c:953
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld iš %ld"
 
-#: ../src/plugins/archive/archiver_gtk.c:991
+#: ../src/plugins/archive/archiver_gtk.c:992
 msgid "Create Archive"
 msgstr "Sukurti archyvą"
 
-#: ../src/plugins/archive/archiver_gtk.c:1006
+#: ../src/plugins/archive/archiver_gtk.c:1007
 msgid "Enter Archiver arguments"
 msgstr "Archyvo argumentų įvedimas"
 
-#: ../src/plugins/archive/archiver_gtk.c:1019
+#: ../src/plugins/archive/archiver_gtk.c:1020
 msgid "Folder to archive"
 msgstr "Archyvuotinas aplankas"
 
-#: ../src/plugins/archive/archiver_gtk.c:1026
+#: ../src/plugins/archive/archiver_gtk.c:1027
 msgid "Folder which is the root of the archive"
 msgstr "Aplankas, kuris būtų archyvo šaknimi"
 
-#: ../src/plugins/archive/archiver_gtk.c:1031
+#: ../src/plugins/archive/archiver_gtk.c:1032
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr "Spauskite, jei norite pasirinkti aplanką, kuris archyve būtų šakninis"
 
-#: ../src/plugins/archive/archiver_gtk.c:1037
+#: ../src/plugins/archive/archiver_gtk.c:1038
 msgid "Name for archive"
 msgstr "Archyvo vardas"
 
-#: ../src/plugins/archive/archiver_gtk.c:1043
+#: ../src/plugins/archive/archiver_gtk.c:1044
 msgid "Archive location and name"
 msgstr "Archyvo vieta ir vardas"
 
-#: ../src/plugins/archive/archiver_gtk.c:1045
+#: ../src/plugins/archive/archiver_gtk.c:1046
 #: ../src/plugins/archive/archiver_prefs.c:198
 #: ../src/plugins/pgpcore/select-keys.c:422
 msgid "_Select"
 msgstr "_Pasirinkti"
 
-#: ../src/plugins/archive/archiver_gtk.c:1048
+#: ../src/plugins/archive/archiver_gtk.c:1049
 msgid "Click this button to select a name and location for the archive"
 msgstr "Spauskite, jei norite nurodyti archyvo vietą ir vardą"
 
-#: ../src/plugins/archive/archiver_gtk.c:1050
+#: ../src/plugins/archive/archiver_gtk.c:1051
 msgid "Choose compression"
 msgstr "Glaudinimo pasirinkimas"
 
-#: ../src/plugins/archive/archiver_gtk.c:1063
+#: ../src/plugins/archive/archiver_gtk.c:1064
 msgid "Choose this option to use ZIP compression for the archive"
 msgstr "Šią parinktį rinkitės, jei norite kurti ZIP archyvą"
 
-#: ../src/plugins/archive/archiver_gtk.c:1070
+#: ../src/plugins/archive/archiver_gtk.c:1071
 msgid "Choose this option to use BZIP2 compression for the archive"
 msgstr "Šią parinktį rinkitės, jei norite kurti BZIP2 archyvą"
 
-#: ../src/plugins/archive/archiver_gtk.c:1078
+#: ../src/plugins/archive/archiver_gtk.c:1079
 msgid "Choose this to use Compress compression for your archive"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1086
+#: ../src/plugins/archive/archiver_gtk.c:1087
 msgid "Choose this option to disable compression for the archive"
 msgstr "Šią parinktį rinkitės, jei archyvo nenorite glaudinti"
 
-#: ../src/plugins/archive/archiver_gtk.c:1108
+#: ../src/plugins/archive/archiver_gtk.c:1109
 msgid "Choose format"
 msgstr "Formato pasirinkimas"
 
-#: ../src/plugins/archive/archiver_gtk.c:1121
+#: ../src/plugins/archive/archiver_gtk.c:1122
 msgid "Choose this option to use TAR as format for the archive"
 msgstr "Šią parinktį rinkitės, jei norite kurti TAR archyvą"
 
-#: ../src/plugins/archive/archiver_gtk.c:1128
+#: ../src/plugins/archive/archiver_gtk.c:1129
 msgid "Choose this to use SHAR as format for the archive"
 msgstr "Rinkitės, jei norite kurti SHAR archyvą"
 
-#: ../src/plugins/archive/archiver_gtk.c:1135
+#: ../src/plugins/archive/archiver_gtk.c:1136
 msgid "Choose this option to use CPIO as format for the archive"
 msgstr "Šią parinktį rinkitės, jei norite kurti CPIO archyvą"
 
-#: ../src/plugins/archive/archiver_gtk.c:1142
+#: ../src/plugins/archive/archiver_gtk.c:1143
 msgid "Choose this option to use PAX as format for the archive"
 msgstr "Šią parinktį rinkitės, jei norite kurti PAX archyvą"
 
-#: ../src/plugins/archive/archiver_gtk.c:1162
+#: ../src/plugins/archive/archiver_gtk.c:1163
 msgid "Miscellaneous options"
 msgstr "Įvairios parinktys"
 
-#: ../src/plugins/archive/archiver_gtk.c:1171
+#: ../src/plugins/archive/archiver_gtk.c:1172
 msgid "_Recursive"
 msgstr "_Rekursyviai"
 
-#: ../src/plugins/archive/archiver_gtk.c:1175
+#: ../src/plugins/archive/archiver_gtk.c:1176
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Šią parinktį rinkitės, jei į archyvą norite įtraukti poaplankius"
 
-#: ../src/plugins/archive/archiver_gtk.c:1177
+#: ../src/plugins/archive/archiver_gtk.c:1178
 msgid "_MD5sum"
 msgstr "_MD5 kontrolinė suma"
 
-#: ../src/plugins/archive/archiver_gtk.c:1181
+#: ../src/plugins/archive/archiver_gtk.c:1182
 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"
 "will take to create the archive"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1185
+#: ../src/plugins/archive/archiver_gtk.c:1186
 msgid "R_ename"
 msgstr "Per_vadinti"
 
-#: ../src/plugins/archive/archiver_gtk.c:1189
+#: ../src/plugins/archive/archiver_gtk.c:1190
 #: ../src/plugins/archive/archiver_prefs.c:333
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9172,17 +9318,17 @@ msgid ""
 "Names will be truncated to max 96 characters"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1197
+#: ../src/plugins/archive/archiver_gtk.c:1198
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
 msgstr ""
 
-#: ../src/plugins/archive/archiver_gtk.c:1201
+#: ../src/plugins/archive/archiver_gtk.c:1202
 msgid "Selection options"
 msgstr "Pasirinkimo parinktys"
 
-#: ../src/plugins/archive/archiver_gtk.c:1217
+#: ../src/plugins/archive/archiver_gtk.c:1218
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9273,23 +9419,89 @@ msgstr "Pervadinti"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Šią parinktį rinkitės, jei sukūrus archyvą norite pašalinti laiškus"
 
-#: ../src/plugins/attachwarner/attachwarner.c:216
-#, c-format
-msgid ""
-"An attachment is mentioned in the mail you're sending, but no file was "
-"attached. Mention appears on line %d, which begins with text: <span weight="
-"\"bold\">%.20s</span>...\n"
-"\n"
-"%s it anyway?"
-msgstr ""
+#: ../src/plugins/att_remover/att_remover.c:299
+msgid "<b>Type: </b>"
+msgstr "<b>Tipas: </b>"
 
-#: ../src/plugins/attachwarner/attachwarner.c:220
-msgid "Attachment warning"
-msgstr "Įspėjimas apie priedus"
+#: ../src/plugins/att_remover/att_remover.c:300
+msgid "<b>Size: </b>"
+msgstr "<b>Dydis: </b>"
 
-#: ../src/plugins/attachwarner/attachwarner.c:245
-#: ../src/plugins/attachwarner/attachwarner.c:282
-#: ../src/plugins/attachwarner/attachwarner.c:334
+#: ../src/plugins/att_remover/att_remover.c:301
+msgid "<b>Filename: </b>"
+msgstr "<b>Rinkmenos vardas: </b>"
+
+#: ../src/plugins/att_remover/att_remover.c:332
+msgid "Remove attachments"
+msgstr "Pašalinti priedus"
+
+#: ../src/plugins/att_remover/att_remover.c:357
+#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
+msgid "Remove"
+msgstr "Pašalinti"
+
+#. S_COL_STATUS
+#: ../src/plugins/att_remover/att_remover.c:365
+#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
+msgid "Attachment"
+msgstr "Priedas"
+
+#: ../src/plugins/att_remover/att_remover.c:417
+msgid "Destroy attachments"
+msgstr "Panaikinti priedus"
+
+#: ../src/plugins/att_remover/att_remover.c:418
+msgid ""
+"Do you really want to remove all attachments from the selected messages?\n"
+"\n"
+"The deleted data will be unrecoverable."
+msgstr ""
+"Tikrai pasirinktuose laiškuose pašalinti visus priedus?\n"
+"\n"
+"Duomenys bus negrįžtamai pašalinti."
+
+#: ../src/plugins/att_remover/att_remover.c:479
+msgid "This message doesn't have any attachments."
+msgstr "Šiame laiške priedų nėra."
+
+#: ../src/plugins/att_remover/att_remover.c:494
+msgid "Remove attachments..."
+msgstr "Pašalinti priedus..."
+
+#: ../src/plugins/att_remover/att_remover.c:506
+#: ../src/plugins/att_remover/att_remover.c:566
+msgid "AttRemover"
+msgstr "Priedų šalinimas"
+
+#: ../src/plugins/att_remover/att_remover.c:571
+msgid ""
+"This plugin removes attachments from mails.\n"
+"\n"
+"Warning: this operation will be completely un-cancellable and the deleted "
+"attachments will be lost forever, and ever, and ever."
+msgstr ""
+
+#: ../src/plugins/att_remover/att_remover.c:595
+msgid "Attachment handling"
+msgstr "Priedų tvarkymas"
+
+#: ../src/plugins/attachwarner/attachwarner.c:216
+#, c-format
+msgid ""
+"An attachment is mentioned in the mail you're sending, but no file was "
+"attached. Mention appears on line %d, which begins with text: <span weight="
+"\"bold\">%.20s</span>...\n"
+"\n"
+"%s it anyway?"
+msgstr ""
+
+#: ../src/plugins/attachwarner/attachwarner.c:220
+msgid "Attachment warning"
+msgstr "Įspėjimas apie priedus"
+
+#: ../src/plugins/attachwarner/attachwarner.c:245
+#: ../src/plugins/attachwarner/attachwarner.c:282
+#: ../src/plugins/attachwarner/attachwarner.c:334
 msgid "Attach warner"
 msgstr "Įspėjimai apie priedus"
 
@@ -9306,22 +9518,17 @@ msgid "attach"
 msgstr "pridėti"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:85
-#, fuzzy
 msgid "One of the following regular expressions is matched (one per line):"
 msgstr ""
-"Įspėti, kai atitinka šį reguliarųjį reiškinį:\n"
-"(viena eilutė – vienas reiškinys)"
+"Atitiko vieną iš reguliariųjų reiškinių (viena eilutė – vienas reiškinys):"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:89
 msgid "Expressions are case sensitive"
-msgstr ""
+msgstr "Reguliarieji reiškiniai skiria didžiąsias ir mažąsias raides"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:96
-#, fuzzy
 msgid "Case sensitive when matching for the regular expressions in the list"
-msgstr ""
-"Įspėti, kai atitinka šį reguliarųjį reiškinį:\n"
-"(viena eilutė – vienas reiškinys)"
+msgstr "Tegu reguliarieji reiškiniai skiria didžiąsias ir mažąsias raides"
 
 #: ../src/plugins/attachwarner/attachwarner_prefs.c:114
 msgid "Lines starting with quotation marks"
@@ -9366,72 +9573,6 @@ msgstr "Išskyrus"
 msgid "Attach Warner"
 msgstr "Įspėjimai apie priedus"
 
-#: ../src/plugins/att_remover/att_remover.c:299
-msgid "<b>Type: </b>"
-msgstr ""
-
-#: ../src/plugins/att_remover/att_remover.c:300
-msgid "<b>Size: </b>"
-msgstr "<b>Dydis: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:301
-msgid "<b>Filename: </b>"
-msgstr "<b>Rinkmenos vardas: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:332
-msgid "Remove attachments"
-msgstr "Pašalinti priedus"
-
-#: ../src/plugins/att_remover/att_remover.c:357
-#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
-msgid "Remove"
-msgstr "Pašalinti"
-
-#. S_COL_STATUS
-#: ../src/plugins/att_remover/att_remover.c:365
-#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
-msgid "Attachment"
-msgstr "Priedas"
-
-#: ../src/plugins/att_remover/att_remover.c:417
-msgid "Destroy attachments"
-msgstr "Panaikinti priedus"
-
-#: ../src/plugins/att_remover/att_remover.c:418
-msgid ""
-"Do you really want to remove all attachments from the selected messages?\n"
-"\n"
-"The deleted data will be unrecoverable."
-msgstr ""
-"Tikrai pasirinktuose laiškuose pašalinti visus priedus?\n"
-"\n"
-"Duomenys bus negrįžtamai pašalinti."
-
-#: ../src/plugins/att_remover/att_remover.c:479
-msgid "This message doesn't have any attachments."
-msgstr "Šiame laiške priedų nėra."
-
-#: ../src/plugins/att_remover/att_remover.c:494
-msgid "Remove attachments..."
-msgstr "Pašalinti priedus..."
-
-#: ../src/plugins/att_remover/att_remover.c:506
-#: ../src/plugins/att_remover/att_remover.c:566
-msgid "AttRemover"
-msgstr "Priedų šalinimas"
-
-#: ../src/plugins/att_remover/att_remover.c:571
-msgid ""
-"This plugin removes attachments from mails.\n"
-"\n"
-"Warning: this operation will be completely un-cancellable and the deleted "
-"attachments will be lost forever, and ever, and ever."
-msgstr ""
-
-#: ../src/plugins/att_remover/att_remover.c:595
-msgid "Attachment handling"
-msgstr "Priedų tvarkymas"
-
 #: ../src/plugins/bogofilter/bogofilter.c:81
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:458
 msgid "Bogofilter"
@@ -9638,25 +9779,21 @@ msgid "Bsfilter"
 msgstr "Bsfilter"
 
 #: ../src/plugins/bsfilter/bsfilter.c:299
-#, fuzzy
 msgid "Bsfilter: fetching body..."
-msgstr "Bogofilter: laiškų pagrindinių dalių gavimas..."
+msgstr "Bsfilter: laiškų pagrindinių dalių gavimas..."
 
 #: ../src/plugins/bsfilter/bsfilter.c:308
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: filtruojami laiškai..."
 
 #: ../src/plugins/bsfilter/bsfilter.c:393
-#, fuzzy, c-format
+#, c-format
 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"
 "Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bsfilter with "
 "a few hundred spam and ham messages."
 msgstr ""
-"SpamAssassin papildinys negali filtruoti laiškų. Greičiausiai klaida įvyko "
-"dėl to, jog nepavyksta pasiekti spamd tarnybos. Įsitikinkite, kad spamd "
-"paleista ir pasiekiama."
 
 #: ../src/plugins/bsfilter/bsfilter.c:400
 #, c-format
@@ -9741,14 +9878,12 @@ msgid "File: %s. Size (%d) greater than limit (%d)\n"
 msgstr ""
 
 #: ../src/plugins/clamd/clamav_plugin.c:174
-#, fuzzy
 msgid "ClamAV: scanning message..."
-msgstr "Žymimi laiškai..."
+msgstr "ClamAV: skaitomi laiškai..."
 
 #: ../src/plugins/clamd/clamav_plugin.c:275
-#, fuzzy
 msgid "Failed to register mail filtering hook"
-msgstr "Nepavyko užregistruoti apipavidalinimo pakeitimo"
+msgstr ""
 
 #: ../src/plugins/clamd/clamav_plugin.c:293
 msgid ""
@@ -9801,35 +9936,34 @@ msgid "Maximum attachment size"
 msgstr "Didžiausias priedo dydis"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:268
-#, fuzzy
 msgid "Message attachments larger than this will not be scanned"
-msgstr "Didesni laiškai nebus tikrinami"
+msgstr "Didesni laiškų priedai, nei nurodyta, nebus tikrinami"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:272
 msgid "MB"
 msgstr "MB"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:281
-#, fuzzy
 msgid "Save infected mail in"
-msgstr "Laiškų įrašymas diske"
+msgstr "Nepatikimus laiškus rašyti į"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:285
 msgid "Save mail that contains viruses"
-msgstr ""
+msgstr "Laiškų, kuriuose aptikta virusų, saugojimo vieta"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:293
-#, fuzzy
 msgid ""
 "Folder for storing infected mail. Leave empty to use the default trash folder"
 msgstr ""
-"Aplankas, kuriame talpinamas brukalas. Jei paliksite tuščią, bus perkeliama "
+"Aplankas, kuriame talpinami kenkėjiška programine įranga apkrėstos rinkmenos. "
+"Jei paliksite tuščią, bus perkeliama "
 "į šiukšlinę."
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:301
-#, fuzzy
 msgid "Click this button to select a folder for storing infected mail"
-msgstr "Pasirinkti aplanką, kuriame bus laikomi abejotini laiškai."
+msgstr ""
+"Nuspaudę mygtuką, galėsite pasirinkti aplanką, kuriame bus laikomi apkrėsti "
+"laiškai."
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:309
 msgid "Automatic configuration"
@@ -9841,7 +9975,7 @@ msgstr ""
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:322
 msgid "Where is clamd.conf"
-msgstr ""
+msgstr "Kur yra clamd.conf"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:330
 msgid ""
@@ -9854,18 +9988,16 @@ msgid "Br_owse"
 msgstr "_Naršyti"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:338
-#, fuzzy
 msgid "Click this button to select full path to clamd.conf"
-msgstr "Pasirinkti aplanką, kuriame bus laikomas brukalas"
+msgstr "Mygtuką spauskite, jei norite rasti clamd.conf kelią"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:346
 msgid "Check permission for folders and adjust if necessary"
 msgstr "Tikrinti aplankų leidimus ir, jei reikia, juos pakeisti"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:359
-#, fuzzy
 msgid "Click this button to check and adjust folder permissions"
-msgstr "Pasirinkti aplanką, kuriame bus laikomas brukalas"
+msgstr "Mygtuką spauskite, jei norite patikrinti ar pakeisti aplanko leidimus"
 
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:367
 msgid "Remote Host"
@@ -9954,63 +10086,63 @@ msgid ""
 "It is not really useful."
 msgstr ""
 
-#: ../src/plugins/fancy/fancy_prefs.c:141
+#: ../src/plugins/fancy/fancy_prefs.c:146
 msgid "Display images"
 msgstr "Rodyti paveiksliukus"
 
-#: ../src/plugins/fancy/fancy_prefs.c:142
+#: ../src/plugins/fancy/fancy_prefs.c:147
 msgid "Display embedded images"
 msgstr "Rodyti įterptus paveikslus"
 
-#: ../src/plugins/fancy/fancy_prefs.c:146
+#: ../src/plugins/fancy/fancy_prefs.c:151
 msgid "Execute javascript"
 msgstr "Vykdyti Javascript"
 
-#: ../src/plugins/fancy/fancy_prefs.c:147
+#: ../src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute embedded javascript"
 msgstr ""
 
-#: ../src/plugins/fancy/fancy_prefs.c:151
+#: ../src/plugins/fancy/fancy_prefs.c:156
 msgid "Execute Java applets"
-msgstr ""
+msgstr "Vykdyti Java programėles"
 
-#: ../src/plugins/fancy/fancy_prefs.c:152
+#: ../src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute embedded Java applets"
 msgstr ""
 
-#: ../src/plugins/fancy/fancy_prefs.c:156
+#: ../src/plugins/fancy/fancy_prefs.c:161
 msgid "Render objects using plugins"
-msgstr ""
+msgstr "Objektus rodyti naudojant papildinius"
 
-#: ../src/plugins/fancy/fancy_prefs.c:157
+#: ../src/plugins/fancy/fancy_prefs.c:162
 msgid "Render embedded objects using plugins"
 msgstr ""
 
-#: ../src/plugins/fancy/fancy_prefs.c:164
+#: ../src/plugins/fancy/fancy_prefs.c:169
 msgid "Open in viewer (remote content is enabled)"
-msgstr ""
+msgstr "Atverti žiūryklėje (įgalinti nuotolinio turinio rodymą)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:167
+#: ../src/plugins/fancy/fancy_prefs.c:172
 msgid "Do nothing (remote content is disabled)"
-msgstr ""
+msgstr "Nieko nedaryti (nuotolinis turinys uždraustas)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:200
+#: ../src/plugins/fancy/fancy_prefs.c:209
 msgid "Proxy"
-msgstr ""
+msgstr "Įgaliotasis serveris"
 
-#: ../src/plugins/fancy/fancy_prefs.c:202
+#: ../src/plugins/fancy/fancy_prefs.c:211
 msgid "Use GNOME's proxy settings"
 msgstr "Naudoti GNOME įgaliotojo serverio nuostatas"
 
-#: ../src/plugins/fancy/fancy_prefs.c:210
+#: ../src/plugins/fancy/fancy_prefs.c:219
 msgid "Use proxy:"
 msgstr "Naudoti įgaliotąjį serverį"
 
-#: ../src/plugins/fancy/fancy_prefs.c:228
+#: ../src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
 msgstr "Nuotoliniai ištekliai"
 
-#: ../src/plugins/fancy/fancy_prefs.c:229
+#: ../src/plugins/fancy/fancy_prefs.c:238
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10019,115 +10151,134 @@ msgid ""
 "in the email."
 msgstr ""
 
-#: ../src/plugins/fancy/fancy_prefs.c:235
+#: ../src/plugins/fancy/fancy_prefs.c:244
 msgid "Enable loading of remote content"
 msgstr "Įgalinti nuotolinio turinio įkėlimą"
 
-#: ../src/plugins/fancy/fancy_prefs.c:267
+#: ../src/plugins/fancy/fancy_prefs.c:276
 msgid "When clicking on a link, by default:"
 msgstr ""
 
-#: ../src/plugins/fancy/fancy_prefs.c:275
+#: ../src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
 msgstr "Atverti išorinėje naršyklėje"
 
-#: ../src/plugins/fancy/fancy_viewer.c:391
-msgid "Remote content loading is disabled."
+#: ../src/plugins/fancy/fancy_prefs.c:298
+msgid "The CSS in this file will be applied to all HTML parts"
 msgstr ""
 
-#: ../src/plugins/fancy/fancy_viewer.c:468
+#: ../src/plugins/fancy/fancy_prefs.c:300
+msgid "Stylesheet:"
+msgstr "Stiliaus rinkmena:"
+
+#: ../src/plugins/fancy/fancy_prefs.c:308 ../src/prefs_account.c:1442
+#: ../src/prefs_account.c:1531 ../src/prefs_account.c:1991
+#: ../src/prefs_customheader.c:237
+msgid "Bro_wse"
+msgstr "_Naršyti"
+
+#: ../src/plugins/fancy/fancy_prefs.c:350
+msgid "Select stylesheet"
+msgstr "Pasirinkite stiliaus rinkmeną"
+
+#: ../src/plugins/fancy/fancy_viewer.c:393
+msgid "Remote content loading is disabled."
+msgstr "Nuotolinio turinio įkėlimas uždraustas."
+
+#: ../src/plugins/fancy/fancy_viewer.c:470
 msgid "Load images"
 msgstr "Įkelti paveikslėlius"
 
-#: ../src/plugins/fancy/fancy_viewer.c:470
+#: ../src/plugins/fancy/fancy_viewer.c:472
 msgid "Enable remote content"
 msgstr "Įgalinti išorinį turinį"
 
-#: ../src/plugins/fancy/fancy_viewer.c:472
+#: ../src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable Javascript"
 msgstr "Įgalinti Javascript"
 
-#: ../src/plugins/fancy/fancy_viewer.c:474
+#: ../src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Plugins"
 msgstr "Įgalinti papildinius"
 
-#: ../src/plugins/fancy/fancy_viewer.c:476
+#: ../src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Java"
 msgstr "Įgalinti Java"
 
-#: ../src/plugins/fancy/fancy_viewer.c:478
+#: ../src/plugins/fancy/fancy_viewer.c:480
 msgid "Open links with external browser"
 msgstr "Nuorodas atverti išorinėje naršyklėje"
 
-#: ../src/plugins/fancy/fancy_viewer.c:647
+#: ../src/plugins/fancy/fancy_viewer.c:649
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Įvyko klaida: %d\n"
 
-#: ../src/plugins/fancy/fancy_viewer.c:703
+#: ../src/plugins/fancy/fancy_viewer.c:705
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr ""
 
-#: ../src/plugins/fancy/fancy_viewer.c:714
+#: ../src/plugins/fancy/fancy_viewer.c:716
 msgid "Search the Web"
 msgstr "Ieškoti saityne"
 
-#: ../src/plugins/fancy/fancy_viewer.c:726
+#: ../src/plugins/fancy/fancy_viewer.c:728
 msgid "Open in Viewer"
 msgstr "Atverti žiūryklėje"
 
-#: ../src/plugins/fancy/fancy_viewer.c:728
+#: ../src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer (enable remote content)"
-msgstr ""
+msgstr "Atverti žiūryklėje (įgalinti nuotolinio turinio rodymą)"
 
-#: ../src/plugins/fancy/fancy_viewer.c:737
+#: ../src/plugins/fancy/fancy_viewer.c:739
 msgid "Open in Browser"
 msgstr "Atverti naršyklės lange"
 
-#: ../src/plugins/fancy/fancy_viewer.c:747
+#: ../src/plugins/fancy/fancy_viewer.c:749
 msgid "Open Image"
 msgstr "Atverti paveikslėlį"
 
-#: ../src/plugins/fancy/fancy_viewer.c:756
+#: ../src/plugins/fancy/fancy_viewer.c:758
 msgid "Copy Link"
 msgstr "Kopijuoti nuorodą"
 
-#: ../src/plugins/fancy/fancy_viewer.c:760
+#: ../src/plugins/fancy/fancy_viewer.c:762
 msgid "Download Link"
 msgstr "Parsiuntimo nuoroda"
 
-#: ../src/plugins/fancy/fancy_viewer.c:771
+#: ../src/plugins/fancy/fancy_viewer.c:773
 msgid "Save Image As"
 msgstr "Paveikslėlį įrašyti kaip"
 
-#: ../src/plugins/fancy/fancy_viewer.c:781
+#: ../src/plugins/fancy/fancy_viewer.c:783
 msgid "Copy Image"
 msgstr "Kopijuoti paveikslėlį"
 
-#: ../src/plugins/fancy/fancy_viewer.c:799
+#: ../src/plugins/fancy/fancy_viewer.c:801
 msgid "Import feed"
 msgstr "Importuoti kanalą"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1012
+#: ../src/plugins/fancy/fancy_viewer.c:1014
 msgid "Fancy"
 msgstr "Fancy"
 
 #. i18n: 'Fancy' here is name of the plugin, not the english word.
-#: ../src/plugins/fancy/fancy_viewer.c:1040
+#: ../src/plugins/fancy/fancy_viewer.c:1042
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML rodinys"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1045
-#, fuzzy, c-format
+#: ../src/plugins/fancy/fancy_viewer.c:1047
+#, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
 "By default all remote content is blocked. Options can be found in /"
 "Configuration/Preferences/Plugins/Fancy"
 msgstr ""
-"Šis papildinys HTML laiškus atvaizduoja naudodamas Dillo saityno naršyklę.\n"
-"\n"
-"Parinktis rasite per /Nuostatos/Nuostatos/Papildiniai/Dillo naršyklė"
+"Šis papildinys HTML laiškus atvaizduoja naudodamas WebKit %d.%d.%d "
+"biblioteką.\n"
+"Numatytuoju atveju blokuojamas visas nuotolinis turinys. "
+"Parinktis rasite per /Nuostatos/Nuostatos/Papildiniai/Fancy"
 
 #. i18n: Possible error message during plugin load
 #: ../src/plugins/fetchinfo/fetchinfo_plugin.c:151
@@ -10142,9 +10293,8 @@ msgstr ""
 
 #. i18n: Possible error message during plugin load
 #: ../src/plugins/fetchinfo/fetchinfo_plugin.c:173
-#, fuzzy
 msgid "Failed to register mail receive hook"
-msgstr "Nepavyko užregistruoti apipavidalinimo pakeitimo"
+msgstr ""
 
 #. i18n: Description seen in plugins dialog.
 #. * Translation of "Plugins" part of preferences path should to be
@@ -10166,9 +10316,8 @@ msgstr "Laiškų žymėjimas"
 
 #. i18n: Heading of a preferences section determining which headers to add
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:94
-#, fuzzy
 msgid "Add fetchinfo headers"
-msgstr "Nerodomos antraštės"
+msgstr "Pridėti informacijos apie gavimą antraštes"
 
 #. i18n: Description of a header to be added
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:101
@@ -10183,7 +10332,7 @@ msgstr "Paskyros pavadinimas"
 #. i18n: Description of a header to be added
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:105
 msgid "Receive server"
-msgstr ""
+msgstr "Gaunamų laiškų serveris"
 
 #. i18n: Description of a header to be added
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:107
@@ -10193,7 +10342,7 @@ msgstr "Naudotojo ID"
 #. i18n: Description of a header to be added
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:109
 msgid "Fetch time"
-msgstr ""
+msgstr "Laiškų parsiuntimui skirta trukmė"
 
 #: ../src/plugins/gdata/cm_gdata_contacts.c:188
 #, c-format
@@ -10270,15 +10419,14 @@ msgid "Polling interval (seconds):"
 msgstr ""
 
 #: ../src/plugins/gdata/cm_gdata_prefs.c:110
-#, fuzzy
 msgid "Maximum number of results:"
-msgstr "Didžiausias parsiunčiamų naujienų grupės laiškų skaičius"
+msgstr "Didžiausias rezultatų kiekis:"
 
 #: ../src/plugins/gdata/cm_gdata_prefs.c:146
 #: ../src/plugins/gdata/gdata_plugin.c:101
 #: ../src/plugins/gdata/gdata_plugin.c:156
 msgid "GData"
-msgstr ""
+msgstr "GData"
 
 #: ../src/plugins/gdata/gdata_plugin.c:75
 msgid ""
@@ -10291,9 +10439,8 @@ msgid "Failed to register address completion hook in the GData plugin"
 msgstr ""
 
 #: ../src/plugins/gdata/gdata_plugin.c:114
-#, fuzzy
 msgid "Failed to register offline switch hook in the GData plugin"
-msgstr "Nepavyko užregistruoti persijungimo į darbą neprisijungus"
+msgstr ""
 
 #: ../src/plugins/gdata/gdata_plugin.c:161
 msgid ""
@@ -10314,7 +10461,7 @@ msgstr "GData integracija"
 #: ../src/plugins/geolocation/geolocation_plugin.c:349
 #, c-format
 msgid "Found location: (%.2f,%.2f)"
-msgstr ""
+msgstr "Rasta vieta: (%.2f,%.2f)"
 
 #. TRANSLATORS: The country name is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:369
@@ -10323,542 +10470,529 @@ msgstr ""
 
 #. TRANSLATORS: The IP address is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:373
-#, fuzzy
 msgid "Could not resolve location of IP address "
-msgstr "Nepavyksta perskaityti adresų indekso"
+msgstr "Nepavyksta nustatyti IP adreso vietos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:512
-#, fuzzy
 msgid "Try to locate sender"
-msgstr "siuntėjo vardas"
+msgstr "Pamėginti rasti siuntėją"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:528
 msgid "Andorra"
-msgstr ""
+msgstr "Andora"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:529
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Jungtiniai Arabų Emyratai"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:530
 msgid "Afghanistan"
-msgstr ""
+msgstr "Afganistanas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:531
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "Antikva ir Barbuda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:532
 msgid "Anguilla"
-msgstr ""
+msgstr "Angilija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:533
 msgid "Albania"
-msgstr ""
+msgstr "Albanija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:534
 msgid "Armenia"
-msgstr ""
+msgstr "Armėnija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:535
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Olandijos Antilai"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:536
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:537
 msgid "Antarctica"
-msgstr ""
+msgstr "Antarkika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:538
-#, fuzzy
 msgid "Argentina"
-msgstr "Violetinė"
+msgstr "Argentina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:539
 msgid "American Samoa"
-msgstr ""
+msgstr "Šiaurės Samoa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:540
 msgid "Austria"
-msgstr ""
+msgstr "Austrija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:541
 msgid "Australia"
-msgstr ""
+msgstr "Australija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:542
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:543
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbaidžanas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:544
 msgid "Bosnia And Herzegovina"
-msgstr ""
+msgstr "Bosnija ir Hercogovina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:545
 msgid "Barbados"
-msgstr ""
+msgstr "Barbadosas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:546
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladešas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:547
 msgid "Belgium"
-msgstr ""
+msgstr "Belgija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:548
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Fasas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:549
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgarija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:550
 msgid "Bahrain"
-msgstr ""
+msgstr "Bahreinas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:551
 msgid "Burundi"
-msgstr ""
+msgstr "Burundis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:552
 msgid "Benin"
-msgstr ""
+msgstr "Beninas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:553
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermudų"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:554
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunėjus Darusalamas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:555
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolivija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:556
 msgid "Brazil"
-msgstr ""
+msgstr "Brazilija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:557
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahamai"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:558
 msgid "Bhutan"
-msgstr ""
+msgstr "Butanas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:559
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Buvė sala"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:560
 msgid "Botswana"
-msgstr ""
+msgstr "Botsvana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:561
 msgid "Belarus"
-msgstr ""
+msgstr "Gudija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:562
 msgid "Belize"
-msgstr ""
+msgstr "Belizas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:563
 msgid "Canada"
-msgstr ""
+msgstr "Kanada"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:564
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Kokosų (Kilingo) salos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:565
 msgid "Central African Republic"
-msgstr ""
+msgstr "Centrinės Afrikos Respublika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:566
 msgid "Congo"
-msgstr ""
+msgstr "Kongas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:567
 msgid "Switzerland"
-msgstr ""
+msgstr "Šveicarija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:568
 msgid "Cote D'Ivoire"
-msgstr ""
+msgstr "Dramblio kaulo krantas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:569
 msgid "Cook Islands"
-msgstr ""
+msgstr "Kuko salos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:570
 msgid "Chile"
-msgstr ""
+msgstr "Čilė"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:571
 msgid "Cameroon"
-msgstr ""
+msgstr "Kamerūnas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:572
-#, fuzzy
 msgid "China"
-msgstr "Kinų"
+msgstr "Kinija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:573
-#, fuzzy
 msgid "Colombia"
-msgstr "Spalva"
+msgstr "Kolumbija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:574
 msgid "Costa Rica"
-msgstr ""
+msgstr "Kosta Rika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:575
 msgid "Cuba"
-msgstr ""
+msgstr "Kuba"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:576
 msgid "Cape Verde"
-msgstr ""
+msgstr "Žaliasis kyšulys"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:577
 msgid "Christmas Island"
-msgstr ""
+msgstr "Kalėdų sala"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:578
 msgid "Cyprus"
-msgstr ""
+msgstr "Kipras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:579
 msgid "Czech Republic"
-msgstr ""
+msgstr "Čekijos Respublika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:580
 msgid "Germany"
-msgstr ""
+msgstr "Vokietija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:581
 msgid "Djibouti"
-msgstr ""
+msgstr "Džibutis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:582
-#, fuzzy
 msgid "Denmark"
-msgstr "Panaikinti žymėjimą"
+msgstr "Danija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:583
 msgid "Dominica"
-msgstr ""
+msgstr "Dominika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:584
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Dominikos respublika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:585
 msgid "Algeria"
-msgstr ""
+msgstr "Alžyras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:586
 msgid "Ecuador"
-msgstr ""
+msgstr "Ekvadoras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:587
 msgid "Estonia"
-msgstr ""
+msgstr "Estija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:588
 msgid "Egypt"
-msgstr ""
+msgstr "Egiptas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:589
-#, fuzzy
 msgid "Western Sahara"
-msgstr "Vakarų Europos"
+msgstr "Vakarų Sachara"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:590
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrėja"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:591
 msgid "Spain"
-msgstr ""
+msgstr "Ispanija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:592
 msgid "Ethiopia"
-msgstr ""
+msgstr "Etiopija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:593
 msgid "Finland"
-msgstr ""
+msgstr "Suomija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:594
 msgid "Fiji"
-msgstr ""
+msgstr "Fidži"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:595
 msgid "Falkland Islands (Malvinas)"
-msgstr ""
+msgstr "Folklandų salos (Malvinai)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:596
 msgid "Micronesia, Federated States Of"
-msgstr ""
+msgstr "Mikronezijos Federacinės Valstijos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:597
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Farerų salos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:598
-#, fuzzy
 msgid "France"
-msgstr "Atsisakyti"
+msgstr "Prancūzija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:599
 msgid "France, Metropolitan"
-msgstr ""
+msgstr "Žemyninė Prancūzija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:600
 msgid "Gabon"
-msgstr ""
+msgstr "Gabonas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:601
 #: ../src/plugins/geolocation/geolocation_plugin.c:747
 msgid "United Kingdom"
-msgstr ""
+msgstr "Jungtinė Karalystė"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:602
 msgid "Grenada"
-msgstr ""
+msgstr "Grenada"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:603
 msgid "Georgia"
-msgstr ""
+msgstr "Gruzija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:604
 msgid "French Guiana"
-msgstr ""
+msgstr "Prancūzų Gviana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:605
 msgid "Ghana"
-msgstr ""
+msgstr "Gana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:606
 msgid "Gibraltar"
-msgstr ""
+msgstr "Gibraltaras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:607
-#, fuzzy
 msgid "Greenland"
-msgstr "Tamsiai žalia"
+msgstr "Grenlandija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:608
 msgid "Gambia"
-msgstr ""
+msgstr "Gambija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:609
 msgid "Guinea"
-msgstr ""
+msgstr "Gvinėja"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:610
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Gvadelupa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:611
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Pusiaujo Gvinėja"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:612
-#, fuzzy
 msgid "Greece"
-msgstr "Tamsiai žalia"
+msgstr "Graikija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:613
 msgid "South Georgia And The South Sandwich Islands"
-msgstr ""
+msgstr "Pietų Džordžija ir Pietų Sandvičo salos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:614
 msgid "Guatemala"
-msgstr ""
+msgstr "Gvatemala"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:615
 msgid "Guam"
-msgstr ""
+msgstr "Guamas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:616
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Bisau Gvinėja"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:617
 msgid "Guyana"
-msgstr ""
+msgstr "Gajana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:618
 msgid "Hong Kong"
-msgstr ""
+msgstr "Honkongas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:619
 msgid "Heard Island And Mcdonald Islands"
-msgstr ""
+msgstr "Herdo sala ir Makdonaldo salos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:620
 msgid "Honduras"
-msgstr ""
+msgstr "Hondūras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:621
 msgid "Croatia"
-msgstr ""
+msgstr "Kroatija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:622
 msgid "Haiti"
-msgstr ""
+msgstr "Haitis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:623
 msgid "Hungary"
-msgstr ""
+msgstr "Vengrija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:624
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonezija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:625
 msgid "Ireland"
-msgstr ""
+msgstr "Airija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:626
 msgid "Israel"
-msgstr ""
+msgstr "Izraelis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:627
-#, fuzzy
 msgid "India"
-msgstr "Indikatorius"
+msgstr "Indija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:628
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Britanijos teritorijos Indijos vandenyne"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:629
 msgid "Iraq"
-msgstr ""
+msgstr "Irakas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:630
 msgid "Iran, Islamic Republic Of"
-msgstr ""
+msgstr "Čekijos Respublika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:631
 msgid "Iceland"
-msgstr ""
+msgstr "Islandija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:632
 msgid "Italy"
-msgstr ""
+msgstr "Italija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:633
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamaika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:634
 msgid "Jordan"
-msgstr ""
+msgstr "Jordanija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:635
-#, fuzzy
 msgid "Japan"
-msgstr "Japonų"
+msgstr "Japonija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:636
 msgid "Kenya"
-msgstr ""
+msgstr "Kenija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:637
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kirgiztanas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:638
 msgid "Cambodia"
-msgstr ""
+msgstr "Kambodža"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:639
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribatis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:640
-#, fuzzy
 msgid "Comoros"
-msgstr "rytoj"
+msgstr "Komorai"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:641
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "Sent Kitsas ir Nevis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:642
 msgid "Korea, Democratic People'S Republic Of"
-msgstr ""
+msgstr "Laoso Liaudies Demokratinė Respublika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:643
 msgid "Korea, Republic Of"
-msgstr ""
+msgstr "Čekijos Respublika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:644
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuveitas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:645
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Kaimanų salos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:646
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazachstanas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:647
 msgid "Lao People'S Democratic Republic"
-msgstr ""
+msgstr "Laoso Liaudies Demokratinė Respublika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:648
 msgid "Lebanon"
-msgstr ""
+msgstr "Libanas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:649
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Sent Martinas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:650
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Lichtenšteinas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:651
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Šri Lanka"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:652
 msgid "Liberia"
-msgstr ""
+msgstr "Liberija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:653
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesotas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:654
 msgid "Lithuania"
-msgstr ""
+msgstr "Lietuva"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:655
 msgid "Luxembourg"
-msgstr ""
+msgstr "Liuksemburgas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:656
 msgid "Latvia"
-msgstr ""
+msgstr "Latvija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:657
 msgid "Libyan Arab Jamahiriya"
@@ -10866,176 +11000,171 @@ msgstr ""
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:658
 msgid "Morocco"
-msgstr ""
+msgstr "Marokas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:659
 msgid "Monaco"
-msgstr ""
+msgstr "Monakas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:660
 msgid "Moldova, Republic Of"
-msgstr ""
+msgstr "Moldovos respublika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:661
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagaskaras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:662
-#, fuzzy
 msgid "Marshall Islands"
-msgstr "Visus pažymėti skaitytais"
+msgstr "Maršalo salos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:663
 msgid "Macedonia, The Former Yugoslav Republic Of"
-msgstr ""
+msgstr "Makedonija, buvusios Jugoslavijos respublikos dalis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:664
 msgid "Mali"
-msgstr ""
+msgstr "Malis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:665
-#, fuzzy
 msgid "Myanmar"
-msgstr "Panaikinti žymėjimą"
+msgstr "Mianmaras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:666
 msgid "Mongolia"
-msgstr ""
+msgstr "Mongolija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:667
 msgid "Macao"
-msgstr ""
+msgstr "Makao"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:668
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Šiaurės Marianų salos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:669
 msgid "Martinique"
-msgstr ""
+msgstr "Martinika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:670
 msgid "Mauritania"
-msgstr ""
+msgstr "Mauritanija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:671
 msgid "Montserrat"
-msgstr ""
+msgstr "Montseratas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:672
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:673
 msgid "Mauritius"
-msgstr ""
+msgstr "Mauricijus"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:674
 msgid "Maldives"
-msgstr ""
+msgstr "Maldyvai"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:675
 msgid "Malawi"
-msgstr ""
+msgstr "Malavis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:676
 msgid "Mexico"
-msgstr ""
+msgstr "Meksika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:677
 msgid "Malaysia"
-msgstr ""
+msgstr "Malaizija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:678
 msgid "Mozambique"
-msgstr ""
+msgstr "Mozambikas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:679
 msgid "Namibia"
-msgstr ""
+msgstr "Namibija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:680
-#, fuzzy
 msgid "New Caledonia"
-msgstr "Nauji kontaktai"
+msgstr "Naujoji Kaledonija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:681
 msgid "Niger"
-msgstr ""
+msgstr "Nigeris"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:682
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Norfolko salos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:683
 msgid "Nigeria"
-msgstr ""
+msgstr "Nigerija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:684
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nikaragva"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:685
 msgid "Netherlands"
-msgstr ""
+msgstr "Olandija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:686
-#, fuzzy
 msgid "Norway"
-msgstr "Persiųsti"
+msgstr "Norvegija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:687
 msgid "Nepal"
-msgstr ""
+msgstr "Nepalas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:688
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:689
 msgid "Niue"
-msgstr ""
+msgstr "Niujė"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:690
 msgid "New Zealand"
-msgstr ""
+msgstr "Naujoji Zelandija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:691
 msgid "Oman"
-msgstr ""
+msgstr "Omanas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:692
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:693
 msgid "Peru"
-msgstr ""
+msgstr "Peru"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:694
 msgid "French Polynesia"
-msgstr ""
+msgstr "Prancūzų Polinezija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:695
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua Naujoji Gvinėja"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:696
-#, fuzzy
 msgid "Philippines"
-msgstr "linija(-omis; -ų)"
+msgstr "Filipinai"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:697
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakistanas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:698
 msgid "Poland"
-msgstr ""
+msgstr "Lenkija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:699
 msgid "Saint Pierre And Miquelon"
-msgstr ""
+msgstr "Sen Pjeras ir Mikelonas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:700
 msgid "Pitcairn"
@@ -11043,263 +11172,259 @@ msgstr ""
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:701
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Puerto Riko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:702
-#, fuzzy
 msgid "Portugal"
-msgstr "Prievadas"
+msgstr "Portugalija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:703
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:704
 msgid "Paraguay"
-msgstr ""
+msgstr "Paragvajus"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:705
 msgid "Qatar"
-msgstr ""
+msgstr "Kataras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:706
 msgid "Reunion"
-msgstr ""
+msgstr "Reunionas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:707
 msgid "Romania"
-msgstr ""
+msgstr "Rumunija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:708
 msgid "Russian Federation"
-msgstr ""
+msgstr "Rusijos Federacija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:709
 msgid "Rwanda"
-msgstr ""
+msgstr "Ruanda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:710
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Saudo Arabija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:711
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Saliamono salos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:712
 msgid "Seychelles"
-msgstr ""
+msgstr "Seišeliai"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:713
 msgid "Sudan"
-msgstr ""
+msgstr "Sudanas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:714
 msgid "Sweden"
-msgstr ""
+msgstr "Švedija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:715
 msgid "Singapore"
-msgstr ""
+msgstr "Singapūras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:716
 msgid "Saint Helena"
-msgstr ""
+msgstr "Šv. Elenos sala"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:717
 msgid "Slovenia"
-msgstr ""
+msgstr "Slovėnija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:718
 msgid "Svalbard And Jan Mayen"
-msgstr ""
+msgstr "Svalbardas ir Jan Mayenas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:719
 msgid "Slovakia"
-msgstr ""
+msgstr "Slovakija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:720
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Siera Leonė"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:721
 msgid "San Marino"
-msgstr ""
+msgstr "San Marinas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:722
 msgid "Senegal"
-msgstr ""
+msgstr "Senegalas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:723
 msgid "Somalia"
-msgstr ""
+msgstr "Somalis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:724
-#, fuzzy
 msgid "Suriname"
-msgstr "SMTP naudotojo vardas:"
+msgstr "Surinamas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:725
 msgid "Sao Tome And Principe"
-msgstr ""
+msgstr "San Tomė ir Prinsipė"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:726
 msgid "El Salvador"
-msgstr ""
+msgstr "Salvadoras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:727
 msgid "Syrian Arab Republic"
-msgstr ""
+msgstr "Sirijos Arabų Respublika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:728
 msgid "Swaziland"
-msgstr ""
+msgstr "Svazilandas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:729
 msgid "Turks And Caicos Islands"
-msgstr ""
+msgstr "Terkso ir Kaiko salos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:730
 msgid "Chad"
-msgstr ""
+msgstr "Čadas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:731
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Prancūzų pietinės teritorijos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:732
 msgid "Togo"
-msgstr ""
+msgstr "Togas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:733
-#, fuzzy
 msgid "Thailand"
-msgstr "Tajų"
+msgstr "Tailandas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:734
 msgid "Tajikistan"
-msgstr ""
+msgstr "Tadžikistanas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:735
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:736
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkmėnistanas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:737
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunisas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:738
 msgid "Tonga"
-msgstr ""
+msgstr "Tongas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:739
 msgid "East Timor"
-msgstr ""
+msgstr "Rytų Timoras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:740
 msgid "Turkey"
-msgstr ""
+msgstr "Turkija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:741
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "Trinidadas ir Tobagas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:742
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:743
 msgid "Taiwan, Province Of China"
-msgstr ""
+msgstr "Taivanis. Kinijos provincija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:744
 msgid "Tanzania, United Republic Of"
-msgstr ""
+msgstr "Tanzanijos Respublika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:745
 msgid "Ukraine"
-msgstr ""
+msgstr "Ukraina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:746
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:748
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "Jungtinės Valstijos Mažosios Užjūrio Teritorijos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:749
 msgid "United States"
-msgstr ""
+msgstr "Jungtinės Amerikos Valstijos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:750
 msgid "Uruguay"
-msgstr ""
+msgstr "Urugvajus"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:751
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekistanas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:752
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Šventasis Sostas (Vatikano miestas valstybė)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:753
 msgid "Saint Vincent And The Grenadines"
-msgstr ""
+msgstr "Šv. Vincentas ir Grenadinai"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:754
 msgid "Venezuela"
-msgstr ""
+msgstr "Venesuela"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:755
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "Britanijos Mergelių salos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:756
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "Britanijos Mergelių salos."
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:757
-#, fuzzy
 msgid "Viet Nam"
-msgstr "Rinkmenos vardas"
+msgstr "Vietnamas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:758
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:759
 msgid "Wallis And Futuna"
-msgstr ""
+msgstr "Valis ir Futuna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:760
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:761
 msgid "Yemen"
-msgstr ""
+msgstr "Jemenas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:762
 msgid "Mayotte"
-msgstr ""
+msgstr "Majotas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:763
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "Serbija ir Montenegras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:764
 msgid "South Africa"
-msgstr ""
+msgstr "Pietų Afrika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:765
 msgid "Zambia"
-msgstr ""
+msgstr "Zambija"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:766
 msgid "Democratic Republic Of The Congo"
@@ -11307,29 +11432,27 @@ msgstr ""
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:767
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabvė"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:777
 #: ../src/plugins/geolocation/geolocation_plugin.c:862
-#, fuzzy
 msgid "GeoLocation"
-msgstr "Vieta:"
+msgstr "Geografinė padėtis:"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:782
-#, fuzzy, c-format
+#, c-format
 msgid "Could not initialize clutter"
-msgstr "Nepavyksta paruošti %s rašybos tikrintuvės"
+msgstr ""
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:788
 #: ../src/plugins/geolocation/geolocation_plugin.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create regular expression: %s\n"
-msgstr "Nepavyksta sukurti laikinosios rinkmenos: %s"
+msgstr "Nepavyksta sukurti reguliariojo reiškinio: %s\n"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:803
-#, fuzzy
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-msgstr "Pranešimų papildinyje nepavyko užregistruoti apipavidalinimo pakeitimo"
+msgstr ""
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:867
 msgid ""
@@ -11349,37 +11472,33 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:900
-#, fuzzy
 msgid "GeoLocation integration"
-msgstr "GData integracija"
+msgstr "GeoLocation integracija"
 
-#: ../src/plugins/libravatar/libravatar.c:374
-#: ../src/plugins/libravatar/libravatar.c:445
-#: ../src/plugins/libravatar/libravatar.c:505
-#: ../src/plugins/libravatar/libravatar_prefs.c:400
+#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:452
+#: ../src/plugins/libravatar/libravatar.c:512
+#: ../src/plugins/libravatar/libravatar_prefs.c:440
 msgid "Libravatar"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar.c:381
-#, fuzzy
+#: ../src/plugins/libravatar/libravatar.c:388
 msgid "Failed to register avatar header update hook"
-msgstr "Nepavyko užregistruoti apipavidalinimo pakeitimo"
+msgstr ""
 
-#: ../src/plugins/libravatar/libravatar.c:389
-#, fuzzy
+#: ../src/plugins/libravatar/libravatar.c:396
 msgid "Failed to register avatar image render hook"
-msgstr "Nepavyko užregistruoti apipavidalinimo pakeitimo"
+msgstr ""
 
-#: ../src/plugins/libravatar/libravatar.c:394
-#, fuzzy
+#: ../src/plugins/libravatar/libravatar.c:401
 msgid "Failed to create avatar image cache directory"
-msgstr "Nepavyko sukurti katalogą"
+msgstr "Nepavyko sukurti psudoportretų podėlio katalogo"
 
-#: ../src/plugins/libravatar/libravatar.c:403
+#: ../src/plugins/libravatar/libravatar.c:410
 msgid "Failed to load missing items cache"
-msgstr ""
+msgstr "Nepavyko įkelti trūkstamų įrašų podėlio"
 
-#: ../src/plugins/libravatar/libravatar.c:455
+#: ../src/plugins/libravatar/libravatar.c:462
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -11395,109 +11514,126 @@ msgid ""
 "Feedback to <ricardo at mones.org> is welcome.\n"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:112
+#: ../src/plugins/libravatar/libravatar_prefs.c:138
 msgid "_Use cached icons"
 msgstr "_Naudoti podėlio ženkliukus"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:113
+#: ../src/plugins/libravatar/libravatar_prefs.c:139
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:121
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
 msgid "Cache refresh interval"
 msgstr "Podėlio atnaujinimo intervalas"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:123
-#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:333
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
+#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:335
 msgid "hours"
 msgstr "val."
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:188
+#: ../src/plugins/libravatar/libravatar_prefs.c:207
 msgid "Mystery man"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:189
+#: ../src/plugins/libravatar/libravatar_prefs.c:208
 msgid "Identicon"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:190
+#: ../src/plugins/libravatar/libravatar_prefs.c:209
 msgid "MonsterID"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:191
+#: ../src/plugins/libravatar/libravatar_prefs.c:210
 msgid "Wavatar"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:192
+#: ../src/plugins/libravatar/libravatar_prefs.c:211
 msgid "Retro"
-msgstr ""
+msgstr "Retro"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:193
+#: ../src/plugins/libravatar/libravatar_prefs.c:212
 msgid "Custom URL"
 msgstr "Savitas URL"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:196
+#: ../src/plugins/libravatar/libravatar_prefs.c:215
 msgid "A blank image"
 msgstr "Tuščias paveikslas"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:197
+#: ../src/plugins/libravatar/libravatar_prefs.c:216
 msgid "The unobtrusive low-contrast greyish silhouette"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:198
+#: ../src/plugins/libravatar/libravatar_prefs.c:217
 msgid "A generated geometric pattern"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:199
+#: ../src/plugins/libravatar/libravatar_prefs.c:218
 msgid "A generated full-body monster"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:200
+#: ../src/plugins/libravatar/libravatar_prefs.c:219
 msgid "A generated almost unique face"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:201
+#: ../src/plugins/libravatar/libravatar_prefs.c:220
 msgid "A generated 8-bit arcade-style pixelated image"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:202
-#, fuzzy
+#: ../src/plugins/libravatar/libravatar_prefs.c:221
 msgid "Redirect to a user provided URL"
-msgstr "naudotojo pateiktam argumentui"
+msgstr "Nukreipti į naudotojo pateiktą URL"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:229 ../src/prefs_themes.c:878
+#: ../src/plugins/libravatar/libravatar_prefs.c:248 ../src/prefs_themes.c:878
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:256
+#: ../src/plugins/libravatar/libravatar_prefs.c:276
 msgid "_Allow redirects to other sites"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:257
+#: ../src/plugins/libravatar/libravatar_prefs.c:277
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:266
+#: ../src/plugins/libravatar/libravatar_prefs.c:286
 msgid "_Enable federated servers"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:267
+#: ../src/plugins/libravatar/libravatar_prefs.c:287
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr ""
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:312
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+msgid "Request timeout"
+msgstr "Užklausai skirtasis laikas baigėsi"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+#: ../src/plugins/notification/notification_prefs.c:1028
+#: ../src/plugins/notification/notification_prefs.c:1300
+#: ../src/plugins/notification/notification_prefs.c:1608
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
+#: ../src/prefs_summaries.c:496
+msgid "seconds"
+msgstr "sek."
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:305
+msgid ""
+"Set to 0 to use global socket I/O timeout. Maximum value must be also less "
+"than global socket I/O timeout."
+msgstr ""
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:349
 msgid "Icon cache"
 msgstr "ženkliukų podėlis"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:316
-#, fuzzy
+#: ../src/plugins/libravatar/libravatar_prefs.c:353
 msgid "Default missing icon mode"
-msgstr "Numatytasis glaudinimas"
+msgstr "Numatytoji trūkstamų ženkliukų veiksena"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:320
+#: ../src/plugins/libravatar/libravatar_prefs.c:357
 msgid "Network"
 msgstr "Tinklas"
 
@@ -11507,18 +11643,17 @@ msgstr "laiškų aplankas (etPan!)"
 
 #: ../src/plugins/mailmbox/plugin.c:63
 msgid "This is a plugin to handle mailboxes in mbox format."
-msgstr ""
+msgstr "Šis papildinys apdoroja mbox formato pašto dėžutes."
 
 #: ../src/plugins/mailmbox/plugin.c:84
 msgid "MBOX"
-msgstr ""
+msgstr "MBOX"
 
 #: ../src/plugins/mailmbox/plugin_gtk.c:86
 msgid "mbox (etPan!)..."
-msgstr ""
+msgstr "mbox (etPan!)..."
 
 #: ../src/plugins/mailmbox/plugin_gtk.c:190
-#, fuzzy
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -11529,19 +11664,17 @@ msgstr ""
 "bus išanalizuota automatiškai."
 
 #: ../src/plugins/mailmbox/plugin_gtk.c:322
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "All folder(s) and message(s) under '%s' will be deleted.\n"
 "Do you really want to delete?"
 msgstr ""
 "Visi aplankai ir laiškai, esantys „%s“ aplanke, bus negrįžtamai pašalinti. "
-"Jų nebus įmanoma atkurti.\n"
-"\n"
 "Tikrai pašalinti?"
 
 #: ../src/plugins/newmail/newmail.c:111 ../src/plugins/newmail/newmail.c:162
 msgid "NewMail"
-msgstr ""
+msgstr "Naujas laiškas"
 
 #: ../src/plugins/newmail/newmail.c:116
 msgid "Failed to register newmail hook"
@@ -11614,9 +11747,8 @@ msgid "Failed to register msginfo update hook in the Notification plugin"
 msgstr ""
 
 #: ../src/plugins/notification/notification_plugin.c:256
-#, fuzzy
 msgid "Failed to register offline switch hook in the Notification plugin"
-msgstr "Nepavyko užregistruoti persijungimo į darbą neprisijungus"
+msgstr ""
 
 #: ../src/plugins/notification/notification_plugin.c:267
 msgid "Failed to register main window close hook in the Notification plugin"
@@ -11688,9 +11820,8 @@ msgstr "Gautas nežinomo tipo pranešimas"
 
 #: ../src/plugins/notification/notification_popup.c:381
 #: ../src/plugins/notification/notification_trayicon.c:644
-#, fuzzy
 msgid "Present main window"
-msgstr "Atverti naujame _lange"
+msgstr "Atverti naujame lange"
 
 #: ../src/plugins/notification/notification_popup.c:491
 msgid "Mail message"
@@ -11930,15 +12061,7 @@ msgstr "Įgalinti iškylantį langą"
 #: ../src/plugins/notification/notification_prefs.c:1018
 #: ../src/plugins/notification/notification_prefs.c:1599
 msgid "Popup timeout:"
-msgstr ""
-
-#: ../src/plugins/notification/notification_prefs.c:1028
-#: ../src/plugins/notification/notification_prefs.c:1300
-#: ../src/plugins/notification/notification_prefs.c:1608
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
-#: ../src/prefs_summaries.c:496
-msgid "seconds"
-msgstr "sek."
+msgstr "Iškylančio lango rodymo laikas:"
 
 #. Sticky check button
 #: ../src/plugins/notification/notification_prefs.c:1057
@@ -11947,11 +12070,11 @@ msgstr ""
 
 #: ../src/plugins/notification/notification_prefs.c:1067
 msgid "Set popup window width and position"
-msgstr ""
+msgstr "Iškylančio lango plotis ir padėtis"
 
 #: ../src/plugins/notification/notification_prefs.c:1072
 msgid "(the window manager is free to ignore this)"
-msgstr ""
+msgstr "(langų tvarkyklė šią informaciją gali ignoruoti)"
 
 #: ../src/plugins/notification/notification_prefs.c:1120
 #: ../src/plugins/notification/notification_prefs.c:1611
@@ -11985,9 +12108,8 @@ msgid "Enable LCD"
 msgstr "Įgalinti LCD"
 
 #: ../src/plugins/notification/notification_prefs.c:1416
-#, fuzzy
 msgid "Hostname:Port of LCDd server:"
-msgstr "spamd serverio pagrindinio kompiuterio vardas arba IP adresas"
+msgstr ""
 
 #. Enable trayicon
 #: ../src/plugins/notification/notification_prefs.c:1501
@@ -12052,11 +12174,11 @@ msgstr ""
 
 #: ../src/plugins/notification/notification_prefs.c:1894
 msgid "<control><shift>F11"
-msgstr ""
+msgstr "<Vald><Lyg2>F11"
 
 #: ../src/plugins/notification/notification_prefs.c:1894
 msgid "<alt>N"
-msgstr "<alt>N"
+msgstr "<Alt>N"
 
 #. toggle mainwindow
 #: ../src/plugins/notification/notification_prefs.c:1905
@@ -12143,7 +12265,7 @@ msgstr[2] ""
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Title:"
-msgstr ""
+msgstr "Pavadinimas:"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:703
 msgid "Author:"
@@ -12194,13 +12316,12 @@ msgstr "iš %d"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1359
 msgid "PDF rendering failed for an unknown reason."
-msgstr ""
+msgstr "Dėl neaiškių priežasčių nepavyko atvaizduoti PDF."
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1722
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1940
-#, fuzzy
 msgid "Document Index"
-msgstr "Dokumentacijos komanda"
+msgstr "Dokumento turinys"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1908
 msgid "First Page"
@@ -12284,9 +12405,8 @@ msgid "Edit perl filter rules (ext)..."
 msgstr ""
 
 #: ../src/plugins/pgpcore/autocompletion.c:125
-#, fuzzy
 msgid "Failed to register PGP address autocompletion hook"
-msgstr "Nepavyko užregistruoti apipavidalinimo pakeitimo"
+msgstr ""
 
 #: ../src/plugins/pgpcore/passphrase.c:86
 #: ../src/plugins/pgpcore/prefs_gpg.c:116
@@ -12535,12 +12655,12 @@ msgid "Undefined"
 msgstr "Neapibrėžta"
 
 #: ../src/plugins/pgpcore/select-keys.c:241
-#: ../src/plugins/pgpcore/sgpgme.c:146
+#: ../src/plugins/pgpcore/sgpgme.c:146 ../src/plugins/pgpcore/sgpgme.c:162
 msgid "Marginal"
 msgstr ""
 
 #: ../src/plugins/pgpcore/select-keys.c:247
-#: ../src/plugins/pgpcore/sgpgme.c:150
+#: ../src/plugins/pgpcore/sgpgme.c:150 ../src/plugins/pgpcore/sgpgme.c:166
 msgid "Ultimate"
 msgstr ""
 
@@ -12573,12 +12693,12 @@ msgid "Enter another user or key ID:"
 msgstr "Įveskite kitą naudotoją arba rakto ID:"
 
 #: ../src/plugins/pgpcore/select-keys.c:606
-#, fuzzy, c-format
+#, c-format
 msgid "Encrypt to %s <%s>"
-msgstr "Užšifruoti nepavyko, %s"
+msgstr "Užšifruoti kaip %s <%s>"
 
 #: ../src/plugins/pgpcore/select-keys.c:607
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
 "If you choose to encrypt the message with this key, you don't\n"
@@ -12591,6 +12711,9 @@ msgstr ""
 "Raktas nėra visiškai patikimas.\n"
 "Jei užšifruosite laišką šiuo raktu, negalėsite būti tikri,\n"
 "kad jis nukeliaus būtent norimam žmogui.\n"
+"\n"
+"Informacija apie raktą: ID %s, pirminė tapatybė %s <%s>\n"
+"\n"
 "Ar pakankamai pasitikite tuo parašu, kad jį vis tiek naudotumėte?"
 
 #: ../src/plugins/pgpcore/sgpgme.c:80 ../src/privacy.c:249
@@ -12598,145 +12721,153 @@ msgstr ""
 msgid "No signature found"
 msgstr "Nerasta jokio parašo"
 
-#: ../src/plugins/pgpcore/sgpgme.c:184 ../src/plugins/pgpcore/sgpgme.c:203
+#: ../src/plugins/pgpcore/sgpgme.c:160
+msgid "Untrusted"
+msgstr "Nepatikimas"
+
+#: ../src/plugins/pgpcore/sgpgme.c:200 ../src/plugins/pgpcore/sgpgme.c:219
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Parašo negalima patikrinti - %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:188 ../src/plugins/pgpcore/sgpgme.c:192
-#: ../src/plugins/pgpcore/sgpgme.c:245
+#: ../src/plugins/pgpcore/sgpgme.c:204 ../src/plugins/pgpcore/sgpgme.c:208
+#: ../src/plugins/pgpcore/sgpgme.c:249
 msgid "The signature has not been checked."
 msgstr "Parašas nepatikrintas"
 
-#: ../src/plugins/pgpcore/sgpgme.c:198 ../src/plugins/pgpcore/sgpgme.c:200
+#: ../src/plugins/pgpcore/sgpgme.c:214 ../src/plugins/pgpcore/sgpgme.c:216
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:215
+#: ../src/plugins/pgpcore/sgpgme.c:228
 #, c-format
 msgid "Good signature from %s."
 msgstr "Geras „%s“ parašas"
 
-#: ../src/plugins/pgpcore/sgpgme.c:222
-#, c-format
-msgid "Good signature (untrusted) from %s."
-msgstr "Geras (bet nepatikimas) „%s“ parašas"
-
-#: ../src/plugins/pgpcore/sgpgme.c:227
+#: ../src/plugins/pgpcore/sgpgme.c:231
 #, c-format
 msgid "Expired signature from %s."
 msgstr "Nebegaliojantis „%s“ parašas."
 
-#: ../src/plugins/pgpcore/sgpgme.c:230
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:234
+#, c-format
 msgid "Good signature from %s, but the key has expired."
-msgstr "Geras „%s“ parašas"
+msgstr "Geras „%s“ parašas, tačiau raktas nebegalioja."
 
-#: ../src/plugins/pgpcore/sgpgme.c:233
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:237
+#, c-format
 msgid "Good signature from %s, but the key has been revoked."
-msgstr "Geras „%s“ parašas"
+msgstr "Geras „%s“ parašas, bet raktas atšauktas."
 
-#: ../src/plugins/pgpcore/sgpgme.c:236
+#: ../src/plugins/pgpcore/sgpgme.c:240
 #, c-format
 msgid "Bad signature from %s."
 msgstr "Blogas „%s“ parašas."
 
-#: ../src/plugins/pgpcore/sgpgme.c:240
+#: ../src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Neturima 0x%s rakto parašo patikrinimui."
 
-#: ../src/plugins/pgpcore/sgpgme.c:264
+#: ../src/plugins/pgpcore/sgpgme.c:268
 #, c-format
 msgid "Error checking signature: no status\n"
 msgstr "Parašo tikrinimo klaida: jokios būsenos\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:283
+#: ../src/plugins/pgpcore/sgpgme.c:287
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Parašo tikrinimo klaida: %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:302
+#: ../src/plugins/pgpcore/sgpgme.c:306
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Parašas sukurtas %s naudojant %s raktą ID %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:308
+#: ../src/plugins/pgpcore/sgpgme.c:312
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Geras uid „%s“ parašas (patikimumas: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:313
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:317
+#, c-format
 msgid "Expired key uid \"%s\"\n"
-msgstr "Nebegaliojantis „%s“ raktas."
+msgstr "Nebegaliojantis „%s“ raktas\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:318
+#: ../src/plugins/pgpcore/sgpgme.c:322
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Nebegaliojantis uid „%s“ parašas (patikimumas: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:323
+#: ../src/plugins/pgpcore/sgpgme.c:327
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:328
+#: ../src/plugins/pgpcore/sgpgme.c:332
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Blogas „%s“ parašas\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:339
+#: ../src/plugins/pgpcore/sgpgme.c:343
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                    uid „%s“ (patikimumas: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:346
+#: ../src/plugins/pgpcore/sgpgme.c:345
+msgid "Revoked"
+msgstr "Atšauktas"
+
+#: ../src/plugins/pgpcore/sgpgme.c:349
+#, c-format
+msgid "Owner Trust: %s\n"
+msgstr "Savininkas patikimas: %s\n"
+
+#: ../src/plugins/pgpcore/sgpgme.c:352
 msgid "Primary key fingerprint:"
 msgstr "Pirminio rakto kontrolinis kodas:"
 
-#: ../src/plugins/pgpcore/sgpgme.c:364
+#: ../src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:370
+#: ../src/plugins/pgpcore/sgpgme.c:376
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr ""
 
-#: ../src/plugins/pgpcore/sgpgme.c:412
+#: ../src/plugins/pgpcore/sgpgme.c:410
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Nepavyksta iš laiško gauti duomenų, %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:428
+#: ../src/plugins/pgpcore/sgpgme.c:426
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Nepavyksta paruošti duomenų, %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:583
+#: ../src/plugins/pgpcore/sgpgme.c:581
 msgid "Secret key specification is ambiguous"
 msgstr "Asmeninio rakto specifikacija yra neaiški"
 
-#: ../src/plugins/pgpcore/sgpgme.c:593
+#: ../src/plugins/pgpcore/sgpgme.c:591
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Nerastas asmeninis raktas (%s)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:606
+#: ../src/plugins/pgpcore/sgpgme.c:604
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Klaida nustatant asmeninį raktą: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:690
+#: ../src/plugins/pgpcore/sgpgme.c:688
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme protokolas „%s“ yra netinkamas: variklis „%s“ neįdiegtas tinkamai."
 
-#: ../src/plugins/pgpcore/sgpgme.c:696
+#: ../src/plugins/pgpcore/sgpgme.c:694
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12745,12 +12876,12 @@ msgstr ""
 "Gpgme protokolas „%s“ yra netinkamas: yra įdiegta variklio „%s“ versija %s, "
 "bet reikia %s versijos.\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:704
+#: ../src/plugins/pgpcore/sgpgme.c:702
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme protokolas „%s“ yra netinkamas (nežinoma problema)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:720
+#: ../src/plugins/pgpcore/sgpgme.c:718
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12758,7 +12889,7 @@ msgstr ""
 "GnuPG nėra tinkamai įdiegtas arba jį reikia atnaujinti.\n"
 "OpenPGP palaikymas uždraustas."
 
-#: ../src/plugins/pgpcore/sgpgme.c:754
+#: ../src/plugins/pgpcore/sgpgme.c:752
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12766,11 +12897,11 @@ msgstr ""
 "Prieš kurdami naują raktų porą, turite įrašyti paskyros informaciją "
 "nuspausdami mygtuką „Gerai“.\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:759
+#: ../src/plugins/pgpcore/sgpgme.c:757
 msgid "No PGP key found"
 msgstr "PGP raktų nerasta"
 
-#: ../src/plugins/pgpcore/sgpgme.c:760
+#: ../src/plugins/pgpcore/sgpgme.c:758
 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"
@@ -12780,12 +12911,12 @@ msgstr ""
 "gauti užšifruotųjų.\n"
 "Norėtumėte dabar sukurti naują raktų porą?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:830 ../src/plugins/pgpcore/sgpgme.c:846
+#: ../src/plugins/pgpcore/sgpgme.c:828 ../src/plugins/pgpcore/sgpgme.c:844
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Nepavyksta sukurti naujos raktų poros: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:837
+#: ../src/plugins/pgpcore/sgpgme.c:835
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12793,11 +12924,11 @@ msgstr ""
 "Kuriama nauja raktų pora... Tam, kad būtų surinkta daugiau atsitiktinių "
 "duomenų, judinkite pelę..."
 
-#: ../src/plugins/pgpcore/sgpgme.c:852
+#: ../src/plugins/pgpcore/sgpgme.c:850
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Nepavyksta sukurti naujos raktų poros: nežinoma klaida"
 
-#: ../src/plugins/pgpcore/sgpgme.c:856
+#: ../src/plugins/pgpcore/sgpgme.c:854
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12810,19 +12941,19 @@ msgstr ""
 "\n"
 "Eksportuoti į raktų serverį?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:860
+#: ../src/plugins/pgpcore/sgpgme.c:858
 msgid "Key generated"
 msgstr "Raktas sukurtas"
 
-#: ../src/plugins/pgpcore/sgpgme.c:899
+#: ../src/plugins/pgpcore/sgpgme.c:897
 msgid "Key exported."
 msgstr "Raktas eksportuotas"
 
-#: ../src/plugins/pgpcore/sgpgme.c:901
+#: ../src/plugins/pgpcore/sgpgme.c:899
 msgid "Couldn't export key."
 msgstr "Negalima eksportuoti rakto"
 
-#: ../src/plugins/pgpcore/sgpgme.c:905
+#: ../src/plugins/pgpcore/sgpgme.c:903
 msgid "Key export isn't implemented in Windows."
 msgstr "Raktų eksportavimas nėra realizuotas Windows sistemoje"
 
@@ -12849,7 +12980,7 @@ msgstr "Teksto nepavyksta konvertuoti į jokį normalų ženklų rinkinį."
 #: ../src/plugins/pgpinline/pgpinline.c:716
 #: ../src/plugins/pgpmime/pgpmime.c:74 ../src/plugins/pgpmime/pgpmime.c:184
 #: ../src/plugins/pgpmime/pgpmime.c:330 ../src/plugins/pgpmime/pgpmime.c:510
-#: ../src/plugins/pgpmime/pgpmime.c:655 ../src/plugins/smime/smime.c:415
+#: ../src/plugins/pgpmime/pgpmime.c:651 ../src/plugins/smime/smime.c:415
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Nepavyksta inicijuoti GPG konteksto, %s"
@@ -12946,19 +13077,19 @@ msgstr ""
 "nei laiško antraštės, pvz., tema."
 
 #: ../src/plugins/pgpinline/pgpinline.c:670
-#: ../src/plugins/pgpmime/pgpmime.c:665
+#: ../src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Nepavyksta pridėti GPG rakto %s, %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:698
-#: ../src/plugins/pgpmime/pgpmime.c:694
+#: ../src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Nepavyksta sukurti laikinosios rinkmenos, %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:729
-#: ../src/plugins/pgpmime/pgpmime.c:721
+#: ../src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Užšifruoti nepavyko, %s"
@@ -13003,7 +13134,11 @@ msgstr "Nepavyksta išnagrinėti iššifruotos rinkmenos dalių."
 msgid "Couldn't create temporary file: %s"
 msgstr "Nepavyksta sukurti laikinosios rinkmenos: %s"
 
-#: ../src/plugins/pgpmime/pgpmime.c:621
+#: ../src/plugins/pgpmime/pgpmime.c:595
+msgid "OpenPGP digital signature"
+msgstr ""
+
+#: ../src/plugins/pgpmime/pgpmime.c:617
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -13011,7 +13146,7 @@ msgstr ""
 "Atminkite, kad laiškų antraštės, pvz. tema, nėra užšifruojamos naudojant PGP/"
 "Mime sistemą."
 
-#: ../src/plugins/pgpmime/pgpmime.c:793
+#: ../src/plugins/pgpmime/pgpmime.c:789
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -13059,9 +13194,8 @@ msgid "Python"
 msgstr "Python"
 
 #: ../src/plugins/python/python_plugin.c:652
-#, fuzzy
 msgid "Failed to register \"compose create hook\" in the Python plugin"
-msgstr "Nepavyko užregistruoti apipavidalinimo pakeitimo"
+msgstr ""
 
 #: ../src/plugins/python/python_plugin.c:730
 msgid ""
@@ -13071,7 +13205,7 @@ msgid ""
 "\n"
 "These scripts are then available via the menu. You can assign keyboard "
 "shortcuts to them just like it is done with other menu items. You can also "
-"put buttons for script invokation into the toolbars using Claws Mail's "
+"put buttons for script invocation into the toolbars using Claws Mail's "
 "builtin toolbar editor.\n"
 "\n"
 "You can provide scripts working on the main window by placing files into ~/."
@@ -13114,154 +13248,44 @@ msgstr ""
 msgid "Python integration"
 msgstr "Python integravimas"
 
-#: ../src/plugins/rssyl/feed.c:126
-msgid "Cannot open temporary file"
-msgstr "Nepavyksta atverti laikinosios rinkmenos"
-
-#: ../src/plugins/rssyl/feed.c:137
-msgid "Cannot init libCURL"
-msgstr ""
-
-#: ../src/plugins/rssyl/feed.c:234 ../src/plugins/vcalendar/vcal_folder.c:1596
-msgid "401 (Authorisation required)"
-msgstr "401 (reikia nustatyti tapatybę)"
-
-#: ../src/plugins/rssyl/feed.c:237 ../src/plugins/vcalendar/vcal_folder.c:1599
-msgid "403 (Unauthorised)"
-msgstr "403 (neautorizuota)"
-
-#: ../src/plugins/rssyl/feed.c:240 ../src/plugins/vcalendar/vcal_folder.c:1602
-msgid "404 (Not found)"
-msgstr "404 (nerasta)"
-
-#: ../src/plugins/rssyl/feed.c:243 ../src/plugins/vcalendar/vcal_folder.c:1605
-#, c-format
-msgid "Error %ld"
-msgstr "%ld klaida"
-
-#: ../src/plugins/rssyl/feed.c:328
-#, c-format
-msgid "Fetching '%s'..."
-msgstr "Gaunama: „%s“..."
-
-#: ../src/plugins/rssyl/feed.c:387
-msgid "Malformed feed"
-msgstr ""
-
-#: ../src/plugins/rssyl/feed.c:1203
-#, c-format
-msgid "Refreshing feed '%s'..."
-msgstr ""
-
-#: ../src/plugins/rssyl/feed.c:1218
-#, c-format
-msgid ""
-"RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-"comments of '%s'"
-msgstr ""
-
-#: ../src/plugins/rssyl/feed.c:1227
-msgid "This feed format is not supported yet."
-msgstr "Šis formatas dar nepalaikomas."
-
-#: ../src/plugins/rssyl/feed.c:1258
-msgid "N/A"
-msgstr "Nepasiekimas"
-
-#: ../src/plugins/rssyl/feed.c:1378
-#, c-format
-msgid "%ld byte"
-msgid_plural "%ld bytes"
-msgstr[0] "%ld baitas"
-msgstr[1] "%ld baitai"
-msgstr[2] "%ld baitų"
-
-#: ../src/plugins/rssyl/feed.c:1381
-msgid "size unknown"
-msgstr "dydis nežinomas"
-
-#: ../src/plugins/rssyl/feed.c:1555
-#, c-format
-msgid ""
-"RSSyl: Cannot update feed %s:\n"
-"%s\n"
-msgstr ""
-
-#: ../src/plugins/rssyl/feed.c:1727
-msgid "You are already subscribed to this feed."
-msgstr ""
-
-#: ../src/plugins/rssyl/feed.c:1738
+#: ../src/plugins/rssyl/old_feeds.c:90
 #, c-format
 msgid ""
-"Couldn't fetch URL '%s':\n"
+"Couldn't read contents of old feeds.xml file:\n"
 "%s"
 msgstr ""
-"Nepavyksta atverti URL „%s“:\n"
+"Nepavyksta senos feeds.xml rinkmenos turinio:\n"
 "%s"
 
-#: ../src/plugins/rssyl/feed.c:1743
-#, c-format
-msgid ""
-"Couldn't fetch URL '%s':\n"
-"%s\n"
-msgstr ""
-"Nepavyksta atverti URL „%s“:\n"
-"%s\n"
-
-#: ../src/plugins/rssyl/feed.c:1759
+#: ../src/plugins/rssyl/opml_export.c:110
 #, c-format
-msgid "Can't subscribe feed '%s'."
+msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr ""
 
-#: ../src/plugins/rssyl/feed.c:1861 ../src/plugins/rssyl/rssyl_cb_menu.c:281
-msgid "Claws Mail needs network access in order to update the feed."
-msgid_plural "Claws Mail needs network access in order to update the feeds."
-msgstr[0] ""
-"Tam, kad galėtų pasiekti naujienų serverį, Claws Mail turi prisijungti prie "
-"tinklo."
-msgstr[1] ""
-"Tam, kad galėtų pasiekti naujienų serverius, Claws Mail turi prisijungti "
-"prie tinklo."
-msgstr[2] ""
-"Tam, kad galėtų pasiekti naujienų serverius, Claws Mail turi prisijungti "
-"prie tinklo."
-
-#: ../src/plugins/rssyl/feed.h:20
-#, c-format
-msgid "Time out connecting to URL %s\n"
-msgstr "Baigėsi laikas jungiantis prie %s\n"
-
-#: ../src/plugins/rssyl/feed.h:21
-#, c-format
-msgid "Couldn't fetch URL %s\n"
-msgstr "Nepavysta atverti URL %s\n"
-
-#: ../src/plugins/rssyl/feed.h:22
+#: ../src/plugins/rssyl/opml_export.c:131
 #, c-format
-msgid "Error parsing feed from URL %s\n"
-msgstr ""
+msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
+msgstr "RSSyl: nepavyksta pašalinti senos OPML rinkmenos „%s“: %s\n"
 
-#: ../src/plugins/rssyl/feed.h:23
+#: ../src/plugins/rssyl/opml_export.c:141
 #, c-format
-msgid "Unsupported feed type at URL %s\n"
+msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
 
-#: ../src/plugins/rssyl/feed.h:25
-#, c-format
-msgid "RSSyl: Updating feed %s\n"
+#: ../src/plugins/rssyl/opml_export.c:182
+msgid "RSSyl: Error during writing feed export file.\n"
 msgstr ""
 
-#: ../src/plugins/rssyl/feed.h:26
+#: ../src/plugins/rssyl/opml_import.c:109
 #, c-format
-msgid "RSSyl: Feed update finished: %s\n"
-msgstr ""
-
-#: ../src/plugins/rssyl/feed.h:27
-msgid "RSSyl: Feed update aborted, application is exiting.\n"
+msgid ""
+"Error while subscribing feed\n"
+"%s\n"
+"\n"
+"Folder name '%s' is not allowed."
 msgstr ""
 
-#: ../src/plugins/rssyl/plugin.c:63
+#: ../src/plugins/rssyl/plugin.c:65
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13270,216 +13294,351 @@ msgid ""
 "the web. You can read them, and delete or keep old entries."
 msgstr ""
 
-#: ../src/plugins/rssyl/plugin.c:87
+#: ../src/plugins/rssyl/plugin.c:89
 msgid "RSS feed"
 msgstr "RSS kanalas"
 
-#: ../src/plugins/rssyl/rssyl.c:133 ../src/plugins/rssyl/rssyl.c:145
+#: ../src/plugins/rssyl/rssyl_add_item.c:295
+msgctxt "Empty RSS feed title placeholder"
+msgid "(empty)"
+msgstr "(tuščia)"
+
+#: ../src/plugins/rssyl/rssyl.c:154 ../src/plugins/rssyl/rssyl.c:165
 msgid "Refresh all feeds"
 msgstr "Atnaujinti visus kanalus"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:62
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Subscribe feed"
 msgstr "Prenumeruoti naujienas"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:63
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:67
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:138
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:100
 #, c-format
-msgid "Really remove the folder tree '%s'?\n"
-msgstr "Tikrai pašalinti „%s“ aplankų medį?\n"
+msgid "'%c' can't be used in folder name."
+msgstr "Aplanko pavadinime negali būti „%c“."
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:139
-msgid "Remove folder tree"
-msgstr "Pašalinti aplankų medį"
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:242
+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] ""
+"Tam, kad galėtų pasiekti naujienų serverį, Claws-Mail turi prisijungti prie "
+"tinklo."
+msgstr[1] ""
+"Tam, kad galėtų pasiekti naujienų serverius, Claws-Mail turi prisijungti "
+"prie tinklo."
+msgstr[2] ""
+"Tam, kad galėtų pasiekti naujienų serverius, Claws-Mail turi prisijungti "
+"prie tinklo."
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:305
 #, c-format
-msgid "Can't remove feed '%s'."
-msgstr "Nepavyksta pašalinti „%s“ naujienų kanalo."
-
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:374
-msgid "Select a .opml file"
-msgstr "Pasirinkite . opml rinkmeną"
-
-#: ../src/plugins/rssyl/rssyl_gtk.c:53
-msgid "_Refresh feed"
-msgstr "_Atnaujinti kanalą"
-
-#: ../src/plugins/rssyl/rssyl_gtk.c:54
-msgid "Refresh _all feeds"
-msgstr "Atnaujinti _visus kanalus"
+msgid "Really remove the feed tree `%s' ?\n"
+msgstr "Tikrai pašalinti naujienų kanalo „%s“ aplankų medį?\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:55
-msgid "Subscribe _new feed..."
-msgstr "_Prenumeruoti naują kanalą..."
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:306
+msgid "Remove feed tree"
+msgstr "Pašalinti naujienų kanalo aplankų medį"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:56
-msgid "_Unsubscribe feed..."
-msgstr "Atsisakyti p_renumeratos..."
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:341
+msgid "Select an OPML file"
+msgstr "Pasirinkite opml rinkmeną"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:57
-msgid "Feed pr_operties..."
-msgstr "_Kanalo savybės..."
+#: ../src/plugins/rssyl/rssyl_feed.c:75
+#: ../src/plugins/rssyl/rssyl_subscribe.c:139
+#, c-format
+msgid "Couldn't create folder for new feed '%s'."
+msgstr "Naujam naujienų kanalui „%s“ nesukūrėme aplanko."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:58
-msgid "Import feed list..."
-msgstr "Importuoti kanalų sąrašą..."
+#: ../src/plugins/rssyl/rssyl_feed.h:10
+#, c-format
+msgid "RSSyl: Subscribing new feed: %s\n"
+msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:59
-msgid "Rena_me..."
-msgstr "_Pervadinti..."
+#: ../src/plugins/rssyl/rssyl_feed.h:11
+#, c-format
+msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
+msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:60
-msgid "_Create new folder..."
-msgstr "_Sukurti naują aplanką..."
+#: ../src/plugins/rssyl/rssyl_feed.h:12
+#, c-format
+msgid "RSSyl: Updating feed: %s\n"
+msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:62
-msgid "Remove folder _tree..."
-msgstr "Šalinti aplankų _medį..."
+#: ../src/plugins/rssyl/rssyl_feed.h:13
+#, c-format
+msgid "RSSyl: Feed update finished: %s\n"
+msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:152
-msgid "Add RSS folder tree"
-msgstr "Pridėti RSS aplankų medį"
+#: ../src/plugins/rssyl/rssyl_feed.h:14
+#, c-format
+msgid "RSSyl: Error fetching feed at '%s': %s\n"
+msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:153
-msgid "Enter name for a new RSS folder tree."
-msgstr "Įveskite naujo RSS aplankų medžio pavadinimą."
+#: ../src/plugins/rssyl/rssyl_feed.h:15
+#, c-format
+msgid "RSSyl: No valid feed found at '%s'\n"
+msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:169
-msgid ""
-"Creation of folder tree failed.\n"
-"Maybe some files already exist, or you don't have the permission to write "
-"there?"
+#: ../src/plugins/rssyl/rssyl_feed.h:16
+#, c-format
+msgid "RSSyl: Couldn't process feed at '%s'\n"
 msgstr ""
-"Nepavyko sukurti aplankų medžio.\n"
-"Galbūt kai kurios rinkmenos jau yra arba jūs neturite leidimo ten rašyti."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:184
-msgid "RSSyl..."
+#: ../src/plugins/rssyl/rssyl_feed.h:17
+#, c-format
+msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:257
+#: ../src/plugins/rssyl/rssyl_feed_props.c:243
 msgid "Use default refresh interval"
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:269
-msgid "Keep default number of expired entries"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:255
+msgid "Keep old items"
+msgstr "Išlaikyti senus įrašus"
+
+#. "Trim" button
+#: ../src/plugins/rssyl/rssyl_feed_props.c:261
+msgid "_Trim"
+msgstr ""
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:264
+#: ../src/plugins/rssyl/rssyl_feed_props.c:267
+msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:275
+#: ../src/plugins/rssyl/rssyl_feed_props.c:271
 msgid "Fetch comments if possible"
 msgstr ""
 
+#: ../src/plugins/rssyl/rssyl_feed_props.c:296
+msgid "Always mark as new"
+msgstr "Visuomet žymėti kaip naują"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:302
+msgid "If only its text changed"
+msgstr "Tik jei pasikeitė tekstas"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:308
+msgid "Never mark as new"
+msgstr "Niekada nežymėti nauju"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:313
+msgid "Add item title to top of message"
+msgstr ""
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:320
+msgid "Ignore title rename"
+msgstr "Nepaisyti antraštės pakeitimo"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:326
+#: ../src/plugins/rssyl/rssyl_feed_props.c:329
+msgid ""
+"Enable this to keep current folder name, even if feed author changes title "
+"of the feed."
+msgstr ""
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:334
+#: ../src/plugins/vcalendar/vcal_prefs.c:518
+msgid "Verify SSL certificate validity"
+msgstr "Tikrinti SSL galiojimą"
+
 #. Label for URL frame
-#: ../src/plugins/rssyl/rssyl_gtk.c:308
+#: ../src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "<b>Source URL:</b>"
 msgstr "<b>Šaltinio URL:</b>"
 
-#. Fetch comments for - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:336
+#. Fetch comments max age - label
+#: ../src/plugins/rssyl/rssyl_feed_props.c:378
 msgid ""
 "<b>Fetch comments on posts aged less than:</b>\n"
 "<small>(In days; set to -1 to fetch all comments)</small>"
 msgstr ""
 
 #. Refresh interval - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:370
+#: ../src/plugins/rssyl/rssyl_feed_props.c:436
 msgid ""
 "<b>Refresh interval in minutes:</b>\n"
 "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
 msgstr ""
 
-#. Expired items - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:403
-msgid ""
-"<b>Number of expired entries to keep:</b>\n"
-"<small>(Set to -1 if you want to keep expired entries)</small>"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:462
+msgid "<b>If an item changes, do not mark it as new:</b>"
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:429
-msgid "<b>If an item changes, do not mark it as unread:</b>"
-msgstr ""
+#: ../src/plugins/rssyl/rssyl_feed_props.c:554
+msgid "_OK"
+msgstr "_Gerai"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:439
-msgid "Always mark as unread"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:562
+msgid "Set feed properties"
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:441
-msgid "If only its text has changed"
-msgstr ""
+#: ../src/plugins/rssyl/rssyl_gtk.c:48
+msgid "_Refresh feed"
+msgstr "_Atnaujinti kanalą"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:443
-msgid "Never mark as unread"
-msgstr ""
+#: ../src/plugins/rssyl/rssyl_gtk.c:49
+msgid "Feed pr_operties"
+msgstr "_Kanalo savybės"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:459
-#: ../src/plugins/vcalendar/vcal_prefs.c:518
-msgid "Verify SSL certificate validity"
-msgstr "Tikrinti SSL galiojimą"
+#: ../src/plugins/rssyl/rssyl_gtk.c:50
+msgid "Rena_me..."
+msgstr "_Pervadinti..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:515
-msgid "_OK"
-msgstr "_Gerai"
+#: ../src/plugins/rssyl/rssyl_gtk.c:51
+msgid "R_efresh recursively"
+msgstr "Atnaujinti _rekursyviai"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:523
-msgid "Set feed properties"
-msgstr ""
+#: ../src/plugins/rssyl/rssyl_gtk.c:52
+msgid "Subscribe _new feed..."
+msgstr "_Prenumeruoti naują kanalą..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:651 ../src/plugins/rssyl/rssyl_gtk.c:675
-msgid "Unsubscribe feed"
-msgstr "Atsisakyti prenumeratos"
+#: ../src/plugins/rssyl/rssyl_gtk.c:53
+msgid "Create new _folder..."
+msgstr "_Sukurti naują aplanką..."
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:54
+msgid "Import feed list..."
+msgstr "Importuoti kanalų sąrašą..."
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:56
+msgid "Remove tree"
+msgstr "Pašalinti medį"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:676
-msgid "Do you really want to remove feed"
-msgstr "Tikrai pašalinti šį kanalą?"
+#: ../src/plugins/rssyl/rssyl_gtk.c:126
+msgid "Add RSS folder tree"
+msgstr "Pridėti RSS aplankų medį"
 
-#. Remove cache checkbutton
-#: ../src/plugins/rssyl/rssyl_gtk.c:682
-msgid "Remove cached entries"
-msgstr "Šalinti podėlio įrašus"
+#: ../src/plugins/rssyl/rssyl_gtk.c:127
+msgid "Enter name for a new RSS folder tree."
+msgstr "Įveskite naujo RSS aplankų medžio pavadinimą."
 
-#: ../src/plugins/rssyl/rssyl.h:8
-msgid "RSSyl"
-msgstr "RSSyl"
+#: ../src/plugins/rssyl/rssyl_gtk.c:143
+msgid ""
+"Creation of folder tree failed.\n"
+"Maybe some files already exist, or you don't have the permission to write "
+"there?"
+msgstr ""
+"Nepavyko sukurti aplankų medžio.\n"
+"Galbūt kai kurios rinkmenos jau yra arba jūs neturite leidimo ten rašyti."
 
 #. Default RSSyl mailbox name
-#: ../src/plugins/rssyl/rssyl.h:14
+#: ../src/plugins/rssyl/rssyl.h:17
 msgid "My Feeds"
 msgstr "Mano kanalai"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:106
+#: ../src/plugins/rssyl/rssyl_prefs.c:128
 msgid "Default refresh interval in minutes"
 msgstr "Numatytasis atnaujinimo intervalas, minutėmis"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:117
-msgid "Set to 0 to disable automatic refreshing"
+#: ../src/plugins/rssyl/rssyl_prefs.c:147
+msgid "Refresh all feeds on application start"
+msgstr "Atnaujinti visus kanalus paleidus programą"
+
+#. Path to cookies file for libcurl to use
+#: ../src/plugins/rssyl/rssyl_prefs.c:155
+msgid "Path to cookies file"
+msgstr "Kelias iki slapukų rinkmenos"
+
+#: ../src/plugins/rssyl/rssyl_prefs.c:166
+#: ../src/plugins/rssyl/rssyl_prefs.c:169
+msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:119
-msgid "Default number of expired items to keep"
+#: ../src/plugins/rssyl/rssyl_prefs.c:176
+msgid "Verify SSL certificates validity for new feeds"
+msgstr "Tikrinti naujų kanalų SSL liudijimo galiojimą"
+
+#. Create window
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+msgid "Subscribe new feed?"
+msgstr "Prenumeruoti naują kanalą?"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:72
+msgid "<b>Feed folder:</b>"
+msgstr "<b>Naujienų kanalo aplankas: </b>"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:82
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:86
+msgid ""
+"Instead of using official title, you can enter a different folder name for "
+"the feed."
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:130
-msgid "Set to -1 to keep expired items"
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:91
+msgid "_Edit feed properties after subscribing"
 msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:133
-msgid "Refresh all feeds on application start"
-msgstr "Atnaujinti visus kanalus paleidus programą"
+#: ../src/plugins/rssyl/rssyl_update_comments.c:99
+#, c-format
+msgid "Updating comments for '%s'..."
+msgstr "Atnaujinami „%s“ komentarai..."
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:139
-msgid "Path to cookies file"
-msgstr "Kelias iki slapukų rinkmenos"
+#: ../src/plugins/rssyl/rssyl_update_feed.c:102
+#: ../src/plugins/vcalendar/vcal_folder.c:1596
+msgid "401 (Authorisation required)"
+msgstr "401 (reikia nustatyti tapatybę)"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:149
-msgid "Path to Netscape-style cookies.txt file containing your cookies"
+#: ../src/plugins/rssyl/rssyl_update_feed.c:105
+#: ../src/plugins/vcalendar/vcal_folder.c:1599
+msgid "403 (Unauthorised)"
+msgstr "403 (neautorizuota)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:108
+#: ../src/plugins/vcalendar/vcal_folder.c:1602
+msgid "404 (Not found)"
+msgstr "404 (nerasta)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:111
+#, c-format
+msgid "Error %d"
+msgstr "%d klaida"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:123
+#, c-format
+msgctxt "First parameter is URL, second is error text"
+msgid ""
+"Error fetching feed at\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:134
+#, c-format
+msgid ""
+"No valid feed found at\n"
+"<b>%s</b>"
+msgstr ""
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:200
+#, c-format
+msgid "Updating feed '%s'..."
+msgstr "Atnaujinamas naujienų kanalas „%s“..."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:221
+#, c-format
+msgid ""
+"Couldn't process feed at\n"
+"<b>%s</b>\n"
+"\n"
+"Please contact developers, this should not happen."
+msgstr ""
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:301
+msgid "Claws Mail needs network access in order to update your feeds."
 msgstr ""
+"Tam, kad galėtų pasiekti naujienų serverį, Claws-Mail turi prisijungti prie "
+"tinklo."
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:152
-msgid "Verify SSL certificate validity for new feeds"
+#: ../src/plugins/rssyl/rssyl_update_format.c:127
+msgid ""
+"Internal problem while upgrading storage format. This should not happen. "
+"Please report this, with debug output attached.\n"
 msgstr ""
 
 #: ../src/plugins/smime/plugin.c:38 ../src/plugins/smime/plugin.c:54
@@ -13532,6 +13691,48 @@ msgstr ""
 "Atminkite, kad laiškų antraštės, pvz. tema, nėra užšifruojamos naudojant S/"
 "MIME sistemą."
 
+#: ../src/plugins/spam_report/spam_report.c:295
+msgid "Reporting spam..."
+msgstr "Pranešimas apie brukalą..."
+
+#: ../src/plugins/spam_report/spam_report.c:330
+msgid "Report spam online..."
+msgstr "Pranešti apie brukalą internete..."
+
+#: ../src/plugins/spam_report/spam_report.c:341
+#: ../src/plugins/spam_report/spam_report.c:379
+#: ../src/plugins/spam_report/spam_report_prefs.c:80
+msgid "SpamReport"
+msgstr "Pranešimas apie brukalą"
+
+#: ../src/plugins/spam_report/spam_report.c:384
+msgid ""
+"This plugin reports spam to various places.\n"
+"Currently the following sites or methods are supported:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * lists.debian.org nomination system"
+msgstr ""
+"Šis papildinys praneša apie brukalą įvairioms sistemoms.\n"
+"Šiuo metu palaikomos svetainės ir metodai:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * lists.debian.org nomination system"
+
+#: ../src/plugins/spam_report/spam_report.c:409
+msgid "Spam reporting"
+msgstr "Pranešimas apie brukalą"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:122
+msgid "Enabled"
+msgstr "Įgalinta"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:149
+msgid "Forward to:"
+msgstr "Persiųsti:"
+
 #: ../src/plugins/spamassassin/spamassassin.c:77
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:649
 msgid "SpamAssassin"
@@ -13648,48 +13849,6 @@ msgstr ""
 "Didžiausias tikrinimui skirtas laikas. Jei tikrinant užtrunkama ilgiau, "
 "tikrinimas nutraukiamas."
 
-#: ../src/plugins/spam_report/spam_report.c:293
-msgid "Reporting spam..."
-msgstr "Pranešimas apie brukalą..."
-
-#: ../src/plugins/spam_report/spam_report.c:328
-msgid "Report spam online..."
-msgstr "Pranešti apie brukalą internete..."
-
-#: ../src/plugins/spam_report/spam_report.c:339
-#: ../src/plugins/spam_report/spam_report.c:377
-#: ../src/plugins/spam_report/spam_report_prefs.c:80
-msgid "SpamReport"
-msgstr "Pranešimas apie brukalą"
-
-#: ../src/plugins/spam_report/spam_report.c:382
-msgid ""
-"This plugin reports spam to various places.\n"
-"Currently the following sites or methods are supported:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * lists.debian.org nomination system"
-msgstr ""
-"Šis papildinys praneša apie brukalą įvairioms sistemoms.\n"
-"Šiuo metu palaikomos svetainės ir metodai:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * lists.debian.org nomination system"
-
-#: ../src/plugins/spam_report/spam_report.c:407
-msgid "Spam reporting"
-msgstr "Pranešimas apie brukalą"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:122
-msgid "Enabled"
-msgstr "Įgalinta"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:149
-msgid "Forward to:"
-msgstr "Persiųsti:"
-
 #: ../src/plugins/tnef_parse/tnef_parse.c:65
 #, c-format
 msgid ""
@@ -13765,7 +13924,7 @@ msgstr "Rodyti"
 
 #: ../src/plugins/vcalendar/day-view.c:614
 #: ../src/plugins/vcalendar/month-view.c:711 ../src/prefs_account.c:1477
-#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:334
+#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:336
 msgid "days"
 msgstr "d."
 
@@ -14101,7 +14260,7 @@ msgstr "Susitikimai"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1476
 msgid "in the past"
-msgstr ""
+msgstr "anksčiau"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1479
 msgid "today"
@@ -14133,6 +14292,11 @@ msgstr ""
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Baigėsi (%d s) laikas jungiantis prie %s\n"
 
+#: ../src/plugins/vcalendar/vcal_folder.c:1605
+#, c-format
+msgid "Error %ld"
+msgstr "%ld klaida"
+
 #: ../src/plugins/vcalendar/vcal_folder.c:1802
 #, c-format
 msgid ""
@@ -14183,9 +14347,9 @@ msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1849
 #: ../src/plugins/vcalendar/vcal_folder.c:1852
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create directory %s"
-msgstr "Nepavyksta sukurti paskirties aplanko %s."
+msgstr "Nepavyksta sukurti katalogo %s"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1890
 msgid "Claws Mail needs network access in order to update the Webcal feed."
@@ -14237,11 +14401,11 @@ msgstr "atmesta"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:112
 msgid "did not answer"
-msgstr ""
+msgstr "neatsakė"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:142
 msgid "individual"
-msgstr ""
+msgstr "asmeninis"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:143
 msgid "group"
@@ -14257,7 +14421,7 @@ msgstr "kambarys"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:556
 msgid "Past"
-msgstr ""
+msgstr "Anksčiau"
 
 #: ../src/plugins/vcalendar/vcal_manager.c:559
 msgid "Today"
@@ -14602,7 +14766,7 @@ msgstr ""
 #. export enable + path stuff
 #: ../src/plugins/vcalendar/vcal_prefs.c:299
 msgid "Calendar export"
-msgstr ""
+msgstr "Kalendoriaus eksportas"
 
 #: ../src/plugins/vcalendar/vcal_prefs.c:310
 msgid "Automatically export calendar to"
@@ -14848,11 +15012,6 @@ msgstr "Numatytasis gautų laiškų aplankas"
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Nefiltruoti laiškai laikomi aplanke"
 
-#: ../src/prefs_account.c:1442 ../src/prefs_account.c:1531
-#: ../src/prefs_account.c:1991 ../src/prefs_customheader.c:237
-msgid "Bro_wse"
-msgstr "_Naršyti"
-
 #: ../src/prefs_account.c:1453
 msgid "Use secure authentication (APOP)"
 msgstr "Naudoti saugų tapatybės nustatymą (APOP)"
@@ -14934,8 +15093,8 @@ msgstr ""
 "Nuspaudus „Tikrinti paštą“, tikrinama, ar šioje paskyroje nėra naujų laiškų"
 
 #: ../src/prefs_account.c:1718 ../src/prefs_customheader.c:209
-#: ../src/prefs_matcher.c:620 ../src/prefs_matcher.c:1958
-#: ../src/prefs_matcher.c:1980
+#: ../src/prefs_matcher.c:623 ../src/prefs_matcher.c:1974
+#: ../src/prefs_matcher.c:1996
 msgid "Header"
 msgstr "Antraštė"
 
@@ -15303,8 +15462,8 @@ msgid "Replace the selected action in list with the action above"
 msgstr "Pasirinktą sąraše esantį veiksmą pakeisti aukščiau esančiu veiksmu"
 
 #: ../src/prefs_actions.c:337 ../src/prefs_filtering_action.c:616
-#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:778
-#: ../src/prefs_template.c:318 ../src/prefs_toolbar.c:1056
+#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:781
+#: ../src/prefs_template.c:320 ../src/prefs_toolbar.c:1056
 msgid "Re_move"
 msgstr "Pa_šalinti"
 
@@ -15313,7 +15472,7 @@ msgid "Delete the selected action from the list"
 msgstr "Pasirinktą veiksmą pašalinti iš sąrašo"
 
 #: ../src/prefs_actions.c:355 ../src/prefs_filtering.c:503
-#: ../src/prefs_template.c:336
+#: ../src/prefs_template.c:338
 msgid "Clear all the input fields in the dialog"
 msgstr "Išvalyti visus dialogo įvedimo laukus"
 
@@ -15334,7 +15493,7 @@ msgstr "Pasirinktą veiksmą nuleisti žemiau"
 #: ../src/prefs_actions.c:535 ../src/prefs_filtering_action.c:704
 #: ../src/prefs_filtering.c:836 ../src/prefs_filtering.c:838
 #: ../src/prefs_filtering.c:839 ../src/prefs_filtering.c:949
-#: ../src/prefs_matcher.c:897 ../src/prefs_template.c:469
+#: ../src/prefs_matcher.c:900 ../src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Nauja)"
 
@@ -15395,22 +15554,22 @@ msgstr "Tikrai šalinti visus veiksmus?"
 
 #: ../src/prefs_actions.c:898 ../src/prefs_actions.c:929
 #: ../src/prefs_filtering.c:1497 ../src/prefs_filtering.c:1519
-#: ../src/prefs_matcher.c:2109 ../src/prefs_template.c:569
-#: ../src/prefs_template.c:594
+#: ../src/prefs_matcher.c:2125 ../src/prefs_template.c:572
+#: ../src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Elementas neįrašytas"
 
 #: ../src/prefs_actions.c:899 ../src/prefs_actions.c:930
 #: ../src/prefs_filtering.c:1498 ../src/prefs_filtering.c:1520
-#: ../src/prefs_template.c:570 ../src/prefs_template.c:595
+#: ../src/prefs_template.c:573 ../src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Elementas nebuvo įrašytas. Vis tiek užverti?"
 
 #: ../src/prefs_actions.c:900 ../src/prefs_actions.c:905
 #: ../src/prefs_actions.c:931 ../src/prefs_filtering.c:1477
 #: ../src/prefs_filtering.c:1499 ../src/prefs_filtering.c:1521
-#: ../src/prefs_matcher.c:2111 ../src/prefs_template.c:571
-#: ../src/prefs_template.c:596 ../src/prefs_template.c:601
+#: ../src/prefs_matcher.c:2127 ../src/prefs_template.c:574
+#: ../src/prefs_template.c:599 ../src/prefs_template.c:604
 msgid "+_Continue editing"
 msgstr "+_Tęsti redagavimą"
 
@@ -15523,7 +15682,7 @@ msgstr ""
 "apdorotumėte laiško rinkmeną arba kurią jo dalį."
 
 #: ../src/prefs_actions.c:1092 ../src/prefs_filtering.c:1695
-#: ../src/prefs_template.c:1101
+#: ../src/prefs_template.c:1121
 msgid "D_uplicate"
 msgstr "_Dubliuoti"
 
@@ -15657,7 +15816,7 @@ msgid "Custom header configuration"
 msgstr "Papildoma antraščių konfigūracija"
 
 #: ../src/prefs_customheader.c:507 ../src/prefs_display_header.c:599
-#: ../src/prefs_matcher.c:1583 ../src/prefs_matcher.c:1598
+#: ../src/prefs_matcher.c:1595 ../src/prefs_matcher.c:1610
 msgid "Header name is not set."
 msgstr "Nenurodytas antraštės pavadinimas."
 
@@ -15843,7 +16002,7 @@ msgstr "Peradresuoti"
 
 #. S_COL_NUMBER
 #: ../src/prefs_filtering_action.c:194 ../src/prefs_filtering_action.c:195
-#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:626
+#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:629
 #: ../src/prefs_summary_column.c:87 ../src/summaryview.c:447
 msgid "Score"
 msgstr "Įvertis"
@@ -15860,7 +16019,7 @@ msgstr "Įvertinti"
 #. S_COL_SCORE
 #. S_COL_LOCKED
 #: ../src/prefs_filtering_action.c:196 ../src/prefs_filtering_action.c:197
-#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:630
+#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:633
 #: ../src/prefs_summary_column.c:89 ../src/summaryview.c:449
 msgid "Tags"
 msgstr "Gairės"
@@ -15890,7 +16049,7 @@ msgid "Action configuration"
 msgstr "Veiksmo konfigūravimas"
 
 #: ../src/prefs_filtering_action.c:427 ../src/prefs_filtering.c:1886
-#: ../src/prefs_matcher.c:583
+#: ../src/prefs_matcher.c:586
 msgid "Rule"
 msgstr "Taisyklė"
 
@@ -15932,25 +16091,25 @@ msgid "No action was defined."
 msgstr "Veiksmas neapibrėžtas."
 
 #. completion of 'To' from address book
-#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2153
+#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2169
 #: ../src/quote_fmt.c:79
 msgid "literal %"
 msgstr "rašmuo „%“"
 
-#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2162
+#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2178
 msgid "filename (should not be modified)"
 msgstr "rinkmena (neturi būti keičiama!)"
 
-#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2163
+#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2179
 #: ../src/quote_fmt.c:87
 msgid "new line"
 msgstr "nauja eilutė"
 
-#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2164
+#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2180
 msgid "escape character for quotes"
 msgstr "Kaitos ženklas"
 
-#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2165
+#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2181
 msgid "quote character"
 msgstr "citavimo ženklas"
 
@@ -16290,7 +16449,7 @@ msgid "Folder and Message Lists"
 msgstr "Aplankų ir laiškų sąrašai"
 
 #. message font label
-#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2030
+#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2046
 msgid "Message"
 msgstr "Laiškas"
 
@@ -16470,245 +16629,249 @@ msgstr "Kita"
 msgid "Logging"
 msgstr "Žurnalavimas"
 
-#: ../src/prefs_matcher.c:328
+#: ../src/prefs_matcher.c:330
 msgid "more than"
 msgstr "didesnis kaip"
 
-#: ../src/prefs_matcher.c:329
+#: ../src/prefs_matcher.c:331
 msgid "less than"
 msgstr "mažesnis kaip"
 
-#: ../src/prefs_matcher.c:335
+#: ../src/prefs_matcher.c:337
 msgid "weeks"
 msgstr "savaitės"
 
-#: ../src/prefs_matcher.c:339
+#: ../src/prefs_matcher.c:341
 msgid "higher than"
 msgstr "daugiau kaip"
 
-#: ../src/prefs_matcher.c:340
+#: ../src/prefs_matcher.c:342
 msgid "lower than"
 msgstr "mažiau kaip"
 
-#: ../src/prefs_matcher.c:341 ../src/prefs_matcher.c:347
+#: ../src/prefs_matcher.c:343 ../src/prefs_matcher.c:349
 msgid "exactly"
 msgstr "tiksliai"
 
-#: ../src/prefs_matcher.c:345
+#: ../src/prefs_matcher.c:347
 msgid "greater than"
 msgstr "didesnis kaip"
 
-#: ../src/prefs_matcher.c:346
+#: ../src/prefs_matcher.c:348
 msgid "smaller than"
 msgstr "mažesnis kaip"
 
-#: ../src/prefs_matcher.c:351
+#: ../src/prefs_matcher.c:353
 msgid "bytes"
 msgstr "baitai"
 
-#: ../src/prefs_matcher.c:352
+#: ../src/prefs_matcher.c:354
 msgid "kilobytes"
 msgstr "kilobaitai"
 
-#: ../src/prefs_matcher.c:353
+#: ../src/prefs_matcher.c:355
 msgid "megabytes"
 msgstr "megabaitai"
 
-#: ../src/prefs_matcher.c:357
+#: ../src/prefs_matcher.c:359
 msgid "contains"
 msgstr "turi"
 
-#: ../src/prefs_matcher.c:358
+#: ../src/prefs_matcher.c:360
 msgid "doesn't contain"
 msgstr "neturi"
 
-#: ../src/prefs_matcher.c:381
+#: ../src/prefs_matcher.c:383
 msgid "headers part"
 msgstr "antraštės dalyje"
 
-#: ../src/prefs_matcher.c:382
+#: ../src/prefs_matcher.c:384
+msgid "headers values"
+msgstr "antraščių reikšmės"
+
+#: ../src/prefs_matcher.c:385
 msgid "body part"
 msgstr "pagrindinėje dalyje"
 
-#: ../src/prefs_matcher.c:383
+#: ../src/prefs_matcher.c:386
 msgid "whole message"
 msgstr "visame laiške"
 
-#: ../src/prefs_matcher.c:389 ../src/summaryview.c:6300
+#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6300
 msgid "Marked"
 msgstr "Pažymėtas"
 
-#: ../src/prefs_matcher.c:390 ../src/summaryview.c:6298
+#: ../src/prefs_matcher.c:393 ../src/summaryview.c:6298
 msgid "Deleted"
 msgstr "Pašalintas"
 
-#: ../src/prefs_matcher.c:391
+#: ../src/prefs_matcher.c:394
 msgid "Replied"
 msgstr "Atsakytas"
 
-#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6292
+#: ../src/prefs_matcher.c:395 ../src/summaryview.c:6292
 msgid "Forwarded"
 msgstr "Persiųstas"
 
-#: ../src/prefs_matcher.c:394 ../src/summaryview.c:6282 ../src/toolbar.c:416
+#: ../src/prefs_matcher.c:397 ../src/summaryview.c:6282 ../src/toolbar.c:416
 #: ../src/toolbar.c:934 ../src/toolbar.c:1978
 msgid "Spam"
 msgstr "Brukalas"
 
-#: ../src/prefs_matcher.c:395
+#: ../src/prefs_matcher.c:398
 msgid "Has attachment"
 msgstr "Turi priedą"
 
-#: ../src/prefs_matcher.c:396 ../src/summaryview.c:6318
+#: ../src/prefs_matcher.c:399 ../src/summaryview.c:6318
 msgid "Signed"
 msgstr "Pasirašytas"
 
-#: ../src/prefs_matcher.c:400
+#: ../src/prefs_matcher.c:403
 msgid "set"
 msgstr "nustatyta"
 
-#: ../src/prefs_matcher.c:401
+#: ../src/prefs_matcher.c:404
 msgid "not set"
 msgstr "nenustatyta"
 
-#: ../src/prefs_matcher.c:405
+#: ../src/prefs_matcher.c:408
 msgid "yes"
 msgstr "taip"
 
-#: ../src/prefs_matcher.c:406
+#: ../src/prefs_matcher.c:409
 msgid "no"
 msgstr "ne"
 
-#: ../src/prefs_matcher.c:410
+#: ../src/prefs_matcher.c:413
 msgid "Any tags"
 msgstr "Bet kokia gairė"
 
-#: ../src/prefs_matcher.c:411
+#: ../src/prefs_matcher.c:414
 msgid "Specific tag"
 msgstr "Tam tikra gairė"
 
-#: ../src/prefs_matcher.c:415
+#: ../src/prefs_matcher.c:418
 msgid "ignored"
 msgstr "ignoruojama"
 
-#: ../src/prefs_matcher.c:416
+#: ../src/prefs_matcher.c:419
 msgid "not ignored"
 msgstr "neignoruojama"
 
-#: ../src/prefs_matcher.c:417
+#: ../src/prefs_matcher.c:420
 msgid "watched"
 msgstr "stebima"
 
-#: ../src/prefs_matcher.c:418
+#: ../src/prefs_matcher.c:421
 msgid "not watched"
 msgstr "nestebima"
 
-#: ../src/prefs_matcher.c:422
+#: ../src/prefs_matcher.c:425
 msgid "found"
 msgstr "rasta"
 
-#: ../src/prefs_matcher.c:423
+#: ../src/prefs_matcher.c:426
 msgid "not found"
 msgstr "nerasta"
 
-#: ../src/prefs_matcher.c:427
+#: ../src/prefs_matcher.c:430
 msgid "0 (Passed)"
 msgstr "0 (pavyko)"
 
-#: ../src/prefs_matcher.c:428
+#: ../src/prefs_matcher.c:431
 msgid "non-0 (Failed)"
 msgstr "ne 0 (nepavyko)"
 
-#: ../src/prefs_matcher.c:566
+#: ../src/prefs_matcher.c:569
 msgid "Condition configuration"
 msgstr "Sąlygos konfigūracija"
 
 #. criteria combo box
-#: ../src/prefs_matcher.c:610
+#: ../src/prefs_matcher.c:613
 msgid "Match criteria:"
 msgstr "Atitikimo kriterijus:"
 
-#: ../src/prefs_matcher.c:619
+#: ../src/prefs_matcher.c:622
 msgid "All messages"
 msgstr "Visi laiškai"
 
-#: ../src/prefs_matcher.c:621
+#: ../src/prefs_matcher.c:624
 msgid "Age"
 msgstr "Amžius"
 
-#: ../src/prefs_matcher.c:622
+#: ../src/prefs_matcher.c:625
 msgid "Phrase"
 msgstr "Frazė"
 
-#: ../src/prefs_matcher.c:623
+#: ../src/prefs_matcher.c:626
 msgid "Flags"
 msgstr "Vėliavėlės"
 
-#: ../src/prefs_matcher.c:624 ../src/prefs_msg_colors.c:410
+#: ../src/prefs_matcher.c:627 ../src/prefs_msg_colors.c:410
 msgid "Color labels"
 msgstr "Spalvotos etiketės"
 
-#: ../src/prefs_matcher.c:625
+#: ../src/prefs_matcher.c:628
 msgid "Thread"
 msgstr "Gija"
 
-#: ../src/prefs_matcher.c:628
+#: ../src/prefs_matcher.c:631
 msgid "Partially downloaded"
 msgstr "Dalinai parsiųsta"
 
-#: ../src/prefs_matcher.c:631
+#: ../src/prefs_matcher.c:634
 msgid "External program test"
 msgstr "Išorinės programos testas"
 
 #. store UNtranslated "Any"/"All" in matcher expressions
-#: ../src/prefs_matcher.c:707 ../src/prefs_matcher.c:1604
-#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:2501
+#: ../src/prefs_matcher.c:710 ../src/prefs_matcher.c:1616
+#: ../src/prefs_matcher.c:1631 ../src/prefs_matcher.c:2521
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Visi"
 
-#: ../src/prefs_matcher.c:741
+#: ../src/prefs_matcher.c:744
 msgid "Use regexp"
 msgstr "Naudoti reguliarųjį reiškinį"
 
-#: ../src/prefs_matcher.c:818
+#: ../src/prefs_matcher.c:821
 msgid "Message must match"
 msgstr "Laiškas privalo atitikti"
 
-#: ../src/prefs_matcher.c:822
+#: ../src/prefs_matcher.c:825
 msgid "at least one"
 msgstr "bent vieną"
 
-#: ../src/prefs_matcher.c:823
+#: ../src/prefs_matcher.c:826
 msgid "all"
 msgstr "visas"
 
-#: ../src/prefs_matcher.c:826
+#: ../src/prefs_matcher.c:829
 msgid "of above rules"
 msgstr "aukščiau pateiktas taisykles"
 
-#: ../src/prefs_matcher.c:1522 ../src/prefs_matcher.c:1588
+#: ../src/prefs_matcher.c:1534 ../src/prefs_matcher.c:1600
 msgid "Search pattern is not set."
 msgstr "Nenurodytas paieškos šablonas"
 
-#: ../src/prefs_matcher.c:1531
+#: ../src/prefs_matcher.c:1543
 msgid "Test command is not set."
 msgstr "Nenurodyta bandymo komanda."
 
-#: ../src/prefs_matcher.c:1605
+#: ../src/prefs_matcher.c:1617
 msgid "all addresses in all headers"
 msgstr "visi adresai visose antraštėse"
 
-#: ../src/prefs_matcher.c:1608
+#: ../src/prefs_matcher.c:1620
 msgid "any address in any header"
 msgstr "bet koks adresas bet kurioje antraštėje"
 
-#: ../src/prefs_matcher.c:1610
+#: ../src/prefs_matcher.c:1622
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "adresas(-ai) antraštėje „%s“"
 
-#: ../src/prefs_matcher.c:1611
+#: ../src/prefs_matcher.c:1623
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16717,79 +16880,83 @@ msgid ""
 "'%s' from the book/folder drop-down list."
 msgstr ""
 
-#: ../src/prefs_matcher.c:1830
+#: ../src/prefs_matcher.c:1842
 msgid "Headers part"
 msgstr "Antraštės dalis"
 
-#: ../src/prefs_matcher.c:1834
+#: ../src/prefs_matcher.c:1846
+msgid "Headers values"
+msgstr "Antraščių reikšmės"
+
+#: ../src/prefs_matcher.c:1850
 msgid "Body part"
 msgstr "Laiško kūno dalis"
 
-#: ../src/prefs_matcher.c:1838
+#: ../src/prefs_matcher.c:1854
 msgid "Whole message"
 msgstr "Visas laiškas"
 
-#: ../src/prefs_matcher.c:1957 ../src/prefs_matcher.c:2001
+#: ../src/prefs_matcher.c:1973 ../src/prefs_matcher.c:2017
 msgid "in"
 msgstr " "
 
-#: ../src/prefs_matcher.c:1959
+#: ../src/prefs_matcher.c:1975
 msgid "content is"
 msgstr "turinys yra"
 
-#: ../src/prefs_matcher.c:1968
+#: ../src/prefs_matcher.c:1984
 msgid "Age is"
 msgstr "Amžius yra"
 
-#: ../src/prefs_matcher.c:1973
+#: ../src/prefs_matcher.c:1989
 msgid "Flag"
 msgstr "Vėliavėlė"
 
-#: ../src/prefs_matcher.c:1974 ../src/prefs_matcher.c:1991
+#: ../src/prefs_matcher.c:1990 ../src/prefs_matcher.c:2007
 msgid "is"
 msgstr "yra"
 
-#: ../src/prefs_matcher.c:1979
+#: ../src/prefs_matcher.c:1995
 msgid "Name:"
 msgstr "Pavadinimas:"
 
-#: ../src/prefs_matcher.c:1990
+#: ../src/prefs_matcher.c:2006
 msgid "Label"
 msgstr "Etiketė"
 
-#: ../src/prefs_matcher.c:1996
+#: ../src/prefs_matcher.c:2012
 msgid "Value:"
 msgstr "Reikšmė:"
 
-#: ../src/prefs_matcher.c:2013
+#: ../src/prefs_matcher.c:2029
 msgid "Score is"
 msgstr "Įvertis"
 
-#: ../src/prefs_matcher.c:2014
+#: ../src/prefs_matcher.c:2030
 msgid "points"
 msgstr "tašką(-us)"
 
-#: ../src/prefs_matcher.c:2024
+#: ../src/prefs_matcher.c:2040
 msgid "Size is"
 msgstr "Dydis yra"
 
-#: ../src/prefs_matcher.c:2029
+#: ../src/prefs_matcher.c:2045
 msgid "Scope:"
 msgstr "Sritis:"
 
-#: ../src/prefs_matcher.c:2031
+#: ../src/prefs_matcher.c:2047
 msgid "tags"
 msgstr "gairės"
 
-#: ../src/prefs_matcher.c:2036
+#: ../src/prefs_matcher.c:2052
 msgid "type is"
 msgstr "tipas yra"
 
-#: ../src/prefs_matcher.c:2040
+#: ../src/prefs_matcher.c:2056
 msgid "Program returns"
 msgstr "Programa grąžina"
 
-#: ../src/prefs_matcher.c:2110
+#: ../src/prefs_matcher.c:2126
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -16797,11 +16964,11 @@ msgstr ""
 "Elementas nebuvo įrašytas.\n"
 "Vis tiek užverti?"
 
-#: ../src/prefs_matcher.c:2174
+#: ../src/prefs_matcher.c:2190
 msgid "Match Type: 'Test'"
 msgstr ""
 
-#: ../src/prefs_matcher.c:2175
+#: ../src/prefs_matcher.c:2191
 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"
@@ -16809,7 +16976,7 @@ msgid ""
 "The following symbols can be used:"
 msgstr ""
 
-#: ../src/prefs_matcher.c:2274
+#: ../src/prefs_matcher.c:2290
 msgid "Current condition rules"
 msgstr "Dabartinės sąlygos taisyklės"
 
@@ -17758,106 +17925,111 @@ msgstr "Galimi pasirinkimai"
 msgid "Selection on folder opening"
 msgstr "Parinkimas atvėrus aplanką"
 
-#: ../src/prefs_template.c:79
+#: ../src/prefs_template.c:80
 msgid "This name is used as the Menu item"
 msgstr "Šis pavadinimas naudojamas kaip meniu įrašas"
 
-#: ../src/prefs_template.c:81
+#: ../src/prefs_template.c:82
 msgid ""
 "Override composing account's From header. This doesn't change the composing "
 "account."
 msgstr ""
 
-#: ../src/prefs_template.c:307
+#: ../src/prefs_template.c:309
 msgid "Append the new template above to the list"
 msgstr "Prie sąrašo pridėti naują šabloną "
 
-#: ../src/prefs_template.c:316
+#: ../src/prefs_template.c:318
 msgid "Replace the selected template in list with the template above"
 msgstr "Pasirinktą sąraše esantį šabloną pakeisti aukščiau esančiu šablonu"
 
-#: ../src/prefs_template.c:326
+#: ../src/prefs_template.c:328
 msgid "Delete the selected template from the list"
 msgstr "Pasirinktą šabloną pašalinti iš sąrašo"
 
-#: ../src/prefs_template.c:344
+#: ../src/prefs_template.c:346
 msgid "Show information on configuring templates"
 msgstr "Rodyti konfigūruojamų šablonų informaciją"
 
-#: ../src/prefs_template.c:368
+#: ../src/prefs_template.c:370
 msgid "Move the selected template to the top"
 msgstr "Pasirinktą šabloną perkelti į viršų"
 
-#: ../src/prefs_template.c:378
+#: ../src/prefs_template.c:380
 msgid "Move the selected template up"
 msgstr "Pasirinktą šabloną kelti aukščiau"
 
-#: ../src/prefs_template.c:386
+#: ../src/prefs_template.c:388
 msgid "Move the selected template down"
 msgstr "Pasirinktą šabloną nuleisti žemiau"
 
-#: ../src/prefs_template.c:396
+#: ../src/prefs_template.c:398
 msgid "Move the selected template to the bottom"
 msgstr "Pasirinktą šabloną nuleisti į apačią"
 
-#: ../src/prefs_template.c:412
+#: ../src/prefs_template.c:414
 msgid "Template configuration"
 msgstr "Šablono konfigūracija"
 
-#: ../src/prefs_template.c:599
+#: ../src/prefs_template.c:602
 msgid "Templates list not saved"
 msgstr "Šablonų sąrašas neįrašytas"
 
-#: ../src/prefs_template.c:600
+#: ../src/prefs_template.c:603
 msgid "The templates list has been modified. Close anyway?"
 msgstr "Šablonų sąrašas pakeistas. Vis tiek užverti?"
 
-#: ../src/prefs_template.c:761
+#: ../src/prefs_template.c:768
 msgid "The template's name is not set."
 msgstr "Nenurodytas šablono pavadinimas."
 
-#: ../src/prefs_template.c:798
+#: ../src/prefs_template.c:811
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "Šablone nurodytas netinkamas siuntėjo el. pašto adresas."
 
-#: ../src/prefs_template.c:804
+#: ../src/prefs_template.c:817
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "Šablone nurodytas netinkamas gavėjo el. pašto adresas."
 
-#: ../src/prefs_template.c:810
+#: ../src/prefs_template.c:823
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "Šablone nurodytas netinkamas laiško kopijos gavėjo el. pašto adresas."
 
-#: ../src/prefs_template.c:816
+#: ../src/prefs_template.c:829
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr ""
 "Šablone nurodytas netinkamas slaptosios kopijos gavėjo el. pašto adresas."
 
-#: ../src/prefs_template.c:822
+#: ../src/prefs_template.c:835
+msgid ""
+"The \"Reply-To\" field of the template contains an invalid email address."
+msgstr "Šablone nurodytas netinkamas atgalinis adresas."
+
+#: ../src/prefs_template.c:841
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "Laiško šablono temos laukelis yra netinkamas."
 
-#: ../src/prefs_template.c:892
+#: ../src/prefs_template.c:912
 msgid "Delete template"
 msgstr "Šalinti šabloną"
 
-#: ../src/prefs_template.c:893
+#: ../src/prefs_template.c:913
 msgid "Do you really want to delete this template?"
 msgstr "Tikrai šalinti šį šabloną?"
 
-#: ../src/prefs_template.c:905
+#: ../src/prefs_template.c:925
 msgid "Delete all templates"
 msgstr "Šalinti visus šablonus"
 
-#: ../src/prefs_template.c:906
+#: ../src/prefs_template.c:926
 msgid "Do you really want to delete all the templates?"
 msgstr "Tikrai šalinti visus šablonus?"
 
-#: ../src/prefs_template.c:1221
+#: ../src/prefs_template.c:1241
 msgid "Current templates"
 msgstr "Esami šablonai"
 
-#: ../src/prefs_template.c:1249
+#: ../src/prefs_template.c:1269
 msgid "Template"
 msgstr "Šablonas"
 
@@ -18072,7 +18244,7 @@ msgstr "Ženkliukas"
 
 #: ../src/prefs_toolbar.c:1042
 msgid "A_dd"
-msgstr ""
+msgstr "_Pridėti"
 
 #: ../src/prefs_toolbar.c:1261 ../src/prefs_toolbar.c:1275
 #: ../src/prefs_toolbar.c:1289
@@ -18168,7 +18340,7 @@ msgstr "Informacija neprieinama"
 msgid "No recipient keys defined."
 msgstr "Nenurodytas gavėjo raktas."
 
-#: ../src/procmime.c:430 ../src/procmime.c:432 ../src/procmime.c:433
+#: ../src/procmime.c:433 ../src/procmime.c:435 ../src/procmime.c:436
 msgid "[Error decoding BASE64]\n"
 msgstr "[Klaidas iškoduojant BASE64]\n"
 
@@ -18879,23 +19051,23 @@ msgstr ""
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "Pasirinkta %d/%d (%s/%s), neskaityta: %d"
 
-#: ../src/summaryview.c:2979
+#: ../src/summaryview.c:2981
 msgid "Sorting summary..."
 msgstr "Rikiuojama santrauka..."
 
-#: ../src/summaryview.c:3118
+#: ../src/summaryview.c:3120
 msgid "Setting summary from message data..."
 msgstr "Pagal laiškų duomenis sudaroma santrauka..."
 
-#: ../src/summaryview.c:3323
+#: ../src/summaryview.c:3325
 msgid "(No Date)"
 msgstr "(Data nežinoma)"
 
-#: ../src/summaryview.c:3375
+#: ../src/summaryview.c:3377
 msgid "(No Recipient)"
 msgstr "(Gavėjo nėra)"
 
-#: ../src/summaryview.c:3410
+#: ../src/summaryview.c:3412
 #, c-format
 msgid ""
 "%s\n"
@@ -18904,7 +19076,7 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Nuo: %s, %s</span>"
 
-#: ../src/summaryview.c:3417
+#: ../src/summaryview.c:3419
 #, c-format
 msgid ""
 "%s\n"
@@ -18913,11 +19085,11 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Kam: %s, %s</span>"
 
-#: ../src/summaryview.c:4294
+#: ../src/summaryview.c:4296
 msgid "You're not the author of the article.\n"
 msgstr "Jūs nesate straipsnio autorius.\n"
 
-#: ../src/summaryview.c:4387
+#: ../src/summaryview.c:4389
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
@@ -18925,15 +19097,15 @@ msgstr[0] "Tikrai šalinti pasirinktą %d laišką?"
 msgstr[1] "Tikrai šalinti pasirinktus %d laiškus?"
 msgstr[2] "Tikrai šalinti pasirinktus %d laiškų?"
 
-#: ../src/summaryview.c:4390
+#: ../src/summaryview.c:4392
 msgid "Delete message(s)"
 msgstr "Šalinti laišką(-us)"
 
-#: ../src/summaryview.c:4553
+#: ../src/summaryview.c:4555
 msgid "Destination is same as current folder."
 msgstr "Paskirtis sutampa su veikiamuoju aplanku."
 
-#: ../src/summaryview.c:4652
+#: ../src/summaryview.c:4653
 msgid "Destination to copy is same as current folder."
 msgstr "Kopijavimo paskirtis sutampa su veikiamuoju aplanku."
 
@@ -19040,7 +19212,7 @@ msgstr "Užšifruotas"
 msgid "Has attachment(s)"
 msgstr "Turi priedą(-ų)"
 
-#: ../src/summaryview.c:7929
+#: ../src/summaryview.c:7932
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19049,11 +19221,11 @@ msgstr ""
 "Reguliariojo reiškinio (regexp) klaida:\n"
 "%s"
 
-#: ../src/summaryview.c:8034
+#: ../src/summaryview.c:8037
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Grįžti į aplankų sąrašą (yra neskaitytų laiškų)"
 
-#: ../src/summaryview.c:8039
+#: ../src/summaryview.c:8042
 msgid "Go back to the folder list"
 msgstr "Grįžti į aplankų sąrašą"
 
@@ -19181,11 +19353,11 @@ msgstr ""
 "    %s\n"
 "Grąžino kodą: %d\n"
 
-#: ../src/textview.c:2194
+#: ../src/textview.c:2173
 msgid "Tags: "
 msgstr "Gairės: "
 
-#: ../src/textview.c:2896
+#: ../src/textview.c:2875
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
@@ -19204,11 +19376,11 @@ msgstr ""
 "\n"
 "Vis tiek atverti?"
 
-#: ../src/textview.c:2905
+#: ../src/textview.c:2884
 msgid "Phishing attempt warning"
 msgstr "Įspėjimas apie galimą sukčiavimą"
 
-#: ../src/textview.c:2906
+#: ../src/textview.c:2885
 msgid "_Open URL"
 msgstr "At_verti URL"
 
@@ -19805,3 +19977,74 @@ msgid ""
 msgstr ""
 "Claws Mail programa paruošta.\n"
 "Norėdami pradėti, spauskite „Įrašyti“."
+
+#~ msgid "messages which contain header S"
+#~ msgstr "laiškai, kurie turi antraštę S"
+
+#~ msgid "Good signature (untrusted) from %s."
+#~ msgstr "Geras (bet nepatikimas) „%s“ parašas"
+
+#~ msgid "Cannot open temporary file"
+#~ msgstr "Nepavyksta atverti laikinosios rinkmenos"
+
+#~ msgid "Fetching '%s'..."
+#~ msgstr "Gaunama: „%s“..."
+
+#~ msgid "This feed format is not supported yet."
+#~ msgstr "Šis formatas dar nepalaikomas."
+
+#~ msgid "N/A"
+#~ msgstr "Nepasiekimas"
+
+#~ msgid "%ld byte"
+#~ msgid_plural "%ld bytes"
+#~ msgstr[0] "%ld baitas"
+#~ msgstr[1] "%ld baitai"
+#~ msgstr[2] "%ld baitų"
+
+#~ msgid "size unknown"
+#~ msgstr "dydis nežinomas"
+
+#~ msgid ""
+#~ "Couldn't fetch URL '%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nepavyksta atverti URL „%s“:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Couldn't fetch URL '%s':\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Nepavyksta atverti URL „%s“:\n"
+#~ "%s\n"
+
+#~ msgid "Time out connecting to URL %s\n"
+#~ msgstr "Baigėsi laikas jungiantis prie %s\n"
+
+#~ msgid "Couldn't fetch URL %s\n"
+#~ msgstr "Nepavysta atverti URL %s\n"
+
+#~ msgid "Can't remove feed '%s'."
+#~ msgstr "Nepavyksta pašalinti „%s“ naujienų kanalo."
+
+#~ msgid "Refresh _all feeds"
+#~ msgstr "Atnaujinti _visus kanalus"
+
+#~ msgid "_Unsubscribe feed..."
+#~ msgstr "Atsisakyti p_renumeratos..."
+
+#~ msgid "Remove folder _tree..."
+#~ msgstr "Šalinti aplankų _medį..."
+
+#~ msgid "Unsubscribe feed"
+#~ msgstr "Atsisakyti prenumeratos"
+
+#~ msgid "Do you really want to remove feed"
+#~ msgstr "Tikrai pašalinti šį kanalą?"
+
+#~ msgid "Remove cached entries"
+#~ msgstr "Šalinti podėlio įrašus"
+
+#~ msgid "RSSyl"
+#~ msgstr "RSSyl"
diff --git a/po/nl.po b/po/nl.po
index d722bde..eb592b0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,13 +11,14 @@
 #
 # todo:
 # snelkoppelingen nalopen
+# Configuratie is juist Instellingen
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2014-06-13 03:15+0400\n"
-"PO-Revision-Date: 2014-05-22 21:46+0100\n"
+"POT-Creation-Date: 2014-10-13 09:04+0100\n"
+"PO-Revision-Date: 2014-10-19 20:20+0100\n"
 "Last-Translator: Marcel Pol <marcel at timelord.nl>\n"
 "Language-Team:  <translators at lists.claws-mail.org>\n"
 "Language: nl\n"
@@ -27,39 +28,218 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: ../claws-mail.appdata.xml.in.h:1
-#, fuzzy
+#: ../claws-mail.desktop.in.h:1
+msgid "E-mail client"
+msgstr "E-mail client"
+
+#: ../claws-mail.desktop.in.h:2
+msgid "Lightweight and Fast GTK+ based Mail Client"
+msgstr "Lichtgewicht en snelle GTK+ gebaseerde Mail Client"
+
+#: ../claws-mail.desktop.in.h:3
+msgid "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
+msgstr ""
+"lichtgewicht;snel;gui;uitbreidbaar;plugin;pop;pop3;imap;imap4;nntp;news;"
+
+#: ../appdata/claws-mail.appdata.xml.in.h:1
 msgid "Claws Mail is a fast, powerful and very extensible email client."
-msgstr "Claws Mail is geregistreerd als standaard mailprogramma."
+msgstr ""
+"Claws Mail is een snel en zeer uitbreidbaar mailprogramma met veel "
+"mogelijkheden."
 
-#: ../claws-mail.appdata.xml.in.h:2
+#: ../appdata/claws-mail.appdata.xml.in.h:2
 msgid ""
 "It is highly configurable and handles hundreds of thousands of emails "
 "easily. Messages are managed in an open format, and are easy to interact "
 "with."
 msgstr ""
+"Het heeft veel configuratie-opties en kan duizenden e-mails makkelijk aan. "
+"Berichten worden opgeslagen in een open formaat, en ze zijn makkelijk te "
+"benaderen.\t"
 
-#: ../claws-mail.appdata.xml.in.h:3
+#: ../appdata/claws-mail.appdata.xml.in.h:3
 msgid ""
 "Lots of extra functionality is provided by plugins, such as PGP signatures "
 "and encryption, an RSS aggregator, a calendar, powerful spam filtering, Perl "
 "and Python interactions, HTML and PDF rendering, and more."
 msgstr ""
+"Veel extra functionaliteit wordt in voorzien door plugins, zoals PGP "
+"handtekeningen en versleuteling, een RSS-lezer, een agenda, goede "
+"spamfilters, Perl en Python interacties, HTML en PDF weergave, en meer."
 
-#: ../claws-mail.desktop.in.h:1
-msgid "E-mail client"
+#: ../appdata/claws-mail-acpi_notifier.metainfo.xml.in.h:1
+msgid "Enables mail notification via LEDs on some laptops"
+msgstr "Geeft e-mail notificatie via LEDs op sommige laptops"
+
+#: ../appdata/claws-mail-address_keeper.metainfo.xml.in.h:1
+msgid ""
+"Allows saving outgoing addresses to a designated folder in the address book"
 msgstr ""
+"Biedt de mogelijkheid om uitgaande adressen op te slaan in een opgegeven map "
+"in het adresboek"
 
-#: ../claws-mail.desktop.in.h:2
-msgid "Lightweight and Fast GTK+ based Mail Client"
+#: ../appdata/claws-mail-archive.metainfo.xml.in.h:1
+msgid "Allows to make tars or zips of old folders"
+msgstr ""
+"Biedt de mogelijkheid om tarbestanden of zipbestanden van oude mappen aan te "
+"maken"
+
+#: ../appdata/claws-mail-att_remover.metainfo.xml.in.h:1
+msgid "Lets you remove attachments from emails"
+msgstr "Biedt de mogelijkheid om bijlages van e-mails te verwijderen"
+
+#: ../appdata/claws-mail-attachwarner.metainfo.xml.in.h:1
+msgid ""
+"Warns when a message mentioning an attachment in the message body without "
+"attaching any files"
+msgstr ""
+"Waarschuwt wanneer een bericht een bijlage noemt in de berichtinhoud zonder "
+"dat er bijlages zijn bijgevoegd"
+
+#: ../appdata/claws-mail-bogofilter.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using Bogofilter"
+msgstr ""
+"Biedt de mogelijkheid om inkomende e-mail van een POP, IMAP of een lokaal "
+"account te scannen met behulp van Bogofilter"
+
+#: ../appdata/claws-mail-bsfilter.metainfo.xml.in.h:1
+msgid ""
+"Check all messages that are received from an IMAP, LOCAL or POP account for "
+"spam using Bsfilter"
+msgstr ""
+"Controleer alle erichten die ontvangen zijn van een IMAP, lokaal of POP "
+"account op spam met behulp van Bsfilter"
+
+#: ../appdata/claws-mail-clamd.metainfo.xml.in.h:1
+msgid ""
+"Scans all messages that are received from an IMAP, LOCAL or POP account "
+"using clamd (Clam AV)"
+msgstr ""
+"Scan alle berichten die ontvangen zijn van een IMAP, lokaal of POP account "
+"met behulp van clamd (Clam AV)"
+
+#: ../appdata/claws-mail-fancy.metainfo.xml.in.h:1
+msgid "Renders HTML e-mail using the WebKit library"
+msgstr "Geeft HTML e-mail weer met behulp van de WebKit bibliotheek"
+
+#: ../appdata/claws-mail-fetchinfo.metainfo.xml.in.h:1
+msgid ""
+"Inserts headers containing: UIDL, Claws' account name, POP server, user ID "
+"and retrieval time"
+msgstr ""
+"Voegt headers toe met UIDL, Claws' account naam, POP server, user ID en tijd "
+"van ophalen"
+
+#: ../appdata/claws-mail-gdata.metainfo.xml.in.h:1
+msgid "Provides an interface to Google services"
+msgstr "Biedt een interface voor Google diensten"
+
+#: ../appdata/claws-mail-geolocation.metainfo.xml.in.h:1
+msgid "Provides GeoLocation functionality"
+msgstr "Biedt GeoLocatie functionaliteit"
+
+#: ../appdata/claws-mail-libravatar.metainfo.xml.in.h:1
+msgid ""
+"Displays libravatar/gravatar profiles' images or a dynamically generated or "
+"predefined alternative"
+msgstr ""
+"Geeft libravatar/gravatar profielafbeeldingen weer of een dynamisch "
+"aangemaakte of vooraf opgegeven alternatief"
+
+#: ../appdata/claws-mail-mailmbox.metainfo.xml.in.h:1
+msgid "Direct support for mailboxes in mbox format"
+msgstr "Directe indersteuning voor mailboxen in mbox formaat"
+
+#: ../appdata/claws-mail-newmail.metainfo.xml.in.h:1
+msgid ""
+"Writes a msg header summary to a log file on arrival of new mail after "
+"sorting"
+msgstr ""
+"Geeft een berichtheader verslag van een logbestand op het aankomen van "
+"nieuwe e-mail na het sorteren"
+
+#: ../appdata/claws-mail-notification.metainfo.xml.in.h:1
+msgid "Provides various ways to notify the user of new and unread email"
+msgstr ""
+"Biedt verschillende manieren om de gebruiker notificatie te geven van nieuwe "
+"en ongelezen e-mail"
+
+#: ../appdata/claws-mail-pdf_viewer.metainfo.xml.in.h:1
+msgid ""
+"Enables the viewing of PDF and PostScript attachments using the Poppler "
+"library and GhostScript"
+msgstr ""
+"Deze plugin maakt het mogelijk om PDF en PostScript bijvoegsels te bekijken "
+"met behulp van de Poppler bibliotheek en GhostScript"
+
+#: ../appdata/claws-mail-perl.metainfo.xml.in.h:1
+msgid "Allowing the use of full Perl power in email filters"
+msgstr "Biedt de mogelijkheid om Perl volledig te gebruiken in e-mail filters"
+
+#: ../appdata/claws-mail-pgpcore.metainfo.xml.in.h:1
+msgid ""
+"Handles core PGP functions and is a dependency of both the PGP/Inline and "
+"PGP/MIME plugins."
+msgstr ""
+"Biedt de basis PGP functies en is een afhankelijkheid van zowel de PGP/"
+"Inline en PGP/MIME plugins"
+
+#: ../appdata/claws-mail-pgpinline.metainfo.xml.in.h:1
+msgid "Handles PGP/Inline signed and/or encrypted mails"
+msgstr "Werkt met PGP/Inline ondertekende en/of versleutelde e-mails"
+
+#: ../appdata/claws-mail-pgpmime.metainfo.xml.in.h:1
+msgid "Handles PGP/MIME signed and/or encrypted mails"
+msgstr "Werkt met PGP/MIME ondertekende en/of versleutelde e-mails"
+
+#: ../appdata/claws-mail-python.metainfo.xml.in.h:1
+msgid ""
+"Offers a Python scripting. Code can be entered into an embedded Python "
+"console or stored"
+msgstr ""
+"Biedt de mogelijkheid om Python scripts te gebruiken. Code kan ingevoerd "
+"worden in een interne Python console of worden opgeslagen"
+
+#: ../appdata/claws-mail-rssyl.metainfo.xml.in.h:1
+msgid "Read your RSS favourite newsfeeds"
+msgstr "Lees je favoriete RSS nieuwsfeeds"
+
+#: ../appdata/claws-mail-smime.metainfo.xml.in.h:1
+msgid "Handles S/MIME signed and/or encrypted mails"
+msgstr "Werkt met S/MIME ondertekende en/of versleutelde e-mails"
+
+#: ../appdata/claws-mail-spam_report.metainfo.xml.in.h:1
+msgid "Reports spam to various places"
+msgstr "Rapporteert spam op verschillende plekken"
+
+#: ../appdata/claws-mail-spamassassin.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using SpamAssassin"
 msgstr ""
+"Biedt de mogelijkheid om e-mail ontvangen van een POP, IMAP of lokaal "
+"account te scannen met behulp van SpamAssassin"
 
-#: ../src/account.c:392
+#: ../appdata/claws-mail-tnef_parse.metainfo.xml.in.h:1
+msgid "Enables reading application/ms-tnef attachments"
+msgstr "Biedt de mogelijkheid om application/ms-tnef bijlages te lezen"
+
+#: ../appdata/claws-mail-vcalendar.metainfo.xml.in.h:1
+msgid ""
+"Enables vCalendar message handling and handles webCal subscriptions. "
+"Provides a calendar import"
+msgstr ""
+"Biedt de mogelijkheid van vCalendar berichtafhandeling en werkt met webCal "
+"inschrijvingen. Biedt de mogelijkheid een agenda te importeren"
+
+#: ../src/account.c:392 ../src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
+"Please close all the composing windows before editing accounts."
 msgstr ""
-"Er zijn nog vensters open waarin berichten worden opgesteld.\n"
+"Enkele vensters zijn open waarin berichten worden opgesteld.\n"
 "Deze moeten gesloten worden voordat je de accountinstellingen kunt "
 "veranderen."
 
@@ -67,11 +247,11 @@ msgstr ""
 msgid "Can't create folder."
 msgstr "Kan map niet aanmaken."
 
-#: ../src/account.c:717
+#: ../src/account.c:724
 msgid "Edit accounts"
 msgstr "Accountbeheer"
 
-#: ../src/account.c:734
+#: ../src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -81,44 +261,44 @@ msgstr ""
 "in de kolom 'O' geeft aan voor welke accounts dit wordt gedaan. Vetgedrukte "
 "tekst geeft het standaardaccount aan."
 
-#: ../src/account.c:805
+#: ../src/account.c:812
 msgid " _Set as default account "
 msgstr " _Instellen als standaard account "
 
-#: ../src/account.c:897
+#: ../src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Accounts met mappen op de server kunnen niet worden gekopieerd."
 
 #. copy fields
-#: ../src/account.c:904
+#: ../src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopie van %s"
 
-#: ../src/account.c:1064
+#: ../src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Wil je werkelijk het account '%s' verwijderen?"
 
-#: ../src/account.c:1066
+#: ../src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Naamloos)"
 
-#: ../src/account.c:1067
+#: ../src/account.c:1074
 msgid "Delete account"
 msgstr "Verwijder account"
 
-#: ../src/account.c:1537
+#: ../src/account.c:1544
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "O"
 
-#: ../src/account.c:1543
+#: ../src/account.c:1550
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Ophalen' haalt berichten op voor de aangevinkte accounts"
 
-#: ../src/account.c:1550 ../src/addrduplicates.c:471 ../src/addressadd.c:215
-#: ../src/addressbook.c:125 ../src/compose.c:7144 ../src/editaddress.c:1263
+#: ../src/account.c:1557 ../src/addrduplicates.c:471 ../src/addressadd.c:215
+#: ../src/addressbook.c:125 ../src/compose.c:7148 ../src/editaddress.c:1263
 #: ../src/editaddress.c:1320 ../src/editaddress.c:1340
 #: ../src/editaddress_other_attributes_ldap.c:302
 #: ../src/editaddress_other_attributes_ldap.c:350 ../src/editbook.c:170
@@ -126,16 +306,16 @@ msgstr "'Ophalen' haalt berichten op voor de aangevinkte accounts"
 #: ../src/editvcard.c:173 ../src/importmutt.c:223 ../src/importpine.c:222
 #: ../src/mimeview.c:275 ../src/plugins/pdf_viewer/poppler_viewer.c:1797
 #: ../src/plugins/pgpcore/select-keys.c:396 ../src/prefs_filtering.c:384
-#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:78
+#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:79
 msgid "Name"
 msgstr "Naam"
 
-#: ../src/account.c:1558 ../src/prefs_account.c:1103
+#: ../src/account.c:1565 ../src/prefs_account.c:1103
 #: ../src/prefs_account.c:4058
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../src/account.c:1566 ../src/ssl_manager.c:102
+#: ../src/account.c:1573 ../src/ssl_manager.c:102
 msgid "Server"
 msgstr "Server"
 
@@ -187,8 +367,8 @@ msgstr ""
 "%s"
 
 #: ../src/action.c:990 ../src/ldaputil.c:326
-#: ../src/plugins/bogofilter/bogofilter.c:876 ../src/plugins/rssyl/feed.c:1739
-#: ../src/plugins/rssyl/feed.c:1743 ../src/plugins/tnef_parse/tnef_parse.c:67
+#: ../src/plugins/bogofilter/bogofilter.c:876
+#: ../src/plugins/tnef_parse/tnef_parse.c:67
 #: ../src/plugins/vcalendar/vcal_folder.c:1803
 #: ../src/plugins/vcalendar/vcal_folder.c:1807
 #: ../src/plugins/vcalendar/vcal_folder.c:1818
@@ -244,22 +424,19 @@ msgid "Action's user argument"
 msgstr "Gebruikersargument van actie"
 
 #: ../src/addrclip.c:479
-#, fuzzy
 msgid "Cannot copy a folder to itself or to its sub-structure."
-msgstr "Kan een map niet kopiëren naar een van z'n submappen."
+msgstr "Kan een map niet kopiëren naar zichzelf of één van z'n submappen."
 
 #: ../src/addrclip.c:502
-#, fuzzy
 msgid "Cannot copy an address book to itself."
-msgstr "Kan niet plakken.  Doel adresboek is alleen-lezen."
+msgstr "Kan adresboek niet naar zichzelf kopiéren."
 
 #: ../src/addrclip.c:593
-#, fuzzy
 msgid "Cannot move a folder to itself or to its sub-structure."
-msgstr "Kan een map niet verplaatsen naar een van z'n submappen."
+msgstr "Kan een map niet verplaatsen naar zichzelf of één van z'n submappen."
 
 #. that's a group
-#: ../src/addr_compl.c:620 ../src/addressbook.c:4866
+#: ../src/addr_compl.c:685 ../src/addressbook.c:4866
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "Groep"
@@ -334,14 +511,14 @@ msgstr ""
 
 #: ../src/addrcustomattr.c:212 ../src/addressbook.c:435
 #: ../src/addressbook.c:463 ../src/addressbook.c:480 ../src/edittags.c:272
-#: ../src/plugins/archive/archiver_gtk.c:1193 ../src/prefs_actions.c:1090
-#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1099
+#: ../src/plugins/archive/archiver_gtk.c:1194 ../src/prefs_actions.c:1090
+#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1119
 msgid "_Delete"
 msgstr "Ver_wijderen"
 
 #: ../src/addrcustomattr.c:213 ../src/edittags.c:273
 #: ../src/prefs_actions.c:1091 ../src/prefs_filtering.c:1694
-#: ../src/prefs_template.c:1100
+#: ../src/prefs_template.c:1120
 msgid "Delete _all"
 msgstr "_Alles verwijderen"
 
@@ -439,7 +616,7 @@ msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
 #: ../src/addressadd.c:485 ../src/editaddress.c:1582 ../src/headerview.c:281
-#: ../src/textview.c:2064
+#: ../src/textview.c:2043
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -470,17 +647,17 @@ msgstr "_Boek"
 
 #. {"Address/---",			NULL, "---", NULL, NULL, NULL },
 #: ../src/addressbook.c:403 ../src/addressbook.c:434 ../src/addressbook.c:462
-#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:504
+#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:506
 #: ../src/messageview.c:210
 msgid "_Edit"
 msgstr "B_ewerken"
 
-#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:507
+#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:509
 #: ../src/messageview.c:213
 msgid "_Tools"
 msgstr "_Gereedschap"
 
-#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:509
+#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:511
 #: ../src/messageview.c:214
 msgid "_Help"
 msgstr "_Help"
@@ -538,7 +715,7 @@ msgstr "K_nippen"
 
 #. Edit menu
 #: ../src/addressbook.c:431 ../src/addressbook.c:470 ../src/addressbook.c:486
-#: ../src/compose.c:610 ../src/mainwindow.c:538 ../src/messageview.c:226
+#: ../src/compose.c:610 ../src/mainwindow.c:540 ../src/messageview.c:226
 msgid "_Copy"
 msgstr "_Kopiëren"
 
@@ -594,7 +771,7 @@ msgid "Edit custom attributes..."
 msgstr "Bewerk extra gegevens..."
 
 #. Help menu
-#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:801
+#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:803
 #: ../src/messageview.c:339
 msgid "_About"
 msgstr "_Over"
@@ -604,9 +781,10 @@ msgid "_Browse Entry"
 msgstr "_Bekijk item"
 
 #. then add the appointment
-#: ../src/addressbook.c:504 ../src/crash.c:454 ../src/crash.c:473
+#: ../src/addressbook.c:504 ../src/crash.c:457 ../src/crash.c:476
 #: ../src/importldif.c:115 ../src/plugins/pgpcore/select-keys.c:251
-#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/vcalendar/day-view.c:402
+#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/pgpcore/sgpgme.c:168
+#: ../src/plugins/vcalendar/day-view.c:402
 #: ../src/plugins/vcalendar/month-view.c:428 ../src/prefs_themes.c:707
 #: ../src/prefs_themes.c:739 ../src/prefs_themes.c:740
 msgid "Unknown"
@@ -712,7 +890,7 @@ msgstr "Sterkere authenticatie vereist"
 msgid "Sources"
 msgstr "Bronnen"
 
-#: ../src/addressbook.c:914 ../src/prefs_matcher.c:629
+#: ../src/addressbook.c:914 ../src/prefs_matcher.c:632
 #: ../src/prefs_other.c:475 ../src/toolbar.c:225 ../src/toolbar.c:2142
 msgid "Address book"
 msgstr "Adresboek"
@@ -763,7 +941,7 @@ msgstr ""
 
 #: ../src/addressbook.c:2921 ../src/imap_gtk.c:363 ../src/mh_gtk.c:202
 #: ../src/plugins/mailmbox/plugin_gtk.c:324
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:236
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:152
 #: ../src/plugins/vcalendar/vcal_folder.c:1966
 msgid "Delete folder"
 msgstr "Verwijder map"
@@ -927,10 +1105,10 @@ msgstr "LDAP-verzoek"
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:443
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:490
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:613
-#: ../src/prefs_matcher.c:672 ../src/prefs_matcher.c:707
-#: ../src/prefs_matcher.c:1607 ../src/prefs_matcher.c:1614
-#: ../src/prefs_matcher.c:1622 ../src/prefs_matcher.c:1624
-#: ../src/prefs_matcher.c:2504 ../src/prefs_matcher.c:2508
+#: ../src/prefs_matcher.c:675 ../src/prefs_matcher.c:710
+#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:1626
+#: ../src/prefs_matcher.c:1634 ../src/prefs_matcher.c:1636
+#: ../src/prefs_matcher.c:2524 ../src/prefs_matcher.c:2528
 msgid "Any"
 msgstr "Elke"
 
@@ -1034,21 +1212,21 @@ msgstr "Adressen update"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Update mislukt. Wijzigingen niet opgeslagen naar map."
 
-#: ../src/alertpanel.c:146 ../src/compose.c:9293
+#: ../src/alertpanel.c:146 ../src/compose.c:9324
 msgid "Notice"
 msgstr "Bericht"
 
 #: ../src/alertpanel.c:159 ../src/compose.c:5656 ../src/compose.c:6133
-#: ../src/compose.c:11662 ../src/file_checker.c:78 ../src/file_checker.c:100
+#: ../src/compose.c:11670 ../src/file_checker.c:78 ../src/file_checker.c:100
 #: ../src/messageview.c:853 ../src/messageview.c:866
-#: ../src/plugins/pgpcore/sgpgme.c:719
+#: ../src/plugins/pgpcore/sgpgme.c:717
 #: ../src/plugins/vcalendar/vcalendar.c:125 ../src/summaryview.c:4863
 msgid "Warning"
 msgstr "Waarschuwing"
 
 #: ../src/alertpanel.c:172 ../src/alertpanel.c:195 ../src/compose.c:5597
 #: ../src/inc.c:669 ../src/plugins/pgpcore/sgpgme.c:152
-#: ../src/plugins/pgpcore/sgpgme.c:249
+#: ../src/plugins/pgpcore/sgpgme.c:253
 msgid "Error"
 msgstr "Fout"
 
@@ -1060,14 +1238,9 @@ msgstr "_Bekijk log"
 msgid "Show this message next time"
 msgstr "Deze waarschuwing volgende keer herhalen"
 
-#: ../src/avatars.c:97
-msgid "Internal avatars rendering already initialized"
-msgstr ""
-
 #: ../src/avatars.c:102
-#, fuzzy
 msgid "Failed to register avatars internal rendering hook"
-msgstr "Registreren van avatar-afbeelding-haak mislukt"
+msgstr "Registreren van avatar-interne-weergave-haak mislukt"
 
 #: ../src/browseldap.c:218
 msgid "Browse Directory Entry"
@@ -1176,7 +1349,7 @@ msgstr "Je versie van Claws Mail is te oud voor de '%s'-plugin."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Je versie van Claws Mail is te oud voor de plugin."
 
-#: ../src/common/session.c:177 ../src/imap.c:1171
+#: ../src/common/session.c:177 ../src/imap.c:1177
 msgid "SSL handshake failed\n"
 msgstr "SSL-handdruk mislukt\n"
 
@@ -1352,212 +1525,212 @@ msgstr "%d,%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: ../src/common/utils.c:4967
+#: ../src/common/utils.c:5000
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "zondag"
 
-#: ../src/common/utils.c:4968
+#: ../src/common/utils.c:5001
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "maandag"
 
-#: ../src/common/utils.c:4969
+#: ../src/common/utils.c:5002
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "dinsdag"
 
-#: ../src/common/utils.c:4970
+#: ../src/common/utils.c:5003
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "woensdag"
 
-#: ../src/common/utils.c:4971
+#: ../src/common/utils.c:5004
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "donderdag"
 
-#: ../src/common/utils.c:4972
+#: ../src/common/utils.c:5005
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "vrijdag"
 
-#: ../src/common/utils.c:4973
+#: ../src/common/utils.c:5006
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "zaterdag"
 
-#: ../src/common/utils.c:4975
+#: ../src/common/utils.c:5008
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "januari"
 
-#: ../src/common/utils.c:4976
+#: ../src/common/utils.c:5009
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "februari"
 
-#: ../src/common/utils.c:4977
+#: ../src/common/utils.c:5010
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "maart"
 
-#: ../src/common/utils.c:4978
+#: ../src/common/utils.c:5011
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "april"
 
-#: ../src/common/utils.c:4979
+#: ../src/common/utils.c:5012
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "mei"
 
-#: ../src/common/utils.c:4980
+#: ../src/common/utils.c:5013
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "juni"
 
-#: ../src/common/utils.c:4981
+#: ../src/common/utils.c:5014
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "juli"
 
-#: ../src/common/utils.c:4982
+#: ../src/common/utils.c:5015
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "augustus"
 
-#: ../src/common/utils.c:4983
+#: ../src/common/utils.c:5016
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "september"
 
-#: ../src/common/utils.c:4984
+#: ../src/common/utils.c:5017
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "oktober"
 
-#: ../src/common/utils.c:4985
+#: ../src/common/utils.c:5018
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "november"
 
-#: ../src/common/utils.c:4986
+#: ../src/common/utils.c:5019
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "december"
 
-#: ../src/common/utils.c:4988
+#: ../src/common/utils.c:5021
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "zo"
 
-#: ../src/common/utils.c:4989
+#: ../src/common/utils.c:5022
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "ma"
 
-#: ../src/common/utils.c:4990
+#: ../src/common/utils.c:5023
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "di"
 
-#: ../src/common/utils.c:4991
+#: ../src/common/utils.c:5024
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "wo"
 
-#: ../src/common/utils.c:4992
+#: ../src/common/utils.c:5025
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "do"
 
-#: ../src/common/utils.c:4993
+#: ../src/common/utils.c:5026
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "vr"
 
-#: ../src/common/utils.c:4994
+#: ../src/common/utils.c:5027
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "za"
 
-#: ../src/common/utils.c:4996
+#: ../src/common/utils.c:5029
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "jan"
 
-#: ../src/common/utils.c:4997
+#: ../src/common/utils.c:5030
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "feb"
 
-#: ../src/common/utils.c:4998
+#: ../src/common/utils.c:5031
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "mar"
 
-#: ../src/common/utils.c:4999
+#: ../src/common/utils.c:5032
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "apr"
 
-#: ../src/common/utils.c:5000
+#: ../src/common/utils.c:5033
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "mei"
 
-#: ../src/common/utils.c:5001
+#: ../src/common/utils.c:5034
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "jun"
 
-#: ../src/common/utils.c:5002
+#: ../src/common/utils.c:5035
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "jul"
 
-#: ../src/common/utils.c:5003
+#: ../src/common/utils.c:5036
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "aug"
 
-#: ../src/common/utils.c:5004
+#: ../src/common/utils.c:5037
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "sep"
 
-#: ../src/common/utils.c:5005
+#: ../src/common/utils.c:5038
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "okt"
 
-#: ../src/common/utils.c:5006
+#: ../src/common/utils.c:5039
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "nov"
 
-#: ../src/common/utils.c:5007
+#: ../src/common/utils.c:5040
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "dec"
 
-#: ../src/common/utils.c:5018
+#: ../src/common/utils.c:5051
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "a.m."
 
-#: ../src/common/utils.c:5019
+#: ../src/common/utils.c:5052
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "p.m."
 
-#: ../src/common/utils.c:5020
+#: ../src/common/utils.c:5053
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "a.m."
 
-#: ../src/common/utils.c:5021
+#: ../src/common/utils.c:5054
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "p.m."
@@ -1568,7 +1741,7 @@ msgstr "_Toevoegen..."
 
 #: ../src/compose.c:571 ../src/mh_gtk.c:361
 #: ../src/plugins/mailmbox/plugin_gtk.c:293
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:140
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:307
 msgid "_Remove"
 msgstr "_Verwijderen"
 
@@ -1577,7 +1750,7 @@ msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
 #. menus
-#: ../src/compose.c:580 ../src/mainwindow.c:506 ../src/messageview.c:212
+#: ../src/compose.c:580 ../src/mainwindow.c:508 ../src/messageview.c:212
 msgid "_Message"
 msgstr "Be_richt"
 
@@ -1649,7 +1822,7 @@ msgstr "Afge_broken"
 msgid "_Unwrapped"
 msgstr "Niet afgeb_roken"
 
-#: ../src/compose.c:618 ../src/mainwindow.c:539
+#: ../src/compose.c:618 ../src/mainwindow.c:541
 msgid "Select _all"
 msgstr "_Alles selecteren"
 
@@ -1781,48 +1954,48 @@ msgstr "_Prioriteit"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
 #. {"View/Scroll/---",          NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:666 ../src/mainwindow.c:603 ../src/messageview.c:265
+#: ../src/compose.c:666 ../src/mainwindow.c:605 ../src/messageview.c:265
 msgid "Character _encoding"
 msgstr "Tekenset_codering"
 
-#: ../src/compose.c:671 ../src/mainwindow.c:608 ../src/messageview.c:270
+#: ../src/compose.c:671 ../src/mainwindow.c:610 ../src/messageview.c:270
 msgid "Western European"
 msgstr "Westeuropees"
 
-#: ../src/compose.c:672 ../src/mainwindow.c:609 ../src/messageview.c:271
+#: ../src/compose.c:672 ../src/mainwindow.c:611 ../src/messageview.c:271
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: ../src/compose.c:673 ../src/mainwindow.c:610 ../src/messageview.c:272
+#: ../src/compose.c:673 ../src/mainwindow.c:612 ../src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebreeuws"
 
-#: ../src/compose.c:674 ../src/mainwindow.c:611 ../src/messageview.c:273
+#: ../src/compose.c:674 ../src/mainwindow.c:613 ../src/messageview.c:273
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: ../src/compose.c:675 ../src/mainwindow.c:612 ../src/messageview.c:274
+#: ../src/compose.c:675 ../src/mainwindow.c:614 ../src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Cyrillisch"
 
-#: ../src/compose.c:676 ../src/mainwindow.c:613 ../src/messageview.c:275
+#: ../src/compose.c:676 ../src/mainwindow.c:615 ../src/messageview.c:275
 msgid "Japanese"
 msgstr "Japans"
 
-#: ../src/compose.c:677 ../src/mainwindow.c:614 ../src/messageview.c:276
+#: ../src/compose.c:677 ../src/mainwindow.c:616 ../src/messageview.c:276
 msgid "Chinese"
 msgstr "Chinees"
 
-#: ../src/compose.c:678 ../src/mainwindow.c:615 ../src/messageview.c:277
+#: ../src/compose.c:678 ../src/mainwindow.c:617 ../src/messageview.c:277
 msgid "Korean"
 msgstr "Koreaans"
 
-#: ../src/compose.c:679 ../src/mainwindow.c:616 ../src/messageview.c:278
+#: ../src/compose.c:679 ../src/mainwindow.c:618 ../src/messageview.c:278
 msgid "Thai"
 msgstr "Thai"
 
 #. Tools menu
-#: ../src/compose.c:682 ../src/mainwindow.c:723 ../src/messageview.c:314
+#: ../src/compose.c:682 ../src/mainwindow.c:725 ../src/messageview.c:314
 msgid "_Address book"
 msgstr "_Adresboek"
 
@@ -1831,7 +2004,7 @@ msgid "_Template"
 msgstr "_Sjabloon"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:686 ../src/mainwindow.c:751 ../src/messageview.c:335
+#: ../src/compose.c:686 ../src/mainwindow.c:753 ../src/messageview.c:335
 msgid "Actio_ns"
 msgstr "Ac_ties"
 
@@ -1875,13 +2048,13 @@ msgid "_Normal"
 msgstr "_Normaal"
 
 #. RADIO compose_reply_change_mode_cb
-#: ../src/compose.c:707 ../src/mainwindow.c:657 ../src/messageview.c:303
+#: ../src/compose.c:707 ../src/mainwindow.c:659 ../src/messageview.c:303
 msgid "_All"
 msgstr "_Allen"
 
 #. RADIO compose_reply_change_mode_cb
 #. COMPOSE_REPLY_TO_ALL
-#: ../src/compose.c:708 ../src/mainwindow.c:658 ../src/messageview.c:304
+#: ../src/compose.c:708 ../src/mainwindow.c:660 ../src/messageview.c:304
 msgid "_Sender"
 msgstr "_Afzender"
 
@@ -1909,19 +2082,19 @@ msgstr "Laa_g"
 msgid "_Lowest"
 msgstr "_Laagste"
 
-#: ../src/compose.c:723 ../src/mainwindow.c:865 ../src/messageview.c:352
+#: ../src/compose.c:723 ../src/mainwindow.c:868 ../src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automatisch"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:724 ../src/mainwindow.c:866 ../src/messageview.c:353
+#: ../src/compose.c:724 ../src/mainwindow.c:869 ../src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:725 ../src/mainwindow.c:867 ../src/messageview.c:354
+#: ../src/compose.c:725 ../src/mainwindow.c:870 ../src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
@@ -1933,7 +2106,7 @@ msgstr "Unicode (_UTF-8)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:729 ../src/mainwindow.c:871 ../src/messageview.c:358
+#: ../src/compose.c:729 ../src/mainwindow.c:874 ../src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centraaleuropees (ISO-8859-_2)"
 
@@ -1943,7 +2116,7 @@ msgstr "Centraaleuropees (ISO-8859-_2)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:732 ../src/mainwindow.c:874 ../src/messageview.c:361
+#: ../src/compose.c:732 ../src/mainwindow.c:877 ../src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grieks (ISO-8859-_7)"
 
@@ -1957,7 +2130,7 @@ msgstr "Grieks (ISO-8859-_7)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:737 ../src/mainwindow.c:879 ../src/messageview.c:366
+#: ../src/compose.c:737 ../src/mainwindow.c:882 ../src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turks (ISO-8859-_9)"
 
@@ -2014,33 +2187,33 @@ msgstr "Doorsturen: meerdere e-mails"
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "De tekst van de \"Herverwijzen\" sjabloon heeft en fout op regel %d."
 
-#: ../src/compose.c:2591 ../src/gtk/headers.h:13
+#: ../src/compose.c:2591 ../src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: ../src/compose.c:2594 ../src/gtk/headers.h:14
+#: ../src/compose.c:2594 ../src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: ../src/compose.c:2597 ../src/gtk/headers.h:11
+#: ../src/compose.c:2597 ../src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
 #: ../src/compose.c:2600 ../src/compose.c:4911 ../src/compose.c:4913
-#: ../src/gtk/headers.h:32
+#: ../src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Nieuwsgroepen:"
 
-#: ../src/compose.c:2603 ../src/gtk/headers.h:33
+#: ../src/compose.c:2603 ../src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Followup-To:"
 
-#: ../src/compose.c:2606 ../src/gtk/headers.h:16
+#: ../src/compose.c:2606 ../src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "In antwoord aan:"
 
 #: ../src/compose.c:2610 ../src/compose.c:4908 ../src/compose.c:4916
-#: ../src/gtk/headers.h:12 ../src/summary_search.c:433
+#: ../src/gtk/headers.h:13 ../src/summary_search.c:433
 msgid "To:"
 msgstr "Aan:"
 
@@ -2081,7 +2254,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Wil je doorgaan?"
 
-#: ../src/compose.c:3603 ../src/compose.c:11144
+#: ../src/compose.c:3603 ../src/compose.c:11152
 msgid "+_Insert"
 msgstr "+_Invoegen"
 
@@ -2108,16 +2281,16 @@ msgstr "Kan %s niet lezen."
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:432
+#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Aangepast]"
 
-#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:435
+#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Bericht opstellen%s"
 
-#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:438
+#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[geen onderwerp] - Bericht opstellen%s"
@@ -2126,7 +2299,7 @@ msgstr "[geen onderwerp] - Bericht opstellen%s"
 #. * This partly duplicates functionality in compose.c::compose_set_title().
 #. * While it's nice to not have to modify Claws Mail for this to work,
 #. * it would be cleaner to export that function in Claws Mail.
-#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:426
+#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Bericht opstellen"
 
@@ -2182,7 +2355,7 @@ msgstr "Toch in de wachtrij zetten?"
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: ../src/compose.c:5134 ../src/compose.c:9719
+#: ../src/compose.c:5134 ../src/compose.c:9750
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2192,7 +2365,7 @@ msgstr ""
 "\n"
 "Omzetten van de tekenset mislukt."
 
-#: ../src/compose.c:5137 ../src/compose.c:9722
+#: ../src/compose.c:5137 ../src/compose.c:9753
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2202,7 +2375,7 @@ msgstr ""
 "\n"
 "Kon de sleutel van de ontvanger, nodig voor versleutelen, niet vinden."
 
-#: ../src/compose.c:5143 ../src/compose.c:9716
+#: ../src/compose.c:5143 ../src/compose.c:9747
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2292,7 +2465,7 @@ msgstr "geselecteerd account is geen NNTP: Posten is niet mogelijk."
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Bijvoegsel %s bestaat niet meer. Negeren?"
 
-#: ../src/compose.c:6133 ../src/mainwindow.c:648 ../src/toolbar.c:231
+#: ../src/compose.c:6133 ../src/mainwindow.c:650 ../src/toolbar.c:231
 #: ../src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Verzenden annuleren"
@@ -2310,34 +2483,34 @@ msgstr "Origineel %s gedeelte"
 msgid "Add to address _book"
 msgstr "Toevoegen aan adres_boek"
 
-#: ../src/compose.c:6908
+#: ../src/compose.c:6912
 msgid "Delete entry contents"
 msgstr "Verwijder inhoud"
 
-#: ../src/compose.c:6912 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: ../src/compose.c:6916 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Gebruik <tab> om adressen automatisch af te maken"
 
-#: ../src/compose.c:7132
+#: ../src/compose.c:7136
 msgid "Mime type"
 msgstr "MIME-type"
 
 #. S_COL_DATE
-#: ../src/compose.c:7138 ../src/mimeview.c:274
-#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:627
+#: ../src/compose.c:7142 ../src/mimeview.c:274
+#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:630
 #: ../src/prefs_summary_column.c:85 ../src/summaryview.c:445
 msgid "Size"
 msgstr "Grootte"
 
 #. Save Message to folder
-#: ../src/compose.c:7201
+#: ../src/compose.c:7205
 msgid "Save Message to "
 msgstr "Bericht bewaren in"
 
-#: ../src/compose.c:7238 ../src/editjpilot.c:276 ../src/editldap.c:520
+#: ../src/compose.c:7242 ../src/editjpilot.c:276 ../src/editldap.c:520
 #: ../src/editvcard.c:192 ../src/export.c:164 ../src/import.c:163
 #: ../src/importmutt.c:239 ../src/importpine.c:238
-#: ../src/plugins/archive/archiver_gtk.c:1028
+#: ../src/plugins/archive/archiver_gtk.c:1029
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:188
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:208
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:181
@@ -2346,24 +2519,23 @@ msgstr "Bericht bewaren in"
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: ../src/compose.c:7710
+#: ../src/compose.c:7714
 msgid "Hea_der"
 msgstr "Hea_der"
 
-#: ../src/compose.c:7715
+#: ../src/compose.c:7719
 msgid "_Attachments"
 msgstr "_Bijvoegsels"
 
-#: ../src/compose.c:7729
+#: ../src/compose.c:7733
 msgid "Othe_rs"
 msgstr "Anderen"
 
-#: ../src/compose.c:7744 ../src/gtk/headers.h:18
-#: ../src/plugins/pdf_viewer/poppler_viewer.c:702 ../src/summary_search.c:440
-msgid "Subject:"
-msgstr "Onderwerp:"
+#: ../src/compose.c:7748
+msgid "_Subject:"
+msgstr "_Onderwerp:"
 
-#: ../src/compose.c:7966
+#: ../src/compose.c:7970
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2372,20 +2544,20 @@ msgstr ""
 "Spellingcontrole kon niet gestart worden.\n"
 "%s"
 
-#: ../src/compose.c:8072
+#: ../src/compose.c:8076
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Van: <i>%s</i>"
 
-#: ../src/compose.c:8106
+#: ../src/compose.c:8119
 msgid "Account to use for this email"
 msgstr "Te gebruiken account voor dit bericht"
 
-#: ../src/compose.c:8108
+#: ../src/compose.c:8121
 msgid "Sender address to be used"
 msgstr "Een afzender-adres is verplicht."
 
-#: ../src/compose.c:8272
+#: ../src/compose.c:8285
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2394,64 +2566,68 @@ msgstr ""
 "Het privacy-systeem '%s' kon niet worden geladen. Het zal niet mogelijk zijn "
 "om dit bericht te ondertekenen of te versleutelen."
 
-#: ../src/compose.c:8372 ../src/plugins/archive/archiver_gtk.c:1082
+#: ../src/compose.c:8385 ../src/plugins/archive/archiver_gtk.c:1083
 msgid "_None"
 msgstr "G_een"
 
-#: ../src/compose.c:8473 ../src/prefs_template.c:753
+#: ../src/compose.c:8486 ../src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Opmaakfout in berichttekst-sjabloon op regel %d."
 
-#: ../src/compose.c:8589
+#: ../src/compose.c:8602
 msgid "Template From format error."
 msgstr "Opmaakfout in Van-sjabloon."
 
-#: ../src/compose.c:8607
+#: ../src/compose.c:8620
 msgid "Template To format error."
 msgstr "Opmaakfout in Aan-sjabloon."
 
-#: ../src/compose.c:8625
+#: ../src/compose.c:8638
 msgid "Template Cc format error."
 msgstr "Opmaakfout in Cc-sjabloon."
 
-#: ../src/compose.c:8643
+#: ../src/compose.c:8656
 msgid "Template Bcc format error."
 msgstr "Opmaakfout in Bcc-sjabloon."
 
-#: ../src/compose.c:8662
+#: ../src/compose.c:8674
+msgid "Template Reply-To format error."
+msgstr "Opmaakfout in Antwoord-Aan sjabloon."
+
+#: ../src/compose.c:8693
 msgid "Template subject format error."
 msgstr "Opmaakfout in Onderwerp-sjabloon."
 
-#: ../src/compose.c:8930
+#: ../src/compose.c:8961
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: ../src/compose.c:8945
+#: ../src/compose.c:8976
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: ../src/compose.c:9019
+#: ../src/compose.c:9050
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: ../src/compose.c:9036
+#: ../src/compose.c:9067
 msgid "MIME type"
 msgstr "MIME type"
 
-#: ../src/compose.c:9077
+#: ../src/compose.c:9108
 msgid "Encoding"
 msgstr "Codering"
 
-#: ../src/compose.c:9097
+#: ../src/compose.c:9128
 msgid "Path"
 msgstr "Pad"
 
-#: ../src/compose.c:9098
+#: ../src/compose.c:9129
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: ../src/compose.c:9290
+#: ../src/compose.c:9321
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2462,16 +2638,16 @@ msgstr ""
 "Zal ik het programma afbreken?\n"
 "procesgroep id: %d"
 
-#: ../src/compose.c:9685 ../src/messageview.c:1095
+#: ../src/compose.c:9716 ../src/messageview.c:1095
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 "Claws Mail heeft netwerktoegang nodig voor het verzenden van deze e-mail."
 
-#: ../src/compose.c:9711
+#: ../src/compose.c:9742
 msgid "Could not queue message."
 msgstr "Kon bericht niet in de wachtrij zetten."
 
-#: ../src/compose.c:9713
+#: ../src/compose.c:9744
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2482,15 +2658,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../src/compose.c:9891
+#: ../src/compose.c:9922
 msgid "Could not save draft."
 msgstr "Kon klad niet opslaan."
 
-#: ../src/compose.c:9895
+#: ../src/compose.c:9926
 msgid "Could not save draft"
 msgstr "Kon klad niet opslaan"
 
-#: ../src/compose.c:9896
+#: ../src/compose.c:9927
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2498,24 +2674,24 @@ msgstr ""
 "Kon klad niet opslaan.\n"
 "Wil je deze e-mail annuleren of weggooien?"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Cancel exit"
 msgstr "_Annuleren"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Discard email"
 msgstr "_Gooi e-mail weg"
 
-#: ../src/compose.c:10058 ../src/compose.c:10072
+#: ../src/compose.c:10089 ../src/compose.c:10103
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: ../src/compose.c:10086
+#: ../src/compose.c:10117
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Bestand '%s' kon niet gelezen worden."
 
-#: ../src/compose.c:10088
+#: ../src/compose.c:10119
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2524,63 +2700,63 @@ msgstr ""
 "Bestand '%s' bevat ongeldige characters\n"
 "voor de huidige codering, invoeging kan onjuist zijn."
 
-#: ../src/compose.c:10175
+#: ../src/compose.c:10206
 msgid "Discard message"
 msgstr "Gooi bericht weg"
 
-#: ../src/compose.c:10176
+#: ../src/compose.c:10207
 msgid "This message has been modified. Discard it?"
 msgstr "Bericht is gewijzigd, veranderingen laten vervallen?"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Discard"
 msgstr "_Gooi weg"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Save to Drafts"
 msgstr "Opslaan als _klad"
 
-#: ../src/compose.c:10179
+#: ../src/compose.c:10210
 msgid "Save changes"
 msgstr "Veranderingen opslaan"
 
-#: ../src/compose.c:10180
+#: ../src/compose.c:10211
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Bericht is gewijzigd. Veranderingen opslaan?"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "_Don't save"
 msgstr "_Niet opslaan"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "+_Save to Drafts"
 msgstr "+Opslaan als _Klad"
 
-#: ../src/compose.c:10251
+#: ../src/compose.c:10282
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Wil je sjabloon '%s' toepassen?"
 
-#: ../src/compose.c:10253
+#: ../src/compose.c:10284
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: ../src/compose.c:10254 ../src/prefs_actions.c:329
+#: ../src/compose.c:10285 ../src/prefs_actions.c:329
 #: ../src/prefs_filtering_action.c:610 ../src/prefs_filtering.c:477
-#: ../src/prefs_matcher.c:772 ../src/prefs_template.c:309
+#: ../src/prefs_matcher.c:775 ../src/prefs_template.c:311
 #: ../src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Vervang"
 
-#: ../src/compose.c:10254
+#: ../src/compose.c:10285
 msgid "_Insert"
 msgstr "_Invoegen"
 
-#: ../src/compose.c:11141
+#: ../src/compose.c:11149
 msgid "Insert or attach?"
 msgstr "In- of Bijvoegen"
 
-#: ../src/compose.c:11142
+#: ../src/compose.c:11150
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2588,16 +2764,16 @@ msgstr ""
 "Wil je de inhoud van de bestand(en) invoegen in de tekst van het bericht of "
 "bij het bericht voegen als het verstuurd wordt?"
 
-#: ../src/compose.c:11144
+#: ../src/compose.c:11152
 msgid "_Attach"
 msgstr "_Bijvoegen"
 
-#: ../src/compose.c:11361
+#: ../src/compose.c:11369
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Opmaakfout in citaat op regel %d."
 
-#: ../src/compose.c:11656
+#: ../src/compose.c:11664
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2858,15 +3034,15 @@ msgstr "Bewerken map"
 msgid "Input the new name of folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
-#: ../src/editgroup.c:556 ../src/foldersel.c:581 ../src/imap_gtk.c:195
+#: ../src/editgroup.c:556 ../src/foldersel.c:585 ../src/imap_gtk.c:195
 #: ../src/mh_gtk.c:145 ../src/plugins/mailmbox/plugin_gtk.c:239
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:89
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: ../src/editgroup.c:557 ../src/foldersel.c:582 ../src/mh_gtk.c:146
+#: ../src/editgroup.c:557 ../src/foldersel.c:586 ../src/mh_gtk.c:146
 #: ../src/plugins/mailmbox/plugin_gtk.c:240
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:90
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
@@ -3221,7 +3397,7 @@ msgstr "Toevoegen nieuwe VCard"
 
 #: ../src/etpan/etpan-ssl.c:167
 msgid "Impossible to set the client certificate.\n"
-msgstr ""
+msgstr "Niet mogelijk om client certificaat in te stellen.\n"
 
 #: ../src/exphtmldlg.c:106
 msgid "Please specify output directory and file to create."
@@ -3292,9 +3468,9 @@ msgstr "Stylesheet"
 #. * can always get back the SummaryView pointer.
 #: ../src/exphtmldlg.c:453 ../src/gtk/colorlabel.c:406
 #: ../src/gtk/gtkaspell.c:1571 ../src/gtk/gtkaspell.c:2231
-#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1174
+#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1177
 #: ../src/plugins/archive/archiver_prefs.c:241
-#: ../src/plugins/libravatar/libravatar_prefs.c:187 ../src/prefs_account.c:949
+#: ../src/plugins/libravatar/libravatar_prefs.c:206 ../src/prefs_account.c:949
 #: ../src/prefs_toolbar.c:780 ../src/prefs_toolbar.c:1465
 #: ../src/summaryview.c:6008
 msgid "None"
@@ -3306,7 +3482,7 @@ msgid "Default"
 msgstr "Standaard"
 
 #: ../src/exphtmldlg.c:455 ../src/plugins/pgpcore/select-keys.c:244
-#: ../src/plugins/pgpcore/sgpgme.c:148
+#: ../src/plugins/pgpcore/sgpgme.c:148 ../src/plugins/pgpcore/sgpgme.c:164
 msgid "Full"
 msgstr "Volledig"
 
@@ -3536,7 +3712,7 @@ msgstr "Exporteren Adresboek naar LDIF-bestand"
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: ../src/export.c:113 ../src/summaryview.c:8117
+#: ../src/export.c:113 ../src/summaryview.c:8120
 msgid "Export to mbox file"
 msgstr "Exporteer naar mbox-bestand"
 
@@ -3573,7 +3749,7 @@ msgid "Full Name"
 msgstr "Volledige naam"
 
 #: ../src/exporthtml.c:771 ../src/importldif.c:1022
-#: ../src/plugins/archive/archiver_gtk.c:736
+#: ../src/plugins/archive/archiver_gtk.c:737
 msgid "Attributes"
 msgstr "Gegevens"
 
@@ -3618,7 +3794,7 @@ msgstr ""
 
 #: ../src/filtering.c:619 ../src/filtering.c:694 ../src/filtering.c:723
 msgid "rule is not account-based\n"
-msgstr ""
+msgstr "Regel is niet verbonden met een account\n"
 
 #: ../src/filtering.c:623
 #, c-format
@@ -3626,18 +3802,22 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
 msgstr ""
+"regel is verbonden aan een account [id=%d, naam='%s'], overeenkomend met het "
+"account dat nu gebruikt wordt om berichten op te halen\n"
 
 #: ../src/filtering.c:625 ../src/filtering.c:642 ../src/filtering.c:643
 #: ../src/filtering.c:667 ../src/filtering.c:685 ../src/filtering.c:712
 #: ../src/filtering.c:713 ../src/filtering.c:730 ../src/filtering.c:731
 msgid "NON_EXISTENT"
-msgstr ""
+msgstr "NON_EXISTENT"
 
 #: ../src/filtering.c:633
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
+"regel is verbonden met een account, niet overeenkomend met het account dat "
+"nu gebruikt wordt om berichten op te halen\n"
 
 #: ../src/filtering.c:640
 #, c-format
@@ -3645,11 +3825,16 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
 msgstr ""
+"regel is verbonden met een account [id=%d, naam='%s'], niet overeenkomend "
+"met het account dat nu gebruikt wordt om berichten op te halen [id=%d, "
+"naam='%s']\n"
 
 #: ../src/filtering.c:659
 msgid ""
 "rule is not account-based, all rules are applied on user request anyway\n"
 msgstr ""
+"regel is niet verbonden met een account, alle regels worden toegepast "
+"volgens aanvraag van de gebruiker\n"
 
 #: ../src/filtering.c:665
 #, c-format
@@ -3657,15 +3842,20 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
 "request\n"
 msgstr ""
+"regel is verbonden met een account [id=%d, naam='%s'], maar alle regels "
+"worden toegepast op aanvraag van de gebruiker\n"
 
 #: ../src/filtering.c:683
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
+"regel is gebonden aan een account [id=%d, naam='%s'], overgeslagen op "
+"verzoek van de gebruiker\n"
 
 #: ../src/filtering.c:688
 msgid "rule is account-based, skipped on user request\n"
 msgstr ""
+"regel is gebonden aan een account, overgeslagen op verzoek van de gebruiker\n"
 
 #: ../src/filtering.c:710
 #, c-format
@@ -3673,10 +3863,12 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching current account [id="
 "%d, name='%s']\n"
 msgstr ""
+"regel is gebonden aan een account [id=%d, naam='%s'], niet het huidige "
+"account [id=%d, naam='%s']\n"
 
 #: ../src/filtering.c:716
 msgid "rule is account-based, not matching current account\n"
-msgstr ""
+msgstr "regel is gebonden aan een account, niet het huidige account\n"
 
 #: ../src/filtering.c:728
 #, c-format
@@ -3684,70 +3876,66 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], current account [id=%d, "
 "name='%s']\n"
 msgstr ""
+"regel is gebonden aan een account [id=%d, naam='%s'], het huidige account "
+"[id=%d, naam='%s']\n"
 
 #: ../src/filtering.c:768
 #, c-format
 msgid "applying action [ %s ]\n"
-msgstr ""
+msgstr "toepassen actie [ %s ]\n"
 
 #: ../src/filtering.c:773
 msgid "action could not apply\n"
-msgstr ""
+msgstr "actie kon niet toegepast worden\n"
 
 #: ../src/filtering.c:775
 #, c-format
 msgid "no further processing after action [ %s ]\n"
-msgstr ""
+msgstr "geen verdere verwerking na actie [ %s ]\n"
 
 #: ../src/filtering.c:826
-#, fuzzy, c-format
+#, c-format
 msgid "processing rule '%s' [ %s ]\n"
-msgstr "_Verwerkingsregel draaien"
+msgstr "verwerking van regel '%s' [ %s ]\n"
 
 #: ../src/filtering.c:830
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "verwerken van regel <onbekend> [ %s ]\n"
 
 #: ../src/filtering.c:848
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
-msgstr ""
+msgstr "regel uitgezet '%s' [ %s ]\n"
 
 #: ../src/filtering.c:852
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "regel uitgezet <onbekend> [ %s ]\n"
 
 #: ../src/filtering.c:890
-#, fuzzy
 msgid "undetermined"
 msgstr "Niet gedefiniëerd"
 
 #: ../src/filtering.c:894
-#, fuzzy
 msgid "incorporation"
-msgstr "filteren bij ontvangst"
+msgstr ""
 
 #: ../src/filtering.c:898
-#, fuzzy
 msgid "manually"
-msgstr "_Handboek"
+msgstr "handmatig"
 
 #: ../src/filtering.c:902
-#, fuzzy
 msgid "folder processing"
-msgstr "_Verwerkingsregels draaien voor map"
+msgstr "verwerken van map"
 
 #: ../src/filtering.c:906
-#, fuzzy
 msgid "pre-processing"
-msgstr "_Voorverwerken..."
+msgstr "voorverwerken"
 
 #: ../src/filtering.c:910
-#, fuzzy
 msgid "post-processing"
-msgstr "_Naverwerken..."
+msgstr "naverwerken"
 
 #: ../src/filtering.c:927
 #, c-format
@@ -3759,10 +3947,16 @@ msgid ""
 "%s%s %s\n"
 "%s%s %s\n"
 msgstr ""
+"filteren van bericht (%s%s%s)\n"
+"%sberichtbestand: %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
 
 #: ../src/filtering.c:929 ../src/filtering.c:938
 msgid ": "
-msgstr ""
+msgstr ": "
 
 #: ../src/filtering.c:936
 #, c-format
@@ -3770,6 +3964,8 @@ msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
 msgstr ""
+"filteren van bericht (%s%s%s)\n"
+"%sberichtbestand: %s\n"
 
 #: ../src/folder.c:1564 ../src/foldersel.c:403 ../src/prefs_folder_item.c:306
 msgid "Inbox"
@@ -3827,38 +4023,37 @@ msgstr "Synchroniseren %s voor offline gebruik... \n"
 msgid "Select folder"
 msgstr "Selecteer map"
 
-#: ../src/foldersel.c:583 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
+#: ../src/foldersel.c:587 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
 #: ../src/plugins/mailmbox/plugin_gtk.c:241
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: ../src/foldersel.c:591 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
+#: ../src/foldersel.c:595 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
 #: ../src/imap_gtk.c:272 ../src/imap_gtk.c:277 ../src/mh_gtk.c:155
 #: ../src/mh_gtk.c:259 ../src/news_gtk.c:315
 #: ../src/plugins/mailmbox/plugin_gtk.c:249
 #: ../src/plugins/mailmbox/plugin_gtk.c:416
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:97
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:339
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
 #: ../src/plugins/vcalendar/vcal_folder.c:2040
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map voorkomen."
 
-#: ../src/foldersel.c:601 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
+#: ../src/foldersel.c:605 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
 #: ../src/mh_gtk.c:165 ../src/mh_gtk.c:266 ../src/news_gtk.c:322
 #: ../src/plugins/mailmbox/plugin_gtk.c:261
 #: ../src/plugins/mailmbox/plugin_gtk.c:425
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:107
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:346
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:211
 #: ../src/plugins/vcalendar/vcal_folder.c:2047
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: ../src/foldersel.c:608 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
+#: ../src/foldersel.c:612 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
 #: ../src/plugins/mailmbox/plugin_gtk.c:268
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:113
+#: ../src/plugins/rssyl/opml_import.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:121
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Kan map '%s' niet aanmaken."
@@ -3871,7 +4066,7 @@ msgstr "_Alles gelezen"
 msgid "R_un processing rules"
 msgstr "_Verwerkingsregel draaien"
 
-#: ../src/folderview.c:233 ../src/mainwindow.c:544
+#: ../src/folderview.c:233 ../src/mainwindow.c:546
 msgid "_Search folder..."
 msgstr "_Map doorzoeken..."
 
@@ -3890,7 +4085,7 @@ msgstr "Verzend wacht_rij..."
 #. F_COL_FOLDER
 #: ../src/folderview.c:380 ../src/folderview.c:427
 #: ../src/plugins/notification/notification_lcdproc.c:141
-#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:388
+#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:391
 #: ../src/summaryview.c:6284
 msgid "New"
 msgstr "Nieuw"
@@ -3898,7 +4093,7 @@ msgstr "Nieuw"
 #. F_COL_NEW
 #: ../src/folderview.c:381 ../src/folderview.c:428
 #: ../src/plugins/notification/notification_lcdproc.c:145
-#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:387
+#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:390
 #: ../src/summaryview.c:6286
 msgid "Unread"
 msgstr "Ongelezen"
@@ -3920,21 +4115,21 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: ../src/folderview.c:823 ../src/summaryview.c:4117 ../src/summaryview.c:4119
+#: ../src/folderview.c:823 ../src/summaryview.c:4119 ../src/summaryview.c:4121
 msgid "Mark all as read"
 msgstr "Markeer alles als gelezen"
 
-#: ../src/folderview.c:824 ../src/summaryview.c:4118
+#: ../src/folderview.c:824 ../src/summaryview.c:4120
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Wil je werkelijk alle berichten in deze map als gelezen markeren?"
 
-#: ../src/folderview.c:982 ../src/imap.c:4528 ../src/mainwindow.c:5134
+#: ../src/folderview.c:982 ../src/imap.c:4574 ../src/mainwindow.c:5157
 #: ../src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Map wordt ingelezen %s%c%s..."
 
-#: ../src/folderview.c:986 ../src/imap.c:4533 ../src/mainwindow.c:5139
+#: ../src/folderview.c:986 ../src/imap.c:4579 ../src/mainwindow.c:5162
 #: ../src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
@@ -3966,61 +4161,61 @@ msgstr "Kan map '%s' niet inlezen\n"
 msgid "Checking for new messages in all folders..."
 msgstr "Alle mappen worden gecontroleerd op nieuwe berichten..."
 
-#: ../src/folderview.c:2005
+#: ../src/folderview.c:2046
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Map %s wordt gesloten..."
 
 #. Open Folder
 #. TODO: wwp: avoid displaying (null) in the status bar
-#: ../src/folderview.c:2100
+#: ../src/folderview.c:2141
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Map %s wordt geopend..."
 
-#: ../src/folderview.c:2118
+#: ../src/folderview.c:2159
 msgid "Folder could not be opened."
 msgstr "Map kon niet worden geopend."
 
-#: ../src/folderview.c:2261 ../src/mainwindow.c:2877 ../src/mainwindow.c:2881
+#: ../src/folderview.c:2302 ../src/mainwindow.c:2887 ../src/mainwindow.c:2891
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: ../src/folderview.c:2262
+#: ../src/folderview.c:2303
 msgid "Delete all messages in trash?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: ../src/folderview.c:2263
+#: ../src/folderview.c:2304
 msgid "+_Empty trash"
 msgstr "+Prullenbak leegmaken"
 
-#: ../src/folderview.c:2307 ../src/inc.c:1540 ../src/toolbar.c:2607
+#: ../src/folderview.c:2348 ../src/inc.c:1540 ../src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Off-line waarschuwing"
 
-#: ../src/folderview.c:2308 ../src/toolbar.c:2608
+#: ../src/folderview.c:2349 ../src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Je bent momenteel niet online. Toch doorgaan?"
 
-#: ../src/folderview.c:2319 ../src/toolbar.c:2627
+#: ../src/folderview.c:2360 ../src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: ../src/folderview.c:2320 ../src/toolbar.c:2628
+#: ../src/folderview.c:2361 ../src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Alle berichten uit de wachtrij verzenden?"
 
-#: ../src/folderview.c:2321 ../src/messageview.c:854 ../src/messageview.c:871
+#: ../src/folderview.c:2362 ../src/messageview.c:854 ../src/messageview.c:871
 #: ../src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Verzenden"
 
-#: ../src/folderview.c:2329 ../src/toolbar.c:2647
+#: ../src/folderview.c:2370 ../src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 "Er is een fout opgetreden bij het verzenden van berichten in de wachtrij."
 
-#: ../src/folderview.c:2332 ../src/main.c:2714 ../src/toolbar.c:2650
+#: ../src/folderview.c:2373 ../src/main.c:2714 ../src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4029,65 +4224,65 @@ msgstr ""
 "Er zijn fouten opgetreden bij het verzenden van berichten in de wachtrij:\n"
 "%s"
 
-#: ../src/folderview.c:2409
+#: ../src/folderview.c:2450
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Wil je werkelijk map '%s' kopiëren naar '%s'?"
 
-#: ../src/folderview.c:2410
+#: ../src/folderview.c:2451
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Wil je werkelijk van map '%s' een submap maken van '%s'?"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Copy folder"
 msgstr "Kopieer map"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Move folder"
 msgstr "Verplaats map"
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Bezig %s te kopiëren naar %s ..."
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Bezig %s te verplaatsen naar %s ..."
 
-#: ../src/folderview.c:2454
+#: ../src/folderview.c:2495
 msgid "Source and destination are the same."
 msgstr "Bron en bestemming zijn hetzelfde."
 
-#: ../src/folderview.c:2457
+#: ../src/folderview.c:2498
 msgid "Can't copy a folder to one of its children."
 msgstr "Kan een map niet kopiëren naar een van z'n submappen."
 
-#: ../src/folderview.c:2458
+#: ../src/folderview.c:2499
 msgid "Can't move a folder to one of its children."
 msgstr "Kan een map niet verplaatsen naar een van z'n submappen."
 
-#: ../src/folderview.c:2461
+#: ../src/folderview.c:2502
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Kan een map niet naar een ander postvak verplaatsen."
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Copy failed!"
 msgstr "Kopiëren mislukt!"
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Move failed!"
 msgstr "Verplaatsen mislukt!"
 
-#: ../src/folderview.c:2515
+#: ../src/folderview.c:2556
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Instellingen voor map '%s' wordt verwerkt"
 
-#: ../src/folderview.c:2943 ../src/summaryview.c:4558
-#: ../src/summaryview.c:4657
+#: ../src/folderview.c:2984 ../src/summaryview.c:4560
+#: ../src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Doel-map kan alleen gebruikt worden om submappen op te slaan."
 
@@ -4633,92 +4828,91 @@ msgstr ""
 
 #: ../src/gtk/gtkutils.c:1907
 msgid "Failed."
-msgstr ""
+msgstr "Niet gelukt."
 
 #: ../src/gtk/gtkutils.c:1970
-#, fuzzy
 msgid "Configuring..."
-msgstr "_Instellingen"
+msgstr "Instellen..."
 
 #. RFC2822
 #. S_COL_TO
 #. date expression
 #. S_COL_TO
-#: ../src/gtk/headers.h:8 ../src/prefs_filtering_action.c:1259
-#: ../src/prefs_matcher.c:2158 ../src/prefs_summary_column.c:84
+#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1259
+#: ../src/prefs_matcher.c:2174 ../src/prefs_summary_column.c:84
 #: ../src/quote_fmt.c:49 ../src/summaryview.c:444
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/gtk/headers.h:8
+#: ../src/gtk/headers.h:9
 msgid "Date:"
 msgstr "Datum:"
 
 #. S_COL_SUBJECT
 #. date
 #. S_COL_SUBJECT
-#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1256
-#: ../src/prefs_matcher.c:2155 ../src/prefs_summary_column.c:82
+#: ../src/gtk/headers.h:10 ../src/prefs_filtering_action.c:1256
+#: ../src/prefs_matcher.c:2171 ../src/prefs_summary_column.c:82
 #: ../src/quote_fmt.c:50 ../src/summaryview.c:442
 msgid "From"
 msgstr "Afzender"
 
-#: ../src/gtk/headers.h:9 ../src/summary_search.c:426
+#: ../src/gtk/headers.h:10 ../src/summary_search.c:426
 msgid "From:"
 msgstr "Afzender:"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender"
 msgstr "Afzender"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender:"
 msgstr "Afzender:"
 
-#: ../src/gtk/headers.h:11
+#: ../src/gtk/headers.h:12
 msgid "Reply-To"
 msgstr "Antwoord aan"
 
 #. S_COL_FROM
 #. subject
 #. S_COL_FROM
-#: ../src/gtk/headers.h:12 ../src/prefs_filtering_action.c:1257
-#: ../src/prefs_matcher.c:2156 ../src/prefs_summary_column.c:83
+#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1257
+#: ../src/prefs_matcher.c:2172 ../src/prefs_summary_column.c:83
 #: ../src/quote_fmt.c:57 ../src/summaryview.c:443
 msgid "To"
 msgstr "Aan"
 
 #. to
-#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1258
-#: ../src/prefs_matcher.c:2157 ../src/quote_fmt.c:58
+#: ../src/gtk/headers.h:14 ../src/prefs_filtering_action.c:1258
+#: ../src/prefs_matcher.c:2173 ../src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
-#: ../src/gtk/headers.h:14
+#: ../src/gtk/headers.h:15
 msgid "Bcc"
 msgstr "Bcc"
 
 #. references
-#: ../src/gtk/headers.h:15 ../src/prefs_filtering_action.c:1260
-#: ../src/prefs_matcher.c:2159 ../src/quote_fmt.c:61
+#: ../src/gtk/headers.h:16 ../src/prefs_filtering_action.c:1260
+#: ../src/prefs_matcher.c:2175 ../src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Bericht-ID"
 
-#: ../src/gtk/headers.h:15
+#: ../src/gtk/headers.h:16
 msgid "Message-ID:"
 msgstr "Bericht-ID:"
 
-#: ../src/gtk/headers.h:16
+#: ../src/gtk/headers.h:17
 msgid "In-Reply-To"
 msgstr "In antwoord aan"
 
 #. newsgroups
-#: ../src/gtk/headers.h:17 ../src/prefs_filtering_action.c:1262
-#: ../src/prefs_matcher.c:2161 ../src/quote_fmt.c:60
+#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1262
+#: ../src/prefs_matcher.c:2177 ../src/quote_fmt.c:60
 msgid "References"
 msgstr "Verwijzingen"
 
-#: ../src/gtk/headers.h:17
+#: ../src/gtk/headers.h:18
 msgid "References:"
 msgstr "Verwijzingen:"
 
@@ -4726,328 +4920,333 @@ msgstr "Verwijzingen:"
 #. initial of sender
 #. S_COL_STATUS
 #. S_COL_MIME
-#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1255
-#: ../src/prefs_matcher.c:2154 ../src/prefs_summary_column.c:81
+#: ../src/gtk/headers.h:19 ../src/prefs_filtering_action.c:1255
+#: ../src/prefs_matcher.c:2170 ../src/prefs_summary_column.c:81
 #: ../src/quote_fmt.c:56 ../src/summaryview.c:441
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:19 ../src/plugins/pdf_viewer/poppler_viewer.c:702
+#: ../src/summary_search.c:440
+msgid "Subject:"
+msgstr "Onderwerp:"
+
+#: ../src/gtk/headers.h:20
 msgid "Comments"
 msgstr "Opmerkingen"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:20
 msgid "Comments:"
 msgstr "Opmerkingen:"
 
-#: ../src/gtk/headers.h:20
+#: ../src/gtk/headers.h:21
 msgid "Keywords"
 msgstr "Sleutelwoorden"
 
-#: ../src/gtk/headers.h:20 ../src/plugins/pdf_viewer/poppler_viewer.c:704
+#: ../src/gtk/headers.h:21 ../src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Keywords:"
 msgstr "Sleutelwoorden:"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date"
 msgstr "Herzonden-Datum"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date:"
 msgstr "Herzonden-Datum:"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From"
 msgstr "Herzonden-Van"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From:"
 msgstr "Herzonden-Van:"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender"
 msgstr "Herzonden-Afzender"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender:"
 msgstr "Herzonden-Afzender"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To"
 msgstr "Herzonden-Aan"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To:"
 msgstr "Herzonden-Aan:"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc"
 msgstr "Herzonden-CC"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc:"
 msgstr "Herzonden-CC:"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc"
 msgstr "Herzonden-Bcc"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc:"
 msgstr "Herzonden-Bcc:"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID"
 msgstr "Herzonden-Bericht-ID"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID:"
 msgstr "Herzonden-Bericht-ID:"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path"
 msgstr "Terugkeer-Pad"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path:"
 msgstr "Terugkeer-Pad:"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received"
 msgstr "Ontvangen"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received:"
 msgstr "Ontvangen:"
 
 #. more
 #. cc
-#: ../src/gtk/headers.h:32 ../src/prefs_filtering_action.c:1261
-#: ../src/prefs_matcher.c:2160 ../src/quote_fmt.c:59
+#: ../src/gtk/headers.h:33 ../src/prefs_filtering_action.c:1261
+#: ../src/prefs_matcher.c:2176 ../src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Nieuwsgroepen"
 
-#: ../src/gtk/headers.h:33
+#: ../src/gtk/headers.h:34
 msgid "Followup-To"
 msgstr "Opvolgend-Aan"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To"
 msgstr "Afgeleverd-Aan"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To:"
 msgstr "Afgeleverd aan:"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen"
 msgstr "Gezien"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen:"
 msgstr "Gezien:"
 
 #. S_COL_MARK
-#: ../src/gtk/headers.h:36 ../src/gtk/progressdialog.c:149
+#: ../src/gtk/headers.h:37 ../src/gtk/progressdialog.c:149
 #: ../src/gtk/sslcertwindow.c:164 ../src/prefs_summary_column.c:79
 #: ../src/summaryview.c:2793
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtk/headers.h:36 ../src/prefs_themes.c:906
+#: ../src/gtk/headers.h:37 ../src/prefs_themes.c:906
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face"
 msgstr "Face"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face:"
 msgstr "Face:"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To"
 msgstr "Disposition-Notification-To"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To:"
 msgstr "Disposition-Notification-To:"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To"
 msgstr "Ontvangstbevestiging-Aan"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To:"
 msgstr "Ontvangstbevestiging-Aan:"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent"
 msgstr "Applicatie"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent:"
 msgstr "Applicatie:"
 
-#: ../src/gtk/headers.h:41
+#: ../src/gtk/headers.h:42
 msgid "Content-Type"
 msgstr "Inhoud-Type"
 
-#: ../src/gtk/headers.h:41 ../src/image_viewer.c:327
+#: ../src/gtk/headers.h:42 ../src/image_viewer.c:327
 msgid "Content-Type:"
 msgstr "Inhoud-Type:"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding"
 msgstr "Inhoud-Overdracht-Codering"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding:"
 msgstr "Inhoud-Overdracht-Codering:"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version"
 msgstr "MIME-Versie"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version:"
 msgstr "MIME-Versie:"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence"
 msgstr "Voorrang"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence:"
 msgstr "Voorrang:"
 
-#: ../src/gtk/headers.h:45 ../src/prefs_account.c:1073
+#: ../src/gtk/headers.h:46 ../src/prefs_account.c:1073
 msgid "Organization"
 msgstr "Organisatie"
 
-#: ../src/gtk/headers.h:45
+#: ../src/gtk/headers.h:46
 msgid "Organization:"
 msgstr "Organisatie:"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List"
 msgstr "Mailing-Lijst"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List:"
 msgstr "Mailing-Lijst:"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post"
 msgstr "Lijst-Post"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post:"
 msgstr "Lijst-Post:"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe"
 msgstr "Lijst-Inschrijven"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe:"
 msgstr "Lijst-Inschrijven:"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe"
 msgstr "Lijst-Uitschrijven"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe:"
 msgstr "Lijst-Uitschrijven:"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help"
 msgstr "Lijst-Help"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help:"
 msgstr "Lijst-Help:"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive"
 msgstr "Lijst-Archief"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive:"
 msgstr "Lijst-Archief:"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner"
 msgstr "Lijst-Eigenaar"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner:"
 msgstr "Lijst-Eigenaar:"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label"
 msgstr "X-Label"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label:"
 msgstr "X-Label:"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer"
 msgstr "X-Mailer"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer:"
 msgstr "X-Mailer:"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status"
 msgstr "X-Status"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status:"
 msgstr "X-Status:"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face"
 msgstr "X-Face"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face:"
 msgstr "X-Face:"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive"
 msgstr "X-Niet-Archiveren"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive:"
 msgstr "X-Niet-Archiveren:"
 
 #. some common logical names referring to real header names
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to"
 msgstr "In antwoord op"
 
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to:"
 msgstr "In antwoord op:"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc"
 msgstr "Aan of Cc"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc:"
 msgstr "Aan of Cc:"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject"
 msgstr "Van, Aan of Onderwerp"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject:"
 msgstr "Van, Aan of Onderwerp:"
 
@@ -5236,10 +5435,10 @@ msgstr ""
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:457
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:400
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:550
-#: ../src/plugins/fancy/fancy_prefs.c:109
+#: ../src/plugins/fancy/fancy_prefs.c:114
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:178
 #: ../src/plugins/gdata/cm_gdata_prefs.c:145
-#: ../src/plugins/libravatar/libravatar_prefs.c:399
+#: ../src/plugins/libravatar/libravatar_prefs.c:439
 #: ../src/plugins/notification/notification_prefs.c:396
 #: ../src/plugins/notification/notification_prefs.c:410
 #: ../src/plugins/notification/notification_prefs.c:428
@@ -5249,9 +5448,9 @@ msgstr ""
 #: ../src/plugins/notification/notification_prefs.c:496
 #: ../src/plugins/notification/notification_prefs.c:513
 #: ../src/plugins/pgpcore/prefs_gpg.c:569
-#: ../src/plugins/rssyl/rssyl_prefs.c:65
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
+#: ../src/plugins/rssyl/rssyl_prefs.c:69
 #: ../src/plugins/spam_report/spam_report_prefs.c:79
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
 #: ../src/plugins/vcalendar/vcal_prefs.c:680 ../src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Plugins"
@@ -5293,7 +5492,7 @@ msgstr "Plugins geladen"
 msgid "Page Index"
 msgstr "Pagina Inhoudsopgave"
 
-#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:828
+#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:831
 msgid "_Hide"
 msgstr "_Verberg"
 
@@ -5306,70 +5505,76 @@ msgstr "_Verberg"
 msgid "Account"
 msgstr "Account"
 
-#: ../src/gtk/quicksearch.c:452
+#: ../src/gtk/quicksearch.c:451
 msgid "all messages"
 msgstr "alle berichten"
 
-#: ../src/gtk/quicksearch.c:453
+#: ../src/gtk/quicksearch.c:452
 msgid "messages whose age is greater than # days"
 msgstr "berichten die ouder zijn dan # dagen"
 
-#: ../src/gtk/quicksearch.c:454
+#: ../src/gtk/quicksearch.c:453
 msgid "messages whose age is less than # days"
 msgstr "berichten die jonger zijn dan # dagen"
 
-#: ../src/gtk/quicksearch.c:455
+#: ../src/gtk/quicksearch.c:454
 msgid "messages whose age is greater than # hours"
 msgstr "berichten die ouder zijn dan # uur"
 
-#: ../src/gtk/quicksearch.c:456
+#: ../src/gtk/quicksearch.c:455
 msgid "messages whose age is less than # hours"
 msgstr "berichten die jonger zijn dan # uur"
 
-#: ../src/gtk/quicksearch.c:457
+#: ../src/gtk/quicksearch.c:456
 msgid "messages which contain S in the message body"
 msgstr "berichten waarvan de berichttekst S bevat"
 
-#: ../src/gtk/quicksearch.c:458
+#: ../src/gtk/quicksearch.c:457
 msgid "messages which contain S in the whole message"
 msgstr "berichten waarin S voorkomt (in berichttekst of headers)"
 
-#: ../src/gtk/quicksearch.c:459
+#: ../src/gtk/quicksearch.c:458
 msgid "messages carbon-copied to S"
 msgstr "berichten waarvan S een kopie (cc) onving"
 
-#: ../src/gtk/quicksearch.c:460
+#: ../src/gtk/quicksearch.c:459
 msgid "message is either to: or cc: to S"
 msgstr "berichten die S ontving (zowel to: als cc:)"
 
-#: ../src/gtk/quicksearch.c:461
+#: ../src/gtk/quicksearch.c:460
 msgid "deleted messages"
 msgstr "verwijderde berichten"
 
 #. * how I can filter deleted messages *
-#: ../src/gtk/quicksearch.c:462
+#: ../src/gtk/quicksearch.c:461
 msgid "messages which contain S in the Sender field"
 msgstr "berichten waarin S voorkomt in het veld 'Afzender'"
 
-#: ../src/gtk/quicksearch.c:463
+#: ../src/gtk/quicksearch.c:462
 msgid "true if execute \"S\" succeeds"
 msgstr "waar als de uitvoer van \"S\" succesvol is"
 
-#: ../src/gtk/quicksearch.c:464
+#: ../src/gtk/quicksearch.c:463
 msgid "messages originating from user S"
 msgstr "berichten die komen van gebruiker S"
 
-#: ../src/gtk/quicksearch.c:465
+#: ../src/gtk/quicksearch.c:464
 msgid "forwarded messages"
 msgstr "doorgestuurde berichten"
 
-#: ../src/gtk/quicksearch.c:466
+#: ../src/gtk/quicksearch.c:465
 msgid "messages which have attachments"
 msgstr "berichten die bijvoegsels hebben"
 
+#: ../src/gtk/quicksearch.c:466
+#, fuzzy
+msgid "messages which contain S in any header name or value"
+msgstr "berichten waarin S in de header 'X-label' voorkomt"
+
 #: ../src/gtk/quicksearch.c:467
-msgid "messages which contain header S"
-msgstr "berichten die header S bevatten"
+#, fuzzy
+msgid "messages which contain S in the value of any header"
+msgstr "berichten waarin S in de header 'X-label' voorkomt"
 
 #: ../src/gtk/quicksearch.c:468
 msgid "messages which contain S in Message-ID header"
@@ -5559,7 +5764,7 @@ msgstr "_Wijzigen"
 
 #: ../src/gtk/quicksearch.c:819 ../src/gtk/quicksearch.c:834
 #: ../src/prefs_actions.c:347 ../src/prefs_filtering.c:495
-#: ../src/prefs_template.c:328
+#: ../src/prefs_template.c:330
 msgid "C_lear"
 msgstr "Leeg _Log"
 
@@ -5711,8 +5916,8 @@ msgstr "Tags:"
 #: ../src/plugins/notification/notification_popup.c:316
 #: ../src/plugins/notification/notification_popup.c:621
 #: ../src/plugins/notification/notification_trayicon.c:851
-#: ../src/summaryview.c:3351 ../src/summaryview.c:3369
-#: ../src/summaryview.c:3390
+#: ../src/summaryview.c:3353 ../src/summaryview.c:3371
+#: ../src/summaryview.c:3392
 msgid "(No From)"
 msgstr "(Geen afzender)"
 
@@ -5720,7 +5925,7 @@ msgstr "(Geen afzender)"
 #: ../src/plugins/notification/notification_popup.c:318
 #: ../src/plugins/notification/notification_popup.c:625
 #: ../src/plugins/notification/notification_trayicon.c:854
-#: ../src/summaryview.c:3403 ../src/summaryview.c:3407
+#: ../src/summaryview.c:3405 ../src/summaryview.c:3409
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
@@ -5728,7 +5933,7 @@ msgstr "(Geen onderwerp)"
 msgid "Error:"
 msgstr "Fout:"
 
-#: ../src/image_viewer.c:299 ../src/mimeview.c:2544
+#: ../src/image_viewer.c:299 ../src/mimeview.c:2545
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:698
 msgid "Filename:"
 msgstr "Bestandsnaam:"
@@ -5741,31 +5946,31 @@ msgstr "Bestandsgrootte:"
 msgid "Load Image"
 msgstr "Laad afbeelding"
 
-#: ../src/imap.c:577
+#: ../src/imap.c:583
 msgid "IMAP4 connection broken\n"
 msgstr "IMAP4-verbinding verbroken\n"
 
-#: ../src/imap.c:616
+#: ../src/imap.c:622
 #, c-format
 msgid "IMAP error on %s: authenticated\n"
 msgstr "IMAP fout op %s: ge-authenticeerd\n"
 
-#: ../src/imap.c:619
+#: ../src/imap.c:625
 #, c-format
 msgid "IMAP error on %s: not authenticated\n"
 msgstr "IMAP fout op %s: niet ge-authenticeerd\n"
 
-#: ../src/imap.c:622
+#: ../src/imap.c:628
 #, c-format
 msgid "IMAP error on %s: bad state\n"
 msgstr "IMAP fout op %s: slechte staat\n"
 
-#: ../src/imap.c:625
+#: ../src/imap.c:631
 #, c-format
 msgid "IMAP error on %s: stream error\n"
 msgstr "IMAP fout op %s: stroom fout\n"
 
-#: ../src/imap.c:628
+#: ../src/imap.c:634
 #, c-format
 msgid ""
 "IMAP error on %s: parse error (very probably non-RFC compliance from the "
@@ -5774,22 +5979,22 @@ msgstr ""
 "IMAP fout op %s: verwerkingsfout (waarschijnlijk niet-RFC overeenkomend van "
 "de server)\n"
 
-#: ../src/imap.c:632
+#: ../src/imap.c:638
 #, c-format
 msgid "IMAP error on %s: connection refused\n"
 msgstr "IMAP fout op %s: verbinding geweigerd\n"
 
-#: ../src/imap.c:635
+#: ../src/imap.c:641
 #, c-format
 msgid "IMAP error on %s: memory error\n"
 msgstr "IMAP fout op %s: geheugen fout\n"
 
-#: ../src/imap.c:638
+#: ../src/imap.c:644
 #, c-format
 msgid "IMAP error on %s: fatal error\n"
 msgstr "IMAP fout op %s: fatale fout\n"
 
-#: ../src/imap.c:641
+#: ../src/imap.c:647
 #, c-format
 msgid ""
 "IMAP error on %s: protocol error(very probably non-RFC compliance from the "
@@ -5798,172 +6003,172 @@ msgstr ""
 "IMAP fout op %s: protocol fout (waarschijnlijk niet-RFC overeenkomend van de "
 "server)\n"
 
-#: ../src/imap.c:645
+#: ../src/imap.c:651
 #, c-format
 msgid "IMAP error on %s: connection not accepted\n"
 msgstr "IMAP fout op %s: verbinding geweigerd\n"
 
-#: ../src/imap.c:648
+#: ../src/imap.c:654
 #, c-format
 msgid "IMAP error on %s: APPEND error\n"
 msgstr "IMAP fout op %s: APPEND fout\n"
 
-#: ../src/imap.c:651
+#: ../src/imap.c:657
 #, c-format
 msgid "IMAP error on %s: NOOP error\n"
 msgstr "IMAP fout op %s: NOOP fout\n"
 
-#: ../src/imap.c:654
+#: ../src/imap.c:660
 #, c-format
 msgid "IMAP error on %s: LOGOUT error\n"
 msgstr "IMAP fout op %s: LOGOUT fout\n"
 
-#: ../src/imap.c:657
+#: ../src/imap.c:663
 #, c-format
 msgid "IMAP error on %s: CAPABILITY error\n"
 msgstr "IMAP fout op %s: CAPABILITY fout\n"
 
-#: ../src/imap.c:660
+#: ../src/imap.c:666
 #, c-format
 msgid "IMAP error on %s: CHECK error\n"
 msgstr "IMAP fout op %s: CHECK fout\n"
 
-#: ../src/imap.c:663
+#: ../src/imap.c:669
 #, c-format
 msgid "IMAP error on %s: CLOSE error\n"
 msgstr "IMAP fout op %s: CLOSE fout\n"
 
-#: ../src/imap.c:666
+#: ../src/imap.c:672
 #, c-format
 msgid "IMAP error on %s: EXPUNGE error\n"
 msgstr "IMAP fout op %s: EXPUNGE fout\n"
 
-#: ../src/imap.c:669
+#: ../src/imap.c:675
 #, c-format
 msgid "IMAP error on %s: COPY error\n"
 msgstr "IMAP fout op %s: COPY fout\n"
 
-#: ../src/imap.c:672
+#: ../src/imap.c:678
 #, c-format
 msgid "IMAP error on %s: UID COPY error\n"
 msgstr "IMAP fout op %s: UID COPY fout\n"
 
-#: ../src/imap.c:675
+#: ../src/imap.c:681
 #, c-format
 msgid "IMAP error on %s: CREATE error\n"
 msgstr "IMAP fout op %s: CREATE fout\n"
 
-#: ../src/imap.c:678
+#: ../src/imap.c:684
 #, c-format
 msgid "IMAP error on %s: DELETE error\n"
 msgstr "IMAP fout op %s: DELETE fout\n"
 
-#: ../src/imap.c:681
+#: ../src/imap.c:687
 #, c-format
 msgid "IMAP error on %s: EXAMINE error\n"
 msgstr "IMAP fout op %s: EXAMINE fout\n"
 
-#: ../src/imap.c:684
+#: ../src/imap.c:690
 #, c-format
 msgid "IMAP error on %s: FETCH error\n"
 msgstr "IMAP fout op %s: FETCH fout\n"
 
-#: ../src/imap.c:687
+#: ../src/imap.c:693
 #, c-format
 msgid "IMAP error on %s: UID FETCH error\n"
 msgstr "IMAP fout op %s: UID FETCH fout\n"
 
-#: ../src/imap.c:690
+#: ../src/imap.c:696
 #, c-format
 msgid "IMAP error on %s: LIST error\n"
 msgstr "IMAP fout op %s: LIST fout\n"
 
-#: ../src/imap.c:693
+#: ../src/imap.c:699
 #, c-format
 msgid "IMAP error on %s: LOGIN error\n"
 msgstr "IMAP fout op %s: LOGIN fout\n"
 
-#: ../src/imap.c:696
+#: ../src/imap.c:702
 #, c-format
 msgid "IMAP error on %s: LSUB error\n"
 msgstr "IMAP fout op %s: LSUB fout\n"
 
-#: ../src/imap.c:699
+#: ../src/imap.c:705
 #, c-format
 msgid "IMAP error on %s: RENAME error\n"
 msgstr "IMAP fout op %s: RENAME fout\n"
 
-#: ../src/imap.c:702
+#: ../src/imap.c:708
 #, c-format
 msgid "IMAP error on %s: SEARCH error\n"
 msgstr "IMAP fout op %s: SEARCH fout\n"
 
-#: ../src/imap.c:705
+#: ../src/imap.c:711
 #, c-format
 msgid "IMAP error on %s: UID SEARCH error\n"
 msgstr "IMAP fout op %s: UID SEARCH fout\n"
 
-#: ../src/imap.c:708
+#: ../src/imap.c:714
 #, c-format
 msgid "IMAP error on %s: SELECT error\n"
 msgstr "IMAP fout op %s: SELECT fout\n"
 
-#: ../src/imap.c:711
+#: ../src/imap.c:717
 #, c-format
 msgid "IMAP error on %s: STATUS error\n"
 msgstr "IMAP fout op %s: STATUS fout\n"
 
-#: ../src/imap.c:714
+#: ../src/imap.c:720
 #, c-format
 msgid "IMAP error on %s: STORE error\n"
 msgstr "IMAP fout op %s: STORE fout\n"
 
-#: ../src/imap.c:717
+#: ../src/imap.c:723
 #, c-format
 msgid "IMAP error on %s: UID STORE error\n"
 msgstr "IMAP fout op %s: UID STORE fout\n"
 
-#: ../src/imap.c:720
+#: ../src/imap.c:726
 #, c-format
 msgid "IMAP error on %s: SUBSCRIBE error\n"
 msgstr "IMAP fout op %s: SUBSCRIBE fout\n"
 
-#: ../src/imap.c:723
+#: ../src/imap.c:729
 #, c-format
 msgid "IMAP error on %s: UNSUBSCRIBE error\n"
 msgstr "IMAP fout op %s: UNSUBSCRIBE fout\n"
 
-#: ../src/imap.c:726
+#: ../src/imap.c:732
 #, c-format
 msgid "IMAP error on %s: STARTTLS error\n"
 msgstr "IMAP fout op %s: STARTTLS fout\n"
 
-#: ../src/imap.c:729
+#: ../src/imap.c:735
 #, c-format
 msgid "IMAP error on %s: INVAL error\n"
 msgstr "IMAP fout op %s: INVAL fout\n"
 
-#: ../src/imap.c:732
+#: ../src/imap.c:738
 #, c-format
 msgid "IMAP error on %s: EXTENSION error\n"
 msgstr "IMAP fout op %s: EXTENSION fout\n"
 
-#: ../src/imap.c:735
+#: ../src/imap.c:741
 #, c-format
 msgid "IMAP error on %s: SASL error\n"
 msgstr "IMAP fout op %s: SASL fout\n"
 
-#: ../src/imap.c:739
+#: ../src/imap.c:745
 #, c-format
 msgid "IMAP error on %s: SSL error\n"
 msgstr "IMAP fout op %s: SSL fout\n"
 
-#: ../src/imap.c:743
+#: ../src/imap.c:749
 #, c-format
 msgid "IMAP error on %s: Unknown error [%d]\n"
 msgstr "IMAP fout op %s: Onbekende fout [%d]\n"
 
-#: ../src/imap.c:928
+#: ../src/imap.c:934
 msgid ""
 "\n"
 "\n"
@@ -5975,7 +6180,7 @@ msgstr ""
 "CRAM-MD5 logins werken alleen als libetpan gecompileerd is met SASL-"
 "ondersteuning en de CRFAM-MD5 SASL plugin geïnstalleerd is."
 
-#: ../src/imap.c:934
+#: ../src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5987,38 +6192,38 @@ msgstr ""
 "DIGEST-MD5 logins werken alleen als libetpan gecompileerd is met SASL-"
 "ondersteuning en de DIGEST-MD5 SASL plugin geïnstalleerd is."
 
-#: ../src/imap.c:941
+#: ../src/imap.c:947
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Verbinding maken met %s mislukt: login geweigerd.%s"
 
-#: ../src/imap.c:945
+#: ../src/imap.c:951
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Verbinding maken met %s mislukt: login geweigerd.%s\n"
 
-#: ../src/imap.c:963
+#: ../src/imap.c:969
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Verbinding maken met %s mislukt"
 
-#: ../src/imap.c:970 ../src/imap.c:973
+#: ../src/imap.c:976 ../src/imap.c:979
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "IMAP4 verbinding naar %s is verbroken. Contact wordt opnieuw gelegd...\n"
 
-#: ../src/imap.c:1003 ../src/imap.c:3583 ../src/imap.c:4242 ../src/imap.c:4339
-#: ../src/imap.c:4517 ../src/imap.c:5314
+#: ../src/imap.c:1009 ../src/imap.c:3619 ../src/imap.c:4278 ../src/imap.c:4375
+#: ../src/imap.c:4555 ../src/imap.c:5364
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail heeft netwerktoegang nodig voor toegang tot de IMAP-server."
 
-#: ../src/imap.c:1112 ../src/inc.c:818 ../src/news.c:387
+#: ../src/imap.c:1118 ../src/inc.c:818 ../src/news.c:387
 #: ../src/send_message.c:278
 msgid "Insecure connection"
 msgstr "Onveilige verbinding"
 
-#: ../src/imap.c:1113 ../src/inc.c:819 ../src/news.c:388
+#: ../src/imap.c:1119 ../src/inc.c:819 ../src/news.c:388
 #: ../src/send_message.c:279
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
@@ -6033,109 +6238,109 @@ msgstr ""
 "Wil je de verbinding met deze server toch maken? De communicatie is dan niet "
 "beveiligd."
 
-#: ../src/imap.c:1119 ../src/inc.c:825 ../src/news.c:394
+#: ../src/imap.c:1125 ../src/inc.c:825 ../src/news.c:394
 #: ../src/send_message.c:285
 msgid "Con_tinue connecting"
 msgstr "Verbinding _hervatten"
 
-#: ../src/imap.c:1129
+#: ../src/imap.c:1135
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Account '%s': Verbinden met IMAP4-server: %s:%d..."
 
-#: ../src/imap.c:1177
+#: ../src/imap.c:1183
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Kan geen verbinding maken met de IMAP4-server: %s:%d"
 
-#: ../src/imap.c:1180
+#: ../src/imap.c:1186
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan geen verbinding maken met de IMAP4-server: %s:%d\n"
 
-#: ../src/imap.c:1213 ../src/imap.c:4004
+#: ../src/imap.c:1219 ../src/imap.c:4040
 msgid "Can't start TLS session.\n"
 msgstr "Kan TLS sessie niet tot stand brengen.\n"
 
-#: ../src/imap.c:1276
+#: ../src/imap.c:1282
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kon niet inloggen op IMAP-server %s.\n"
 
-#: ../src/imap.c:1279
+#: ../src/imap.c:1285
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kon niet inloggen op IMAP-server %s."
 
-#: ../src/imap.c:1679
+#: ../src/imap.c:1703
 msgid "Adding messages..."
 msgstr "Berichten worden toegevoegd..."
 
-#: ../src/imap.c:1883 ../src/mh.c:520
+#: ../src/imap.c:1908 ../src/mh.c:526
 msgid "Copying messages..."
 msgstr "Berichten worden gekopieerd..."
 
-#: ../src/imap.c:2465
+#: ../src/imap.c:2492
 msgid "can't set deleted flags\n"
 msgstr "kan \"verwijderd\" vlaggen niet instellen\n"
 
-#: ../src/imap.c:2472 ../src/imap.c:4944
+#: ../src/imap.c:2499 ../src/imap.c:4994
 msgid "can't expunge\n"
 msgstr "kan niet wissen\n"
 
-#: ../src/imap.c:2823
+#: ../src/imap.c:2850
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Zoeken naar niet-geabonneerde mappen in %s..."
 
-#: ../src/imap.c:2826
+#: ../src/imap.c:2853
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Zoeken naar submappen van %s..."
 
-#: ../src/imap.c:3123
+#: ../src/imap.c:3159
 msgid "can't create mailbox: LIST failed\n"
 msgstr "LIST mislukt; kan postvak niet aanmaken\n"
 
-#: ../src/imap.c:3138
+#: ../src/imap.c:3174
 msgid "can't create mailbox\n"
 msgstr "kan postvak niet aanmaken\n"
 
-#: ../src/imap.c:3229
+#: ../src/imap.c:3265
 msgid "New folder name must not contain the namespace path separator"
 msgstr "Een nieuwe mapnaam mag geen 'namespace path separator' bevatten"
 
-#: ../src/imap.c:3269
+#: ../src/imap.c:3305
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan postvak niet hernoemen: %s naar %s\n"
 
-#: ../src/imap.c:3382
+#: ../src/imap.c:3418
 msgid "can't delete mailbox\n"
 msgstr "kan postvak niet verwijderen\n"
 
-#: ../src/imap.c:3661
+#: ../src/imap.c:3697
 msgid "LIST failed\n"
 msgstr "LIST mislukt\n"
 
-#: ../src/imap.c:3746
+#: ../src/imap.c:3782
 msgid "Flagging messages..."
 msgstr "Berichten afvlaggen..."
 
-#: ../src/imap.c:3849
+#: ../src/imap.c:3885
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: ../src/imap.c:4001
+#: ../src/imap.c:4037
 msgid "Server requires TLS to log in.\n"
 msgstr "Server vereist TLS om in te loggen.\n"
 
-#: ../src/imap.c:4011
+#: ../src/imap.c:4047
 msgid "Can't refresh capabilities.\n"
 msgstr "Kan 'capabilities' niet verversen.\n"
 
-#: ../src/imap.c:4016
+#: ../src/imap.c:4052
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -6144,20 +6349,20 @@ msgstr ""
 "Verbinden me %s mislukt: de server vereist TLS, maar Claws Mail is niet "
 "vertaald met OpenSSL-ondersteuning.\n"
 
-#: ../src/imap.c:4024
+#: ../src/imap.c:4060
 msgid "Server logins are disabled.\n"
 msgstr "Inloggen op servers staat uit.\n"
 
-#: ../src/imap.c:4247
+#: ../src/imap.c:4283
 msgid "Fetching message..."
 msgstr "Berichten worden opgehaald..."
 
-#: ../src/imap.c:4937
+#: ../src/imap.c:4987
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan \"verwijderd\" vlaggen: %d niet instellen\n"
 
-#: ../src/imap.c:5973
+#: ../src/imap.c:6023
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6193,7 +6398,7 @@ msgid "Cop_y folder..."
 msgstr "_Kopieer map..."
 
 #: ../src/imap_gtk.c:69 ../src/mh_gtk.c:59
-#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:61
+#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:55
 msgid "_Delete folder..."
 msgstr "Ver_wijder map..."
 
@@ -6254,7 +6459,7 @@ msgstr "Neem eigenschappen over van bovenliggende map"
 
 #: ../src/imap_gtk.c:261 ../src/mh_gtk.c:249 ../src/news_gtk.c:306
 #: ../src/plugins/mailmbox/plugin_gtk.c:405
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:331
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:196
 #: ../src/plugins/vcalendar/vcal_folder.c:2032
 #, c-format
 msgid "Input new name for '%s':"
@@ -6262,14 +6467,14 @@ msgstr "Geef een nieuwe naam voor '%s':"
 
 #: ../src/imap_gtk.c:263 ../src/mh_gtk.c:251
 #: ../src/plugins/mailmbox/plugin_gtk.c:406
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:332
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:197
 #: ../src/plugins/vcalendar/vcal_folder.c:2033
 msgid "Rename folder"
 msgstr "Hernoem map"
 
 #: ../src/imap_gtk.c:292 ../src/mh_gtk.c:274 ../src/news_gtk.c:328
 #: ../src/plugins/mailmbox/plugin_gtk.c:433
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:352
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:217
 #: ../src/plugins/vcalendar/vcal_folder.c:2053
 msgid ""
 "The folder could not be renamed.\n"
@@ -6279,7 +6484,7 @@ msgstr ""
 "De nieuwe mapnaam is niet toegestaan."
 
 #: ../src/imap_gtk.c:360 ../src/mh_gtk.c:199
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:233
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:149
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6293,7 +6498,7 @@ msgstr ""
 
 #: ../src/imap_gtk.c:381 ../src/mh_gtk.c:220 ../src/news_gtk.c:281
 #: ../src/plugins/mailmbox/plugin_gtk.c:341
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:254
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:170
 #: ../src/plugins/vcalendar/vcal_folder.c:1986
 #, c-format
 msgid "Can't remove the folder '%s'."
@@ -6321,7 +6526,7 @@ msgstr "+_Zoek"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Kies een submap van %s om op te abonneren: "
 
-#: ../src/imap_gtk.c:537 ../src/mainwindow.c:672
+#: ../src/imap_gtk.c:537 ../src/mainwindow.c:674
 msgid "Subscribe"
 msgstr "Abonneren"
 
@@ -6598,7 +6803,7 @@ msgid "Auth failed"
 msgstr "Authenticatie mislukt"
 
 #. S_COL_SCORE
-#: ../src/inc.c:662 ../src/prefs_matcher.c:393
+#: ../src/inc.c:662 ../src/prefs_matcher.c:396
 #: ../src/prefs_summary_column.c:88 ../src/summaryview.c:2789
 #: ../src/summaryview.c:6310
 msgid "Locked"
@@ -6784,23 +6989,9 @@ msgstr "%s%sJe bent momenteel niet online. Toch doorgaan?"
 msgid "On_ly once"
 msgstr "_Eenmalig"
 
-#: ../src/ldapupdate.c:189
-#, c-format
-msgid "ldapsvr_retrieve_item_person->Unknown status: %d"
-msgstr ""
-
-#: ../src/ldapupdate.c:472
-msgid "ldapsvr_update_book: Could not clean cache\n"
-msgstr ""
-
 #: ../src/ldapupdate.c:1056
 msgid "Some SN"
-msgstr ""
-
-#: ../src/ldapupdate.c:1440
-#, c-format
-msgid "ldapsvr_update_book->Unknown status: %s\n"
-msgstr ""
+msgstr "Een SN"
 
 #: ../src/ldif.c:776
 msgid "Nick Name"
@@ -7139,328 +7330,328 @@ msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: netwerk is niet beschikbaar.\n"
 
 #. menus
-#: ../src/mainwindow.c:503 ../src/messageview.c:209
+#: ../src/mainwindow.c:505 ../src/messageview.c:209
 msgid "_File"
 msgstr "_Bestand"
 
-#: ../src/mainwindow.c:505 ../src/messageview.c:211 ../src/summaryview.c:434
+#: ../src/mainwindow.c:507 ../src/messageview.c:211 ../src/summaryview.c:434
 msgid "_View"
 msgstr "Beel_d"
 
-#: ../src/mainwindow.c:508
+#: ../src/mainwindow.c:510
 msgid "_Configuration"
 msgstr "_Instellingen"
 
 #. File menu
-#: ../src/mainwindow.c:512
+#: ../src/mainwindow.c:514
 msgid "_Add mailbox"
 msgstr "_Postvak toevoegen"
 
-#: ../src/mainwindow.c:513
+#: ../src/mainwindow.c:515
 msgid "MH..."
 msgstr "MH..."
 
-#: ../src/mainwindow.c:516
+#: ../src/mainwindow.c:518
 msgid "Change mailbox order..."
 msgstr "Verander postvak volgorde..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:519
+#: ../src/mainwindow.c:521
 msgid "_Import mbox file..."
 msgstr "_Importeer mbox-bestand"
 
-#: ../src/mainwindow.c:520
+#: ../src/mainwindow.c:522
 msgid "_Export to mbox file..."
 msgstr "_Exporteer naar mbox-bestand"
 
-#: ../src/mainwindow.c:521
+#: ../src/mainwindow.c:523
 msgid "_Export selected to mbox file..."
 msgstr "E_xporteer selectie naar mbox-bestand..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:523
+#: ../src/mainwindow.c:525
 msgid "Empty all _Trash folders"
 msgstr "Alle prullenbakken _leegmaken"
 
 #. {"File/---",				NULL, "---" },
 #. File menu
-#: ../src/mainwindow.c:526 ../src/messageview.c:218
+#: ../src/mainwindow.c:528 ../src/messageview.c:218
 msgid "_Save email as..."
 msgstr "_Opslaan e-mail als..."
 
-#: ../src/mainwindow.c:527 ../src/messageview.c:219
+#: ../src/mainwindow.c:529 ../src/messageview.c:219
 msgid "_Save part as..."
 msgstr "Opslaan _deel als..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:530 ../src/messageview.c:220
+#: ../src/mainwindow.c:532 ../src/messageview.c:220
 msgid "Page setup..."
 msgstr "Pagina instellingen..."
 
-#: ../src/mainwindow.c:531 ../src/messageview.c:221
+#: ../src/mainwindow.c:533 ../src/messageview.c:221
 msgid "_Print..."
 msgstr "Af_drukken..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:533
+#: ../src/mainwindow.c:535
 msgid "Synchronise folders"
 msgstr "Synchroniseer mappen"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:535
+#: ../src/mainwindow.c:537
 msgid "E_xit"
 msgstr "Af_sluiten"
 
-#: ../src/mainwindow.c:540
+#: ../src/mainwindow.c:542
 msgid "Select _thread"
 msgstr "_Discussiedraad selecteren"
 
-#: ../src/mainwindow.c:541
+#: ../src/mainwindow.c:543
 msgid "_Delete thread"
 msgstr "_Verwijder draad"
 
-#: ../src/mainwindow.c:543
+#: ../src/mainwindow.c:545
 msgid "_Find in current message..."
 msgstr "_Zoek in huidige bericht"
 
-#: ../src/mainwindow.c:545
+#: ../src/mainwindow.c:547
 msgid "_Quick search"
 msgstr "_Snelzoeken"
 
 #. View menu
-#: ../src/mainwindow.c:548
+#: ../src/mainwindow.c:550
 msgid "Show or hi_de"
 msgstr "_Toon of verberg"
 
-#: ../src/mainwindow.c:549
+#: ../src/mainwindow.c:551
 msgid "_Toolbar"
 msgstr "_Werkbalk"
 
-#: ../src/mainwindow.c:551
+#: ../src/mainwindow.c:553
 msgid "Set displayed _columns"
 msgstr "Weergegeven _kolommen instellen"
 
-#: ../src/mainwindow.c:552
+#: ../src/mainwindow.c:554
 msgid "In _folder list..."
 msgstr "in _mappenlijst..."
 
-#: ../src/mainwindow.c:553
+#: ../src/mainwindow.c:555
 msgid "In _message list..."
 msgstr "in _berichtenlijst..."
 
-#: ../src/mainwindow.c:558
+#: ../src/mainwindow.c:560
 msgid "La_yout"
 msgstr "_Weergave"
 
-#: ../src/mainwindow.c:561
+#: ../src/mainwindow.c:563
 msgid "_Sort"
 msgstr "_Sorteer"
 
-#: ../src/mainwindow.c:563
+#: ../src/mainwindow.c:565
 msgid "_Attract by subject"
 msgstr "Ge_lijksoortige onderwerpen bij elkaar"
 
-#: ../src/mainwindow.c:565
+#: ../src/mainwindow.c:567
 msgid "E_xpand all threads"
 msgstr "Berichtenboom _uitklappen"
 
-#: ../src/mainwindow.c:566
+#: ../src/mainwindow.c:568
 msgid "Co_llapse all threads"
 msgstr "Berichtenboom _inklappen"
 
 #. View menu
-#: ../src/mainwindow.c:568 ../src/messageview.c:232
+#: ../src/mainwindow.c:570 ../src/messageview.c:232
 msgid "_Go to"
 msgstr "_Ga naar"
 
-#: ../src/mainwindow.c:569 ../src/messageview.c:233
+#: ../src/mainwindow.c:571 ../src/messageview.c:233
 msgid "_Previous message"
 msgstr "_Vorige pagina"
 
-#: ../src/mainwindow.c:570 ../src/messageview.c:234
+#: ../src/mainwindow.c:572 ../src/messageview.c:234
 msgid "_Next message"
 msgstr "V_olgende bericht"
 
-#: ../src/mainwindow.c:572 ../src/messageview.c:236
+#: ../src/mainwindow.c:574 ../src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "Vo_rige ongelezen bericht"
 
-#: ../src/mainwindow.c:573 ../src/messageview.c:237
+#: ../src/mainwindow.c:575 ../src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Volgende o_ngelezen bericht"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:575 ../src/messageview.c:239
+#: ../src/mainwindow.c:577 ../src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Vo_rige nieuwe bericht"
 
-#: ../src/mainwindow.c:576 ../src/messageview.c:240
+#: ../src/mainwindow.c:578 ../src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Volge_nde nieuwe bericht"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:578 ../src/messageview.c:242
+#: ../src/mainwindow.c:580 ../src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Vorige ge_markeerde bericht"
 
-#: ../src/mainwindow.c:579 ../src/messageview.c:243
+#: ../src/mainwindow.c:581 ../src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Volgende gem_arkeerde bericht"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:581 ../src/messageview.c:245
+#: ../src/mainwindow.c:583 ../src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Vorige bericht met _label"
 
-#: ../src/mainwindow.c:582 ../src/messageview.c:246
+#: ../src/mainwindow.c:584 ../src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Volgende bericht met l_abel"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:584 ../src/messageview.c:248
+#: ../src/mainwindow.c:586 ../src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Vorige geopende bericht"
 
-#: ../src/mainwindow.c:585 ../src/messageview.c:249
+#: ../src/mainwindow.c:587 ../src/messageview.c:249
 msgid "Next opened message"
 msgstr "Volgende geopende bericht"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:587 ../src/messageview.c:251
+#: ../src/mainwindow.c:589 ../src/messageview.c:251
 msgid "Parent message"
 msgstr "Bovenliggende bericht"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:589 ../src/messageview.c:253
+#: ../src/mainwindow.c:591 ../src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Volgende _ongelezen bericht"
 
-#: ../src/mainwindow.c:590 ../src/messageview.c:254
+#: ../src/mainwindow.c:592 ../src/messageview.c:254
 msgid "_Other folder..."
 msgstr "An_dere map..."
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:592 ../src/messageview.c:256 ../src/mimeview.c:201
+#: ../src/mainwindow.c:594 ../src/messageview.c:256 ../src/mimeview.c:201
 msgid "Next part"
 msgstr "Volgende deel"
 
-#: ../src/mainwindow.c:593 ../src/messageview.c:257 ../src/mimeview.c:202
+#: ../src/mainwindow.c:595 ../src/messageview.c:257 ../src/mimeview.c:202
 msgid "Previous part"
 msgstr "Vorige deel"
 
 #. {"View/Scroll/---",                  NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:596 ../src/messageview.c:258
+#: ../src/mainwindow.c:598 ../src/messageview.c:258
 msgid "Message scroll"
 msgstr "Berichten schuiven"
 
-#: ../src/mainwindow.c:597 ../src/messageview.c:259
+#: ../src/mainwindow.c:599 ../src/messageview.c:259
 msgid "Previous line"
 msgstr "Vorige regel"
 
-#: ../src/mainwindow.c:598 ../src/messageview.c:260
+#: ../src/mainwindow.c:600 ../src/messageview.c:260
 msgid "Next line"
 msgstr "Volgende regel"
 
-#: ../src/mainwindow.c:599 ../src/messageview.c:261 ../src/printing.c:481
+#: ../src/mainwindow.c:601 ../src/messageview.c:261 ../src/printing.c:481
 msgid "Previous page"
 msgstr "Vorige pagina"
 
-#: ../src/mainwindow.c:600 ../src/messageview.c:262 ../src/printing.c:488
+#: ../src/mainwindow.c:602 ../src/messageview.c:262 ../src/printing.c:488
 msgid "Next page"
 msgstr "Volgende pagina"
 
-#: ../src/mainwindow.c:618 ../src/messageview.c:280
+#: ../src/mainwindow.c:620 ../src/messageview.c:280
 msgid "Decode"
 msgstr "Decodeer"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:625
+#: ../src/mainwindow.c:627
 msgid "Open in new _window"
 msgstr "_Nieuw venster"
 
-#: ../src/mainwindow.c:626 ../src/messageview.c:287
+#: ../src/mainwindow.c:628 ../src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Br_on weergeven"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:628 ../src/messageview.c:288
+#: ../src/mainwindow.c:630 ../src/messageview.c:288
 msgid "Message part"
 msgstr "Bericht deel"
 
-#: ../src/mainwindow.c:629 ../src/messageview.c:289
+#: ../src/mainwindow.c:631 ../src/messageview.c:289
 msgid "View as text"
 msgstr "Als tekst weergeven"
 
-#: ../src/mainwindow.c:630 ../src/messageview.c:290 ../src/toolbar.c:403
+#: ../src/mainwindow.c:632 ../src/messageview.c:290 ../src/toolbar.c:403
 msgid "Open"
 msgstr "Openen"
 
-#: ../src/mainwindow.c:632 ../src/messageview.c:292
+#: ../src/mainwindow.c:634 ../src/messageview.c:292
 msgid "Open with..."
 msgstr "Openen met..."
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:636 ../src/messageview.c:295
+#: ../src/mainwindow.c:638 ../src/messageview.c:295
 msgid "Quotes"
 msgstr "Citaties"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:638
+#: ../src/mainwindow.c:640
 msgid "_Update summary"
 msgstr "Berichtenlijst v_erversen"
 
 #. Message menu
-#: ../src/mainwindow.c:641
+#: ../src/mainwindow.c:643
 msgid "Recei_ve"
 msgstr "Ont_vangen"
 
-#: ../src/mainwindow.c:642
+#: ../src/mainwindow.c:644
 msgid "Get from _current account"
 msgstr "Ophalen van _huidige account"
 
-#: ../src/mainwindow.c:643
+#: ../src/mainwindow.c:645
 msgid "Get from _all accounts"
 msgstr "Ophalen van _alle accounts"
 
-#: ../src/mainwindow.c:644
+#: ../src/mainwindow.c:646
 msgid "Cancel receivin_g"
 msgstr "Ophalen ann_uleren"
 
-#: ../src/mainwindow.c:647
+#: ../src/mainwindow.c:649
 msgid "_Send queued messages"
 msgstr "Verzend berichten uit de _wachtrij"
 
-#: ../src/mainwindow.c:652
+#: ../src/mainwindow.c:654
 msgid "Compose a_n email message"
 msgstr "Nieuw _e-mail bericht opstellen"
 
-#: ../src/mainwindow.c:653
+#: ../src/mainwindow.c:655
 msgid "Compose a news message"
 msgstr "Nieuw _Nieuwsbericht opstellen"
 
-#: ../src/mainwindow.c:655 ../src/messageview.c:301
+#: ../src/mainwindow.c:657 ../src/messageview.c:301
 #: ../src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Beantwoorden"
 
 #. COMPOSE_REPLY
-#: ../src/mainwindow.c:656 ../src/messageview.c:302 ../src/summaryview.c:426
+#: ../src/mainwindow.c:658 ../src/messageview.c:302 ../src/summaryview.c:426
 msgid "Repl_y to"
 msgstr "Be_antwoord"
 
 #. COMPOSE_REPLY_TO_SENDER
-#: ../src/mainwindow.c:659 ../src/messageview.c:305
+#: ../src/mainwindow.c:661 ../src/messageview.c:305
 msgid "Mailing _list"
 msgstr "Mailing-_lijst"
 
 #. COMPOSE_REPLY_TO_LIST
-#: ../src/mainwindow.c:660
+#: ../src/mainwindow.c:662
 msgid "Follow-up and reply to"
 msgstr "Beantwoorden en _opvolgen"
 
@@ -7468,177 +7659,177 @@ msgstr "Beantwoorden en _opvolgen"
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REPLY_TO_LIST
 #. {"Message/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:663 ../src/messageview.c:308 ../src/toolbar.c:2069
+#: ../src/mainwindow.c:665 ../src/messageview.c:308 ../src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Doorsturen"
 
 #. COMPOSE_FORWARD_INLINE
-#: ../src/mainwindow.c:664 ../src/messageview.c:309 ../src/toolbar.c:2070
+#: ../src/mainwindow.c:666 ../src/messageview.c:309 ../src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "Doorsturen als bijvoegsel"
 
 #. COMPOSE_FORWARD_AS_ATTACH
-#: ../src/mainwindow.c:665 ../src/messageview.c:310 ../src/toolbar.c:2071
+#: ../src/mainwindow.c:667 ../src/messageview.c:310 ../src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Herverwi_jzen"
 
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:667
+#: ../src/mainwindow.c:669
 msgid "Mailing-_List"
 msgstr "Mailing-_Lijst"
 
-#: ../src/mainwindow.c:668
+#: ../src/mainwindow.c:670
 msgid "Post"
 msgstr "Posten"
 
-#: ../src/mainwindow.c:670
+#: ../src/mainwindow.c:672
 msgid "Help"
 msgstr "Help"
 
-#: ../src/mainwindow.c:674
+#: ../src/mainwindow.c:676
 msgid "Unsubscribe"
 msgstr "Afmelden"
 
-#: ../src/mainwindow.c:676
+#: ../src/mainwindow.c:678
 msgid "View archive"
 msgstr "Bekijk archief"
 
-#: ../src/mainwindow.c:678
+#: ../src/mainwindow.c:680
 msgid "Contact owner"
 msgstr "Contact eigenaar"
 
 #. separation
-#: ../src/mainwindow.c:682
+#: ../src/mainwindow.c:684
 msgid "M_ove..."
 msgstr "Ver_plaatsen..."
 
-#: ../src/mainwindow.c:683
+#: ../src/mainwindow.c:685
 msgid "_Copy..."
 msgstr "K_opiëren..."
 
-#: ../src/mainwindow.c:684
+#: ../src/mainwindow.c:686
 msgid "Move to _trash"
 msgstr "Naar _prullenbak"
 
-#: ../src/mainwindow.c:685
+#: ../src/mainwindow.c:687
 msgid "_Delete..."
 msgstr "Ver_wijderen..."
 
-#: ../src/mainwindow.c:686
+#: ../src/mainwindow.c:688
 msgid "Cancel a news message"
 msgstr "Trek nieuwsartikel in"
 
 #. separation
-#: ../src/mainwindow.c:689 ../src/mainwindow.c:690 ../src/summaryview.c:427
+#: ../src/mainwindow.c:691 ../src/mainwindow.c:692 ../src/summaryview.c:427
 msgid "_Mark"
 msgstr "_Markeren"
 
-#: ../src/mainwindow.c:691
+#: ../src/mainwindow.c:693
 msgid "_Unmark"
 msgstr "_Demarkeer"
 
-#: ../src/mainwindow.c:694
+#: ../src/mainwindow.c:696
 msgid "Mark as unr_ead"
 msgstr "Markeer _ongelezen"
 
-#: ../src/mainwindow.c:695
+#: ../src/mainwindow.c:697
 msgid "Mark as rea_d"
 msgstr "Markeer _gelezen"
 
 #. separation
-#: ../src/mainwindow.c:697
+#: ../src/mainwindow.c:699
 msgid "Mark all read"
 msgstr "Alles gelezen"
 
 #. separation
-#: ../src/mainwindow.c:699 ../src/prefs_filtering_action.c:199
+#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:199
 #: ../src/toolbar.c:208 ../src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Draad negeren"
 
-#: ../src/mainwindow.c:700
+#: ../src/mainwindow.c:702
 msgid "Unignore thread"
 msgstr "Draad niet meer negeren"
 
-#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:200
+#: ../src/mainwindow.c:703 ../src/prefs_filtering_action.c:200
 #: ../src/toolbar.c:209 ../src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Volg draad"
 
-#: ../src/mainwindow.c:702
+#: ../src/mainwindow.c:704
 msgid "Unwatch thread"
 msgstr "Volg draad niet meer"
 
 #. separation
-#: ../src/mainwindow.c:705
+#: ../src/mainwindow.c:707
 msgid "Mark as _spam"
 msgstr "Markeer als _spam"
 
-#: ../src/mainwindow.c:706
+#: ../src/mainwindow.c:708
 msgid "Mark as _ham"
 msgstr "Markeer als _ham"
 
 #. separation
-#: ../src/mainwindow.c:709 ../src/prefs_filtering_action.c:181
+#: ../src/mainwindow.c:711 ../src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Op slot"
 
-#: ../src/mainwindow.c:710 ../src/prefs_filtering_action.c:182
+#: ../src/mainwindow.c:712 ../src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Van slot"
 
-#: ../src/mainwindow.c:712 ../src/summaryview.c:428
+#: ../src/mainwindow.c:714 ../src/summaryview.c:428
 msgid "Color la_bel"
 msgstr "_Kleurlabel"
 
-#: ../src/mainwindow.c:713 ../src/summaryview.c:429
+#: ../src/mainwindow.c:715 ../src/summaryview.c:429
 msgid "Ta_gs"
 msgstr "Ta_gs"
 
 #. {"Message/---",			NULL, "---" },
-#: ../src/mainwindow.c:716
+#: ../src/mainwindow.c:718
 msgid "Re-_edit"
 msgstr "_Wijzigen"
 
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:719 ../src/messageview.c:311 ../src/mimeview.c:1027
+#: ../src/mainwindow.c:721 ../src/messageview.c:311 ../src/mimeview.c:1027
 msgid "Check signature"
 msgstr "Verifieer ondertekening"
 
-#: ../src/mainwindow.c:724 ../src/messageview.c:315
+#: ../src/mainwindow.c:726 ../src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "A_fzender toevoegen aan adresboek"
 
-#: ../src/mainwindow.c:726
+#: ../src/mainwindow.c:728
 msgid "C_ollect addresses"
 msgstr "_Verzamel adressen"
 
-#: ../src/mainwindow.c:727
+#: ../src/mainwindow.c:729
 msgid "From current _folder..."
 msgstr "Van huidige _map..."
 
-#: ../src/mainwindow.c:728
+#: ../src/mainwindow.c:730
 msgid "From selected _messages..."
 msgstr "Van geselecteerde _berichten..."
 
-#: ../src/mainwindow.c:731
+#: ../src/mainwindow.c:733
 msgid "_Filter all messages in folder"
 msgstr "Alle berichten _filteren"
 
-#: ../src/mainwindow.c:732
+#: ../src/mainwindow.c:734
 msgid "Filter _selected messages"
 msgstr "Selectie _filteren"
 
-#: ../src/mainwindow.c:733
+#: ../src/mainwindow.c:735
 msgid "Run folder pr_ocessing rules"
 msgstr "_Verwerkingsregels draaien voor map"
 
-#: ../src/mainwindow.c:735 ../src/messageview.c:318
+#: ../src/mainwindow.c:737 ../src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "_Filterregel aanmaken"
 
-#: ../src/mainwindow.c:736 ../src/mainwindow.c:742 ../src/messageview.c:319
+#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/messageview.c:319
 #: ../src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automatisch"
@@ -7646,7 +7837,7 @@ msgstr "_Automatisch"
 #. FILTER_BY_AUTO
 #. radio SORT_BY_THREAD_DATE
 #. FILTER_BY_AUTO
-#: ../src/mainwindow.c:737 ../src/mainwindow.c:743 ../src/mainwindow.c:845
+#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/mainwindow.c:848
 #: ../src/messageview.c:320 ../src/messageview.c:326
 msgid "By _From"
 msgstr "A_fzender"
@@ -7654,407 +7845,412 @@ msgstr "A_fzender"
 #. FILTER_BY_FROM
 #. radio SORT_BY_FROM
 #. FILTER_BY_FROM
-#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/mainwindow.c:846
+#: ../src/mainwindow.c:740 ../src/mainwindow.c:746 ../src/mainwindow.c:849
 #: ../src/messageview.c:321 ../src/messageview.c:327
 msgid "By _To"
 msgstr "Aan"
 
 #. FILTER_BY_TO
-#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/messageview.c:322
+#: ../src/mainwindow.c:741 ../src/mainwindow.c:747 ../src/messageview.c:322
 #: ../src/messageview.c:328
 msgid "By _Subject"
 msgstr "_Onderwerp"
 
 #. FILTER_BY_SUBJECT
-#: ../src/mainwindow.c:741 ../src/messageview.c:324 ../src/summaryview.c:432
+#: ../src/mainwindow.c:743 ../src/messageview.c:324 ../src/summaryview.c:432
 msgid "Create processing rule"
 msgstr "Verwerkingsregel aanmaken"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:748 ../src/messageview.c:332
+#: ../src/mainwindow.c:750 ../src/messageview.c:332
 msgid "List _URLs..."
 msgstr "Geef _URLs weer..."
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:755
+#: ../src/mainwindow.c:757
 msgid "Ch_eck for new messages in all folders"
 msgstr "Alle mappen worden gecontroleerd op nieuwe berichten"
 
-#: ../src/mainwindow.c:756
+#: ../src/mainwindow.c:758
 msgid "Delete du_plicated messages"
 msgstr "Verwijder _dubbele berichten"
 
-#: ../src/mainwindow.c:757
+#: ../src/mainwindow.c:759
 msgid "In selected folder"
 msgstr "In geselecteerde map"
 
-#: ../src/mainwindow.c:758
+#: ../src/mainwindow.c:760
 msgid "In all folders"
 msgstr "In alle mappen"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:761
+#: ../src/mainwindow.c:763
 msgid "E_xecute"
 msgstr "_Doen!"
 
-#: ../src/mainwindow.c:762
+#: ../src/mainwindow.c:764
 msgid "Exp_unge"
 msgstr "Gooi _weg"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:765
+#: ../src/mainwindow.c:767
 msgid "SSL cer_tificates"
 msgstr "SSL-cer_tificaten"
 
-#: ../src/mainwindow.c:769
+#: ../src/mainwindow.c:771
 msgid "Filtering Lo_g"
 msgstr "Filter Lo_g"
 
-#: ../src/mainwindow.c:771
+#: ../src/mainwindow.c:773
 msgid "Network _Log"
 msgstr "Netwerk _Log"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:773
+#: ../src/mainwindow.c:775
 msgid "_Forget all session passwords"
 msgstr "_Vergeet alle wachtwoorden van de sessie"
 
 #. Configuration menu
-#: ../src/mainwindow.c:776
+#: ../src/mainwindow.c:778
 msgid "C_hange current account"
 msgstr "_Huidig account veranderen"
 
-#: ../src/mainwindow.c:778
+#: ../src/mainwindow.c:780
 msgid "_Preferences for current account..."
 msgstr "V_oorkeuren huidig account..."
 
-#: ../src/mainwindow.c:779
+#: ../src/mainwindow.c:781
 msgid "Create _new account..."
 msgstr "_Nieuw account aanmaken..."
 
-#: ../src/mainwindow.c:780
+#: ../src/mainwindow.c:782
 msgid "_Edit accounts..."
 msgstr "Account_beheer..."
 
-#: ../src/mainwindow.c:783
+#: ../src/mainwindow.c:785
 msgid "P_references..."
 msgstr "_Voorkeuren..."
 
-#: ../src/mainwindow.c:784
+#: ../src/mainwindow.c:786
 msgid "Pre-pr_ocessing..."
 msgstr "_Voorverwerken..."
 
-#: ../src/mainwindow.c:785
+#: ../src/mainwindow.c:787
 msgid "Post-pro_cessing..."
 msgstr "_Naverwerken..."
 
-#: ../src/mainwindow.c:786
+#: ../src/mainwindow.c:788
 msgid "_Filtering..."
 msgstr "Bezig met _filteren..."
 
-#: ../src/mainwindow.c:787
+#: ../src/mainwindow.c:789
 msgid "_Templates..."
 msgstr "_Sjablonen..."
 
-#: ../src/mainwindow.c:788
+#: ../src/mainwindow.c:790
 msgid "_Actions..."
 msgstr "_Acties..."
 
-#: ../src/mainwindow.c:789
+#: ../src/mainwindow.c:791
 msgid "Tag_s..."
 msgstr "Tag_s..."
 
 #. {"Configuration/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:791
+#: ../src/mainwindow.c:793
 msgid "Plu_gins..."
 msgstr "Plu_gins..."
 
 #. Help menu
-#: ../src/mainwindow.c:794
+#: ../src/mainwindow.c:796
 msgid "_Manual"
 msgstr "_Handboek"
 
-#: ../src/mainwindow.c:795
+#: ../src/mainwindow.c:797
 msgid "_Online User-contributed FAQ"
 msgstr "_On-line FAQ met bijdragen van gebruikers"
 
-#: ../src/mainwindow.c:796
+#: ../src/mainwindow.c:798
 msgid "Icon _Legend"
 msgstr "Pictogram_legenda"
 
-#: ../src/mainwindow.c:798
+#: ../src/mainwindow.c:800
 msgid "Set as default client"
 msgstr "Instellen als standaard programma"
 
-#: ../src/mainwindow.c:805
+#: ../src/mainwindow.c:807
 msgid "Offline _mode"
 msgstr "_Werk offline"
 
 #. toggle
-#: ../src/mainwindow.c:806
+#: ../src/mainwindow.c:808
+msgid "Men_ubar"
+msgstr "Men_ubalk"
+
+#. toggle
+#: ../src/mainwindow.c:809
 msgid "_Message view"
 msgstr "_Berichtweergave"
 
-#: ../src/mainwindow.c:808
+#: ../src/mainwindow.c:811
 msgid "Status _bar"
 msgstr "_Status balk"
 
-#: ../src/mainwindow.c:810
+#: ../src/mainwindow.c:813
 msgid "Column headers"
 msgstr "Kolom koppen"
 
 #. toggle
-#: ../src/mainwindow.c:811
+#: ../src/mainwindow.c:814
 msgid "Th_read view"
 msgstr "Toon berichtenlijst in _boomvorm"
 
 #. toggle
-#: ../src/mainwindow.c:812
+#: ../src/mainwindow.c:815
 msgid "Hide read threads"
 msgstr "Gelezen draden verbergen"
 
 #. toggle
-#: ../src/mainwindow.c:813
+#: ../src/mainwindow.c:816
 msgid "_Hide read messages"
 msgstr "Gelezen berichten _verbergen"
 
 #. toggle
-#: ../src/mainwindow.c:814
+#: ../src/mainwindow.c:817
 msgid "Hide deleted messages"
 msgstr "Verberg verwijderde berichten"
 
 #. toggle
-#: ../src/mainwindow.c:815
+#: ../src/mainwindow.c:818
 msgid "_Fullscreen"
 msgstr "_Volledig scherm"
 
 #. toggle
-#: ../src/mainwindow.c:816 ../src/messageview.c:344
+#: ../src/mainwindow.c:819 ../src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Vo_lledige header weergeven"
 
 #. toggle
-#: ../src/mainwindow.c:817 ../src/messageview.c:345
+#: ../src/mainwindow.c:820 ../src/messageview.c:345
 msgid "_Collapse all"
 msgstr "Alles _opvouwen"
 
 #. 1 toggle
-#: ../src/mainwindow.c:818 ../src/messageview.c:346
+#: ../src/mainwindow.c:821 ../src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Opvouwen vanaf niveau _2"
 
 #. 2 toggle
-#: ../src/mainwindow.c:819 ../src/messageview.c:347
+#: ../src/mainwindow.c:822 ../src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Opvouwen vanaf niveau _3"
 
 #. toggle_toolbar_cb
-#: ../src/mainwindow.c:823
+#: ../src/mainwindow.c:826
 msgid "Text _below icons"
 msgstr "Tekst _onder pictogrammen"
 
 #. radio TOOLBAR_BOTH
-#: ../src/mainwindow.c:824
+#: ../src/mainwindow.c:827
 msgid "Text be_side icons"
 msgstr "Tekst _naast pictogrammen"
 
 #. radio TOOLBAR_BOTH_HORIZ
-#: ../src/mainwindow.c:825
+#: ../src/mainwindow.c:828
 msgid "_Icons only"
 msgstr "Alleen _pictogrammen"
 
 #. radio TOOLBAR_ICON
-#: ../src/mainwindow.c:826
+#: ../src/mainwindow.c:829
 msgid "_Text only"
 msgstr "Alleen _tekst"
 
 #. set_layout_cb
-#: ../src/mainwindow.c:833
+#: ../src/mainwindow.c:836
 msgid "_Standard"
 msgstr "_Standaard"
 
 #. radio NORMAL_LAYOUT
-#: ../src/mainwindow.c:834
+#: ../src/mainwindow.c:837
 msgid "_Three columns"
 msgstr "3 _Kolommen"
 
 #. radio VERTICAL_LAYOUT
-#: ../src/mainwindow.c:835
+#: ../src/mainwindow.c:838
 msgid "_Wide message"
 msgstr "_Hele bericht"
 
 #. radio WIDE_LAYOUT
-#: ../src/mainwindow.c:836
+#: ../src/mainwindow.c:839
 msgid "W_ide message list"
 msgstr "_Brede berichtenlijst"
 
 #. radio WIDE_MSGLIST_LAYOUT
-#: ../src/mainwindow.c:837
+#: ../src/mainwindow.c:840
 msgid "S_mall screen"
 msgstr "K_lein scherm"
 
 #. sort_summary_cb
-#: ../src/mainwindow.c:841
+#: ../src/mainwindow.c:844
 msgid "By _number"
 msgstr "Volgens _nummer"
 
 #. radio SORT_BY_NUMBER
-#: ../src/mainwindow.c:842
+#: ../src/mainwindow.c:845
 msgid "By s_ize"
 msgstr "Volgens _grootte"
 
 #. radio SORT_BY_SIZE
-#: ../src/mainwindow.c:843
+#: ../src/mainwindow.c:846
 msgid "By _date"
 msgstr "Op _datum"
 
 #. radio SORT_BY_DATE
-#: ../src/mainwindow.c:844
+#: ../src/mainwindow.c:847
 msgid "By thread date"
 msgstr "Volgens datum van draad"
 
 #. radio SORT_BY_TO
-#: ../src/mainwindow.c:847
+#: ../src/mainwindow.c:850
 msgid "By s_ubject"
 msgstr "Volgens _onderwerp"
 
 #. radio SORT_BY_SUBJECT
-#: ../src/mainwindow.c:848
+#: ../src/mainwindow.c:851
 msgid "By _color label"
 msgstr "Volgens _kleurlabel"
 
 #. radio SORT_BY_LABEL
-#: ../src/mainwindow.c:849
+#: ../src/mainwindow.c:852
 msgid "By tag"
 msgstr "Volgens tag"
 
 #. radio SORT_BY_TAGS
-#: ../src/mainwindow.c:850
+#: ../src/mainwindow.c:853
 msgid "By _mark"
 msgstr "Volgens _markering"
 
 #. radio SORT_BY_MARK
-#: ../src/mainwindow.c:851
+#: ../src/mainwindow.c:854
 msgid "By _status"
 msgstr "Volgens _status"
 
 #. radio SORT_BY_STATUS
-#: ../src/mainwindow.c:852
+#: ../src/mainwindow.c:855
 msgid "By a_ttachment"
 msgstr "Volgens _bijvoegsel"
 
 #. radio SORT_BY_MIME
-#: ../src/mainwindow.c:853
+#: ../src/mainwindow.c:856
 msgid "By score"
 msgstr "Volgens sc_ore"
 
 #. radio SORT_BY_SCORE
-#: ../src/mainwindow.c:854
+#: ../src/mainwindow.c:857
 msgid "By locked"
 msgstr "Volgens beveiligd"
 
 #. radio SORT_BY_LOCKED
-#: ../src/mainwindow.c:855
+#: ../src/mainwindow.c:858
 msgid "D_on't sort"
 msgstr "Ni_et sorteren"
 
 #. sort_summary_type_cb
-#: ../src/mainwindow.c:859
+#: ../src/mainwindow.c:862
 msgid "Ascending"
 msgstr "Oplopend"
 
 #. radio SORT_ASCENDING
-#: ../src/mainwindow.c:860
+#: ../src/mainwindow.c:863
 msgid "Descending"
 msgstr "Aflopend"
 
-#: ../src/mainwindow.c:901 ../src/messageview.c:388
+#: ../src/mainwindow.c:904 ../src/messageview.c:388
 msgid "_Auto detect"
 msgstr "_Automatisch detecteren"
 
-#: ../src/mainwindow.c:1298 ../src/summaryview.c:6236
+#: ../src/mainwindow.c:1301 ../src/summaryview.c:6236
 msgid "Apply tags..."
 msgstr "Tags toepassen..."
 
-#: ../src/mainwindow.c:1936
+#: ../src/mainwindow.c:1943
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Fout(en) voorgekomen. Klik hier om het log te zien."
 
-#: ../src/mainwindow.c:1951
+#: ../src/mainwindow.c:1958
 msgid "You are online. Click the icon to go offline"
 msgstr "Je bent on-line. Klik op het pictogram om offline te gaan"
 
-#: ../src/mainwindow.c:1954
+#: ../src/mainwindow.c:1961
 msgid "You are offline. Click the icon to go online"
 msgstr "Je bent offline. Klik op het pictogram om on-line te gaan"
 
-#: ../src/mainwindow.c:1968
+#: ../src/mainwindow.c:1975
 msgid "Select account"
 msgstr "Selecteer account"
 
 #. init log instances data before creating log views
 #. Protocol log
-#: ../src/mainwindow.c:1995 ../src/prefs_logging.c:140
+#: ../src/mainwindow.c:2002 ../src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Netwerk log"
 
-#: ../src/mainwindow.c:1999
+#: ../src/mainwindow.c:2006
 msgid "Filtering/Processing debug log"
 msgstr "Filteren/Verwerkingen debug log"
 
-#: ../src/mainwindow.c:2018 ../src/prefs_logging.c:392
+#: ../src/mainwindow.c:2025 ../src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "filter log staat aan\n"
 
-#: ../src/mainwindow.c:2020 ../src/prefs_logging.c:394
+#: ../src/mainwindow.c:2027 ../src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "filter log staat uit.\n"
 
-#: ../src/mainwindow.c:2460 ../src/mainwindow.c:2467 ../src/mainwindow.c:2510
-#: ../src/mainwindow.c:2543 ../src/mainwindow.c:2575 ../src/mainwindow.c:2620
+#: ../src/mainwindow.c:2470 ../src/mainwindow.c:2477 ../src/mainwindow.c:2520
+#: ../src/mainwindow.c:2553 ../src/mainwindow.c:2585 ../src/mainwindow.c:2630
 #: ../src/plugins/notification/notification_trayicon.c:360
-#: ../src/prefs_folder_item.c:1065
+#: ../src/plugins/rssyl/opml_import.c:73 ../src/prefs_folder_item.c:1065
 msgid "Untitled"
 msgstr "Naamloos"
 
-#: ../src/mainwindow.c:2621 ../src/prefs_summary_open.c:114
+#: ../src/mainwindow.c:2631 ../src/prefs_summary_open.c:114
 msgid "none"
 msgstr "niets"
 
-#: ../src/mainwindow.c:2878 ../src/mainwindow.c:2882
+#: ../src/mainwindow.c:2888 ../src/mainwindow.c:2892
 msgid "Delete all messages in trash folders?"
 msgstr "Alle berichten uit de prullenbakken weggooien?"
 
-#: ../src/mainwindow.c:2879
+#: ../src/mainwindow.c:2889
 msgid "Don't quit"
 msgstr "Niet afsluiten"
 
-#: ../src/mainwindow.c:2908 ../src/plugins/mailmbox/plugin_gtk.c:189
+#: ../src/mainwindow.c:2918 ../src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Postvak toevoegen"
 
-#: ../src/mainwindow.c:2909
+#: ../src/mainwindow.c:2919
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
-"Geef de lokatie van het postvak.\n"
+"Geef de locatie van het postvak.\n"
 "Als een bestaand postvak wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: ../src/mainwindow.c:2915 ../src/plugins/mailmbox/plugin_gtk.c:196
-#: ../src/plugins/rssyl/rssyl_gtk.c:158
+#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:196
+#: ../src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Het postvak '%s' bestaat al."
 
-#: ../src/mainwindow.c:2920 ../src/plugins/mailmbox/plugin_gtk.c:202
+#: ../src/mainwindow.c:2930 ../src/plugins/mailmbox/plugin_gtk.c:202
 #: ../src/setup.c:52 ../src/wizard.c:741
 msgid "Mailbox"
 msgstr "Postvak"
 
-#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:209
+#: ../src/mainwindow.c:2935 ../src/plugins/mailmbox/plugin_gtk.c:209
 #: ../src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
@@ -8065,137 +8261,137 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
 "schrijven."
 
-#: ../src/mainwindow.c:3377
+#: ../src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "Versturen niet toegestaan"
 
-#: ../src/mainwindow.c:3955
+#: ../src/mainwindow.c:3965
 msgid "Mbox import has failed."
 msgstr "Fout bij importeren mbox-bestand."
 
-#: ../src/mainwindow.c:3964 ../src/mainwindow.c:3973
+#: ../src/mainwindow.c:3974 ../src/mainwindow.c:3983
 msgid "Export to mbox has failed."
 msgstr "Exporteren naar mbox-bestand mislukt."
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit Claws Mail?"
 msgstr "Claws Mail afsluiten?"
 
-#: ../src/mainwindow.c:4205
+#: ../src/mainwindow.c:4215
 msgid "Folder synchronisation"
 msgstr "Map synchronisatie"
 
-#: ../src/mainwindow.c:4206
+#: ../src/mainwindow.c:4216
 msgid "Do you want to synchronise your folders now?"
 msgstr "Wil je alle mappen nu synchroniseren?"
 
-#: ../src/mainwindow.c:4207
+#: ../src/mainwindow.c:4217
 msgid "+_Synchronise"
 msgstr "+_Synchroniseer"
 
-#: ../src/mainwindow.c:4636
+#: ../src/mainwindow.c:4659
 msgid "Deleting duplicated messages..."
 msgstr "Dubbele berichten worden verwijderd..."
 
-#: ../src/mainwindow.c:4673
+#: ../src/mainwindow.c:4696
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d dubbel bericht verwijderd in %d map.\n"
 msgstr[1] "%d dubbele berichten verwijderd in %d mappen.\n"
 
-#: ../src/mainwindow.c:4928 ../src/summaryview.c:5725
+#: ../src/mainwindow.c:4951 ../src/summaryview.c:5725
 msgid "Processing rules to apply before folder rules"
 msgstr "Verwerkingsregels toepassen voor mapregels"
 
-#: ../src/mainwindow.c:4936
+#: ../src/mainwindow.c:4959
 msgid "Processing rules to apply after folder rules"
 msgstr "Verwerkingsregels toepassen na mapregels"
 
-#: ../src/mainwindow.c:4944 ../src/summaryview.c:5736
+#: ../src/mainwindow.c:4967 ../src/summaryview.c:5736
 msgid "Filtering configuration"
 msgstr "Filters instellen"
 
-#: ../src/mainwindow.c:5059
+#: ../src/mainwindow.c:5082
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Kan niet registreren als standaard mailprogramma: niet mogelijk om het "
 "uitvoerpad te vinden."
 
-#: ../src/mainwindow.c:5118
+#: ../src/mainwindow.c:5141
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail is geregistreerd als standaard mailprogramma."
 
-#: ../src/mainwindow.c:5120
+#: ../src/mainwindow.c:5143
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Kan niet registreren als standaard mailprogramma: niet mogelijk om te "
 "schrijven naar het register."
 
-#: ../src/mainwindow.c:5278
+#: ../src/mainwindow.c:5301
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "%d Vergeten wachtwoord van %d accounts.\n"
 msgstr[1] "%d Vergeten wachtwoorden van %d accounts.\n"
 
-#: ../src/matcher.c:209 ../src/matcher.c:210 ../src/matcher.c:211
-#: ../src/matcher.c:212 ../src/matcher.c:213 ../src/matcher.c:214
-#: ../src/matcher.c:215
+#: ../src/matcher.c:211 ../src/matcher.c:212 ../src/matcher.c:213
+#: ../src/matcher.c:214 ../src/matcher.c:215 ../src/matcher.c:216
+#: ../src/matcher.c:217
 #, c-format
 msgid "%s header"
 msgstr "%s header"
 
-#: ../src/matcher.c:216
+#: ../src/matcher.c:218
 msgid "header"
 msgstr "header"
 
-#: ../src/matcher.c:217
+#: ../src/matcher.c:219
 msgid "header line"
 msgstr "header regel"
 
-#: ../src/matcher.c:218
+#: ../src/matcher.c:220
 msgid "body line"
 msgstr "Inhoud regel"
 
-#: ../src/matcher.c:219
+#: ../src/matcher.c:221
 msgid "tag"
 msgstr "tag"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553 ../src/message_search.c:205 ../src/prefs_matcher.c:739
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555 ../src/message_search.c:205 ../src/prefs_matcher.c:742
 #: ../src/summary_search.c:466
 msgid "Case sensitive"
 msgstr "Hoofd / kleine letters onderscheiden"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555
 msgid "Case insensitive"
 msgstr "Hoofd / kleine letters niet onderscheiden"
 
-#: ../src/matcher.c:1818
+#: ../src/matcher.c:1843
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "Controleren of bericht overeenkomt met [ %s ]\n"
 
-#: ../src/matcher.c:1887 ../src/matcher.c:1906 ../src/matcher.c:1919
+#: ../src/matcher.c:1912 ../src/matcher.c:1931 ../src/matcher.c:1944
 msgid "message matches\n"
 msgstr "bericht komt overeen\n"
 
-#: ../src/matcher.c:1894 ../src/matcher.c:1912 ../src/matcher.c:1921
+#: ../src/matcher.c:1919 ../src/matcher.c:1937 ../src/matcher.c:1946
 msgid "message does not match\n"
 msgstr "bericht komt niet overeen\n"
 
-#: ../src/matcher.c:2184 ../src/matcher.c:2185 ../src/matcher.c:2186
-#: ../src/matcher.c:2187 ../src/matcher.c:2188 ../src/matcher.c:2189
-#: ../src/matcher.c:2190 ../src/matcher.c:2191
+#: ../src/matcher.c:2209 ../src/matcher.c:2210 ../src/matcher.c:2211
+#: ../src/matcher.c:2212 ../src/matcher.c:2213 ../src/matcher.c:2214
+#: ../src/matcher.c:2215 ../src/matcher.c:2216
 msgid "(none)"
 msgstr "(niets)"
 
@@ -8223,8 +8419,8 @@ msgstr "Mbox-bestand overschrijven"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Dit bestand bestaat reeds. Wil je het overschrijven?"
 
-#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1843
-#: ../src/prefs_themes.c:555 ../src/textview.c:3075
+#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1844
+#: ../src/prefs_themes.c:555 ../src/textview.c:3054
 msgid "Overwrite"
 msgstr "Overschrijven"
 
@@ -8319,7 +8515,7 @@ msgstr ""
 msgid "Fetching message (%s)..."
 msgstr "Ophalen van bericht (%s)..."
 
-#: ../src/messageview.c:1357 ../src/procmime.c:1004
+#: ../src/messageview.c:1357 ../src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Decoderen mislukt: %s"
@@ -8330,9 +8526,9 @@ msgstr ""
 "Bericht is niet conform de MIME standaard. Het zou verkeerd weergegeven "
 "kunnen worden."
 
-#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1996
-#: ../src/plugins/fancy/fancy_viewer.c:667 ../src/summaryview.c:4808
-#: ../src/summaryview.c:4811 ../src/textview.c:3063
+#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1997
+#: ../src/plugins/fancy/fancy_viewer.c:669 ../src/summaryview.c:4808
+#: ../src/summaryview.c:4811 ../src/textview.c:3042
 msgid "Save as"
 msgstr "Opslaan als"
 
@@ -8438,7 +8634,7 @@ msgstr ""
 "Dit bericht werd verzonden naar meerdere accounts van je\n"
 "Kies het account vanaf welke je de ontvangstbevestiging wilt versturen:"
 
-#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_gtk.c:494
+#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_feed_props.c:533
 msgid "_Cancel"
 msgstr "_Annuleren"
 
@@ -8475,20 +8671,20 @@ msgstr ""
 "  Bericht is verplaatst naar de prullenbak of naar een andere map"
 
 #: ../src/messageview.c:2971 ../src/messageview.c:2977
-#: ../src/summaryview.c:4191 ../src/summaryview.c:6964
+#: ../src/summaryview.c:4193 ../src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "Er is een fout opgetreden tijdens het leren.\n"
 
-#: ../src/mh.c:432
+#: ../src/mh.c:438
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kan bericht niet van %s naar %s kopiëren\n"
 
-#: ../src/mh.c:518
+#: ../src/mh.c:524
 msgid "Moving messages..."
 msgstr "Berichten worden verplaatst..."
 
-#: ../src/mh.c:662 ../src/plugins/mailmbox/mailmbox_folder.c:839
+#: ../src/mh.c:668 ../src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Berichten worden verwijderd..."
 
@@ -8579,32 +8775,32 @@ msgstr "Ondertekening wordt geverifieerd..."
 msgid "Go back to email"
 msgstr "Ga terug naar bericht"
 
-#: ../src/mimeview.c:1762 ../src/mimeview.c:1851 ../src/mimeview.c:2043
-#: ../src/mimeview.c:2079 ../src/mimeview.c:2191
-#: ../src/plugins/fancy/fancy_viewer.c:420
+#: ../src/mimeview.c:1763 ../src/mimeview.c:1852 ../src/mimeview.c:2044
+#: ../src/mimeview.c:2080 ../src/mimeview.c:2192
+#: ../src/plugins/fancy/fancy_viewer.c:422
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Kan het deel van een meerdelig bericht niet opslaan: %s"
 
-#: ../src/mimeview.c:1840 ../src/textview.c:3073
+#: ../src/mimeview.c:1841 ../src/textview.c:3052
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Bestaand bestand '%s' overschrijven?"
 
-#: ../src/mimeview.c:1882 ../src/plugins/archive/archiver_prefs.c:128
+#: ../src/mimeview.c:1883 ../src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
 msgstr "Selecteer doelmap"
 
-#: ../src/mimeview.c:1889 ../src/plugins/archive/archiver_prefs.c:134
+#: ../src/mimeview.c:1890 ../src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' is geen map."
 
-#: ../src/mimeview.c:2126 ../src/mimeview.c:2133 ../src/textview.c:2994
+#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2973
 msgid "Open with"
 msgstr "Open met"
 
-#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2995
+#: ../src/mimeview.c:2128 ../src/mimeview.c:2135 ../src/textview.c:2974
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8613,11 +8809,11 @@ msgstr ""
 "Geef de opdracht om het bestand mee te openen:\n"
 "('%s' zal vervangen worden door de bestandsnaam)"
 
-#: ../src/mimeview.c:2225
+#: ../src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "Onbekend programma uitvoeren?"
 
-#: ../src/mimeview.c:2226
+#: ../src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8630,19 +8826,19 @@ msgstr ""
 "\n"
 "Wil je dit programma uitvoeren?"
 
-#: ../src/mimeview.c:2230
+#: ../src/mimeview.c:2231
 msgid "Run binary"
 msgstr "Draai programma"
 
-#: ../src/mimeview.c:2529
+#: ../src/mimeview.c:2530
 msgid "Type:"
 msgstr "Type:"
 
-#: ../src/mimeview.c:2530 ../src/plugins/pdf_viewer/poppler_viewer.c:699
+#: ../src/mimeview.c:2531 ../src/plugins/pdf_viewer/poppler_viewer.c:699
 msgid "Size:"
 msgstr "Grootte:"
 
-#: ../src/mimeview.c:2544 ../src/plugins/vcalendar/vcalendar.c:1271
+#: ../src/mimeview.c:2545 ../src/plugins/vcalendar/vcalendar.c:1271
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1722
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1732
 msgid "Description:"
@@ -8773,7 +8969,7 @@ msgstr "Nieuwsgroep '%s' werkelijk afmelden?"
 msgid "Unsubscribe newsgroup"
 msgstr "Afmelden van nieuwsgroep"
 
-#: ../src/news_gtk.c:268 ../src/plugins/rssyl/rssyl_gtk.c:695
+#: ../src/news_gtk.c:268
 msgid "_Unsubscribe"
 msgstr "_Afmelden"
 
@@ -8919,7 +9115,7 @@ msgstr "Adresboek pad waar adressen opgeslagen worden"
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:201
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:447
 #: ../src/prefs_filtering_action.c:573 ../src/prefs_filtering_action.c:580
-#: ../src/prefs_matcher.c:676
+#: ../src/prefs_matcher.c:679
 msgid "Select..."
 msgstr "Selecteren..."
 
@@ -8994,7 +9190,7 @@ msgstr ""
 "Deze plugin voegt archiveringsmogelijkheden toe aan Claws Mail.\n"
 "\n"
 "Het biedt de mogelijkheid om een mail map te selecteren die je gearchiveerd "
-"wilt hebben, en dan een naam, formaat en lokatie te kiezen voor het archief. "
+"wilt hebben, en dan een naam, formaat en locatie te kiezen voor het archief. "
 "Submappen kunnen bijgevoegd worden en MD5 checksums kunnen toegevoegd worden "
 "voor elk bestand in het archief. Meerdere archiveringsopties zijn verder nog "
 "beschikbaar.\n"
@@ -9014,7 +9210,7 @@ msgstr ""
 "\n"
 "Om de archivering te activeren ga naar /Gereedschap/Maak Archief Aan\n"
 "\n"
-"Standaard opties kunnen ingesteld worden in /Configuratie/Voorkeuren/Plugins/"
+"Standaard opties kunnen ingesteld worden in /Instellingen/Voorkeuren/Plugins/"
 "Mail Archiveerder"
 
 #: ../src/plugins/archive/archiver.c:156
@@ -9033,36 +9229,36 @@ msgstr "Klik op Annuleren om het archiveren te stoppen"
 msgid "Archiving:"
 msgstr "Archiveren:"
 
-#: ../src/plugins/archive/archiver_gtk.c:506
+#: ../src/plugins/archive/archiver_gtk.c:507
 msgid "Folder and archive must be selected"
 msgstr "Map en archief moeten geselecteerd worden"
 
-#: ../src/plugins/archive/archiver_gtk.c:515
+#: ../src/plugins/archive/archiver_gtk.c:516
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s: Bestaat. Toch doorgaan?"
 
-#: ../src/plugins/archive/archiver_gtk.c:518
+#: ../src/plugins/archive/archiver_gtk.c:519
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: Is een link. Kan niet doorgaan"
 
-#: ../src/plugins/archive/archiver_gtk.c:521
+#: ../src/plugins/archive/archiver_gtk.c:522
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: Is een map. Kan niet doorgaan"
 
-#: ../src/plugins/archive/archiver_gtk.c:524
+#: ../src/plugins/archive/archiver_gtk.c:525
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: Geen toegang. Kan niet doorgaan"
 
-#: ../src/plugins/archive/archiver_gtk.c:527
+#: ../src/plugins/archive/archiver_gtk.c:528
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: Onbekende fout. Kan niet doorgaan"
 
-#: ../src/plugins/archive/archiver_gtk.c:564
+#: ../src/plugins/archive/archiver_gtk.c:565
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -9071,7 +9267,7 @@ msgstr ""
 "Geen geldige bestandsnaam:\n"
 "%s."
 
-#: ../src/plugins/archive/archiver_gtk.c:577
+#: ../src/plugins/archive/archiver_gtk.c:578
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -9080,7 +9276,7 @@ msgstr ""
 "Geen geldige Claws Mail map:\n"
 "%s."
 
-#: ../src/plugins/archive/archiver_gtk.c:606
+#: ../src/plugins/archive/archiver_gtk.c:607
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -9095,182 +9291,182 @@ msgstr ""
 "\n"
 "Toch doorgaan?"
 
-#: ../src/plugins/archive/archiver_gtk.c:710
+#: ../src/plugins/archive/archiver_gtk.c:711
 msgid "Archive result"
 msgstr "Archiveer resultaat"
 
-#: ../src/plugins/archive/archiver_gtk.c:740
+#: ../src/plugins/archive/archiver_gtk.c:741
 msgid "Values"
 msgstr "Waardes"
 
-#: ../src/plugins/archive/archiver_gtk.c:749
+#: ../src/plugins/archive/archiver_gtk.c:750
 msgid "Archive"
 msgstr "Archief"
 
-#: ../src/plugins/archive/archiver_gtk.c:755
+#: ../src/plugins/archive/archiver_gtk.c:756
 msgid "Archive format"
 msgstr "Archief formaat"
 
-#: ../src/plugins/archive/archiver_gtk.c:762
+#: ../src/plugins/archive/archiver_gtk.c:763
 msgid "Compression method"
 msgstr "Complessie methode"
 
-#: ../src/plugins/archive/archiver_gtk.c:770
+#: ../src/plugins/archive/archiver_gtk.c:771
 msgid "Number of files"
 msgstr "Aantal bestanden"
 
-#: ../src/plugins/archive/archiver_gtk.c:778
+#: ../src/plugins/archive/archiver_gtk.c:779
 msgid "Archive Size"
 msgstr "Archief Grootte"
 
-#: ../src/plugins/archive/archiver_gtk.c:786
+#: ../src/plugins/archive/archiver_gtk.c:787
 msgid "Folder Size"
 msgstr "Map Grootte"
 
-#: ../src/plugins/archive/archiver_gtk.c:795
+#: ../src/plugins/archive/archiver_gtk.c:796
 msgid "Compression level"
 msgstr "Compressie niveau"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:718
 #: ../src/prefs_folder_item.c:514
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:721
 #: ../src/prefs_folder_item.c:513 ../src/prefs_summaries.c:369
 msgid "No"
 msgstr "Geen"
 
-#: ../src/plugins/archive/archiver_gtk.c:803
+#: ../src/plugins/archive/archiver_gtk.c:804
 msgid "MD5 checksum"
 msgstr "MD5 checksum"
 
-#: ../src/plugins/archive/archiver_gtk.c:811
+#: ../src/plugins/archive/archiver_gtk.c:812
 msgid "Descriptive names"
 msgstr "Beschrijvende namen"
 
-#: ../src/plugins/archive/archiver_gtk.c:819
+#: ../src/plugins/archive/archiver_gtk.c:820
 msgid "Delete selected files"
 msgstr "Verwijder geselecteerd bestand"
 
-#: ../src/plugins/archive/archiver_gtk.c:828
-#: ../src/plugins/archive/archiver_gtk.c:1210
+#: ../src/plugins/archive/archiver_gtk.c:829
+#: ../src/plugins/archive/archiver_gtk.c:1211
 msgid "Select mails before"
 msgstr "Selecteer e-mails voor"
 
-#: ../src/plugins/archive/archiver_gtk.c:904
+#: ../src/plugins/archive/archiver_gtk.c:905
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Selecteer bestandsnaam voor archief [achtervoegsel moet overeenkomen met "
 "archief zoals .tgz]"
 
-#: ../src/plugins/archive/archiver_gtk.c:952
+#: ../src/plugins/archive/archiver_gtk.c:953
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld of %ld"
 
-#: ../src/plugins/archive/archiver_gtk.c:991
+#: ../src/plugins/archive/archiver_gtk.c:992
 msgid "Create Archive"
 msgstr "Maak Archief aan"
 
-#: ../src/plugins/archive/archiver_gtk.c:1006
+#: ../src/plugins/archive/archiver_gtk.c:1007
 msgid "Enter Archiver arguments"
 msgstr "Voer Archiveerder argumenten in"
 
-#: ../src/plugins/archive/archiver_gtk.c:1019
+#: ../src/plugins/archive/archiver_gtk.c:1020
 msgid "Folder to archive"
 msgstr "Map om te archiveren"
 
-#: ../src/plugins/archive/archiver_gtk.c:1026
+#: ../src/plugins/archive/archiver_gtk.c:1027
 msgid "Folder which is the root of the archive"
 msgstr "Bovenste map van het archief"
 
-#: ../src/plugins/archive/archiver_gtk.c:1031
+#: ../src/plugins/archive/archiver_gtk.c:1032
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 "Klik hier om een map te selecteren wat de bovenste map van het archief is"
 
-#: ../src/plugins/archive/archiver_gtk.c:1037
+#: ../src/plugins/archive/archiver_gtk.c:1038
 msgid "Name for archive"
 msgstr "Naam van het archief"
 
-#: ../src/plugins/archive/archiver_gtk.c:1043
+#: ../src/plugins/archive/archiver_gtk.c:1044
 msgid "Archive location and name"
-msgstr "Lokatie en naam van het archief"
+msgstr "Locatie en naam van het archief"
 
-#: ../src/plugins/archive/archiver_gtk.c:1045
+#: ../src/plugins/archive/archiver_gtk.c:1046
 #: ../src/plugins/archive/archiver_prefs.c:198
 #: ../src/plugins/pgpcore/select-keys.c:422
 msgid "_Select"
 msgstr "_Selecteer"
 
-#: ../src/plugins/archive/archiver_gtk.c:1048
+#: ../src/plugins/archive/archiver_gtk.c:1049
 msgid "Click this button to select a name and location for the archive"
-msgstr "Klik hier om een naam en lokatie voor het archief te selecteren"
+msgstr "Klik hier om een naam en locatie voor het archief te selecteren"
 
-#: ../src/plugins/archive/archiver_gtk.c:1050
+#: ../src/plugins/archive/archiver_gtk.c:1051
 msgid "Choose compression"
 msgstr "Kies compressie"
 
-#: ../src/plugins/archive/archiver_gtk.c:1063
+#: ../src/plugins/archive/archiver_gtk.c:1064
 msgid "Choose this option to use ZIP compression for the archive"
 msgstr "Kies deze optie om ZIP compressie te gebruiken voor het archief"
 
-#: ../src/plugins/archive/archiver_gtk.c:1070
+#: ../src/plugins/archive/archiver_gtk.c:1071
 msgid "Choose this option to use BZIP2 compression for the archive"
 msgstr "Kies deze optie om BZIP2 compressie te gebruiken voor het archief"
 
-#: ../src/plugins/archive/archiver_gtk.c:1078
+#: ../src/plugins/archive/archiver_gtk.c:1079
 msgid "Choose this to use Compress compression for your archive"
 msgstr "Kies deze optie om Compress compressie te gebruiken voor het archief"
 
-#: ../src/plugins/archive/archiver_gtk.c:1086
+#: ../src/plugins/archive/archiver_gtk.c:1087
 msgid "Choose this option to disable compression for the archive"
 msgstr "Kies deze optie om compressie uit te schakelen voor het archief"
 
-#: ../src/plugins/archive/archiver_gtk.c:1108
+#: ../src/plugins/archive/archiver_gtk.c:1109
 msgid "Choose format"
 msgstr "Kies formaat"
 
-#: ../src/plugins/archive/archiver_gtk.c:1121
+#: ../src/plugins/archive/archiver_gtk.c:1122
 msgid "Choose this option to use TAR as format for the archive"
 msgstr "Kies deze optie om TAR te gebruiken als formaat voor het archief"
 
-#: ../src/plugins/archive/archiver_gtk.c:1128
+#: ../src/plugins/archive/archiver_gtk.c:1129
 msgid "Choose this to use SHAR as format for the archive"
 msgstr "Kies deze optie om SHAR te gebruiken als formaat voor het archief"
 
-#: ../src/plugins/archive/archiver_gtk.c:1135
+#: ../src/plugins/archive/archiver_gtk.c:1136
 msgid "Choose this option to use CPIO as format for the archive"
 msgstr "Kies deze optie om CPIO te gebruiken als formaat voor het archief"
 
-#: ../src/plugins/archive/archiver_gtk.c:1142
+#: ../src/plugins/archive/archiver_gtk.c:1143
 msgid "Choose this option to use PAX as format for the archive"
 msgstr "Kies deze optie om PAX te gebruiken als formaat voor het archief"
 
-#: ../src/plugins/archive/archiver_gtk.c:1162
+#: ../src/plugins/archive/archiver_gtk.c:1163
 msgid "Miscellaneous options"
 msgstr "Overige opties"
 
-#: ../src/plugins/archive/archiver_gtk.c:1171
+#: ../src/plugins/archive/archiver_gtk.c:1172
 msgid "_Recursive"
 msgstr "_Recursief"
 
-#: ../src/plugins/archive/archiver_gtk.c:1175
+#: ../src/plugins/archive/archiver_gtk.c:1176
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Kies dzee optie om submappen in het archief te voegen"
 
-#: ../src/plugins/archive/archiver_gtk.c:1177
+#: ../src/plugins/archive/archiver_gtk.c:1178
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: ../src/plugins/archive/archiver_gtk.c:1181
+#: ../src/plugins/archive/archiver_gtk.c:1182
 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"
@@ -9280,11 +9476,11 @@ msgstr ""
 "Wees je ervan bewust dat dit de tijd die het duurt om het archief aan te "
 "maken drastisch verhoogt"
 
-#: ../src/plugins/archive/archiver_gtk.c:1185
+#: ../src/plugins/archive/archiver_gtk.c:1186
 msgid "R_ename"
 msgstr "_Hernoemen"
 
-#: ../src/plugins/archive/archiver_gtk.c:1189
+#: ../src/plugins/archive/archiver_gtk.c:1190
 #: ../src/plugins/archive/archiver_prefs.c:333
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9295,7 +9491,7 @@ msgstr ""
 "Dit volgens het schema: datum_van at onderwerp.\n"
 "Namen worden verkort tot max 96 karakters"
 
-#: ../src/plugins/archive/archiver_gtk.c:1197
+#: ../src/plugins/archive/archiver_gtk.c:1198
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9303,11 +9499,11 @@ msgstr ""
 "Kies deze optie om e-mails te verwijderen na het archiveren\n"
 "Op dit moment kan dit alleen bij IMAP4, Lokale mbox en POP3"
 
-#: ../src/plugins/archive/archiver_gtk.c:1201
+#: ../src/plugins/archive/archiver_gtk.c:1202
 msgid "Selection options"
 msgstr "Selecteer opties"
 
-#: ../src/plugins/archive/archiver_gtk.c:1217
+#: ../src/plugins/archive/archiver_gtk.c:1218
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9322,7 +9518,7 @@ msgstr "Standaard bewaar map"
 #: ../src/plugins/archive/archiver_prefs.c:202
 msgid "Click this button to select the default location for saving archives"
 msgstr ""
-"Klik deze knop om de standaard lokatie te selecteren voor het bewaren van "
+"Klik deze knop om de standaard locatie te selecteren voor het bewaren van "
 "archieven"
 
 #: ../src/plugins/archive/archiver_prefs.c:211
@@ -9397,11 +9593,82 @@ msgstr "Hernoemen"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Kies deze optie om e-mails te verwijderen na het archiveren"
 
-#: ../src/plugins/attachwarner/attachwarner.c:216
-#, c-format
-msgid ""
-"An attachment is mentioned in the mail you're sending, but no file was "
-"attached. Mention appears on line %d, which begins with text: <span weight="
+#: ../src/plugins/att_remover/att_remover.c:299
+msgid "<b>Type: </b>"
+msgstr "<b>Type: </b>"
+
+#: ../src/plugins/att_remover/att_remover.c:300
+msgid "<b>Size: </b>"
+msgstr "<b>Grootte:</b>"
+
+#: ../src/plugins/att_remover/att_remover.c:301
+msgid "<b>Filename: </b>"
+msgstr "<b>Bestandsnaam: </b>"
+
+#: ../src/plugins/att_remover/att_remover.c:332
+msgid "Remove attachments"
+msgstr "Verwijder bijvoegsels"
+
+#: ../src/plugins/att_remover/att_remover.c:357
+#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
+msgid "Remove"
+msgstr "Verwijderen"
+
+#. S_COL_STATUS
+#: ../src/plugins/att_remover/att_remover.c:365
+#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
+msgid "Attachment"
+msgstr "Bijvoegsel"
+
+#: ../src/plugins/att_remover/att_remover.c:417
+msgid "Destroy attachments"
+msgstr "Vernietig bijvoegsels"
+
+#: ../src/plugins/att_remover/att_remover.c:418
+msgid ""
+"Do you really want to remove all attachments from the selected messages?\n"
+"\n"
+"The deleted data will be unrecoverable."
+msgstr ""
+"Wil je werkelijk alle bijvoegsels verwijderen van de geselecteerde "
+"berichten?\n"
+"\n"
+"De verwijderde gegevens kunnen niet teruggehaald worden."
+
+#: ../src/plugins/att_remover/att_remover.c:479
+msgid "This message doesn't have any attachments."
+msgstr "Dit bericht bevat geen bijvoegsels."
+
+#: ../src/plugins/att_remover/att_remover.c:494
+msgid "Remove attachments..."
+msgstr "Verwijder bijvoegsels..."
+
+#: ../src/plugins/att_remover/att_remover.c:506
+#: ../src/plugins/att_remover/att_remover.c:566
+msgid "AttRemover"
+msgstr "Bijvoegsel Verwijderaar"
+
+#: ../src/plugins/att_remover/att_remover.c:571
+msgid ""
+"This plugin removes attachments from mails.\n"
+"\n"
+"Warning: this operation will be completely un-cancellable and the deleted "
+"attachments will be lost forever, and ever, and ever."
+msgstr ""
+"Deze plugin verwijdert bijvoegsels van e-mails.\n"
+"\n"
+"Waarschuwing: deze operatie is volledig onomkeerbaar en de verwijderde "
+"bijvoegsels zijn voor eeuwig en eeuwig verloren."
+
+#: ../src/plugins/att_remover/att_remover.c:595
+msgid "Attachment handling"
+msgstr "Bijvoegsel afhandeling"
+
+#: ../src/plugins/attachwarner/attachwarner.c:216
+#, c-format
+msgid ""
+"An attachment is mentioned in the mail you're sending, but no file was "
+"attached. Mention appears on line %d, which begins with text: <span weight="
 "\"bold\">%.20s</span>...\n"
 "\n"
 "%s it anyway?"
@@ -9497,77 +9764,6 @@ msgstr "Negeren"
 msgid "Attach Warner"
 msgstr "Attach Warner"
 
-#: ../src/plugins/att_remover/att_remover.c:299
-msgid "<b>Type: </b>"
-msgstr "<b>Type: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:300
-msgid "<b>Size: </b>"
-msgstr "<b>Grootte:</b>"
-
-#: ../src/plugins/att_remover/att_remover.c:301
-msgid "<b>Filename: </b>"
-msgstr "<b>Bestandsnaam: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:332
-msgid "Remove attachments"
-msgstr "Verwijder bijvoegsels"
-
-#: ../src/plugins/att_remover/att_remover.c:357
-#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
-msgid "Remove"
-msgstr "Verwijderen"
-
-#. S_COL_STATUS
-#: ../src/plugins/att_remover/att_remover.c:365
-#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
-msgid "Attachment"
-msgstr "Bijvoegsel"
-
-#: ../src/plugins/att_remover/att_remover.c:417
-msgid "Destroy attachments"
-msgstr "Vernietig bijvoegsels"
-
-#: ../src/plugins/att_remover/att_remover.c:418
-msgid ""
-"Do you really want to remove all attachments from the selected messages?\n"
-"\n"
-"The deleted data will be unrecoverable."
-msgstr ""
-"Wil je werkelijk alle bijvoegsels verwijderen van de geselecteerde "
-"berichten?\n"
-"\n"
-"De verwijderde gegevens kunnen niet teruggehaald worden."
-
-#: ../src/plugins/att_remover/att_remover.c:479
-msgid "This message doesn't have any attachments."
-msgstr "Dit bericht bevat geen bijvoegsels."
-
-#: ../src/plugins/att_remover/att_remover.c:494
-msgid "Remove attachments..."
-msgstr "Verwijder bijvoegsels..."
-
-#: ../src/plugins/att_remover/att_remover.c:506
-#: ../src/plugins/att_remover/att_remover.c:566
-msgid "AttRemover"
-msgstr "Bijvoegsel Verwijderaar"
-
-#: ../src/plugins/att_remover/att_remover.c:571
-msgid ""
-"This plugin removes attachments from mails.\n"
-"\n"
-"Warning: this operation will be completely un-cancellable and the deleted "
-"attachments will be lost forever, and ever, and ever."
-msgstr ""
-"Deze plugin verwijdert bijvoegsels van e-mails.\n"
-"\n"
-"Waarschuwing: deze operatie is volledig onomkeerbaar en de verwijderde "
-"bijvoegsels zijn voor eeuwig en eeuwig verloren."
-
-#: ../src/plugins/att_remover/att_remover.c:595
-msgid "Attachment handling"
-msgstr "Bijvoegsel afhandeling"
-
 #: ../src/plugins/bogofilter/bogofilter.c:81
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:458
 msgid "Bogofilter"
@@ -9984,7 +10180,7 @@ msgstr ""
 "TCP socket en handmatige configuratie kiezen voor clamd.\n"
 "\n"
 "Opties kunnen gevonden worden in\n"
-"/Configuratie/Voorkeuren/Plugins/Clam AntiVirus"
+"/Instellingen/Voorkeuren/Plugins/Clam AntiVirus"
 
 #: ../src/plugins/clamd/clamav_plugin.c:367
 msgid "Virus detection"
@@ -10168,63 +10364,63 @@ msgstr ""
 "\n"
 "De plugin is als plugin niet echt echt nuttig"
 
-#: ../src/plugins/fancy/fancy_prefs.c:141
+#: ../src/plugins/fancy/fancy_prefs.c:146
 msgid "Display images"
 msgstr "Afbeeldingen weergeven"
 
-#: ../src/plugins/fancy/fancy_prefs.c:142
+#: ../src/plugins/fancy/fancy_prefs.c:147
 msgid "Display embedded images"
 msgstr "Weergeven ingesloten afbeeldingen"
 
-#: ../src/plugins/fancy/fancy_prefs.c:146
+#: ../src/plugins/fancy/fancy_prefs.c:151
 msgid "Execute javascript"
 msgstr "Zet Javascript aan"
 
-#: ../src/plugins/fancy/fancy_prefs.c:147
+#: ../src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute embedded javascript"
 msgstr "Ingesloten Javascript uitvoeren"
 
-#: ../src/plugins/fancy/fancy_prefs.c:151
+#: ../src/plugins/fancy/fancy_prefs.c:156
 msgid "Execute Java applets"
 msgstr "Java applets uitvoeren"
 
-#: ../src/plugins/fancy/fancy_prefs.c:152
+#: ../src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute embedded Java applets"
 msgstr "Ingesloten Java applets uitvoeren"
 
-#: ../src/plugins/fancy/fancy_prefs.c:156
+#: ../src/plugins/fancy/fancy_prefs.c:161
 msgid "Render objects using plugins"
 msgstr "Toon objecten met behulp van plugins"
 
-#: ../src/plugins/fancy/fancy_prefs.c:157
+#: ../src/plugins/fancy/fancy_prefs.c:162
 msgid "Render embedded objects using plugins"
 msgstr "Toon ingesloten objecten met behulp van plugins"
 
-#: ../src/plugins/fancy/fancy_prefs.c:164
+#: ../src/plugins/fancy/fancy_prefs.c:169
 msgid "Open in viewer (remote content is enabled)"
 msgstr "Open in browser (inhoud van de server wordt geladen)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:167
+#: ../src/plugins/fancy/fancy_prefs.c:172
 msgid "Do nothing (remote content is disabled)"
 msgstr "Doe niets (inhoud van de server wordt niet geladen)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:200
+#: ../src/plugins/fancy/fancy_prefs.c:209
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/plugins/fancy/fancy_prefs.c:202
+#: ../src/plugins/fancy/fancy_prefs.c:211
 msgid "Use GNOME's proxy settings"
 msgstr "Gebruik GNOME's proxy instellingen"
 
-#: ../src/plugins/fancy/fancy_prefs.c:210
+#: ../src/plugins/fancy/fancy_prefs.c:219
 msgid "Use proxy:"
 msgstr "Gebruik proxy:"
 
-#: ../src/plugins/fancy/fancy_prefs.c:228
+#: ../src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
 msgstr "Bronnen van de server"
 
-#: ../src/plugins/fancy/fancy_prefs.c:229
+#: ../src/plugins/fancy/fancy_prefs.c:238
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10238,106 +10434,124 @@ msgstr ""
 "scripts, plugin objecten of Java applets kan nog steeds\n"
 "worden aangezet voor inhoud die is bijgevoegd in de e-mail."
 
-#: ../src/plugins/fancy/fancy_prefs.c:235
+#: ../src/plugins/fancy/fancy_prefs.c:244
 msgid "Enable loading of remote content"
 msgstr "Inhoud van de server laden"
 
-#: ../src/plugins/fancy/fancy_prefs.c:267
+#: ../src/plugins/fancy/fancy_prefs.c:276
 msgid "When clicking on a link, by default:"
 msgstr "Bij klikken op een link, standaard:"
 
-#: ../src/plugins/fancy/fancy_prefs.c:275
+#: ../src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
 msgstr "Open met externe browser"
 
-#: ../src/plugins/fancy/fancy_viewer.c:391
+#: ../src/plugins/fancy/fancy_prefs.c:298
+msgid "The CSS in this file will be applied to all HTML parts"
+msgstr "De CSS in dit bestand wordt toegepast op alle HTML delen"
+
+#: ../src/plugins/fancy/fancy_prefs.c:300
+msgid "Stylesheet:"
+msgstr "Stylesheet:"
+
+#: ../src/plugins/fancy/fancy_prefs.c:308 ../src/prefs_account.c:1442
+#: ../src/prefs_account.c:1531 ../src/prefs_account.c:1991
+#: ../src/prefs_customheader.c:237
+msgid "Bro_wse"
+msgstr "Bekijk"
+
+#: ../src/plugins/fancy/fancy_prefs.c:350
+msgid "Select stylesheet"
+msgstr "Stylesheet selecteren"
+
+#: ../src/plugins/fancy/fancy_viewer.c:393
 msgid "Remote content loading is disabled."
 msgstr "Inhoud van de server laden is uitgezet."
 
-#: ../src/plugins/fancy/fancy_viewer.c:468
+#: ../src/plugins/fancy/fancy_viewer.c:470
 msgid "Load images"
 msgstr "Laad afbeeldingen"
 
-#: ../src/plugins/fancy/fancy_viewer.c:470
+#: ../src/plugins/fancy/fancy_viewer.c:472
 msgid "Enable remote content"
 msgstr "Deblokkeer externe inhoud"
 
-#: ../src/plugins/fancy/fancy_viewer.c:472
+#: ../src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable Javascript"
 msgstr "Zet Javascript Aan"
 
-#: ../src/plugins/fancy/fancy_viewer.c:474
+#: ../src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Plugins"
 msgstr "Zet Plugins Aan"
 
-#: ../src/plugins/fancy/fancy_viewer.c:476
+#: ../src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Java"
 msgstr "Java aanzetten"
 
-#: ../src/plugins/fancy/fancy_viewer.c:478
+#: ../src/plugins/fancy/fancy_viewer.c:480
 msgid "Open links with external browser"
 msgstr "Open links met externe browser"
 
-#: ../src/plugins/fancy/fancy_viewer.c:647
+#: ../src/plugins/fancy/fancy_viewer.c:649
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Een fout gebeurde: %d\n"
 
-#: ../src/plugins/fancy/fancy_viewer.c:703
+#: ../src/plugins/fancy/fancy_viewer.c:705
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s is een foutgevormde of niet-ondersteunde feed"
 
-#: ../src/plugins/fancy/fancy_viewer.c:714
+#: ../src/plugins/fancy/fancy_viewer.c:716
 msgid "Search the Web"
 msgstr "Zoeken op het Web"
 
-#: ../src/plugins/fancy/fancy_viewer.c:726
+#: ../src/plugins/fancy/fancy_viewer.c:728
 msgid "Open in Viewer"
 msgstr "Open in Bladerprogramma"
 
-#: ../src/plugins/fancy/fancy_viewer.c:728
+#: ../src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer (enable remote content)"
 msgstr "Open in Browser (laad inhoud van de server)"
 
-#: ../src/plugins/fancy/fancy_viewer.c:737
+#: ../src/plugins/fancy/fancy_viewer.c:739
 msgid "Open in Browser"
 msgstr "Open in Bladerprogramma"
 
-#: ../src/plugins/fancy/fancy_viewer.c:747
+#: ../src/plugins/fancy/fancy_viewer.c:749
 msgid "Open Image"
 msgstr "Open Afbeelding"
 
-#: ../src/plugins/fancy/fancy_viewer.c:756
+#: ../src/plugins/fancy/fancy_viewer.c:758
 msgid "Copy Link"
 msgstr "Kopieer Koppeling"
 
-#: ../src/plugins/fancy/fancy_viewer.c:760
+#: ../src/plugins/fancy/fancy_viewer.c:762
 msgid "Download Link"
 msgstr "Haal Koppeling Op"
 
-#: ../src/plugins/fancy/fancy_viewer.c:771
+#: ../src/plugins/fancy/fancy_viewer.c:773
 msgid "Save Image As"
 msgstr "Sla Afbeelding Op Als"
 
-#: ../src/plugins/fancy/fancy_viewer.c:781
+#: ../src/plugins/fancy/fancy_viewer.c:783
 msgid "Copy Image"
 msgstr "Kopieer Afbeelding"
 
-#: ../src/plugins/fancy/fancy_viewer.c:799
+#: ../src/plugins/fancy/fancy_viewer.c:801
 msgid "Import feed"
 msgstr "Importeer feed"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1012
+#: ../src/plugins/fancy/fancy_viewer.c:1014
 msgid "Fancy"
 msgstr "Fancy"
 
 #. i18n: 'Fancy' here is name of the plugin, not the english word.
-#: ../src/plugins/fancy/fancy_viewer.c:1040
+#: ../src/plugins/fancy/fancy_viewer.c:1042
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML Weergever"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1045
+#: ../src/plugins/fancy/fancy_viewer.c:1047
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10543,1025 +10757,999 @@ msgstr "GData integratie"
 #: ../src/plugins/geolocation/geolocation_plugin.c:349
 #, c-format
 msgid "Found location: (%.2f,%.2f)"
-msgstr ""
+msgstr "Locatie gevonden: (%.2f,%.2f)"
 
 #. TRANSLATORS: The country name is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:369
 msgid "Alleged country of origin: "
-msgstr ""
+msgstr "Aangenomen land van herkomst:"
 
 #. TRANSLATORS: The IP address is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:373
-#, fuzzy
 msgid "Could not resolve location of IP address "
-msgstr "Kon adresindexbestand niet lezen."
+msgstr "Kon locatie van IP adres niet opvragen."
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:512
-#, fuzzy
 msgid "Try to locate sender"
-msgstr "voornaam van afzender"
+msgstr "Probeer locatie van afzender op te vragen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:528
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:529
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Verenigde Arabische Emiraten"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:530
 msgid "Afghanistan"
-msgstr ""
+msgstr "Afghanistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:531
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "Antigua en Barbuda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:532
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguilla"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:533
 msgid "Albania"
-msgstr ""
+msgstr "Albanië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:534
 msgid "Armenia"
-msgstr ""
+msgstr "Armenië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:535
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Nederlandse Antillen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:536
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:537
 msgid "Antarctica"
-msgstr ""
+msgstr "Antarctica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:538
-#, fuzzy
 msgid "Argentina"
-msgstr "Magenta"
+msgstr "Argentinië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:539
 msgid "American Samoa"
-msgstr ""
+msgstr "Amerikaans-Samoa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:540
 msgid "Austria"
-msgstr ""
+msgstr "Oostenrijk"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:541
 msgid "Australia"
-msgstr ""
+msgstr "Australieé"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:542
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:543
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbeijan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:544
 msgid "Bosnia And Herzegovina"
-msgstr ""
+msgstr "Bosnië-Herzegovina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:545
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:546
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladesh"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:547
 msgid "Belgium"
-msgstr ""
+msgstr "België"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:548
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:549
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgarije"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:550
 msgid "Bahrain"
-msgstr ""
+msgstr "Bahrein"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:551
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:552
 msgid "Benin"
-msgstr ""
+msgstr "Benin"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:553
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermuda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:554
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:555
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolivia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:556
 msgid "Brazil"
-msgstr ""
+msgstr "Brazilië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:557
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahama's"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:558
 msgid "Bhutan"
-msgstr ""
+msgstr "Bhutan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:559
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Bouveteiland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:560
 msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:561
 msgid "Belarus"
-msgstr ""
+msgstr "Wit-Rusland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:562
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:563
 msgid "Canada"
-msgstr ""
+msgstr "Canada"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:564
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Cocoseilanden"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:565
 msgid "Central African Republic"
-msgstr ""
+msgstr "Centraal Afrikaanse Republiek"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:566
 msgid "Congo"
-msgstr ""
+msgstr "Congo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:567
 msgid "Switzerland"
-msgstr ""
+msgstr "Zwitserland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:568
 msgid "Cote D'Ivoire"
-msgstr ""
+msgstr "Ivoorkust"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:569
 msgid "Cook Islands"
-msgstr ""
+msgstr "Cookeilanden"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:570
 msgid "Chile"
-msgstr ""
+msgstr "Cili"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:571
 msgid "Cameroon"
-msgstr ""
+msgstr "Kameroen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:572
-#, fuzzy
 msgid "China"
-msgstr "Chinees"
+msgstr "China"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:573
-#, fuzzy
 msgid "Colombia"
-msgstr "Kleur"
+msgstr "Colombia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:574
 msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:575
 msgid "Cuba"
-msgstr ""
+msgstr "Cuba"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:576
 msgid "Cape Verde"
-msgstr ""
+msgstr "Kaapverdische Eilanden"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:577
 msgid "Christmas Island"
-msgstr ""
+msgstr "Christmaseiland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:578
 msgid "Cyprus"
-msgstr ""
+msgstr "Cyprus"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:579
 msgid "Czech Republic"
-msgstr ""
+msgstr "Tsjechië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:580
 msgid "Germany"
-msgstr ""
+msgstr "Duitsland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:581
 msgid "Djibouti"
-msgstr ""
+msgstr "Djibouti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:582
-#, fuzzy
 msgid "Denmark"
-msgstr "Demarkeer"
+msgstr "Denemarken"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:583
 msgid "Dominica"
-msgstr ""
+msgstr "Dominica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:584
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Dominicaanse Republiek"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:585
 msgid "Algeria"
-msgstr ""
+msgstr "Algerije"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:586
 msgid "Ecuador"
-msgstr ""
+msgstr "Ecuador"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:587
 msgid "Estonia"
-msgstr ""
+msgstr "Estland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:588
 msgid "Egypt"
-msgstr ""
+msgstr "Egypte"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:589
-#, fuzzy
 msgid "Western Sahara"
-msgstr "Westeuropees"
+msgstr "West Sahara"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:590
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:591
 msgid "Spain"
-msgstr ""
+msgstr "Spanje"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:592
 msgid "Ethiopia"
-msgstr ""
+msgstr "Ethiopië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:593
 msgid "Finland"
-msgstr ""
+msgstr "Finland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:594
 msgid "Fiji"
-msgstr ""
+msgstr "Fiji"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:595
 msgid "Falkland Islands (Malvinas)"
-msgstr ""
+msgstr "Falkland Eilanden (Malvinas)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:596
 msgid "Micronesia, Federated States Of"
-msgstr ""
+msgstr "Micronesia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:597
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Farao Eilanden"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:598
-#, fuzzy
 msgid "France"
-msgstr "Annuleren"
+msgstr "Frankrijk"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:599
 msgid "France, Metropolitan"
-msgstr ""
+msgstr "Frankrijk"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:600
 msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:601
 #: ../src/plugins/geolocation/geolocation_plugin.c:747
 msgid "United Kingdom"
-msgstr ""
+msgstr "Verenigd Koninkrijk"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:602
 msgid "Grenada"
-msgstr ""
+msgstr "Granada"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:603
 msgid "Georgia"
-msgstr ""
+msgstr "Georgië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:604
 msgid "French Guiana"
-msgstr ""
+msgstr "Frans Guinea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:605
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:606
-#, fuzzy
 msgid "Gibraltar"
-msgstr "Libravatar"
+msgstr "Gibraltar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:607
-#, fuzzy
 msgid "Greenland"
-msgstr "Groen"
+msgstr "Groenland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:608
 msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:609
 msgid "Guinea"
-msgstr ""
+msgstr "Guinee"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:610
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Guadeloupe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:611
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Equatoriaal Guinea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:612
-#, fuzzy
 msgid "Greece"
-msgstr "Groen"
+msgstr "Griekenland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:613
 msgid "South Georgia And The South Sandwich Islands"
-msgstr ""
+msgstr "Zuid-Georgia en de Zuidelijke Sandwicheilanden"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:614
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:615
 msgid "Guam"
-msgstr ""
+msgstr "Guam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:616
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Guinee-Bissau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:617
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:618
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:619
 msgid "Heard Island And Mcdonald Islands"
-msgstr ""
+msgstr "Heard en McDonaldeilanden"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:620
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:621
 msgid "Croatia"
-msgstr ""
+msgstr "Kroatië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:622
 msgid "Haiti"
-msgstr ""
+msgstr "Haïti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:623
 msgid "Hungary"
-msgstr ""
+msgstr "Hongarije"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:624
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonesië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:625
 msgid "Ireland"
-msgstr ""
+msgstr "Ierland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:626
 msgid "Israel"
-msgstr ""
+msgstr "Israël"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:627
-#, fuzzy
 msgid "India"
-msgstr "Indicator"
+msgstr "India"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:628
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Brits Indische Oceaanterritorium"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:629
 msgid "Iraq"
-msgstr ""
+msgstr "Irak"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:630
 msgid "Iran, Islamic Republic Of"
-msgstr ""
+msgstr "Iran"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:631
 msgid "Iceland"
-msgstr ""
+msgstr "Ijsland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:632
 msgid "Italy"
-msgstr ""
+msgstr "Italië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:633
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamaica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:634
 msgid "Jordan"
-msgstr ""
+msgstr "Jordanië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:635
-#, fuzzy
 msgid "Japan"
-msgstr "Japans"
+msgstr "Japan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:636
 msgid "Kenya"
-msgstr ""
+msgstr "Kenia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:637
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kirgizië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:638
 msgid "Cambodia"
-msgstr ""
+msgstr "Cambodja"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:639
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:640
-#, fuzzy
 msgid "Comoros"
-msgstr "morgen"
+msgstr "Komoren"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:641
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "Saint Kitts en Nevis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:642
 msgid "Korea, Democratic People'S Republic Of"
-msgstr ""
+msgstr "Noord-Korea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:643
 msgid "Korea, Republic Of"
-msgstr ""
+msgstr "Zuid-Korea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:644
 msgid "Kuwait"
-msgstr ""
+msgstr "Koeweit"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:645
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Kaaiman Eilanden"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:646
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazachstan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:647
 msgid "Lao People'S Democratic Republic"
-msgstr ""
+msgstr "Laos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:648
 msgid "Lebanon"
-msgstr ""
+msgstr "Libanon"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:649
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Saint Lucia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:650
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:651
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:652
 msgid "Liberia"
-msgstr ""
+msgstr "Liberia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:653
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:654
 msgid "Lithuania"
-msgstr ""
+msgstr "Litouwen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:655
 msgid "Luxembourg"
-msgstr ""
+msgstr "Luxemburg"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:656
 msgid "Latvia"
-msgstr ""
+msgstr "Letland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:657
 msgid "Libyan Arab Jamahiriya"
-msgstr ""
+msgstr "Libië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:658
 msgid "Morocco"
-msgstr ""
+msgstr "Marokko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:659
 msgid "Monaco"
-msgstr ""
+msgstr "Monaco"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:660
 msgid "Moldova, Republic Of"
-msgstr ""
+msgstr "Moldavië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:661
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagascar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:662
-#, fuzzy
 msgid "Marshall Islands"
-msgstr "Markeer alles als gelezen"
+msgstr "Marshall Eilanden"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:663
 msgid "Macedonia, The Former Yugoslav Republic Of"
-msgstr ""
+msgstr "Macedonië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:664
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:665
-#, fuzzy
 msgid "Myanmar"
-msgstr "Demarkeer"
+msgstr "Myanmar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:666
 msgid "Mongolia"
-msgstr ""
+msgstr "Mongolië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:667
 msgid "Macao"
-msgstr ""
+msgstr "Macau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:668
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Noordelijke Marianen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:669
 msgid "Martinique"
-msgstr ""
+msgstr "Martinique"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:670
 msgid "Mauritania"
-msgstr ""
+msgstr "Mauritanië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:671
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:672
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:673
 msgid "Mauritius"
-msgstr ""
+msgstr "Mauritië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:674
 msgid "Maldives"
-msgstr ""
+msgstr "De Maldiven"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:675
 msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:676
 msgid "Mexico"
-msgstr ""
+msgstr "Mexico"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:677
 msgid "Malaysia"
-msgstr ""
+msgstr "Maleisië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:678
 msgid "Mozambique"
-msgstr ""
+msgstr "Mozambique"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:679
 msgid "Namibia"
-msgstr ""
+msgstr "Namibië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:680
-#, fuzzy
 msgid "New Caledonia"
-msgstr "Nieuwe contacten"
+msgstr "Nieuw Caledonië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:681
 msgid "Niger"
-msgstr ""
+msgstr "Niger"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:682
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Norfolk"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:683
 msgid "Nigeria"
-msgstr ""
+msgstr "Nigeria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:684
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicaragua"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:685
 msgid "Netherlands"
-msgstr ""
+msgstr "Nederland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:686
-#, fuzzy
 msgid "Norway"
-msgstr "Doorsturen"
+msgstr "Noorwegen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:687
 msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:688
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:689
 msgid "Niue"
-msgstr ""
+msgstr "Niue"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:690
 msgid "New Zealand"
-msgstr ""
+msgstr "Nieuw Zeeland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:691
 msgid "Oman"
-msgstr ""
+msgstr "Oman"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:692
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:693
 msgid "Peru"
-msgstr ""
+msgstr "Peru"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:694
 msgid "French Polynesia"
-msgstr ""
+msgstr "Frans-Polynesië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:695
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papoea Nieuw Guinea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:696
-#, fuzzy
 msgid "Philippines"
-msgstr "regels"
+msgstr "Filipijnen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:697
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:698
 msgid "Poland"
-msgstr ""
+msgstr "Polen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:699
 msgid "Saint Pierre And Miquelon"
-msgstr ""
+msgstr "Saint-Pierre en Miquelon"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:700
 msgid "Pitcairn"
-msgstr ""
+msgstr "Pitcairneilanden"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:701
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Puerto Rico"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:702
-#, fuzzy
 msgid "Portugal"
-msgstr "Poort"
+msgstr "Portugal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:703
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:704
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguay"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:705
-#, fuzzy
 msgid "Qatar"
-msgstr "Wavatar"
+msgstr "Qatar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:706
 msgid "Reunion"
-msgstr ""
+msgstr "Réunion"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:707
 msgid "Romania"
-msgstr ""
+msgstr "Roemenië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:708
 msgid "Russian Federation"
-msgstr ""
+msgstr "Rusland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:709
 msgid "Rwanda"
-msgstr ""
+msgstr "Ruanda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:710
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Saudi Arabië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:711
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Salomonseilanden"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:712
 msgid "Seychelles"
-msgstr ""
+msgstr "Seychellen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:713
 msgid "Sudan"
-msgstr ""
+msgstr "Sudan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:714
 msgid "Sweden"
-msgstr ""
+msgstr "Zweden"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:715
 msgid "Singapore"
-msgstr ""
+msgstr "Singapore"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:716
 msgid "Saint Helena"
-msgstr ""
+msgstr "Sint-Helena"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:717
 msgid "Slovenia"
-msgstr ""
+msgstr "Slovenië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:718
 msgid "Svalbard And Jan Mayen"
-msgstr ""
+msgstr "Spitsbergen en Jan Mayen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:719
 msgid "Slovakia"
-msgstr ""
+msgstr "Slowakije"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:720
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:721
 msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:722
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:723
 msgid "Somalia"
-msgstr ""
+msgstr "Somalië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:724
-#, fuzzy
 msgid "Suriname"
-msgstr "SMTP gebruikersnaam"
+msgstr "Suriname"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:725
 msgid "Sao Tome And Principe"
-msgstr ""
+msgstr "Sao Tomé en Principe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:726
 msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:727
 msgid "Syrian Arab Republic"
-msgstr ""
+msgstr "Syrië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:728
 msgid "Swaziland"
-msgstr ""
+msgstr "Swaziland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:729
 msgid "Turks And Caicos Islands"
-msgstr ""
+msgstr "Turks- en Caicoseilanden"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:730
 msgid "Chad"
-msgstr ""
+msgstr "Tsjaad"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:731
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Franse Zuidelijke en Antarctische Gebieden"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:732
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:733
-#, fuzzy
 msgid "Thailand"
-msgstr "Thai"
+msgstr "Thailand"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:734
 msgid "Tajikistan"
-msgstr ""
+msgstr "Tajikistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:735
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:736
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkmenistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:737
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunesië"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:738
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:739
 msgid "East Timor"
-msgstr ""
+msgstr "Oost Timor"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:740
 msgid "Turkey"
-msgstr ""
+msgstr "Turkije"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:741
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "Trinidad en Tobago"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:742
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:743
 msgid "Taiwan, Province Of China"
-msgstr ""
+msgstr "Taiwan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:744
 msgid "Tanzania, United Republic Of"
-msgstr ""
+msgstr "Tanzania"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:745
 msgid "Ukraine"
-msgstr ""
+msgstr "Oekraine"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:746
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:748
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "Kleine afgelegen eilanden van de Verenigde Staten"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:749
 msgid "United States"
-msgstr ""
+msgstr "Verenigde Staten"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:750
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguay"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:751
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:752
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Vaticaanstad"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:753
 msgid "Saint Vincent And The Grenadines"
-msgstr ""
+msgstr "Saint Vincent en de Grenadines"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:754
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:755
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "Britse Maagdeneilanden"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:756
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "Amerikaanse Maagdeneilanden"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:757
-#, fuzzy
 msgid "Viet Nam"
-msgstr "Bestandsnaam"
+msgstr "Vietnam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:758
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:759
 msgid "Wallis And Futuna"
-msgstr ""
+msgstr "Wallis en Futuna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:760
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:761
 msgid "Yemen"
-msgstr ""
+msgstr "Yemen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:762
 msgid "Mayotte"
-msgstr ""
+msgstr "Mayotte"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:763
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "Servië en Montenegro"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:764
 msgid "South Africa"
-msgstr ""
+msgstr "Zuid Afrika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:765
 msgid "Zambia"
-msgstr ""
+msgstr "Zambia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:766
 msgid "Democratic Republic Of The Congo"
-msgstr ""
+msgstr "Democratische Republiek Congo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:767
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:777
 #: ../src/plugins/geolocation/geolocation_plugin.c:862
-#, fuzzy
 msgid "GeoLocation"
-msgstr "Lokatie:"
+msgstr "GeoLocatie"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:782
-#, fuzzy, c-format
+#, c-format
 msgid "Could not initialize clutter"
-msgstr "Kon spellingcontrole %s niet initialiseren."
+msgstr "Kon clutter niet initialiseren"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:788
 #: ../src/plugins/geolocation/geolocation_plugin.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create regular expression: %s\n"
-msgstr "Kon tijdelijk bestand niet aanmaken: %s"
+msgstr "Kon reguiere expressie niet aanmaken: %s\n"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:803
-#, fuzzy
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
 msgstr ""
-"Registreren van thema-veranderd-haak in de Notificatie plugin is mislukt"
+"Registreren van berichtweergave-toon-haak in de GeoLocatie plugin is mislukt"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:867
 msgid ""
@@ -11579,36 +11767,49 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome (but only if it's not about marital "
 "quarrels)."
 msgstr ""
+"Deze plugin voorziet in GeoLocatie functionaliteit voor Claws Mail.\n"
+"\n"
+"Waarschuwing: Het is technisch onmogelijk om met enige zekerheid de "
+"geografische locatie van afzenders te herleiden uit hun e-mails. De "
+"resultaten weergegeven door deze plugin zijn alleen grove schattingen. "
+"Vooral mailing lijst managers verwijderen informatie van de afzender uit de "
+"e-mails, dus e-mails van mailing lijsten kunnen de locatie toegewezen "
+"krijgen van de mailing lijst server in plaats van de afzender van de e-"
+"mail.\n"
+"In geval van twijfel, vertrouw de resultaten van deze plugin niet. En ga "
+"niet van je partner scheiden op basis van deze informatie.\n"
+"\n"
+"Feedback naar <berndth at gmx.de> is welkom (maar alleen als het niet over "
+"relatieperikelen gaat)."
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:900
-#, fuzzy
 msgid "GeoLocation integration"
-msgstr "GData integratie"
+msgstr "GeoLocatie integratie"
 
-#: ../src/plugins/libravatar/libravatar.c:374
-#: ../src/plugins/libravatar/libravatar.c:445
-#: ../src/plugins/libravatar/libravatar.c:505
-#: ../src/plugins/libravatar/libravatar_prefs.c:400
+#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:452
+#: ../src/plugins/libravatar/libravatar.c:512
+#: ../src/plugins/libravatar/libravatar_prefs.c:440
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:388
 msgid "Failed to register avatar header update hook"
 msgstr "Registreren van avatar-bijwerk-haak mislukt"
 
-#: ../src/plugins/libravatar/libravatar.c:389
+#: ../src/plugins/libravatar/libravatar.c:396
 msgid "Failed to register avatar image render hook"
 msgstr "Registreren van avatar-afbeelding-haak mislukt"
 
-#: ../src/plugins/libravatar/libravatar.c:394
+#: ../src/plugins/libravatar/libravatar.c:401
 msgid "Failed to create avatar image cache directory"
 msgstr "Avatar afbeeldingscache aanmaken mislukt"
 
-#: ../src/plugins/libravatar/libravatar.c:403
+#: ../src/plugins/libravatar/libravatar.c:410
 msgid "Failed to load missing items cache"
 msgstr "Missende items cache laden mislukt"
 
-#: ../src/plugins/libravatar/libravatar.c:455
+#: ../src/plugins/libravatar/libravatar.c:462
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -11629,7 +11830,7 @@ msgstr ""
 "ook opgehaald worden (wanneer herverwijzen aanstaat in de plugin\n"
 "configuratie).\n"
 "De Plugin configuratiepagina is beschikbaar vanaf het hoofdscherm:\n"
-"/Configuratie/Voorkeuren/Plugins/Libravatar.\n"
+"/Instellingen/Voorkeuren/Plugins/Libravatar.\n"
 "\n"
 "Deze plugin gebruikt libcurl om afbeeldingen op te halen, dus als je\n"
 "achter een proxy zit lees dan de curl(1) manpage voor de details over\n"
@@ -11638,87 +11839,87 @@ msgstr ""
 "\n"
 "Feedback naar <ricardo at mones.org> is welkom.\n"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:112
+#: ../src/plugins/libravatar/libravatar_prefs.c:138
 msgid "_Use cached icons"
 msgstr "_Gebruik gecachte pictogrammen"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:113
+#: ../src/plugins/libravatar/libravatar_prefs.c:139
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr ""
 "Bewaar pictogrammen op harde schijf voor hergebruik ipv. een nieuwe "
 "netwerkaanvraag te maken"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:121
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
 msgid "Cache refresh interval"
 msgstr "Cache verversingsinterval"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:123
-#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:333
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
+#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:335
 msgid "hours"
 msgstr "uur"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:188
+#: ../src/plugins/libravatar/libravatar_prefs.c:207
 msgid "Mystery man"
 msgstr "Mystery man"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:189
+#: ../src/plugins/libravatar/libravatar_prefs.c:208
 msgid "Identicon"
 msgstr "Identificatie-pictogram"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:190
+#: ../src/plugins/libravatar/libravatar_prefs.c:209
 msgid "MonsterID"
 msgstr "MonsterID"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:191
+#: ../src/plugins/libravatar/libravatar_prefs.c:210
 msgid "Wavatar"
 msgstr "Wavatar"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:192
+#: ../src/plugins/libravatar/libravatar_prefs.c:211
 msgid "Retro"
 msgstr "Retro"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:193
+#: ../src/plugins/libravatar/libravatar_prefs.c:212
 msgid "Custom URL"
 msgstr "Aangepaste URL"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:196
+#: ../src/plugins/libravatar/libravatar_prefs.c:215
 msgid "A blank image"
 msgstr "Een standaard afbeelding"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:197
+#: ../src/plugins/libravatar/libravatar_prefs.c:216
 msgid "The unobtrusive low-contrast greyish silhouette"
 msgstr "Het niet-opdringerige grijze silhouet met laag contrast"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:198
+#: ../src/plugins/libravatar/libravatar_prefs.c:217
 msgid "A generated geometric pattern"
 msgstr "Een aangemaakt geometrisch patroon"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:199
+#: ../src/plugins/libravatar/libravatar_prefs.c:218
 msgid "A generated full-body monster"
 msgstr "Een aangemaakte full-body afdruk"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:200
+#: ../src/plugins/libravatar/libravatar_prefs.c:219
 msgid "A generated almost unique face"
 msgstr "Een aangemaakte bijna unieke gezichtsafbeelding"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:201
+#: ../src/plugins/libravatar/libravatar_prefs.c:220
 msgid "A generated 8-bit arcade-style pixelated image"
 msgstr "Een aangemaakte 8-bit arcade-stijl pixelafbeelding"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:202
+#: ../src/plugins/libravatar/libravatar_prefs.c:221
 msgid "Redirect to a user provided URL"
 msgstr "Herverwijs naar een door de gebruiker opgegeven URL"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:229 ../src/prefs_themes.c:878
+#: ../src/plugins/libravatar/libravatar_prefs.c:248 ../src/prefs_themes.c:878
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:256
+#: ../src/plugins/libravatar/libravatar_prefs.c:276
 msgid "_Allow redirects to other sites"
 msgstr "_Sta herverwijzen naar andere sites toe"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:257
+#: ../src/plugins/libravatar/libravatar_prefs.c:277
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
@@ -11726,25 +11927,46 @@ msgstr ""
 "Volg herverwijs-antwoorden die ontvangen zijn van de libravatar-server naar "
 "andere diensten als gravatar.com"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:266
+#: ../src/plugins/libravatar/libravatar_prefs.c:286
 msgid "_Enable federated servers"
 msgstr "_Gebruik aangesloten servers"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:267
+#: ../src/plugins/libravatar/libravatar_prefs.c:287
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr ""
 "Probeer de avatar te krijgen van de libravatar-server van het domein van de "
 "afzender"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:312
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+msgid "Request timeout"
+msgstr "Aanvraag verlopen"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+#: ../src/plugins/notification/notification_prefs.c:1028
+#: ../src/plugins/notification/notification_prefs.c:1300
+#: ../src/plugins/notification/notification_prefs.c:1608
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
+#: ../src/prefs_summaries.c:496
+msgid "seconds"
+msgstr "seconden"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:305
+msgid ""
+"Set to 0 to use global socket I/O timeout. Maximum value must be also less "
+"than global socket I/O timeout."
+msgstr ""
+"Zet op 0 om globale socket I/O timeout te gebruiken. Maximum waarde moet ook "
+"minder zijn dan de globale socket I/O timeout zijn."
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:349
 msgid "Icon cache"
 msgstr "Pictogramcache"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:316
+#: ../src/plugins/libravatar/libravatar_prefs.c:353
 msgid "Default missing icon mode"
 msgstr "Standaard modus voor missend pictogram"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:320
+#: ../src/plugins/libravatar/libravatar_prefs.c:357
 msgid "Network"
 msgstr "Netwerk"
 
@@ -11770,7 +11992,7 @@ msgid ""
 "If the existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
-"Geef de lokatie van het postvak.\n"
+"Geef de locatie van het postvak.\n"
 "Als een bestaand postvak wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
@@ -12063,7 +12285,6 @@ msgstr "Kalender mappen"
 
 #. Warning-Label
 #: ../src/plugins/notification/notification_prefs.c:639
-#, fuzzy
 msgid "These settings override folder-specific selections."
 msgstr "Deze instellingen overschrijven map-specifieke selecties."
 
@@ -12192,14 +12413,6 @@ msgstr "Zet popup aan"
 msgid "Popup timeout:"
 msgstr "Popup timeout:"
 
-#: ../src/plugins/notification/notification_prefs.c:1028
-#: ../src/plugins/notification/notification_prefs.c:1300
-#: ../src/plugins/notification/notification_prefs.c:1608
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
-#: ../src/prefs_summaries.c:496
-msgid "seconds"
-msgstr "seconden"
-
 #. Sticky check button
 #: ../src/plugins/notification/notification_prefs.c:1057
 msgid "Make popup sticky"
@@ -12452,7 +12665,7 @@ msgstr "van %d"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1359
 msgid "PDF rendering failed for an unknown reason."
-msgstr ""
+msgstr "PDF weergave is om een onbekende reden mislukt."
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1722
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1940
@@ -12548,7 +12761,7 @@ msgstr ""
 
 #: ../src/plugins/perl/perl_gtk.c:50
 msgid "Edit perl filter rules (ext)..."
-msgstr ""
+msgstr "Bewerk perl filterregels (ext)..."
 
 #: ../src/plugins/pgpcore/autocompletion.c:125
 msgid "Failed to register PGP address autocompletion hook"
@@ -12815,12 +13028,12 @@ msgid "Undefined"
 msgstr "Niet gedefiniëerd"
 
 #: ../src/plugins/pgpcore/select-keys.c:241
-#: ../src/plugins/pgpcore/sgpgme.c:146
+#: ../src/plugins/pgpcore/sgpgme.c:146 ../src/plugins/pgpcore/sgpgme.c:162
 msgid "Marginal"
 msgstr "Marginaal"
 
 #: ../src/plugins/pgpcore/select-keys.c:247
-#: ../src/plugins/pgpcore/sgpgme.c:150
+#: ../src/plugins/pgpcore/sgpgme.c:150 ../src/plugins/pgpcore/sgpgme.c:166
 msgid "Ultimate"
 msgstr "Ultiem"
 
@@ -12882,146 +13095,154 @@ msgstr ""
 msgid "No signature found"
 msgstr "Geen handtekening gevonden"
 
-#: ../src/plugins/pgpcore/sgpgme.c:184 ../src/plugins/pgpcore/sgpgme.c:203
+#: ../src/plugins/pgpcore/sgpgme.c:160
+msgid "Untrusted"
+msgstr "Niet vertrouwd"
+
+#: ../src/plugins/pgpcore/sgpgme.c:200 ../src/plugins/pgpcore/sgpgme.c:219
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "De ondertekening kan niet worden gecontroleerd - %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:188 ../src/plugins/pgpcore/sgpgme.c:192
-#: ../src/plugins/pgpcore/sgpgme.c:245
+#: ../src/plugins/pgpcore/sgpgme.c:204 ../src/plugins/pgpcore/sgpgme.c:208
+#: ../src/plugins/pgpcore/sgpgme.c:249
 msgid "The signature has not been checked."
 msgstr "Deze ondertekening is nog niet gecontroleerd."
 
-#: ../src/plugins/pgpcore/sgpgme.c:198 ../src/plugins/pgpcore/sgpgme.c:200
+#: ../src/plugins/pgpcore/sgpgme.c:214 ../src/plugins/pgpcore/sgpgme.c:216
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: Geen sleutel - er draait geen gpg-agent."
 
-#: ../src/plugins/pgpcore/sgpgme.c:215
+#: ../src/plugins/pgpcore/sgpgme.c:228
 #, c-format
 msgid "Good signature from %s."
 msgstr "Goedgekeurde ondertekening van %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:222
-#, c-format
-msgid "Good signature (untrusted) from %s."
-msgstr "Goedgekeurde ondertekening (niet vertrouwd) van %s."
-
-#: ../src/plugins/pgpcore/sgpgme.c:227
+#: ../src/plugins/pgpcore/sgpgme.c:231
 #, c-format
 msgid "Expired signature from %s."
 msgstr "Verlopen ondertekening van %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:230
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:234
+#, c-format
 msgid "Good signature from %s, but the key has expired."
-msgstr "Goedgekeurde ondertekening van %s."
+msgstr "Goedgekeurde ondertekening van %s, maar de sleutel is verlopen."
 
-#: ../src/plugins/pgpcore/sgpgme.c:233
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:237
+#, c-format
 msgid "Good signature from %s, but the key has been revoked."
-msgstr "Goedgekeurde ondertekening van %s."
+msgstr "Goedgekeurde ondertekening van %s, maar de sleutel is ingetrokken."
 
-#: ../src/plugins/pgpcore/sgpgme.c:236
+#: ../src/plugins/pgpcore/sgpgme.c:240
 #, c-format
 msgid "Bad signature from %s."
 msgstr "Foutieve ondertekening van %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:240
+#: ../src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Sleutel 0x%s niet voorhanden om deze ondertekening te verifiëren"
 
-#: ../src/plugins/pgpcore/sgpgme.c:264
+#: ../src/plugins/pgpcore/sgpgme.c:268
 #, c-format
 msgid "Error checking signature: no status\n"
 msgstr "Fout bij het controleren van de ondertekening: no status\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:283
+#: ../src/plugins/pgpcore/sgpgme.c:287
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Fout bij het controleren van de ondertekening: %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:302
+#: ../src/plugins/pgpcore/sgpgme.c:306
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Ondertekening gemaakt op %s met %s sleutel ID %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:308
+#: ../src/plugins/pgpcore/sgpgme.c:312
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Goedgekeurde ondertekening van \"%s\" (Vertrouwen: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:313
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:317
+#, c-format
 msgid "Expired key uid \"%s\"\n"
-msgstr "Verlopen sleutel van %s."
+msgstr "Verlopen sleutel uid \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:318
+#: ../src/plugins/pgpcore/sgpgme.c:322
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Verlopen ondertekening van uid \"%s\" (Vertrouwen: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:323
+#: ../src/plugins/pgpcore/sgpgme.c:327
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
-msgstr ""
+msgstr "Ingetrokken sleutel uid \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:328
+#: ../src/plugins/pgpcore/sgpgme.c:332
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "FOUTIEVE ondertekening van \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:339
+#: ../src/plugins/pgpcore/sgpgme.c:343
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                alias \"%s\" (Vertrouwen: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:346
+#: ../src/plugins/pgpcore/sgpgme.c:345
+msgid "Revoked"
+msgstr "Ingetrokken"
+
+#: ../src/plugins/pgpcore/sgpgme.c:349
+#, c-format
+msgid "Owner Trust: %s\n"
+msgstr ""
+
+#: ../src/plugins/pgpcore/sgpgme.c:352
 msgid "Primary key fingerprint:"
 msgstr "Vingerafdruk van primaire sleutel:"
 
-#: ../src/plugins/pgpcore/sgpgme.c:364
+#: ../src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 "Waarschuwing: Adres van ondertekenaar \"%s\" klopt niet met DNS ingang\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:370
+#: ../src/plugins/pgpcore/sgpgme.c:376
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Adres van geverifieerde ondertekenaar is \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:412
+#: ../src/plugins/pgpcore/sgpgme.c:410
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Kon gegevens van bericht verkrijgen, %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:428
+#: ../src/plugins/pgpcore/sgpgme.c:426
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Kon gegevens initialiseren, %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:583
+#: ../src/plugins/pgpcore/sgpgme.c:581
 msgid "Secret key specification is ambiguous"
 msgstr "Geheime sleutel specificatie is onduidelijk"
 
-#: ../src/plugins/pgpcore/sgpgme.c:593
+#: ../src/plugins/pgpcore/sgpgme.c:591
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Geheime sleutel niet gevonden (%s)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:606
+#: ../src/plugins/pgpcore/sgpgme.c:604
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Fout bij instellen geheime sleutel: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:690
+#: ../src/plugins/pgpcore/sgpgme.c:688
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme-protocol '%s' is onbruikbaar: Engine '%s' is niet goed geïnstalleerd."
 
-#: ../src/plugins/pgpcore/sgpgme.c:696
+#: ../src/plugins/pgpcore/sgpgme.c:694
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -13030,12 +13251,12 @@ msgstr ""
 "Gpgme-protocol '%s' is onbruikbaar: Engine '%s' versie %s is geïnstalleerd, "
 "maar versie %s is nodig.\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:704
+#: ../src/plugins/pgpcore/sgpgme.c:702
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme-protocol '%s' is onbruikbaar (onbekend probleem)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:720
+#: ../src/plugins/pgpcore/sgpgme.c:718
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -13043,7 +13264,7 @@ msgstr ""
 "GnuPG is niet goed geïnstalleerd of moet worden bijgewerkt.\n"
 "OpenPGP ondersteuning wordt uitgeschakeld."
 
-#: ../src/plugins/pgpcore/sgpgme.c:754
+#: ../src/plugins/pgpcore/sgpgme.c:752
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -13051,11 +13272,11 @@ msgstr ""
 "Je dient de informatie van het account op te slaan door op \"OK\" te drukken "
 "alvorens je een sleutelpaar kunt aanmaken.\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:759
+#: ../src/plugins/pgpcore/sgpgme.c:757
 msgid "No PGP key found"
 msgstr "Geen PGP-sleutel gevonden"
 
-#: ../src/plugins/pgpcore/sgpgme.c:760
+#: ../src/plugins/pgpcore/sgpgme.c:758
 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"
@@ -13065,12 +13286,12 @@ msgstr ""
 "berichten kunt ondertekenen of versleutelde berichten kunt ontvangen.\n"
 "Wil je nu een sleutelpaar aanmaken?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:830 ../src/plugins/pgpcore/sgpgme.c:846
+#: ../src/plugins/pgpcore/sgpgme.c:828 ../src/plugins/pgpcore/sgpgme.c:844
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Kon nieuw sleutelpaar niet aanmaken: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:837
+#: ../src/plugins/pgpcore/sgpgme.c:835
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -13078,11 +13299,11 @@ msgstr ""
 "Je nieuwe sleutelpaar wordt nu aangemaakt... Beweeg je muis heen en weer om "
 "te helpen bij het maken van entropie..."
 
-#: ../src/plugins/pgpcore/sgpgme.c:852
+#: ../src/plugins/pgpcore/sgpgme.c:850
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Kon nieuw sleutelpaar niet aanmaken: onbekende fout"
 
-#: ../src/plugins/pgpcore/sgpgme.c:856
+#: ../src/plugins/pgpcore/sgpgme.c:854
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -13095,19 +13316,19 @@ msgstr ""
 "\n"
 "Wil je de sleutel exporteren naar een sleutel-server?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:860
+#: ../src/plugins/pgpcore/sgpgme.c:858
 msgid "Key generated"
 msgstr "Seutel aangemaakt"
 
-#: ../src/plugins/pgpcore/sgpgme.c:899
+#: ../src/plugins/pgpcore/sgpgme.c:897
 msgid "Key exported."
 msgstr "Sleutel geëxporteerd."
 
-#: ../src/plugins/pgpcore/sgpgme.c:901
+#: ../src/plugins/pgpcore/sgpgme.c:899
 msgid "Couldn't export key."
 msgstr "Kon seutel niet exporteren."
 
-#: ../src/plugins/pgpcore/sgpgme.c:905
+#: ../src/plugins/pgpcore/sgpgme.c:903
 msgid "Key export isn't implemented in Windows."
 msgstr "Seutels exporteren is niet geïmplementeerd onder Windows."
 
@@ -13134,7 +13355,7 @@ msgstr "Kon tekstgegevens naar geen enkel zinnige karakterset converteren."
 #: ../src/plugins/pgpinline/pgpinline.c:716
 #: ../src/plugins/pgpmime/pgpmime.c:74 ../src/plugins/pgpmime/pgpmime.c:184
 #: ../src/plugins/pgpmime/pgpmime.c:330 ../src/plugins/pgpmime/pgpmime.c:510
-#: ../src/plugins/pgpmime/pgpmime.c:655 ../src/plugins/smime/smime.c:415
+#: ../src/plugins/pgpmime/pgpmime.c:651 ../src/plugins/smime/smime.c:415
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Kon de GPG-context niet initializeren, %s"
@@ -13231,19 +13452,19 @@ msgstr ""
 "systeem, noch e-mail headers, zoals Onderwerp."
 
 #: ../src/plugins/pgpinline/pgpinline.c:670
-#: ../src/plugins/pgpmime/pgpmime.c:665
+#: ../src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Kon GPG-sleutel niet toevoegen %s, %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:698
-#: ../src/plugins/pgpmime/pgpmime.c:694
+#: ../src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Kon tijdelijk bestand niet aanmaken, %s."
 
 #: ../src/plugins/pgpinline/pgpinline.c:729
-#: ../src/plugins/pgpmime/pgpmime.c:721
+#: ../src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Coderen mislukt, %s"
@@ -13299,7 +13520,11 @@ msgstr "Kon gedecodeerde bestandsonderdelen niet lezen."
 msgid "Couldn't create temporary file: %s"
 msgstr "Kon tijdelijk bestand niet aanmaken: %s"
 
-#: ../src/plugins/pgpmime/pgpmime.c:621
+#: ../src/plugins/pgpmime/pgpmime.c:595
+msgid "OpenPGP digital signature"
+msgstr "OpenPGP digitale handtekening"
+
+#: ../src/plugins/pgpmime/pgpmime.c:617
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -13307,7 +13532,7 @@ msgstr ""
 "Let op dat e-mail headers, zoals Onderwerp, niet versleuteld worden door het "
 "PGP/Mime systeem."
 
-#: ../src/plugins/pgpmime/pgpmime.c:793
+#: ../src/plugins/pgpmime/pgpmime.c:789
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -13370,6 +13595,7 @@ msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Registreren van \"aanmaken-maak-haak\" mislukt in de Python plugin"
 
 #: ../src/plugins/python/python_plugin.c:730
+#, fuzzy
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -13377,7 +13603,7 @@ msgid ""
 "\n"
 "These scripts are then available via the menu. You can assign keyboard "
 "shortcuts to them just like it is done with other menu items. You can also "
-"put buttons for script invokation into the toolbars using Claws Mail's "
+"put buttons for script invocation into the toolbars using Claws Mail's "
 "builtin toolbar editor.\n"
 "\n"
 "You can provide scripts working on the main window by placing files into ~/."
@@ -13464,148 +13690,44 @@ msgstr ""
 msgid "Python integration"
 msgstr "Python integratie"
 
-#: ../src/plugins/rssyl/feed.c:126
-msgid "Cannot open temporary file"
-msgstr "Kan tijdelijk bestand niet openen"
-
-#: ../src/plugins/rssyl/feed.c:137
-msgid "Cannot init libCURL"
-msgstr "Kan libCURL niet initialiseren"
-
-#: ../src/plugins/rssyl/feed.c:234 ../src/plugins/vcalendar/vcal_folder.c:1596
-msgid "401 (Authorisation required)"
-msgstr "401 (Authorisatie vereist)"
-
-#: ../src/plugins/rssyl/feed.c:237 ../src/plugins/vcalendar/vcal_folder.c:1599
-msgid "403 (Unauthorised)"
-msgstr "403 (Niet geautoriseerd)"
-
-#: ../src/plugins/rssyl/feed.c:240 ../src/plugins/vcalendar/vcal_folder.c:1602
-msgid "404 (Not found)"
-msgstr "404 (Niet gevonden)"
-
-#: ../src/plugins/rssyl/feed.c:243 ../src/plugins/vcalendar/vcal_folder.c:1605
-#, c-format
-msgid "Error %ld"
-msgstr "Fout %ld"
-
-#: ../src/plugins/rssyl/feed.c:328
-#, c-format
-msgid "Fetching '%s'..."
-msgstr "Ophalen van '%s'..."
-
-#: ../src/plugins/rssyl/feed.c:387
-msgid "Malformed feed"
-msgstr "Vervormde feed"
-
-#: ../src/plugins/rssyl/feed.c:1203
-#, c-format
-msgid "Refreshing feed '%s'..."
-msgstr "Verversen van feed '%s'..."
-
-#: ../src/plugins/rssyl/feed.c:1218
-#, c-format
+#: ../src/plugins/rssyl/old_feeds.c:90
+#, fuzzy, c-format
 msgid ""
-"RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-"comments of '%s'"
+"Couldn't read contents of old feeds.xml file:\n"
+"%s"
 msgstr ""
-"RSSyl: Ophalen van reacties wordt niet ondersteund voor RDF feeds. Kan "
-"reacties van '%s' niet ophalen"
-
-#: ../src/plugins/rssyl/feed.c:1227
-msgid "This feed format is not supported yet."
-msgstr "Dit feed formaat wordt nog niet ondersteund."
-
-#: ../src/plugins/rssyl/feed.c:1258
-msgid "N/A"
-msgstr "N/A"
+"Kon mbox-bestand niet aanmaken:\n"
+"%s\n"
 
-#: ../src/plugins/rssyl/feed.c:1378
+#: ../src/plugins/rssyl/opml_export.c:110
 #, c-format
-msgid "%ld byte"
-msgid_plural "%ld bytes"
-msgstr[0] "%ld byte"
-msgstr[1] "%ld bytes"
+msgid "RSSyl: Error while writing '%s' to feed export list.\n"
+msgstr ""
 
-#: ../src/plugins/rssyl/feed.c:1381
-msgid "size unknown"
-msgstr "grootte onbekend"
+#: ../src/plugins/rssyl/opml_export.c:131
+#, fuzzy, c-format
+msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
+msgstr "Kon log bestand %s niet openen: %s\n"
 
-#: ../src/plugins/rssyl/feed.c:1555
+#: ../src/plugins/rssyl/opml_export.c:141
 #, c-format
-msgid ""
-"RSSyl: Cannot update feed %s:\n"
-"%s\n"
+msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
-"RSSyl: kan feed %s niet verversen\n"
-"%s\n"
-
-#: ../src/plugins/rssyl/feed.c:1727
-msgid "You are already subscribed to this feed."
-msgstr "Je bent al geabonneerd op deze feed."
 
-#: ../src/plugins/rssyl/feed.c:1738
-#, c-format
-msgid ""
-"Couldn't fetch URL '%s':\n"
-"%s"
-msgstr "Kon URL '%s' niet ophalen:%s"
+#: ../src/plugins/rssyl/opml_export.c:182
+msgid "RSSyl: Error during writing feed export file.\n"
+msgstr ""
 
-#: ../src/plugins/rssyl/feed.c:1743
+#: ../src/plugins/rssyl/opml_import.c:109
 #, c-format
 msgid ""
-"Couldn't fetch URL '%s':\n"
+"Error while subscribing feed\n"
 "%s\n"
+"\n"
+"Folder name '%s' is not allowed."
 msgstr ""
-"Kon URL '%s' niet ophalen:\n"
-"%s\n"
-
-#: ../src/plugins/rssyl/feed.c:1759
-#, c-format
-msgid "Can't subscribe feed '%s'."
-msgstr "Kon niet abonneren op feed '%s'"
-
-#: ../src/plugins/rssyl/feed.c:1861 ../src/plugins/rssyl/rssyl_cb_menu.c:281
-msgid "Claws Mail needs network access in order to update the feed."
-msgid_plural "Claws Mail needs network access in order to update the feeds."
-msgstr[0] "Claws Mail heeft netwerk toegang nodig om de feed te verversen"
-msgstr[1] "Claws Mail heeft netwerk toegang nodig om de feeds te verversen"
-
-#: ../src/plugins/rssyl/feed.h:20
-#, c-format
-msgid "Time out connecting to URL %s\n"
-msgstr "Tijd verlopen met verbinding makenmet URL %s\n"
-
-#: ../src/plugins/rssyl/feed.h:21
-#, c-format
-msgid "Couldn't fetch URL %s\n"
-msgstr "Kon URL %s niet ophalen\n"
-
-#: ../src/plugins/rssyl/feed.h:22
-#, c-format
-msgid "Error parsing feed from URL %s\n"
-msgstr "Fout met verwerken van feed van URL %s\n"
-
-#: ../src/plugins/rssyl/feed.h:23
-#, c-format
-msgid "Unsupported feed type at URL %s\n"
-msgstr "Niet ondersteunde feed type op URL %s\n"
-
-#: ../src/plugins/rssyl/feed.h:25
-#, c-format
-msgid "RSSyl: Updating feed %s\n"
-msgstr "RSSyl: verversen feed %s\n"
 
-#: ../src/plugins/rssyl/feed.h:26
-#, c-format
-msgid "RSSyl: Feed update finished: %s\n"
-msgstr "RSSyl: Feed verversen is klaar: %s\n"
-
-#: ../src/plugins/rssyl/feed.h:27
-msgid "RSSyl: Feed update aborted, application is exiting.\n"
-msgstr "RSSyl: Feed verversen afgebroken, programma wordt afgesloten.\n"
-
-#: ../src/plugins/rssyl/plugin.c:63
+#: ../src/plugins/rssyl/plugin.c:65
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13619,117 +13741,159 @@ msgstr ""
 "Elke nieuwsfeed zal een map aanmaken met ingangen gehaald van het web. Je "
 "kunt ze lezen, verwijderen of bewaren."
 
-#: ../src/plugins/rssyl/plugin.c:87
+#: ../src/plugins/rssyl/plugin.c:89
 msgid "RSS feed"
 msgstr "RSS feed"
 
-#: ../src/plugins/rssyl/rssyl.c:133 ../src/plugins/rssyl/rssyl.c:145
+#: ../src/plugins/rssyl/rssyl_add_item.c:295
+#, fuzzy
+msgctxt "Empty RSS feed title placeholder"
+msgid "(empty)"
+msgstr "(gewoonlijk leeg)"
+
+#: ../src/plugins/rssyl/rssyl.c:154 ../src/plugins/rssyl/rssyl.c:165
 msgid "Refresh all feeds"
 msgstr "Ververs alle feeds"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:62
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Subscribe feed"
 msgstr "Abonneer op feed"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:63
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:67
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Voer de URL in van de nieuwsfeed waarop je wilt abonneren:"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:138
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:100
 #, c-format
-msgid "Really remove the folder tree '%s'?\n"
-msgstr "Werkelijk de mappenboom '%s' verwijderen?\n"
+msgid "'%c' can't be used in folder name."
+msgstr "'%c' mag niet in de naam van een map voorkomen."
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:139
-msgid "Remove folder tree"
-msgstr "Verwijder mappenboom"
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:242
+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 heeft netwerk toegang nodig om de feed te verversen."
+msgstr[1] "Claws-Mail heeft netwerk toegang nodig om de feeds te verversen."
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:305
 #, c-format
-msgid "Can't remove feed '%s'."
-msgstr "Kan feed '%s' niet verwijderen."
-
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:374
-msgid "Select a .opml file"
-msgstr "Selecteer een .opml bestand"
-
-#: ../src/plugins/rssyl/rssyl_gtk.c:53
-msgid "_Refresh feed"
-msgstr "_Ververs feed"
+msgid "Really remove the feed tree `%s' ?\n"
+msgstr "Werkelijk de feedboom '%s' verwijderen?\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:54
-msgid "Refresh _all feeds"
-msgstr "Ververs _alle feeds"
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:306
+msgid "Remove feed tree"
+msgstr "Verwijder feedboom"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:55
-msgid "Subscribe _new feed..."
-msgstr "Abonneer op _nieuwe feed..."
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:341
+msgid "Select an OPML file"
+msgstr "Selecteer een OPML bestand"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:56
-msgid "_Unsubscribe feed..."
-msgstr "Af_melden van feed..."
+#: ../src/plugins/rssyl/rssyl_feed.c:75
+#: ../src/plugins/rssyl/rssyl_subscribe.c:139
+#, fuzzy, c-format
+msgid "Couldn't create folder for new feed '%s'."
+msgstr "Kon tijdelijk bestand voor het verzenden van nieuws niet aanmaken."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:57
-msgid "Feed pr_operties..."
-msgstr "Feed _eigenschappen..."
+#: ../src/plugins/rssyl/rssyl_feed.h:10
+#, fuzzy, c-format
+msgid "RSSyl: Subscribing new feed: %s\n"
+msgstr "RSSyl: verversen feed %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:58
-msgid "Import feed list..."
-msgstr "Importeer feed lijst..."
+#: ../src/plugins/rssyl/rssyl_feed.h:11
+#, c-format
+msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
+msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:59
-msgid "Rena_me..."
-msgstr "_Hernoem..."
+#: ../src/plugins/rssyl/rssyl_feed.h:12
+#, fuzzy, c-format
+msgid "RSSyl: Updating feed: %s\n"
+msgstr "RSSyl: verversen feed %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:60
-msgid "_Create new folder..."
-msgstr "_Maak nieuwe map aan..."
+#: ../src/plugins/rssyl/rssyl_feed.h:13
+#, c-format
+msgid "RSSyl: Feed update finished: %s\n"
+msgstr "RSSyl: Feed verversen is klaar: %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:62
-msgid "Remove folder _tree..."
-msgstr "Verwijder mappen_boom..."
+#: ../src/plugins/rssyl/rssyl_feed.h:14
+#, fuzzy, c-format
+msgid "RSSyl: Error fetching feed at '%s': %s\n"
+msgstr "RSSyl: verversen feed %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:152
-msgid "Add RSS folder tree"
-msgstr "Voeg RSS mappenboom toe"
+#: ../src/plugins/rssyl/rssyl_feed.h:15
+#, fuzzy, c-format
+msgid "RSSyl: No valid feed found at '%s'\n"
+msgstr "RSSyl: verversen feed %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:153
-msgid "Enter name for a new RSS folder tree."
-msgstr "Voer naam in van nieuwe RSS mappenboom."
+#: ../src/plugins/rssyl/rssyl_feed.h:16
+#, fuzzy, c-format
+msgid "RSSyl: Couldn't process feed at '%s'\n"
+msgstr "Kon vrij/bezet niet exporteren naar '%s'\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:169
-msgid ""
-"Creation of folder tree failed.\n"
-"Maybe some files already exist, or you don't have the permission to write "
-"there?"
+#: ../src/plugins/rssyl/rssyl_feed.h:17
+#, c-format
+msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
-"Aanmaken van mappenboom is mislukt.\n"
-"Misschien dat sommige bestanden al bestaan, of je hebt geen permissie om "
-"daar te schrijven?"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:184
-msgid "RSSyl..."
-msgstr "RSSyl"
-
-#: ../src/plugins/rssyl/rssyl_gtk.c:257
+#: ../src/plugins/rssyl/rssyl_feed_props.c:243
 msgid "Use default refresh interval"
 msgstr "Gebruik standaard verversings interval"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:269
-msgid "Keep default number of expired entries"
-msgstr "Hou standaard aantal van verlopen items"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:255
+msgid "Keep old items"
+msgstr "Bewaar oude items"
+
+#. "Trim" button
+#: ../src/plugins/rssyl/rssyl_feed_props.c:261
+msgid "_Trim"
+msgstr "_Trim"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:264
+#: ../src/plugins/rssyl/rssyl_feed_props.c:267
+msgid "Update feed, deleting items which are no longer in the source feed"
+msgstr ""
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:275
+#: ../src/plugins/rssyl/rssyl_feed_props.c:271
 msgid "Fetch comments if possible"
 msgstr "Haal reacties op indien mogelijk"
 
+#: ../src/plugins/rssyl/rssyl_feed_props.c:296
+msgid "Always mark as new"
+msgstr "Altijd markeren als nieuw"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:302
+msgid "If only its text changed"
+msgstr "Als alleen de tekst is veranderd"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:308
+msgid "Never mark as new"
+msgstr "Nooit als nieuw markeren"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:313
+msgid "Add item title to top of message"
+msgstr "Voeg itemtitel toe aan bovenkant van bericht"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:320
+msgid "Ignore title rename"
+msgstr "Titel hernoemen negeren"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:326
+#: ../src/plugins/rssyl/rssyl_feed_props.c:329
+msgid ""
+"Enable this to keep current folder name, even if feed author changes title "
+"of the feed."
+msgstr ""
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:334
+#: ../src/plugins/vcalendar/vcal_prefs.c:518
+msgid "Verify SSL certificate validity"
+msgstr "Verifieer SSL certificaat geldigheid"
+
 #. Label for URL frame
-#: ../src/plugins/rssyl/rssyl_gtk.c:308
+#: ../src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "<b>Source URL:</b>"
 msgstr "<b>Bron URL:</b>"
 
-#. Fetch comments for - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:336
+#. Fetch comments max age - label
+#: ../src/plugins/rssyl/rssyl_feed_props.c:378
 msgid ""
 "<b>Fetch comments on posts aged less than:</b>\n"
 "<small>(In days; set to -1 to fetch all comments)</small>"
@@ -13738,7 +13902,7 @@ msgstr ""
 "alles op te halen)</small>"
 
 #. Refresh interval - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:370
+#: ../src/plugins/rssyl/rssyl_feed_props.c:436
 msgid ""
 "<b>Refresh interval in minutes:</b>\n"
 "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
@@ -13747,98 +13911,182 @@ msgstr ""
 "<small>(Zet op 0 om automatische verversing uit te zetten voor deze feed)</"
 "small>"
 
-#. Expired items - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:403
-msgid ""
-"<b>Number of expired entries to keep:</b>\n"
-"<small>(Set to -1 if you want to keep expired entries)</small>"
-msgstr ""
-"<b>Aantal verlopen items om te houden:</b>\n"
-"<small>(Zet op -1 om verlopen items te houden)</small>"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:462
+msgid "<b>If an item changes, do not mark it as new:</b>"
+msgstr "<b>Wanneer een item veranderd, markeer het niet als nieuw:</b>"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:554
+msgid "_OK"
+msgstr "_OK"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:429
-msgid "<b>If an item changes, do not mark it as unread:</b>"
-msgstr "<b>Wanneer een item veranderd, markeer het niet als ongelezen:</b>"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:562
+msgid "Set feed properties"
+msgstr "Stel feed eigenschappen in"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:439
-msgid "Always mark as unread"
-msgstr "Altijd markeren als ongelezen"
+#: ../src/plugins/rssyl/rssyl_gtk.c:48
+msgid "_Refresh feed"
+msgstr "_Ververs feed"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:441
-msgid "If only its text has changed"
-msgstr "Als alleen de tekst is veranderd"
+#: ../src/plugins/rssyl/rssyl_gtk.c:49
+msgid "Feed pr_operties"
+msgstr "Feed _eigenschappen"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:443
-msgid "Never mark as unread"
-msgstr "Nooit als ongelezen markeren"
+#: ../src/plugins/rssyl/rssyl_gtk.c:50
+msgid "Rena_me..."
+msgstr "_Hernoem..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:459
-#: ../src/plugins/vcalendar/vcal_prefs.c:518
-msgid "Verify SSL certificate validity"
-msgstr "Verifieer SSL certificaat geldigheid"
+#: ../src/plugins/rssyl/rssyl_gtk.c:51
+msgid "R_efresh recursively"
+msgstr "_Ververs recursief"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:515
-msgid "_OK"
-msgstr "_OK"
+#: ../src/plugins/rssyl/rssyl_gtk.c:52
+msgid "Subscribe _new feed..."
+msgstr "Abonneer op _nieuwe feed..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:523
-msgid "Set feed properties"
-msgstr "Stel feed eigenschappen in"
+#: ../src/plugins/rssyl/rssyl_gtk.c:53
+msgid "Create new _folder..."
+msgstr "Maak nieuwe _map aan..."
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:54
+msgid "Import feed list..."
+msgstr "Importeer feed lijst..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:651 ../src/plugins/rssyl/rssyl_gtk.c:675
-msgid "Unsubscribe feed"
-msgstr "Afmelden feed"
+#: ../src/plugins/rssyl/rssyl_gtk.c:56
+msgid "Remove tree"
+msgstr "Verwijder boom"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:676
-msgid "Do you really want to remove feed"
-msgstr "Wil je werkelijk de feed verwijderen"
+#: ../src/plugins/rssyl/rssyl_gtk.c:126
+msgid "Add RSS folder tree"
+msgstr "Voeg RSS mappenboom toe"
 
-#. Remove cache checkbutton
-#: ../src/plugins/rssyl/rssyl_gtk.c:682
-msgid "Remove cached entries"
-msgstr "Verwijder cached items"
+#: ../src/plugins/rssyl/rssyl_gtk.c:127
+msgid "Enter name for a new RSS folder tree."
+msgstr "Voer naam in van nieuwe RSS mappenboom."
 
-#: ../src/plugins/rssyl/rssyl.h:8
-msgid "RSSyl"
-msgstr "RSSyl"
+#: ../src/plugins/rssyl/rssyl_gtk.c:143
+msgid ""
+"Creation of folder tree failed.\n"
+"Maybe some files already exist, or you don't have the permission to write "
+"there?"
+msgstr ""
+"Aanmaken van mappenboom is mislukt.\n"
+"Misschien dat sommige bestanden al bestaan, of je hebt geen permissie om "
+"daar te schrijven?"
 
 #. Default RSSyl mailbox name
-#: ../src/plugins/rssyl/rssyl.h:14
+#: ../src/plugins/rssyl/rssyl.h:17
 msgid "My Feeds"
 msgstr "Mijn Feeds"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:106
+#: ../src/plugins/rssyl/rssyl_prefs.c:128
 msgid "Default refresh interval in minutes"
 msgstr "Standaard verversings interval in minuten"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:117
-msgid "Set to 0 to disable automatic refreshing"
-msgstr "Zet op 0 om automatische verversing uit te zetten"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:119
-msgid "Default number of expired items to keep"
-msgstr "Standaard aantal verlopen items om te houden"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:130
-msgid "Set to -1 to keep expired items"
-msgstr "Zet op -1 om verlopen items te houden"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:133
+#: ../src/plugins/rssyl/rssyl_prefs.c:147
 msgid "Refresh all feeds on application start"
 msgstr "Ververs alle feeds bij het starten van het programma"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:139
+#. Path to cookies file for libcurl to use
+#: ../src/plugins/rssyl/rssyl_prefs.c:155
 msgid "Path to cookies file"
 msgstr "Pad naar het cookies bestand"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:149
+#: ../src/plugins/rssyl/rssyl_prefs.c:166
+#: ../src/plugins/rssyl/rssyl_prefs.c:169
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr "Pad naar Netscape-stijl cookies.txt bestand dat je cookies bevat"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:152
-msgid "Verify SSL certificate validity for new feeds"
+#: ../src/plugins/rssyl/rssyl_prefs.c:176
+#, fuzzy
+msgid "Verify SSL certificates validity for new feeds"
 msgstr "Verifieer SSL certificaat geldigheid voor nieuwe feeds"
 
+#. Create window
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+msgid "Subscribe new feed?"
+msgstr "Abonneer op nieuwe feed?"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:72
+msgid "<b>Feed folder:</b>"
+msgstr "<b>Feed map:</b>"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:82
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:86
+msgid ""
+"Instead of using official title, you can enter a different folder name for "
+"the feed."
+msgstr ""
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:91
+msgid "_Edit feed properties after subscribing"
+msgstr ""
+
+#: ../src/plugins/rssyl/rssyl_update_comments.c:99
+#, c-format
+msgid "Updating comments for '%s'..."
+msgstr "Bijwerken reacties voor '%s'..."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:102
+#: ../src/plugins/vcalendar/vcal_folder.c:1596
+msgid "401 (Authorisation required)"
+msgstr "401 (Authorisatie vereist)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:105
+#: ../src/plugins/vcalendar/vcal_folder.c:1599
+msgid "403 (Unauthorised)"
+msgstr "403 (Niet geautoriseerd)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:108
+#: ../src/plugins/vcalendar/vcal_folder.c:1602
+msgid "404 (Not found)"
+msgstr "404 (Niet gevonden)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:111
+#, c-format
+msgid "Error %d"
+msgstr "Fout %d"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:123
+#, c-format
+msgctxt "First parameter is URL, second is error text"
+msgid ""
+"Error fetching feed at\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:134
+#, c-format
+msgid ""
+"No valid feed found at\n"
+"<b>%s</b>"
+msgstr ""
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:200
+#, c-format
+msgid "Updating feed '%s'..."
+msgstr "Verversen van feed '%s'..."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:221
+#, c-format
+msgid ""
+"Couldn't process feed at\n"
+"<b>%s</b>\n"
+"\n"
+"Please contact developers, this should not happen."
+msgstr ""
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:301
+msgid "Claws Mail needs network access in order to update your feeds."
+msgstr "Claws Mail heeft netwerk toegang nodig om de feeds te verversen."
+
+#: ../src/plugins/rssyl/rssyl_update_format.c:127
+msgid ""
+"Internal problem while upgrading storage format. This should not happen. "
+"Please report this, with debug output attached.\n"
+msgstr ""
+
 #: ../src/plugins/smime/plugin.c:38 ../src/plugins/smime/plugin.c:54
 #: ../src/plugins/smime/smime.c:911
 msgid "S/MIME"
@@ -13906,6 +14154,48 @@ msgstr ""
 "Let op dat e-mail headers, zoals Onderwerp, niet versleuteld worden door het "
 "S/MIME systeem."
 
+#: ../src/plugins/spam_report/spam_report.c:295
+msgid "Reporting spam..."
+msgstr "Rapporteer spam..."
+
+#: ../src/plugins/spam_report/spam_report.c:330
+msgid "Report spam online..."
+msgstr "Rapporteer spam online..."
+
+#: ../src/plugins/spam_report/spam_report.c:341
+#: ../src/plugins/spam_report/spam_report.c:379
+#: ../src/plugins/spam_report/spam_report_prefs.c:80
+msgid "SpamReport"
+msgstr "SpamRapport"
+
+#: ../src/plugins/spam_report/spam_report.c:384
+msgid ""
+"This plugin reports spam to various places.\n"
+"Currently the following sites or methods are supported:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * lists.debian.org nomination system"
+msgstr ""
+"Deze plugin rapporteert spam aan verschillende plekken.\n"
+"Op dit moment worden de volgende sites of methodes ondersteund:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * lists.debian.org nomination system"
+
+#: ../src/plugins/spam_report/spam_report.c:409
+msgid "Spam reporting"
+msgstr "Spam rapportering"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:122
+msgid "Enabled"
+msgstr "Aangezet"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:149
+msgid "Forward to:"
+msgstr "Doorsturen aan:"
+
 #: ../src/plugins/spamassassin/spamassassin.c:77
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:649
 msgid "SpamAssassin"
@@ -14035,48 +14325,6 @@ msgstr ""
 "De toegestane tijd voor controle. Als de controle langer duurt zal de "
 "controle worden gestopt."
 
-#: ../src/plugins/spam_report/spam_report.c:293
-msgid "Reporting spam..."
-msgstr "Rapporteer spam..."
-
-#: ../src/plugins/spam_report/spam_report.c:328
-msgid "Report spam online..."
-msgstr "Rapporteer spam online..."
-
-#: ../src/plugins/spam_report/spam_report.c:339
-#: ../src/plugins/spam_report/spam_report.c:377
-#: ../src/plugins/spam_report/spam_report_prefs.c:80
-msgid "SpamReport"
-msgstr "SpamRapport"
-
-#: ../src/plugins/spam_report/spam_report.c:382
-msgid ""
-"This plugin reports spam to various places.\n"
-"Currently the following sites or methods are supported:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * lists.debian.org nomination system"
-msgstr ""
-"Deze plugin rapporteert spam aan verschillende plekken.\n"
-"Op dit moment worden de volgende sites of methodes ondersteund:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * lists.debian.org nomination system"
-
-#: ../src/plugins/spam_report/spam_report.c:407
-msgid "Spam reporting"
-msgstr "Spam rapportering"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:122
-msgid "Enabled"
-msgstr "Aangezet"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:149
-msgid "Forward to:"
-msgstr "Doorsturen aan:"
-
 #: ../src/plugins/tnef_parse/tnef_parse.c:65
 #, c-format
 msgid ""
@@ -14153,7 +14401,7 @@ msgstr "Laat zien"
 
 #: ../src/plugins/vcalendar/day-view.c:614
 #: ../src/plugins/vcalendar/month-view.c:711 ../src/prefs_account.c:1477
-#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:334
+#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:336
 msgid "days"
 msgstr "dagen"
 
@@ -14445,7 +14693,7 @@ msgstr "Agenda:"
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1721
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1731
 msgid "Location:"
-msgstr "Lokatie:"
+msgstr "Locatie:"
 
 #: ../src/plugins/vcalendar/vcalendar.c:1268
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1719
@@ -14541,6 +14789,11 @@ msgstr ""
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Timeout (%d secondes) verbinden met %s\n"
 
+#: ../src/plugins/vcalendar/vcal_folder.c:1605
+#, c-format
+msgid "Error %ld"
+msgstr "Fout %ld"
+
 #: ../src/plugins/vcalendar/vcal_folder.c:1802
 #, c-format
 msgid ""
@@ -14591,9 +14844,9 @@ msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1849
 #: ../src/plugins/vcalendar/vcal_folder.c:1852
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create directory %s"
-msgstr "Kon de doelmap %s niet aanmaken."
+msgstr "Kon de doelmap %s niet aanmaken"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1890
 msgid "Claws Mail needs network access in order to update the Webcal feed."
@@ -14957,7 +15210,7 @@ msgid ""
 msgstr ""
 "Je hebt binnenkort een afspraak.\n"
 "Het begint om %s en eindigt %s later.\n"
-"Lokatie: %s\n"
+"Locatie: %s\n"
 "Meer informatie:\n"
 "\n"
 "%s"
@@ -15264,11 +15517,6 @@ msgstr "Standaard Inbox"
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ongefilterde berichten gaan in deze map"
 
-#: ../src/prefs_account.c:1442 ../src/prefs_account.c:1531
-#: ../src/prefs_account.c:1991 ../src/prefs_customheader.c:237
-msgid "Bro_wse"
-msgstr "Bekijk"
-
 #: ../src/prefs_account.c:1453
 msgid "Use secure authentication (APOP)"
 msgstr "Gebruik beveiligde authenticatie (APOP)"
@@ -15354,8 +15602,8 @@ msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Ophalen' haalt de e-mail voor dit account op"
 
 #: ../src/prefs_account.c:1718 ../src/prefs_customheader.c:209
-#: ../src/prefs_matcher.c:620 ../src/prefs_matcher.c:1958
-#: ../src/prefs_matcher.c:1980
+#: ../src/prefs_matcher.c:623 ../src/prefs_matcher.c:1974
+#: ../src/prefs_matcher.c:1996
 msgid "Header"
 msgstr "Header"
 
@@ -15730,8 +15978,8 @@ msgid "Replace the selected action in list with the action above"
 msgstr "Vervang de geselecteerde actie in de lijst met bovenstaande actie"
 
 #: ../src/prefs_actions.c:337 ../src/prefs_filtering_action.c:616
-#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:778
-#: ../src/prefs_template.c:318 ../src/prefs_toolbar.c:1056
+#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:781
+#: ../src/prefs_template.c:320 ../src/prefs_toolbar.c:1056
 msgid "Re_move"
 msgstr "_Verwijderen"
 
@@ -15740,7 +15988,7 @@ msgid "Delete the selected action from the list"
 msgstr "Verwijder de geselecteerde actie van de lijst"
 
 #: ../src/prefs_actions.c:355 ../src/prefs_filtering.c:503
-#: ../src/prefs_template.c:336
+#: ../src/prefs_template.c:338
 msgid "Clear all the input fields in the dialog"
 msgstr "Wis alle invoervelden in de dialoog"
 
@@ -15761,7 +16009,7 @@ msgstr "Verplaats de geselecteerde actie naar onderen"
 #: ../src/prefs_actions.c:535 ../src/prefs_filtering_action.c:704
 #: ../src/prefs_filtering.c:836 ../src/prefs_filtering.c:838
 #: ../src/prefs_filtering.c:839 ../src/prefs_filtering.c:949
-#: ../src/prefs_matcher.c:897 ../src/prefs_template.c:469
+#: ../src/prefs_matcher.c:900 ../src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Nieuw)"
 
@@ -15822,22 +16070,22 @@ msgstr "Wil je werkelijk alle acties verwijderen?"
 
 #: ../src/prefs_actions.c:898 ../src/prefs_actions.c:929
 #: ../src/prefs_filtering.c:1497 ../src/prefs_filtering.c:1519
-#: ../src/prefs_matcher.c:2109 ../src/prefs_template.c:569
-#: ../src/prefs_template.c:594
+#: ../src/prefs_matcher.c:2125 ../src/prefs_template.c:572
+#: ../src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Ingang niet opgeslagen"
 
 #: ../src/prefs_actions.c:899 ../src/prefs_actions.c:930
 #: ../src/prefs_filtering.c:1498 ../src/prefs_filtering.c:1520
-#: ../src/prefs_template.c:570 ../src/prefs_template.c:595
+#: ../src/prefs_template.c:573 ../src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Deze ingang is nie opgeslagen. Toch afsluiten?"
 
 #: ../src/prefs_actions.c:900 ../src/prefs_actions.c:905
 #: ../src/prefs_actions.c:931 ../src/prefs_filtering.c:1477
 #: ../src/prefs_filtering.c:1499 ../src/prefs_filtering.c:1521
-#: ../src/prefs_matcher.c:2111 ../src/prefs_template.c:571
-#: ../src/prefs_template.c:596 ../src/prefs_template.c:601
+#: ../src/prefs_matcher.c:2127 ../src/prefs_template.c:574
+#: ../src/prefs_template.c:599 ../src/prefs_template.c:604
 msgid "+_Continue editing"
 msgstr "+Ga _door met bewerken"
 
@@ -15957,7 +16205,7 @@ msgstr ""
 "daarvan te verwerken."
 
 #: ../src/prefs_actions.c:1092 ../src/prefs_filtering.c:1695
-#: ../src/prefs_template.c:1101
+#: ../src/prefs_template.c:1121
 msgid "D_uplicate"
 msgstr "D_ubbele"
 
@@ -16091,7 +16339,7 @@ msgid "Custom header configuration"
 msgstr "Aangepaste header instellen"
 
 #: ../src/prefs_customheader.c:507 ../src/prefs_display_header.c:599
-#: ../src/prefs_matcher.c:1583 ../src/prefs_matcher.c:1598
+#: ../src/prefs_matcher.c:1595 ../src/prefs_matcher.c:1610
 msgid "Header name is not set."
 msgstr "Header-naam niet ingevoerd."
 
@@ -16280,7 +16528,7 @@ msgstr "Herverwijzen"
 
 #. S_COL_NUMBER
 #: ../src/prefs_filtering_action.c:194 ../src/prefs_filtering_action.c:195
-#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:626
+#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:629
 #: ../src/prefs_summary_column.c:87 ../src/summaryview.c:447
 msgid "Score"
 msgstr "Score"
@@ -16297,7 +16545,7 @@ msgstr "Stel Score in"
 #. S_COL_SCORE
 #. S_COL_LOCKED
 #: ../src/prefs_filtering_action.c:196 ../src/prefs_filtering_action.c:197
-#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:630
+#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:633
 #: ../src/prefs_summary_column.c:89 ../src/summaryview.c:449
 msgid "Tags"
 msgstr "Tags"
@@ -16327,7 +16575,7 @@ msgid "Action configuration"
 msgstr "Acties instellen"
 
 #: ../src/prefs_filtering_action.c:427 ../src/prefs_filtering.c:1886
-#: ../src/prefs_matcher.c:583
+#: ../src/prefs_matcher.c:586
 msgid "Rule"
 msgstr "Regel"
 
@@ -16369,25 +16617,25 @@ msgid "No action was defined."
 msgstr "Geen acties gedefinieerd."
 
 #. completion of 'To' from address book
-#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2153
+#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2169
 #: ../src/quote_fmt.c:79
 msgid "literal %"
 msgstr "Letterlijke %"
 
-#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2162
+#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2178
 msgid "filename (should not be modified)"
 msgstr "bestandsnaam (dient niet veranderd te worden)"
 
-#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2163
+#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2179
 #: ../src/quote_fmt.c:87
 msgid "new line"
 msgstr "nieuwe regel"
 
-#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2164
+#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2180
 msgid "escape character for quotes"
 msgstr "escape-teken voor aanhalingstekens"
 
-#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2165
+#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2181
 msgid "quote character"
 msgstr "aanhalingsteken"
 
@@ -16739,7 +16987,7 @@ msgid "Folder and Message Lists"
 msgstr "Mappen- en berichtenlijst"
 
 #. message font label
-#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2030
+#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2046
 msgid "Message"
 msgstr "Bericht"
 
@@ -16932,245 +17180,249 @@ msgstr "Diversen"
 msgid "Logging"
 msgstr "Loggen"
 
-#: ../src/prefs_matcher.c:328
+#: ../src/prefs_matcher.c:330
 msgid "more than"
 msgstr "meer dan"
 
-#: ../src/prefs_matcher.c:329
+#: ../src/prefs_matcher.c:331
 msgid "less than"
 msgstr "minder dan"
 
-#: ../src/prefs_matcher.c:335
+#: ../src/prefs_matcher.c:337
 msgid "weeks"
 msgstr "weken"
 
-#: ../src/prefs_matcher.c:339
+#: ../src/prefs_matcher.c:341
 msgid "higher than"
 msgstr "hoger dan"
 
-#: ../src/prefs_matcher.c:340
+#: ../src/prefs_matcher.c:342
 msgid "lower than"
 msgstr "lager dan"
 
-#: ../src/prefs_matcher.c:341 ../src/prefs_matcher.c:347
+#: ../src/prefs_matcher.c:343 ../src/prefs_matcher.c:349
 msgid "exactly"
 msgstr "exacte grootte"
 
-#: ../src/prefs_matcher.c:345
+#: ../src/prefs_matcher.c:347
 msgid "greater than"
 msgstr "groter dan"
 
-#: ../src/prefs_matcher.c:346
+#: ../src/prefs_matcher.c:348
 msgid "smaller than"
 msgstr "kleiner dan"
 
-#: ../src/prefs_matcher.c:351
+#: ../src/prefs_matcher.c:353
 msgid "bytes"
 msgstr "bytes"
 
-#: ../src/prefs_matcher.c:352
+#: ../src/prefs_matcher.c:354
 msgid "kilobytes"
 msgstr "kilobytes"
 
-#: ../src/prefs_matcher.c:353
+#: ../src/prefs_matcher.c:355
 msgid "megabytes"
 msgstr "megabytes"
 
-#: ../src/prefs_matcher.c:357
+#: ../src/prefs_matcher.c:359
 msgid "contains"
 msgstr "bevat"
 
-#: ../src/prefs_matcher.c:358
+#: ../src/prefs_matcher.c:360
 msgid "doesn't contain"
 msgstr "bevat niet"
 
-#: ../src/prefs_matcher.c:381
+#: ../src/prefs_matcher.c:383
 msgid "headers part"
 msgstr "header-deel"
 
-#: ../src/prefs_matcher.c:382
+#: ../src/prefs_matcher.c:384
+msgid "headers values"
+msgstr "headers waardes"
+
+#: ../src/prefs_matcher.c:385
 msgid "body part"
 msgstr "berichtinhoud"
 
-#: ../src/prefs_matcher.c:383
+#: ../src/prefs_matcher.c:386
 msgid "whole message"
 msgstr "hele bericht"
 
-#: ../src/prefs_matcher.c:389 ../src/summaryview.c:6300
+#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6300
 msgid "Marked"
 msgstr "Markeer"
 
-#: ../src/prefs_matcher.c:390 ../src/summaryview.c:6298
+#: ../src/prefs_matcher.c:393 ../src/summaryview.c:6298
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: ../src/prefs_matcher.c:391
+#: ../src/prefs_matcher.c:394
 msgid "Replied"
 msgstr "Beantwoord"
 
-#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6292
+#: ../src/prefs_matcher.c:395 ../src/summaryview.c:6292
 msgid "Forwarded"
 msgstr "Doorgestuurd"
 
-#: ../src/prefs_matcher.c:394 ../src/summaryview.c:6282 ../src/toolbar.c:416
+#: ../src/prefs_matcher.c:397 ../src/summaryview.c:6282 ../src/toolbar.c:416
 #: ../src/toolbar.c:934 ../src/toolbar.c:1978
 msgid "Spam"
 msgstr "Spam"
 
-#: ../src/prefs_matcher.c:395
+#: ../src/prefs_matcher.c:398
 msgid "Has attachment"
 msgstr "Heeft bijvoegsel"
 
-#: ../src/prefs_matcher.c:396 ../src/summaryview.c:6318
+#: ../src/prefs_matcher.c:399 ../src/summaryview.c:6318
 msgid "Signed"
 msgstr "Ondertekend"
 
-#: ../src/prefs_matcher.c:400
+#: ../src/prefs_matcher.c:403
 msgid "set"
 msgstr "gezet"
 
-#: ../src/prefs_matcher.c:401
+#: ../src/prefs_matcher.c:404
 msgid "not set"
 msgstr "niet gezet"
 
-#: ../src/prefs_matcher.c:405
+#: ../src/prefs_matcher.c:408
 msgid "yes"
 msgstr "ja"
 
-#: ../src/prefs_matcher.c:406
+#: ../src/prefs_matcher.c:409
 msgid "no"
 msgstr "nee"
 
-#: ../src/prefs_matcher.c:410
+#: ../src/prefs_matcher.c:413
 msgid "Any tags"
 msgstr "Elke tag"
 
-#: ../src/prefs_matcher.c:411
+#: ../src/prefs_matcher.c:414
 msgid "Specific tag"
 msgstr "Specifieke tag"
 
-#: ../src/prefs_matcher.c:415
+#: ../src/prefs_matcher.c:418
 msgid "ignored"
 msgstr "genegeerd"
 
-#: ../src/prefs_matcher.c:416
+#: ../src/prefs_matcher.c:419
 msgid "not ignored"
 msgstr "niet genegeerd"
 
-#: ../src/prefs_matcher.c:417
+#: ../src/prefs_matcher.c:420
 msgid "watched"
 msgstr "gevolgd"
 
-#: ../src/prefs_matcher.c:418
+#: ../src/prefs_matcher.c:421
 msgid "not watched"
 msgstr "niet gevolgd"
 
-#: ../src/prefs_matcher.c:422
+#: ../src/prefs_matcher.c:425
 msgid "found"
 msgstr "gevonden"
 
-#: ../src/prefs_matcher.c:423
+#: ../src/prefs_matcher.c:426
 msgid "not found"
 msgstr "niet gevonden"
 
-#: ../src/prefs_matcher.c:427
+#: ../src/prefs_matcher.c:430
 msgid "0 (Passed)"
 msgstr "0 (Gelukt)"
 
-#: ../src/prefs_matcher.c:428
+#: ../src/prefs_matcher.c:431
 msgid "non-0 (Failed)"
 msgstr "non-0 (Mislukt)"
 
-#: ../src/prefs_matcher.c:566
+#: ../src/prefs_matcher.c:569
 msgid "Condition configuration"
 msgstr "Voorwaarden instellen"
 
 #. criteria combo box
-#: ../src/prefs_matcher.c:610
+#: ../src/prefs_matcher.c:613
 msgid "Match criteria:"
 msgstr "Overeenkomst met criteria:"
 
-#: ../src/prefs_matcher.c:619
+#: ../src/prefs_matcher.c:622
 msgid "All messages"
 msgstr "Alle berichten"
 
-#: ../src/prefs_matcher.c:621
+#: ../src/prefs_matcher.c:624
 msgid "Age"
 msgstr "Leeftijd"
 
-#: ../src/prefs_matcher.c:622
+#: ../src/prefs_matcher.c:625
 msgid "Phrase"
 msgstr "Zin"
 
-#: ../src/prefs_matcher.c:623
+#: ../src/prefs_matcher.c:626
 msgid "Flags"
 msgstr "Vlaggen"
 
-#: ../src/prefs_matcher.c:624 ../src/prefs_msg_colors.c:410
+#: ../src/prefs_matcher.c:627 ../src/prefs_msg_colors.c:410
 msgid "Color labels"
 msgstr "Kleurlabels"
 
-#: ../src/prefs_matcher.c:625
+#: ../src/prefs_matcher.c:628
 msgid "Thread"
 msgstr "Draad"
 
-#: ../src/prefs_matcher.c:628
+#: ../src/prefs_matcher.c:631
 msgid "Partially downloaded"
 msgstr "Gedeeltelijk opgehaald"
 
-#: ../src/prefs_matcher.c:631
+#: ../src/prefs_matcher.c:634
 msgid "External program test"
 msgstr "Externe programma test"
 
 #. store UNtranslated "Any"/"All" in matcher expressions
-#: ../src/prefs_matcher.c:707 ../src/prefs_matcher.c:1604
-#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:2501
+#: ../src/prefs_matcher.c:710 ../src/prefs_matcher.c:1616
+#: ../src/prefs_matcher.c:1631 ../src/prefs_matcher.c:2521
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Alle"
 
-#: ../src/prefs_matcher.c:741
+#: ../src/prefs_matcher.c:744
 msgid "Use regexp"
 msgstr "Gebruik regex"
 
-#: ../src/prefs_matcher.c:818
+#: ../src/prefs_matcher.c:821
 msgid "Message must match"
 msgstr "Bericht moet overeenkomen met"
 
-#: ../src/prefs_matcher.c:822
+#: ../src/prefs_matcher.c:825
 msgid "at least one"
 msgstr "minstens een"
 
-#: ../src/prefs_matcher.c:823
+#: ../src/prefs_matcher.c:826
 msgid "all"
 msgstr "elke"
 
-#: ../src/prefs_matcher.c:826
+#: ../src/prefs_matcher.c:829
 msgid "of above rules"
 msgstr "van bovenstaande regels"
 
-#: ../src/prefs_matcher.c:1522 ../src/prefs_matcher.c:1588
+#: ../src/prefs_matcher.c:1534 ../src/prefs_matcher.c:1600
 msgid "Search pattern is not set."
 msgstr "Zoekcriteria niet ingevoerd."
 
-#: ../src/prefs_matcher.c:1531
+#: ../src/prefs_matcher.c:1543
 msgid "Test command is not set."
 msgstr "Test-opdrachtregel is niet ingevoerd."
 
-#: ../src/prefs_matcher.c:1605
+#: ../src/prefs_matcher.c:1617
 msgid "all addresses in all headers"
 msgstr "alle adressen in alle headers"
 
-#: ../src/prefs_matcher.c:1608
+#: ../src/prefs_matcher.c:1620
 msgid "any address in any header"
 msgstr "elk adres in elke header"
 
-#: ../src/prefs_matcher.c:1610
+#: ../src/prefs_matcher.c:1622
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "de adres(sen) in header '%s'"
 
-#: ../src/prefs_matcher.c:1611
+#: ../src/prefs_matcher.c:1623
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -17183,79 +17435,83 @@ msgstr ""
 "Als je %s wilt vergelijken met alle ingangen in het adresboek, dan dien je "
 "'%s' te selecteren van de boek/map-keuzelijst."
 
-#: ../src/prefs_matcher.c:1830
+#: ../src/prefs_matcher.c:1842
 msgid "Headers part"
 msgstr "Header-deel"
 
-#: ../src/prefs_matcher.c:1834
+#: ../src/prefs_matcher.c:1846
+msgid "Headers values"
+msgstr "Headers waardes"
+
+#: ../src/prefs_matcher.c:1850
 msgid "Body part"
 msgstr "Berichtinhoud"
 
-#: ../src/prefs_matcher.c:1838
+#: ../src/prefs_matcher.c:1854
 msgid "Whole message"
 msgstr "Hele bericht"
 
-#: ../src/prefs_matcher.c:1957 ../src/prefs_matcher.c:2001
+#: ../src/prefs_matcher.c:1973 ../src/prefs_matcher.c:2017
 msgid "in"
 msgstr "in"
 
-#: ../src/prefs_matcher.c:1959
+#: ../src/prefs_matcher.c:1975
 msgid "content is"
 msgstr "inhoud is"
 
-#: ../src/prefs_matcher.c:1968
+#: ../src/prefs_matcher.c:1984
 msgid "Age is"
 msgstr "Leeftijd is"
 
-#: ../src/prefs_matcher.c:1973
+#: ../src/prefs_matcher.c:1989
 msgid "Flag"
 msgstr "Vlag"
 
-#: ../src/prefs_matcher.c:1974 ../src/prefs_matcher.c:1991
+#: ../src/prefs_matcher.c:1990 ../src/prefs_matcher.c:2007
 msgid "is"
 msgstr "is"
 
-#: ../src/prefs_matcher.c:1979
+#: ../src/prefs_matcher.c:1995
 msgid "Name:"
 msgstr "Naam:"
 
-#: ../src/prefs_matcher.c:1990
+#: ../src/prefs_matcher.c:2006
 msgid "Label"
 msgstr "Label"
 
-#: ../src/prefs_matcher.c:1996
+#: ../src/prefs_matcher.c:2012
 msgid "Value:"
 msgstr "Waarde:"
 
-#: ../src/prefs_matcher.c:2013
+#: ../src/prefs_matcher.c:2029
 msgid "Score is"
 msgstr "Score is"
 
-#: ../src/prefs_matcher.c:2014
+#: ../src/prefs_matcher.c:2030
 msgid "points"
 msgstr "punten"
 
-#: ../src/prefs_matcher.c:2024
+#: ../src/prefs_matcher.c:2040
 msgid "Size is"
 msgstr "Grootte is"
 
-#: ../src/prefs_matcher.c:2029
+#: ../src/prefs_matcher.c:2045
 msgid "Scope:"
 msgstr "Breedte:"
 
-#: ../src/prefs_matcher.c:2031
+#: ../src/prefs_matcher.c:2047
 msgid "tags"
 msgstr "tags"
 
-#: ../src/prefs_matcher.c:2036
+#: ../src/prefs_matcher.c:2052
 msgid "type is"
 msgstr "type is"
 
-#: ../src/prefs_matcher.c:2040
+#: ../src/prefs_matcher.c:2056
 msgid "Program returns"
 msgstr "Programma komt terug"
 
-#: ../src/prefs_matcher.c:2110
+#: ../src/prefs_matcher.c:2126
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -17263,11 +17519,11 @@ msgstr ""
 "Deze ingang is niet opgeslagen.\n"
 "Toch sluiten?"
 
-#: ../src/prefs_matcher.c:2174
+#: ../src/prefs_matcher.c:2190
 msgid "Match Type: 'Test'"
 msgstr "Zoek Type: 'Test'"
 
-#: ../src/prefs_matcher.c:2175
+#: ../src/prefs_matcher.c:2191
 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"
@@ -17280,7 +17536,7 @@ msgstr ""
 "\n"
 "De volgende speciale tekens kunnen gebruikt worden:"
 
-#: ../src/prefs_matcher.c:2274
+#: ../src/prefs_matcher.c:2290
 msgid "Current condition rules"
 msgstr "Huidige voorwaarden"
 
@@ -18240,11 +18496,11 @@ msgstr "Mogelijke selecties"
 msgid "Selection on folder opening"
 msgstr "Selectie bij het openen van een map"
 
-#: ../src/prefs_template.c:79
+#: ../src/prefs_template.c:80
 msgid "This name is used as the Menu item"
 msgstr "Deze naam wordt gebruikt als het menu-item"
 
-#: ../src/prefs_template.c:81
+#: ../src/prefs_template.c:82
 msgid ""
 "Override composing account's From header. This doesn't change the composing "
 "account."
@@ -18252,96 +18508,102 @@ msgstr ""
 "Overschrijf de Van header bij het opstellen. Dit veranderd niets aan het "
 "account bij het opstellen."
 
-#: ../src/prefs_template.c:307
+#: ../src/prefs_template.c:309
 msgid "Append the new template above to the list"
 msgstr "Voeg de nieuwe sjabloon boven aan de lijst toe"
 
-#: ../src/prefs_template.c:316
+#: ../src/prefs_template.c:318
 msgid "Replace the selected template in list with the template above"
 msgstr ""
 "Vervang de geselecteerde sjabloon in de lijst met bovenstaande sjabloon"
 
-#: ../src/prefs_template.c:326
+#: ../src/prefs_template.c:328
 msgid "Delete the selected template from the list"
 msgstr "Verwijder de geselecteerde sjabloon van de lijst"
 
-#: ../src/prefs_template.c:344
+#: ../src/prefs_template.c:346
 msgid "Show information on configuring templates"
 msgstr "Geef informatie weer over het configureren van sjablonen"
 
-#: ../src/prefs_template.c:368
+#: ../src/prefs_template.c:370
 msgid "Move the selected template to the top"
 msgstr "Verplaats de geselecteerde sjabloon naar bovenaan"
 
-#: ../src/prefs_template.c:378
+#: ../src/prefs_template.c:380
 msgid "Move the selected template up"
 msgstr "Verplaats de geselecteerde sjabloon naar boven"
 
-#: ../src/prefs_template.c:386
+#: ../src/prefs_template.c:388
 msgid "Move the selected template down"
 msgstr "Verplaats de geselecteerde sjabloon naar onderen"
 
-#: ../src/prefs_template.c:396
+#: ../src/prefs_template.c:398
 msgid "Move the selected template to the bottom"
 msgstr "Verplaats de geselecteerde sjabloon naar onderaan"
 
-#: ../src/prefs_template.c:412
+#: ../src/prefs_template.c:414
 msgid "Template configuration"
 msgstr "Sjabloon-instellingen"
 
-#: ../src/prefs_template.c:599
+#: ../src/prefs_template.c:602
 msgid "Templates list not saved"
 msgstr "Sjabloonlijst niet opgeslagen"
 
-#: ../src/prefs_template.c:600
+#: ../src/prefs_template.c:603
 msgid "The templates list has been modified. Close anyway?"
 msgstr "De sjabloonlijst is niet opgeslagen. Toch afsluiten?"
 
-#: ../src/prefs_template.c:761
+#: ../src/prefs_template.c:768
 msgid "The template's name is not set."
 msgstr "De sjabloonnaam is niet ingevoerd."
 
-#: ../src/prefs_template.c:798
+#: ../src/prefs_template.c:811
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "Het \"Van\" veld van de sjabloon bevat een ongeldig e-mail adres."
 
-#: ../src/prefs_template.c:804
+#: ../src/prefs_template.c:817
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "Het \"Aan\" veld van de sjabloon bevat een ongeldig e-mail adres."
 
-#: ../src/prefs_template.c:810
+#: ../src/prefs_template.c:823
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "Het \"Cc\" veld van de sjabloon bevat een ongeldig e-mail adres."
 
-#: ../src/prefs_template.c:816
+#: ../src/prefs_template.c:829
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "Het \"Bcc\" veld van de sjabloon bevat een ongeldig e-mail adres."
 
-#: ../src/prefs_template.c:822
+#: ../src/prefs_template.c:835
+msgid ""
+"The \"Reply-To\" field of the template contains an invalid email address."
+msgstr ""
+"Het \"Antwoord-Aan\" veld van de sjabloon bevat een ongeldig e-mail adres."
+
+#: ../src/prefs_template.c:841
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "Het \"Onderwerp\" veld van de sjabloon is ongeldig."
 
-#: ../src/prefs_template.c:892
+#: ../src/prefs_template.c:912
 msgid "Delete template"
 msgstr "Verwijder sjabloon"
 
-#: ../src/prefs_template.c:893
+#: ../src/prefs_template.c:913
 msgid "Do you really want to delete this template?"
 msgstr "Wil je deze sjabloon werkelijk verwijderen?"
 
-#: ../src/prefs_template.c:905
+#: ../src/prefs_template.c:925
 msgid "Delete all templates"
 msgstr "Verwijder alle sjablonen?"
 
-#: ../src/prefs_template.c:906
+#: ../src/prefs_template.c:926
 msgid "Do you really want to delete all the templates?"
 msgstr "Wil je alle sjablonen werkelijk verwijderen?"
 
-#: ../src/prefs_template.c:1221
+#: ../src/prefs_template.c:1241
 msgid "Current templates"
 msgstr "Huidige sjablonen"
 
-#: ../src/prefs_template.c:1249
+#: ../src/prefs_template.c:1269
 msgid "Template"
 msgstr "Sjabloon"
 
@@ -18652,7 +18914,7 @@ msgstr "Geen informatie beschikbaar"
 msgid "No recipient keys defined."
 msgstr "Geen sleutel van ontvanger gedefinieerd."
 
-#: ../src/procmime.c:430 ../src/procmime.c:432 ../src/procmime.c:433
+#: ../src/procmime.c:433 ../src/procmime.c:435 ../src/procmime.c:436
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fout bij decoderen BASE64]\n"
 
@@ -19151,7 +19413,7 @@ msgid ""
 "if you have the one.\n"
 "If you're not sure, just select OK."
 msgstr ""
-"Je zal eerst de lokatie van het postvak moeten geven.\n"
+"Je zal eerst de locatie van het postvak moeten geven.\n"
 "Je kunt een bestaand postvak in MH formaat gebruiken.\n"
 "Als je twijfelt kun je het beste gewoon op OK klikken."
 
@@ -19380,23 +19642,23 @@ msgstr ""
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d geselecteerd (%s/%s, %d ongelezen"
 
-#: ../src/summaryview.c:2979
+#: ../src/summaryview.c:2981
 msgid "Sorting summary..."
 msgstr "Lijst wordt gesorteerd..."
 
-#: ../src/summaryview.c:3118
+#: ../src/summaryview.c:3120
 msgid "Setting summary from message data..."
 msgstr "Lijst wordt ingesteld van berichtinformatie..."
 
-#: ../src/summaryview.c:3323
+#: ../src/summaryview.c:3325
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
-#: ../src/summaryview.c:3375
+#: ../src/summaryview.c:3377
 msgid "(No Recipient)"
 msgstr "(Geen ontvanger)"
 
-#: ../src/summaryview.c:3410
+#: ../src/summaryview.c:3412
 #, c-format
 msgid ""
 "%s\n"
@@ -19405,7 +19667,7 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Van: %s, op %s</span>"
 
-#: ../src/summaryview.c:3417
+#: ../src/summaryview.c:3419
 #, c-format
 msgid ""
 "%s\n"
@@ -19414,26 +19676,26 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Aan: %s, op %s</span>"
 
-#: ../src/summaryview.c:4294
+#: ../src/summaryview.c:4296
 msgid "You're not the author of the article.\n"
 msgstr "Je bent niet de auteur van het artikel.\n"
 
-#: ../src/summaryview.c:4387
+#: ../src/summaryview.c:4389
 #, 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] "Wil je werkelijk het geselecteerde bericht verwijderen?"
 msgstr[1] "Wil je werkelijk de %d geselecteerde berichten verwijderen?"
 
-#: ../src/summaryview.c:4390
+#: ../src/summaryview.c:4392
 msgid "Delete message(s)"
 msgstr "Verwijder bericht(en)"
 
-#: ../src/summaryview.c:4553
+#: ../src/summaryview.c:4555
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: ../src/summaryview.c:4652
+#: ../src/summaryview.c:4653
 msgid "Destination to copy is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
@@ -19539,7 +19801,7 @@ msgstr "Versleuteld"
 msgid "Has attachment(s)"
 msgstr "Heeft bijvoegsel(s)"
 
-#: ../src/summaryview.c:7929
+#: ../src/summaryview.c:7932
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19548,11 +19810,11 @@ msgstr ""
 "Reguliere expressie (regexp) fout:\n"
 "%s"
 
-#: ../src/summaryview.c:8034
+#: ../src/summaryview.c:8037
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Ga terug in de mappenlijst (Je heeft ongelezen berichten)"
 
-#: ../src/summaryview.c:8039
+#: ../src/summaryview.c:8042
 msgid "Go back to the folder list"
 msgstr "Ga terug naar de mappenlijst"
 
@@ -19680,11 +19942,11 @@ msgstr ""
 "    %s\n"
 "Uitvoer-code %d\n"
 
-#: ../src/textview.c:2194
+#: ../src/textview.c:2173
 msgid "Tags: "
 msgstr "Tags:"
 
-#: ../src/textview.c:2896
+#: ../src/textview.c:2875
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
@@ -19703,11 +19965,11 @@ msgstr ""
 "\n"
 "Toch openen?"
 
-#: ../src/textview.c:2905
+#: ../src/textview.c:2884
 msgid "Phishing attempt warning"
 msgstr "Phishing-waarschuwing"
 
-#: ../src/textview.c:2906
+#: ../src/textview.c:2885
 msgid "_Open URL"
 msgstr "_Open URL"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 945190c..34bdf66 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2014-06-13 03:15+0400\n"
-"PO-Revision-Date: 2014-05-25 18:40-0300\n"
+"POT-Creation-Date: 2014-10-13 09:04+0100\n"
+"PO-Revision-Date: 2014-10-20 00:50-0200\n"
 "Last-Translator: Frederico Goncalves Guimaraes\n"
-"Language-Team: Frederico Goncalves Guimaraes\n"
+"Language-Team: Brazilian Portuguese <kde-i18n-pt_BR at kde.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,37 +20,211 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: ../claws-mail.appdata.xml.in.h:1
-#, fuzzy
+#: ../claws-mail.desktop.in.h:1
+msgid "E-mail client"
+msgstr "Cliente de e-mail"
+
+#: ../claws-mail.desktop.in.h:2
+msgid "Lightweight and Fast GTK+ based Mail Client"
+msgstr "Cliente de e-mail leve e rápido, baseado em GTK+"
+
+#: ../claws-mail.desktop.in.h:3
+msgid "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
+msgstr "leve;rápido;gui;extensível;plugin;pop;pop3;imap;imap4;nntp;news;"
+
+#: ../appdata/claws-mail.appdata.xml.in.h:1
 msgid "Claws Mail is a fast, powerful and very extensible email client."
-msgstr "O Claws Mail foi registrado como o cliente padrão."
+msgstr ""
+"O Claws Mail é um cliente de e-mail rápido, poderoso e bastante extensível"
 
-#: ../claws-mail.appdata.xml.in.h:2
+#: ../appdata/claws-mail.appdata.xml.in.h:2
 msgid ""
 "It is highly configurable and handles hundreds of thousands of emails "
 "easily. Messages are managed in an open format, and are easy to interact "
 "with."
 msgstr ""
+"Ele é altamente configurável e pode manipular centenas de milhares de "
+"mensagens facilmente. As mensagens são mantidas em um padrão aberto "
+"e é fácil interagir com elas."
 
-#: ../claws-mail.appdata.xml.in.h:3
+#: ../appdata/claws-mail.appdata.xml.in.h:3
 msgid ""
 "Lots of extra functionality is provided by plugins, such as PGP signatures "
 "and encryption, an RSS aggregator, a calendar, powerful spam filtering, Perl "
 "and Python interactions, HTML and PDF rendering, and more."
 msgstr ""
+"Várias funcionalidades extras são obtidas através de plugins, como "
+"assinaturas "
+"e criptografia PGP, agregador RSS, agenda, filtragem de spam, interações via "
+"Perl e Python, renderização HTML e PDF e muito mais."
 
-#: ../claws-mail.desktop.in.h:1
-msgid "E-mail client"
+#: ../appdata/claws-mail-acpi_notifier.metainfo.xml.in.h:1
+msgid "Enables mail notification via LEDs on some laptops"
+msgstr "Habilita notificações de mensagens através de LEDs em alguns laptops"
+
+#: ../appdata/claws-mail-address_keeper.metainfo.xml.in.h:1
+msgid ""
+"Allows saving outgoing addresses to a designated folder in the address book"
 msgstr ""
+"Permite salvar endereços de destinatários em uma pasta do Livro de Endereços"
 
-#: ../claws-mail.desktop.in.h:2
-msgid "Lightweight and Fast GTK+ based Mail Client"
+#: ../appdata/claws-mail-archive.metainfo.xml.in.h:1
+msgid "Allows to make tars or zips of old folders"
+msgstr "Permite fazer tars ou zips de pastas antigas"
+
+#: ../appdata/claws-mail-att_remover.metainfo.xml.in.h:1
+msgid "Lets you remove attachments from emails"
+msgstr "Permite a remoção de anexos das mensagens"
+
+#: ../appdata/claws-mail-attachwarner.metainfo.xml.in.h:1
+msgid ""
+"Warns when a message mentioning an attachment in the message body without "
+"attaching any files"
+msgstr ""
+"Avisa quando uma mensagem mencionar um anexo no corpo do texto sem ter "
+"nenhum anexo afetivamente adicionado"
+
+#: ../appdata/claws-mail-bogofilter.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using Bogofilter"
+msgstr ""
+"Habilita a verificação de mensagens recebidas via POP, IMAP ou contas locais, "
+"usando o Bogofilter"
+
+#: ../appdata/claws-mail-bsfilter.metainfo.xml.in.h:1
+msgid ""
+"Check all messages that are received from an IMAP, LOCAL or POP account for "
+"spam using Bsfilter"
+msgstr ""
+"Verifica spams em todas as mensagens que foram recebidas em uma conta IMAP, "
+"POP ou local, usando o Bsfilter"
+
+#: ../appdata/claws-mail-clamd.metainfo.xml.in.h:1
+msgid ""
+"Scans all messages that are received from an IMAP, LOCAL or POP account "
+"using clamd (Clam AV)"
+msgstr ""
+"Verifica spams em todas as mensagens que foram recebidas em uma conta IMAP, "
+"POP ou local, usando o clamd (Clam AV)"
+
+#: ../appdata/claws-mail-fancy.metainfo.xml.in.h:1
+msgid "Renders HTML e-mail using the WebKit library"
+msgstr "Renderiza mensagens HTML usando uma biblioteca WebKit"
+
+#: ../appdata/claws-mail-fetchinfo.metainfo.xml.in.h:1
+msgid ""
+"Inserts headers containing: UIDL, Claws' account name, POP server, user ID "
+"and retrieval time"
+msgstr ""
+"Insere cabeçalhos contendo: UIDL, nome da conta no Claws, servidor POP, "
+"ID do usuário e hora da recuperação"
+
+#: ../appdata/claws-mail-gdata.metainfo.xml.in.h:1
+msgid "Provides an interface to Google services"
+msgstr "Fornece uma interface para serviços do Google"
+
+#: ../appdata/claws-mail-geolocation.metainfo.xml.in.h:1
+msgid "Provides GeoLocation functionality"
+msgstr "Fornece funcionalidade de GeoLocalização"
+
+#: ../appdata/claws-mail-libravatar.metainfo.xml.in.h:1
+msgid ""
+"Displays libravatar/gravatar profiles' images or a dynamically generated or "
+"predefined alternative"
+msgstr ""
+"Exibe imagens de perfil do libravatar/gravatar ou uma alternativa gerada "
+"dinamicamente ou pré-definida"
+
+#: ../appdata/claws-mail-mailmbox.metainfo.xml.in.h:1
+msgid "Direct support for mailboxes in mbox format"
+msgstr "Suporte para caixas postais no formato mbox"
+
+#: ../appdata/claws-mail-newmail.metainfo.xml.in.h:1
+msgid ""
+"Writes a msg header summary to a log file on arrival of new mail after "
+"sorting"
+msgstr ""
+"Escreve um resumo de cabeçalho de mensagem em um arrquivo de registro, "
+"durante o recebimento de novas mensagens, apos ordenação"
+
+#: ../appdata/claws-mail-notification.metainfo.xml.in.h:1
+msgid "Provides various ways to notify the user of new and unread email"
+msgstr "Fornece várias formas de notificação de mensagens novas e não lidas"
+
+#: ../appdata/claws-mail-pdf_viewer.metainfo.xml.in.h:1
+msgid ""
+"Enables the viewing of PDF and PostScript attachments using the Poppler "
+"library and GhostScript"
+msgstr ""
+"Habilita a visualização de anexos em PDF e PostScript usando a biblioteca "
+"Poppler e Ghostscript"
+
+#: ../appdata/claws-mail-perl.metainfo.xml.in.h:1
+msgid "Allowing the use of full Perl power in email filters"
+msgstr "Permite o uso de todo o poder do Perl na filtragem de mensagens"
+
+#: ../appdata/claws-mail-pgpcore.metainfo.xml.in.h:1
+msgid ""
+"Handles core PGP functions and is a dependency of both the PGP/Inline and "
+"PGP/MIME plugins."
 msgstr ""
+"Trata de funções centrais do PGP e é uma dependência tanto do plugin "
+"PGP/Inline "
+"quanto do PGP/MIME"
 
-#: ../src/account.c:392
+#: ../appdata/claws-mail-pgpinline.metainfo.xml.in.h:1
+msgid "Handles PGP/Inline signed and/or encrypted mails"
+msgstr "Trata de mensagens assinadas e/ou criptografadas por PGP/Inline"
+
+#: ../appdata/claws-mail-pgpmime.metainfo.xml.in.h:1
+msgid "Handles PGP/MIME signed and/or encrypted mails"
+msgstr "Trata de mensagens assinadas e/ou criptografadas por PGP/MIME"
+
+#: ../appdata/claws-mail-python.metainfo.xml.in.h:1
+msgid ""
+"Offers a Python scripting. Code can be entered into an embedded Python "
+"console or stored"
+msgstr ""
+"Fornece suporte a scripts Python. Os códigos podem ser digitados em um "
+"console Python incorporado ou armazenados"
+
+#: ../appdata/claws-mail-rssyl.metainfo.xml.in.h:1
+msgid "Read your RSS favourite newsfeeds"
+msgstr "Leia suas fontes RSS favoritas"
+
+#: ../appdata/claws-mail-smime.metainfo.xml.in.h:1
+msgid "Handles S/MIME signed and/or encrypted mails"
+msgstr "Trata de mensagens assinadas e/ou criptografadas por S/MIME"
+
+#: ../appdata/claws-mail-spam_report.metainfo.xml.in.h:1
+msgid "Reports spam to various places"
+msgstr "Informa sobre spams para vários lugares"
+
+#: ../appdata/claws-mail-spamassassin.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using SpamAssassin"
+msgstr ""
+"Habilita a verificação de mensagens recebidas via POP, IMAP ou contas locais, "
+"usando o SpamAssassin"
+
+#: ../appdata/claws-mail-tnef_parse.metainfo.xml.in.h:1
+msgid "Enables reading application/ms-tnef attachments"
+msgstr "Habilita a leitura de anexos application/ms-tnef"
+
+#: ../appdata/claws-mail-vcalendar.metainfo.xml.in.h:1
+msgid ""
+"Enables vCalendar message handling and handles webCal subscriptions. "
+"Provides a calendar import"
+msgstr ""
+"Habilita a manipulação de mensagens vCalendar e trata de assinaturas "
+"webCal. Fornece um importador de agendas"
+
+#: ../src/account.c:392 ../src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
+"Please close all the composing windows before editing accounts."
 msgstr ""
 "Algumas janelas de composição estão abertas.\n"
 "Por favor, feche todas essas janelas antes de editar as contas."
@@ -59,11 +233,11 @@ msgstr ""
 msgid "Can't create folder."
 msgstr "Não foi possível criar a pasta."
 
-#: ../src/account.c:717
+#: ../src/account.c:724
 msgid "Edit accounts"
 msgstr "Editar contas"
 
-#: ../src/account.c:734
+#: ../src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -73,44 +247,44 @@ msgstr ""
 "contas, na ordem fornecida. As caixas de checagem indicam quais contas serão "
 "incluídas. A conta padrão possui o seu texto em negrito."
 
-#: ../src/account.c:805
+#: ../src/account.c:812
 msgid " _Set as default account "
 msgstr " Definir como conta _padrão "
 
-#: ../src/account.c:897
+#: ../src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Contas com pastas remotas não podem ser copiadas."
 
 #. copy fields
-#: ../src/account.c:904
+#: ../src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Cópia de %s"
 
-#: ../src/account.c:1064
+#: ../src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Deseja realmente excluir a conta '%s'?"
 
-#: ../src/account.c:1066
+#: ../src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Sem título)"
 
-#: ../src/account.c:1067
+#: ../src/account.c:1074
 msgid "Delete account"
 msgstr "Excluir conta"
 
-#: ../src/account.c:1537
+#: ../src/account.c:1544
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "R"
 
-#: ../src/account.c:1543
+#: ../src/account.c:1550
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Receber mensagem' busca os e-mails das contas marcadas"
 
-#: ../src/account.c:1550 ../src/addrduplicates.c:471 ../src/addressadd.c:215
-#: ../src/addressbook.c:125 ../src/compose.c:7144 ../src/editaddress.c:1263
+#: ../src/account.c:1557 ../src/addrduplicates.c:471 ../src/addressadd.c:215
+#: ../src/addressbook.c:125 ../src/compose.c:7148 ../src/editaddress.c:1263
 #: ../src/editaddress.c:1320 ../src/editaddress.c:1340
 #: ../src/editaddress_other_attributes_ldap.c:302
 #: ../src/editaddress_other_attributes_ldap.c:350 ../src/editbook.c:170
@@ -118,16 +292,16 @@ msgstr "'Receber mensagem' busca os e-mails das contas marcadas"
 #: ../src/editvcard.c:173 ../src/importmutt.c:223 ../src/importpine.c:222
 #: ../src/mimeview.c:275 ../src/plugins/pdf_viewer/poppler_viewer.c:1797
 #: ../src/plugins/pgpcore/select-keys.c:396 ../src/prefs_filtering.c:384
-#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:78
+#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:79
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/account.c:1558 ../src/prefs_account.c:1103
+#: ../src/account.c:1565 ../src/prefs_account.c:1103
 #: ../src/prefs_account.c:4058
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/account.c:1566 ../src/ssl_manager.c:102
+#: ../src/account.c:1573 ../src/ssl_manager.c:102
 msgid "Server"
 msgstr "Servidor"
 
@@ -179,8 +353,8 @@ msgstr ""
 "%s"
 
 #: ../src/action.c:990 ../src/ldaputil.c:326
-#: ../src/plugins/bogofilter/bogofilter.c:876 ../src/plugins/rssyl/feed.c:1739
-#: ../src/plugins/rssyl/feed.c:1743 ../src/plugins/tnef_parse/tnef_parse.c:67
+#: ../src/plugins/bogofilter/bogofilter.c:876
+#: ../src/plugins/tnef_parse/tnef_parse.c:67
 #: ../src/plugins/vcalendar/vcal_folder.c:1803
 #: ../src/plugins/vcalendar/vcal_folder.c:1807
 #: ../src/plugins/vcalendar/vcal_folder.c:1818
@@ -237,24 +411,21 @@ msgid "Action's user argument"
 msgstr "Argumento do usuário para ação"
 
 #: ../src/addrclip.c:479
-#, fuzzy
 msgid "Cannot copy a folder to itself or to its sub-structure."
-msgstr "Não é possível copiar a pasta para dentro dela mesma."
+msgstr ""
+"Não é possível copiar a pasta para dentro dela mesma ou de sua sub-estrutura"
 
 #: ../src/addrclip.c:502
-#, fuzzy
 msgid "Cannot copy an address book to itself."
-msgstr ""
-"Não é possível colar. O livro de endereços de destino é \"somente para "
-"leitura\"."
+msgstr "Não é possível copiar um Livro de Endereços para ele mesmo"
 
 #: ../src/addrclip.c:593
-#, fuzzy
 msgid "Cannot move a folder to itself or to its sub-structure."
-msgstr "Não é possível mover a pasta para dentro dela mesma."
+msgstr ""
+"Não é possível mover uma pasta para dentro dela mesma ou de sua sub-estrutura"
 
 #. that's a group
-#: ../src/addr_compl.c:620 ../src/addressbook.c:4866
+#: ../src/addr_compl.c:685 ../src/addressbook.c:4866
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "Grupo"
@@ -329,14 +500,14 @@ msgstr ""
 
 #: ../src/addrcustomattr.c:212 ../src/addressbook.c:435
 #: ../src/addressbook.c:463 ../src/addressbook.c:480 ../src/edittags.c:272
-#: ../src/plugins/archive/archiver_gtk.c:1193 ../src/prefs_actions.c:1090
-#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1099
+#: ../src/plugins/archive/archiver_gtk.c:1194 ../src/prefs_actions.c:1090
+#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1119
 msgid "_Delete"
 msgstr "E_xcluir"
 
 #: ../src/addrcustomattr.c:213 ../src/edittags.c:273
 #: ../src/prefs_actions.c:1091 ../src/prefs_filtering.c:1694
-#: ../src/prefs_template.c:1100
+#: ../src/prefs_template.c:1120
 msgid "Delete _all"
 msgstr "Excluir _todos"
 
@@ -439,7 +610,7 @@ msgid "Select Address Book Folder"
 msgstr "Selecione a pasta do Livro de Endereços"
 
 #: ../src/addressadd.c:485 ../src/editaddress.c:1582 ../src/headerview.c:281
-#: ../src/textview.c:2064
+#: ../src/textview.c:2043
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -470,17 +641,17 @@ msgstr "Li_vro"
 
 #. {"Address/---",			NULL, "---", NULL, NULL, NULL },
 #: ../src/addressbook.c:403 ../src/addressbook.c:434 ../src/addressbook.c:462
-#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:504
+#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:506
 #: ../src/messageview.c:210
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:507
+#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:509
 #: ../src/messageview.c:213
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:509
+#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:511
 #: ../src/messageview.c:214
 msgid "_Help"
 msgstr "_Ajuda"
@@ -538,7 +709,7 @@ msgstr "_Recortar"
 
 #. Edit menu
 #: ../src/addressbook.c:431 ../src/addressbook.c:470 ../src/addressbook.c:486
-#: ../src/compose.c:610 ../src/mainwindow.c:538 ../src/messageview.c:226
+#: ../src/compose.c:610 ../src/mainwindow.c:540 ../src/messageview.c:226
 msgid "_Copy"
 msgstr "_Copiar"
 
@@ -594,7 +765,7 @@ msgid "Edit custom attributes..."
 msgstr "Editar atributos _personalizados..."
 
 #. Help menu
-#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:801
+#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:803
 #: ../src/messageview.c:339
 msgid "_About"
 msgstr "_Sobre"
@@ -604,9 +775,10 @@ msgid "_Browse Entry"
 msgstr "Percorrer a entra_da"
 
 #. then add the appointment
-#: ../src/addressbook.c:504 ../src/crash.c:454 ../src/crash.c:473
+#: ../src/addressbook.c:504 ../src/crash.c:457 ../src/crash.c:476
 #: ../src/importldif.c:115 ../src/plugins/pgpcore/select-keys.c:251
-#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/vcalendar/day-view.c:402
+#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/pgpcore/sgpgme.c:168
+#: ../src/plugins/vcalendar/day-view.c:402
 #: ../src/plugins/vcalendar/month-view.c:428 ../src/prefs_themes.c:707
 #: ../src/prefs_themes.c:739 ../src/prefs_themes.c:740
 msgid "Unknown"
@@ -712,7 +884,7 @@ msgstr "Foi requerida uma autenticação (mais) forte"
 msgid "Sources"
 msgstr "Fontes"
 
-#: ../src/addressbook.c:914 ../src/prefs_matcher.c:629
+#: ../src/addressbook.c:914 ../src/prefs_matcher.c:632
 #: ../src/prefs_other.c:475 ../src/toolbar.c:225 ../src/toolbar.c:2142
 msgid "Address book"
 msgstr "Livro de endereços"
@@ -765,7 +937,7 @@ msgstr ""
 
 #: ../src/addressbook.c:2921 ../src/imap_gtk.c:363 ../src/mh_gtk.c:202
 #: ../src/plugins/mailmbox/plugin_gtk.c:324
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:236
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:152
 #: ../src/plugins/vcalendar/vcal_folder.c:1966
 msgid "Delete folder"
 msgstr "Excluir a pasta"
@@ -930,10 +1102,10 @@ msgstr "Consulta LDAP"
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:443
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:490
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:613
-#: ../src/prefs_matcher.c:672 ../src/prefs_matcher.c:707
-#: ../src/prefs_matcher.c:1607 ../src/prefs_matcher.c:1614
-#: ../src/prefs_matcher.c:1622 ../src/prefs_matcher.c:1624
-#: ../src/prefs_matcher.c:2504 ../src/prefs_matcher.c:2508
+#: ../src/prefs_matcher.c:675 ../src/prefs_matcher.c:710
+#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:1626
+#: ../src/prefs_matcher.c:1634 ../src/prefs_matcher.c:1636
+#: ../src/prefs_matcher.c:2524 ../src/prefs_matcher.c:2528
 msgid "Any"
 msgstr "Qualquer"
 
@@ -1039,21 +1211,21 @@ msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Não foi possível atualizar. As mudanças não foram escritas no diretório."
 
-#: ../src/alertpanel.c:146 ../src/compose.c:9293
+#: ../src/alertpanel.c:146 ../src/compose.c:9324
 msgid "Notice"
 msgstr "Nota"
 
 #: ../src/alertpanel.c:159 ../src/compose.c:5656 ../src/compose.c:6133
-#: ../src/compose.c:11662 ../src/file_checker.c:78 ../src/file_checker.c:100
+#: ../src/compose.c:11670 ../src/file_checker.c:78 ../src/file_checker.c:100
 #: ../src/messageview.c:853 ../src/messageview.c:866
-#: ../src/plugins/pgpcore/sgpgme.c:719
+#: ../src/plugins/pgpcore/sgpgme.c:717
 #: ../src/plugins/vcalendar/vcalendar.c:125 ../src/summaryview.c:4863
 msgid "Warning"
 msgstr "Aviso"
 
 #: ../src/alertpanel.c:172 ../src/alertpanel.c:195 ../src/compose.c:5597
 #: ../src/inc.c:669 ../src/plugins/pgpcore/sgpgme.c:152
-#: ../src/plugins/pgpcore/sgpgme.c:249
+#: ../src/plugins/pgpcore/sgpgme.c:253
 msgid "Error"
 msgstr "Erro"
 
@@ -1065,15 +1237,9 @@ msgstr "_Ver relatório"
 msgid "Show this message next time"
 msgstr "Exibir essa mensagem da próxima vez"
 
-#: ../src/avatars.c:97
-msgid "Internal avatars rendering already initialized"
-msgstr ""
-
 #: ../src/avatars.c:102
-#, fuzzy
 msgid "Failed to register avatars internal rendering hook"
-msgstr ""
-"Não foi possível registrar o gancho de renderização da imagem de avatar"
+msgstr "Não foi possível registrar o gancho de renderização interno do avatar"
 
 #: ../src/browseldap.c:218
 msgid "Browse Directory Entry"
@@ -1181,7 +1347,7 @@ msgstr "A sua versão do Claws Mail é muito antiga para o plugin '%s'."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "A sua versão do Claws Mail é muito antiga para o plugin."
 
-#: ../src/common/session.c:177 ../src/imap.c:1171
+#: ../src/common/session.c:177 ../src/imap.c:1177
 msgid "SSL handshake failed\n"
 msgstr "Não foi possível efetuar o handshake do SSL\n"
 
@@ -1358,212 +1524,212 @@ msgstr "%d,%02dMb"
 msgid "%.2fGB"
 msgstr "%.2fGb"
 
-#: ../src/common/utils.c:4967
+#: ../src/common/utils.c:5000
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Domingo"
 
-#: ../src/common/utils.c:4968
+#: ../src/common/utils.c:5001
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: ../src/common/utils.c:4969
+#: ../src/common/utils.c:5002
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: ../src/common/utils.c:4970
+#: ../src/common/utils.c:5003
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: ../src/common/utils.c:4971
+#: ../src/common/utils.c:5004
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: ../src/common/utils.c:4972
+#: ../src/common/utils.c:5005
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: ../src/common/utils.c:4973
+#: ../src/common/utils.c:5006
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sábado"
 
-#: ../src/common/utils.c:4975
+#: ../src/common/utils.c:5008
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Janeiro"
 
-#: ../src/common/utils.c:4976
+#: ../src/common/utils.c:5009
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Fevereiro"
 
-#: ../src/common/utils.c:4977
+#: ../src/common/utils.c:5010
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Março"
 
-#: ../src/common/utils.c:4978
+#: ../src/common/utils.c:5011
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Abril"
 
-#: ../src/common/utils.c:4979
+#: ../src/common/utils.c:5012
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Maio"
 
-#: ../src/common/utils.c:4980
+#: ../src/common/utils.c:5013
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Junho"
 
-#: ../src/common/utils.c:4981
+#: ../src/common/utils.c:5014
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Julho"
 
-#: ../src/common/utils.c:4982
+#: ../src/common/utils.c:5015
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Agosto"
 
-#: ../src/common/utils.c:4983
+#: ../src/common/utils.c:5016
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Setembro"
 
-#: ../src/common/utils.c:4984
+#: ../src/common/utils.c:5017
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Outubro"
 
-#: ../src/common/utils.c:4985
+#: ../src/common/utils.c:5018
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Novembro"
 
-#: ../src/common/utils.c:4986
+#: ../src/common/utils.c:5019
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Dezembro"
 
-#: ../src/common/utils.c:4988
+#: ../src/common/utils.c:5021
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dom"
 
-#: ../src/common/utils.c:4989
+#: ../src/common/utils.c:5022
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Seg"
 
-#: ../src/common/utils.c:4990
+#: ../src/common/utils.c:5023
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Ter"
 
-#: ../src/common/utils.c:4991
+#: ../src/common/utils.c:5024
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Qua"
 
-#: ../src/common/utils.c:4992
+#: ../src/common/utils.c:5025
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Qui"
 
-#: ../src/common/utils.c:4993
+#: ../src/common/utils.c:5026
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Sex"
 
-#: ../src/common/utils.c:4994
+#: ../src/common/utils.c:5027
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sáb"
 
-#: ../src/common/utils.c:4996
+#: ../src/common/utils.c:5029
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: ../src/common/utils.c:4997
+#: ../src/common/utils.c:5030
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Fev"
 
-#: ../src/common/utils.c:4998
+#: ../src/common/utils.c:5031
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: ../src/common/utils.c:4999
+#: ../src/common/utils.c:5032
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Abr"
 
-#: ../src/common/utils.c:5000
+#: ../src/common/utils.c:5033
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: ../src/common/utils.c:5001
+#: ../src/common/utils.c:5034
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: ../src/common/utils.c:5002
+#: ../src/common/utils.c:5035
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: ../src/common/utils.c:5003
+#: ../src/common/utils.c:5036
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ago"
 
-#: ../src/common/utils.c:5004
+#: ../src/common/utils.c:5037
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Set"
 
-#: ../src/common/utils.c:5005
+#: ../src/common/utils.c:5038
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Out"
 
-#: ../src/common/utils.c:5006
+#: ../src/common/utils.c:5039
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: ../src/common/utils.c:5007
+#: ../src/common/utils.c:5040
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dez"
 
-#: ../src/common/utils.c:5018
+#: ../src/common/utils.c:5051
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: ../src/common/utils.c:5019
+#: ../src/common/utils.c:5052
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: ../src/common/utils.c:5020
+#: ../src/common/utils.c:5053
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: ../src/common/utils.c:5021
+#: ../src/common/utils.c:5054
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
@@ -1574,7 +1740,7 @@ msgstr "_Adicionar..."
 
 #: ../src/compose.c:571 ../src/mh_gtk.c:361
 #: ../src/plugins/mailmbox/plugin_gtk.c:293
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:140
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:307
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -1583,7 +1749,7 @@ msgid "_Properties..."
 msgstr "_Propriedades..."
 
 #. menus
-#: ../src/compose.c:580 ../src/mainwindow.c:506 ../src/messageview.c:212
+#: ../src/compose.c:580 ../src/mainwindow.c:508 ../src/messageview.c:212
 msgid "_Message"
 msgstr "_Mensagem"
 
@@ -1655,7 +1821,7 @@ msgstr "Com _quebra de linhas"
 msgid "_Unwrapped"
 msgstr "_Sem quebra de linhas"
 
-#: ../src/compose.c:618 ../src/mainwindow.c:539
+#: ../src/compose.c:618 ../src/mainwindow.c:541
 msgid "Select _all"
 msgstr "Selecionar _tudo"
 
@@ -1787,48 +1953,48 @@ msgstr "_Prioridade"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
 #. {"View/Scroll/---",          NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:666 ../src/mainwindow.c:603 ../src/messageview.c:265
+#: ../src/compose.c:666 ../src/mainwindow.c:605 ../src/messageview.c:265
 msgid "Character _encoding"
 msgstr "_Codificação dos caracteres"
 
-#: ../src/compose.c:671 ../src/mainwindow.c:608 ../src/messageview.c:270
+#: ../src/compose.c:671 ../src/mainwindow.c:610 ../src/messageview.c:270
 msgid "Western European"
 msgstr "Europeu Ocidental"
 
-#: ../src/compose.c:672 ../src/mainwindow.c:609 ../src/messageview.c:271
+#: ../src/compose.c:672 ../src/mainwindow.c:611 ../src/messageview.c:271
 msgid "Baltic"
 msgstr "Báltico"
 
-#: ../src/compose.c:673 ../src/mainwindow.c:610 ../src/messageview.c:272
+#: ../src/compose.c:673 ../src/mainwindow.c:612 ../src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: ../src/compose.c:674 ../src/mainwindow.c:611 ../src/messageview.c:273
+#: ../src/compose.c:674 ../src/mainwindow.c:613 ../src/messageview.c:273
 msgid "Arabic"
 msgstr "Árabe"
 
-#: ../src/compose.c:675 ../src/mainwindow.c:612 ../src/messageview.c:274
+#: ../src/compose.c:675 ../src/mainwindow.c:614 ../src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: ../src/compose.c:676 ../src/mainwindow.c:613 ../src/messageview.c:275
+#: ../src/compose.c:676 ../src/mainwindow.c:615 ../src/messageview.c:275
 msgid "Japanese"
 msgstr "Japonês"
 
-#: ../src/compose.c:677 ../src/mainwindow.c:614 ../src/messageview.c:276
+#: ../src/compose.c:677 ../src/mainwindow.c:616 ../src/messageview.c:276
 msgid "Chinese"
 msgstr "Chinês"
 
-#: ../src/compose.c:678 ../src/mainwindow.c:615 ../src/messageview.c:277
+#: ../src/compose.c:678 ../src/mainwindow.c:617 ../src/messageview.c:277
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../src/compose.c:679 ../src/mainwindow.c:616 ../src/messageview.c:278
+#: ../src/compose.c:679 ../src/mainwindow.c:618 ../src/messageview.c:278
 msgid "Thai"
 msgstr "Tailandês"
 
 #. Tools menu
-#: ../src/compose.c:682 ../src/mainwindow.c:723 ../src/messageview.c:314
+#: ../src/compose.c:682 ../src/mainwindow.c:725 ../src/messageview.c:314
 msgid "_Address book"
 msgstr "_Livro de endereços"
 
@@ -1837,7 +2003,7 @@ msgid "_Template"
 msgstr "_Modelo"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:686 ../src/mainwindow.c:751 ../src/messageview.c:335
+#: ../src/compose.c:686 ../src/mainwindow.c:753 ../src/messageview.c:335
 msgid "Actio_ns"
 msgstr "_Ações"
 
@@ -1881,13 +2047,13 @@ msgid "_Normal"
 msgstr "_Normal"
 
 #. RADIO compose_reply_change_mode_cb
-#: ../src/compose.c:707 ../src/mainwindow.c:657 ../src/messageview.c:303
+#: ../src/compose.c:707 ../src/mainwindow.c:659 ../src/messageview.c:303
 msgid "_All"
 msgstr "_Todos"
 
 #. RADIO compose_reply_change_mode_cb
 #. COMPOSE_REPLY_TO_ALL
-#: ../src/compose.c:708 ../src/mainwindow.c:658 ../src/messageview.c:304
+#: ../src/compose.c:708 ../src/mainwindow.c:660 ../src/messageview.c:304
 msgid "_Sender"
 msgstr "_Remetente"
 
@@ -1915,19 +2081,19 @@ msgstr "_Baixa"
 msgid "_Lowest"
 msgstr "Bai_xíssima"
 
-#: ../src/compose.c:723 ../src/mainwindow.c:865 ../src/messageview.c:352
+#: ../src/compose.c:723 ../src/mainwindow.c:868 ../src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automática"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:724 ../src/mainwindow.c:866 ../src/messageview.c:353
+#: ../src/compose.c:724 ../src/mainwindow.c:869 ../src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:725 ../src/mainwindow.c:867 ../src/messageview.c:354
+#: ../src/compose.c:725 ../src/mainwindow.c:870 ../src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "U_nicode (UTF-8)"
 
@@ -1939,7 +2105,7 @@ msgstr "U_nicode (UTF-8)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:729 ../src/mainwindow.c:871 ../src/messageview.c:358
+#: ../src/compose.c:729 ../src/mainwindow.c:874 ../src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Europeu Central (ISO-8859-_2)"
 
@@ -1949,7 +2115,7 @@ msgstr "Europeu Central (ISO-8859-_2)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:732 ../src/mainwindow.c:874 ../src/messageview.c:361
+#: ../src/compose.c:732 ../src/mainwindow.c:877 ../src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "_Grego (ISO-8859-7)"
 
@@ -1963,7 +2129,7 @@ msgstr "_Grego (ISO-8859-7)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:737 ../src/mainwindow.c:879 ../src/messageview.c:366
+#: ../src/compose.c:737 ../src/mainwindow.c:882 ../src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turco (ISO-8859-_9)"
 
@@ -2019,33 +2185,33 @@ msgstr "Enc: múltiplos e-mails"
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "O corpo do modelo \"Redirecionar\" possui um erro na linha %d."
 
-#: ../src/compose.c:2591 ../src/gtk/headers.h:13
+#: ../src/compose.c:2591 ../src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: ../src/compose.c:2594 ../src/gtk/headers.h:14
+#: ../src/compose.c:2594 ../src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Cco:"
 
-#: ../src/compose.c:2597 ../src/gtk/headers.h:11
+#: ../src/compose.c:2597 ../src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Responder para:"
 
 #: ../src/compose.c:2600 ../src/compose.c:4911 ../src/compose.c:4913
-#: ../src/gtk/headers.h:32
+#: ../src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 
-#: ../src/compose.c:2603 ../src/gtk/headers.h:33
+#: ../src/compose.c:2603 ../src/gtk/headers.h:34
 msgid "Followup-To:"
-msgstr "Seguir a:"
+msgstr "Seguindo a:"
 
-#: ../src/compose.c:2606 ../src/gtk/headers.h:16
+#: ../src/compose.c:2606 ../src/gtk/headers.h:17
 msgid "In-Reply-To:"
-msgstr "Respondendo a:"
+msgstr "Em resposta a:"
 
 #: ../src/compose.c:2610 ../src/compose.c:4908 ../src/compose.c:4916
-#: ../src/gtk/headers.h:12 ../src/summary_search.c:433
+#: ../src/gtk/headers.h:13 ../src/summary_search.c:433
 msgid "To:"
 msgstr "Para:"
 
@@ -2092,7 +2258,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Tem certeza?"
 
-#: ../src/compose.c:3603 ../src/compose.c:11144
+#: ../src/compose.c:3603 ../src/compose.c:11152
 msgid "+_Insert"
 msgstr "+_Inserir"
 
@@ -2119,16 +2285,16 @@ msgstr "Não foi possível ler %s."
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:432
+#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Editada]"
 
-#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:435
+#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Escrever mensagem%s"
 
-#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:438
+#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sem assunto] - Escrever mensagem%s"
@@ -2137,7 +2303,7 @@ msgstr "[sem assunto] - Escrever mensagem%s"
 #. * This partly duplicates functionality in compose.c::compose_set_title().
 #. * While it's nice to not have to modify Claws Mail for this to work,
 #. * it would be cleaner to export that function in Claws Mail.
-#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:426
+#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Escrever mensagem"
 
@@ -2193,7 +2359,7 @@ msgstr "Mandar para a Fila de Saída mesmo assim?"
 msgid "Send later"
 msgstr "Enviar mais tarde"
 
-#: ../src/compose.c:5134 ../src/compose.c:9719
+#: ../src/compose.c:5134 ../src/compose.c:9750
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2203,7 +2369,7 @@ msgstr ""
 "\n"
 "Ocorreu um erro na conversão da codificação dos caracteres."
 
-#: ../src/compose.c:5137 ../src/compose.c:9722
+#: ../src/compose.c:5137 ../src/compose.c:9753
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2213,7 +2379,7 @@ msgstr ""
 "\n"
 "Não foi possível obter a chave de criptografia do destinatário."
 
-#: ../src/compose.c:5143 ../src/compose.c:9716
+#: ../src/compose.c:5143 ../src/compose.c:9747
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2303,7 +2469,7 @@ msgstr "A conta selecionada não é NNTP: é impossível enviar a mensagem."
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "O anexo %s não existe mais. Devo ignorar?"
 
-#: ../src/compose.c:6133 ../src/mainwindow.c:648 ../src/toolbar.c:231
+#: ../src/compose.c:6133 ../src/mainwindow.c:650 ../src/toolbar.c:231
 #: ../src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Cancelar o envio"
@@ -2321,35 +2487,35 @@ msgstr "Parte %s original"
 msgid "Add to address _book"
 msgstr "Adicionar ao _Livro de Endereços"
 
-#: ../src/compose.c:6908
+#: ../src/compose.c:6912
 msgid "Delete entry contents"
 msgstr "Excluir o conteúdo da entrada"
 
-#: ../src/compose.c:6912 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: ../src/compose.c:6916 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 "Use <tab> para completar automaticamente a partir do Livro de Endereços"
 
-#: ../src/compose.c:7132
+#: ../src/compose.c:7136
 msgid "Mime type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: ../src/compose.c:7138 ../src/mimeview.c:274
-#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:627
+#: ../src/compose.c:7142 ../src/mimeview.c:274
+#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:630
 #: ../src/prefs_summary_column.c:85 ../src/summaryview.c:445
 msgid "Size"
 msgstr "Tamanho"
 
 #. Save Message to folder
-#: ../src/compose.c:7201
+#: ../src/compose.c:7205
 msgid "Save Message to "
 msgstr "Salvar mensagem em "
 
-#: ../src/compose.c:7238 ../src/editjpilot.c:276 ../src/editldap.c:520
+#: ../src/compose.c:7242 ../src/editjpilot.c:276 ../src/editldap.c:520
 #: ../src/editvcard.c:192 ../src/export.c:164 ../src/import.c:163
 #: ../src/importmutt.c:239 ../src/importpine.c:238
-#: ../src/plugins/archive/archiver_gtk.c:1028
+#: ../src/plugins/archive/archiver_gtk.c:1029
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:188
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:208
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:181
@@ -2358,24 +2524,23 @@ msgstr "Salvar mensagem em "
 msgid "_Browse"
 msgstr "Nav_egar"
 
-#: ../src/compose.c:7710
+#: ../src/compose.c:7714
 msgid "Hea_der"
 msgstr "_Cabeçalho"
 
-#: ../src/compose.c:7715
+#: ../src/compose.c:7719
 msgid "_Attachments"
-msgstr "_Anexos"
+msgstr "Ane_xos"
 
-#: ../src/compose.c:7729
+#: ../src/compose.c:7733
 msgid "Othe_rs"
 msgstr "_Outros"
 
-#: ../src/compose.c:7744 ../src/gtk/headers.h:18
-#: ../src/plugins/pdf_viewer/poppler_viewer.c:702 ../src/summary_search.c:440
-msgid "Subject:"
-msgstr "Assunto:"
+#: ../src/compose.c:7748
+msgid "_Subject:"
+msgstr "_Assunto:"
 
-#: ../src/compose.c:7966
+#: ../src/compose.c:7970
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2384,20 +2549,20 @@ msgstr ""
 "Não foi possível iniciar o verificador ortográfico.\n"
 "%s"
 
-#: ../src/compose.c:8072
+#: ../src/compose.c:8076
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "De: <i>%s</i>"
 
-#: ../src/compose.c:8106
+#: ../src/compose.c:8119
 msgid "Account to use for this email"
 msgstr "Conta a ser usada por esse e-mail"
 
-#: ../src/compose.c:8108
+#: ../src/compose.c:8121
 msgid "Sender address to be used"
 msgstr "Endereço do remetente a ser usado"
 
-#: ../src/compose.c:8272
+#: ../src/compose.c:8285
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2406,64 +2571,68 @@ msgstr ""
 "Não foi possível carregar o sistema de privacidade '%s'. Você não poderá "
 "assinar ou criptografar essa mensagem."
 
-#: ../src/compose.c:8372 ../src/plugins/archive/archiver_gtk.c:1082
+#: ../src/compose.c:8385 ../src/plugins/archive/archiver_gtk.c:1083
 msgid "_None"
 msgstr "_Nenhum"
 
-#: ../src/compose.c:8473 ../src/prefs_template.c:753
+#: ../src/compose.c:8486 ../src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "O corpo do modelo possui um erro na linha %d."
 
-#: ../src/compose.c:8589
+#: ../src/compose.c:8602
 msgid "Template From format error."
 msgstr "Erro no formato do Remetente do modelo."
 
-#: ../src/compose.c:8607
+#: ../src/compose.c:8620
 msgid "Template To format error."
 msgstr "Erro no formato do Destinatário do modelo."
 
-#: ../src/compose.c:8625
+#: ../src/compose.c:8638
 msgid "Template Cc format error."
 msgstr "Erro no formato da Cc do modelo."
 
-#: ../src/compose.c:8643
+#: ../src/compose.c:8656
 msgid "Template Bcc format error."
 msgstr "Erro no formato da Cco do modelo."
 
-#: ../src/compose.c:8662
+#: ../src/compose.c:8674
+msgid "Template Reply-To format error."
+msgstr "Erro no formato do Responder Para do modelo."
+
+#: ../src/compose.c:8693
 msgid "Template subject format error."
 msgstr "Erro no formato do assunto do modelo."
 
-#: ../src/compose.c:8930
+#: ../src/compose.c:8961
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: ../src/compose.c:8945
+#: ../src/compose.c:8976
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: ../src/compose.c:9019
+#: ../src/compose.c:9050
 msgid "Properties"
 msgstr "Propriedades"
 
-#: ../src/compose.c:9036
+#: ../src/compose.c:9067
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: ../src/compose.c:9077
+#: ../src/compose.c:9108
 msgid "Encoding"
 msgstr "Codificação"
 
-#: ../src/compose.c:9097
+#: ../src/compose.c:9128
 msgid "Path"
 msgstr "Caminho"
 
-#: ../src/compose.c:9098
+#: ../src/compose.c:9129
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: ../src/compose.c:9290
+#: ../src/compose.c:9321
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2474,15 +2643,15 @@ msgstr ""
 "Deseja terminar o processo?\n"
 "Id do grupo do processo: %d"
 
-#: ../src/compose.c:9685 ../src/messageview.c:1095
+#: ../src/compose.c:9716 ../src/messageview.c:1095
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "O Claws Mail necessita de acesso à rede para enviar essa mensagem."
 
-#: ../src/compose.c:9711
+#: ../src/compose.c:9742
 msgid "Could not queue message."
 msgstr "Não foi possível adicionar a mensagem à Fila de Saída."
 
-#: ../src/compose.c:9713
+#: ../src/compose.c:9744
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2493,15 +2662,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../src/compose.c:9891
+#: ../src/compose.c:9922
 msgid "Could not save draft."
 msgstr "Não foi possível salvar o rascunho."
 
-#: ../src/compose.c:9895
+#: ../src/compose.c:9926
 msgid "Could not save draft"
 msgstr "Não foi possível salvar o rascunho"
 
-#: ../src/compose.c:9896
+#: ../src/compose.c:9927
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2509,24 +2678,24 @@ msgstr ""
 "Não foi possível salvar o rascunho.\n"
 "Deseja cancelar a saída ou descartar essa mensagem?"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Cancel exit"
 msgstr "_Cancelar a saída"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Discard email"
 msgstr "_Descartar a mensagem"
 
-#: ../src/compose.c:10058 ../src/compose.c:10072
+#: ../src/compose.c:10089 ../src/compose.c:10103
 msgid "Select file"
 msgstr "Selecione o arquivo"
 
-#: ../src/compose.c:10086
+#: ../src/compose.c:10117
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Não foi possível ler o arquivo '%s'."
 
-#: ../src/compose.c:10088
+#: ../src/compose.c:10119
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2535,63 +2704,63 @@ msgstr ""
 "O arquivo '%s' continha caracteres inválidos para a\n"
 "codificação atual, a inserção pode estar incorreta."
 
-#: ../src/compose.c:10175
+#: ../src/compose.c:10206
 msgid "Discard message"
 msgstr "Descartar a mensagem"
 
-#: ../src/compose.c:10176
+#: ../src/compose.c:10207
 msgid "This message has been modified. Discard it?"
 msgstr "Essa mensagem foi modificada. Deseja descartá-la ?"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Save to Drafts"
 msgstr "Salvar em _Rascunhos"
 
-#: ../src/compose.c:10179
+#: ../src/compose.c:10210
 msgid "Save changes"
 msgstr "Salvar alterações"
 
-#: ../src/compose.c:10180
+#: ../src/compose.c:10211
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Essa mensagem foi modificada. Deseja salvar as últimas alterações?"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "_Don't save"
 msgstr "_Não salvar"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "+_Save to Drafts"
 msgstr "+Salvar em _Rascunhos"
 
-#: ../src/compose.c:10251
+#: ../src/compose.c:10282
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Deseja aplicar o modelo '%s'?"
 
-#: ../src/compose.c:10253
+#: ../src/compose.c:10284
 msgid "Apply template"
 msgstr "Aplicar o modelo"
 
-#: ../src/compose.c:10254 ../src/prefs_actions.c:329
+#: ../src/compose.c:10285 ../src/prefs_actions.c:329
 #: ../src/prefs_filtering_action.c:610 ../src/prefs_filtering.c:477
-#: ../src/prefs_matcher.c:772 ../src/prefs_template.c:309
+#: ../src/prefs_matcher.c:775 ../src/prefs_template.c:311
 #: ../src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: ../src/compose.c:10254
+#: ../src/compose.c:10285
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../src/compose.c:11141
+#: ../src/compose.c:11149
 msgid "Insert or attach?"
 msgstr "Inserir ou anexar?"
 
-#: ../src/compose.c:11142
+#: ../src/compose.c:11150
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2599,16 +2768,16 @@ msgstr ""
 "Você deseja inserir o conteúdo do(s) arquivo(s) no corpo da mensagem ou "
 "anexá-lo ao e-mail?"
 
-#: ../src/compose.c:11144
+#: ../src/compose.c:11152
 msgid "_Attach"
 msgstr "_Anexar"
 
-#: ../src/compose.c:11361
+#: ../src/compose.c:11369
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erro no formato da citação, na linha %d."
 
-#: ../src/compose.c:11656
+#: ../src/compose.c:11664
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2867,15 +3036,15 @@ msgstr "Editar a pasta"
 msgid "Input the new name of folder:"
 msgstr "Digite o novo nome da pasta:"
 
-#: ../src/editgroup.c:556 ../src/foldersel.c:581 ../src/imap_gtk.c:195
+#: ../src/editgroup.c:556 ../src/foldersel.c:585 ../src/imap_gtk.c:195
 #: ../src/mh_gtk.c:145 ../src/plugins/mailmbox/plugin_gtk.c:239
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:89
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: ../src/editgroup.c:557 ../src/foldersel.c:582 ../src/mh_gtk.c:146
+#: ../src/editgroup.c:557 ../src/foldersel.c:586 ../src/mh_gtk.c:146
 #: ../src/plugins/mailmbox/plugin_gtk.c:240
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:90
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -3235,7 +3404,7 @@ msgstr "Adicionar uma nova entrada vCard"
 
 #: ../src/etpan/etpan-ssl.c:167
 msgid "Impossible to set the client certificate.\n"
-msgstr ""
+msgstr "Impossível configurar o certificado do cliente.\n"
 
 #: ../src/exphtmldlg.c:106
 msgid "Please specify output directory and file to create."
@@ -3308,9 +3477,9 @@ msgstr "Folha de Estilo"
 #. * can always get back the SummaryView pointer.
 #: ../src/exphtmldlg.c:453 ../src/gtk/colorlabel.c:406
 #: ../src/gtk/gtkaspell.c:1571 ../src/gtk/gtkaspell.c:2231
-#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1174
+#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1177
 #: ../src/plugins/archive/archiver_prefs.c:241
-#: ../src/plugins/libravatar/libravatar_prefs.c:187 ../src/prefs_account.c:949
+#: ../src/plugins/libravatar/libravatar_prefs.c:206 ../src/prefs_account.c:949
 #: ../src/prefs_toolbar.c:780 ../src/prefs_toolbar.c:1465
 #: ../src/summaryview.c:6008
 msgid "None"
@@ -3322,7 +3491,7 @@ msgid "Default"
 msgstr "Padrão"
 
 #: ../src/exphtmldlg.c:455 ../src/plugins/pgpcore/select-keys.c:244
-#: ../src/plugins/pgpcore/sgpgme.c:148
+#: ../src/plugins/pgpcore/sgpgme.c:148 ../src/plugins/pgpcore/sgpgme.c:164
 msgid "Full"
 msgstr "Completo"
 
@@ -3556,7 +3725,7 @@ msgstr "Exportar o Livro de Endereços para um arquivo LDIF"
 msgid "Distinguished Name"
 msgstr "Nome Distinto (dn)"
 
-#: ../src/export.c:113 ../src/summaryview.c:8117
+#: ../src/export.c:113 ../src/summaryview.c:8120
 msgid "Export to mbox file"
 msgstr "Exporta para arquivo mbox"
 
@@ -3593,7 +3762,7 @@ msgid "Full Name"
 msgstr "Nome completo"
 
 #: ../src/exporthtml.c:771 ../src/importldif.c:1022
-#: ../src/plugins/archive/archiver_gtk.c:736
+#: ../src/plugins/archive/archiver_gtk.c:737
 msgid "Attributes"
 msgstr "Atributos"
 
@@ -3639,7 +3808,7 @@ msgstr ""
 
 #: ../src/filtering.c:619 ../src/filtering.c:694 ../src/filtering.c:723
 msgid "rule is not account-based\n"
-msgstr ""
+msgstr "a regra não é associada à conta\n"
 
 #: ../src/filtering.c:623
 #, c-format
@@ -3647,18 +3816,22 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
 msgstr ""
+"a regra é associada à conta [id=%d, nome='%s'], correspondendo à "
+"conta atualmente usada para recuperar as mensagens\n"
 
 #: ../src/filtering.c:625 ../src/filtering.c:642 ../src/filtering.c:643
 #: ../src/filtering.c:667 ../src/filtering.c:685 ../src/filtering.c:712
 #: ../src/filtering.c:713 ../src/filtering.c:730 ../src/filtering.c:731
 msgid "NON_EXISTENT"
-msgstr ""
+msgstr "NON_EXISTENT"
 
 #: ../src/filtering.c:633
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
+"a regra é associada a conta, não correspondendo à conta atualmente usada "
+"para recuperar as mensagens\n"
 
 #: ../src/filtering.c:640
 #, c-format
@@ -3666,11 +3839,15 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
 msgstr ""
+"a regra é associada a conta [id=%d, nome='%s'], não correspondendo à "
+"conta atualmente usada para recuperar as mensagens [id=%d, nome='%s']\n"
 
 #: ../src/filtering.c:659
 msgid ""
 "rule is not account-based, all rules are applied on user request anyway\n"
 msgstr ""
+"a regra não é associada a conta, entretanto todas as regras serão aplicadas "
+"a pedido do usuário\n"
 
 #: ../src/filtering.c:665
 #, c-format
@@ -3678,15 +3855,19 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
 "request\n"
 msgstr ""
+"a regra não é associada a conta [id=%d, nome='%s'], entretanto todas as "
+"regras serão aplicadas "
+"a pedido do usuário\n"
 
 #: ../src/filtering.c:683
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
+"a regra é associada a conta [id=%d, nome='%s'], ignorada a pedido do usuário\n"
 
 #: ../src/filtering.c:688
 msgid "rule is account-based, skipped on user request\n"
-msgstr ""
+msgstr "a regra é associada a conta, ignorada a pedido do usuário\n"
 
 #: ../src/filtering.c:710
 #, c-format
@@ -3694,10 +3875,12 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching current account [id="
 "%d, name='%s']\n"
 msgstr ""
+"a regra é associada a conta [id=%d, nome='%s'], não correspondendo à conta "
+"atual [id=%d, nome='%s']\n"
 
 #: ../src/filtering.c:716
 msgid "rule is account-based, not matching current account\n"
-msgstr ""
+msgstr "a regra é associada a conta, não correspondendo à conta atual\n"
 
 #: ../src/filtering.c:728
 #, c-format
@@ -3705,70 +3888,66 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], current account [id=%d, "
 "name='%s']\n"
 msgstr ""
+"a regra é associada a conta [id=%d, nome='%s'], conta atual [id=%d, "
+"nome='%s']\n"
 
 #: ../src/filtering.c:768
 #, c-format
 msgid "applying action [ %s ]\n"
-msgstr ""
+msgstr "aplicando a ação [ %s ]\n"
 
 #: ../src/filtering.c:773
 msgid "action could not apply\n"
-msgstr ""
+msgstr "não foi possível aplicar a ação\n"
 
 #: ../src/filtering.c:775
 #, c-format
 msgid "no further processing after action [ %s ]\n"
-msgstr ""
+msgstr "não outro processamento após a ação [ %s ]\n"
 
 #: ../src/filtering.c:826
-#, fuzzy, c-format
+#, c-format
 msgid "processing rule '%s' [ %s ]\n"
-msgstr "E_xecutar regras de processamento"
+msgstr "regra de processamento '%s' [ %s ]\n"
 
 #: ../src/filtering.c:830
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "regra de processamento <sem nome> [ %s ]\n"
 
 #: ../src/filtering.c:848
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
-msgstr ""
+msgstr "regra desabilitada '%s' [ %s ]\n"
 
 #: ../src/filtering.c:852
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "regra desabilitada <sem nome> [ %s ]\n"
 
 #: ../src/filtering.c:890
-#, fuzzy
 msgid "undetermined"
-msgstr "Indefinido"
+msgstr "indeterminado"
 
 #: ../src/filtering.c:894
-#, fuzzy
 msgid "incorporation"
-msgstr "a filtragem na incorporação"
+msgstr "incorporação"
 
 #: ../src/filtering.c:898
-#, fuzzy
 msgid "manually"
-msgstr "_Manual"
+msgstr "manualmente"
 
 #: ../src/filtering.c:902
-#, fuzzy
 msgid "folder processing"
-msgstr "E_xecutar regras de processamento da pasta"
+msgstr "processamento da pasta"
 
 #: ../src/filtering.c:906
-#, fuzzy
 msgid "pre-processing"
-msgstr "P_ré-processamento..."
+msgstr "pré-processamento"
 
 #: ../src/filtering.c:910
-#, fuzzy
 msgid "post-processing"
-msgstr "Pó_s-processamento..."
+msgstr "pós-processamento"
 
 #: ../src/filtering.c:927
 #, c-format
@@ -3780,10 +3959,16 @@ msgid ""
 "%s%s %s\n"
 "%s%s %s\n"
 msgstr ""
+"filtrando mensagem (%s%s%s)\n"
+"%sarquivo da mensagem: %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
 
 #: ../src/filtering.c:929 ../src/filtering.c:938
 msgid ": "
-msgstr ""
+msgstr ": "
 
 #: ../src/filtering.c:936
 #, c-format
@@ -3791,6 +3976,8 @@ msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
 msgstr ""
+"filtrando mensagem (%s%s%s)\n"
+"%sarquivo da mensagem: %s\n"
 
 #: ../src/folder.c:1564 ../src/foldersel.c:403 ../src/prefs_folder_item.c:306
 msgid "Inbox"
@@ -3848,38 +4035,37 @@ msgstr "Sincronizando %s para uso desconectado...\n"
 msgid "Select folder"
 msgstr "Selecione a pasta"
 
-#: ../src/foldersel.c:583 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
+#: ../src/foldersel.c:587 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
 #: ../src/plugins/mailmbox/plugin_gtk.c:241
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "NewFolder"
 msgstr "NovaPasta"
 
-#: ../src/foldersel.c:591 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
+#: ../src/foldersel.c:595 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
 #: ../src/imap_gtk.c:272 ../src/imap_gtk.c:277 ../src/mh_gtk.c:155
 #: ../src/mh_gtk.c:259 ../src/news_gtk.c:315
 #: ../src/plugins/mailmbox/plugin_gtk.c:249
 #: ../src/plugins/mailmbox/plugin_gtk.c:416
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:97
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:339
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
 #: ../src/plugins/vcalendar/vcal_folder.c:2040
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' não pode ser incluído no nome da pasta."
 
-#: ../src/foldersel.c:601 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
+#: ../src/foldersel.c:605 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
 #: ../src/mh_gtk.c:165 ../src/mh_gtk.c:266 ../src/news_gtk.c:322
 #: ../src/plugins/mailmbox/plugin_gtk.c:261
 #: ../src/plugins/mailmbox/plugin_gtk.c:425
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:107
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:346
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:211
 #: ../src/plugins/vcalendar/vcal_folder.c:2047
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "A pasta '%s' já existe."
 
-#: ../src/foldersel.c:608 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
+#: ../src/foldersel.c:612 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
 #: ../src/plugins/mailmbox/plugin_gtk.c:268
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:113
+#: ../src/plugins/rssyl/opml_import.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:121
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Não foi possível criar a pasta '%s'."
@@ -3892,7 +4078,7 @@ msgstr "Marcar _todas como lidas"
 msgid "R_un processing rules"
 msgstr "E_xecutar regras de processamento"
 
-#: ../src/folderview.c:233 ../src/mainwindow.c:544
+#: ../src/folderview.c:233 ../src/mainwindow.c:546
 msgid "_Search folder..."
 msgstr "_Pesquisar na pasta..."
 
@@ -3911,7 +4097,7 @@ msgstr "Enviar mensagens da _fila..."
 #. F_COL_FOLDER
 #: ../src/folderview.c:380 ../src/folderview.c:427
 #: ../src/plugins/notification/notification_lcdproc.c:141
-#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:388
+#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:391
 #: ../src/summaryview.c:6284
 msgid "New"
 msgstr "Nova"
@@ -3919,7 +4105,7 @@ msgstr "Nova"
 #. F_COL_NEW
 #: ../src/folderview.c:381 ../src/folderview.c:428
 #: ../src/plugins/notification/notification_lcdproc.c:145
-#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:387
+#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:390
 #: ../src/summaryview.c:6286
 msgid "Unread"
 msgstr "Não lida"
@@ -3941,21 +4127,21 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Configurando as informações da pasta..."
 
-#: ../src/folderview.c:823 ../src/summaryview.c:4117 ../src/summaryview.c:4119
+#: ../src/folderview.c:823 ../src/summaryview.c:4119 ../src/summaryview.c:4121
 msgid "Mark all as read"
 msgstr "Marcar todas como lidas"
 
-#: ../src/folderview.c:824 ../src/summaryview.c:4118
+#: ../src/folderview.c:824 ../src/summaryview.c:4120
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Deseja realmente marcar todas as mensagens dessa pasta como lidas?"
 
-#: ../src/folderview.c:982 ../src/imap.c:4528 ../src/mainwindow.c:5134
+#: ../src/folderview.c:982 ../src/imap.c:4574 ../src/mainwindow.c:5157
 #: ../src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Vasculhando a pasta %s%c%s..."
 
-#: ../src/folderview.c:986 ../src/imap.c:4533 ../src/mainwindow.c:5139
+#: ../src/folderview.c:986 ../src/imap.c:4579 ../src/mainwindow.c:5162
 #: ../src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
@@ -3989,60 +4175,60 @@ msgstr "Não foi possível vasculhar a pasta %s\n"
 msgid "Checking for new messages in all folders..."
 msgstr "Verificando se há novas mensagens em todas as pastas..."
 
-#: ../src/folderview.c:2005
+#: ../src/folderview.c:2046
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Fechando a pasta %s..."
 
 #. Open Folder
 #. TODO: wwp: avoid displaying (null) in the status bar
-#: ../src/folderview.c:2100
+#: ../src/folderview.c:2141
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Abrindo a pasta %s..."
 
-#: ../src/folderview.c:2118
+#: ../src/folderview.c:2159
 msgid "Folder could not be opened."
 msgstr "Não foi possível abrir a pasta."
 
-#: ../src/folderview.c:2261 ../src/mainwindow.c:2877 ../src/mainwindow.c:2881
+#: ../src/folderview.c:2302 ../src/mainwindow.c:2887 ../src/mainwindow.c:2891
 msgid "Empty trash"
 msgstr "Esvaziar Lixeira"
 
-#: ../src/folderview.c:2262
+#: ../src/folderview.c:2303
 msgid "Delete all messages in trash?"
 msgstr "Excluir todas as mensagens da Lixeira?"
 
-#: ../src/folderview.c:2263
+#: ../src/folderview.c:2304
 msgid "+_Empty trash"
 msgstr "+_Esvaziar Lixeira"
 
-#: ../src/folderview.c:2307 ../src/inc.c:1540 ../src/toolbar.c:2607
+#: ../src/folderview.c:2348 ../src/inc.c:1540 ../src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Aviso de modo desconectado"
 
-#: ../src/folderview.c:2308 ../src/toolbar.c:2608
+#: ../src/folderview.c:2349 ../src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Você está trabalhando em modo desconectado. Redefinir?"
 
-#: ../src/folderview.c:2319 ../src/toolbar.c:2627
+#: ../src/folderview.c:2360 ../src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Enviar mensagens da Fila de Saída"
 
-#: ../src/folderview.c:2320 ../src/toolbar.c:2628
+#: ../src/folderview.c:2361 ../src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Enviar todas as mensagens da Fila de Saída?"
 
-#: ../src/folderview.c:2321 ../src/messageview.c:854 ../src/messageview.c:871
+#: ../src/folderview.c:2362 ../src/messageview.c:854 ../src/messageview.c:871
 #: ../src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../src/folderview.c:2329 ../src/toolbar.c:2647
+#: ../src/folderview.c:2370 ../src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocorreram erros durante o envio das mensagens da Fila de Saída."
 
-#: ../src/folderview.c:2332 ../src/main.c:2714 ../src/toolbar.c:2650
+#: ../src/folderview.c:2373 ../src/main.c:2714 ../src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4051,65 +4237,65 @@ msgstr ""
 "Ocorreram erros durante o envio de mensagens da Fila de Saída:\n"
 "%s"
 
-#: ../src/folderview.c:2409
+#: ../src/folderview.c:2450
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Deseja realmente copiar a pasta '%s' para '%s'?"
 
-#: ../src/folderview.c:2410
+#: ../src/folderview.c:2451
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Deseja realmente tornar a pasta '%s' uma sub-pasta de '%s'?"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Copy folder"
 msgstr "Copiar a pasta"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Move folder"
 msgstr "Mover a pasta"
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s para %s..."
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Movendo %s para %s..."
 
-#: ../src/folderview.c:2454
+#: ../src/folderview.c:2495
 msgid "Source and destination are the same."
 msgstr "A pasta de origem e a de destino são a mesma."
 
-#: ../src/folderview.c:2457
+#: ../src/folderview.c:2498
 msgid "Can't copy a folder to one of its children."
 msgstr "Não é possível copiar a pasta para dentro dela mesma."
 
-#: ../src/folderview.c:2458
+#: ../src/folderview.c:2499
 msgid "Can't move a folder to one of its children."
 msgstr "Não é possível mover a pasta para dentro dela mesma."
 
-#: ../src/folderview.c:2461
+#: ../src/folderview.c:2502
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Não é possivel mover pastas entre caixas postais diferentes."
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Copy failed!"
 msgstr "Não foi possível copiar!"
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Move failed!"
 msgstr "Não foi possível mover!"
 
-#: ../src/folderview.c:2515
+#: ../src/folderview.c:2556
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuração de processamento da pasta %s"
 
-#: ../src/folderview.c:2943 ../src/summaryview.c:4558
-#: ../src/summaryview.c:4657
+#: ../src/folderview.c:2984 ../src/summaryview.c:4560
+#: ../src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr "A pasta de destino só pode ser usada para armazenar sub-pastas."
 
@@ -4656,92 +4842,91 @@ msgstr ""
 
 #: ../src/gtk/gtkutils.c:1907
 msgid "Failed."
-msgstr ""
+msgstr "Falhou."
 
 #: ../src/gtk/gtkutils.c:1970
-#, fuzzy
 msgid "Configuring..."
-msgstr "_Configurações"
+msgstr "Configurando..."
 
 #. RFC2822
 #. S_COL_TO
 #. date expression
 #. S_COL_TO
-#: ../src/gtk/headers.h:8 ../src/prefs_filtering_action.c:1259
-#: ../src/prefs_matcher.c:2158 ../src/prefs_summary_column.c:84
+#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1259
+#: ../src/prefs_matcher.c:2174 ../src/prefs_summary_column.c:84
 #: ../src/quote_fmt.c:49 ../src/summaryview.c:444
 msgid "Date"
 msgstr "Data"
 
-#: ../src/gtk/headers.h:8
+#: ../src/gtk/headers.h:9
 msgid "Date:"
 msgstr "Data:"
 
 #. S_COL_SUBJECT
 #. date
 #. S_COL_SUBJECT
-#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1256
-#: ../src/prefs_matcher.c:2155 ../src/prefs_summary_column.c:82
+#: ../src/gtk/headers.h:10 ../src/prefs_filtering_action.c:1256
+#: ../src/prefs_matcher.c:2171 ../src/prefs_summary_column.c:82
 #: ../src/quote_fmt.c:50 ../src/summaryview.c:442
 msgid "From"
 msgstr "De"
 
-#: ../src/gtk/headers.h:9 ../src/summary_search.c:426
+#: ../src/gtk/headers.h:10 ../src/summary_search.c:426
 msgid "From:"
 msgstr "De:"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender"
 msgstr "Remetente"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender:"
 msgstr "Remetente:"
 
-#: ../src/gtk/headers.h:11
+#: ../src/gtk/headers.h:12
 msgid "Reply-To"
 msgstr "Responder para"
 
 #. S_COL_FROM
 #. subject
 #. S_COL_FROM
-#: ../src/gtk/headers.h:12 ../src/prefs_filtering_action.c:1257
-#: ../src/prefs_matcher.c:2156 ../src/prefs_summary_column.c:83
+#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1257
+#: ../src/prefs_matcher.c:2172 ../src/prefs_summary_column.c:83
 #: ../src/quote_fmt.c:57 ../src/summaryview.c:443
 msgid "To"
 msgstr "Para"
 
 #. to
-#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1258
-#: ../src/prefs_matcher.c:2157 ../src/quote_fmt.c:58
+#: ../src/gtk/headers.h:14 ../src/prefs_filtering_action.c:1258
+#: ../src/prefs_matcher.c:2173 ../src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
-#: ../src/gtk/headers.h:14
+#: ../src/gtk/headers.h:15
 msgid "Bcc"
 msgstr "Cco"
 
 #. references
-#: ../src/gtk/headers.h:15 ../src/prefs_filtering_action.c:1260
-#: ../src/prefs_matcher.c:2159 ../src/quote_fmt.c:61
+#: ../src/gtk/headers.h:16 ../src/prefs_filtering_action.c:1260
+#: ../src/prefs_matcher.c:2175 ../src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "ID da Mensagem"
 
-#: ../src/gtk/headers.h:15
+#: ../src/gtk/headers.h:16
 msgid "Message-ID:"
 msgstr "ID da Mensagem:"
 
-#: ../src/gtk/headers.h:16
+#: ../src/gtk/headers.h:17
 msgid "In-Reply-To"
 msgstr "Respondendo a"
 
 #. newsgroups
-#: ../src/gtk/headers.h:17 ../src/prefs_filtering_action.c:1262
-#: ../src/prefs_matcher.c:2161 ../src/quote_fmt.c:60
+#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1262
+#: ../src/prefs_matcher.c:2177 ../src/quote_fmt.c:60
 msgid "References"
 msgstr "Referências"
 
-#: ../src/gtk/headers.h:17
+#: ../src/gtk/headers.h:18
 msgid "References:"
 msgstr "Referências:"
 
@@ -4749,328 +4934,333 @@ msgstr "Referências:"
 #. initial of sender
 #. S_COL_STATUS
 #. S_COL_MIME
-#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1255
-#: ../src/prefs_matcher.c:2154 ../src/prefs_summary_column.c:81
+#: ../src/gtk/headers.h:19 ../src/prefs_filtering_action.c:1255
+#: ../src/prefs_matcher.c:2170 ../src/prefs_summary_column.c:81
 #: ../src/quote_fmt.c:56 ../src/summaryview.c:441
 msgid "Subject"
 msgstr "Assunto"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:19 ../src/plugins/pdf_viewer/poppler_viewer.c:702
+#: ../src/summary_search.c:440
+msgid "Subject:"
+msgstr "Assunto:"
+
+#: ../src/gtk/headers.h:20
 msgid "Comments"
 msgstr "Comentários"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:20
 msgid "Comments:"
 msgstr "Comentários:"
 
-#: ../src/gtk/headers.h:20
+#: ../src/gtk/headers.h:21
 msgid "Keywords"
 msgstr "Palavras-chave"
 
-#: ../src/gtk/headers.h:20 ../src/plugins/pdf_viewer/poppler_viewer.c:704
+#: ../src/gtk/headers.h:21 ../src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Keywords:"
 msgstr "Palavras-chave:"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date"
 msgstr "Data de reenvio"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date:"
 msgstr "Data de reenvio:"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From"
 msgstr "Quem está reenviando"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From:"
 msgstr "Quem está reenviando:"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender"
 msgstr "Origem do reenvio"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender:"
 msgstr "Origem do reenvio:"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To"
 msgstr "Destinatário do reenvio"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To:"
 msgstr "Destinatário do reenvio:"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc"
 msgstr "Cc do reenvio"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc:"
 msgstr "Cc do reenvio:"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc"
 msgstr "Cco do reenvio"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc:"
 msgstr "Cco do reenvio:"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID"
 msgstr "ID da mensagem reenviada"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID:"
 msgstr "ID da mensagem reenviada:"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path"
 msgstr "Caminho de retorno"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path:"
 msgstr "Caminho de retorno:"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received"
 msgstr "Recebido"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received:"
 msgstr "Recebido:"
 
 #. more
 #. cc
-#: ../src/gtk/headers.h:32 ../src/prefs_filtering_action.c:1261
-#: ../src/prefs_matcher.c:2160 ../src/quote_fmt.c:59
+#: ../src/gtk/headers.h:33 ../src/prefs_filtering_action.c:1261
+#: ../src/prefs_matcher.c:2176 ../src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: ../src/gtk/headers.h:33
+#: ../src/gtk/headers.h:34
 msgid "Followup-To"
 msgstr "Encaminhar para"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To"
 msgstr "Entregar para"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To:"
 msgstr "Entregar para:"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen"
 msgstr "Visualizado"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen:"
 msgstr "Visualizado:"
 
 #. S_COL_MARK
-#: ../src/gtk/headers.h:36 ../src/gtk/progressdialog.c:149
+#: ../src/gtk/headers.h:37 ../src/gtk/progressdialog.c:149
 #: ../src/gtk/sslcertwindow.c:164 ../src/prefs_summary_column.c:79
 #: ../src/summaryview.c:2793
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtk/headers.h:36 ../src/prefs_themes.c:906
+#: ../src/gtk/headers.h:37 ../src/prefs_themes.c:906
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face"
 msgstr "Face"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face:"
 msgstr "Face:"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To"
 msgstr "Destinatário da notificação de disposição"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To:"
 msgstr "Destinatário da notificação de disposição:"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To"
 msgstr "Destinatário da confirmação de recebimento"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To:"
 msgstr "Destinatário da confirmação de recebimento:"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent"
 msgstr "Cliente de e-mail do remetente"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent:"
 msgstr "Cliente de e-mail do remetente:"
 
-#: ../src/gtk/headers.h:41
+#: ../src/gtk/headers.h:42
 msgid "Content-Type"
 msgstr "Formato do conteúdo"
 
-#: ../src/gtk/headers.h:41 ../src/image_viewer.c:327
+#: ../src/gtk/headers.h:42 ../src/image_viewer.c:327
 msgid "Content-Type:"
 msgstr "Formato do conteúdo:"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding"
 msgstr "Método de codificação do conteúdo"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding:"
 msgstr "Método de codificação do conteúdo:"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version"
 msgstr "Versão do MIME"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version:"
 msgstr "Versão do MIME:"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence"
 msgstr "Precedência"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence:"
 msgstr "Precedência:"
 
-#: ../src/gtk/headers.h:45 ../src/prefs_account.c:1073
+#: ../src/gtk/headers.h:46 ../src/prefs_account.c:1073
 msgid "Organization"
 msgstr "Organização"
 
-#: ../src/gtk/headers.h:45
+#: ../src/gtk/headers.h:46
 msgid "Organization:"
 msgstr "Organização:"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List"
 msgstr "Lista de discussão"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List:"
 msgstr "Lista de discussão:"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post"
 msgstr "Envio para a lista"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post:"
 msgstr "Envio para a lista:"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe"
 msgstr "Assinar a lista"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe:"
 msgstr "Assinar a lista:"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe"
 msgstr "Cancelar a assinatura da lista"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe:"
 msgstr "Cancelar a assinatura da lista:"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help"
 msgstr "Informações sobre a lista"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help:"
 msgstr "Informações sobre a lista:"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive"
 msgstr "Arquivo de mensagens da lista"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive:"
 msgstr "Arquivo de mensagens da lista:"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner"
 msgstr "Proprietário da lista"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner:"
 msgstr "Proprietário da lista:"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label"
 msgstr "Rótulo definido pelo usuário"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label:"
 msgstr "Rótulo definido pelo usuário:"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer"
 msgstr "Cliente de e-mail do rementente"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer:"
 msgstr "Cliente de e-mail do rementente:"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status"
 msgstr "Status definido pelo usuário"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status:"
 msgstr "Status definido pelo usuário:"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face"
 msgstr "Imagem definida pelo usuário"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face:"
 msgstr "Imagem definida pelo usuário:"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive"
 msgstr "Não arquivamento público da mensagem"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive:"
 msgstr "Não arquivamento público da mensagem:"
 
 #. some common logical names referring to real header names
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to"
 msgstr "Em resposta à"
 
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to:"
 msgstr "Em resposta à:"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc"
 msgstr "Para ou Cc"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc:"
 msgstr "Para ou Cc:"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject"
 msgstr "De, Para ou Assunto"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject:"
 msgstr "De, Para ou Assunto:"
 
@@ -5259,10 +5449,10 @@ msgstr ""
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:457
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:400
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:550
-#: ../src/plugins/fancy/fancy_prefs.c:109
+#: ../src/plugins/fancy/fancy_prefs.c:114
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:178
 #: ../src/plugins/gdata/cm_gdata_prefs.c:145
-#: ../src/plugins/libravatar/libravatar_prefs.c:399
+#: ../src/plugins/libravatar/libravatar_prefs.c:439
 #: ../src/plugins/notification/notification_prefs.c:396
 #: ../src/plugins/notification/notification_prefs.c:410
 #: ../src/plugins/notification/notification_prefs.c:428
@@ -5272,9 +5462,9 @@ msgstr ""
 #: ../src/plugins/notification/notification_prefs.c:496
 #: ../src/plugins/notification/notification_prefs.c:513
 #: ../src/plugins/pgpcore/prefs_gpg.c:569
-#: ../src/plugins/rssyl/rssyl_prefs.c:65
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
+#: ../src/plugins/rssyl/rssyl_prefs.c:69
 #: ../src/plugins/spam_report/spam_report_prefs.c:79
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
 #: ../src/plugins/vcalendar/vcal_prefs.c:680 ../src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Plugins"
@@ -5316,7 +5506,7 @@ msgstr "Plugins carregados"
 msgid "Page Index"
 msgstr "Índice da Página"
 
-#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:828
+#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:831
 msgid "_Hide"
 msgstr "_Esconder"
 
@@ -5329,70 +5519,74 @@ msgstr "_Esconder"
 msgid "Account"
 msgstr "Conta"
 
-#: ../src/gtk/quicksearch.c:452
+#: ../src/gtk/quicksearch.c:451
 msgid "all messages"
 msgstr "todas as mensagens"
 
-#: ../src/gtk/quicksearch.c:453
+#: ../src/gtk/quicksearch.c:452
 msgid "messages whose age is greater than # days"
 msgstr "mensagens anteriores a # dias"
 
-#: ../src/gtk/quicksearch.c:454
+#: ../src/gtk/quicksearch.c:453
 msgid "messages whose age is less than # days"
 msgstr "mensagens posteriores a # dias"
 
-#: ../src/gtk/quicksearch.c:455
+#: ../src/gtk/quicksearch.c:454
 msgid "messages whose age is greater than # hours"
 msgstr "mensagens anteriores a # horas"
 
-#: ../src/gtk/quicksearch.c:456
+#: ../src/gtk/quicksearch.c:455
 msgid "messages whose age is less than # hours"
 msgstr "mensagens posteriores a # horas"
 
-#: ../src/gtk/quicksearch.c:457
+#: ../src/gtk/quicksearch.c:456
 msgid "messages which contain S in the message body"
 msgstr "mensagens que contenham S no corpo"
 
-#: ../src/gtk/quicksearch.c:458
+#: ../src/gtk/quicksearch.c:457
 msgid "messages which contain S in the whole message"
 msgstr "mensagens que contenham S em qualquer parte"
 
-#: ../src/gtk/quicksearch.c:459
+#: ../src/gtk/quicksearch.c:458
 msgid "messages carbon-copied to S"
 msgstr "mensagens com cópia-carbono para S"
 
-#: ../src/gtk/quicksearch.c:460
+#: ../src/gtk/quicksearch.c:459
 msgid "message is either to: or cc: to S"
 msgstr "mensagem que seja 'Para:' ou 'Cc:' para S"
 
-#: ../src/gtk/quicksearch.c:461
+#: ../src/gtk/quicksearch.c:460
 msgid "deleted messages"
 msgstr "mensagens excluídas"
 
 #. * how I can filter deleted messages *
-#: ../src/gtk/quicksearch.c:462
+#: ../src/gtk/quicksearch.c:461
 msgid "messages which contain S in the Sender field"
 msgstr "mensagens que contenham S no campo remetente"
 
-#: ../src/gtk/quicksearch.c:463
+#: ../src/gtk/quicksearch.c:462
 msgid "true if execute \"S\" succeeds"
 msgstr "verdadeiro se a execução \"S\" for bem sucedida"
 
-#: ../src/gtk/quicksearch.c:464
+#: ../src/gtk/quicksearch.c:463
 msgid "messages originating from user S"
 msgstr "mensagens originárias do usuário S"
 
-#: ../src/gtk/quicksearch.c:465
+#: ../src/gtk/quicksearch.c:464
 msgid "forwarded messages"
 msgstr "mensagens encaminhadas"
 
-#: ../src/gtk/quicksearch.c:466
+#: ../src/gtk/quicksearch.c:465
 msgid "messages which have attachments"
 msgstr "mensagens que tenham anexos"
 
+#: ../src/gtk/quicksearch.c:466
+msgid "messages which contain S in any header name or value"
+msgstr "mensagens que contenham S em qualquer nome ou valor de cabeçalho"
+
 #: ../src/gtk/quicksearch.c:467
-msgid "messages which contain header S"
-msgstr "mensagens que contenham o cabeçalho S"
+msgid "messages which contain S in the value of any header"
+msgstr "mensagens que contenham S no valor de qualquer cabeçalho"
 
 #: ../src/gtk/quicksearch.c:468
 msgid "messages which contain S in Message-ID header"
@@ -5484,7 +5678,7 @@ msgstr "mensagens não lidas"
 
 #: ../src/gtk/quicksearch.c:490
 msgid "messages which contain S in References header"
-msgstr "mensagens que contém S no cabeçalho 'References'"
+msgstr "mensagens que contenham S no cabeçalho 'References'"
 
 #: ../src/gtk/quicksearch.c:491
 #, c-format
@@ -5495,7 +5689,7 @@ msgstr ""
 
 #: ../src/gtk/quicksearch.c:492
 msgid "messages which contain S in X-Label header"
-msgstr "mensagens que contém S no cabeçalho 'X-Label'"
+msgstr "mensagens que contenham S no cabeçalho 'X-Label'"
 
 #: ../src/gtk/quicksearch.c:494
 msgid "logical AND operator"
@@ -5585,7 +5779,7 @@ msgstr "E_ditar"
 
 #: ../src/gtk/quicksearch.c:819 ../src/gtk/quicksearch.c:834
 #: ../src/prefs_actions.c:347 ../src/prefs_filtering.c:495
-#: ../src/prefs_template.c:328
+#: ../src/prefs_template.c:330
 msgid "C_lear"
 msgstr "_Limpar"
 
@@ -5737,8 +5931,8 @@ msgstr "Etiquetas:"
 #: ../src/plugins/notification/notification_popup.c:316
 #: ../src/plugins/notification/notification_popup.c:621
 #: ../src/plugins/notification/notification_trayicon.c:851
-#: ../src/summaryview.c:3351 ../src/summaryview.c:3369
-#: ../src/summaryview.c:3390
+#: ../src/summaryview.c:3353 ../src/summaryview.c:3371
+#: ../src/summaryview.c:3392
 msgid "(No From)"
 msgstr "(Sem remetente)"
 
@@ -5746,7 +5940,7 @@ msgstr "(Sem remetente)"
 #: ../src/plugins/notification/notification_popup.c:318
 #: ../src/plugins/notification/notification_popup.c:625
 #: ../src/plugins/notification/notification_trayicon.c:854
-#: ../src/summaryview.c:3403 ../src/summaryview.c:3407
+#: ../src/summaryview.c:3405 ../src/summaryview.c:3409
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
@@ -5754,7 +5948,7 @@ msgstr "(Sem assunto)"
 msgid "Error:"
 msgstr "Erro:"
 
-#: ../src/image_viewer.c:299 ../src/mimeview.c:2544
+#: ../src/image_viewer.c:299 ../src/mimeview.c:2545
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:698
 msgid "Filename:"
 msgstr "Nome do arquivo:"
@@ -5767,31 +5961,31 @@ msgstr "Tamanho do arquivo:"
 msgid "Load Image"
 msgstr "Carregar imagem"
 
-#: ../src/imap.c:577
+#: ../src/imap.c:583
 msgid "IMAP4 connection broken\n"
 msgstr "A conexão com o IMAP4 foi interrompida\n"
 
-#: ../src/imap.c:616
+#: ../src/imap.c:622
 #, c-format
 msgid "IMAP error on %s: authenticated\n"
 msgstr "Erro no IMAP em %s: autenticado\n"
 
-#: ../src/imap.c:619
+#: ../src/imap.c:625
 #, c-format
 msgid "IMAP error on %s: not authenticated\n"
 msgstr "Erro no IMAP em %s: não autenticado\n"
 
-#: ../src/imap.c:622
+#: ../src/imap.c:628
 #, c-format
 msgid "IMAP error on %s: bad state\n"
 msgstr "Erro no IMAP em %s: estado ruim\n"
 
-#: ../src/imap.c:625
+#: ../src/imap.c:631
 #, c-format
 msgid "IMAP error on %s: stream error\n"
 msgstr "Erro no IMAP em %s: erro no fluxo\n"
 
-#: ../src/imap.c:628
+#: ../src/imap.c:634
 #, c-format
 msgid ""
 "IMAP error on %s: parse error (very probably non-RFC compliance from the "
@@ -5800,22 +5994,22 @@ msgstr ""
 "Erro no IMAP em %s: erro de análise (muito provavelmente uma submissão não-"
 "RFC do servidor)\n"
 
-#: ../src/imap.c:632
+#: ../src/imap.c:638
 #, c-format
 msgid "IMAP error on %s: connection refused\n"
 msgstr "Erro no IMAP em %s: conexão recusada\n"
 
-#: ../src/imap.c:635
+#: ../src/imap.c:641
 #, c-format
 msgid "IMAP error on %s: memory error\n"
 msgstr "Erro no IMAP em %s: erro de memória\n"
 
-#: ../src/imap.c:638
+#: ../src/imap.c:644
 #, c-format
 msgid "IMAP error on %s: fatal error\n"
 msgstr "Erro no IMAP em %s: erro fatal\n"
 
-#: ../src/imap.c:641
+#: ../src/imap.c:647
 #, c-format
 msgid ""
 "IMAP error on %s: protocol error(very probably non-RFC compliance from the "
@@ -5824,172 +6018,172 @@ msgstr ""
 "Erro no IMAP em %s: erro de protocolo (muito provavelmente uma submissão não-"
 "RFC do servidor)\n"
 
-#: ../src/imap.c:645
+#: ../src/imap.c:651
 #, c-format
 msgid "IMAP error on %s: connection not accepted\n"
 msgstr "Erro no IMAP em %s: conexão não aceita\n"
 
-#: ../src/imap.c:648
+#: ../src/imap.c:654
 #, c-format
 msgid "IMAP error on %s: APPEND error\n"
 msgstr "Erro no IMAP em %s: erro no APPEND\n"
 
-#: ../src/imap.c:651
+#: ../src/imap.c:657
 #, c-format
 msgid "IMAP error on %s: NOOP error\n"
 msgstr "Erro no IMAP em %s: erro no NOOP\n"
 
-#: ../src/imap.c:654
+#: ../src/imap.c:660
 #, c-format
 msgid "IMAP error on %s: LOGOUT error\n"
 msgstr "Erro no IMAP em %s: erro no LOGOUT\n"
 
-#: ../src/imap.c:657
+#: ../src/imap.c:663
 #, c-format
 msgid "IMAP error on %s: CAPABILITY error\n"
 msgstr "Erro no IMAP em %s: erro no CAPABILITY\n"
 
-#: ../src/imap.c:660
+#: ../src/imap.c:666
 #, c-format
 msgid "IMAP error on %s: CHECK error\n"
 msgstr "Erro no IMAP em %s: erro no CHECK\n"
 
-#: ../src/imap.c:663
+#: ../src/imap.c:669
 #, c-format
 msgid "IMAP error on %s: CLOSE error\n"
 msgstr "Erro no IMAP em %s: erro no CLOSE\n"
 
-#: ../src/imap.c:666
+#: ../src/imap.c:672
 #, c-format
 msgid "IMAP error on %s: EXPUNGE error\n"
 msgstr "Erro no IMAP em %s: erro no EXPUNGE\n"
 
-#: ../src/imap.c:669
+#: ../src/imap.c:675
 #, c-format
 msgid "IMAP error on %s: COPY error\n"
 msgstr "Erro no IMAP em %s: erro no COPY\n"
 
-#: ../src/imap.c:672
+#: ../src/imap.c:678
 #, c-format
 msgid "IMAP error on %s: UID COPY error\n"
 msgstr "Erro no IMAP em %s: erro no UID COPY\n"
 
-#: ../src/imap.c:675
+#: ../src/imap.c:681
 #, c-format
 msgid "IMAP error on %s: CREATE error\n"
 msgstr "Erro no IMAP em %s: erro no CREATE\n"
 
-#: ../src/imap.c:678
+#: ../src/imap.c:684
 #, c-format
 msgid "IMAP error on %s: DELETE error\n"
 msgstr "Erro no IMAP em %s: erro no DELETE\n"
 
-#: ../src/imap.c:681
+#: ../src/imap.c:687
 #, c-format
 msgid "IMAP error on %s: EXAMINE error\n"
 msgstr "Erro no IMAP em %s: erro no EXAMINE\n"
 
-#: ../src/imap.c:684
+#: ../src/imap.c:690
 #, c-format
 msgid "IMAP error on %s: FETCH error\n"
 msgstr "Erro no IMAP em %s: erro no FETCH\n"
 
-#: ../src/imap.c:687
+#: ../src/imap.c:693
 #, c-format
 msgid "IMAP error on %s: UID FETCH error\n"
 msgstr "Erro no IMAP em %s: erro no UID FETCH\n"
 
-#: ../src/imap.c:690
+#: ../src/imap.c:696
 #, c-format
 msgid "IMAP error on %s: LIST error\n"
 msgstr "Erro no IMAP em %s: erro no LIST\n"
 
-#: ../src/imap.c:693
+#: ../src/imap.c:699
 #, c-format
 msgid "IMAP error on %s: LOGIN error\n"
 msgstr "Erro no IMAP em %s: erro no LOGIN\n"
 
-#: ../src/imap.c:696
+#: ../src/imap.c:702
 #, c-format
 msgid "IMAP error on %s: LSUB error\n"
 msgstr "Erro no IMAP em %s: erro no LSUB\n"
 
-#: ../src/imap.c:699
+#: ../src/imap.c:705
 #, c-format
 msgid "IMAP error on %s: RENAME error\n"
 msgstr "Erro no IMAP em %s: erro no RENAME\n"
 
-#: ../src/imap.c:702
+#: ../src/imap.c:708
 #, c-format
 msgid "IMAP error on %s: SEARCH error\n"
 msgstr "Erro no IMAP em %s: erro no SEARCH\n"
 
-#: ../src/imap.c:705
+#: ../src/imap.c:711
 #, c-format
 msgid "IMAP error on %s: UID SEARCH error\n"
 msgstr "Erro no IMAP em %s: erro no UID SEARCH\n"
 
-#: ../src/imap.c:708
+#: ../src/imap.c:714
 #, c-format
 msgid "IMAP error on %s: SELECT error\n"
 msgstr "Erro no IMAP em %s: erro no SELECT\n"
 
-#: ../src/imap.c:711
+#: ../src/imap.c:717
 #, c-format
 msgid "IMAP error on %s: STATUS error\n"
 msgstr "Erro no IMAP em %s: erro no STATUS\n"
 
-#: ../src/imap.c:714
+#: ../src/imap.c:720
 #, c-format
 msgid "IMAP error on %s: STORE error\n"
 msgstr "Erro no IMAP em %s: erro no STORE\n"
 
-#: ../src/imap.c:717
+#: ../src/imap.c:723
 #, c-format
 msgid "IMAP error on %s: UID STORE error\n"
 msgstr "Erro no IMAP em %s: erro no UID STORE\n"
 
-#: ../src/imap.c:720
+#: ../src/imap.c:726
 #, c-format
 msgid "IMAP error on %s: SUBSCRIBE error\n"
 msgstr "Erro no IMAP em %s: erro no SUBSCRIBE\n"
 
-#: ../src/imap.c:723
+#: ../src/imap.c:729
 #, c-format
 msgid "IMAP error on %s: UNSUBSCRIBE error\n"
 msgstr "Erro no IMAP em %s: erro no UNSUBSCRIBE\n"
 
-#: ../src/imap.c:726
+#: ../src/imap.c:732
 #, c-format
 msgid "IMAP error on %s: STARTTLS error\n"
 msgstr "Erro no IMAP em %s: erro no STARTTLS\n"
 
-#: ../src/imap.c:729
+#: ../src/imap.c:735
 #, c-format
 msgid "IMAP error on %s: INVAL error\n"
 msgstr "Erro no IMAP em %s: erro no INVAL\n"
 
-#: ../src/imap.c:732
+#: ../src/imap.c:738
 #, c-format
 msgid "IMAP error on %s: EXTENSION error\n"
 msgstr "Erro no IMAP em %s: erro no EXTENSION\n"
 
-#: ../src/imap.c:735
+#: ../src/imap.c:741
 #, c-format
 msgid "IMAP error on %s: SASL error\n"
 msgstr "Erro no IMAP em %s: erro no SASL\n"
 
-#: ../src/imap.c:739
+#: ../src/imap.c:745
 #, c-format
 msgid "IMAP error on %s: SSL error\n"
 msgstr "Erro no IMAP em %s: erro no SSL\n"
 
-#: ../src/imap.c:743
+#: ../src/imap.c:749
 #, c-format
 msgid "IMAP error on %s: Unknown error [%d]\n"
 msgstr "Erro no IMAP em %s: erro desconhecido [%d]\n"
 
-#: ../src/imap.c:928
+#: ../src/imap.c:934
 msgid ""
 "\n"
 "\n"
@@ -6001,7 +6195,7 @@ msgstr ""
 "Autenticações CRAM-MD5 funcionam somente se a libetpan estiver compilada com "
 "suporte a SASL e o plugin CRAM-MD5 SASL instalado."
 
-#: ../src/imap.c:934
+#: ../src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -6013,38 +6207,38 @@ msgstr ""
 "Autenticações DIGEST-MD5 funcionam somente se a libetpan estiver compilada "
 "com suporte a SASL e o plugin DIGEST-MD5 SASL estiver instalado."
 
-#: ../src/imap.c:941
+#: ../src/imap.c:947
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Erro na conexão com %s: login recusado.%s"
 
-#: ../src/imap.c:945
+#: ../src/imap.c:951
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Erro na conexão com %s: login recusado.%s\n"
 
-#: ../src/imap.c:963
+#: ../src/imap.c:969
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Erro na conexão com %s"
 
-#: ../src/imap.c:970 ../src/imap.c:973
+#: ../src/imap.c:976 ../src/imap.c:979
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "A conexão IMAP4 com %s foi interrompida. Reconectando...\n"
 
-#: ../src/imap.c:1003 ../src/imap.c:3583 ../src/imap.c:4242 ../src/imap.c:4339
-#: ../src/imap.c:4517 ../src/imap.c:5314
+#: ../src/imap.c:1009 ../src/imap.c:3619 ../src/imap.c:4278 ../src/imap.c:4375
+#: ../src/imap.c:4555 ../src/imap.c:5364
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "O Claws Mail necessita de acesso à rede para conectar-se ao servidor IMAP."
 
-#: ../src/imap.c:1112 ../src/inc.c:818 ../src/news.c:387
+#: ../src/imap.c:1118 ../src/inc.c:818 ../src/news.c:387
 #: ../src/send_message.c:278
 msgid "Insecure connection"
 msgstr "Conexão não-segura"
 
-#: ../src/imap.c:1113 ../src/inc.c:819 ../src/news.c:388
+#: ../src/imap.c:1119 ../src/inc.c:819 ../src/news.c:388
 #: ../src/send_message.c:279
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
@@ -6058,109 +6252,109 @@ msgstr ""
 "\n"
 "Você quer continuar a conexão ao servidor? A comunicação não será segura."
 
-#: ../src/imap.c:1119 ../src/inc.c:825 ../src/news.c:394
+#: ../src/imap.c:1125 ../src/inc.c:825 ../src/news.c:394
 #: ../src/send_message.c:285
 msgid "Con_tinue connecting"
 msgstr "Con_tinuar a conexão"
 
-#: ../src/imap.c:1129
+#: ../src/imap.c:1135
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Conta '%s': Conectando ao servidor IMAP4: %s:%d..."
 
-#: ../src/imap.c:1177
+#: ../src/imap.c:1183
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Não foi possível conectar com o servidor IMAP4: %s:%d"
 
-#: ../src/imap.c:1180
+#: ../src/imap.c:1186
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Não foi possível conectar com o servidor IMAP4: %s:%d\n"
 
-#: ../src/imap.c:1213 ../src/imap.c:4004
+#: ../src/imap.c:1219 ../src/imap.c:4040
 msgid "Can't start TLS session.\n"
 msgstr "Não foi possível iniciar sessão TLS.\n"
 
-#: ../src/imap.c:1276
+#: ../src/imap.c:1282
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Não foi possível autenticar-se no servidor IMAP %s.\n"
 
-#: ../src/imap.c:1279
+#: ../src/imap.c:1285
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Não foi possível conectar-se ao servidor IMAP %s."
 
-#: ../src/imap.c:1679
+#: ../src/imap.c:1703
 msgid "Adding messages..."
 msgstr "Adicionando mensagens..."
 
-#: ../src/imap.c:1883 ../src/mh.c:520
+#: ../src/imap.c:1908 ../src/mh.c:526
 msgid "Copying messages..."
 msgstr "Copiando mensagens..."
 
-#: ../src/imap.c:2465
+#: ../src/imap.c:2492
 msgid "can't set deleted flags\n"
 msgstr "não foi possível definir as marcas de exclusão\n"
 
-#: ../src/imap.c:2472 ../src/imap.c:4944
+#: ../src/imap.c:2499 ../src/imap.c:4994
 msgid "can't expunge\n"
 msgstr "não foi possível expurgar\n"
 
-#: ../src/imap.c:2823
+#: ../src/imap.c:2850
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Procurando por pastas não assinadas em %s..."
 
-#: ../src/imap.c:2826
+#: ../src/imap.c:2853
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Procurando por sub-pastas de %s..."
 
-#: ../src/imap.c:3123
+#: ../src/imap.c:3159
 msgid "can't create mailbox: LIST failed\n"
 msgstr "não foi possível criar a caixa postal: falha no comando LIST\n"
 
-#: ../src/imap.c:3138
+#: ../src/imap.c:3174
 msgid "can't create mailbox\n"
 msgstr "não foi possível criar a caixa postal\n"
 
-#: ../src/imap.c:3229
+#: ../src/imap.c:3265
 msgid "New folder name must not contain the namespace path separator"
 msgstr "O nome da nova pasta não pode conter o caractere separador de caminho"
 
-#: ../src/imap.c:3269
+#: ../src/imap.c:3305
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "não foi possível renomear a caixa postal: %s para %s\n"
 
-#: ../src/imap.c:3382
+#: ../src/imap.c:3418
 msgid "can't delete mailbox\n"
 msgstr "não foi possível excluir a caixa postal\n"
 
-#: ../src/imap.c:3661
+#: ../src/imap.c:3697
 msgid "LIST failed\n"
 msgstr "Erro no comando LIST\n"
 
-#: ../src/imap.c:3746
+#: ../src/imap.c:3782
 msgid "Flagging messages..."
 msgstr "Marcando as mensagens..."
 
-#: ../src/imap.c:3849
+#: ../src/imap.c:3885
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "não foi possível selecionar a pasta: %s\n"
 
-#: ../src/imap.c:4001
+#: ../src/imap.c:4037
 msgid "Server requires TLS to log in.\n"
 msgstr "O servidor depende do TLS para efetutar a autenticação.\n"
 
-#: ../src/imap.c:4011
+#: ../src/imap.c:4047
 msgid "Can't refresh capabilities.\n"
 msgstr "Não foi possível atualizar as capacidades.\n"
 
-#: ../src/imap.c:4016
+#: ../src/imap.c:4052
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -6169,20 +6363,20 @@ msgstr ""
 "Ocorreu uma falha na conexão com %s: o servidor requer TLS, mas o Claws Mail "
 "foi compilado sem o suporte ao OpenSSL.\n"
 
-#: ../src/imap.c:4024
+#: ../src/imap.c:4060
 msgid "Server logins are disabled.\n"
 msgstr "As autenticações no servidor estão desabilitadas.\n"
 
-#: ../src/imap.c:4247
+#: ../src/imap.c:4283
 msgid "Fetching message..."
 msgstr "Buscando a mensagem..."
 
-#: ../src/imap.c:4937
+#: ../src/imap.c:4987
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "não foi possível definir marcas de exclusão: %d\n"
 
-#: ../src/imap.c:5973
+#: ../src/imap.c:6023
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6217,7 +6411,7 @@ msgid "Cop_y folder..."
 msgstr "_Copiar pasta..."
 
 #: ../src/imap_gtk.c:69 ../src/mh_gtk.c:59
-#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:61
+#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:55
 msgid "_Delete folder..."
 msgstr "E_xcluir pasta..."
 
@@ -6278,7 +6472,7 @@ msgstr "Propriedades herdadas da pasta superior"
 
 #: ../src/imap_gtk.c:261 ../src/mh_gtk.c:249 ../src/news_gtk.c:306
 #: ../src/plugins/mailmbox/plugin_gtk.c:405
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:331
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:196
 #: ../src/plugins/vcalendar/vcal_folder.c:2032
 #, c-format
 msgid "Input new name for '%s':"
@@ -6286,14 +6480,14 @@ msgstr "Entre com o novo nome para '%s':"
 
 #: ../src/imap_gtk.c:263 ../src/mh_gtk.c:251
 #: ../src/plugins/mailmbox/plugin_gtk.c:406
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:332
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:197
 #: ../src/plugins/vcalendar/vcal_folder.c:2033
 msgid "Rename folder"
 msgstr "Renomear a pasta"
 
 #: ../src/imap_gtk.c:292 ../src/mh_gtk.c:274 ../src/news_gtk.c:328
 #: ../src/plugins/mailmbox/plugin_gtk.c:433
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:352
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:217
 #: ../src/plugins/vcalendar/vcal_folder.c:2053
 msgid ""
 "The folder could not be renamed.\n"
@@ -6303,7 +6497,7 @@ msgstr ""
 "O nome fornecido não é permitido."
 
 #: ../src/imap_gtk.c:360 ../src/mh_gtk.c:199
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:233
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:149
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6318,7 +6512,7 @@ msgstr ""
 
 #: ../src/imap_gtk.c:381 ../src/mh_gtk.c:220 ../src/news_gtk.c:281
 #: ../src/plugins/mailmbox/plugin_gtk.c:341
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:254
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:170
 #: ../src/plugins/vcalendar/vcal_folder.c:1986
 #, c-format
 msgid "Can't remove the folder '%s'."
@@ -6346,7 +6540,7 @@ msgstr "+_Pesquisar"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Selecione uma sub-pasta de %s para assinar:"
 
-#: ../src/imap_gtk.c:537 ../src/mainwindow.c:672
+#: ../src/imap_gtk.c:537 ../src/mainwindow.c:674
 msgid "Subscribe"
 msgstr "Assinar"
 
@@ -6622,7 +6816,7 @@ msgid "Auth failed"
 msgstr "Ocorreu um erro na autenticação"
 
 #. S_COL_SCORE
-#: ../src/inc.c:662 ../src/prefs_matcher.c:393
+#: ../src/inc.c:662 ../src/prefs_matcher.c:396
 #: ../src/prefs_summary_column.c:88 ../src/summaryview.c:2789
 #: ../src/summaryview.c:6310
 msgid "Locked"
@@ -6809,23 +7003,9 @@ msgstr "%s%sVocê está trabalhando em modo desconectado. Redefinir?"
 msgid "On_ly once"
 msgstr "Apenas _uma vez"
 
-#: ../src/ldapupdate.c:189
-#, c-format
-msgid "ldapsvr_retrieve_item_person->Unknown status: %d"
-msgstr ""
-
-#: ../src/ldapupdate.c:472
-msgid "ldapsvr_update_book: Could not clean cache\n"
-msgstr ""
-
 #: ../src/ldapupdate.c:1056
 msgid "Some SN"
-msgstr ""
-
-#: ../src/ldapupdate.c:1440
-#, c-format
-msgid "ldapsvr_update_book->Unknown status: %s\n"
-msgstr ""
+msgstr "Some SN"
 
 #: ../src/ldif.c:776
 msgid "Nick Name"
@@ -7170,328 +7350,328 @@ msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: a rede está desconectada.\n"
 
 #. menus
-#: ../src/mainwindow.c:503 ../src/messageview.c:209
+#: ../src/mainwindow.c:505 ../src/messageview.c:209
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../src/mainwindow.c:505 ../src/messageview.c:211 ../src/summaryview.c:434
+#: ../src/mainwindow.c:507 ../src/messageview.c:211 ../src/summaryview.c:434
 msgid "_View"
 msgstr "E_xibir"
 
-#: ../src/mainwindow.c:508
+#: ../src/mainwindow.c:510
 msgid "_Configuration"
 msgstr "_Configurações"
 
 #. File menu
-#: ../src/mainwindow.c:512
+#: ../src/mainwindow.c:514
 msgid "_Add mailbox"
 msgstr "Adicionar caixa _postal"
 
-#: ../src/mainwindow.c:513
+#: ../src/mainwindow.c:515
 msgid "MH..."
 msgstr "MH..."
 
-#: ../src/mainwindow.c:516
+#: ../src/mainwindow.c:518
 msgid "Change mailbox order..."
 msgstr "Mudar a ordenação da caixa postal..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:519
+#: ../src/mainwindow.c:521
 msgid "_Import mbox file..."
 msgstr "Importar arquivo _mbox"
 
-#: ../src/mainwindow.c:520
+#: ../src/mainwindow.c:522
 msgid "_Export to mbox file..."
 msgstr "Exporta para arquivo m_box"
 
-#: ../src/mainwindow.c:521
+#: ../src/mainwindow.c:523
 msgid "_Export selected to mbox file..."
 msgstr "Exportar a seleção para um _arquivo mbox..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:523
+#: ../src/mainwindow.c:525
 msgid "Empty all _Trash folders"
 msgstr "Esvaziar todas as _Lixeiras"
 
 #. {"File/---",				NULL, "---" },
 #. File menu
-#: ../src/mainwindow.c:526 ../src/messageview.c:218
+#: ../src/mainwindow.c:528 ../src/messageview.c:218
 msgid "_Save email as..."
 msgstr "Salvar a _mensagem como..."
 
-#: ../src/mainwindow.c:527 ../src/messageview.c:219
+#: ../src/mainwindow.c:529 ../src/messageview.c:219
 msgid "_Save part as..."
 msgstr "Salvar a _parte como..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:530 ../src/messageview.c:220
+#: ../src/mainwindow.c:532 ../src/messageview.c:220
 msgid "Page setup..."
 msgstr "Con_figuração da página..."
 
-#: ../src/mainwindow.c:531 ../src/messageview.c:221
+#: ../src/mainwindow.c:533 ../src/messageview.c:221
 msgid "_Print..."
 msgstr "_Imprimir..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:533
+#: ../src/mainwindow.c:535
 msgid "Synchronise folders"
 msgstr "_Sincronizar pastas"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:535
+#: ../src/mainwindow.c:537
 msgid "E_xit"
 msgstr "Sai_r"
 
-#: ../src/mainwindow.c:540
+#: ../src/mainwindow.c:542
 msgid "Select _thread"
 msgstr "Selecionar _discussão"
 
-#: ../src/mainwindow.c:541
+#: ../src/mainwindow.c:543
 msgid "_Delete thread"
 msgstr "_Excluir discussão"
 
-#: ../src/mainwindow.c:543
+#: ../src/mainwindow.c:545
 msgid "_Find in current message..."
 msgstr "_Localizar na mensagem atual..."
 
-#: ../src/mainwindow.c:545
+#: ../src/mainwindow.c:547
 msgid "_Quick search"
 msgstr "Pesquisa _rápida"
 
 #. View menu
-#: ../src/mainwindow.c:548
+#: ../src/mainwindow.c:550
 msgid "Show or hi_de"
 msgstr "_Mostrar ou esconder"
 
-#: ../src/mainwindow.c:549
+#: ../src/mainwindow.c:551
 msgid "_Toolbar"
 msgstr "_Barra de ferramentas"
 
-#: ../src/mainwindow.c:551
+#: ../src/mainwindow.c:553
 msgid "Set displayed _columns"
 msgstr "Definir colu_nas visíveis"
 
-#: ../src/mainwindow.c:552
+#: ../src/mainwindow.c:554
 msgid "In _folder list..."
 msgstr "Na lista de _pastas..."
 
-#: ../src/mainwindow.c:553
+#: ../src/mainwindow.c:555
 msgid "In _message list..."
 msgstr "Na lista de _mensagens"
 
-#: ../src/mainwindow.c:558
+#: ../src/mainwindow.c:560
 msgid "La_yout"
 msgstr "_Aparência"
 
-#: ../src/mainwindow.c:561
+#: ../src/mainwindow.c:563
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: ../src/mainwindow.c:563
+#: ../src/mainwindow.c:565
 msgid "_Attract by subject"
 msgstr "_Atrair pelo assunto"
 
-#: ../src/mainwindow.c:565
+#: ../src/mainwindow.c:567
 msgid "E_xpand all threads"
 msgstr "E_xpandir todas as discussões"
 
-#: ../src/mainwindow.c:566
+#: ../src/mainwindow.c:568
 msgid "Co_llapse all threads"
 msgstr "Recolher _todas as discussões"
 
 #. View menu
-#: ../src/mainwindow.c:568 ../src/messageview.c:232
+#: ../src/mainwindow.c:570 ../src/messageview.c:232
 msgid "_Go to"
 msgstr "_Ir para"
 
-#: ../src/mainwindow.c:569 ../src/messageview.c:233
+#: ../src/mainwindow.c:571 ../src/messageview.c:233
 msgid "_Previous message"
 msgstr "Mensagem _anterior"
 
-#: ../src/mainwindow.c:570 ../src/messageview.c:234
+#: ../src/mainwindow.c:572 ../src/messageview.c:234
 msgid "_Next message"
 msgstr "_Próxima mensagem"
 
-#: ../src/mainwindow.c:572 ../src/messageview.c:236
+#: ../src/mainwindow.c:574 ../src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "Mensagem não _lida anterior"
 
-#: ../src/mainwindow.c:573 ../src/messageview.c:237
+#: ../src/mainwindow.c:575 ../src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Próxima mensagem _não lida"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:575 ../src/messageview.c:239
+#: ../src/mainwindow.c:577 ../src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "_Mensagem nova anterior"
 
-#: ../src/mainwindow.c:576 ../src/messageview.c:240
+#: ../src/mainwindow.c:578 ../src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Próxima m_ensagem nova"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:578 ../src/messageview.c:242
+#: ../src/mainwindow.c:580 ../src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Mensagem ma_rcada anterior"
 
-#: ../src/mainwindow.c:579 ../src/messageview.c:243
+#: ../src/mainwindow.c:581 ../src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Próxima mensa_gem marcada"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:581 ../src/messageview.c:245
+#: ../src/mainwindow.c:583 ../src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Mensagem rot_ulada anterior"
 
-#: ../src/mainwindow.c:582 ../src/messageview.c:246
+#: ../src/mainwindow.c:584 ../src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Próxima mensagem ro_tulada"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:584 ../src/messageview.c:248
+#: ../src/mainwindow.c:586 ../src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Mensagem aberta anterior"
 
-#: ../src/mainwindow.c:585 ../src/messageview.c:249
+#: ../src/mainwindow.c:587 ../src/messageview.c:249
 msgid "Next opened message"
 msgstr "Próxima mensagem aberta"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:587 ../src/messageview.c:251
+#: ../src/mainwindow.c:589 ../src/messageview.c:251
 msgid "Parent message"
 msgstr "Mensagem pai"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:589 ../src/messageview.c:253
+#: ../src/mainwindow.c:591 ../src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Próxima pa_sta não lida"
 
-#: ../src/mainwindow.c:590 ../src/messageview.c:254
+#: ../src/mainwindow.c:592 ../src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Outra pasta..."
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:592 ../src/messageview.c:256 ../src/mimeview.c:201
+#: ../src/mainwindow.c:594 ../src/messageview.c:256 ../src/mimeview.c:201
 msgid "Next part"
 msgstr "Próxima parte"
 
-#: ../src/mainwindow.c:593 ../src/messageview.c:257 ../src/mimeview.c:202
+#: ../src/mainwindow.c:595 ../src/messageview.c:257 ../src/mimeview.c:202
 msgid "Previous part"
 msgstr "Parte anterior"
 
 #. {"View/Scroll/---",                  NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:596 ../src/messageview.c:258
+#: ../src/mainwindow.c:598 ../src/messageview.c:258
 msgid "Message scroll"
 msgstr "Rolagem da mensagem"
 
-#: ../src/mainwindow.c:597 ../src/messageview.c:259
+#: ../src/mainwindow.c:599 ../src/messageview.c:259
 msgid "Previous line"
 msgstr "Linha anterior"
 
-#: ../src/mainwindow.c:598 ../src/messageview.c:260
+#: ../src/mainwindow.c:600 ../src/messageview.c:260
 msgid "Next line"
 msgstr "Próxima linha"
 
-#: ../src/mainwindow.c:599 ../src/messageview.c:261 ../src/printing.c:481
+#: ../src/mainwindow.c:601 ../src/messageview.c:261 ../src/printing.c:481
 msgid "Previous page"
 msgstr "Página anterior"
 
-#: ../src/mainwindow.c:600 ../src/messageview.c:262 ../src/printing.c:488
+#: ../src/mainwindow.c:602 ../src/messageview.c:262 ../src/printing.c:488
 msgid "Next page"
 msgstr "Próxima página"
 
-#: ../src/mainwindow.c:618 ../src/messageview.c:280
+#: ../src/mainwindow.c:620 ../src/messageview.c:280
 msgid "Decode"
 msgstr "_Decodificação"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:625
+#: ../src/mainwindow.c:627
 msgid "Open in new _window"
 msgstr "Abrir em uma nova _janela"
 
-#: ../src/mainwindow.c:626 ../src/messageview.c:287
+#: ../src/mainwindow.c:628 ../src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Código-_fonte da mensagem"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:628 ../src/messageview.c:288
+#: ../src/mainwindow.c:630 ../src/messageview.c:288
 msgid "Message part"
 msgstr "Parte da mensagem"
 
-#: ../src/mainwindow.c:629 ../src/messageview.c:289
+#: ../src/mainwindow.c:631 ../src/messageview.c:289
 msgid "View as text"
 msgstr "Visualizar como texto"
 
-#: ../src/mainwindow.c:630 ../src/messageview.c:290 ../src/toolbar.c:403
+#: ../src/mainwindow.c:632 ../src/messageview.c:290 ../src/toolbar.c:403
 msgid "Open"
 msgstr "Abrir"
 
-#: ../src/mainwindow.c:632 ../src/messageview.c:292
+#: ../src/mainwindow.c:634 ../src/messageview.c:292
 msgid "Open with..."
 msgstr "Abrir com..."
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:636 ../src/messageview.c:295
+#: ../src/mainwindow.c:638 ../src/messageview.c:295
 msgid "Quotes"
 msgstr "Ci_tações"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:638
+#: ../src/mainwindow.c:640
 msgid "_Update summary"
 msgstr "At_ualizar sumário"
 
 #. Message menu
-#: ../src/mainwindow.c:641
+#: ../src/mainwindow.c:643
 msgid "Recei_ve"
 msgstr "_Receber"
 
-#: ../src/mainwindow.c:642
+#: ../src/mainwindow.c:644
 msgid "Get from _current account"
 msgstr "Receber da conta _atual"
 
-#: ../src/mainwindow.c:643
+#: ../src/mainwindow.c:645
 msgid "Get from _all accounts"
 msgstr "Receber de _todas as contas"
 
-#: ../src/mainwindow.c:644
+#: ../src/mainwindow.c:646
 msgid "Cancel receivin_g"
 msgstr "_Cancelar a recepção"
 
-#: ../src/mainwindow.c:647
+#: ../src/mainwindow.c:649
 msgid "_Send queued messages"
 msgstr "_Enviar mensagens da Fila de Saída"
 
-#: ../src/mainwindow.c:652
+#: ../src/mainwindow.c:654
 msgid "Compose a_n email message"
 msgstr "Escrever uma mensa_gem de e-mail"
 
-#: ../src/mainwindow.c:653
+#: ../src/mainwindow.c:655
 msgid "Compose a news message"
 msgstr "Escrever artigo de _Newsgroup"
 
-#: ../src/mainwindow.c:655 ../src/messageview.c:301
+#: ../src/mainwindow.c:657 ../src/messageview.c:301
 #: ../src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Responder"
 
 #. COMPOSE_REPLY
-#: ../src/mainwindow.c:656 ../src/messageview.c:302 ../src/summaryview.c:426
+#: ../src/mainwindow.c:658 ../src/messageview.c:302 ../src/summaryview.c:426
 msgid "Repl_y to"
 msgstr "Responder _para"
 
 #. COMPOSE_REPLY_TO_SENDER
-#: ../src/mainwindow.c:659 ../src/messageview.c:305
+#: ../src/mainwindow.c:661 ../src/messageview.c:305
 msgid "Mailing _list"
 msgstr "_Lista de discussão"
 
 #. COMPOSE_REPLY_TO_LIST
-#: ../src/mainwindow.c:660
+#: ../src/mainwindow.c:662
 msgid "Follow-up and reply to"
 msgstr "_Acompanhar o assunto e responder"
 
@@ -7499,177 +7679,177 @@ msgstr "_Acompanhar o assunto e responder"
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REPLY_TO_LIST
 #. {"Message/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:663 ../src/messageview.c:308 ../src/toolbar.c:2069
+#: ../src/mainwindow.c:665 ../src/messageview.c:308 ../src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Encaminhar"
 
 #. COMPOSE_FORWARD_INLINE
-#: ../src/mainwindow.c:664 ../src/messageview.c:309 ../src/toolbar.c:2070
+#: ../src/mainwindow.c:666 ../src/messageview.c:309 ../src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "Encaminhar como _anexo"
 
 #. COMPOSE_FORWARD_AS_ATTACH
-#: ../src/mainwindow.c:665 ../src/messageview.c:310 ../src/toolbar.c:2071
+#: ../src/mainwindow.c:667 ../src/messageview.c:310 ../src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Re_direcionar"
 
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:667
+#: ../src/mainwindow.c:669
 msgid "Mailing-_List"
 msgstr "_Lista de discussão"
 
-#: ../src/mainwindow.c:668
+#: ../src/mainwindow.c:670
 msgid "Post"
 msgstr "Enviar _mensagem"
 
-#: ../src/mainwindow.c:670
+#: ../src/mainwindow.c:672
 msgid "Help"
 msgstr "_Ajuda"
 
-#: ../src/mainwindow.c:674
+#: ../src/mainwindow.c:676
 msgid "Unsubscribe"
 msgstr "Cancelar assinatura"
 
-#: ../src/mainwindow.c:676
+#: ../src/mainwindow.c:678
 msgid "View archive"
 msgstr "_Ver arquivo"
 
-#: ../src/mainwindow.c:678
+#: ../src/mainwindow.c:680
 msgid "Contact owner"
 msgstr "_Contatar o administrador"
 
 #. separation
-#: ../src/mainwindow.c:682
+#: ../src/mainwindow.c:684
 msgid "M_ove..."
 msgstr "M_over..."
 
-#: ../src/mainwindow.c:683
+#: ../src/mainwindow.c:685
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../src/mainwindow.c:684
+#: ../src/mainwindow.c:686
 msgid "Move to _trash"
 msgstr "Mover para a _Lixeira"
 
-#: ../src/mainwindow.c:685
+#: ../src/mainwindow.c:687
 msgid "_Delete..."
 msgstr "E_xcluir..."
 
-#: ../src/mainwindow.c:686
+#: ../src/mainwindow.c:688
 msgid "Cancel a news message"
 msgstr "Cancelar uma mensagem de Ne_wsgroup"
 
 #. separation
-#: ../src/mainwindow.c:689 ../src/mainwindow.c:690 ../src/summaryview.c:427
+#: ../src/mainwindow.c:691 ../src/mainwindow.c:692 ../src/summaryview.c:427
 msgid "_Mark"
 msgstr "_Marcar"
 
-#: ../src/mainwindow.c:691
+#: ../src/mainwindow.c:693
 msgid "_Unmark"
 msgstr "_Desmarcar"
 
-#: ../src/mainwindow.c:694
+#: ../src/mainwindow.c:696
 msgid "Mark as unr_ead"
 msgstr "Marcar como _não lida"
 
-#: ../src/mainwindow.c:695
+#: ../src/mainwindow.c:697
 msgid "Mark as rea_d"
 msgstr "Marcar como _lida"
 
 #. separation
-#: ../src/mainwindow.c:697
+#: ../src/mainwindow.c:699
 msgid "Mark all read"
 msgstr "Marcar _todas como lidas"
 
 #. separation
-#: ../src/mainwindow.c:699 ../src/prefs_filtering_action.c:199
+#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:199
 #: ../src/toolbar.c:208 ../src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Ignorar discussão"
 
-#: ../src/mainwindow.c:700
+#: ../src/mainwindow.c:702
 msgid "Unignore thread"
 msgstr "Deixar de ignorar discussão"
 
-#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:200
+#: ../src/mainwindow.c:703 ../src/prefs_filtering_action.c:200
 #: ../src/toolbar.c:209 ../src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Observar discussão"
 
-#: ../src/mainwindow.c:702
+#: ../src/mainwindow.c:704
 msgid "Unwatch thread"
 msgstr "Deixar de observar discussão"
 
 #. separation
-#: ../src/mainwindow.c:705
+#: ../src/mainwindow.c:707
 msgid "Mark as _spam"
 msgstr "Marcar como _spam"
 
-#: ../src/mainwindow.c:706
+#: ../src/mainwindow.c:708
 msgid "Mark as _ham"
 msgstr "Marcar como _não-spam"
 
 #. separation
-#: ../src/mainwindow.c:709 ../src/prefs_filtering_action.c:181
+#: ../src/mainwindow.c:711 ../src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Bloquear"
 
-#: ../src/mainwindow.c:710 ../src/prefs_filtering_action.c:182
+#: ../src/mainwindow.c:712 ../src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: ../src/mainwindow.c:712 ../src/summaryview.c:428
+#: ../src/mainwindow.c:714 ../src/summaryview.c:428
 msgid "Color la_bel"
 msgstr "Ró_tulo colorido"
 
-#: ../src/mainwindow.c:713 ../src/summaryview.c:429
+#: ../src/mainwindow.c:715 ../src/summaryview.c:429
 msgid "Ta_gs"
 msgstr "E_tiquetas"
 
 #. {"Message/---",			NULL, "---" },
-#: ../src/mainwindow.c:716
+#: ../src/mainwindow.c:718
 msgid "Re-_edit"
 msgstr "Reedi_tar"
 
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:719 ../src/messageview.c:311 ../src/mimeview.c:1027
+#: ../src/mainwindow.c:721 ../src/messageview.c:311 ../src/mimeview.c:1027
 msgid "Check signature"
 msgstr "Verificar assinatura"
 
-#: ../src/mainwindow.c:724 ../src/messageview.c:315
+#: ../src/mainwindow.c:726 ../src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "Adicionar remetente ao Li_vro de Endereços"
 
-#: ../src/mainwindow.c:726
+#: ../src/mainwindow.c:728
 msgid "C_ollect addresses"
 msgstr "_Coletar endereços"
 
-#: ../src/mainwindow.c:727
+#: ../src/mainwindow.c:729
 msgid "From current _folder..."
 msgstr "Da _pasta atual..."
 
-#: ../src/mainwindow.c:728
+#: ../src/mainwindow.c:730
 msgid "From selected _messages..."
 msgstr "Das _mensagens selecionadas..."
 
-#: ../src/mainwindow.c:731
+#: ../src/mainwindow.c:733
 msgid "_Filter all messages in folder"
 msgstr "Filtrar _todas as mensagens da pasta"
 
-#: ../src/mainwindow.c:732
+#: ../src/mainwindow.c:734
 msgid "Filter _selected messages"
 msgstr "Filtrar as mensagens _selecionadas"
 
-#: ../src/mainwindow.c:733
+#: ../src/mainwindow.c:735
 msgid "Run folder pr_ocessing rules"
 msgstr "E_xecutar regras de processamento da pasta"
 
-#: ../src/mainwindow.c:735 ../src/messageview.c:318
+#: ../src/mainwindow.c:737 ../src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "Criar regra de _filtragem"
 
-#: ../src/mainwindow.c:736 ../src/mainwindow.c:742 ../src/messageview.c:319
+#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/messageview.c:319
 #: ../src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automaticamente"
@@ -7677,7 +7857,7 @@ msgstr "_Automaticamente"
 #. FILTER_BY_AUTO
 #. radio SORT_BY_THREAD_DATE
 #. FILTER_BY_AUTO
-#: ../src/mainwindow.c:737 ../src/mainwindow.c:743 ../src/mainwindow.c:845
+#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/mainwindow.c:848
 #: ../src/messageview.c:320 ../src/messageview.c:326
 msgid "By _From"
 msgstr "Pelo _remetente (De:)"
@@ -7685,386 +7865,391 @@ msgstr "Pelo _remetente (De:)"
 #. FILTER_BY_FROM
 #. radio SORT_BY_FROM
 #. FILTER_BY_FROM
-#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/mainwindow.c:846
+#: ../src/mainwindow.c:740 ../src/mainwindow.c:746 ../src/mainwindow.c:849
 #: ../src/messageview.c:321 ../src/messageview.c:327
 msgid "By _To"
 msgstr "Pelo _destinatário (Para:)"
 
 #. FILTER_BY_TO
-#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/messageview.c:322
+#: ../src/mainwindow.c:741 ../src/mainwindow.c:747 ../src/messageview.c:322
 #: ../src/messageview.c:328
 msgid "By _Subject"
 msgstr "Pelo a_ssunto"
 
 #. FILTER_BY_SUBJECT
-#: ../src/mainwindow.c:741 ../src/messageview.c:324 ../src/summaryview.c:432
+#: ../src/mainwindow.c:743 ../src/messageview.c:324 ../src/summaryview.c:432
 msgid "Create processing rule"
 msgstr "Criar re_gra de processamento"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:748 ../src/messageview.c:332
+#: ../src/mainwindow.c:750 ../src/messageview.c:332
 msgid "List _URLs..."
 msgstr "Listar _URLs..."
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:755
+#: ../src/mainwindow.c:757
 msgid "Ch_eck for new messages in all folders"
 msgstr "Procurar por _novas mensagens em todas as pastas"
 
-#: ../src/mainwindow.c:756
+#: ../src/mainwindow.c:758
 msgid "Delete du_plicated messages"
 msgstr "Excluir mensagens _duplicadas"
 
-#: ../src/mainwindow.c:757
+#: ../src/mainwindow.c:759
 msgid "In selected folder"
 msgstr "Na pasta _selecionada"
 
-#: ../src/mainwindow.c:758
+#: ../src/mainwindow.c:760
 msgid "In all folders"
 msgstr "Em _todas as pastas"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:761
+#: ../src/mainwindow.c:763
 msgid "E_xecute"
 msgstr "_Executar"
 
-#: ../src/mainwindow.c:762
+#: ../src/mainwindow.c:764
 msgid "Exp_unge"
 msgstr "Exp_urgar"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:765
+#: ../src/mainwindow.c:767
 msgid "SSL cer_tificates"
 msgstr "Cert_ificados SSL"
 
-#: ../src/mainwindow.c:769
+#: ../src/mainwindow.c:771
 msgid "Filtering Lo_g"
 msgstr "Relatório de _filtragem"
 
-#: ../src/mainwindow.c:771
+#: ../src/mainwindow.c:773
 msgid "Network _Log"
 msgstr "Relatório da _rede"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:773
+#: ../src/mainwindow.c:775
 msgid "_Forget all session passwords"
 msgstr "Es_quecer todas as senhas da sessão"
 
 #. Configuration menu
-#: ../src/mainwindow.c:776
+#: ../src/mainwindow.c:778
 msgid "C_hange current account"
 msgstr "M_udar conta atual"
 
-#: ../src/mainwindow.c:778
+#: ../src/mainwindow.c:780
 msgid "_Preferences for current account..."
 msgstr "Preferências da _conta atual..."
 
-#: ../src/mainwindow.c:779
+#: ../src/mainwindow.c:781
 msgid "Create _new account..."
 msgstr "Criar uma _nova conta..."
 
-#: ../src/mainwindow.c:780
+#: ../src/mainwindow.c:782
 msgid "_Edit accounts..."
 msgstr "_Editar contas..."
 
-#: ../src/mainwindow.c:783
+#: ../src/mainwindow.c:785
 msgid "P_references..."
 msgstr "_Preferências..."
 
-#: ../src/mainwindow.c:784
+#: ../src/mainwindow.c:786
 msgid "Pre-pr_ocessing..."
 msgstr "P_ré-processamento..."
 
-#: ../src/mainwindow.c:785
+#: ../src/mainwindow.c:787
 msgid "Post-pro_cessing..."
 msgstr "Pó_s-processamento..."
 
-#: ../src/mainwindow.c:786
+#: ../src/mainwindow.c:788
 msgid "_Filtering..."
 msgstr "_Filtragem..."
 
-#: ../src/mainwindow.c:787
+#: ../src/mainwindow.c:789
 msgid "_Templates..."
 msgstr "_Modelos..."
 
-#: ../src/mainwindow.c:788
+#: ../src/mainwindow.c:790
 msgid "_Actions..."
 msgstr "_Ações..."
 
-#: ../src/mainwindow.c:789
+#: ../src/mainwindow.c:791
 msgid "Tag_s..."
 msgstr "E_tiquetas..."
 
 #. {"Configuration/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:791
+#: ../src/mainwindow.c:793
 msgid "Plu_gins..."
 msgstr "_Plugins..."
 
 #. Help menu
-#: ../src/mainwindow.c:794
+#: ../src/mainwindow.c:796
 msgid "_Manual"
 msgstr "_Manual"
 
-#: ../src/mainwindow.c:795
+#: ../src/mainwindow.c:797
 msgid "_Online User-contributed FAQ"
 msgstr "_FAQ na Internet (contribuição dos usuários)"
 
-#: ../src/mainwindow.c:796
+#: ../src/mainwindow.c:798
 msgid "Icon _Legend"
 msgstr "_Legendas dos ícones"
 
-#: ../src/mainwindow.c:798
+#: ../src/mainwindow.c:800
 msgid "Set as default client"
 msgstr "Definir como o cliente padrão"
 
-#: ../src/mainwindow.c:805
+#: ../src/mainwindow.c:807
 msgid "Offline _mode"
 msgstr "Modo _desconectado"
 
 #. toggle
-#: ../src/mainwindow.c:806
+#: ../src/mainwindow.c:808
+msgid "Men_ubar"
+msgstr "Barra de men_u"
+
+#. toggle
+#: ../src/mainwindow.c:809
 msgid "_Message view"
 msgstr "Visualização da _mensagem"
 
-#: ../src/mainwindow.c:808
+#: ../src/mainwindow.c:811
 msgid "Status _bar"
 msgstr "Barra de _status"
 
-#: ../src/mainwindow.c:810
+#: ../src/mainwindow.c:813
 msgid "Column headers"
 msgstr "_Cabeçalhos das colunas"
 
 #. toggle
-#: ../src/mainwindow.c:811
+#: ../src/mainwindow.c:814
 msgid "Th_read view"
 msgstr "A_grupar por assunto"
 
 #. toggle
-#: ../src/mainwindow.c:812
+#: ../src/mainwindow.c:815
 msgid "Hide read threads"
 msgstr "Ocultar discussões lidas"
 
 #. toggle
-#: ../src/mainwindow.c:813
+#: ../src/mainwindow.c:816
 msgid "_Hide read messages"
 msgstr "Ocultar mensagens _lidas"
 
 #. toggle
-#: ../src/mainwindow.c:814
+#: ../src/mainwindow.c:817
 msgid "Hide deleted messages"
 msgstr "Ocultar as mensagens excluídas"
 
 #. toggle
-#: ../src/mainwindow.c:815
+#: ../src/mainwindow.c:818
 msgid "_Fullscreen"
 msgstr "_Tela inteira"
 
 #. toggle
-#: ../src/mainwindow.c:816 ../src/messageview.c:344
+#: ../src/mainwindow.c:819 ../src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Mostrar todos os cabeçal_hos"
 
 #. toggle
-#: ../src/mainwindow.c:817 ../src/messageview.c:345
+#: ../src/mainwindow.c:820 ../src/messageview.c:345
 msgid "_Collapse all"
 msgstr "Recolher _tudo"
 
 #. 1 toggle
-#: ../src/mainwindow.c:818 ../src/messageview.c:346
+#: ../src/mainwindow.c:821 ../src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Recolher a partir do nível _2"
 
 #. 2 toggle
-#: ../src/mainwindow.c:819 ../src/messageview.c:347
+#: ../src/mainwindow.c:822 ../src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Recolher a partir do nível _3"
 
 #. toggle_toolbar_cb
-#: ../src/mainwindow.c:823
+#: ../src/mainwindow.c:826
 msgid "Text _below icons"
 msgstr "Texto _abaixo do ícones"
 
 #. radio TOOLBAR_BOTH
-#: ../src/mainwindow.c:824
+#: ../src/mainwindow.c:827
 msgid "Text be_side icons"
 msgstr "Texto ao _lado do ícones"
 
 #. radio TOOLBAR_BOTH_HORIZ
-#: ../src/mainwindow.c:825
+#: ../src/mainwindow.c:828
 msgid "_Icons only"
 msgstr "Somente í_cones"
 
 #. radio TOOLBAR_ICON
-#: ../src/mainwindow.c:826
+#: ../src/mainwindow.c:829
 msgid "_Text only"
 msgstr "Somente _texto"
 
 #. set_layout_cb
-#: ../src/mainwindow.c:833
+#: ../src/mainwindow.c:836
 msgid "_Standard"
 msgstr "_Padrão"
 
 #. radio NORMAL_LAYOUT
-#: ../src/mainwindow.c:834
+#: ../src/mainwindow.c:837
 msgid "_Three columns"
 msgstr "_Três colunas"
 
 #. radio VERTICAL_LAYOUT
-#: ../src/mainwindow.c:835
+#: ../src/mainwindow.c:838
 msgid "_Wide message"
 msgstr "Ampliar a área de _mensagens"
 
 #. radio WIDE_LAYOUT
-#: ../src/mainwindow.c:836
+#: ../src/mainwindow.c:839
 msgid "W_ide message list"
 msgstr "Amplicar a _lista de mensagens"
 
 #. radio WIDE_MSGLIST_LAYOUT
-#: ../src/mainwindow.c:837
+#: ../src/mainwindow.c:840
 msgid "S_mall screen"
 msgstr "_Tela pequena"
 
 #. sort_summary_cb
-#: ../src/mainwindow.c:841
+#: ../src/mainwindow.c:844
 msgid "By _number"
 msgstr "Pelo _número"
 
 #. radio SORT_BY_NUMBER
-#: ../src/mainwindow.c:842
+#: ../src/mainwindow.c:845
 msgid "By s_ize"
 msgstr "Pelo _tamanho"
 
 #. radio SORT_BY_SIZE
-#: ../src/mainwindow.c:843
+#: ../src/mainwindow.c:846
 msgid "By _date"
 msgstr "Pela _data"
 
 #. radio SORT_BY_DATE
-#: ../src/mainwindow.c:844
+#: ../src/mainwindow.c:847
 msgid "By thread date"
 msgstr "Pela data da disc_ussão"
 
 #. radio SORT_BY_TO
-#: ../src/mainwindow.c:847
+#: ../src/mainwindow.c:850
 msgid "By s_ubject"
 msgstr "Pelo a_ssunto"
 
 #. radio SORT_BY_SUBJECT
-#: ../src/mainwindow.c:848
+#: ../src/mainwindow.c:851
 msgid "By _color label"
 msgstr "Pela _cor do rótulo"
 
 #. radio SORT_BY_LABEL
-#: ../src/mainwindow.c:849
+#: ../src/mainwindow.c:852
 msgid "By tag"
 msgstr "Pela etiqueta"
 
 #. radio SORT_BY_TAGS
-#: ../src/mainwindow.c:850
+#: ../src/mainwindow.c:853
 msgid "By _mark"
 msgstr "Pela _marca"
 
 #. radio SORT_BY_MARK
-#: ../src/mainwindow.c:851
+#: ../src/mainwindow.c:854
 msgid "By _status"
 msgstr "Pelo s_tatus"
 
 #. radio SORT_BY_STATUS
-#: ../src/mainwindow.c:852
+#: ../src/mainwindow.c:855
 msgid "By a_ttachment"
 msgstr "Pelo ane_xo"
 
 #. radio SORT_BY_MIME
-#: ../src/mainwindow.c:853
+#: ../src/mainwindow.c:856
 msgid "By score"
 msgstr "Pela _pontuação"
 
 #. radio SORT_BY_SCORE
-#: ../src/mainwindow.c:854
+#: ../src/mainwindow.c:857
 msgid "By locked"
 msgstr "Pelo tra_vamento"
 
 #. radio SORT_BY_LOCKED
-#: ../src/mainwindow.c:855
+#: ../src/mainwindow.c:858
 msgid "D_on't sort"
 msgstr "Não _ordenar"
 
 #. sort_summary_type_cb
-#: ../src/mainwindow.c:859
+#: ../src/mainwindow.c:862
 msgid "Ascending"
 msgstr "_Crescente"
 
 #. radio SORT_ASCENDING
-#: ../src/mainwindow.c:860
+#: ../src/mainwindow.c:863
 msgid "Descending"
 msgstr "_Decrescente"
 
-#: ../src/mainwindow.c:901 ../src/messageview.c:388
+#: ../src/mainwindow.c:904 ../src/messageview.c:388
 msgid "_Auto detect"
 msgstr "_Autodetectar"
 
-#: ../src/mainwindow.c:1298 ../src/summaryview.c:6236
+#: ../src/mainwindow.c:1301 ../src/summaryview.c:6236
 msgid "Apply tags..."
 msgstr "Aplicar etiquetas..."
 
-#: ../src/mainwindow.c:1936
+#: ../src/mainwindow.c:1943
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Ocorreram alguns erros. Clique aqui para ver o relatório."
 
-#: ../src/mainwindow.c:1951
+#: ../src/mainwindow.c:1958
 msgid "You are online. Click the icon to go offline"
 msgstr "Você está conectado. Clique no ícone para desconectar."
 
-#: ../src/mainwindow.c:1954
+#: ../src/mainwindow.c:1961
 msgid "You are offline. Click the icon to go online"
 msgstr "Você está desconectado. Clique no ícone para conectar."
 
-#: ../src/mainwindow.c:1968
+#: ../src/mainwindow.c:1975
 msgid "Select account"
 msgstr "Selecione a conta"
 
 #. init log instances data before creating log views
 #. Protocol log
-#: ../src/mainwindow.c:1995 ../src/prefs_logging.c:140
+#: ../src/mainwindow.c:2002 ../src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Relatório da rede"
 
-#: ../src/mainwindow.c:1999
+#: ../src/mainwindow.c:2006
 msgid "Filtering/Processing debug log"
 msgstr "Relatório de depuração da filtragem/processamento"
 
-#: ../src/mainwindow.c:2018 ../src/prefs_logging.c:392
+#: ../src/mainwindow.c:2025 ../src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "relatório de filtragem habilitado\n"
 
-#: ../src/mainwindow.c:2020 ../src/prefs_logging.c:394
+#: ../src/mainwindow.c:2027 ../src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "relatório de filtragem desabilitado\n"
 
-#: ../src/mainwindow.c:2460 ../src/mainwindow.c:2467 ../src/mainwindow.c:2510
-#: ../src/mainwindow.c:2543 ../src/mainwindow.c:2575 ../src/mainwindow.c:2620
+#: ../src/mainwindow.c:2470 ../src/mainwindow.c:2477 ../src/mainwindow.c:2520
+#: ../src/mainwindow.c:2553 ../src/mainwindow.c:2585 ../src/mainwindow.c:2630
 #: ../src/plugins/notification/notification_trayicon.c:360
-#: ../src/prefs_folder_item.c:1065
+#: ../src/plugins/rssyl/opml_import.c:73 ../src/prefs_folder_item.c:1065
 msgid "Untitled"
 msgstr "Sem título"
 
-#: ../src/mainwindow.c:2621 ../src/prefs_summary_open.c:114
+#: ../src/mainwindow.c:2631 ../src/prefs_summary_open.c:114
 msgid "none"
 msgstr "nenhuma"
 
-#: ../src/mainwindow.c:2878 ../src/mainwindow.c:2882
+#: ../src/mainwindow.c:2888 ../src/mainwindow.c:2892
 msgid "Delete all messages in trash folders?"
 msgstr "Excluir todas as mensagens da Lixeira?"
 
-#: ../src/mainwindow.c:2879
+#: ../src/mainwindow.c:2889
 msgid "Don't quit"
 msgstr "Não sair"
 
-#: ../src/mainwindow.c:2908 ../src/plugins/mailmbox/plugin_gtk.c:189
+#: ../src/mainwindow.c:2918 ../src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Adicionar caixa postal"
 
-#: ../src/mainwindow.c:2909
+#: ../src/mainwindow.c:2919
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -8074,18 +8259,18 @@ msgstr ""
 "Se for especificada uma já existente, ela será\n"
 "verificada automaticamente."
 
-#: ../src/mainwindow.c:2915 ../src/plugins/mailmbox/plugin_gtk.c:196
-#: ../src/plugins/rssyl/rssyl_gtk.c:158
+#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:196
+#: ../src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "A caixa postal '%s' já existe."
 
-#: ../src/mainwindow.c:2920 ../src/plugins/mailmbox/plugin_gtk.c:202
+#: ../src/mainwindow.c:2930 ../src/plugins/mailmbox/plugin_gtk.c:202
 #: ../src/setup.c:52 ../src/wizard.c:741
 msgid "Mailbox"
 msgstr "Caixa postal"
 
-#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:209
+#: ../src/mainwindow.c:2935 ../src/plugins/mailmbox/plugin_gtk.c:209
 #: ../src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
@@ -8096,137 +8281,137 @@ msgstr ""
 "Talvez já existam arquivos, ou você não possui permissão para escrita nesta "
 "pasta."
 
-#: ../src/mainwindow.c:3377
+#: ../src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "Não é permitido o envio de mensagens"
 
-#: ../src/mainwindow.c:3955
+#: ../src/mainwindow.c:3965
 msgid "Mbox import has failed."
 msgstr "Não foi possível importar o mbox."
 
-#: ../src/mainwindow.c:3964 ../src/mainwindow.c:3973
+#: ../src/mainwindow.c:3974 ../src/mainwindow.c:3983
 msgid "Export to mbox has failed."
 msgstr "Não foi possível exportar para o mbox."
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit"
 msgstr "Sair"
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit Claws Mail?"
 msgstr "Sair do Claws Mail?"
 
-#: ../src/mainwindow.c:4205
+#: ../src/mainwindow.c:4215
 msgid "Folder synchronisation"
 msgstr "Sincronização das pastas"
 
-#: ../src/mainwindow.c:4206
+#: ../src/mainwindow.c:4216
 msgid "Do you want to synchronise your folders now?"
 msgstr "Deseja sincronizar suas pastas agora?"
 
-#: ../src/mainwindow.c:4207
+#: ../src/mainwindow.c:4217
 msgid "+_Synchronise"
 msgstr "+_Sincronizar"
 
-#: ../src/mainwindow.c:4636
+#: ../src/mainwindow.c:4659
 msgid "Deleting duplicated messages..."
 msgstr "Excluindo mensagens duplicadas..."
 
-#: ../src/mainwindow.c:4673
+#: ../src/mainwindow.c:4696
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Foi excluída %d mensagem duplicada em %d pastas.\n"
 msgstr[1] "Foram excluídas %d mensagens duplicadas em %d pastas.\n"
 
-#: ../src/mainwindow.c:4928 ../src/summaryview.c:5725
+#: ../src/mainwindow.c:4951 ../src/summaryview.c:5725
 msgid "Processing rules to apply before folder rules"
 msgstr "Regras de processamento a serem aplicadas antes das regras das pastas"
 
-#: ../src/mainwindow.c:4936
+#: ../src/mainwindow.c:4959
 msgid "Processing rules to apply after folder rules"
 msgstr "Regras de processamento a serem aplicadas após as regras das pastas"
 
-#: ../src/mainwindow.c:4944 ../src/summaryview.c:5736
+#: ../src/mainwindow.c:4967 ../src/summaryview.c:5736
 msgid "Filtering configuration"
 msgstr "Configuração da filtragem"
 
-#: ../src/mainwindow.c:5059
+#: ../src/mainwindow.c:5082
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Não foi possível registrar como cliente padrão: impossível obter o caminho "
 "do executável."
 
-#: ../src/mainwindow.c:5118
+#: ../src/mainwindow.c:5141
 msgid "Claws Mail has been registered as default client."
 msgstr "O Claws Mail foi registrado como o cliente padrão."
 
-#: ../src/mainwindow.c:5120
+#: ../src/mainwindow.c:5143
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Não foi possível registrar como cliente padrão: impossível escrever no "
 "registro."
 
-#: ../src/mainwindow.c:5278
+#: ../src/mainwindow.c:5301
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "%d senha esquecida em %d contas.\n"
 msgstr[1] "%d senhas esquecidas em %d contas.\n"
 
-#: ../src/matcher.c:209 ../src/matcher.c:210 ../src/matcher.c:211
-#: ../src/matcher.c:212 ../src/matcher.c:213 ../src/matcher.c:214
-#: ../src/matcher.c:215
+#: ../src/matcher.c:211 ../src/matcher.c:212 ../src/matcher.c:213
+#: ../src/matcher.c:214 ../src/matcher.c:215 ../src/matcher.c:216
+#: ../src/matcher.c:217
 #, c-format
 msgid "%s header"
 msgstr "cabeçalho %s"
 
-#: ../src/matcher.c:216
+#: ../src/matcher.c:218
 msgid "header"
 msgstr "cabeçalho"
 
-#: ../src/matcher.c:217
+#: ../src/matcher.c:219
 msgid "header line"
 msgstr "linha do cabeçalho"
 
-#: ../src/matcher.c:218
+#: ../src/matcher.c:220
 msgid "body line"
 msgstr "linha do corpo"
 
-#: ../src/matcher.c:219
+#: ../src/matcher.c:221
 msgid "tag"
 msgstr "etiqueta"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553 ../src/message_search.c:205 ../src/prefs_matcher.c:739
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555 ../src/message_search.c:205 ../src/prefs_matcher.c:742
 #: ../src/summary_search.c:466
 msgid "Case sensitive"
 msgstr "Diferenciar maiúsc./minúsc."
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555
 msgid "Case insensitive"
 msgstr "Não diferenciar maiúsc./minúsc."
 
-#: ../src/matcher.c:1818
+#: ../src/matcher.c:1843
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "verificando se as mensagens correspondem [ %s ]\n"
 
-#: ../src/matcher.c:1887 ../src/matcher.c:1906 ../src/matcher.c:1919
+#: ../src/matcher.c:1912 ../src/matcher.c:1931 ../src/matcher.c:1944
 msgid "message matches\n"
 msgstr "a mensagem corresponde\n"
 
-#: ../src/matcher.c:1894 ../src/matcher.c:1912 ../src/matcher.c:1921
+#: ../src/matcher.c:1919 ../src/matcher.c:1937 ../src/matcher.c:1946
 msgid "message does not match\n"
 msgstr "a mensagem não corresponde\n"
 
-#: ../src/matcher.c:2184 ../src/matcher.c:2185 ../src/matcher.c:2186
-#: ../src/matcher.c:2187 ../src/matcher.c:2188 ../src/matcher.c:2189
-#: ../src/matcher.c:2190 ../src/matcher.c:2191
+#: ../src/matcher.c:2209 ../src/matcher.c:2210 ../src/matcher.c:2211
+#: ../src/matcher.c:2212 ../src/matcher.c:2213 ../src/matcher.c:2214
+#: ../src/matcher.c:2215 ../src/matcher.c:2216
 msgid "(none)"
 msgstr "(nenhuma)"
 
@@ -8254,8 +8439,8 @@ msgstr "Sobrescrever o arquivo mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "O arquivo já existe. Deseja sobrescrevê-lo?"
 
-#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1843
-#: ../src/prefs_themes.c:555 ../src/textview.c:3075
+#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1844
+#: ../src/prefs_themes.c:555 ../src/textview.c:3054
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
@@ -8350,7 +8535,7 @@ msgstr ""
 msgid "Fetching message (%s)..."
 msgstr "Buscando a mensagem (%s)..."
 
-#: ../src/messageview.c:1357 ../src/procmime.c:1004
+#: ../src/messageview.c:1357 ../src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Não foi possível descriptografar: %s"
@@ -8361,9 +8546,9 @@ msgstr ""
 "A mensagem não está de acordo com o padrão MIME. Ela pode ser renderizada "
 "incorretamente."
 
-#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1996
-#: ../src/plugins/fancy/fancy_viewer.c:667 ../src/summaryview.c:4808
-#: ../src/summaryview.c:4811 ../src/textview.c:3063
+#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1997
+#: ../src/plugins/fancy/fancy_viewer.c:669 ../src/summaryview.c:4808
+#: ../src/summaryview.c:4811 ../src/textview.c:3042
 msgid "Save as"
 msgstr "Salvar como"
 
@@ -8471,7 +8656,7 @@ msgstr ""
 "Por favor, selecione qual a conta que você deseja utilizar para enviar a "
 "confirmação de recebimento:"
 
-#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_gtk.c:494
+#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_feed_props.c:533
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -8508,20 +8693,20 @@ msgstr ""
 "  A mensagem foi excluída ou movida para outra pasta"
 
 #: ../src/messageview.c:2971 ../src/messageview.c:2977
-#: ../src/summaryview.c:4191 ../src/summaryview.c:6964
+#: ../src/summaryview.c:4193 ../src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "Ocorreu um erro durante a aprendizagem.\n"
 
-#: ../src/mh.c:432
+#: ../src/mh.c:438
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "não foi possível copiar a mensagem %s para %s\n"
 
-#: ../src/mh.c:518
+#: ../src/mh.c:524
 msgid "Moving messages..."
 msgstr "Movendo as mensagens..."
 
-#: ../src/mh.c:662 ../src/plugins/mailmbox/mailmbox_folder.c:839
+#: ../src/mh.c:668 ../src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Excluindo mensagens..."
 
@@ -8612,33 +8797,33 @@ msgstr "Verificando a assinatura..."
 msgid "Go back to email"
 msgstr "Voltar à mensagem"
 
-#: ../src/mimeview.c:1762 ../src/mimeview.c:1851 ../src/mimeview.c:2043
-#: ../src/mimeview.c:2079 ../src/mimeview.c:2191
-#: ../src/plugins/fancy/fancy_viewer.c:420
+#: ../src/mimeview.c:1763 ../src/mimeview.c:1852 ../src/mimeview.c:2044
+#: ../src/mimeview.c:2080 ../src/mimeview.c:2192
+#: ../src/plugins/fancy/fancy_viewer.c:422
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
 "Não foi possível salvar uma das partes da mensagem com múltiplas partes: %s"
 
-#: ../src/mimeview.c:1840 ../src/textview.c:3073
+#: ../src/mimeview.c:1841 ../src/textview.c:3052
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Sobrescrever o arquivo %s existente?"
 
-#: ../src/mimeview.c:1882 ../src/plugins/archive/archiver_prefs.c:128
+#: ../src/mimeview.c:1883 ../src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
 msgstr "Selecione a pasta de destino"
 
-#: ../src/mimeview.c:1889 ../src/plugins/archive/archiver_prefs.c:134
+#: ../src/mimeview.c:1890 ../src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' não é um diretório."
 
-#: ../src/mimeview.c:2126 ../src/mimeview.c:2133 ../src/textview.c:2994
+#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2973
 msgid "Open with"
 msgstr "Abrir com"
 
-#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2995
+#: ../src/mimeview.c:2128 ../src/mimeview.c:2135 ../src/textview.c:2974
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8647,11 +8832,11 @@ msgstr ""
 "Digite o comando para abrir o arquivo:\n"
 "('%s' será substituído pelo nome do arquivo)"
 
-#: ../src/mimeview.c:2225
+#: ../src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "Executar binário não confiável?"
 
-#: ../src/mimeview.c:2226
+#: ../src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8663,19 +8848,19 @@ msgstr ""
 "\n"
 "Deseja executar esse arquivo?"
 
-#: ../src/mimeview.c:2230
+#: ../src/mimeview.c:2231
 msgid "Run binary"
 msgstr "Executar o binário"
 
-#: ../src/mimeview.c:2529
+#: ../src/mimeview.c:2530
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/mimeview.c:2530 ../src/plugins/pdf_viewer/poppler_viewer.c:699
+#: ../src/mimeview.c:2531 ../src/plugins/pdf_viewer/poppler_viewer.c:699
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: ../src/mimeview.c:2544 ../src/plugins/vcalendar/vcalendar.c:1271
+#: ../src/mimeview.c:2545 ../src/plugins/vcalendar/vcalendar.c:1271
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1722
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1732
 msgid "Description:"
@@ -8806,7 +8991,7 @@ msgstr "Deseja realmente cancelar a assinatura do Newsgroup '%s'?"
 msgid "Unsubscribe newsgroup"
 msgstr "Cancelar a assinatura do Newsgroup"
 
-#: ../src/news_gtk.c:268 ../src/plugins/rssyl/rssyl_gtk.c:695
+#: ../src/news_gtk.c:268
 msgid "_Unsubscribe"
 msgstr "_Cancelar a assinatura"
 
@@ -8954,7 +9139,7 @@ msgstr "Caminho no Livro de Endereços onde os endereços serão armazenados"
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:201
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:447
 #: ../src/prefs_filtering_action.c:573 ../src/prefs_filtering_action.c:580
-#: ../src/prefs_matcher.c:676
+#: ../src/prefs_matcher.c:679
 msgid "Select..."
 msgstr "Selecione..."
 
@@ -9067,36 +9252,36 @@ msgstr "Pressione o botão Cancelar para interromper o empacotamento"
 msgid "Archiving:"
 msgstr "Empacotando:"
 
-#: ../src/plugins/archive/archiver_gtk.c:506
+#: ../src/plugins/archive/archiver_gtk.c:507
 msgid "Folder and archive must be selected"
 msgstr "A pasta e o pacote devem ser selecionados"
 
-#: ../src/plugins/archive/archiver_gtk.c:515
+#: ../src/plugins/archive/archiver_gtk.c:516
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s: já existe. Continuar mesmo assim?"
 
-#: ../src/plugins/archive/archiver_gtk.c:518
+#: ../src/plugins/archive/archiver_gtk.c:519
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: é um link. Não é possível continuar."
 
-#: ../src/plugins/archive/archiver_gtk.c:521
+#: ../src/plugins/archive/archiver_gtk.c:522
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: é um diretório. Não é possível continuar."
 
-#: ../src/plugins/archive/archiver_gtk.c:524
+#: ../src/plugins/archive/archiver_gtk.c:525
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: permissões insuficientes. Não é possível continuar."
 
-#: ../src/plugins/archive/archiver_gtk.c:527
+#: ../src/plugins/archive/archiver_gtk.c:528
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: erro desconhecido. Não é possível continuar."
 
-#: ../src/plugins/archive/archiver_gtk.c:564
+#: ../src/plugins/archive/archiver_gtk.c:565
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -9105,7 +9290,7 @@ msgstr ""
 "Não é um nome de arquivo válido:\n"
 "%s."
 
-#: ../src/plugins/archive/archiver_gtk.c:577
+#: ../src/plugins/archive/archiver_gtk.c:578
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -9114,7 +9299,7 @@ msgstr ""
 "Não é uma pasta do Claws Mail válida:\n"
 "%s."
 
-#: ../src/plugins/archive/archiver_gtk.c:606
+#: ../src/plugins/archive/archiver_gtk.c:607
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -9129,181 +9314,181 @@ msgstr ""
 "\n"
 "Continuar mesmo assim?"
 
-#: ../src/plugins/archive/archiver_gtk.c:710
+#: ../src/plugins/archive/archiver_gtk.c:711
 msgid "Archive result"
 msgstr "Resultado do pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:740
+#: ../src/plugins/archive/archiver_gtk.c:741
 msgid "Values"
 msgstr "Valores"
 
-#: ../src/plugins/archive/archiver_gtk.c:749
+#: ../src/plugins/archive/archiver_gtk.c:750
 msgid "Archive"
 msgstr "Pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:755
+#: ../src/plugins/archive/archiver_gtk.c:756
 msgid "Archive format"
 msgstr "Formato do pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:762
+#: ../src/plugins/archive/archiver_gtk.c:763
 msgid "Compression method"
 msgstr "Método de compressão"
 
-#: ../src/plugins/archive/archiver_gtk.c:770
+#: ../src/plugins/archive/archiver_gtk.c:771
 msgid "Number of files"
 msgstr "Número de arquivos"
 
-#: ../src/plugins/archive/archiver_gtk.c:778
+#: ../src/plugins/archive/archiver_gtk.c:779
 msgid "Archive Size"
 msgstr "Tamanho do pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:786
+#: ../src/plugins/archive/archiver_gtk.c:787
 msgid "Folder Size"
 msgstr "Tamanho da pasta"
 
-#: ../src/plugins/archive/archiver_gtk.c:795
+#: ../src/plugins/archive/archiver_gtk.c:796
 msgid "Compression level"
 msgstr "Nível de compressão"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:718
 #: ../src/prefs_folder_item.c:514
 msgid "Yes"
 msgstr "Sim"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:721
 #: ../src/prefs_folder_item.c:513 ../src/prefs_summaries.c:369
 msgid "No"
 msgstr "Não"
 
-#: ../src/plugins/archive/archiver_gtk.c:803
+#: ../src/plugins/archive/archiver_gtk.c:804
 msgid "MD5 checksum"
 msgstr "Checksum MD5"
 
-#: ../src/plugins/archive/archiver_gtk.c:811
+#: ../src/plugins/archive/archiver_gtk.c:812
 msgid "Descriptive names"
 msgstr "Nomes descritivos"
 
-#: ../src/plugins/archive/archiver_gtk.c:819
+#: ../src/plugins/archive/archiver_gtk.c:820
 msgid "Delete selected files"
 msgstr "Excluir arquivos selecionados"
 
-#: ../src/plugins/archive/archiver_gtk.c:828
-#: ../src/plugins/archive/archiver_gtk.c:1210
+#: ../src/plugins/archive/archiver_gtk.c:829
+#: ../src/plugins/archive/archiver_gtk.c:1211
 msgid "Select mails before"
 msgstr "Selecione as mensagens antes"
 
-#: ../src/plugins/archive/archiver_gtk.c:904
+#: ../src/plugins/archive/archiver_gtk.c:905
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Selecione o nome de arquivo para o pacote [o sufixo deve indicar o tipo de "
 "pacote, ex. .tgz]"
 
-#: ../src/plugins/archive/archiver_gtk.c:952
+#: ../src/plugins/archive/archiver_gtk.c:953
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld de %ld"
 
-#: ../src/plugins/archive/archiver_gtk.c:991
+#: ../src/plugins/archive/archiver_gtk.c:992
 msgid "Create Archive"
 msgstr "Criar pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:1006
+#: ../src/plugins/archive/archiver_gtk.c:1007
 msgid "Enter Archiver arguments"
 msgstr "Digite os argumentos para o empacotador"
 
-#: ../src/plugins/archive/archiver_gtk.c:1019
+#: ../src/plugins/archive/archiver_gtk.c:1020
 msgid "Folder to archive"
 msgstr "Pasta para o pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:1026
+#: ../src/plugins/archive/archiver_gtk.c:1027
 msgid "Folder which is the root of the archive"
 msgstr "Pasta onde está a raiz do pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:1031
+#: ../src/plugins/archive/archiver_gtk.c:1032
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr "Clique nesse botão para selecionar a pasta que será a raiz do pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:1037
+#: ../src/plugins/archive/archiver_gtk.c:1038
 msgid "Name for archive"
 msgstr "Nome para o pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:1043
+#: ../src/plugins/archive/archiver_gtk.c:1044
 msgid "Archive location and name"
 msgstr "Localização e nome do pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:1045
+#: ../src/plugins/archive/archiver_gtk.c:1046
 #: ../src/plugins/archive/archiver_prefs.c:198
 #: ../src/plugins/pgpcore/select-keys.c:422
 msgid "_Select"
 msgstr "_Selecionar"
 
-#: ../src/plugins/archive/archiver_gtk.c:1048
+#: ../src/plugins/archive/archiver_gtk.c:1049
 msgid "Click this button to select a name and location for the archive"
 msgstr "Clique nesse botão para selecionar o nome a localização para o pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:1050
+#: ../src/plugins/archive/archiver_gtk.c:1051
 msgid "Choose compression"
 msgstr "Escolha a compressão"
 
-#: ../src/plugins/archive/archiver_gtk.c:1063
+#: ../src/plugins/archive/archiver_gtk.c:1064
 msgid "Choose this option to use ZIP compression for the archive"
 msgstr "Selecione essa opção para usar a compressão ZIP no pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:1070
+#: ../src/plugins/archive/archiver_gtk.c:1071
 msgid "Choose this option to use BZIP2 compression for the archive"
 msgstr "Selecione essa opção para usar a compressão BZIP2 no pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:1078
+#: ../src/plugins/archive/archiver_gtk.c:1079
 msgid "Choose this to use Compress compression for your archive"
 msgstr "Selecione essa opção para usar a compressão Compress no pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:1086
+#: ../src/plugins/archive/archiver_gtk.c:1087
 msgid "Choose this option to disable compression for the archive"
 msgstr "Selecione essa opção para desabilitar a compressão do pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:1108
+#: ../src/plugins/archive/archiver_gtk.c:1109
 msgid "Choose format"
 msgstr "Escolha o formato"
 
-#: ../src/plugins/archive/archiver_gtk.c:1121
+#: ../src/plugins/archive/archiver_gtk.c:1122
 msgid "Choose this option to use TAR as format for the archive"
 msgstr "Selecione essa opção para usar o TAR como formato do pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:1128
+#: ../src/plugins/archive/archiver_gtk.c:1129
 msgid "Choose this to use SHAR as format for the archive"
 msgstr "Selecione essa opção para usar o SHAR como formato do pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:1135
+#: ../src/plugins/archive/archiver_gtk.c:1136
 msgid "Choose this option to use CPIO as format for the archive"
 msgstr "Selecione essa opção para usar o CPIO como formato do pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:1142
+#: ../src/plugins/archive/archiver_gtk.c:1143
 msgid "Choose this option to use PAX as format for the archive"
 msgstr "Selecione essa opção para usar o PAX como formato do pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:1162
+#: ../src/plugins/archive/archiver_gtk.c:1163
 msgid "Miscellaneous options"
 msgstr "Outras opções"
 
-#: ../src/plugins/archive/archiver_gtk.c:1171
+#: ../src/plugins/archive/archiver_gtk.c:1172
 msgid "_Recursive"
 msgstr "_Recursivo"
 
-#: ../src/plugins/archive/archiver_gtk.c:1175
+#: ../src/plugins/archive/archiver_gtk.c:1176
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Selecione essa opção para incluir as subpastas no pacote"
 
-#: ../src/plugins/archive/archiver_gtk.c:1177
+#: ../src/plugins/archive/archiver_gtk.c:1178
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: ../src/plugins/archive/archiver_gtk.c:1181
+#: ../src/plugins/archive/archiver_gtk.c:1182
 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"
@@ -9313,11 +9498,11 @@ msgstr ""
 "pacote. Saiba, entretanto, que isso aumentará significativamente o\n"
 "tempo de criação do pacote."
 
-#: ../src/plugins/archive/archiver_gtk.c:1185
+#: ../src/plugins/archive/archiver_gtk.c:1186
 msgid "R_ename"
 msgstr "R_enomear"
 
-#: ../src/plugins/archive/archiver_gtk.c:1189
+#: ../src/plugins/archive/archiver_gtk.c:1190
 #: ../src/plugins/archive/archiver_prefs.c:333
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9328,7 +9513,7 @@ msgstr ""
 "pacote. O esquema de nome é: data_de at para@assunto.\n"
 "Os nomes serão truncados no limite de 96 caracteres."
 
-#: ../src/plugins/archive/archiver_gtk.c:1197
+#: ../src/plugins/archive/archiver_gtk.c:1198
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9336,11 +9521,11 @@ msgstr ""
 "Selecione essa opção para excluir as mensagens após o empacotamento.\n"
 "Apenas para IMAP4, caixa postal local e POP3."
 
-#: ../src/plugins/archive/archiver_gtk.c:1201
+#: ../src/plugins/archive/archiver_gtk.c:1202
 msgid "Selection options"
 msgstr "Opções de seleção"
 
-#: ../src/plugins/archive/archiver_gtk.c:1217
+#: ../src/plugins/archive/archiver_gtk.c:1218
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9429,24 +9614,94 @@ msgstr "Renomear"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Selecione essa opção para excluir as mensagens após o empacotamento"
 
-#: ../src/plugins/attachwarner/attachwarner.c:216
-#, c-format
-msgid ""
-"An attachment is mentioned in the mail you're sending, but no file was "
-"attached. Mention appears on line %d, which begins with text: <span weight="
-"\"bold\">%.20s</span>...\n"
-"\n"
-"%s it anyway?"
-msgstr ""
-"Um anexo foi mencionado na mensagem que você está enviando, mas nenhum "
-"arquivo foi anexado. A menção aparece na linha %d, que começa com o texto: "
-"<span weight=\"bold\">%.20s</span>...\n"
-"\n"
-"%s mesmo assim?"
+#: ../src/plugins/att_remover/att_remover.c:299
+msgid "<b>Type: </b>"
+msgstr "<b>Tipo: </b>"
 
-#: ../src/plugins/attachwarner/attachwarner.c:220
-msgid "Attachment warning"
-msgstr "Alerta de anexo"
+#: ../src/plugins/att_remover/att_remover.c:300
+msgid "<b>Size: </b>"
+msgstr "<b>Tamanho: </b>"
+
+#: ../src/plugins/att_remover/att_remover.c:301
+msgid "<b>Filename: </b>"
+msgstr "<b>Nome do arquivo: </b>"
+
+#: ../src/plugins/att_remover/att_remover.c:332
+msgid "Remove attachments"
+msgstr "Remover anexos"
+
+#: ../src/plugins/att_remover/att_remover.c:357
+#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
+msgid "Remove"
+msgstr "Remover"
+
+#. S_COL_STATUS
+#: ../src/plugins/att_remover/att_remover.c:365
+#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
+msgid "Attachment"
+msgstr "Anexos"
+
+#: ../src/plugins/att_remover/att_remover.c:417
+msgid "Destroy attachments"
+msgstr "Destruir anexos"
+
+#: ../src/plugins/att_remover/att_remover.c:418
+msgid ""
+"Do you really want to remove all attachments from the selected messages?\n"
+"\n"
+"The deleted data will be unrecoverable."
+msgstr ""
+"Deseja realmente remover todos os anexos das mensagens selecionadas?\n"
+"\n"
+"Os dados excluídos não poderão ser recuperados."
+
+#: ../src/plugins/att_remover/att_remover.c:479
+msgid "This message doesn't have any attachments."
+msgstr "Essa mensagem não tem nenhum anexo."
+
+#: ../src/plugins/att_remover/att_remover.c:494
+msgid "Remove attachments..."
+msgstr "Remover anexos..."
+
+#: ../src/plugins/att_remover/att_remover.c:506
+#: ../src/plugins/att_remover/att_remover.c:566
+msgid "AttRemover"
+msgstr "AttRemover"
+
+#: ../src/plugins/att_remover/att_remover.c:571
+msgid ""
+"This plugin removes attachments from mails.\n"
+"\n"
+"Warning: this operation will be completely un-cancellable and the deleted "
+"attachments will be lost forever, and ever, and ever."
+msgstr ""
+"Esse plugin remove anexos das mensagens.\n"
+"\n"
+"Atenção: esta operação não pode ser cancelada e os anexos excluídos estarão "
+"perdidos pra sempre (e pra sempre é realmente muito tempo)."
+
+#: ../src/plugins/att_remover/att_remover.c:595
+msgid "Attachment handling"
+msgstr "Gerenciamento de anexos"
+
+#: ../src/plugins/attachwarner/attachwarner.c:216
+#, c-format
+msgid ""
+"An attachment is mentioned in the mail you're sending, but no file was "
+"attached. Mention appears on line %d, which begins with text: <span weight="
+"\"bold\">%.20s</span>...\n"
+"\n"
+"%s it anyway?"
+msgstr ""
+"Um anexo foi mencionado na mensagem que você está enviando, mas nenhum "
+"arquivo foi anexado. A menção aparece na linha %d, que começa com o texto: "
+"<span weight=\"bold\">%.20s</span>...\n"
+"\n"
+"%s mesmo assim?"
+
+#: ../src/plugins/attachwarner/attachwarner.c:220
+msgid "Attachment warning"
+msgstr "Alerta de anexo"
 
 #: ../src/plugins/attachwarner/attachwarner.c:245
 #: ../src/plugins/attachwarner/attachwarner.c:282
@@ -9531,76 +9786,6 @@ msgstr "Excluir"
 msgid "Attach Warner"
 msgstr "Alerta de anexo"
 
-#: ../src/plugins/att_remover/att_remover.c:299
-msgid "<b>Type: </b>"
-msgstr "<b>Tipo: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:300
-msgid "<b>Size: </b>"
-msgstr "<b>Tamanho: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:301
-msgid "<b>Filename: </b>"
-msgstr "<b>Nome do arquivo: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:332
-msgid "Remove attachments"
-msgstr "Remover anexos"
-
-#: ../src/plugins/att_remover/att_remover.c:357
-#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
-msgid "Remove"
-msgstr "Remover"
-
-#. S_COL_STATUS
-#: ../src/plugins/att_remover/att_remover.c:365
-#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
-msgid "Attachment"
-msgstr "Anexos"
-
-#: ../src/plugins/att_remover/att_remover.c:417
-msgid "Destroy attachments"
-msgstr "Destruir anexos"
-
-#: ../src/plugins/att_remover/att_remover.c:418
-msgid ""
-"Do you really want to remove all attachments from the selected messages?\n"
-"\n"
-"The deleted data will be unrecoverable."
-msgstr ""
-"Deseja realmente remover todos os anexos das mensagens selecionadas?\n"
-"\n"
-"Os dados excluídos não poderão ser recuperados."
-
-#: ../src/plugins/att_remover/att_remover.c:479
-msgid "This message doesn't have any attachments."
-msgstr "Essa mensagem não tem nenhum anexo."
-
-#: ../src/plugins/att_remover/att_remover.c:494
-msgid "Remove attachments..."
-msgstr "Remover anexos..."
-
-#: ../src/plugins/att_remover/att_remover.c:506
-#: ../src/plugins/att_remover/att_remover.c:566
-msgid "AttRemover"
-msgstr "AttRemover"
-
-#: ../src/plugins/att_remover/att_remover.c:571
-msgid ""
-"This plugin removes attachments from mails.\n"
-"\n"
-"Warning: this operation will be completely un-cancellable and the deleted "
-"attachments will be lost forever, and ever, and ever."
-msgstr ""
-"Esse plugin remove anexos das mensagens.\n"
-"\n"
-"Atenção: esta operação não pode ser cancelada e os anexos excluídos estarão "
-"perdidos pra sempre (e pra sempre é realmente muito tempo)."
-
-#: ../src/plugins/att_remover/att_remover.c:595
-msgid "Attachment handling"
-msgstr "Gerenciamento de anexos"
-
 #: ../src/plugins/bogofilter/bogofilter.c:81
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:458
 msgid "Bogofilter"
@@ -10200,63 +10385,63 @@ msgstr ""
 "\n"
 "Ele definitivamente não é muito útil."
 
-#: ../src/plugins/fancy/fancy_prefs.c:141
+#: ../src/plugins/fancy/fancy_prefs.c:146
 msgid "Display images"
 msgstr "Exibir imagens"
 
-#: ../src/plugins/fancy/fancy_prefs.c:142
+#: ../src/plugins/fancy/fancy_prefs.c:147
 msgid "Display embedded images"
 msgstr "Exibir Imagens incorporadas"
 
-#: ../src/plugins/fancy/fancy_prefs.c:146
+#: ../src/plugins/fancy/fancy_prefs.c:151
 msgid "Execute javascript"
 msgstr "Executar Javascript"
 
-#: ../src/plugins/fancy/fancy_prefs.c:147
+#: ../src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute embedded javascript"
 msgstr "Executar Javascript incorporado"
 
-#: ../src/plugins/fancy/fancy_prefs.c:151
+#: ../src/plugins/fancy/fancy_prefs.c:156
 msgid "Execute Java applets"
 msgstr "Executar applets Java"
 
-#: ../src/plugins/fancy/fancy_prefs.c:152
+#: ../src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute embedded Java applets"
 msgstr "Executar applets Java incorporados"
 
-#: ../src/plugins/fancy/fancy_prefs.c:156
+#: ../src/plugins/fancy/fancy_prefs.c:161
 msgid "Render objects using plugins"
 msgstr "Renderizar objetos usando plugins"
 
-#: ../src/plugins/fancy/fancy_prefs.c:157
+#: ../src/plugins/fancy/fancy_prefs.c:162
 msgid "Render embedded objects using plugins"
 msgstr "Renderizar objetos incorporados usando plugins"
 
-#: ../src/plugins/fancy/fancy_prefs.c:164
+#: ../src/plugins/fancy/fancy_prefs.c:169
 msgid "Open in viewer (remote content is enabled)"
 msgstr "Abrir no visualizador (o conteúdo remoto está habilitado)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:167
+#: ../src/plugins/fancy/fancy_prefs.c:172
 msgid "Do nothing (remote content is disabled)"
 msgstr "Não fazer nada (o conteúdo remoto está desabilitado)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:200
+#: ../src/plugins/fancy/fancy_prefs.c:209
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/plugins/fancy/fancy_prefs.c:202
+#: ../src/plugins/fancy/fancy_prefs.c:211
 msgid "Use GNOME's proxy settings"
 msgstr "Usar as configurações de proxy do GNOME"
 
-#: ../src/plugins/fancy/fancy_prefs.c:210
+#: ../src/plugins/fancy/fancy_prefs.c:219
 msgid "Use proxy:"
 msgstr "Usar proxy:"
 
-#: ../src/plugins/fancy/fancy_prefs.c:228
+#: ../src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
 msgstr "Recursos remotos"
 
-#: ../src/plugins/fancy/fancy_prefs.c:229
+#: ../src/plugins/fancy/fancy_prefs.c:238
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10269,106 +10454,124 @@ msgstr ""
 "à rede. A renderização de imagens, scripts, objetos de plugin ou applets\n"
 "Java ainda podem estar habilitados para os conteúdos anexados ao e-mail."
 
-#: ../src/plugins/fancy/fancy_prefs.c:235
+#: ../src/plugins/fancy/fancy_prefs.c:244
 msgid "Enable loading of remote content"
 msgstr "Habilitar a carga de conteúdo remoto"
 
-#: ../src/plugins/fancy/fancy_prefs.c:267
+#: ../src/plugins/fancy/fancy_prefs.c:276
 msgid "When clicking on a link, by default:"
 msgstr "Ao clicar em um link, por padrão:"
 
-#: ../src/plugins/fancy/fancy_prefs.c:275
+#: ../src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
 msgstr "Abra em um navegador externo"
 
-#: ../src/plugins/fancy/fancy_viewer.c:391
+#: ../src/plugins/fancy/fancy_prefs.c:298
+msgid "The CSS in this file will be applied to all HTML parts"
+msgstr "O CSS desse arquivo será aplicado em todas as partes HTML"
+
+#: ../src/plugins/fancy/fancy_prefs.c:300
+msgid "Stylesheet:"
+msgstr "Folha de Estilos:"
+
+#: ../src/plugins/fancy/fancy_prefs.c:308 ../src/prefs_account.c:1442
+#: ../src/prefs_account.c:1531 ../src/prefs_account.c:1991
+#: ../src/prefs_customheader.c:237
+msgid "Bro_wse"
+msgstr "E_xplorar"
+
+#: ../src/plugins/fancy/fancy_prefs.c:350
+msgid "Select stylesheet"
+msgstr "Selecione a folha de estilos"
+
+#: ../src/plugins/fancy/fancy_viewer.c:393
 msgid "Remote content loading is disabled."
 msgstr "A recuperação de conteúdo remoto está desabilitada."
 
-#: ../src/plugins/fancy/fancy_viewer.c:468
+#: ../src/plugins/fancy/fancy_viewer.c:470
 msgid "Load images"
 msgstr "Carregar imagens"
 
-#: ../src/plugins/fancy/fancy_viewer.c:470
+#: ../src/plugins/fancy/fancy_viewer.c:472
 msgid "Enable remote content"
 msgstr "Habilitar conteúdo remoto"
 
-#: ../src/plugins/fancy/fancy_viewer.c:472
+#: ../src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable Javascript"
 msgstr "Habilitar Javascript"
 
-#: ../src/plugins/fancy/fancy_viewer.c:474
+#: ../src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Plugins"
 msgstr "Habilitar plugins"
 
-#: ../src/plugins/fancy/fancy_viewer.c:476
+#: ../src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Java"
 msgstr "Habilitar Java"
 
-#: ../src/plugins/fancy/fancy_viewer.c:478
+#: ../src/plugins/fancy/fancy_viewer.c:480
 msgid "Open links with external browser"
 msgstr "Abrir os links com um navegador externo"
 
-#: ../src/plugins/fancy/fancy_viewer.c:647
+#: ../src/plugins/fancy/fancy_viewer.c:649
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ocorreu um erro: %d\n"
 
-#: ../src/plugins/fancy/fancy_viewer.c:703
+#: ../src/plugins/fancy/fancy_viewer.c:705
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s é uma fonte malformada ou não suportada"
 
-#: ../src/plugins/fancy/fancy_viewer.c:714
+#: ../src/plugins/fancy/fancy_viewer.c:716
 msgid "Search the Web"
 msgstr "Pesquisar a Web"
 
-#: ../src/plugins/fancy/fancy_viewer.c:726
+#: ../src/plugins/fancy/fancy_viewer.c:728
 msgid "Open in Viewer"
 msgstr "Abrir no visualizador"
 
-#: ../src/plugins/fancy/fancy_viewer.c:728
+#: ../src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer (enable remote content)"
 msgstr "Abrir no visualizador (habilitar conteúdo remoto)"
 
-#: ../src/plugins/fancy/fancy_viewer.c:737
+#: ../src/plugins/fancy/fancy_viewer.c:739
 msgid "Open in Browser"
 msgstr "Abrir no navegador"
 
-#: ../src/plugins/fancy/fancy_viewer.c:747
+#: ../src/plugins/fancy/fancy_viewer.c:749
 msgid "Open Image"
 msgstr "Abrir a imagem"
 
-#: ../src/plugins/fancy/fancy_viewer.c:756
+#: ../src/plugins/fancy/fancy_viewer.c:758
 msgid "Copy Link"
 msgstr "Copiar o link"
 
-#: ../src/plugins/fancy/fancy_viewer.c:760
+#: ../src/plugins/fancy/fancy_viewer.c:762
 msgid "Download Link"
 msgstr "Baixar o link"
 
-#: ../src/plugins/fancy/fancy_viewer.c:771
+#: ../src/plugins/fancy/fancy_viewer.c:773
 msgid "Save Image As"
 msgstr "Salvar imagem como"
 
-#: ../src/plugins/fancy/fancy_viewer.c:781
+#: ../src/plugins/fancy/fancy_viewer.c:783
 msgid "Copy Image"
 msgstr "Copiar a imagem"
 
-#: ../src/plugins/fancy/fancy_viewer.c:799
+#: ../src/plugins/fancy/fancy_viewer.c:801
 msgid "Import feed"
 msgstr "Importar a fonte"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1012
+#: ../src/plugins/fancy/fancy_viewer.c:1014
 msgid "Fancy"
 msgstr "Fancy"
 
 #. i18n: 'Fancy' here is name of the plugin, not the english word.
-#: ../src/plugins/fancy/fancy_viewer.c:1040
+#: ../src/plugins/fancy/fancy_viewer.c:1042
 msgid "Fancy HTML Viewer"
 msgstr "Visualizador HTML Fancy"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1045
+#: ../src/plugins/fancy/fancy_viewer.c:1047
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10577,1026 +10780,999 @@ msgstr "Integração com GData"
 #: ../src/plugins/geolocation/geolocation_plugin.c:349
 #, c-format
 msgid "Found location: (%.2f,%.2f)"
-msgstr ""
+msgstr "Localização encontrada: (%.2f,%.2f)"
 
 #. TRANSLATORS: The country name is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:369
 msgid "Alleged country of origin: "
-msgstr ""
+msgstr "País de origem alegado: "
 
 #. TRANSLATORS: The IP address is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:373
-#, fuzzy
 msgid "Could not resolve location of IP address "
-msgstr "Não foi possível ler o índice dos endereços"
+msgstr "Não foi possível resolver a localização do endereço IP "
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:512
-#, fuzzy
 msgid "Try to locate sender"
-msgstr "primeiro nome do remetente"
+msgstr "Tente localizar o remetente"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:528
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:529
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Emirados Árabes Unidos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:530
 msgid "Afghanistan"
-msgstr ""
+msgstr "Afeganistão"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:531
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "Antígua e Barbuda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:532
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguila"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:533
 msgid "Albania"
-msgstr ""
+msgstr "Albânia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:534
 msgid "Armenia"
-msgstr ""
+msgstr "Armênia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:535
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Antilhas Holandesas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:536
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:537
 msgid "Antarctica"
-msgstr ""
+msgstr "Antártida"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:538
-#, fuzzy
 msgid "Argentina"
-msgstr "Magenta"
+msgstr "Argentina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:539
 msgid "American Samoa"
-msgstr ""
+msgstr "Samoa Americana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:540
 msgid "Austria"
-msgstr ""
+msgstr "Áustria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:541
 msgid "Australia"
-msgstr ""
+msgstr "Austrália"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:542
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:543
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbaijão"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:544
 msgid "Bosnia And Herzegovina"
-msgstr ""
+msgstr "Bósnia e Herzegovina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:545
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:546
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladesh"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:547
 msgid "Belgium"
-msgstr ""
+msgstr "Bélgica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:548
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:549
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgária"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:550
 msgid "Bahrain"
-msgstr ""
+msgstr "Barém"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:551
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:552
 msgid "Benin"
-msgstr ""
+msgstr "Benim"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:553
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermuda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:554
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei Darussalam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:555
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolívia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:556
 msgid "Brazil"
-msgstr ""
+msgstr "Brasil"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:557
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahamas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:558
 msgid "Bhutan"
-msgstr ""
+msgstr "Butão"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:559
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Ilha Bouvet"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:560
 msgid "Botswana"
-msgstr ""
+msgstr "Botsuana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:561
 msgid "Belarus"
-msgstr ""
+msgstr "Bielorússia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:562
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:563
 msgid "Canada"
-msgstr ""
+msgstr "Canadá"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:564
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Ilhas Cocos (Keeling)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:565
 msgid "Central African Republic"
-msgstr ""
+msgstr "República Centro-Africana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:566
 msgid "Congo"
-msgstr ""
+msgstr "Congo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:567
 msgid "Switzerland"
-msgstr ""
+msgstr "Suíça"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:568
 msgid "Cote D'Ivoire"
-msgstr ""
+msgstr "Costa do Marfim"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:569
 msgid "Cook Islands"
-msgstr ""
+msgstr "Ilhas Cook"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:570
 msgid "Chile"
-msgstr ""
+msgstr "Chile"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:571
 msgid "Cameroon"
-msgstr ""
+msgstr "Camarões"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:572
-#, fuzzy
 msgid "China"
-msgstr "Chinês"
+msgstr "China"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:573
-#, fuzzy
 msgid "Colombia"
-msgstr "Colorir"
+msgstr "Colômbia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:574
 msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:575
 msgid "Cuba"
-msgstr ""
+msgstr "Cuba"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:576
 msgid "Cape Verde"
-msgstr ""
+msgstr "Cabo Verde"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:577
 msgid "Christmas Island"
-msgstr ""
+msgstr "Ilha Christmas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:578
 msgid "Cyprus"
-msgstr ""
+msgstr "Chipre"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:579
 msgid "Czech Republic"
-msgstr ""
+msgstr "República Tcheca"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:580
 msgid "Germany"
-msgstr ""
+msgstr "Alemanha"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:581
 msgid "Djibouti"
-msgstr ""
+msgstr "Djibuti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:582
-#, fuzzy
 msgid "Denmark"
-msgstr "Desmarcar"
+msgstr "Dinamarca"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:583
 msgid "Dominica"
-msgstr ""
+msgstr "Dominica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:584
 msgid "Dominican Republic"
-msgstr ""
+msgstr "República Dominicana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:585
 msgid "Algeria"
-msgstr ""
+msgstr "Argélia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:586
 msgid "Ecuador"
-msgstr ""
+msgstr "Equador"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:587
 msgid "Estonia"
-msgstr ""
+msgstr "Estônia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:588
 msgid "Egypt"
-msgstr ""
+msgstr "Egito"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:589
-#, fuzzy
 msgid "Western Sahara"
-msgstr "Europeu Ocidental"
+msgstr "Sahara Ocidental"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:590
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritreia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:591
 msgid "Spain"
-msgstr ""
+msgstr "Espanha"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:592
 msgid "Ethiopia"
-msgstr ""
+msgstr "Etiópia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:593
 msgid "Finland"
-msgstr ""
+msgstr "Finlândia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:594
 msgid "Fiji"
-msgstr ""
+msgstr "Fiji"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:595
 msgid "Falkland Islands (Malvinas)"
-msgstr ""
+msgstr "Ilhas Falkland (Malvinas)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:596
 msgid "Micronesia, Federated States Of"
-msgstr ""
+msgstr "Micronésia, Estados Federados da"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:597
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Ilhas Faroé"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:598
-#, fuzzy
 msgid "France"
-msgstr "Cancelar"
+msgstr "França"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:599
 msgid "France, Metropolitan"
-msgstr ""
+msgstr "França, Metropolitana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:600
 msgid "Gabon"
-msgstr ""
+msgstr "Gabão"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:601
 #: ../src/plugins/geolocation/geolocation_plugin.c:747
 msgid "United Kingdom"
-msgstr ""
+msgstr "Reino Unido"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:602
 msgid "Grenada"
-msgstr ""
+msgstr "Granada"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:603
 msgid "Georgia"
-msgstr ""
+msgstr "Geórgia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:604
 msgid "French Guiana"
-msgstr ""
+msgstr "Guiana Francesa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:605
 msgid "Ghana"
-msgstr ""
+msgstr "Gana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:606
-#, fuzzy
 msgid "Gibraltar"
-msgstr "Libravatar"
+msgstr "Gibraltar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:607
-#, fuzzy
 msgid "Greenland"
-msgstr "Verde"
+msgstr "Groelândia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:608
 msgid "Gambia"
-msgstr ""
+msgstr "Gâmbia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:609
 msgid "Guinea"
-msgstr ""
+msgstr "Guiné"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:610
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Guadalupe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:611
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Guiné Equatorial"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:612
-#, fuzzy
 msgid "Greece"
-msgstr "Verde"
+msgstr "Grécia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:613
 msgid "South Georgia And The South Sandwich Islands"
-msgstr ""
+msgstr "Ilhas Geórgia do Sul e Sandwich do Sul"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:614
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:615
 msgid "Guam"
-msgstr ""
+msgstr "Guam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:616
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Guiné-Bissau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:617
 msgid "Guyana"
-msgstr ""
+msgstr "Guiana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:618
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:619
 msgid "Heard Island And Mcdonald Islands"
-msgstr ""
+msgstr "Ilha Heard e Ilhas McDonald"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:620
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:621
 msgid "Croatia"
-msgstr ""
+msgstr "Croácia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:622
 msgid "Haiti"
-msgstr ""
+msgstr "Haiti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:623
 msgid "Hungary"
-msgstr ""
+msgstr "Hungria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:624
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonésia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:625
 msgid "Ireland"
-msgstr ""
+msgstr "Irlanda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:626
 msgid "Israel"
-msgstr ""
+msgstr "Israel"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:627
-#, fuzzy
 msgid "India"
-msgstr "Indicador"
+msgstr "Índia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:628
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Território Britânico do Oceano Índico"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:629
 msgid "Iraq"
-msgstr ""
+msgstr "Iraque"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:630
 msgid "Iran, Islamic Republic Of"
-msgstr ""
+msgstr "Irã, República Islâmica do"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:631
 msgid "Iceland"
-msgstr ""
+msgstr "Islândia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:632
 msgid "Italy"
-msgstr ""
+msgstr "Itália"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:633
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamaica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:634
 msgid "Jordan"
-msgstr ""
+msgstr "Jordânia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:635
-#, fuzzy
 msgid "Japan"
-msgstr "Japonês"
+msgstr "Japão"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:636
 msgid "Kenya"
-msgstr ""
+msgstr "Quênia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:637
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Quirguistão"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:638
 msgid "Cambodia"
-msgstr ""
+msgstr "Camboja"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:639
 msgid "Kiribati"
-msgstr ""
+msgstr "Quiribati"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:640
-#, fuzzy
 msgid "Comoros"
-msgstr "amanhã"
+msgstr "Comores"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:641
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "São Cristóvão e Nevis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:642
 msgid "Korea, Democratic People'S Republic Of"
-msgstr ""
+msgstr "Coreia, República Popular Democrática da"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:643
 msgid "Korea, Republic Of"
-msgstr ""
+msgstr "Coreia, República da"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:644
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuwait"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:645
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Ilhas Caimã"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:646
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Cazaquistão"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:647
 msgid "Lao People'S Democratic Republic"
-msgstr ""
+msgstr "República Democrática Popular do Laos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:648
 msgid "Lebanon"
-msgstr ""
+msgstr "Líbano"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:649
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Santa Lúcia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:650
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:651
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:652
 msgid "Liberia"
-msgstr ""
+msgstr "Libéria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:653
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesoto"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:654
 msgid "Lithuania"
-msgstr ""
+msgstr "Lituânia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:655
 msgid "Luxembourg"
-msgstr ""
+msgstr "Luxemburgo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:656
 msgid "Latvia"
-msgstr ""
+msgstr "Letônia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:657
 msgid "Libyan Arab Jamahiriya"
-msgstr ""
+msgstr "Líbia Jamahiriya Árabe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:658
 msgid "Morocco"
-msgstr ""
+msgstr "Marrocos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:659
 msgid "Monaco"
-msgstr ""
+msgstr "Mônaco"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:660
 msgid "Moldova, Republic Of"
-msgstr ""
+msgstr "Moldávia, República da"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:661
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagascar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:662
-#, fuzzy
 msgid "Marshall Islands"
-msgstr "Marcar todas como lidas"
+msgstr "Ilhas Marshall"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:663
 msgid "Macedonia, The Former Yugoslav Republic Of"
-msgstr ""
+msgstr "Macedônia, Antiga República Iugoslava da"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:664
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:665
-#, fuzzy
 msgid "Myanmar"
-msgstr "Desmarcar"
+msgstr "Birmânia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:666
 msgid "Mongolia"
-msgstr ""
+msgstr "Mongólia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:667
 msgid "Macao"
-msgstr ""
+msgstr "Macau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:668
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Ilhas Marianas do Norte"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:669
 msgid "Martinique"
-msgstr ""
+msgstr "Martinica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:670
 msgid "Mauritania"
-msgstr ""
+msgstr "Mauritânia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:671
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:672
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:673
 msgid "Mauritius"
-msgstr ""
+msgstr "Maurício"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:674
 msgid "Maldives"
-msgstr ""
+msgstr "Maldivas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:675
 msgid "Malawi"
-msgstr ""
+msgstr "Malaui"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:676
 msgid "Mexico"
-msgstr ""
+msgstr "México"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:677
 msgid "Malaysia"
-msgstr ""
+msgstr "Malásia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:678
 msgid "Mozambique"
-msgstr ""
+msgstr "Moçambique"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:679
 msgid "Namibia"
-msgstr ""
+msgstr "Namíbia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:680
-#, fuzzy
 msgid "New Caledonia"
-msgstr "Novos contatos"
+msgstr "Nova Caledônia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:681
 msgid "Niger"
-msgstr ""
+msgstr "Níger"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:682
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Ilha Norfolk"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:683
 msgid "Nigeria"
-msgstr ""
+msgstr "Nigéria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:684
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicarágua"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:685
 msgid "Netherlands"
-msgstr ""
+msgstr "Países Baixos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:686
-#, fuzzy
 msgid "Norway"
-msgstr "Encaminhar"
+msgstr "Noruega"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:687
 msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:688
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:689
 msgid "Niue"
-msgstr ""
+msgstr "Niue"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:690
 msgid "New Zealand"
-msgstr ""
+msgstr "Nova Zelândia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:691
 msgid "Oman"
-msgstr ""
+msgstr "Omã"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:692
 msgid "Panama"
-msgstr ""
+msgstr "Panamá"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:693
 msgid "Peru"
-msgstr ""
+msgstr "Peru"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:694
 msgid "French Polynesia"
-msgstr ""
+msgstr "Polinésia Francesa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:695
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua Nova Guiné"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:696
-#, fuzzy
 msgid "Philippines"
-msgstr "linhas"
+msgstr "Filipinas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:697
 msgid "Pakistan"
-msgstr ""
+msgstr "Paquistão"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:698
 msgid "Poland"
-msgstr ""
+msgstr "Polônia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:699
 msgid "Saint Pierre And Miquelon"
-msgstr ""
+msgstr "São Pedro e Miquelão"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:700
 msgid "Pitcairn"
-msgstr ""
+msgstr "Picárnia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:701
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Porto Rico"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:702
-#, fuzzy
 msgid "Portugal"
-msgstr "Porta"
+msgstr "Portugal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:703
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:704
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguai"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:705
-#, fuzzy
 msgid "Qatar"
-msgstr "Wavatar"
+msgstr "Qatar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:706
 msgid "Reunion"
-msgstr ""
+msgstr "Reunião"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:707
 msgid "Romania"
-msgstr ""
+msgstr "Romênia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:708
 msgid "Russian Federation"
-msgstr ""
+msgstr "Federação Russa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:709
 msgid "Rwanda"
-msgstr ""
+msgstr "Ruanda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:710
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Arábia Saudita"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:711
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Ilhas Salomão"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:712
 msgid "Seychelles"
-msgstr ""
+msgstr "Seychelles"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:713
 msgid "Sudan"
-msgstr ""
+msgstr "Sudão"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:714
 msgid "Sweden"
-msgstr ""
+msgstr "Suécia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:715
 msgid "Singapore"
-msgstr ""
+msgstr "Singapura"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:716
 msgid "Saint Helena"
-msgstr ""
+msgstr "Santa Helena"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:717
 msgid "Slovenia"
-msgstr ""
+msgstr "Eslovênia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:718
 msgid "Svalbard And Jan Mayen"
-msgstr ""
+msgstr "Svalbard e Jan Mayen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:719
 msgid "Slovakia"
-msgstr ""
+msgstr "Eslováquia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:720
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Serra Leoa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:721
 msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:722
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:723
 msgid "Somalia"
-msgstr ""
+msgstr "Somália"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:724
-#, fuzzy
 msgid "Suriname"
-msgstr "Nome de usuário do SMTP:"
+msgstr "Suriname"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:725
 msgid "Sao Tome And Principe"
-msgstr ""
+msgstr "São Tomé e Príncipe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:726
 msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:727
 msgid "Syrian Arab Republic"
-msgstr ""
+msgstr "República Árabe da Síria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:728
 msgid "Swaziland"
-msgstr ""
+msgstr "Suazilândia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:729
 msgid "Turks And Caicos Islands"
-msgstr ""
+msgstr "Ilhas Turcas e Caicos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:730
 msgid "Chad"
-msgstr ""
+msgstr "Chade"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:731
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Território das Terras Austrais e Antártidas Francesas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:732
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:733
-#, fuzzy
 msgid "Thailand"
-msgstr "Tailandês"
+msgstr "Tailândia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:734
 msgid "Tajikistan"
-msgstr ""
+msgstr "Tadjiquistão"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:735
 msgid "Tokelau"
-msgstr ""
+msgstr "Toquelau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:736
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turcomênia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:737
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunísia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:738
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:739
 msgid "East Timor"
-msgstr ""
+msgstr "Timor Leste"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:740
 msgid "Turkey"
-msgstr ""
+msgstr "Turquia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:741
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "Trinidad e Tobago"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:742
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:743
 msgid "Taiwan, Province Of China"
-msgstr ""
+msgstr "Taiwan, Província da China"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:744
 msgid "Tanzania, United Republic Of"
-msgstr ""
+msgstr "Tanzânia, República Unida da"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:745
 msgid "Ukraine"
-msgstr ""
+msgstr "Ucrânia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:746
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:748
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "Ilhas Menores Distantes dos Estados Unidos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:749
 msgid "United States"
-msgstr ""
+msgstr "Estados Unidos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:750
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguai"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:751
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbequistão"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:752
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Santa Sé (Estado da Cidade do Vaticano)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:753
 msgid "Saint Vincent And The Grenadines"
-msgstr ""
+msgstr "São Vicente e Granadinas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:754
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:755
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "Ilhas Virgens Britânicas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:756
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "Ilhas Virgens Americanas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:757
-#, fuzzy
 msgid "Viet Nam"
-msgstr "Nome do arquivo"
+msgstr "Vietnã"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:758
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:759
 msgid "Wallis And Futuna"
-msgstr ""
+msgstr "Wallis e Futuna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:760
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:761
 msgid "Yemen"
-msgstr ""
+msgstr "Iêmen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:762
 msgid "Mayotte"
-msgstr ""
+msgstr "Maiote"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:763
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "Sérvia e Montenegro"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:764
 msgid "South Africa"
-msgstr ""
+msgstr "África do Sul"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:765
 msgid "Zambia"
-msgstr ""
+msgstr "Zâmbia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:766
 msgid "Democratic Republic Of The Congo"
-msgstr ""
+msgstr "República Democrática do Congo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:767
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbábue"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:777
 #: ../src/plugins/geolocation/geolocation_plugin.c:862
-#, fuzzy
 msgid "GeoLocation"
-msgstr "Localização:"
+msgstr "GeoLocation"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:782
-#, fuzzy, c-format
+#, c-format
 msgid "Could not initialize clutter"
-msgstr "Não foi possível iniciar o verificador %s."
+msgstr "Não foi possível iniciar o clutter"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:788
 #: ../src/plugins/geolocation/geolocation_plugin.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create regular expression: %s\n"
-msgstr "Não foi possível criar o arquivo temporário: %s"
+msgstr "Não foi possível criar a expressão regular: %s\n"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:803
-#, fuzzy
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
 msgstr ""
-"Não foi possível registrar o gancho de alteração do tema no plugin "
-"Notificação"
+"Não foi possível registrar o gancho messageview_show no plugin GeoLocation"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:867
 msgid ""
@@ -11614,38 +11790,51 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome (but only if it's not about marital "
 "quarrels)."
 msgstr ""
+"Este plugin disponibiliza a opção de geolocalização no Claws Mail.\n"
+"\n"
+"Aviso: É tecnicamente impossível descobrir a localização geográfica dos "
+"remetentes a partir de seus e-mails, com um certo grau de precisão. Os "
+"resultados apresentados aqui são apenas estimativas grosseiras. Em "
+"particular, gerenciadores de listas de discussão removem das mensagens as "
+"informações do remetente. Com isso, mensagens oriundas de listas de "
+"discussão podem estar associadas à localização da lista e não à do "
+"remetente.\n"
+"Em caso de dúvida, não confie nos resultados deste plugin (e não se baseie "
+"em sua informação para se divorciar de sua esposa).\n"
+"\n"
+"Qualquer retorno para <berndth at gmx.de> é bem-vindo (desde que não tenha a "
+"ver com disputas maritais)."
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:900
-#, fuzzy
 msgid "GeoLocation integration"
-msgstr "Integração com GData"
+msgstr "Integração com o GeoLocation"
 
-#: ../src/plugins/libravatar/libravatar.c:374
-#: ../src/plugins/libravatar/libravatar.c:445
-#: ../src/plugins/libravatar/libravatar.c:505
-#: ../src/plugins/libravatar/libravatar_prefs.c:400
+#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:452
+#: ../src/plugins/libravatar/libravatar.c:512
+#: ../src/plugins/libravatar/libravatar_prefs.c:440
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:388
 msgid "Failed to register avatar header update hook"
 msgstr ""
 "Não foi possível registrar o gancho de atualização do cabeçalho de avatar"
 
-#: ../src/plugins/libravatar/libravatar.c:389
+#: ../src/plugins/libravatar/libravatar.c:396
 msgid "Failed to register avatar image render hook"
 msgstr ""
 "Não foi possível registrar o gancho de renderização da imagem de avatar"
 
-#: ../src/plugins/libravatar/libravatar.c:394
+#: ../src/plugins/libravatar/libravatar.c:401
 msgid "Failed to create avatar image cache directory"
 msgstr "Não foi possível criar o diretório de cache da imagem de avatar"
 
-#: ../src/plugins/libravatar/libravatar.c:403
+#: ../src/plugins/libravatar/libravatar.c:410
 msgid "Failed to load missing items cache"
 msgstr "Não foi possível carregar o cache de itens faltantes"
 
-#: ../src/plugins/libravatar/libravatar.c:455
+#: ../src/plugins/libravatar/libravatar.c:462
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -11676,87 +11865,87 @@ msgstr ""
 "\n"
 "Qualquer retorno para <ricardo at mones.org> é bem-vindo.\n"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:112
+#: ../src/plugins/libravatar/libravatar_prefs.c:138
 msgid "_Use cached icons"
 msgstr "_Usar ícones do cache"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:113
+#: ../src/plugins/libravatar/libravatar_prefs.c:139
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr ""
 "Mantém os ícones no disco para reuso, ao invés de efetuar outra requisição à "
 "rede"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:121
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
 msgid "Cache refresh interval"
 msgstr "Intervalo de atualização do cache"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:123
-#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:333
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
+#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:335
 msgid "hours"
 msgstr "horas"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:188
+#: ../src/plugins/libravatar/libravatar_prefs.c:207
 msgid "Mystery man"
 msgstr "Mystery man"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:189
+#: ../src/plugins/libravatar/libravatar_prefs.c:208
 msgid "Identicon"
 msgstr "Identicon"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:190
+#: ../src/plugins/libravatar/libravatar_prefs.c:209
 msgid "MonsterID"
 msgstr "MonsterID"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:191
+#: ../src/plugins/libravatar/libravatar_prefs.c:210
 msgid "Wavatar"
 msgstr "Wavatar"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:192
+#: ../src/plugins/libravatar/libravatar_prefs.c:211
 msgid "Retro"
 msgstr "Retro"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:193
+#: ../src/plugins/libravatar/libravatar_prefs.c:212
 msgid "Custom URL"
 msgstr "URL personalizada"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:196
+#: ../src/plugins/libravatar/libravatar_prefs.c:215
 msgid "A blank image"
 msgstr "Uma imagem em branco"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:197
+#: ../src/plugins/libravatar/libravatar_prefs.c:216
 msgid "The unobtrusive low-contrast greyish silhouette"
 msgstr "A silhueta em tom de cinza de baixo contraste não obstrusiva"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:198
+#: ../src/plugins/libravatar/libravatar_prefs.c:217
 msgid "A generated geometric pattern"
 msgstr "Um padrão geométrico"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:199
+#: ../src/plugins/libravatar/libravatar_prefs.c:218
 msgid "A generated full-body monster"
 msgstr "Um monstro de corpo inteiro"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:200
+#: ../src/plugins/libravatar/libravatar_prefs.c:219
 msgid "A generated almost unique face"
 msgstr "Uma face quase única"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:201
+#: ../src/plugins/libravatar/libravatar_prefs.c:220
 msgid "A generated 8-bit arcade-style pixelated image"
 msgstr "Uma imagem pixelada ao estilo dos jogos 8-bit"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:202
+#: ../src/plugins/libravatar/libravatar_prefs.c:221
 msgid "Redirect to a user provided URL"
 msgstr "Redireciona para uma URL fornecida pelo usuário"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:229 ../src/prefs_themes.c:878
+#: ../src/plugins/libravatar/libravatar_prefs.c:248 ../src/prefs_themes.c:878
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:256
+#: ../src/plugins/libravatar/libravatar_prefs.c:276
 msgid "_Allow redirects to other sites"
 msgstr "_Permitir redirecionamento para outros sites"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:257
+#: ../src/plugins/libravatar/libravatar_prefs.c:277
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
@@ -11764,24 +11953,46 @@ msgstr ""
 "Segue indicações de redirecionamento do servidor libravatar para outros "
 "serviços como o gravatar.com"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:266
+#: ../src/plugins/libravatar/libravatar_prefs.c:286
 msgid "_Enable federated servers"
 msgstr "_Habilitar servidores federados"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:267
+#: ../src/plugins/libravatar/libravatar_prefs.c:287
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr ""
 "Tenta obter o avatar a partir do servidor libravatar do domínio do remetente"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:312
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+msgid "Request timeout"
+msgstr "Tempo da requisição esgotado"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+#: ../src/plugins/notification/notification_prefs.c:1028
+#: ../src/plugins/notification/notification_prefs.c:1300
+#: ../src/plugins/notification/notification_prefs.c:1608
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
+#: ../src/prefs_summaries.c:496
+msgid "seconds"
+msgstr "segundos"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:305
+msgid ""
+"Set to 0 to use global socket I/O timeout. Maximum value must be also less "
+"than global socket I/O timeout."
+msgstr ""
+"Defina 0 para usar o tempo limite global do socket de I/O. O valor máximo tem "
+"que "
+"ser menor que o tempo limite global do socket de I/O."
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:349
 msgid "Icon cache"
 msgstr "Cache de ícone"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:316
+#: ../src/plugins/libravatar/libravatar_prefs.c:353
 msgid "Default missing icon mode"
 msgstr "Modo de ícone faltante padrão"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:320
+#: ../src/plugins/libravatar/libravatar_prefs.c:357
 msgid "Network"
 msgstr "Rede"
 
@@ -12108,7 +12319,6 @@ msgstr "Pastas de Agenda"
 
 #. Warning-Label
 #: ../src/plugins/notification/notification_prefs.c:639
-#, fuzzy
 msgid "These settings override folder-specific selections."
 msgstr ""
 "Essas configurações têm prioridade sobre as seleções especificas das pastas."
@@ -12242,14 +12452,6 @@ msgstr "Habilitar janela de notificação"
 msgid "Popup timeout:"
 msgstr "Limite de tempo da janela de notificação:"
 
-#: ../src/plugins/notification/notification_prefs.c:1028
-#: ../src/plugins/notification/notification_prefs.c:1300
-#: ../src/plugins/notification/notification_prefs.c:1608
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
-#: ../src/prefs_summaries.c:496
-msgid "seconds"
-msgstr "segundos"
-
 #. Sticky check button
 #: ../src/plugins/notification/notification_prefs.c:1057
 msgid "Make popup sticky"
@@ -12500,7 +12702,7 @@ msgstr "de %d"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1359
 msgid "PDF rendering failed for an unknown reason."
-msgstr ""
+msgstr "A renderização para PDF falhou por um motivo desconhecido."
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1722
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1940
@@ -12596,7 +12798,7 @@ msgstr ""
 
 #: ../src/plugins/perl/perl_gtk.c:50
 msgid "Edit perl filter rules (ext)..."
-msgstr ""
+msgstr "Editar regras de filtragem Perl (ext)..."
 
 #: ../src/plugins/pgpcore/autocompletion.c:125
 msgid "Failed to register PGP address autocompletion hook"
@@ -12864,12 +13066,12 @@ msgid "Undefined"
 msgstr "Indefinido"
 
 #: ../src/plugins/pgpcore/select-keys.c:241
-#: ../src/plugins/pgpcore/sgpgme.c:146
+#: ../src/plugins/pgpcore/sgpgme.c:146 ../src/plugins/pgpcore/sgpgme.c:162
 msgid "Marginal"
 msgstr "Marginal"
 
 #: ../src/plugins/pgpcore/select-keys.c:247
-#: ../src/plugins/pgpcore/sgpgme.c:150
+#: ../src/plugins/pgpcore/sgpgme.c:150 ../src/plugins/pgpcore/sgpgme.c:166
 msgid "Ultimate"
 msgstr "Máximo"
 
@@ -12930,147 +13132,155 @@ msgstr ""
 msgid "No signature found"
 msgstr "Não foi encontrada nenhuma assinatura"
 
-#: ../src/plugins/pgpcore/sgpgme.c:184 ../src/plugins/pgpcore/sgpgme.c:203
+#: ../src/plugins/pgpcore/sgpgme.c:160
+msgid "Untrusted"
+msgstr "Não confiável"
+
+#: ../src/plugins/pgpcore/sgpgme.c:200 ../src/plugins/pgpcore/sgpgme.c:219
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Não foi possível chegar a assinatura - %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:188 ../src/plugins/pgpcore/sgpgme.c:192
-#: ../src/plugins/pgpcore/sgpgme.c:245
+#: ../src/plugins/pgpcore/sgpgme.c:204 ../src/plugins/pgpcore/sgpgme.c:208
+#: ../src/plugins/pgpcore/sgpgme.c:249
 msgid "The signature has not been checked."
 msgstr "A assinatura não foi checada."
 
-#: ../src/plugins/pgpcore/sgpgme.c:198 ../src/plugins/pgpcore/sgpgme.c:200
+#: ../src/plugins/pgpcore/sgpgme.c:214 ../src/plugins/pgpcore/sgpgme.c:216
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 "Núcleo PGP: Não foi possível obter a chave - nenhum gpg-agent em execução."
 
-#: ../src/plugins/pgpcore/sgpgme.c:215
+#: ../src/plugins/pgpcore/sgpgme.c:228
 #, c-format
 msgid "Good signature from %s."
 msgstr "A assinatura de %s é válida."
 
-#: ../src/plugins/pgpcore/sgpgme.c:222
-#, c-format
-msgid "Good signature (untrusted) from %s."
-msgstr "Assinatura válida (não confiável) de %s."
-
-#: ../src/plugins/pgpcore/sgpgme.c:227
+#: ../src/plugins/pgpcore/sgpgme.c:231
 #, c-format
 msgid "Expired signature from %s."
 msgstr "A assinatura de %s expirou."
 
-#: ../src/plugins/pgpcore/sgpgme.c:230
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:234
+#, c-format
 msgid "Good signature from %s, but the key has expired."
-msgstr "A assinatura de %s é válida."
+msgstr "A assinatura de %s é válida, mas a chave expirou."
 
-#: ../src/plugins/pgpcore/sgpgme.c:233
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:237
+#, c-format
 msgid "Good signature from %s, but the key has been revoked."
-msgstr "A assinatura de %s é válida."
+msgstr "A assinatura de %s é válida, mas a chave foi revogada."
 
-#: ../src/plugins/pgpcore/sgpgme.c:236
+#: ../src/plugins/pgpcore/sgpgme.c:240
 #, c-format
 msgid "Bad signature from %s."
 msgstr "A assinatura de %s é inválida."
 
-#: ../src/plugins/pgpcore/sgpgme.c:240
+#: ../src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "A chave 0x%s para verificar essa assinatura não está disponível."
 
-#: ../src/plugins/pgpcore/sgpgme.c:264
+#: ../src/plugins/pgpcore/sgpgme.c:268
 #, c-format
 msgid "Error checking signature: no status\n"
 msgstr "Erro durante a verificação da assinatura: sem status\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:283
+#: ../src/plugins/pgpcore/sgpgme.c:287
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Erro durante a verificação da assinatura: %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:302
+#: ../src/plugins/pgpcore/sgpgme.c:306
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Assinatura feita em %s usando %s ID da chave %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:308
+#: ../src/plugins/pgpcore/sgpgme.c:312
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Assinatura boa de \"%s\" (validade: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:313
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:317
+#, c-format
 msgid "Expired key uid \"%s\"\n"
-msgstr "A chave de %s expirou."
+msgstr "A chave uid \"%s\" expirou\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:318
+#: ../src/plugins/pgpcore/sgpgme.c:322
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Assinatura expirada de \"%s\" (validade: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:323
+#: ../src/plugins/pgpcore/sgpgme.c:327
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
-msgstr ""
+msgstr "A chave uid \"%s\" foi revogada\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:328
+#: ../src/plugins/pgpcore/sgpgme.c:332
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "A assinatura de \"%s\" é INVÁLIDA\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:339
+#: ../src/plugins/pgpcore/sgpgme.c:343
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                    uid \"%s\" (validade: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:346
+#: ../src/plugins/pgpcore/sgpgme.c:345
+msgid "Revoked"
+msgstr "Revogada"
+
+#: ../src/plugins/pgpcore/sgpgme.c:349
+#, c-format
+msgid "Owner Trust: %s\n"
+msgstr "Confiabilidade do proprietário: %s\n"
+
+#: ../src/plugins/pgpcore/sgpgme.c:352
 msgid "Primary key fingerprint:"
 msgstr "Impressão digital primária da chave:"
 
-#: ../src/plugins/pgpcore/sgpgme.c:364
+#: ../src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "AVISO: O endereço \"%s\" do signatário não equivale à entrada DNS\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:370
+#: ../src/plugins/pgpcore/sgpgme.c:376
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "O endereço verificado do signatário é \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:412
+#: ../src/plugins/pgpcore/sgpgme.c:410
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Não foi possível obter nenhum dado da mensagem, %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:428
+#: ../src/plugins/pgpcore/sgpgme.c:426
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Não foi possível inicializar os dados, %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:583
+#: ../src/plugins/pgpcore/sgpgme.c:581
 msgid "Secret key specification is ambiguous"
 msgstr "A especificação da chave secreta é ambígua"
 
-#: ../src/plugins/pgpcore/sgpgme.c:593
+#: ../src/plugins/pgpcore/sgpgme.c:591
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Chave secreta não encontrada (%s)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:606
+#: ../src/plugins/pgpcore/sgpgme.c:604
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Ocorreu um erro ao configurar a chave secreta: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:690
+#: ../src/plugins/pgpcore/sgpgme.c:688
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "O protocolo Gpgme '%s' está inutilizável: o mecanismo '%s' não foi instalado "
 "corretamente."
 
-#: ../src/plugins/pgpcore/sgpgme.c:696
+#: ../src/plugins/pgpcore/sgpgme.c:694
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -13079,12 +13289,12 @@ msgstr ""
 "O protocolo Gpgme '%s' está inutilizável: o mecanismo '%s', versão %s está "
 "instalado, mas é necessária a versão %s.\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:704
+#: ../src/plugins/pgpcore/sgpgme.c:702
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "O protocolo Gpgme '%s' está inutilizável (problema desconhecido)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:720
+#: ../src/plugins/pgpcore/sgpgme.c:718
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -13092,7 +13302,7 @@ msgstr ""
 "O GnuPG não está instalado adequadamente, ou precisa ser atualizado.\n"
 "O suporte ao OpenPGP estará desativado."
 
-#: ../src/plugins/pgpcore/sgpgme.c:754
+#: ../src/plugins/pgpcore/sgpgme.c:752
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -13100,11 +13310,11 @@ msgstr ""
 "Para conseguir gerar o par de chaves, é necessário, primeiro, salvar as "
 "informações da conta, pressionando o \"Ok\".\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:759
+#: ../src/plugins/pgpcore/sgpgme.c:757
 msgid "No PGP key found"
 msgstr "Não foi encontrada nenhuma chave PGP"
 
-#: ../src/plugins/pgpcore/sgpgme.c:760
+#: ../src/plugins/pgpcore/sgpgme.c:758
 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"
@@ -13114,12 +13324,12 @@ msgstr ""
 "você não poderá assinar suas mensagens ou receber e-mails criptografados.\n"
 "Deseja criar um novo par de chaves agora?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:830 ../src/plugins/pgpcore/sgpgme.c:846
+#: ../src/plugins/pgpcore/sgpgme.c:828 ../src/plugins/pgpcore/sgpgme.c:844
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Não foi possível gerar o novo par de chaves: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:837
+#: ../src/plugins/pgpcore/sgpgme.c:835
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -13127,11 +13337,11 @@ msgstr ""
 "Gerando seu novo par de chaves... Por favor, movimente o mouse "
 "aleatoriamente para ajudar a gerar entropia..."
 
-#: ../src/plugins/pgpcore/sgpgme.c:852
+#: ../src/plugins/pgpcore/sgpgme.c:850
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Não foi possível gerar o novo par de chaves: erro desconhecido"
 
-#: ../src/plugins/pgpcore/sgpgme.c:856
+#: ../src/plugins/pgpcore/sgpgme.c:854
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -13144,19 +13354,19 @@ msgstr ""
 "\n"
 "Deseja exportá-lo para um servidor de chaves?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:860
+#: ../src/plugins/pgpcore/sgpgme.c:858
 msgid "Key generated"
 msgstr "Chaves geradas"
 
-#: ../src/plugins/pgpcore/sgpgme.c:899
+#: ../src/plugins/pgpcore/sgpgme.c:897
 msgid "Key exported."
 msgstr "Chaves exportadas."
 
-#: ../src/plugins/pgpcore/sgpgme.c:901
+#: ../src/plugins/pgpcore/sgpgme.c:899
 msgid "Couldn't export key."
 msgstr "Não foi possível exportar as chaves."
 
-#: ../src/plugins/pgpcore/sgpgme.c:905
+#: ../src/plugins/pgpcore/sgpgme.c:903
 msgid "Key export isn't implemented in Windows."
 msgstr "A exportação de chaves não está implementada no Windows."
 
@@ -13185,7 +13395,7 @@ msgstr ""
 #: ../src/plugins/pgpinline/pgpinline.c:716
 #: ../src/plugins/pgpmime/pgpmime.c:74 ../src/plugins/pgpmime/pgpmime.c:184
 #: ../src/plugins/pgpmime/pgpmime.c:330 ../src/plugins/pgpmime/pgpmime.c:510
-#: ../src/plugins/pgpmime/pgpmime.c:655 ../src/plugins/smime/smime.c:415
+#: ../src/plugins/pgpmime/pgpmime.c:651 ../src/plugins/smime/smime.c:415
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Não foi possível inicializar o contexto GPG, %s"
@@ -13282,19 +13492,19 @@ msgstr ""
 "não são criptografados pelo sistema PGP/Inline."
 
 #: ../src/plugins/pgpinline/pgpinline.c:670
-#: ../src/plugins/pgpmime/pgpmime.c:665
+#: ../src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Não foi possível adicionar a chave GPG %s, %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:698
-#: ../src/plugins/pgpmime/pgpmime.c:694
+#: ../src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Não foi possível criar o arquivo temporário, %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:729
-#: ../src/plugins/pgpmime/pgpmime.c:721
+#: ../src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Falha na criptografia, %s"
@@ -13350,7 +13560,11 @@ msgstr "Não foi possível traduzir as partes do arquivo descriptografado."
 msgid "Couldn't create temporary file: %s"
 msgstr "Não foi possível criar o arquivo temporário: %s"
 
-#: ../src/plugins/pgpmime/pgpmime.c:621
+#: ../src/plugins/pgpmime/pgpmime.c:595
+msgid "OpenPGP digital signature"
+msgstr "Assinatura digital OpenPGP"
+
+#: ../src/plugins/pgpmime/pgpmime.c:617
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -13358,7 +13572,7 @@ msgstr ""
 "Por favor, perceba que os cabeçalhos do e-mail (como o Assunto) não são "
 "criptografados pelo sistema PGP/Mime."
 
-#: ../src/plugins/pgpmime/pgpmime.c:793
+#: ../src/plugins/pgpmime/pgpmime.c:789
 msgid "PGP/Mime"
 msgstr "PGP/MIME"
 
@@ -13428,7 +13642,7 @@ msgid ""
 "\n"
 "These scripts are then available via the menu. You can assign keyboard "
 "shortcuts to them just like it is done with other menu items. You can also "
-"put buttons for script invokation into the toolbars using Claws Mail's "
+"put buttons for script invocation into the toolbars using Claws Mail's "
 "builtin toolbar editor.\n"
 "\n"
 "You can provide scripts working on the main window by placing files into ~/."
@@ -13516,152 +13730,52 @@ msgstr ""
 msgid "Python integration"
 msgstr "Integração com o Python"
 
-#: ../src/plugins/rssyl/feed.c:126
-msgid "Cannot open temporary file"
-msgstr "Não foi possível abrir o arquivo temporário"
-
-#: ../src/plugins/rssyl/feed.c:137
-msgid "Cannot init libCURL"
-msgstr "Não foi possível iniciar a libCURL"
-
-#: ../src/plugins/rssyl/feed.c:234 ../src/plugins/vcalendar/vcal_folder.c:1596
-msgid "401 (Authorisation required)"
-msgstr "401 (Requer autorização)"
-
-#: ../src/plugins/rssyl/feed.c:237 ../src/plugins/vcalendar/vcal_folder.c:1599
-msgid "403 (Unauthorised)"
-msgstr "403 (Não autorizado)"
-
-#: ../src/plugins/rssyl/feed.c:240 ../src/plugins/vcalendar/vcal_folder.c:1602
-msgid "404 (Not found)"
-msgstr "404 (Não encontrado)"
-
-#: ../src/plugins/rssyl/feed.c:243 ../src/plugins/vcalendar/vcal_folder.c:1605
-#, c-format
-msgid "Error %ld"
-msgstr "Erro %ld"
-
-#: ../src/plugins/rssyl/feed.c:328
-#, c-format
-msgid "Fetching '%s'..."
-msgstr "Buscando '%s'..."
-
-#: ../src/plugins/rssyl/feed.c:387
-msgid "Malformed feed"
-msgstr "Fonta malformatada"
-
-#: ../src/plugins/rssyl/feed.c:1203
-#, c-format
-msgid "Refreshing feed '%s'..."
-msgstr "Atualizando a fonte '%s'"
-
-#: ../src/plugins/rssyl/feed.c:1218
-#, c-format
-msgid ""
-"RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-"comments of '%s'"
-msgstr ""
-"RSSyl: A busca de comentários não é suportada para fontes RDF. Não foi "
-"possível buscar os comentários de '%s'"
-
-#: ../src/plugins/rssyl/feed.c:1227
-msgid "This feed format is not supported yet."
-msgstr "O formato dessa fonte (feed) não é suportado ainda."
-
-#: ../src/plugins/rssyl/feed.c:1258
-msgid "N/A"
-msgstr "N/A"
-
-#: ../src/plugins/rssyl/feed.c:1378
-#, c-format
-msgid "%ld byte"
-msgid_plural "%ld bytes"
-msgstr[0] "%ld byte"
-msgstr[1] "%ld bytes"
-
-#: ../src/plugins/rssyl/feed.c:1381
-msgid "size unknown"
-msgstr "tamanho desconhecido"
-
-#: ../src/plugins/rssyl/feed.c:1555
-#, c-format
-msgid ""
-"RSSyl: Cannot update feed %s:\n"
-"%s\n"
-msgstr ""
-"RSSyl: Não foi possível atualizar a fonte %s:\n"
-"%s\n"
-
-#: ../src/plugins/rssyl/feed.c:1727
-msgid "You are already subscribed to this feed."
-msgstr "Você já está assinando esta fonte."
-
-#: ../src/plugins/rssyl/feed.c:1738
+#: ../src/plugins/rssyl/old_feeds.c:90
 #, c-format
 msgid ""
-"Couldn't fetch URL '%s':\n"
+"Couldn't read contents of old feeds.xml file:\n"
 "%s"
 msgstr ""
-"Não foi possível buscar a URL '%s':\n"
+"Não foi possível ler o conteúdo do antigo arquivo de fontes xml:\n"
 "%s"
 
-#: ../src/plugins/rssyl/feed.c:1743
+#: ../src/plugins/rssyl/opml_export.c:110
 #, c-format
-msgid ""
-"Couldn't fetch URL '%s':\n"
-"%s\n"
+msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr ""
-"Não foi possível buscar a URL '%s':\n"
-"%s\n"
-
-#: ../src/plugins/rssyl/feed.c:1759
-#, c-format
-msgid "Can't subscribe feed '%s'."
-msgstr "Não foi possível assinar a fonte '%s'."
-
-#: ../src/plugins/rssyl/feed.c:1861 ../src/plugins/rssyl/rssyl_cb_menu.c:281
-msgid "Claws Mail needs network access in order to update the feed."
-msgid_plural "Claws Mail needs network access in order to update the feeds."
-msgstr[0] "O Claws Mail necessita de acesso à rede para atualizar a fonte."
-msgstr[1] "O Claws Mail necessita de acesso à rede para atualizar as fontes."
-
-#: ../src/plugins/rssyl/feed.h:20
-#, c-format
-msgid "Time out connecting to URL %s\n"
-msgstr "Tempo esgotado ao tentar conectar com a URL %s\n"
+"RSSyl: Ocorreu um erro ao escrever '%s' na lista de exportação de fontes.\n"
 
-#: ../src/plugins/rssyl/feed.h:21
+#: ../src/plugins/rssyl/opml_export.c:131
 #, c-format
-msgid "Couldn't fetch URL %s\n"
-msgstr "Não foi possível buscar a URL %s\n"
+msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
+msgstr "RSSyl: Não foi possível excluir o antigo arquivo OPML '%s': %s\n"
 
-#: ../src/plugins/rssyl/feed.h:22
+#: ../src/plugins/rssyl/opml_export.c:141
 #, c-format
-msgid "Error parsing feed from URL %s\n"
-msgstr "Ocorreu um erro ao analisar a fonte da URL %s\n"
-
-#: ../src/plugins/rssyl/feed.h:23
-#, c-format
-msgid "Unsupported feed type at URL %s\n"
-msgstr "Tipo de fonte não suportada na URL %s\n"
+msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
+msgstr ""
+"RSSyl: Não foi possível abrir o arquivo '%s' para a exportação da lista de "
+"fontes: %s\n"
 
-#: ../src/plugins/rssyl/feed.h:25
-#, c-format
-msgid "RSSyl: Updating feed %s\n"
-msgstr "RSSyl: Atualizando a fonte %s\n"
+#: ../src/plugins/rssyl/opml_export.c:182
+msgid "RSSyl: Error during writing feed export file.\n"
+msgstr ""
+"RSSyl: Ocorreu um erro durante a escrita do arquivo de exportação de fontes.\n"
 
-#: ../src/plugins/rssyl/feed.h:26
+#: ../src/plugins/rssyl/opml_import.c:109
 #, c-format
-msgid "RSSyl: Feed update finished: %s\n"
-msgstr "RSSyl: A atualização da fonte foi finalizada: %s\n"
-
-#: ../src/plugins/rssyl/feed.h:27
-msgid "RSSyl: Feed update aborted, application is exiting.\n"
+msgid ""
+"Error while subscribing feed\n"
+"%s\n"
+"\n"
+"Folder name '%s' is not allowed."
 msgstr ""
-"RSSyl: A atualização da fonte foi abortada, a aplicação está sendo "
-"encerrada.\n"
+"Ocorreu um erro na assinatura da fonte\n"
+"%s\n"
+"\n"
+"O nome de pasta '%s' não é permitido."
 
-#: ../src/plugins/rssyl/plugin.c:63
+#: ../src/plugins/rssyl/plugin.c:65
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13675,116 +13789,163 @@ msgstr ""
 "Cada fonte de notícia irá criar uma pasta com as entradas apropriadas, "
 "buscadas na Web. Você pode lê-las e excluir ou manter as entradas antigas."
 
-#: ../src/plugins/rssyl/plugin.c:87
+#: ../src/plugins/rssyl/plugin.c:89
 msgid "RSS feed"
 msgstr "Fonte RSS"
 
-#: ../src/plugins/rssyl/rssyl.c:133 ../src/plugins/rssyl/rssyl.c:145
+#: ../src/plugins/rssyl/rssyl_add_item.c:295
+msgctxt "Empty RSS feed title placeholder"
+msgid "(empty)"
+msgstr "(vazio)"
+
+#: ../src/plugins/rssyl/rssyl.c:154 ../src/plugins/rssyl/rssyl.c:165
 msgid "Refresh all feeds"
 msgstr "Atualizar todas as fontes"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:62
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Subscribe feed"
 msgstr "Assinar a fonte"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:63
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:67
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Digite a URL da fonte de notícias que você deseja assinar:"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:138
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:100
 #, c-format
-msgid "Really remove the folder tree '%s'?\n"
-msgstr "Deseja realmente remover a árvore da pasta '%s'?\n"
+msgid "'%c' can't be used in folder name."
+msgstr "'%c' não pode ser usado no nome da pasta."
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:139
-msgid "Remove folder tree"
-msgstr "Remover a árvore da pasta"
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:242
+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] "O Claws Mail necessita de acesso à rede para atualizar a fonte."
+msgstr[1] "O Claws Mail necessita de acesso à rede para atualizar as fontes."
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:305
 #, c-format
-msgid "Can't remove feed '%s'."
-msgstr "Não foi possível remover a fonte '%s'."
-
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:374
-msgid "Select a .opml file"
-msgstr "Selecione um arquivo .opml"
-
-#: ../src/plugins/rssyl/rssyl_gtk.c:53
-msgid "_Refresh feed"
-msgstr "Atualizar a _fonte"
+msgid "Really remove the feed tree `%s' ?\n"
+msgstr "Deseja realmente remover a árvore da fonte '%s'?\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:54
-msgid "Refresh _all feeds"
-msgstr "Atualizar _todas as fontes"
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:306
+msgid "Remove feed tree"
+msgstr "Remover a árvore da fonte"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:55
-msgid "Subscribe _new feed..."
-msgstr "Assinar uma _nova fonte..."
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:341
+msgid "Select an OPML file"
+msgstr "Selecione um arquivo OPML"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:56
-msgid "_Unsubscribe feed..."
-msgstr "_Cancelar assinatura da fonte..."
+#: ../src/plugins/rssyl/rssyl_feed.c:75
+#: ../src/plugins/rssyl/rssyl_subscribe.c:139
+#, c-format
+msgid "Couldn't create folder for new feed '%s'."
+msgstr "Não foi possível criar a pasta para a nova fonte '%s'."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:57
-msgid "Feed pr_operties..."
-msgstr "_Propriedades da fonte..."
+#: ../src/plugins/rssyl/rssyl_feed.h:10
+#, c-format
+msgid "RSSyl: Subscribing new feed: %s\n"
+msgstr "RSSyl: Assinando uma nova fonte %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:58
-msgid "Import feed list..."
-msgstr "Importar lista de fontes..."
+#: ../src/plugins/rssyl/rssyl_feed.h:11
+#, c-format
+msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
+msgstr "RSSyl: Nova fonte assinada: '%s' (%s)\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:59
-msgid "Rena_me..."
-msgstr "Reno_mear"
+#: ../src/plugins/rssyl/rssyl_feed.h:12
+#, c-format
+msgid "RSSyl: Updating feed: %s\n"
+msgstr "RSSyl: Atualizando a fonte %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:60
-msgid "_Create new folder..."
-msgstr "Criar nova _pasta..."
+#: ../src/plugins/rssyl/rssyl_feed.h:13
+#, c-format
+msgid "RSSyl: Feed update finished: %s\n"
+msgstr "RSSyl: A atualização da fonte foi finalizada: %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:62
-msgid "Remove folder _tree..."
-msgstr "_Remover a árvore da pasta..."
+#: ../src/plugins/rssyl/rssyl_feed.h:14
+#, c-format
+msgid "RSSyl: Error fetching feed at '%s': %s\n"
+msgstr "RSSyl: Ocorreu um erro na recuperação da fonte em '%s': %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:152
-msgid "Add RSS folder tree"
-msgstr "Adicionar árvore de pastas RSS"
+#: ../src/plugins/rssyl/rssyl_feed.h:15
+#, c-format
+msgid "RSSyl: No valid feed found at '%s'\n"
+msgstr "RSSyl: Não foi encontrada nenhuma fonte válida em '%s'\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:153
-msgid "Enter name for a new RSS folder tree."
-msgstr "Digite o nome para a nova árvore de pastas RSS."
+#: ../src/plugins/rssyl/rssyl_feed.h:16
+#, c-format
+msgid "RSSyl: Couldn't process feed at '%s'\n"
+msgstr "RSSyl: Não foi possível processar a fonte em '%s'\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:169
-msgid ""
-"Creation of folder tree failed.\n"
-"Maybe some files already exist, or you don't have the permission to write "
-"there?"
+#: ../src/plugins/rssyl/rssyl_feed.h:17
+#, c-format
+msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
-"Ocorreu um erro na criação da árvore de pastas.\n"
-"Talvez alguns arquivos já existam ou você não tem permissão para escrever lá."
-
-#: ../src/plugins/rssyl/rssyl_gtk.c:184
-msgid "RSSyl..."
-msgstr "RSSyl..."
+"RSSyl: A aplicação está encerrando, não possível encerrar a atualização do "
+"feed em '%s'\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:257
+#: ../src/plugins/rssyl/rssyl_feed_props.c:243
 msgid "Use default refresh interval"
 msgstr "Use o intervalo de atualização padrão"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:269
-msgid "Keep default number of expired entries"
-msgstr "Mantenha o número padrão de entradas expiradas"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:255
+msgid "Keep old items"
+msgstr "Manter itens antigos"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:275
+#. "Trim" button
+#: ../src/plugins/rssyl/rssyl_feed_props.c:261
+msgid "_Trim"
+msgstr "_Aparar"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:264
+#: ../src/plugins/rssyl/rssyl_feed_props.c:267
+msgid "Update feed, deleting items which are no longer in the source feed"
+msgstr ""
+"Fonte atualizada, excluindo itens que já não existem mais na origem da fonte"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:271
 msgid "Fetch comments if possible"
 msgstr "Buscar comentários, se possível"
 
+#: ../src/plugins/rssyl/rssyl_feed_props.c:296
+msgid "Always mark as new"
+msgstr "Sempre marcar como nova"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:302
+msgid "If only its text changed"
+msgstr "Apenas se o seu texto mudar"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:308
+msgid "Never mark as new"
+msgstr "Nunca marcar como não nova"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:313
+msgid "Add item title to top of message"
+msgstr "Adicionar o título do item no topo da mensagem"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:320
+msgid "Ignore title rename"
+msgstr "Ignorar a renomeação do título"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:326
+#: ../src/plugins/rssyl/rssyl_feed_props.c:329
+msgid ""
+"Enable this to keep current folder name, even if feed author changes title "
+"of the feed."
+msgstr ""
+"Habilite isso para manter o nome atual da pasta, mesmo que o autor do feed "
+"altere o título da fonte,"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:334
+#: ../src/plugins/vcalendar/vcal_prefs.c:518
+msgid "Verify SSL certificate validity"
+msgstr "Verificar a validade do certificado SSL"
+
 #. Label for URL frame
-#: ../src/plugins/rssyl/rssyl_gtk.c:308
+#: ../src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "<b>Source URL:</b>"
 msgstr "<b>URL de origem:</b>"
 
-#. Fetch comments for - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:336
+#. Fetch comments max age - label
+#: ../src/plugins/rssyl/rssyl_feed_props.c:378
 msgid ""
 "<b>Fetch comments on posts aged less than:</b>\n"
 "<small>(In days; set to -1 to fetch all comments)</small>"
@@ -13793,7 +13954,7 @@ msgstr ""
 "<small>(Em dias; digite -1 para obter todos os comentários)</small>"
 
 #. Refresh interval - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:370
+#: ../src/plugins/rssyl/rssyl_feed_props.c:436
 msgid ""
 "<b>Refresh interval in minutes:</b>\n"
 "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
@@ -13802,98 +13963,197 @@ msgstr ""
 "<small>(Coloque 0 para desabilitar a atualização automática dessa fonte)</"
 "small>"
 
-#. Expired items - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:403
-msgid ""
-"<b>Number of expired entries to keep:</b>\n"
-"<small>(Set to -1 if you want to keep expired entries)</small>"
-msgstr ""
-"<b>Número de entradas expiradas a manter:</b>\n"
-"<small>(Coloque -1 se você deseja manter todas as entradas expiradas)</small>"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:462
+msgid "<b>If an item changes, do not mark it as new:</b>"
+msgstr "<b>Se um item mudar, não marcá-lo como novo:</b>"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:554
+msgid "_OK"
+msgstr "_Ok"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:429
-msgid "<b>If an item changes, do not mark it as unread:</b>"
-msgstr "<b>Se um item mudar, não marcá-lo como não lido:</b>"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:562
+msgid "Set feed properties"
+msgstr "Definir as propriedades da fonte"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:439
-msgid "Always mark as unread"
-msgstr "Sempre marcar como não lido"
+#: ../src/plugins/rssyl/rssyl_gtk.c:48
+msgid "_Refresh feed"
+msgstr "Atualizar a _fonte"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:441
-msgid "If only its text has changed"
-msgstr "Apenas se o seu texto mudar"
+#: ../src/plugins/rssyl/rssyl_gtk.c:49
+msgid "Feed pr_operties"
+msgstr "_Propriedades da fonte..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:443
-msgid "Never mark as unread"
-msgstr "Nunca marcar como não lido"
+#: ../src/plugins/rssyl/rssyl_gtk.c:50
+msgid "Rena_me..."
+msgstr "Reno_mear"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:459
-#: ../src/plugins/vcalendar/vcal_prefs.c:518
-msgid "Verify SSL certificate validity"
-msgstr "Verificar a validade do certificado SSL"
+#: ../src/plugins/rssyl/rssyl_gtk.c:51
+msgid "R_efresh recursively"
+msgstr "Atualizar recursivamente"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:515
-msgid "_OK"
-msgstr "_Ok"
+#: ../src/plugins/rssyl/rssyl_gtk.c:52
+msgid "Subscribe _new feed..."
+msgstr "Assinar uma _nova fonte..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:523
-msgid "Set feed properties"
-msgstr "Definir as propriedades da fonte"
+#: ../src/plugins/rssyl/rssyl_gtk.c:53
+msgid "Create new _folder..."
+msgstr "Criar nova _pasta..."
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:54
+msgid "Import feed list..."
+msgstr "Importar lista de fontes..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:651 ../src/plugins/rssyl/rssyl_gtk.c:675
-msgid "Unsubscribe feed"
-msgstr "Cancelar a assinatura da fonte"
+#: ../src/plugins/rssyl/rssyl_gtk.c:56
+msgid "Remove tree"
+msgstr "Remover a árvore"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:676
-msgid "Do you really want to remove feed"
-msgstr "Deseja realmente remover a fonte"
+#: ../src/plugins/rssyl/rssyl_gtk.c:126
+msgid "Add RSS folder tree"
+msgstr "Adicionar árvore de pastas RSS"
 
-#. Remove cache checkbutton
-#: ../src/plugins/rssyl/rssyl_gtk.c:682
-msgid "Remove cached entries"
-msgstr "Remover as entradas do cache"
+#: ../src/plugins/rssyl/rssyl_gtk.c:127
+msgid "Enter name for a new RSS folder tree."
+msgstr "Digite o nome para a nova árvore de pastas RSS."
 
-#: ../src/plugins/rssyl/rssyl.h:8
-msgid "RSSyl"
-msgstr "RSSyl"
+#: ../src/plugins/rssyl/rssyl_gtk.c:143
+msgid ""
+"Creation of folder tree failed.\n"
+"Maybe some files already exist, or you don't have the permission to write "
+"there?"
+msgstr ""
+"Ocorreu um erro na criação da árvore de pastas.\n"
+"Talvez alguns arquivos já existam ou você não tem permissão para escrever lá."
 
 #. Default RSSyl mailbox name
-#: ../src/plugins/rssyl/rssyl.h:14
+#: ../src/plugins/rssyl/rssyl.h:17
 msgid "My Feeds"
 msgstr "Minhas fontes"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:106
+#: ../src/plugins/rssyl/rssyl_prefs.c:128
 msgid "Default refresh interval in minutes"
 msgstr "Intervalo de atualização padrão, em minutos"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:117
-msgid "Set to 0 to disable automatic refreshing"
-msgstr "Defina como 0 para desabilitar a atualização automática"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:119
-msgid "Default number of expired items to keep"
-msgstr "Número padrão de itens expirados a manter"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:130
-msgid "Set to -1 to keep expired items"
-msgstr "Defina como -1 para manter os itens expirados"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:133
+#: ../src/plugins/rssyl/rssyl_prefs.c:147
 msgid "Refresh all feeds on application start"
 msgstr "Atualizar todas as fontes ao iniciar o programa"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:139
+#. Path to cookies file for libcurl to use
+#: ../src/plugins/rssyl/rssyl_prefs.c:155
 msgid "Path to cookies file"
 msgstr "Caminho para o arquivo de cookies"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:149
+#: ../src/plugins/rssyl/rssyl_prefs.c:166
+#: ../src/plugins/rssyl/rssyl_prefs.c:169
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr ""
 "Caminho para o arquivo cookies.txt (estilo Netscape), contendo seus cookies"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:152
-msgid "Verify SSL certificate validity for new feeds"
-msgstr "Verificar a validade do certificado SSL para novas fontes"
+#: ../src/plugins/rssyl/rssyl_prefs.c:176
+msgid "Verify SSL certificates validity for new feeds"
+msgstr "Verificar a validade dos certificados SSL para novas fontes"
+
+#. Create window
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+msgid "Subscribe new feed?"
+msgstr "Assinar a nova fonte?"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:72
+msgid "<b>Feed folder:</b>"
+msgstr "<b>Pasta da fonte:</b>"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:82
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:86
+msgid ""
+"Instead of using official title, you can enter a different folder name for "
+"the feed."
+msgstr ""
+"Ao invés de usar o título oficial, você pode digitar um nome de pasta "
+"diferente "
+"para a nova fonte."
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:91
+msgid "_Edit feed properties after subscribing"
+msgstr "_Editar as propriedades da fonte após assiná-la"
+
+#: ../src/plugins/rssyl/rssyl_update_comments.c:99
+#, c-format
+msgid "Updating comments for '%s'..."
+msgstr "Atualizando os comentários para '%s'..."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:102
+#: ../src/plugins/vcalendar/vcal_folder.c:1596
+msgid "401 (Authorisation required)"
+msgstr "401 (Requer autorização)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:105
+#: ../src/plugins/vcalendar/vcal_folder.c:1599
+msgid "403 (Unauthorised)"
+msgstr "403 (Não autorizado)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:108
+#: ../src/plugins/vcalendar/vcal_folder.c:1602
+msgid "404 (Not found)"
+msgstr "404 (Não encontrado)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:111
+#, c-format
+msgid "Error %d"
+msgstr "Erro %d"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:123
+#, c-format
+msgctxt "First parameter is URL, second is error text"
+msgid ""
+"Error fetching feed at\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
+msgstr ""
+"Erro ao obter fonte em\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:134
+#, c-format
+msgid ""
+"No valid feed found at\n"
+"<b>%s</b>"
+msgstr ""
+"Não foi encontrada nenhuma fonte válida em\n"
+"<b>%s</b>"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:200
+#, c-format
+msgid "Updating feed '%s'..."
+msgstr "Atualizando a fonte '%s'..."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:221
+#, c-format
+msgid ""
+"Couldn't process feed at\n"
+"<b>%s</b>\n"
+"\n"
+"Please contact developers, this should not happen."
+msgstr ""
+"Não foi possível processar a fonte em\n"
+"<b>%s</b>\n"
+"\n"
+"Por favor, entre em contato com os desenvolvedores. Isso não poderia "
+"ter acontecido."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:301
+msgid "Claws Mail needs network access in order to update your feeds."
+msgstr "O Claws Mail necessita de acesso à rede para atualizar suas fontes."
+
+#: ../src/plugins/rssyl/rssyl_update_format.c:127
+msgid ""
+"Internal problem while upgrading storage format. This should not happen. "
+"Please report this, with debug output attached.\n"
+msgstr ""
+"Ocorreu um problema interno na atualização do formato de armazenamento. Isso "
+"não poderia acontecer. Por favor informe isso, com a saída de depuração "
+"anexada.\n"
 
 #: ../src/plugins/smime/plugin.c:38 ../src/plugins/smime/plugin.c:54
 #: ../src/plugins/smime/smime.c:911
@@ -13962,6 +14222,48 @@ msgstr ""
 "Por favor, perceba que os cabeçalhos do e-mail (como o Assunto) não são "
 "criptografados pelo sistema S/MIME."
 
+#: ../src/plugins/spam_report/spam_report.c:295
+msgid "Reporting spam..."
+msgstr "Relatar o spam..."
+
+#: ../src/plugins/spam_report/spam_report.c:330
+msgid "Report spam online..."
+msgstr "Relatar o spam online..."
+
+#: ../src/plugins/spam_report/spam_report.c:341
+#: ../src/plugins/spam_report/spam_report.c:379
+#: ../src/plugins/spam_report/spam_report_prefs.c:80
+msgid "SpamReport"
+msgstr "SpamReport"
+
+#: ../src/plugins/spam_report/spam_report.c:384
+msgid ""
+"This plugin reports spam to various places.\n"
+"Currently the following sites or methods are supported:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * lists.debian.org nomination system"
+msgstr ""
+"Esse plugin relata spams para vários lugares.\n"
+"Atualmente são suportados os seguintes sites e métodos:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * sistema de notificação da lists.debian.org"
+
+#: ../src/plugins/spam_report/spam_report.c:409
+msgid "Spam reporting"
+msgstr "Relatando o spam"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:122
+msgid "Enabled"
+msgstr "Habilitado"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:149
+msgid "Forward to:"
+msgstr "Encaminhar para:"
+
 #: ../src/plugins/spamassassin/spamassassin.c:77
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:649
 msgid "SpamAssassin"
@@ -14092,48 +14394,6 @@ msgid ""
 msgstr ""
 "Duração máxima da checagem. Se ela durar mais que isso, será cancelada."
 
-#: ../src/plugins/spam_report/spam_report.c:293
-msgid "Reporting spam..."
-msgstr "Relatar o spam..."
-
-#: ../src/plugins/spam_report/spam_report.c:328
-msgid "Report spam online..."
-msgstr "Relatar o spam online..."
-
-#: ../src/plugins/spam_report/spam_report.c:339
-#: ../src/plugins/spam_report/spam_report.c:377
-#: ../src/plugins/spam_report/spam_report_prefs.c:80
-msgid "SpamReport"
-msgstr "SpamReport"
-
-#: ../src/plugins/spam_report/spam_report.c:382
-msgid ""
-"This plugin reports spam to various places.\n"
-"Currently the following sites or methods are supported:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * lists.debian.org nomination system"
-msgstr ""
-"Esse plugin relata spams para vários lugares.\n"
-"Atualmente são suportados os seguintes sites e métodos:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * sistema de notificação da lists.debian.org"
-
-#: ../src/plugins/spam_report/spam_report.c:407
-msgid "Spam reporting"
-msgstr "Relatando o spam"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:122
-msgid "Enabled"
-msgstr "Habilitado"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:149
-msgid "Forward to:"
-msgstr "Encaminhar para:"
-
 #: ../src/plugins/tnef_parse/tnef_parse.c:65
 #, c-format
 msgid ""
@@ -14209,7 +14469,7 @@ msgstr "Exibir"
 
 #: ../src/plugins/vcalendar/day-view.c:614
 #: ../src/plugins/vcalendar/month-view.c:711 ../src/prefs_account.c:1477
-#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:334
+#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:336
 msgid "days"
 msgstr "dias"
 
@@ -14596,6 +14856,11 @@ msgstr ""
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Tempo esgotado (%d segundos) ao tentar conectar com %s\n"
 
+#: ../src/plugins/vcalendar/vcal_folder.c:1605
+#, c-format
+msgid "Error %ld"
+msgstr "Erro %ld"
+
 #: ../src/plugins/vcalendar/vcal_folder.c:1802
 #, c-format
 msgid ""
@@ -14646,9 +14911,9 @@ msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1849
 #: ../src/plugins/vcalendar/vcal_folder.c:1852
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create directory %s"
-msgstr "Não foi possível criar o diretório de destino %s."
+msgstr "Não foi possível criar o diretório %s"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1890
 msgid "Claws Mail needs network access in order to update the Webcal feed."
@@ -15323,11 +15588,6 @@ msgstr "Caixa de Entrada padrão"
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Mensagens não filtradas serão armazenadas nessa pasta"
 
-#: ../src/prefs_account.c:1442 ../src/prefs_account.c:1531
-#: ../src/prefs_account.c:1991 ../src/prefs_customheader.c:237
-msgid "Bro_wse"
-msgstr "E_xplorar"
-
 #: ../src/prefs_account.c:1453
 msgid "Use secure authentication (APOP)"
 msgstr "Usar autenticação de segurança (APOP)"
@@ -15412,8 +15672,8 @@ msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Receber mensagem' procura por novas mensagens dessa conta"
 
 #: ../src/prefs_account.c:1718 ../src/prefs_customheader.c:209
-#: ../src/prefs_matcher.c:620 ../src/prefs_matcher.c:1958
-#: ../src/prefs_matcher.c:1980
+#: ../src/prefs_matcher.c:623 ../src/prefs_matcher.c:1974
+#: ../src/prefs_matcher.c:1996
 msgid "Header"
 msgstr "Cabeçalho"
 
@@ -15788,8 +16048,8 @@ msgid "Replace the selected action in list with the action above"
 msgstr "Substitui a ação selecionada na lista pela definida acima"
 
 #: ../src/prefs_actions.c:337 ../src/prefs_filtering_action.c:616
-#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:778
-#: ../src/prefs_template.c:318 ../src/prefs_toolbar.c:1056
+#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:781
+#: ../src/prefs_template.c:320 ../src/prefs_toolbar.c:1056
 msgid "Re_move"
 msgstr "Re_mover"
 
@@ -15798,7 +16058,7 @@ msgid "Delete the selected action from the list"
 msgstr "Exclui a ação selecionada da lista"
 
 #: ../src/prefs_actions.c:355 ../src/prefs_filtering.c:503
-#: ../src/prefs_template.c:336
+#: ../src/prefs_template.c:338
 msgid "Clear all the input fields in the dialog"
 msgstr "Limpa todos os campos da janela"
 
@@ -15819,7 +16079,7 @@ msgstr "Move a ação selecionada para baixo"
 #: ../src/prefs_actions.c:535 ../src/prefs_filtering_action.c:704
 #: ../src/prefs_filtering.c:836 ../src/prefs_filtering.c:838
 #: ../src/prefs_filtering.c:839 ../src/prefs_filtering.c:949
-#: ../src/prefs_matcher.c:897 ../src/prefs_template.c:469
+#: ../src/prefs_matcher.c:900 ../src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Novo)"
 
@@ -15880,22 +16140,22 @@ msgstr "Deseja realmente deseja excluir todas as ações?"
 
 #: ../src/prefs_actions.c:898 ../src/prefs_actions.c:929
 #: ../src/prefs_filtering.c:1497 ../src/prefs_filtering.c:1519
-#: ../src/prefs_matcher.c:2109 ../src/prefs_template.c:569
-#: ../src/prefs_template.c:594
+#: ../src/prefs_matcher.c:2125 ../src/prefs_template.c:572
+#: ../src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "A entrada não foi salva"
 
 #: ../src/prefs_actions.c:899 ../src/prefs_actions.c:930
 #: ../src/prefs_filtering.c:1498 ../src/prefs_filtering.c:1520
-#: ../src/prefs_template.c:570 ../src/prefs_template.c:595
+#: ../src/prefs_template.c:573 ../src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "A entrada não foi salva. Fechar mesmo assim?"
 
 #: ../src/prefs_actions.c:900 ../src/prefs_actions.c:905
 #: ../src/prefs_actions.c:931 ../src/prefs_filtering.c:1477
 #: ../src/prefs_filtering.c:1499 ../src/prefs_filtering.c:1521
-#: ../src/prefs_matcher.c:2111 ../src/prefs_template.c:571
-#: ../src/prefs_template.c:596 ../src/prefs_template.c:601
+#: ../src/prefs_matcher.c:2127 ../src/prefs_template.c:574
+#: ../src/prefs_template.c:599 ../src/prefs_template.c:604
 msgid "+_Continue editing"
 msgstr "+Con_tinuar editando"
 
@@ -16006,7 +16266,7 @@ msgstr ""
 "processar um arquivo completo de mensagens ou somente uma de suas partes."
 
 #: ../src/prefs_actions.c:1092 ../src/prefs_filtering.c:1695
-#: ../src/prefs_template.c:1101
+#: ../src/prefs_template.c:1121
 msgid "D_uplicate"
 msgstr "D_uplicar"
 
@@ -16141,7 +16401,7 @@ msgid "Custom header configuration"
 msgstr "Configuração de cabeçalhos personalizados"
 
 #: ../src/prefs_customheader.c:507 ../src/prefs_display_header.c:599
-#: ../src/prefs_matcher.c:1583 ../src/prefs_matcher.c:1598
+#: ../src/prefs_matcher.c:1595 ../src/prefs_matcher.c:1610
 msgid "Header name is not set."
 msgstr "O nome do cabeçalho não foi definido."
 
@@ -16330,7 +16590,7 @@ msgstr "Redirecionar"
 
 #. S_COL_NUMBER
 #: ../src/prefs_filtering_action.c:194 ../src/prefs_filtering_action.c:195
-#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:626
+#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:629
 #: ../src/prefs_summary_column.c:87 ../src/summaryview.c:447
 msgid "Score"
 msgstr "Pontuação"
@@ -16347,7 +16607,7 @@ msgstr "Configurar a pontuação"
 #. S_COL_SCORE
 #. S_COL_LOCKED
 #: ../src/prefs_filtering_action.c:196 ../src/prefs_filtering_action.c:197
-#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:630
+#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:633
 #: ../src/prefs_summary_column.c:89 ../src/summaryview.c:449
 msgid "Tags"
 msgstr "Etiquetas"
@@ -16377,7 +16637,7 @@ msgid "Action configuration"
 msgstr "Configuração da ação"
 
 #: ../src/prefs_filtering_action.c:427 ../src/prefs_filtering.c:1886
-#: ../src/prefs_matcher.c:583
+#: ../src/prefs_matcher.c:586
 msgid "Rule"
 msgstr "Regra"
 
@@ -16419,25 +16679,25 @@ msgid "No action was defined."
 msgstr "Não foi definida nenhuma ação."
 
 #. completion of 'To' from address book
-#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2153
+#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2169
 #: ../src/quote_fmt.c:79
 msgid "literal %"
 msgstr "% literal"
 
-#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2162
+#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2178
 msgid "filename (should not be modified)"
 msgstr "Nome do arquivo (não deve ser modificado)"
 
-#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2163
+#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2179
 #: ../src/quote_fmt.c:87
 msgid "new line"
 msgstr "Nova linha"
 
-#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2164
+#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2180
 msgid "escape character for quotes"
 msgstr "Caractere de escape para as aspas"
 
-#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2165
+#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2181
 msgid "quote character"
 msgstr "Caractere para aspas"
 
@@ -16786,7 +17046,7 @@ msgid "Folder and Message Lists"
 msgstr "Listas de pastas e mensagens"
 
 #. message font label
-#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2030
+#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2046
 msgid "Message"
 msgstr "Mensagem"
 
@@ -16981,245 +17241,249 @@ msgstr "Outro"
 msgid "Logging"
 msgstr "Relatórios"
 
-#: ../src/prefs_matcher.c:328
+#: ../src/prefs_matcher.c:330
 msgid "more than"
 msgstr "mais de"
 
-#: ../src/prefs_matcher.c:329
+#: ../src/prefs_matcher.c:331
 msgid "less than"
 msgstr "menos de"
 
-#: ../src/prefs_matcher.c:335
+#: ../src/prefs_matcher.c:337
 msgid "weeks"
 msgstr "semanas"
 
-#: ../src/prefs_matcher.c:339
+#: ../src/prefs_matcher.c:341
 msgid "higher than"
 msgstr "mais alta que"
 
-#: ../src/prefs_matcher.c:340
+#: ../src/prefs_matcher.c:342
 msgid "lower than"
 msgstr "mais baixa que"
 
-#: ../src/prefs_matcher.c:341 ../src/prefs_matcher.c:347
+#: ../src/prefs_matcher.c:343 ../src/prefs_matcher.c:349
 msgid "exactly"
 msgstr "exatamente"
 
-#: ../src/prefs_matcher.c:345
+#: ../src/prefs_matcher.c:347
 msgid "greater than"
 msgstr "maior que"
 
-#: ../src/prefs_matcher.c:346
+#: ../src/prefs_matcher.c:348
 msgid "smaller than"
 msgstr "menor que"
 
-#: ../src/prefs_matcher.c:351
+#: ../src/prefs_matcher.c:353
 msgid "bytes"
 msgstr "bytes"
 
-#: ../src/prefs_matcher.c:352
+#: ../src/prefs_matcher.c:354
 msgid "kilobytes"
 msgstr "kilobytes"
 
-#: ../src/prefs_matcher.c:353
+#: ../src/prefs_matcher.c:355
 msgid "megabytes"
 msgstr "megabytes"
 
-#: ../src/prefs_matcher.c:357
+#: ../src/prefs_matcher.c:359
 msgid "contains"
 msgstr "contém"
 
-#: ../src/prefs_matcher.c:358
+#: ../src/prefs_matcher.c:360
 msgid "doesn't contain"
 msgstr "não contém"
 
-#: ../src/prefs_matcher.c:381
+#: ../src/prefs_matcher.c:383
 msgid "headers part"
 msgstr "trecho do cabeçalho"
 
-#: ../src/prefs_matcher.c:382
+#: ../src/prefs_matcher.c:384
+msgid "headers values"
+msgstr "valores dos cabeçalhos"
+
+#: ../src/prefs_matcher.c:385
 msgid "body part"
 msgstr "trecho do corpo"
 
-#: ../src/prefs_matcher.c:383
+#: ../src/prefs_matcher.c:386
 msgid "whole message"
 msgstr "toda a mensagem"
 
-#: ../src/prefs_matcher.c:389 ../src/summaryview.c:6300
+#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6300
 msgid "Marked"
 msgstr "Marcada"
 
-#: ../src/prefs_matcher.c:390 ../src/summaryview.c:6298
+#: ../src/prefs_matcher.c:393 ../src/summaryview.c:6298
 msgid "Deleted"
 msgstr "Excluída"
 
-#: ../src/prefs_matcher.c:391
+#: ../src/prefs_matcher.c:394
 msgid "Replied"
 msgstr "Respondida"
 
-#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6292
+#: ../src/prefs_matcher.c:395 ../src/summaryview.c:6292
 msgid "Forwarded"
 msgstr "Encaminhada"
 
-#: ../src/prefs_matcher.c:394 ../src/summaryview.c:6282 ../src/toolbar.c:416
+#: ../src/prefs_matcher.c:397 ../src/summaryview.c:6282 ../src/toolbar.c:416
 #: ../src/toolbar.c:934 ../src/toolbar.c:1978
 msgid "Spam"
 msgstr "Spam"
 
-#: ../src/prefs_matcher.c:395
+#: ../src/prefs_matcher.c:398
 msgid "Has attachment"
 msgstr "Possui anexo"
 
-#: ../src/prefs_matcher.c:396 ../src/summaryview.c:6318
+#: ../src/prefs_matcher.c:399 ../src/summaryview.c:6318
 msgid "Signed"
 msgstr "Assinada"
 
-#: ../src/prefs_matcher.c:400
+#: ../src/prefs_matcher.c:403
 msgid "set"
 msgstr "definida"
 
-#: ../src/prefs_matcher.c:401
+#: ../src/prefs_matcher.c:404
 msgid "not set"
 msgstr "não definida"
 
-#: ../src/prefs_matcher.c:405
+#: ../src/prefs_matcher.c:408
 msgid "yes"
 msgstr "sim"
 
-#: ../src/prefs_matcher.c:406
+#: ../src/prefs_matcher.c:409
 msgid "no"
 msgstr "não"
 
-#: ../src/prefs_matcher.c:410
+#: ../src/prefs_matcher.c:413
 msgid "Any tags"
 msgstr "Qualquer etiqueta"
 
-#: ../src/prefs_matcher.c:411
+#: ../src/prefs_matcher.c:414
 msgid "Specific tag"
 msgstr "Etiqueta específica"
 
-#: ../src/prefs_matcher.c:415
+#: ../src/prefs_matcher.c:418
 msgid "ignored"
 msgstr "ignorada"
 
-#: ../src/prefs_matcher.c:416
+#: ../src/prefs_matcher.c:419
 msgid "not ignored"
 msgstr "não ignorada"
 
-#: ../src/prefs_matcher.c:417
+#: ../src/prefs_matcher.c:420
 msgid "watched"
 msgstr "observada"
 
-#: ../src/prefs_matcher.c:418
+#: ../src/prefs_matcher.c:421
 msgid "not watched"
 msgstr "não observada"
 
-#: ../src/prefs_matcher.c:422
+#: ../src/prefs_matcher.c:425
 msgid "found"
 msgstr "encontrada"
 
-#: ../src/prefs_matcher.c:423
+#: ../src/prefs_matcher.c:426
 msgid "not found"
 msgstr "não encontrada"
 
-#: ../src/prefs_matcher.c:427
+#: ../src/prefs_matcher.c:430
 msgid "0 (Passed)"
 msgstr "0 (Passou)"
 
-#: ../src/prefs_matcher.c:428
+#: ../src/prefs_matcher.c:431
 msgid "non-0 (Failed)"
 msgstr "não-0 (Falhou)"
 
-#: ../src/prefs_matcher.c:566
+#: ../src/prefs_matcher.c:569
 msgid "Condition configuration"
 msgstr "Configuração da condição"
 
 #. criteria combo box
-#: ../src/prefs_matcher.c:610
+#: ../src/prefs_matcher.c:613
 msgid "Match criteria:"
 msgstr "Critério:"
 
-#: ../src/prefs_matcher.c:619
+#: ../src/prefs_matcher.c:622
 msgid "All messages"
 msgstr "Todas as mensagens"
 
-#: ../src/prefs_matcher.c:621
+#: ../src/prefs_matcher.c:624
 msgid "Age"
 msgstr "Idade"
 
-#: ../src/prefs_matcher.c:622
+#: ../src/prefs_matcher.c:625
 msgid "Phrase"
 msgstr "Frase"
 
-#: ../src/prefs_matcher.c:623
+#: ../src/prefs_matcher.c:626
 msgid "Flags"
 msgstr "Marcas"
 
-#: ../src/prefs_matcher.c:624 ../src/prefs_msg_colors.c:410
+#: ../src/prefs_matcher.c:627 ../src/prefs_msg_colors.c:410
 msgid "Color labels"
 msgstr "Rótulos coloridos"
 
-#: ../src/prefs_matcher.c:625
+#: ../src/prefs_matcher.c:628
 msgid "Thread"
 msgstr "Discussão"
 
-#: ../src/prefs_matcher.c:628
+#: ../src/prefs_matcher.c:631
 msgid "Partially downloaded"
 msgstr "Transferido parcialmente"
 
-#: ../src/prefs_matcher.c:631
+#: ../src/prefs_matcher.c:634
 msgid "External program test"
 msgstr "Teste por programa externo"
 
 #. store UNtranslated "Any"/"All" in matcher expressions
-#: ../src/prefs_matcher.c:707 ../src/prefs_matcher.c:1604
-#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:2501
+#: ../src/prefs_matcher.c:710 ../src/prefs_matcher.c:1616
+#: ../src/prefs_matcher.c:1631 ../src/prefs_matcher.c:2521
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Todas"
 
-#: ../src/prefs_matcher.c:741
+#: ../src/prefs_matcher.c:744
 msgid "Use regexp"
 msgstr "Usar expressão regular"
 
-#: ../src/prefs_matcher.c:818
+#: ../src/prefs_matcher.c:821
 msgid "Message must match"
 msgstr "A mensagem deve corresponder a"
 
-#: ../src/prefs_matcher.c:822
+#: ../src/prefs_matcher.c:825
 msgid "at least one"
 msgstr "pelo menos uma das"
 
-#: ../src/prefs_matcher.c:823
+#: ../src/prefs_matcher.c:826
 msgid "all"
 msgstr "todas as"
 
-#: ../src/prefs_matcher.c:826
+#: ../src/prefs_matcher.c:829
 msgid "of above rules"
 msgstr "regras acima"
 
-#: ../src/prefs_matcher.c:1522 ../src/prefs_matcher.c:1588
+#: ../src/prefs_matcher.c:1534 ../src/prefs_matcher.c:1600
 msgid "Search pattern is not set."
 msgstr "O padrão da pesquisa não foi definido."
 
-#: ../src/prefs_matcher.c:1531
+#: ../src/prefs_matcher.c:1543
 msgid "Test command is not set."
 msgstr "O comando de teste não foi definido."
 
-#: ../src/prefs_matcher.c:1605
+#: ../src/prefs_matcher.c:1617
 msgid "all addresses in all headers"
 msgstr "todos os endereços em todos os cabeçalhos"
 
-#: ../src/prefs_matcher.c:1608
+#: ../src/prefs_matcher.c:1620
 msgid "any address in any header"
 msgstr "qualquer endereço em qualquer cabeçalho"
 
-#: ../src/prefs_matcher.c:1610
+#: ../src/prefs_matcher.c:1622
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "o(s) endereço(s) no cabeçalho '%s'"
 
-#: ../src/prefs_matcher.c:1611
+#: ../src/prefs_matcher.c:1623
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -17232,79 +17496,83 @@ msgstr ""
 "Se você deseja procurar a correspondência de %s por todo o livro de "
 "endereços, deve selecionar '%s' da caixa de seleção do livro/pasta."
 
-#: ../src/prefs_matcher.c:1830
+#: ../src/prefs_matcher.c:1842
 msgid "Headers part"
 msgstr "Trecho do cabeçalho"
 
-#: ../src/prefs_matcher.c:1834
+#: ../src/prefs_matcher.c:1846
+msgid "Headers values"
+msgstr "Valores dos cabeçalhos"
+
+#: ../src/prefs_matcher.c:1850
 msgid "Body part"
 msgstr "Trecho do texto"
 
-#: ../src/prefs_matcher.c:1838
+#: ../src/prefs_matcher.c:1854
 msgid "Whole message"
 msgstr "Toda a mensagem"
 
-#: ../src/prefs_matcher.c:1957 ../src/prefs_matcher.c:2001
+#: ../src/prefs_matcher.c:1973 ../src/prefs_matcher.c:2017
 msgid "in"
 msgstr "em"
 
-#: ../src/prefs_matcher.c:1959
+#: ../src/prefs_matcher.c:1975
 msgid "content is"
 msgstr "conteúdo é"
 
-#: ../src/prefs_matcher.c:1968
+#: ../src/prefs_matcher.c:1984
 msgid "Age is"
 msgstr "Idade é"
 
-#: ../src/prefs_matcher.c:1973
+#: ../src/prefs_matcher.c:1989
 msgid "Flag"
 msgstr "Marca"
 
-#: ../src/prefs_matcher.c:1974 ../src/prefs_matcher.c:1991
+#: ../src/prefs_matcher.c:1990 ../src/prefs_matcher.c:2007
 msgid "is"
 msgstr "é"
 
-#: ../src/prefs_matcher.c:1979
+#: ../src/prefs_matcher.c:1995
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/prefs_matcher.c:1990
+#: ../src/prefs_matcher.c:2006
 msgid "Label"
 msgstr "Rótulo"
 
-#: ../src/prefs_matcher.c:1996
+#: ../src/prefs_matcher.c:2012
 msgid "Value:"
 msgstr "Valor:"
 
-#: ../src/prefs_matcher.c:2013
+#: ../src/prefs_matcher.c:2029
 msgid "Score is"
 msgstr "A pontuação é"
 
-#: ../src/prefs_matcher.c:2014
+#: ../src/prefs_matcher.c:2030
 msgid "points"
 msgstr "pontos"
 
-#: ../src/prefs_matcher.c:2024
+#: ../src/prefs_matcher.c:2040
 msgid "Size is"
 msgstr "O tamanho é"
 
-#: ../src/prefs_matcher.c:2029
+#: ../src/prefs_matcher.c:2045
 msgid "Scope:"
 msgstr "Alcance:"
 
-#: ../src/prefs_matcher.c:2031
+#: ../src/prefs_matcher.c:2047
 msgid "tags"
 msgstr "etiquetas"
 
-#: ../src/prefs_matcher.c:2036
+#: ../src/prefs_matcher.c:2052
 msgid "type is"
 msgstr "o tipo é"
 
-#: ../src/prefs_matcher.c:2040
+#: ../src/prefs_matcher.c:2056
 msgid "Program returns"
 msgstr "O programa retorna"
 
-#: ../src/prefs_matcher.c:2110
+#: ../src/prefs_matcher.c:2126
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -17312,11 +17580,11 @@ msgstr ""
 "A entrada não foi salva.\n"
 "Fechar mesmo assim?"
 
-#: ../src/prefs_matcher.c:2174
+#: ../src/prefs_matcher.c:2190
 msgid "Match Type: 'Test'"
 msgstr "Correspondência: 'Testar'"
 
-#: ../src/prefs_matcher.c:2175
+#: ../src/prefs_matcher.c:2191
 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"
@@ -17328,7 +17596,7 @@ msgstr ""
 "\n"
 "Os seguinte símbolos podem ser utilizados:"
 
-#: ../src/prefs_matcher.c:2274
+#: ../src/prefs_matcher.c:2290
 msgid "Current condition rules"
 msgstr "Regras de condição atuais"
 
@@ -18284,11 +18552,11 @@ msgstr "Seleções possíveis"
 msgid "Selection on folder opening"
 msgstr "Seleção ao abrir a pasta"
 
-#: ../src/prefs_template.c:79
+#: ../src/prefs_template.c:80
 msgid "This name is used as the Menu item"
 msgstr "Esse nome é usado como um item do menu"
 
-#: ../src/prefs_template.c:81
+#: ../src/prefs_template.c:82
 msgid ""
 "Override composing account's From header. This doesn't change the composing "
 "account."
@@ -18296,95 +18564,101 @@ msgstr ""
 "Sobrepor o cabeçalho De da conta de composição. Isso não muda a conta de "
 "composição."
 
-#: ../src/prefs_template.c:307
+#: ../src/prefs_template.c:309
 msgid "Append the new template above to the list"
 msgstr "Adiciona o novo modelo definido acima à lista"
 
-#: ../src/prefs_template.c:316
+#: ../src/prefs_template.c:318
 msgid "Replace the selected template in list with the template above"
 msgstr "Substitui o modelo selecionado na lista pelo definido acima"
 
-#: ../src/prefs_template.c:326
+#: ../src/prefs_template.c:328
 msgid "Delete the selected template from the list"
 msgstr "Exclui o modelo selecionado da lista"
 
-#: ../src/prefs_template.c:344
+#: ../src/prefs_template.c:346
 msgid "Show information on configuring templates"
 msgstr "Mostra informações sobre a configuração de modelos"
 
-#: ../src/prefs_template.c:368
+#: ../src/prefs_template.c:370
 msgid "Move the selected template to the top"
 msgstr "Move o modelo selecionado para o início"
 
-#: ../src/prefs_template.c:378
+#: ../src/prefs_template.c:380
 msgid "Move the selected template up"
 msgstr "Move o modelo selecionado para cima"
 
-#: ../src/prefs_template.c:386
+#: ../src/prefs_template.c:388
 msgid "Move the selected template down"
 msgstr "Move o modelo selecionado para baixo"
 
-#: ../src/prefs_template.c:396
+#: ../src/prefs_template.c:398
 msgid "Move the selected template to the bottom"
 msgstr "Move o modelo selecionado para o fim"
 
-#: ../src/prefs_template.c:412
+#: ../src/prefs_template.c:414
 msgid "Template configuration"
 msgstr "Configuração dos modelos"
 
-#: ../src/prefs_template.c:599
+#: ../src/prefs_template.c:602
 msgid "Templates list not saved"
 msgstr "A lista de modelos não foi salva"
 
-#: ../src/prefs_template.c:600
+#: ../src/prefs_template.c:603
 msgid "The templates list has been modified. Close anyway?"
 msgstr "A lista de modelos foi modificada. Fechar mesmo assim?"
 
-#: ../src/prefs_template.c:761
+#: ../src/prefs_template.c:768
 msgid "The template's name is not set."
 msgstr "O nome do modelo não foi definido."
 
-#: ../src/prefs_template.c:798
+#: ../src/prefs_template.c:811
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "O campo \"De\" do modelo possui um endereço de e-mail inválido."
 
-#: ../src/prefs_template.c:804
+#: ../src/prefs_template.c:817
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "O campo \"Para\" do modelo possui um endereço de e-mail inválido."
 
-#: ../src/prefs_template.c:810
+#: ../src/prefs_template.c:823
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "O campo \"Cc\" do modelo possui um endereço de e-mail inválido."
 
-#: ../src/prefs_template.c:816
+#: ../src/prefs_template.c:829
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "O campo \"Cco\" do modelo possui um endereço de e-mail inválido."
 
-#: ../src/prefs_template.c:822
+#: ../src/prefs_template.c:835
+msgid ""
+"The \"Reply-To\" field of the template contains an invalid email address."
+msgstr ""
+"O campo \"Responder para\" do modelo possui um endereço de e-mail inválido."
+
+#: ../src/prefs_template.c:841
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "O campo \"Assunto\" do modelo é inválido."
 
-#: ../src/prefs_template.c:892
+#: ../src/prefs_template.c:912
 msgid "Delete template"
 msgstr "Excluir modelo"
 
-#: ../src/prefs_template.c:893
+#: ../src/prefs_template.c:913
 msgid "Do you really want to delete this template?"
 msgstr "Deseja realmente excluir esse modelo?"
 
-#: ../src/prefs_template.c:905
+#: ../src/prefs_template.c:925
 msgid "Delete all templates"
 msgstr "Excluir todos os modelos"
 
-#: ../src/prefs_template.c:906
+#: ../src/prefs_template.c:926
 msgid "Do you really want to delete all the templates?"
 msgstr "Deseja realmente excluir todos os modelos?"
 
-#: ../src/prefs_template.c:1221
+#: ../src/prefs_template.c:1241
 msgid "Current templates"
 msgstr "Modelos atuais"
 
-#: ../src/prefs_template.c:1249
+#: ../src/prefs_template.c:1269
 msgid "Template"
 msgstr "Modelo"
 
@@ -18695,7 +18969,7 @@ msgstr "Não existe informação disponível"
 msgid "No recipient keys defined."
 msgstr "Não foi definida nenhuma chave de destinatário."
 
-#: ../src/procmime.c:430 ../src/procmime.c:432 ../src/procmime.c:433
+#: ../src/procmime.c:433 ../src/procmime.c:435 ../src/procmime.c:436
 msgid "[Error decoding BASE64]\n"
 msgstr "[Erro ao decodificar BASE64]\n"
 
@@ -19424,23 +19698,23 @@ msgstr ""
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d selecionada(s) (%s/%s), %d não lida(s)"
 
-#: ../src/summaryview.c:2979
+#: ../src/summaryview.c:2981
 msgid "Sorting summary..."
 msgstr "Ordenando o sumário..."
 
-#: ../src/summaryview.c:3118
+#: ../src/summaryview.c:3120
 msgid "Setting summary from message data..."
 msgstr "Estruturando o sumário a partir dos dados das mensagens..."
 
-#: ../src/summaryview.c:3323
+#: ../src/summaryview.c:3325
 msgid "(No Date)"
 msgstr "(Sem data)"
 
-#: ../src/summaryview.c:3375
+#: ../src/summaryview.c:3377
 msgid "(No Recipient)"
 msgstr "(Sem destinatário)"
 
-#: ../src/summaryview.c:3410
+#: ../src/summaryview.c:3412
 #, c-format
 msgid ""
 "%s\n"
@@ -19449,7 +19723,7 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>De: %s, em %s</span>"
 
-#: ../src/summaryview.c:3417
+#: ../src/summaryview.c:3419
 #, c-format
 msgid ""
 "%s\n"
@@ -19458,26 +19732,26 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Para: %s, em %s</span>"
 
-#: ../src/summaryview.c:4294
+#: ../src/summaryview.c:4296
 msgid "You're not the author of the article.\n"
 msgstr "Você não é o autor do artigo.\n"
 
-#: ../src/summaryview.c:4387
+#: ../src/summaryview.c:4389
 #, 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] "Deseja realmente excluir a mensagem selecionada?"
 msgstr[1] "Deseja realmente excluir as %d mensagens selecionadas?"
 
-#: ../src/summaryview.c:4390
+#: ../src/summaryview.c:4392
 msgid "Delete message(s)"
 msgstr "Excluir a(s) mensagem(ns)"
 
-#: ../src/summaryview.c:4553
+#: ../src/summaryview.c:4555
 msgid "Destination is same as current folder."
 msgstr "As pastas de destino e a atual são a mesma."
 
-#: ../src/summaryview.c:4652
+#: ../src/summaryview.c:4653
 msgid "Destination to copy is same as current folder."
 msgstr "Você está tentando copiar para a mesma pasta."
 
@@ -19585,7 +19859,7 @@ msgstr "Criptografada"
 msgid "Has attachment(s)"
 msgstr "Possui anexo(s)"
 
-#: ../src/summaryview.c:7929
+#: ../src/summaryview.c:7932
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19594,11 +19868,11 @@ msgstr ""
 "Erro na expressão regular (regexp):\n"
 "%s"
 
-#: ../src/summaryview.c:8034
+#: ../src/summaryview.c:8037
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Voltar à lista de pastas (se você tiver mensagens não lidas)"
 
-#: ../src/summaryview.c:8039
+#: ../src/summaryview.c:8042
 msgid "Go back to the folder list"
 msgstr "Voltar à lista de pastas"
 
@@ -19726,11 +20000,11 @@ msgstr ""
 "    %s\n"
 "Código de saída %d\n"
 
-#: ../src/textview.c:2194
+#: ../src/textview.c:2173
 msgid "Tags: "
 msgstr "Etiquetas: "
 
-#: ../src/textview.c:2896
+#: ../src/textview.c:2875
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
@@ -19749,11 +20023,11 @@ msgstr ""
 "\n"
 "Deseja abrir mesmo assim?"
 
-#: ../src/textview.c:2905
+#: ../src/textview.c:2884
 msgid "Phishing attempt warning"
 msgstr "Aviso de tentativa de fraude por phishing"
 
-#: ../src/textview.c:2906
+#: ../src/textview.c:2885
 msgid "_Open URL"
 msgstr "_Abrir URL"
 
@@ -20355,3 +20629,4 @@ msgid ""
 msgstr ""
 "O Claws Mail está pronto.\n"
 "Clique em Salvar para iniciar."
+
diff --git a/po/sk.po b/po/sk.po
index b046c1c..30514bc 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,55 +1,313 @@
+# #-#-#-#-#  sk.po (claws-mail 3.11.0)  #-#-#-#-#
 # Slovak translation of Claws Mail.
 # Copyright © 2009-2014 The Claws Mail team.
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
+#
+# #-#-#-#-#  iso_3166-3.56.sk.po (iso_3166 3.13)  #-#-#-#-#
+# Translation of ISO-3166 (country names) to Slovak
+#
+# This file is distributed under the same license as the iso-codes package.
+#
+# Copyright (C)
+#   Free Software Foundation, Inc., 2004
+#   Peter Mann <Peter.Mann at tuke.sk>, 2004, 2006.
+#   Pavol Cvengros <orpheus at hq.alert.sk>, 2001.
+#   (translations from drakfw)
+#   Alastair McKinstry <mckinstry at computer.org>, 2001.
+#   Ivan Masár <helix84 at centrum.sk>, 2007, 2008, 2009, 2010.
+#
+# source:
+# http://www.geodesy.gov.sk
+# http://www.fao.org/ (historic names)
 # Slavko <linux at slavino.sk>, 2009, 2010, 2011, 2012, 2013, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version:  Claws Mail 3.10.0\n"
+"Project-Id-Version: iso_3166 3.13\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2014-06-13 03:15+0400\n"
-"PO-Revision-Date: 2014-05-22 18:21+0200\n"
+"POT-Creation-Date: 2014-10-13 09:04+0100\n"
+"PO-Revision-Date: 2014-10-19 19:37+0200\n"
 "Last-Translator: Slavko <linux at slavino.sk>\n"
 "Language-Team: slovenčina <linux at slavino.sk>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  sk.po (claws-mail 3.11.0)  #-#-#-#-#\n"
 "X-Generator: Gtranslator 2.91.6\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-POFile-SpellExtra: Distguished DIGEST-MD5 Foundation iconv compose Okt\n"
+"X-POFile-SpellExtra: EUC-JP send podzložiek X-Mailer faq List-Help XBM\n"
+"X-POFile-SpellExtra: status-full ubject POP3 item priklad LDAP Dillo jozef\n"
+"X-POFile-SpellExtra: SELECT RFC822 version Lomka bogofilter IMAP change\n"
+"X-POFile-SpellExtra: search ixed receive changed NOT NNTP EHLO Aug GnuTLS\n"
+"X-POFile-SpellExtra: LDIFbol select account 02dMB Pospracovanie gpgsm\n"
+"X-POFile-SpellExtra: EUC-TW UTF-8 GnuPG Glib PGP License PalmOS fd switch\n"
+"X-POFile-SpellExtra: inline PNG metadát ld gpg-agent libSM URI Control\n"
+"X-POFile-SpellExtra: debug LDIF Mailbox got offline claws-mail GPGME Big5\n"
+"X-POFile-SpellExtra: RFC mojadomena org Apr shred IPv6 IMAP4 Gpgme key\n"
+"X-POFile-SpellExtra: attach SASL TLS GTK NetworkManager Sep gnupg-agent\n"
+"X-POFile-SpellExtra: Claws GTK1 xtended kB Enter uri Relative RSS Dec\n"
+"X-POFile-SpellExtra: Libetpan GPGSM Free theme Mime ldap folder Bogofilter\n"
+"X-POFile-SpellExtra: US-ASCII dn spamd GPG dc CRAM-MD5 Enchant GBK PKCS12\n"
+"X-POFile-SpellExtra: close TCP ISO-8859-9 ISO-8859-8 ISO-8859-7 ISO-8859-6\n"
+"X-POFile-SpellExtra: ISO-8859-5 ISO-8859-4 SpamAssassin ISO-8859-2\n"
+"X-POFile-SpellExtra: ISO-8859-1 news OpenPGP 0x Unicode strftime cn\n"
+"X-POFile-SpellExtra: subscribe soketu Sylpheed-Claws quit podzložku\n"
+"X-POFile-SpellExtra: podzložky podzložka OpensSSL súbor1 súbor2 News\n"
+"X-POFile-SpellExtra: General mbox MIME conf ascii FAQ 7bit libetpan IP v3\n"
+"X-POFile-SpellExtra: 02dKB vyp KOI8-U KOI8-R menodomeny Zap BASE64\n"
+"X-POFile-SpellExtra: version-full Sylpheed UID ldif PEM JPilot home exit\n"
+"X-POFile-SpellExtra: Št localhost Ut Feb aktivovanú sProsím inbox\n"
+"X-POFile-SpellExtra: Pobaltie GB2312 sPracujete glib soket DNS RDN\n"
+"X-POFile-SpellExtra: Distinguished ISO-8859-15 ISO-8859-13 phishingovým\n"
+"X-POFile-SpellExtra: uid čítačku deaktivované ISO-2022-JP STARTTLS\n"
+"X-POFile-SpellExtra: update ISO-2022-CN vCard Return-Path X-Label Pine\n"
+"X-POFile-SpellExtra: Inline Resent-From Resent-To color Received GB18030\n"
+"X-POFile-SpellExtra: Sender From compface Content-Type\n"
+"X-POFile-SpellExtra: Disposition-Notification-To 48x48 Resent-Cc\n"
+"X-POFile-SpellExtra: compose-from-file List-Owner Resent-Date ShiftJIS\n"
+"X-POFile-SpellExtra: Seen Resent-Bcc TLSREQCERT alternate-config-dir\n"
+"X-POFile-SpellExtra: Resent-Message-ID Message-ID\n"
+"X-POFile-SpellExtra: Content-Transfer-Encoding 2fGB fullwindow St\n"
+"X-POFile-SpellExtra: Return-Receipt-To Precedence Cc local List-Subscribe\n"
+"X-POFile-SpellExtra: Delivered-To EUC-KR X-No-Archive sk Mailing-List\n"
+"X-POFile-SpellExtra: In-Reply-To List-Archive UIDL X-Bogosity TLSCACERTDIR\n"
+"X-POFile-SpellExtra: ID MIME-Version Followup-To Resent-Sender config-dir\n"
+"X-POFile-SpellExtra: List-Unsubscribe receive-all help Hraško LAST CHECK\n"
+"X-POFile-SpellExtra: Štýlopis LSUB štýlopis Werner Mutt domena\n"
+"X-POFile-SpellExtra: Yamamoto janko Subject people pospracovania arg HELO\n"
+"X-POFile-SpellExtra: SEARCH APOP PM asp oznamovača LOGOUT dirmngr INVAL\n"
+"X-POFile-SpellExtra: iconified Chmod SUBSCRIBE NOOP DELETE cc FETCH APPEND\n"
+"X-POFile-SpellExtra: Fw EXPUNGE Koch CLOSE pm Hiroyuki Bind Franklin\n"
+"X-POFile-SpellExtra: dfNFLIstcnriT RCPT EXAMINE References RENAME\n"
+"X-POFile-SpellExtra: EXTENSION af ao an as PATH LOGIN DATA id Localhost\n"
+"X-POFile-SpellExtra: CREATE CAPABILITY podmenu aT EChyba ABt podvýraz\n"
+"X-POFile-SpellExtra: AUTH MUTT COPY ABc FROM ABf bind hrasko Street\n"
+"X-POFile-SpellExtra: UNSUBSCRIBE Floor Fifth Core nezalomené shellu\n"
+"X-POFile-SpellExtra: prefscommon mailbox MIMEhowto xover Vypršaný xhdr\n"
+"X-POFile-SpellExtra: gthread nextunreadmsgdialog Nezalomené statistics\n"
+"X-POFile-SpellExtra: dillo Príjímanie Kocha reader Wernera\n"
+"X-POFile-SpellExtra: autentifikovaný reset-statistics distinguished www\n"
+"X-POFile-SpellExtra: 600 GNU am root MH Jan 110 Online 15 Public 2822 rom\n"
+"X-POFile-SpellExtra: 12-hod 25 List-Post php X-Face X- Max X-Status\n"
+"X-POFile-SpellExtra: User-Agent P12 HTML 02110-1301 online Windows-1256\n"
+"X-POFile-SpellExtra: 480 24-hod Windows-1251 102376 http AM 998 IO\n"
+"X-POFile-SpellExtra: Po-spracovanie 389 100 Face Janko Software AND 10\n"
+"X-POFile-SpellExtra: Windows-1255 OK TIS-620 Windows-874 1999-2012 51 mh\n"
+"X-POFile-SpellExtra: 2001 DoS podreťazca 725 OS OR ad ov\n"
+"X-POFile-SpellExtra: 20s check send before code gs vCalendar ClamAV\n"
+"X-POFile-SpellExtra: whitelist Bsfilter COMPRESS XFCE kanály\n"
+"X-POFile-SpellExtra: clamav-daemon hint AttRemover Filtering webCal\n"
+"#-#-#-#-#  iso_3166-3.56.sk.po (iso_3166 3.13)  #-#-#-#-#\n"
+"X-POFile-SpellExtra: novších Webcal GNOME ISO-8601 ghostscript gui\n"
+"X-POFile-SpellExtra: Mjanmarsko Tab imap4 Macao GeoLocation Džibutsko\n"
+
+#: ../claws-mail.desktop.in.h:1
+msgid "E-mail client"
+msgstr "Počtový klient"
+
+#: ../claws-mail.desktop.in.h:2
+msgid "Lightweight and Fast GTK+ based Mail Client"
+msgstr "Odľahčený a rýchly poštový klient, postavený na GTK+"
+
+#: ../claws-mail.desktop.in.h:3
+msgid "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
+msgstr ""
+"odľahčený;rýchly;gui;rozšíriteľný;zásuvný modul;pop;pop3;imap;imap4;nntp;"
+"news;"
 
-#: ../claws-mail.appdata.xml.in.h:1
-#, fuzzy
+#: ../appdata/claws-mail.appdata.xml.in.h:1
 msgid "Claws Mail is a fast, powerful and very extensible email client."
-msgstr "Claws Mail bol zaregistrovaný ako predvolený klient."
+msgstr "Claws Mail je rýchly, výkonný a veľmi rozšíriteľný poštový klient."
 
-#: ../claws-mail.appdata.xml.in.h:2
+#: ../appdata/claws-mail.appdata.xml.in.h:2
 msgid ""
 "It is highly configurable and handles hundreds of thousands of emails "
 "easily. Messages are managed in an open format, and are easy to interact "
 "with."
 msgstr ""
+"Je vysoko nastaviteľný a ľahko dokáže obslúžiť státisíce emailov. Správy sú "
+"spracovávané v otvorenom formáte a možno s nimi ľahko pracovať."
 
-#: ../claws-mail.appdata.xml.in.h:3
+#: ../appdata/claws-mail.appdata.xml.in.h:3
 msgid ""
 "Lots of extra functionality is provided by plugins, such as PGP signatures "
 "and encryption, an RSS aggregator, a calendar, powerful spam filtering, Perl "
 "and Python interactions, HTML and PDF rendering, and more."
 msgstr ""
+"Veľa doplnkových možností je poskytovaných prostredníctvom zásuvných "
+"modulov, ako napr. podpisy a šifrovanie PGP, čítačka RSS, kalendár, výkonné "
+"filtrovanie spamov, interakcia pomocou Perl a Python, spracovanie HTML a PD "
+"a ďalšie."
 
-#: ../claws-mail.desktop.in.h:1
-msgid "E-mail client"
+#: ../appdata/claws-mail-acpi_notifier.metainfo.xml.in.h:1
+msgid "Enables mail notification via LEDs on some laptops"
+msgstr "Zapína upozorňovanie na email pomocou LED na niektorých notebookoch"
+
+#: ../appdata/claws-mail-address_keeper.metainfo.xml.in.h:1
+msgid ""
+"Allows saving outgoing addresses to a designated folder in the address book"
+msgstr "Umožňuje ukladanie adresy prijímateľov do učenej zložky adresára"
+
+#: ../appdata/claws-mail-archive.metainfo.xml.in.h:1
+msgid "Allows to make tars or zips of old folders"
+msgstr "Umožňuje vytvorenie archívov TAR alebo ZIP zo starých zložiek"
+
+#: ../appdata/claws-mail-att_remover.metainfo.xml.in.h:1
+msgid "Lets you remove attachments from emails"
+msgstr "Umožňuje z emailov odstrániť prílohy"
+
+#: ../appdata/claws-mail-attachwarner.metainfo.xml.in.h:1
+msgid ""
+"Warns when a message mentioning an attachment in the message body without "
+"attaching any files"
 msgstr ""
+"Upozorňuje, keď správa, kde je spomínaná príloha, nemá priložené žiadne "
+"súbory"
 
-#: ../claws-mail.desktop.in.h:2
-msgid "Lightweight and Fast GTK+ based Mail Client"
+#: ../appdata/claws-mail-bogofilter.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using Bogofilter"
+msgstr ""
+"Kontroluje všetky správy prijaté z účtov POP, IMAP alebo LOCAL pomocou "
+"Bsfilter"
+
+#: ../appdata/claws-mail-bsfilter.metainfo.xml.in.h:1
+msgid ""
+"Check all messages that are received from an IMAP, LOCAL or POP account for "
+"spam using Bsfilter"
+msgstr ""
+"Kontroluje všetky správy prijaté z účtov POP, IMAP alebo LOCAL pomocou "
+"Bsfilter"
+
+#: ../appdata/claws-mail-clamd.metainfo.xml.in.h:1
+msgid ""
+"Scans all messages that are received from an IMAP, LOCAL or POP account "
+"using clamd (Clam AV)"
+msgstr ""
+"Kontroluje všetky správy prijaté z účtov POP, IMAP alebo LOCAL pomocou clamd "
+"(Clam AV)"
+
+#: ../appdata/claws-mail-fancy.metainfo.xml.in.h:1
+msgid "Renders HTML e-mail using the WebKit library"
+msgstr "Spracúva emaily vo formáte HTML pomocou knižnice WebKit"
+
+#: ../appdata/claws-mail-fetchinfo.metainfo.xml.in.h:1
+msgid ""
+"Inserts headers containing: UIDL, Claws' account name, POP server, user ID "
+"and retrieval time"
+msgstr ""
+"Pridáva hlavičky obsahujúce: UIDL, názov účtu Claws, server POP, ID "
+"používateľa a čas získania"
+
+#: ../appdata/claws-mail-gdata.metainfo.xml.in.h:1
+msgid "Provides an interface to Google services"
+msgstr "Poskytuje rozhranie k službám Google"
+
+#: ../appdata/claws-mail-geolocation.metainfo.xml.in.h:1
+msgid "Provides GeoLocation functionality"
+msgstr "Poskytuje funkcie GeoLocation"
+
+#: ../appdata/claws-mail-libravatar.metainfo.xml.in.h:1
+msgid ""
+"Displays libravatar/gravatar profiles' images or a dynamically generated or "
+"predefined alternative"
+msgstr ""
+"Zobrazuje obrázky profilov libravatar/gravatar alebo dynamicky generovanú, "
+"či preddefinovanú alternatívu"
+
+#: ../appdata/claws-mail-mailmbox.metainfo.xml.in.h:1
+msgid "Direct support for mailboxes in mbox format"
+msgstr "Priama podpora schránky vo formáte mbox."
+
+#: ../appdata/claws-mail-newmail.metainfo.xml.in.h:1
+msgid ""
+"Writes a msg header summary to a log file on arrival of new mail after "
+"sorting"
+msgstr ""
+"Zapisuje do súboru záznamu zhrnutie hlavičiek správy pri príchode novej "
+"správy, po triedení"
+
+#: ../appdata/claws-mail-notification.metainfo.xml.in.h:1
+msgid "Provides various ways to notify the user of new and unread email"
+msgstr ""
+"Poskytuje rôzne spôsoby upozornenia používateľa na nový a neprečítaný email"
+
+#: ../appdata/claws-mail-pdf_viewer.metainfo.xml.in.h:1
+msgid ""
+"Enables the viewing of PDF and PostScript attachments using the Poppler "
+"library and GhostScript"
+msgstr ""
+"Umožňuje zobrazovanie príloh PDF a PostScript pomocou knižnice Poppler a "
+"nástroja GhostScript"
+
+#: ../appdata/claws-mail-perl.metainfo.xml.in.h:1
+msgid "Allowing the use of full Perl power in email filters"
+msgstr "Umožňuje vo filtroch využiť plnú silu Perl"
+
+#: ../appdata/claws-mail-pgpcore.metainfo.xml.in.h:1
+msgid ""
+"Handles core PGP functions and is a dependency of both the PGP/Inline and "
+"PGP/MIME plugins."
+msgstr ""
+"Poskytuje základné funkcie PGP a je závislosťou oboch zásuvných modulov PGP/"
+"Inline a PGP/MIME."
+
+#: ../appdata/claws-mail-pgpinline.metainfo.xml.in.h:1
+msgid "Handles PGP/Inline signed and/or encrypted mails"
+msgstr "Obsluhuje emaily podpísané a/alebo šifrované pomocou PGP/Inline"
+
+#: ../appdata/claws-mail-pgpmime.metainfo.xml.in.h:1
+msgid "Handles PGP/MIME signed and/or encrypted mails"
+msgstr "Obsluhuje emaily podpísané a/alebo šifrované pomocou PGP/MIME"
+
+#: ../appdata/claws-mail-python.metainfo.xml.in.h:1
+msgid ""
+"Offers a Python scripting. Code can be entered into an embedded Python "
+"console or stored"
+msgstr ""
+"Ponúka skritovanie v jazyku Python. Kód môže byť zadaný do zabudovanej "
+"konzoly Python alebo uložený"
+
+#: ../appdata/claws-mail-rssyl.metainfo.xml.in.h:1
+msgid "Read your RSS favourite newsfeeds"
+msgstr "Číta obľúbené kanály RSS"
+
+#: ../appdata/claws-mail-smime.metainfo.xml.in.h:1
+msgid "Handles S/MIME signed and/or encrypted mails"
+msgstr "Obsluhuje emaily podpísané a/alebo šifrované pomocou S/MIME"
+
+#: ../appdata/claws-mail-spam_report.metainfo.xml.in.h:1
+msgid "Reports spam to various places"
+msgstr "Hlási SPAM na rôzne miesta"
+
+#: ../appdata/claws-mail-spamassassin.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using SpamAssassin"
+msgstr ""
+"Zapína kontrolu všetkých správ prijaté z účtov POP, IMAP alebo LOCAL pomocou "
+"SpamAssassin"
+
+#: ../appdata/claws-mail-tnef_parse.metainfo.xml.in.h:1
+msgid "Enables reading application/ms-tnef attachments"
+msgstr "Umožňuje čítanie príloh application/ms-tnef"
+
+#: ../appdata/claws-mail-vcalendar.metainfo.xml.in.h:1
+msgid ""
+"Enables vCalendar message handling and handles webCal subscriptions. "
+"Provides a calendar import"
 msgstr ""
+"Umožňuje spracovávanie správ vCalendar a obsluhuje prihlásenia webCal. "
+"Poskytuje import kalendára"
 
-#: ../src/account.c:392
+#: ../src/account.c:392 ../src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
+"Please close all the composing windows before editing accounts."
 msgstr ""
 "Sú otvorené okná s rozpísanými správami.\n"
 "Prosím zatvorte všetky tieto okná predtým, ako začnete meniť nastavenia "
@@ -59,11 +317,11 @@ msgstr ""
 msgid "Can't create folder."
 msgstr "Nemožno vytvoriť zložku."
 
-#: ../src/account.c:717
+#: ../src/account.c:724
 msgid "Edit accounts"
 msgstr "Upraviť účty"
 
-#: ../src/account.c:734
+#: ../src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -73,44 +331,44 @@ msgstr ""
 "zaškrtnutie poľa v stĺpci „G” určuje ktoré účty budú zahrnuté. Predvolený "
 "účet je označený tučným písmom."
 
-#: ../src/account.c:805
+#: ../src/account.c:812
 msgid " _Set as default account "
 msgstr " _Nastaviť ako predvolený účet "
 
-#: ../src/account.c:897
+#: ../src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Účty so vzdialenými zložkami nemožno kopírovať."
 
 #. copy fields
-#: ../src/account.c:904
+#: ../src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Kópia %s"
 
-#: ../src/account.c:1064
+#: ../src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Naozaj chcete odstrániť účet „%s”?"
 
-#: ../src/account.c:1066
+#: ../src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Bez názvu)"
 
-#: ../src/account.c:1067
+#: ../src/account.c:1074
 msgid "Delete account"
 msgstr "Zmazať účet"
 
-#: ../src/account.c:1537
+#: ../src/account.c:1544
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr " "
 
-#: ../src/account.c:1543
+#: ../src/account.c:1550
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "Tlačidlo „Prijať poštu” prijme poštu z označených účtov"
 
-#: ../src/account.c:1550 ../src/addrduplicates.c:471 ../src/addressadd.c:215
-#: ../src/addressbook.c:125 ../src/compose.c:7144 ../src/editaddress.c:1263
+#: ../src/account.c:1557 ../src/addrduplicates.c:471 ../src/addressadd.c:215
+#: ../src/addressbook.c:125 ../src/compose.c:7148 ../src/editaddress.c:1263
 #: ../src/editaddress.c:1320 ../src/editaddress.c:1340
 #: ../src/editaddress_other_attributes_ldap.c:302
 #: ../src/editaddress_other_attributes_ldap.c:350 ../src/editbook.c:170
@@ -118,16 +376,16 @@ msgstr "Tlačidlo „Prijať poštu” prijme poštu z označených účtov"
 #: ../src/editvcard.c:173 ../src/importmutt.c:223 ../src/importpine.c:222
 #: ../src/mimeview.c:275 ../src/plugins/pdf_viewer/poppler_viewer.c:1797
 #: ../src/plugins/pgpcore/select-keys.c:396 ../src/prefs_filtering.c:384
-#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:78
+#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:79
 msgid "Name"
 msgstr "Meno"
 
-#: ../src/account.c:1558 ../src/prefs_account.c:1103
+#: ../src/account.c:1565 ../src/prefs_account.c:1103
 #: ../src/prefs_account.c:4058
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/account.c:1566 ../src/ssl_manager.c:102
+#: ../src/account.c:1573 ../src/ssl_manager.c:102
 msgid "Server"
 msgstr "Server"
 
@@ -179,8 +437,8 @@ msgstr ""
 "%s"
 
 #: ../src/action.c:990 ../src/ldaputil.c:326
-#: ../src/plugins/bogofilter/bogofilter.c:876 ../src/plugins/rssyl/feed.c:1739
-#: ../src/plugins/rssyl/feed.c:1743 ../src/plugins/tnef_parse/tnef_parse.c:67
+#: ../src/plugins/bogofilter/bogofilter.c:876
+#: ../src/plugins/tnef_parse/tnef_parse.c:67
 #: ../src/plugins/vcalendar/vcal_folder.c:1803
 #: ../src/plugins/vcalendar/vcal_folder.c:1807
 #: ../src/plugins/vcalendar/vcal_folder.c:1818
@@ -237,22 +495,19 @@ msgid "Action's user argument"
 msgstr "Používateľský parameter"
 
 #: ../src/addrclip.c:479
-#, fuzzy
 msgid "Cannot copy a folder to itself or to its sub-structure."
-msgstr "Nie je možné skopírovať zložku do jeho potomka."
+msgstr "Nie je možné kopírovať zložku do seba samej alebo do jej potomka."
 
 #: ../src/addrclip.c:502
-#, fuzzy
 msgid "Cannot copy an address book to itself."
-msgstr "Nemožno vkladať. Cieľový adresár je len na čítanie."
+msgstr "Nie je možné adresár do seba samého."
 
 #: ../src/addrclip.c:593
-#, fuzzy
 msgid "Cannot move a folder to itself or to its sub-structure."
-msgstr "Nie je možné presunúť zložku do jeho potomka."
+msgstr "Nie je možné presunúť zložku do so samej seba alebo jej potomka."
 
 #. that's a group
-#: ../src/addr_compl.c:620 ../src/addressbook.c:4866
+#: ../src/addr_compl.c:685 ../src/addressbook.c:4866
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "Skupina"
@@ -327,14 +582,14 @@ msgstr ""
 
 #: ../src/addrcustomattr.c:212 ../src/addressbook.c:435
 #: ../src/addressbook.c:463 ../src/addressbook.c:480 ../src/edittags.c:272
-#: ../src/plugins/archive/archiver_gtk.c:1193 ../src/prefs_actions.c:1090
-#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1099
+#: ../src/plugins/archive/archiver_gtk.c:1194 ../src/prefs_actions.c:1090
+#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1119
 msgid "_Delete"
 msgstr "O_dstrániť"
 
 #: ../src/addrcustomattr.c:213 ../src/edittags.c:273
 #: ../src/prefs_actions.c:1091 ../src/prefs_filtering.c:1694
-#: ../src/prefs_template.c:1100
+#: ../src/prefs_template.c:1120
 msgid "Delete _all"
 msgstr "Zm_azať všetko"
 
@@ -432,7 +687,7 @@ msgid "Select Address Book Folder"
 msgstr "Vyberte zložku adresára"
 
 #: ../src/addressadd.c:485 ../src/editaddress.c:1582 ../src/headerview.c:281
-#: ../src/textview.c:2064
+#: ../src/textview.c:2043
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -463,17 +718,17 @@ msgstr "_Adresár"
 
 #. {"Address/---",			NULL, "---", NULL, NULL, NULL },
 #: ../src/addressbook.c:403 ../src/addressbook.c:434 ../src/addressbook.c:462
-#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:504
+#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:506
 #: ../src/messageview.c:210
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:507
+#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:509
 #: ../src/messageview.c:213
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:509
+#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:511
 #: ../src/messageview.c:214
 msgid "_Help"
 msgstr "_Pomocník"
@@ -531,7 +786,7 @@ msgstr "_Vystrihnúť"
 
 #. Edit menu
 #: ../src/addressbook.c:431 ../src/addressbook.c:470 ../src/addressbook.c:486
-#: ../src/compose.c:610 ../src/mainwindow.c:538 ../src/messageview.c:226
+#: ../src/compose.c:610 ../src/mainwindow.c:540 ../src/messageview.c:226
 msgid "_Copy"
 msgstr "_Kopírovať"
 
@@ -587,7 +842,7 @@ msgid "Edit custom attributes..."
 msgstr "Upraviť vlastné atribúty…"
 
 #. Help menu
-#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:801
+#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:803
 #: ../src/messageview.c:339
 msgid "_About"
 msgstr "_O programe"
@@ -597,9 +852,10 @@ msgid "_Browse Entry"
 msgstr "P_rechádzať  položky"
 
 #. then add the appointment
-#: ../src/addressbook.c:504 ../src/crash.c:454 ../src/crash.c:473
+#: ../src/addressbook.c:504 ../src/crash.c:457 ../src/crash.c:476
 #: ../src/importldif.c:115 ../src/plugins/pgpcore/select-keys.c:251
-#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/vcalendar/day-view.c:402
+#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/pgpcore/sgpgme.c:168
+#: ../src/plugins/vcalendar/day-view.c:402
 #: ../src/plugins/vcalendar/month-view.c:428 ../src/prefs_themes.c:707
 #: ../src/prefs_themes.c:739 ../src/prefs_themes.c:740
 msgid "Unknown"
@@ -705,7 +961,7 @@ msgstr "Je vyžadovaná silnejšia autentifikácia"
 msgid "Sources"
 msgstr "Zdroje"
 
-#: ../src/addressbook.c:914 ../src/prefs_matcher.c:629
+#: ../src/addressbook.c:914 ../src/prefs_matcher.c:632
 #: ../src/prefs_other.c:475 ../src/toolbar.c:225 ../src/toolbar.c:2142
 msgid "Address book"
 msgstr "Adresár"
@@ -756,7 +1012,7 @@ msgstr ""
 
 #: ../src/addressbook.c:2921 ../src/imap_gtk.c:363 ../src/mh_gtk.c:202
 #: ../src/plugins/mailmbox/plugin_gtk.c:324
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:236
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:152
 #: ../src/plugins/vcalendar/vcal_folder.c:1966
 msgid "Delete folder"
 msgstr "Odstrániť zložku"
@@ -920,10 +1176,10 @@ msgstr "LDAP požiadavka"
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:443
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:490
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:613
-#: ../src/prefs_matcher.c:672 ../src/prefs_matcher.c:707
-#: ../src/prefs_matcher.c:1607 ../src/prefs_matcher.c:1614
-#: ../src/prefs_matcher.c:1622 ../src/prefs_matcher.c:1624
-#: ../src/prefs_matcher.c:2504 ../src/prefs_matcher.c:2508
+#: ../src/prefs_matcher.c:675 ../src/prefs_matcher.c:710
+#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:1626
+#: ../src/prefs_matcher.c:1634 ../src/prefs_matcher.c:1636
+#: ../src/prefs_matcher.c:2524 ../src/prefs_matcher.c:2528
 msgid "Any"
 msgstr "Všetky"
 
@@ -1027,21 +1283,21 @@ msgstr "Aktualizácia adries"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Aktualizácia zlyhala. Zmeny neboli zapísané do adresára."
 
-#: ../src/alertpanel.c:146 ../src/compose.c:9293
+#: ../src/alertpanel.c:146 ../src/compose.c:9324
 msgid "Notice"
 msgstr "Upozornenie"
 
 #: ../src/alertpanel.c:159 ../src/compose.c:5656 ../src/compose.c:6133
-#: ../src/compose.c:11662 ../src/file_checker.c:78 ../src/file_checker.c:100
+#: ../src/compose.c:11670 ../src/file_checker.c:78 ../src/file_checker.c:100
 #: ../src/messageview.c:853 ../src/messageview.c:866
-#: ../src/plugins/pgpcore/sgpgme.c:719
+#: ../src/plugins/pgpcore/sgpgme.c:717
 #: ../src/plugins/vcalendar/vcalendar.c:125 ../src/summaryview.c:4863
 msgid "Warning"
 msgstr "Upozornenie"
 
 #: ../src/alertpanel.c:172 ../src/alertpanel.c:195 ../src/compose.c:5597
 #: ../src/inc.c:669 ../src/plugins/pgpcore/sgpgme.c:152
-#: ../src/plugins/pgpcore/sgpgme.c:249
+#: ../src/plugins/pgpcore/sgpgme.c:253
 msgid "Error"
 msgstr "Chyba"
 
@@ -1053,14 +1309,9 @@ msgstr "_Zobraziť záznam"
 msgid "Show this message next time"
 msgstr "Zobraziť túto správu aj nabudúce"
 
-#: ../src/avatars.c:97
-msgid "Internal avatars rendering already initialized"
-msgstr ""
-
 #: ../src/avatars.c:102
-#, fuzzy
 msgid "Failed to register avatars internal rendering hook"
-msgstr "Zlyhala registrácia obsluhy udalosti „avatar image render”"
+msgstr "Zlyhala registrácia obsluhy udalosti „avatars internal rendering”"
 
 #: ../src/browseldap.c:218
 msgid "Browse Directory Entry"
@@ -1170,7 +1421,7 @@ msgstr "Vaša verzia Claws Mail je pre zásuvný modul „%s” príliš stará.
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Vaša verzia Claws Mail je pre tento zásuvný modul príliš stará."
 
-#: ../src/common/session.c:177 ../src/imap.c:1171
+#: ../src/common/session.c:177 ../src/imap.c:1177
 msgid "SSL handshake failed\n"
 msgstr "Vytvorenie SSL spojenia zlyhalo\n"
 
@@ -1346,212 +1597,212 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: ../src/common/utils.c:4967
+#: ../src/common/utils.c:5000
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: ../src/common/utils.c:4968
+#: ../src/common/utils.c:5001
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Pondelok"
 
-#: ../src/common/utils.c:4969
+#: ../src/common/utils.c:5002
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: ../src/common/utils.c:4970
+#: ../src/common/utils.c:5003
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Streda"
 
-#: ../src/common/utils.c:4971
+#: ../src/common/utils.c:5004
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: ../src/common/utils.c:4972
+#: ../src/common/utils.c:5005
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Piatok"
 
-#: ../src/common/utils.c:4973
+#: ../src/common/utils.c:5006
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sobota"
 
-#: ../src/common/utils.c:4975
+#: ../src/common/utils.c:5008
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Január"
 
-#: ../src/common/utils.c:4976
+#: ../src/common/utils.c:5009
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Február"
 
-#: ../src/common/utils.c:4977
+#: ../src/common/utils.c:5010
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marec"
 
-#: ../src/common/utils.c:4978
+#: ../src/common/utils.c:5011
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Apríl"
 
-#: ../src/common/utils.c:4979
+#: ../src/common/utils.c:5012
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Máj"
 
-#: ../src/common/utils.c:4980
+#: ../src/common/utils.c:5013
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Jún"
 
-#: ../src/common/utils.c:4981
+#: ../src/common/utils.c:5014
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Júl"
 
-#: ../src/common/utils.c:4982
+#: ../src/common/utils.c:5015
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "August"
 
-#: ../src/common/utils.c:4983
+#: ../src/common/utils.c:5016
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "September"
 
-#: ../src/common/utils.c:4984
+#: ../src/common/utils.c:5017
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Október"
 
-#: ../src/common/utils.c:4985
+#: ../src/common/utils.c:5018
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "November"
 
-#: ../src/common/utils.c:4986
+#: ../src/common/utils.c:5019
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "December"
 
-#: ../src/common/utils.c:4988
+#: ../src/common/utils.c:5021
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Ne"
 
-#: ../src/common/utils.c:4989
+#: ../src/common/utils.c:5022
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Po"
 
-#: ../src/common/utils.c:4990
+#: ../src/common/utils.c:5023
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Ut"
 
-#: ../src/common/utils.c:4991
+#: ../src/common/utils.c:5024
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "St"
 
-#: ../src/common/utils.c:4992
+#: ../src/common/utils.c:5025
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Št"
 
-#: ../src/common/utils.c:4993
+#: ../src/common/utils.c:5026
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Pi"
 
-#: ../src/common/utils.c:4994
+#: ../src/common/utils.c:5027
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "So"
 
-#: ../src/common/utils.c:4996
+#: ../src/common/utils.c:5029
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: ../src/common/utils.c:4997
+#: ../src/common/utils.c:5030
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: ../src/common/utils.c:4998
+#: ../src/common/utils.c:5031
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: ../src/common/utils.c:4999
+#: ../src/common/utils.c:5032
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Apr"
 
-#: ../src/common/utils.c:5000
+#: ../src/common/utils.c:5033
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Máj"
 
-#: ../src/common/utils.c:5001
+#: ../src/common/utils.c:5034
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jún"
 
-#: ../src/common/utils.c:5002
+#: ../src/common/utils.c:5035
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Júl"
 
-#: ../src/common/utils.c:5003
+#: ../src/common/utils.c:5036
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aug"
 
-#: ../src/common/utils.c:5004
+#: ../src/common/utils.c:5037
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: ../src/common/utils.c:5005
+#: ../src/common/utils.c:5038
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Okt"
 
-#: ../src/common/utils.c:5006
+#: ../src/common/utils.c:5039
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: ../src/common/utils.c:5007
+#: ../src/common/utils.c:5040
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dec"
 
-#: ../src/common/utils.c:5018
+#: ../src/common/utils.c:5051
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "DOP"
 
-#: ../src/common/utils.c:5019
+#: ../src/common/utils.c:5052
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "ODP"
 
-#: ../src/common/utils.c:5020
+#: ../src/common/utils.c:5053
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "dop."
 
-#: ../src/common/utils.c:5021
+#: ../src/common/utils.c:5054
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "odp."
@@ -1562,7 +1813,7 @@ msgstr "_Pridať…"
 
 #: ../src/compose.c:571 ../src/mh_gtk.c:361
 #: ../src/plugins/mailmbox/plugin_gtk.c:293
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:140
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:307
 msgid "_Remove"
 msgstr "_Odstrániť"
 
@@ -1571,7 +1822,7 @@ msgid "_Properties..."
 msgstr "_Vlastnosti…"
 
 #. menus
-#: ../src/compose.c:580 ../src/mainwindow.c:506 ../src/messageview.c:212
+#: ../src/compose.c:580 ../src/mainwindow.c:508 ../src/messageview.c:212
 msgid "_Message"
 msgstr "Sp_ráva"
 
@@ -1643,7 +1894,7 @@ msgstr "_Zalomené"
 msgid "_Unwrapped"
 msgstr "_Nezalomené"
 
-#: ../src/compose.c:618 ../src/mainwindow.c:539
+#: ../src/compose.c:618 ../src/mainwindow.c:541
 msgid "Select _all"
 msgstr "Vy_brať všetko"
 
@@ -1775,48 +2026,48 @@ msgstr "Pri_orita"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
 #. {"View/Scroll/---",          NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:666 ../src/mainwindow.c:603 ../src/messageview.c:265
+#: ../src/compose.c:666 ../src/mainwindow.c:605 ../src/messageview.c:265
 msgid "Character _encoding"
 msgstr "_Kódovanie znakov"
 
-#: ../src/compose.c:671 ../src/mainwindow.c:608 ../src/messageview.c:270
+#: ../src/compose.c:671 ../src/mainwindow.c:610 ../src/messageview.c:270
 msgid "Western European"
 msgstr "Západná Európa (ISO-8859-1)"
 
-#: ../src/compose.c:672 ../src/mainwindow.c:609 ../src/messageview.c:271
+#: ../src/compose.c:672 ../src/mainwindow.c:611 ../src/messageview.c:271
 msgid "Baltic"
 msgstr "Pobaltské"
 
-#: ../src/compose.c:673 ../src/mainwindow.c:610 ../src/messageview.c:272
+#: ../src/compose.c:673 ../src/mainwindow.c:612 ../src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebrejské"
 
-#: ../src/compose.c:674 ../src/mainwindow.c:611 ../src/messageview.c:273
+#: ../src/compose.c:674 ../src/mainwindow.c:613 ../src/messageview.c:273
 msgid "Arabic"
 msgstr "Arabské"
 
-#: ../src/compose.c:675 ../src/mainwindow.c:612 ../src/messageview.c:274
+#: ../src/compose.c:675 ../src/mainwindow.c:614 ../src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Cyrilika"
 
-#: ../src/compose.c:676 ../src/mainwindow.c:613 ../src/messageview.c:275
+#: ../src/compose.c:676 ../src/mainwindow.c:615 ../src/messageview.c:275
 msgid "Japanese"
 msgstr "Japonské"
 
-#: ../src/compose.c:677 ../src/mainwindow.c:614 ../src/messageview.c:276
+#: ../src/compose.c:677 ../src/mainwindow.c:616 ../src/messageview.c:276
 msgid "Chinese"
 msgstr "Čínske"
 
-#: ../src/compose.c:678 ../src/mainwindow.c:615 ../src/messageview.c:277
+#: ../src/compose.c:678 ../src/mainwindow.c:617 ../src/messageview.c:277
 msgid "Korean"
 msgstr "Kórejské"
 
-#: ../src/compose.c:679 ../src/mainwindow.c:616 ../src/messageview.c:278
+#: ../src/compose.c:679 ../src/mainwindow.c:618 ../src/messageview.c:278
 msgid "Thai"
 msgstr "Thajské"
 
 #. Tools menu
-#: ../src/compose.c:682 ../src/mainwindow.c:723 ../src/messageview.c:314
+#: ../src/compose.c:682 ../src/mainwindow.c:725 ../src/messageview.c:314
 msgid "_Address book"
 msgstr "_Adresár"
 
@@ -1825,7 +2076,7 @@ msgid "_Template"
 msgstr "Šabló_na"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:686 ../src/mainwindow.c:751 ../src/messageview.c:335
+#: ../src/compose.c:686 ../src/mainwindow.c:753 ../src/messageview.c:335
 msgid "Actio_ns"
 msgstr "A_kcie"
 
@@ -1869,13 +2120,13 @@ msgid "_Normal"
 msgstr "_Normálny"
 
 #. RADIO compose_reply_change_mode_cb
-#: ../src/compose.c:707 ../src/mainwindow.c:657 ../src/messageview.c:303
+#: ../src/compose.c:707 ../src/mainwindow.c:659 ../src/messageview.c:303
 msgid "_All"
 msgstr "_Všetkým"
 
 #. RADIO compose_reply_change_mode_cb
 #. COMPOSE_REPLY_TO_ALL
-#: ../src/compose.c:708 ../src/mainwindow.c:658 ../src/messageview.c:304
+#: ../src/compose.c:708 ../src/mainwindow.c:660 ../src/messageview.c:304
 msgid "_Sender"
 msgstr "Odo_sielateľ"
 
@@ -1903,19 +2154,19 @@ msgstr "_Nízka"
 msgid "_Lowest"
 msgstr "Na_jnižšia"
 
-#: ../src/compose.c:723 ../src/mainwindow.c:865 ../src/messageview.c:352
+#: ../src/compose.c:723 ../src/mainwindow.c:868 ../src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automaticky"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:724 ../src/mainwindow.c:866 ../src/messageview.c:353
+#: ../src/compose.c:724 ../src/mainwindow.c:869 ../src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:725 ../src/mainwindow.c:867 ../src/messageview.c:354
+#: ../src/compose.c:725 ../src/mainwindow.c:870 ../src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
@@ -1927,7 +2178,7 @@ msgstr "Unicode (_UTF-8)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:729 ../src/mainwindow.c:871 ../src/messageview.c:358
+#: ../src/compose.c:729 ../src/mainwindow.c:874 ../src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Stredná Európa (ISO-8859-_2)"
 
@@ -1937,7 +2188,7 @@ msgstr "Stredná Európa (ISO-8859-_2)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:732 ../src/mainwindow.c:874 ../src/messageview.c:361
+#: ../src/compose.c:732 ../src/mainwindow.c:877 ../src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grécke (ISO-8859-_7)"
 
@@ -1951,7 +2202,7 @@ msgstr "Grécke (ISO-8859-_7)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:737 ../src/mainwindow.c:879 ../src/messageview.c:366
+#: ../src/compose.c:737 ../src/mainwindow.c:882 ../src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turecké (ISO-8859-_9)"
 
@@ -2003,33 +2254,33 @@ msgstr "Fw: viacero správ"
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "V tele šablóny „Presmerovať” je chyba na riadku %d."
 
-#: ../src/compose.c:2591 ../src/gtk/headers.h:13
+#: ../src/compose.c:2591 ../src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: ../src/compose.c:2594 ../src/gtk/headers.h:14
+#: ../src/compose.c:2594 ../src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
-#: ../src/compose.c:2597 ../src/gtk/headers.h:11
+#: ../src/compose.c:2597 ../src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
 #: ../src/compose.c:2600 ../src/compose.c:4911 ../src/compose.c:4913
-#: ../src/gtk/headers.h:32
+#: ../src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Diskusné skupiny:"
 
-#: ../src/compose.c:2603 ../src/gtk/headers.h:33
+#: ../src/compose.c:2603 ../src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Pokračovanie:"
 
-#: ../src/compose.c:2606 ../src/gtk/headers.h:16
+#: ../src/compose.c:2606 ../src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "V odpovedi komu:"
 
 #: ../src/compose.c:2610 ../src/compose.c:4908 ../src/compose.c:4916
-#: ../src/gtk/headers.h:12 ../src/summary_search.c:433
+#: ../src/gtk/headers.h:13 ../src/summary_search.c:433
 msgid "To:"
 msgstr "Komu:"
 
@@ -2075,7 +2326,7 @@ msgstr "Do tela správy vkladáte súbor %s. Ste si istý, že to chcete urobiť
 msgid "Are you sure?"
 msgstr "Ste si istý?"
 
-#: ../src/compose.c:3603 ../src/compose.c:11144
+#: ../src/compose.c:3603 ../src/compose.c:11152
 msgid "+_Insert"
 msgstr "+_Vložiť"
 
@@ -2102,16 +2353,16 @@ msgstr "Nemožno čítať %s."
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:432
+#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr "[Upravené]"
 
-#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:435
+#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Písanie správy%s"
 
-#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:438
+#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[bez názvu] - Písanie správy%s"
@@ -2120,7 +2371,7 @@ msgstr "[bez názvu] - Písanie správy%s"
 #. * This partly duplicates functionality in compose.c::compose_set_title().
 #. * While it's nice to not have to modify Claws Mail for this to work,
 #. * it would be cleaner to export that function in Claws Mail.
-#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:426
+#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Napísať správu"
 
@@ -2176,7 +2427,7 @@ msgstr "Zaradiť do fronty i tak?"
 msgid "Send later"
 msgstr "Odoslať ho neskôr"
 
-#: ../src/compose.c:5134 ../src/compose.c:9719
+#: ../src/compose.c:5134 ../src/compose.c:9750
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2186,7 +2437,7 @@ msgstr ""
 "\n"
 "Zlyhala konverzia kódovania."
 
-#: ../src/compose.c:5137 ../src/compose.c:9722
+#: ../src/compose.c:5137 ../src/compose.c:9753
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2196,7 +2447,7 @@ msgstr ""
 "\n"
 "Nie je dostupný šifrovací kľúč príjemcu."
 
-#: ../src/compose.c:5143 ../src/compose.c:9716
+#: ../src/compose.c:5143 ../src/compose.c:9747
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2284,7 +2535,7 @@ msgstr "Zvolený účet nie je NNTP: Posielanie nie je možné."
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Príloha %s už neexistuje. Ignorovať?"
 
-#: ../src/compose.c:6133 ../src/mainwindow.c:648 ../src/toolbar.c:231
+#: ../src/compose.c:6133 ../src/mainwindow.c:650 ../src/toolbar.c:231
 #: ../src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Zrušiť posielanie"
@@ -2302,34 +2553,34 @@ msgstr "Pôvodná časť %s"
 msgid "Add to address _book"
 msgstr "Pridať do _adresára"
 
-#: ../src/compose.c:6908
+#: ../src/compose.c:6912
 msgid "Delete entry contents"
 msgstr "Zmazať obsah položiek"
 
-#: ../src/compose.c:6912 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: ../src/compose.c:6916 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Na automatické doplnenie z adresára použite <TAB>"
 
-#: ../src/compose.c:7132
+#: ../src/compose.c:7136
 msgid "Mime type"
 msgstr "Typ MIME"
 
 #. S_COL_DATE
-#: ../src/compose.c:7138 ../src/mimeview.c:274
-#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:627
+#: ../src/compose.c:7142 ../src/mimeview.c:274
+#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:630
 #: ../src/prefs_summary_column.c:85 ../src/summaryview.c:445
 msgid "Size"
 msgstr "Veľkosť"
 
 #. Save Message to folder
-#: ../src/compose.c:7201
+#: ../src/compose.c:7205
 msgid "Save Message to "
 msgstr "Uložiť správu do "
 
-#: ../src/compose.c:7238 ../src/editjpilot.c:276 ../src/editldap.c:520
+#: ../src/compose.c:7242 ../src/editjpilot.c:276 ../src/editldap.c:520
 #: ../src/editvcard.c:192 ../src/export.c:164 ../src/import.c:163
 #: ../src/importmutt.c:239 ../src/importpine.c:238
-#: ../src/plugins/archive/archiver_gtk.c:1028
+#: ../src/plugins/archive/archiver_gtk.c:1029
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:188
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:208
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:181
@@ -2338,24 +2589,23 @@ msgstr "Uložiť správu do "
 msgid "_Browse"
 msgstr "_Prechádzať"
 
-#: ../src/compose.c:7710
+#: ../src/compose.c:7714
 msgid "Hea_der"
 msgstr "H_lavička"
 
-#: ../src/compose.c:7715
+#: ../src/compose.c:7719
 msgid "_Attachments"
 msgstr "_Prílohy"
 
-#: ../src/compose.c:7729
+#: ../src/compose.c:7733
 msgid "Othe_rs"
 msgstr "_Ostatné"
 
-#: ../src/compose.c:7744 ../src/gtk/headers.h:18
-#: ../src/plugins/pdf_viewer/poppler_viewer.c:702 ../src/summary_search.c:440
-msgid "Subject:"
-msgstr "Predmet:"
+#: ../src/compose.c:7748
+msgid "_Subject:"
+msgstr "P_redmet:"
 
-#: ../src/compose.c:7966
+#: ../src/compose.c:7970
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2364,20 +2614,20 @@ msgstr ""
 "Nemožno spustiť kontrolu preklepov.\n"
 "%s"
 
-#: ../src/compose.c:8072
+#: ../src/compose.c:8076
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Od: <i>%s</i>"
 
-#: ../src/compose.c:8106
+#: ../src/compose.c:8119
 msgid "Account to use for this email"
 msgstr "Účet, použitý pre tento email"
 
-#: ../src/compose.c:8108
+#: ../src/compose.c:8121
 msgid "Sender address to be used"
 msgstr "Adresa odosielateľa"
 
-#: ../src/compose.c:8272
+#: ../src/compose.c:8285
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2386,64 +2636,68 @@ msgstr ""
 "Nemožno načítať systém súkromia „%s”. Nebude možné podpísať ani zašifrovať "
 "túto správu."
 
-#: ../src/compose.c:8372 ../src/plugins/archive/archiver_gtk.c:1082
+#: ../src/compose.c:8385 ../src/plugins/archive/archiver_gtk.c:1083
 msgid "_None"
 msgstr "Žiad_na"
 
-#: ../src/compose.c:8473 ../src/prefs_template.c:753
+#: ../src/compose.c:8486 ../src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Telo šablóny má chybu v riadku %d."
 
-#: ../src/compose.c:8589
+#: ../src/compose.c:8602
 msgid "Template From format error."
 msgstr "Chyba v tvare hlavičky odosielateľa v šablóne."
 
-#: ../src/compose.c:8607
+#: ../src/compose.c:8620
 msgid "Template To format error."
 msgstr "Chyba v tvare hlavičky príjemcu v šablóne."
 
-#: ../src/compose.c:8625
+#: ../src/compose.c:8638
 msgid "Template Cc format error."
 msgstr "Chyba v tvare hlavičky kópie v šablóne."
 
-#: ../src/compose.c:8643
+#: ../src/compose.c:8656
 msgid "Template Bcc format error."
 msgstr "Chyba v tvare hlavičky slepej kópie v šablóne."
 
-#: ../src/compose.c:8662
+#: ../src/compose.c:8674
+msgid "Template Reply-To format error."
+msgstr "Chyba vo formáte šablóny Odpovedať."
+
+#: ../src/compose.c:8693
 msgid "Template subject format error."
-msgstr "Chyba v tvare hlavičky predmetu v šablóne."
+msgstr "Chyba vo formáte predmetu šablóny."
 
-#: ../src/compose.c:8930
+#: ../src/compose.c:8961
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: ../src/compose.c:8945
+#: ../src/compose.c:8976
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: ../src/compose.c:9019
+#: ../src/compose.c:9050
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: ../src/compose.c:9036
+#: ../src/compose.c:9067
 msgid "MIME type"
 msgstr "Typ MIME"
 
-#: ../src/compose.c:9077
+#: ../src/compose.c:9108
 msgid "Encoding"
 msgstr "Kódovanie"
 
-#: ../src/compose.c:9097
+#: ../src/compose.c:9128
 msgid "Path"
 msgstr "Cesta"
 
-#: ../src/compose.c:9098
+#: ../src/compose.c:9129
 msgid "File name"
 msgstr "Názov súboru"
 
-#: ../src/compose.c:9290
+#: ../src/compose.c:9321
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2454,15 +2708,15 @@ msgstr ""
 "Vynútiť ukončenie procesu?\n"
 "ID skupiny procesu: %d"
 
-#: ../src/compose.c:9685 ../src/messageview.c:1095
+#: ../src/compose.c:9716 ../src/messageview.c:1095
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail potrebuje na odoslanie tejto správy pripojenie k sieti."
 
-#: ../src/compose.c:9711
+#: ../src/compose.c:9742
 msgid "Could not queue message."
 msgstr "Nemožno zaradiť správu do fronty na odoslanie."
 
-#: ../src/compose.c:9713
+#: ../src/compose.c:9744
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2473,15 +2727,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/compose.c:9891
+#: ../src/compose.c:9922
 msgid "Could not save draft."
 msgstr "Koncept nemožno uložiť."
 
-#: ../src/compose.c:9895
+#: ../src/compose.c:9926
 msgid "Could not save draft"
 msgstr "Koncept nemožno uložiť"
 
-#: ../src/compose.c:9896
+#: ../src/compose.c:9927
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2489,24 +2743,24 @@ msgstr ""
 "Koncept nemožno uložiť.\n"
 "Chcete pokračovať v písaní, alebo zahodiť rozpísanú správu?"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Cancel exit"
 msgstr "+_Zrušiť skončenie"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Discard email"
 msgstr "_Zahodiť správu"
 
-#: ../src/compose.c:10058 ../src/compose.c:10072
+#: ../src/compose.c:10089 ../src/compose.c:10103
 msgid "Select file"
 msgstr "Zvoľte súbor"
 
-#: ../src/compose.c:10086
+#: ../src/compose.c:10117
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Súbor „%s” nemožno čítať."
 
-#: ../src/compose.c:10088
+#: ../src/compose.c:10119
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2515,63 +2769,63 @@ msgstr ""
 "Súbor „%s” obsahuje neplatné znaky pre\n"
 "súčasné kódovanie, vloženie môže byť nepresné."
 
-#: ../src/compose.c:10175
+#: ../src/compose.c:10206
 msgid "Discard message"
 msgstr "Zahodiť správu"
 
-#: ../src/compose.c:10176
+#: ../src/compose.c:10207
 msgid "This message has been modified. Discard it?"
 msgstr "Táto správa bola zmenená. Zahodiť zmeny?"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Discard"
 msgstr "_Zahodiť"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Save to Drafts"
 msgstr "Uložiť medzi _koncepty"
 
-#: ../src/compose.c:10179
+#: ../src/compose.c:10210
 msgid "Save changes"
 msgstr "Uložiť zmeny"
 
-#: ../src/compose.c:10180
+#: ../src/compose.c:10211
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Táto správa bola zmenená. Uložiť posledné zmeny?"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "_Don't save"
 msgstr "_Neukladať"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "+_Save to Drafts"
 msgstr "+Uložiť medzi _koncepty"
 
-#: ../src/compose.c:10251
+#: ../src/compose.c:10282
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použiť šablónu „%s”?"
 
-#: ../src/compose.c:10253
+#: ../src/compose.c:10284
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: ../src/compose.c:10254 ../src/prefs_actions.c:329
+#: ../src/compose.c:10285 ../src/prefs_actions.c:329
 #: ../src/prefs_filtering_action.c:610 ../src/prefs_filtering.c:477
-#: ../src/prefs_matcher.c:772 ../src/prefs_template.c:309
+#: ../src/prefs_matcher.c:775 ../src/prefs_template.c:311
 #: ../src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Nahradiť"
 
-#: ../src/compose.c:10254
+#: ../src/compose.c:10285
 msgid "_Insert"
 msgstr "_Vložiť"
 
-#: ../src/compose.c:11141
+#: ../src/compose.c:11149
 msgid "Insert or attach?"
 msgstr "Vložiť, alebo pripojiť ako prílohu?"
 
-#: ../src/compose.c:11142
+#: ../src/compose.c:11150
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2579,16 +2833,16 @@ msgstr ""
 "Chcete vložiť obsah súboru do tela správy, alebo ho chcete pripojiť k správe "
 "ako prílohu?"
 
-#: ../src/compose.c:11144
+#: ../src/compose.c:11152
 msgid "_Attach"
 msgstr "_Pripojiť"
 
-#: ../src/compose.c:11361
+#: ../src/compose.c:11369
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba v tvare citácie na riadku %d."
 
-#: ../src/compose.c:11656
+#: ../src/compose.c:11664
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2849,15 +3103,15 @@ msgstr "Upraviť zložku"
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov zložky:"
 
-#: ../src/editgroup.c:556 ../src/foldersel.c:581 ../src/imap_gtk.c:195
+#: ../src/editgroup.c:556 ../src/foldersel.c:585 ../src/imap_gtk.c:195
 #: ../src/mh_gtk.c:145 ../src/plugins/mailmbox/plugin_gtk.c:239
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:89
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "New folder"
 msgstr "Nová zložka"
 
-#: ../src/editgroup.c:557 ../src/foldersel.c:582 ../src/mh_gtk.c:146
+#: ../src/editgroup.c:557 ../src/foldersel.c:586 ../src/mh_gtk.c:146
 #: ../src/plugins/mailmbox/plugin_gtk.c:240
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:90
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov novej zložky:"
 
@@ -3202,7 +3456,7 @@ msgstr "Pridať nový vCard záznam"
 
 #: ../src/etpan/etpan-ssl.c:167
 msgid "Impossible to set the client certificate.\n"
-msgstr ""
+msgstr "Nemožno nastaviť certifikát klienta.\n"
 
 #: ../src/exphtmldlg.c:106
 msgid "Please specify output directory and file to create."
@@ -3273,9 +3527,9 @@ msgstr "Štýlopis"
 #. * can always get back the SummaryView pointer.
 #: ../src/exphtmldlg.c:453 ../src/gtk/colorlabel.c:406
 #: ../src/gtk/gtkaspell.c:1571 ../src/gtk/gtkaspell.c:2231
-#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1174
+#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1177
 #: ../src/plugins/archive/archiver_prefs.c:241
-#: ../src/plugins/libravatar/libravatar_prefs.c:187 ../src/prefs_account.c:949
+#: ../src/plugins/libravatar/libravatar_prefs.c:206 ../src/prefs_account.c:949
 #: ../src/prefs_toolbar.c:780 ../src/prefs_toolbar.c:1465
 #: ../src/summaryview.c:6008
 msgid "None"
@@ -3287,7 +3541,7 @@ msgid "Default"
 msgstr "Štandardné"
 
 #: ../src/exphtmldlg.c:455 ../src/plugins/pgpcore/select-keys.c:244
-#: ../src/plugins/pgpcore/sgpgme.c:148
+#: ../src/plugins/pgpcore/sgpgme.c:148 ../src/plugins/pgpcore/sgpgme.c:164
 msgid "Full"
 msgstr "Plné"
 
@@ -3514,7 +3768,7 @@ msgstr "Exportovať adresár do súboru LDIF"
 msgid "Distinguished Name"
 msgstr "Distguished Name"
 
-#: ../src/export.c:113 ../src/summaryview.c:8117
+#: ../src/export.c:113 ../src/summaryview.c:8120
 msgid "Export to mbox file"
 msgstr "Exportovať do súboru mbox"
 
@@ -3551,7 +3805,7 @@ msgid "Full Name"
 msgstr "Celé meno"
 
 #: ../src/exporthtml.c:771 ../src/importldif.c:1022
-#: ../src/plugins/archive/archiver_gtk.c:736
+#: ../src/plugins/archive/archiver_gtk.c:737
 msgid "Attributes"
 msgstr "Atribúty"
 
@@ -3594,7 +3848,7 @@ msgstr "Súbor %s je prázdny alebo poškodený! Chcete použiť záložný súb
 
 #: ../src/filtering.c:619 ../src/filtering.c:694 ../src/filtering.c:723
 msgid "rule is not account-based\n"
-msgstr ""
+msgstr "pravidlo nie je závislé na účte\n"
 
 #: ../src/filtering.c:623
 #, c-format
@@ -3602,18 +3856,22 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
 msgstr ""
+"pravidlo je závislé na účte [id=%d, názov='%s'], vyhovuje účtu práve "
+"použitému na získanie správ\n"
 
 #: ../src/filtering.c:625 ../src/filtering.c:642 ../src/filtering.c:643
 #: ../src/filtering.c:667 ../src/filtering.c:685 ../src/filtering.c:712
 #: ../src/filtering.c:713 ../src/filtering.c:730 ../src/filtering.c:731
 msgid "NON_EXISTENT"
-msgstr ""
+msgstr "NE_EXISTUJÚCE"
 
 #: ../src/filtering.c:633
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
+"pravidlo je závislé na účte, nevyhovuje účtu práve použitému na získanie "
+"správ\n"
 
 #: ../src/filtering.c:640
 #, c-format
@@ -3621,11 +3879,15 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
 msgstr ""
+"pravidlo je závislé na účte [id=%d, názov='%s'], nevyhovuje účtu práve "
+"použitému na získanie správ [id=%d, názov='%s']\n"
 
 #: ../src/filtering.c:659
 msgid ""
 "rule is not account-based, all rules are applied on user request anyway\n"
 msgstr ""
+"pravidlo nie je závislé na účte, na žiadosť používateľa boli i tak "
+"aplikované všetky pravidlá\n"
 
 #: ../src/filtering.c:665
 #, c-format
@@ -3633,15 +3895,19 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
 "request\n"
 msgstr ""
+"pravidlo je závislé na účte [id=%d, názov='%s'], ale na žiadosť používateľa "
+"boli aplikované všetky pravidlá\n"
 
 #: ../src/filtering.c:683
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
+"pravidlo je závislé na účte [id=%d, názov='%s'], na žiadosť používateľa "
+"preskočené\n"
 
 #: ../src/filtering.c:688
 msgid "rule is account-based, skipped on user request\n"
-msgstr ""
+msgstr "pravidlo je závislé na účte, na žiadosť používateľa preskočené\n"
 
 #: ../src/filtering.c:710
 #, c-format
@@ -3649,10 +3915,12 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching current account [id="
 "%d, name='%s']\n"
 msgstr ""
+"pravidlo je závislé na účte [id=%d, názov='%s'], nevyhovuje práve použitému "
+"účtu [id=%d, názov='%s']\n"
 
 #: ../src/filtering.c:716
 msgid "rule is account-based, not matching current account\n"
-msgstr ""
+msgstr "pravidlo je závislé na účte, nevyhovuje práve použitému účtu\n"
 
 #: ../src/filtering.c:728
 #, c-format
@@ -3660,70 +3928,66 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], current account [id=%d, "
 "name='%s']\n"
 msgstr ""
+"pravidlo je závislé na účte [id=%d, názov='%s'], práve použitý účet [id=%d, "
+"názov='%s']\n"
 
 #: ../src/filtering.c:768
 #, c-format
 msgid "applying action [ %s ]\n"
-msgstr ""
+msgstr "aplikovanie akcie [ %s ]\n"
 
 #: ../src/filtering.c:773
 msgid "action could not apply\n"
-msgstr ""
+msgstr "akciu nemožno aplikovať\n"
 
 #: ../src/filtering.c:775
 #, c-format
 msgid "no further processing after action [ %s ]\n"
-msgstr ""
+msgstr "žiadne ďalšie spracovanie po akcii [ %s ]\n"
 
 #: ../src/filtering.c:826
-#, fuzzy, c-format
+#, c-format
 msgid "processing rule '%s' [ %s ]\n"
-msgstr "Sp_ustiť pravidlá spracovania"
+msgstr "spracovanie pravidla „%s” [ %s ]\n"
 
 #: ../src/filtering.c:830
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "spracovanie pravidla <bez mena> [ %s ]\n"
 
 #: ../src/filtering.c:848
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
-msgstr ""
+msgstr "vypnuté pravidlo „%s” [ %s ]\n"
 
 #: ../src/filtering.c:852
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "vypnuté pravidlo [ %s ]\n"
 
 #: ../src/filtering.c:890
-#, fuzzy
 msgid "undetermined"
-msgstr "Nezadaná"
+msgstr "neurčené"
 
 #: ../src/filtering.c:894
-#, fuzzy
 msgid "incorporation"
-msgstr "filtrovaní pri príjme"
+msgstr "začlenenie"
 
 #: ../src/filtering.c:898
-#, fuzzy
 msgid "manually"
-msgstr "_Manuál"
+msgstr "manuálne"
 
 #: ../src/filtering.c:902
-#, fuzzy
 msgid "folder processing"
-msgstr "Spustiť sprac_ovanie pravidiel"
+msgstr "spracovanie zložky"
 
 #: ../src/filtering.c:906
-#, fuzzy
 msgid "pre-processing"
-msgstr "Pred-sprac_ovanie…"
+msgstr "pred-spracovanie"
 
 #: ../src/filtering.c:910
-#, fuzzy
 msgid "post-processing"
-msgstr "Po-spra_covanie…"
+msgstr "po-spracovanie"
 
 #: ../src/filtering.c:927
 #, c-format
@@ -3735,10 +3999,16 @@ msgid ""
 "%s%s %s\n"
 "%s%s %s\n"
 msgstr ""
+"filtrovanie správy (%s%s%s)\n"
+"%ssúbor správy: %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
 
 #: ../src/filtering.c:929 ../src/filtering.c:938
 msgid ": "
-msgstr ""
+msgstr ": "
 
 #: ../src/filtering.c:936
 #, c-format
@@ -3746,6 +4016,8 @@ msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
 msgstr ""
+"filtrovanie správy (%s%s%s)\n"
+"%ssúbor správy: %s\n"
 
 #: ../src/folder.c:1564 ../src/foldersel.c:403 ../src/prefs_folder_item.c:306
 msgid "Inbox"
@@ -3803,38 +4075,37 @@ msgstr "Synchronizujem %s na použitie pri odpojení…\n"
 msgid "Select folder"
 msgstr "Zvoľte zložku"
 
-#: ../src/foldersel.c:583 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
+#: ../src/foldersel.c:587 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
 #: ../src/plugins/mailmbox/plugin_gtk.c:241
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "NewFolder"
 msgstr "Nová zložka"
 
-#: ../src/foldersel.c:591 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
+#: ../src/foldersel.c:595 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
 #: ../src/imap_gtk.c:272 ../src/imap_gtk.c:277 ../src/mh_gtk.c:155
 #: ../src/mh_gtk.c:259 ../src/news_gtk.c:315
 #: ../src/plugins/mailmbox/plugin_gtk.c:249
 #: ../src/plugins/mailmbox/plugin_gtk.c:416
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:97
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:339
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
 #: ../src/plugins/vcalendar/vcal_folder.c:2040
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "Názov zložky nemôže obsahovať „%c”."
 
-#: ../src/foldersel.c:601 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
+#: ../src/foldersel.c:605 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
 #: ../src/mh_gtk.c:165 ../src/mh_gtk.c:266 ../src/news_gtk.c:322
 #: ../src/plugins/mailmbox/plugin_gtk.c:261
 #: ../src/plugins/mailmbox/plugin_gtk.c:425
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:107
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:346
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:211
 #: ../src/plugins/vcalendar/vcal_folder.c:2047
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Zložka „%s” už existuje."
 
-#: ../src/foldersel.c:608 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
+#: ../src/foldersel.c:612 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
 #: ../src/plugins/mailmbox/plugin_gtk.c:268
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:113
+#: ../src/plugins/rssyl/opml_import.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:121
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Nemožno vytvoriť zložku „%s”."
@@ -3847,7 +4118,7 @@ msgstr "Označiť _všetky ako prečítané"
 msgid "R_un processing rules"
 msgstr "Sp_ustiť pravidlá spracovania"
 
-#: ../src/folderview.c:233 ../src/mainwindow.c:544
+#: ../src/folderview.c:233 ../src/mainwindow.c:546
 msgid "_Search folder..."
 msgstr "Pre_hľadať zložku…"
 
@@ -3866,7 +4137,7 @@ msgstr "Odoslať _front…"
 #. F_COL_FOLDER
 #: ../src/folderview.c:380 ../src/folderview.c:427
 #: ../src/plugins/notification/notification_lcdproc.c:141
-#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:388
+#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:391
 #: ../src/summaryview.c:6284
 msgid "New"
 msgstr "Nový"
@@ -3874,7 +4145,7 @@ msgstr "Nový"
 #. F_COL_NEW
 #: ../src/folderview.c:381 ../src/folderview.c:428
 #: ../src/plugins/notification/notification_lcdproc.c:145
-#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:387
+#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:390
 #: ../src/summaryview.c:6286
 msgid "Unread"
 msgstr "Neprečítané"
@@ -3896,21 +4167,21 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie zložky…"
 
-#: ../src/folderview.c:823 ../src/summaryview.c:4117 ../src/summaryview.c:4119
+#: ../src/folderview.c:823 ../src/summaryview.c:4119 ../src/summaryview.c:4121
 msgid "Mark all as read"
 msgstr "Označiť všetky ako prečítané"
 
-#: ../src/folderview.c:824 ../src/summaryview.c:4118
+#: ../src/folderview.c:824 ../src/summaryview.c:4120
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Naozaj chcete označiť všetky správy tejto zložky ako prečítané?"
 
-#: ../src/folderview.c:982 ../src/imap.c:4528 ../src/mainwindow.c:5134
+#: ../src/folderview.c:982 ../src/imap.c:4574 ../src/mainwindow.c:5157
 #: ../src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Prehľadávanie zložky %s%c%s…"
 
-#: ../src/folderview.c:986 ../src/imap.c:4533 ../src/mainwindow.c:5139
+#: ../src/folderview.c:986 ../src/imap.c:4579 ../src/mainwindow.c:5162
 #: ../src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
@@ -3944,60 +4215,60 @@ msgstr "Nemožno skenovať obsah zložky %s\n"
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové správy vo všetkých zložkách…"
 
-#: ../src/folderview.c:2005
+#: ../src/folderview.c:2046
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Zatváram zložku %s…"
 
 #. Open Folder
 #. TODO: wwp: avoid displaying (null) in the status bar
-#: ../src/folderview.c:2100
+#: ../src/folderview.c:2141
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Otváram zložku %s…"
 
-#: ../src/folderview.c:2118
+#: ../src/folderview.c:2159
 msgid "Folder could not be opened."
 msgstr "Zložku nemožno otvoriť."
 
-#: ../src/folderview.c:2261 ../src/mainwindow.c:2877 ../src/mainwindow.c:2881
+#: ../src/folderview.c:2302 ../src/mainwindow.c:2887 ../src/mainwindow.c:2891
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: ../src/folderview.c:2262
+#: ../src/folderview.c:2303
 msgid "Delete all messages in trash?"
 msgstr "Vymazať všetky správy z koša?"
 
-#: ../src/folderview.c:2263
+#: ../src/folderview.c:2304
 msgid "+_Empty trash"
 msgstr "+_Vyprázdniť kôš"
 
-#: ../src/folderview.c:2307 ../src/inc.c:1540 ../src/toolbar.c:2607
+#: ../src/folderview.c:2348 ../src/inc.c:1540 ../src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Varovanie odpojenia"
 
-#: ../src/folderview.c:2308 ../src/toolbar.c:2608
+#: ../src/folderview.c:2349 ../src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Pracujete odpojený. Pripojiť?"
 
-#: ../src/folderview.c:2319 ../src/toolbar.c:2627
+#: ../src/folderview.c:2360 ../src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Odoslať správy vo fronte"
 
-#: ../src/folderview.c:2320 ../src/toolbar.c:2628
+#: ../src/folderview.c:2361 ../src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Odoslať všetky správy vo fronte?"
 
-#: ../src/folderview.c:2321 ../src/messageview.c:854 ../src/messageview.c:871
+#: ../src/folderview.c:2362 ../src/messageview.c:854 ../src/messageview.c:871
 #: ../src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Odoslať"
 
-#: ../src/folderview.c:2329 ../src/toolbar.c:2647
+#: ../src/folderview.c:2370 ../src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Pri odosielaní správ vo fronte nastali chyby."
 
-#: ../src/folderview.c:2332 ../src/main.c:2714 ../src/toolbar.c:2650
+#: ../src/folderview.c:2373 ../src/main.c:2714 ../src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4006,65 +4277,65 @@ msgstr ""
 "Pri odosielaní správ vo fronte nastali chyby:\n"
 "%s"
 
-#: ../src/folderview.c:2409
+#: ../src/folderview.c:2450
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Naozaj chcete kopírovať zložku „%s” do „%s”?"
 
-#: ../src/folderview.c:2410
+#: ../src/folderview.c:2451
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Naozaj chcete presunúť zložku „%s” ako podzložku „%s”?"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Copy folder"
 msgstr "Kopírovať zložku"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Move folder"
 msgstr "Presunúť zložku"
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopírujem %s do %s…"
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Presúvam %s do %s…"
 
-#: ../src/folderview.c:2454
+#: ../src/folderview.c:2495
 msgid "Source and destination are the same."
 msgstr "Zdroj je identický s cieľom."
 
-#: ../src/folderview.c:2457
+#: ../src/folderview.c:2498
 msgid "Can't copy a folder to one of its children."
 msgstr "Nie je možné skopírovať zložku do jeho potomka."
 
-#: ../src/folderview.c:2458
+#: ../src/folderview.c:2499
 msgid "Can't move a folder to one of its children."
 msgstr "Nie je možné presunúť zložku do jeho potomka."
 
-#: ../src/folderview.c:2461
+#: ../src/folderview.c:2502
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Zložky nemožno presúvať medzi rôznymi schránkami."
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Copy failed!"
 msgstr "Kopírovanie zlyhalo!"
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Move failed!"
 msgstr "Presun zlyhal!"
 
-#: ../src/folderview.c:2515
+#: ../src/folderview.c:2556
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Nastavenie spracovania zložky %s"
 
-#: ../src/folderview.c:2943 ../src/summaryview.c:4558
-#: ../src/summaryview.c:4657
+#: ../src/folderview.c:2984 ../src/summaryview.c:4560
+#: ../src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Zvolená cieľová zložka môže obsahovať len podzložky."
 
@@ -4605,92 +4876,91 @@ msgstr ""
 
 #: ../src/gtk/gtkutils.c:1907
 msgid "Failed."
-msgstr ""
+msgstr "Zlyhalo."
 
 #: ../src/gtk/gtkutils.c:1970
-#, fuzzy
 msgid "Configuring..."
-msgstr "Nastav_enie"
+msgstr "Nastavovanie…"
 
 #. RFC2822
 #. S_COL_TO
 #. date expression
 #. S_COL_TO
-#: ../src/gtk/headers.h:8 ../src/prefs_filtering_action.c:1259
-#: ../src/prefs_matcher.c:2158 ../src/prefs_summary_column.c:84
+#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1259
+#: ../src/prefs_matcher.c:2174 ../src/prefs_summary_column.c:84
 #: ../src/quote_fmt.c:49 ../src/summaryview.c:444
 msgid "Date"
 msgstr "Dátum"
 
-#: ../src/gtk/headers.h:8
+#: ../src/gtk/headers.h:9
 msgid "Date:"
 msgstr "Dátum:"
 
 #. S_COL_SUBJECT
 #. date
 #. S_COL_SUBJECT
-#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1256
-#: ../src/prefs_matcher.c:2155 ../src/prefs_summary_column.c:82
+#: ../src/gtk/headers.h:10 ../src/prefs_filtering_action.c:1256
+#: ../src/prefs_matcher.c:2171 ../src/prefs_summary_column.c:82
 #: ../src/quote_fmt.c:50 ../src/summaryview.c:442
 msgid "From"
 msgstr "Od"
 
-#: ../src/gtk/headers.h:9 ../src/summary_search.c:426
+#: ../src/gtk/headers.h:10 ../src/summary_search.c:426
 msgid "From:"
 msgstr "Od:"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender"
 msgstr "Odosielateľ"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender:"
 msgstr "Odosielateľ:"
 
-#: ../src/gtk/headers.h:11
+#: ../src/gtk/headers.h:12
 msgid "Reply-To"
 msgstr "Odpovedať komu"
 
 #. S_COL_FROM
 #. subject
 #. S_COL_FROM
-#: ../src/gtk/headers.h:12 ../src/prefs_filtering_action.c:1257
-#: ../src/prefs_matcher.c:2156 ../src/prefs_summary_column.c:83
+#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1257
+#: ../src/prefs_matcher.c:2172 ../src/prefs_summary_column.c:83
 #: ../src/quote_fmt.c:57 ../src/summaryview.c:443
 msgid "To"
 msgstr "Komu"
 
 #. to
-#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1258
-#: ../src/prefs_matcher.c:2157 ../src/quote_fmt.c:58
+#: ../src/gtk/headers.h:14 ../src/prefs_filtering_action.c:1258
+#: ../src/prefs_matcher.c:2173 ../src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Kópia"
 
-#: ../src/gtk/headers.h:14
+#: ../src/gtk/headers.h:15
 msgid "Bcc"
 msgstr "Slepá kópia"
 
 #. references
-#: ../src/gtk/headers.h:15 ../src/prefs_filtering_action.c:1260
-#: ../src/prefs_matcher.c:2159 ../src/quote_fmt.c:61
+#: ../src/gtk/headers.h:16 ../src/prefs_filtering_action.c:1260
+#: ../src/prefs_matcher.c:2175 ../src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Message-ID"
 
-#: ../src/gtk/headers.h:15
+#: ../src/gtk/headers.h:16
 msgid "Message-ID:"
 msgstr "Message-ID:"
 
-#: ../src/gtk/headers.h:16
+#: ../src/gtk/headers.h:17
 msgid "In-Reply-To"
 msgstr "In-Reply-To"
 
 #. newsgroups
-#: ../src/gtk/headers.h:17 ../src/prefs_filtering_action.c:1262
-#: ../src/prefs_matcher.c:2161 ../src/quote_fmt.c:60
+#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1262
+#: ../src/prefs_matcher.c:2177 ../src/quote_fmt.c:60
 msgid "References"
 msgstr "Odkazy"
 
-#: ../src/gtk/headers.h:17
+#: ../src/gtk/headers.h:18
 msgid "References:"
 msgstr "Odkazy:"
 
@@ -4698,328 +4968,333 @@ msgstr "Odkazy:"
 #. initial of sender
 #. S_COL_STATUS
 #. S_COL_MIME
-#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1255
-#: ../src/prefs_matcher.c:2154 ../src/prefs_summary_column.c:81
+#: ../src/gtk/headers.h:19 ../src/prefs_filtering_action.c:1255
+#: ../src/prefs_matcher.c:2170 ../src/prefs_summary_column.c:81
 #: ../src/quote_fmt.c:56 ../src/summaryview.c:441
 msgid "Subject"
 msgstr "Predmet"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:19 ../src/plugins/pdf_viewer/poppler_viewer.c:702
+#: ../src/summary_search.c:440
+msgid "Subject:"
+msgstr "Predmet:"
+
+#: ../src/gtk/headers.h:20
 msgid "Comments"
 msgstr "Komentáre"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:20
 msgid "Comments:"
 msgstr "Komentáre:"
 
-#: ../src/gtk/headers.h:20
+#: ../src/gtk/headers.h:21
 msgid "Keywords"
 msgstr "Kľúčové slová"
 
-#: ../src/gtk/headers.h:20 ../src/plugins/pdf_viewer/poppler_viewer.c:704
+#: ../src/gtk/headers.h:21 ../src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Keywords:"
 msgstr "Kľúčové slová:"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date"
 msgstr "Resent-Date"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date:"
 msgstr "Resent-Date:"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From"
 msgstr "Resent-From"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From:"
 msgstr "Resent-From:"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender"
 msgstr "Resent-Sender"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender:"
 msgstr "Resent-Sender:"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To"
 msgstr "Resent-To"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To:"
 msgstr "Resent-To:"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc"
 msgstr "Resent-Cc"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc:"
 msgstr "Resent-Cc:"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc"
 msgstr "Resent-Bcc"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc:"
 msgstr "Resent-Bcc:"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID"
 msgstr "Resent-Message-ID"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID:"
 msgstr "Resent-Message-ID:"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path"
 msgstr "Return-Path"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path:"
 msgstr "Return-Path:"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received"
 msgstr "Received"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received:"
 msgstr "Received:"
 
 #. more
 #. cc
-#: ../src/gtk/headers.h:32 ../src/prefs_filtering_action.c:1261
-#: ../src/prefs_matcher.c:2160 ../src/quote_fmt.c:59
+#: ../src/gtk/headers.h:33 ../src/prefs_filtering_action.c:1261
+#: ../src/prefs_matcher.c:2176 ../src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Diskusné skupiny"
 
-#: ../src/gtk/headers.h:33
+#: ../src/gtk/headers.h:34
 msgid "Followup-To"
 msgstr "Followup-To"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To"
 msgstr "Delivered-To"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To:"
 msgstr "Delivered-To:"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen"
 msgstr "Seen"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen:"
 msgstr "Seen:"
 
 #. S_COL_MARK
-#: ../src/gtk/headers.h:36 ../src/gtk/progressdialog.c:149
+#: ../src/gtk/headers.h:37 ../src/gtk/progressdialog.c:149
 #: ../src/gtk/sslcertwindow.c:164 ../src/prefs_summary_column.c:79
 #: ../src/summaryview.c:2793
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtk/headers.h:36 ../src/prefs_themes.c:906
+#: ../src/gtk/headers.h:37 ../src/prefs_themes.c:906
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face"
 msgstr "Face"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face:"
 msgstr "Face:"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To"
 msgstr "Disposition-Notification-To"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To:"
 msgstr "Disposition-Notification-To:"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To"
 msgstr "Return-Receipt-To"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To:"
 msgstr "Return-Receipt-To:"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent"
 msgstr "User-Agent"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent:"
 msgstr "User-Agent:"
 
-#: ../src/gtk/headers.h:41
+#: ../src/gtk/headers.h:42
 msgid "Content-Type"
 msgstr "Content-Type"
 
-#: ../src/gtk/headers.h:41 ../src/image_viewer.c:327
+#: ../src/gtk/headers.h:42 ../src/image_viewer.c:327
 msgid "Content-Type:"
 msgstr "Content-Type:"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding"
 msgstr "Content-Transfer-Encoding"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding:"
 msgstr "Content-Transfer-Encoding:"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version"
 msgstr "MIME-Version"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version:"
 msgstr "MIME-Version:"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence"
 msgstr "Precedence"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence:"
 msgstr "Precedence:"
 
-#: ../src/gtk/headers.h:45 ../src/prefs_account.c:1073
+#: ../src/gtk/headers.h:46 ../src/prefs_account.c:1073
 msgid "Organization"
 msgstr "Organizácia"
 
-#: ../src/gtk/headers.h:45
+#: ../src/gtk/headers.h:46
 msgid "Organization:"
 msgstr "Organizácia:"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List"
 msgstr "Mailing-List"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List:"
 msgstr "Mailing-List:"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post"
 msgstr "List-Post"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post:"
 msgstr "List-Post:"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe"
 msgstr "List-Subscribe"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe:"
 msgstr "List-Subscribe:"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe"
 msgstr "List-Unsubscribe"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe:"
 msgstr "List-Unsubscribe:"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help"
 msgstr "List-Help"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help:"
 msgstr "List-Help:"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive"
 msgstr "List-Archive"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive:"
 msgstr "List-Archive:"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner"
 msgstr "List-Owner"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner:"
 msgstr "List-Owner:"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label"
 msgstr "X-Label"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label:"
 msgstr "X-Label:"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer"
 msgstr "X-Mailer"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer:"
 msgstr "X-Mailer:"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status"
 msgstr "X-Status"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status:"
 msgstr "X-Status:"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face"
 msgstr "X-Face"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face:"
 msgstr "X-Face:"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive"
 msgstr "X-No-Archive"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive:"
 msgstr "X-No-Archive:"
 
 #. some common logical names referring to real header names
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to"
 msgstr "Odpoveď na"
 
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to:"
 msgstr "Odpoveď na:"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc"
 msgstr "Komu alebo Kópia"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc:"
 msgstr "Komu alebo Kópia:"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject"
 msgstr "Od, Komu alebo Predmet"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject:"
 msgstr "Od, Komu alebo Predmet:"
 
@@ -5208,10 +5483,10 @@ msgstr ""
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:457
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:400
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:550
-#: ../src/plugins/fancy/fancy_prefs.c:109
+#: ../src/plugins/fancy/fancy_prefs.c:114
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:178
 #: ../src/plugins/gdata/cm_gdata_prefs.c:145
-#: ../src/plugins/libravatar/libravatar_prefs.c:399
+#: ../src/plugins/libravatar/libravatar_prefs.c:439
 #: ../src/plugins/notification/notification_prefs.c:396
 #: ../src/plugins/notification/notification_prefs.c:410
 #: ../src/plugins/notification/notification_prefs.c:428
@@ -5221,9 +5496,9 @@ msgstr ""
 #: ../src/plugins/notification/notification_prefs.c:496
 #: ../src/plugins/notification/notification_prefs.c:513
 #: ../src/plugins/pgpcore/prefs_gpg.c:569
-#: ../src/plugins/rssyl/rssyl_prefs.c:65
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
+#: ../src/plugins/rssyl/rssyl_prefs.c:69
 #: ../src/plugins/spam_report/spam_report_prefs.c:79
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
 #: ../src/plugins/vcalendar/vcal_prefs.c:680 ../src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Zásuvné moduly"
@@ -5265,7 +5540,7 @@ msgstr "Načítané zásuvné moduly"
 msgid "Page Index"
 msgstr "Obsah Stránky"
 
-#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:828
+#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:831
 msgid "_Hide"
 msgstr "_Skryť"
 
@@ -5278,70 +5553,74 @@ msgstr "_Skryť"
 msgid "Account"
 msgstr "Účet"
 
-#: ../src/gtk/quicksearch.c:452
+#: ../src/gtk/quicksearch.c:451
 msgid "all messages"
 msgstr "všetky správy"
 
-#: ../src/gtk/quicksearch.c:453
+#: ../src/gtk/quicksearch.c:452
 msgid "messages whose age is greater than # days"
 msgstr "správy, ktoré sú staršie ako # dní"
 
-#: ../src/gtk/quicksearch.c:454
+#: ../src/gtk/quicksearch.c:453
 msgid "messages whose age is less than # days"
 msgstr "správy, ktoré sú novšie ako # dní"
 
-#: ../src/gtk/quicksearch.c:455
+#: ../src/gtk/quicksearch.c:454
 msgid "messages whose age is greater than # hours"
 msgstr "správy, ktoré sú staršie ako # hodín"
 
-#: ../src/gtk/quicksearch.c:456
+#: ../src/gtk/quicksearch.c:455
 msgid "messages whose age is less than # hours"
 msgstr "správy, ktoré sú novšie ako # hodín"
 
-#: ../src/gtk/quicksearch.c:457
+#: ../src/gtk/quicksearch.c:456
 msgid "messages which contain S in the message body"
 msgstr "správy, ktorých telo obsahuje S"
 
-#: ../src/gtk/quicksearch.c:458
+#: ../src/gtk/quicksearch.c:457
 msgid "messages which contain S in the whole message"
 msgstr "správy, ktoré obsahujú S kdekoľvek"
 
-#: ../src/gtk/quicksearch.c:459
+#: ../src/gtk/quicksearch.c:458
 msgid "messages carbon-copied to S"
 msgstr "správy s kópiou v S"
 
-#: ../src/gtk/quicksearch.c:460
+#: ../src/gtk/quicksearch.c:459
 msgid "message is either to: or cc: to S"
 msgstr "správa je buď to: alebo cc: S"
 
-#: ../src/gtk/quicksearch.c:461
+#: ../src/gtk/quicksearch.c:460
 msgid "deleted messages"
 msgstr "vymazané správy"
 
 #. * how I can filter deleted messages *
-#: ../src/gtk/quicksearch.c:462
+#: ../src/gtk/quicksearch.c:461
 msgid "messages which contain S in the Sender field"
 msgstr "správy, ktoré obsahujú S v hlavičke Sender"
 
-#: ../src/gtk/quicksearch.c:463
+#: ../src/gtk/quicksearch.c:462
 msgid "true if execute \"S\" succeeds"
 msgstr "pravda, ak je „S” vykonané úspešne"
 
-#: ../src/gtk/quicksearch.c:464
+#: ../src/gtk/quicksearch.c:463
 msgid "messages originating from user S"
 msgstr "správy pochádzajúce od používateľa S"
 
-#: ../src/gtk/quicksearch.c:465
+#: ../src/gtk/quicksearch.c:464
 msgid "forwarded messages"
 msgstr "správy poslané ďalej"
 
-#: ../src/gtk/quicksearch.c:466
+#: ../src/gtk/quicksearch.c:465
 msgid "messages which have attachments"
 msgstr "správy s prílohami"
 
+#: ../src/gtk/quicksearch.c:466
+msgid "messages which contain S in any header name or value"
+msgstr "správy, ktoré obsahujú S v hociktorej hodnote alebo názve hlavičke"
+
 #: ../src/gtk/quicksearch.c:467
-msgid "messages which contain header S"
-msgstr "správy, ktoré obsahujú hlavičku S"
+msgid "messages which contain S in the value of any header"
+msgstr "správy, ktoré obsahujú S v hodnote akejkoľvek hlavičky"
 
 #: ../src/gtk/quicksearch.c:468
 msgid "messages which contain S in Message-ID header"
@@ -5529,7 +5808,7 @@ msgstr "_Upraviť"
 
 #: ../src/gtk/quicksearch.c:819 ../src/gtk/quicksearch.c:834
 #: ../src/prefs_actions.c:347 ../src/prefs_filtering.c:495
-#: ../src/prefs_template.c:328
+#: ../src/prefs_template.c:330
 msgid "C_lear"
 msgstr "Vy_mazať"
 
@@ -5681,8 +5960,8 @@ msgstr "Značky:"
 #: ../src/plugins/notification/notification_popup.c:316
 #: ../src/plugins/notification/notification_popup.c:621
 #: ../src/plugins/notification/notification_trayicon.c:851
-#: ../src/summaryview.c:3351 ../src/summaryview.c:3369
-#: ../src/summaryview.c:3390
+#: ../src/summaryview.c:3353 ../src/summaryview.c:3371
+#: ../src/summaryview.c:3392
 msgid "(No From)"
 msgstr "(bez Odosielateľa)"
 
@@ -5690,7 +5969,7 @@ msgstr "(bez Odosielateľa)"
 #: ../src/plugins/notification/notification_popup.c:318
 #: ../src/plugins/notification/notification_popup.c:625
 #: ../src/plugins/notification/notification_trayicon.c:854
-#: ../src/summaryview.c:3403 ../src/summaryview.c:3407
+#: ../src/summaryview.c:3405 ../src/summaryview.c:3409
 msgid "(No Subject)"
 msgstr "(bez Predmetu)"
 
@@ -5698,7 +5977,7 @@ msgstr "(bez Predmetu)"
 msgid "Error:"
 msgstr "Chyba:"
 
-#: ../src/image_viewer.c:299 ../src/mimeview.c:2544
+#: ../src/image_viewer.c:299 ../src/mimeview.c:2545
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:698
 msgid "Filename:"
 msgstr "Názov súboru:"
@@ -5711,31 +5990,31 @@ msgstr "Veľkosť súboru:"
 msgid "Load Image"
 msgstr "Načítať obrázok"
 
-#: ../src/imap.c:577
+#: ../src/imap.c:583
 msgid "IMAP4 connection broken\n"
 msgstr "IMAP4 spojenie prerušené\n"
 
-#: ../src/imap.c:616
+#: ../src/imap.c:622
 #, c-format
 msgid "IMAP error on %s: authenticated\n"
 msgstr "Chyba IMAP na %s: autentifikovaný\n"
 
-#: ../src/imap.c:619
+#: ../src/imap.c:625
 #, c-format
 msgid "IMAP error on %s: not authenticated\n"
 msgstr "Chyba IMAP na %s: neautentifikovaný\n"
 
-#: ../src/imap.c:622
+#: ../src/imap.c:628
 #, c-format
 msgid "IMAP error on %s: bad state\n"
 msgstr "Chyba IMAP na %s: zlý stav\n"
 
-#: ../src/imap.c:625
+#: ../src/imap.c:631
 #, c-format
 msgid "IMAP error on %s: stream error\n"
 msgstr "Chyba IMAP na %s: chyba prúdu\n"
 
-#: ../src/imap.c:628
+#: ../src/imap.c:634
 #, c-format
 msgid ""
 "IMAP error on %s: parse error (very probably non-RFC compliance from the "
@@ -5744,22 +6023,22 @@ msgstr ""
 "Chyba IMAP na %s: chyba pri spracovaní (pravdepodobne server, ktorý "
 "nedodržiava RFC štandard)\n"
 
-#: ../src/imap.c:632
+#: ../src/imap.c:638
 #, c-format
 msgid "IMAP error on %s: connection refused\n"
 msgstr "Chyba IMAP na %s: spojenie odmietnuté\n"
 
-#: ../src/imap.c:635
+#: ../src/imap.c:641
 #, c-format
 msgid "IMAP error on %s: memory error\n"
 msgstr "Chyba IMAP na %s: chyba pamäte\n"
 
-#: ../src/imap.c:638
+#: ../src/imap.c:644
 #, c-format
 msgid "IMAP error on %s: fatal error\n"
 msgstr "Chyba IMAP na %s: fatálna chyba\n"
 
-#: ../src/imap.c:641
+#: ../src/imap.c:647
 #, c-format
 msgid ""
 "IMAP error on %s: protocol error(very probably non-RFC compliance from the "
@@ -5768,172 +6047,172 @@ msgstr ""
 "Chyba IMAP na %s: chyba protokolu (pravdepodobne server, ktorý nedodržiava "
 "RFC štandard)\n"
 
-#: ../src/imap.c:645
+#: ../src/imap.c:651
 #, c-format
 msgid "IMAP error on %s: connection not accepted\n"
 msgstr "Chyba IMAP na %s: spojenie nebolo prijaté\n"
 
-#: ../src/imap.c:648
+#: ../src/imap.c:654
 #, c-format
 msgid "IMAP error on %s: APPEND error\n"
 msgstr "Chyba IMAP na %s: chyba pri APPEND\n"
 
-#: ../src/imap.c:651
+#: ../src/imap.c:657
 #, c-format
 msgid "IMAP error on %s: NOOP error\n"
 msgstr "Chyba IMAP na %s: chyba pri NOOP\n"
 
-#: ../src/imap.c:654
+#: ../src/imap.c:660
 #, c-format
 msgid "IMAP error on %s: LOGOUT error\n"
 msgstr "Chyba IMAP na %s: chyba pri LOGOUT\n"
 
-#: ../src/imap.c:657
+#: ../src/imap.c:663
 #, c-format
 msgid "IMAP error on %s: CAPABILITY error\n"
 msgstr "Chyba IMAP na %s: chyba pri CAPABILITY\n"
 
-#: ../src/imap.c:660
+#: ../src/imap.c:666
 #, c-format
 msgid "IMAP error on %s: CHECK error\n"
 msgstr "Chyba IMAP na %s: chyba pri CHECK\n"
 
-#: ../src/imap.c:663
+#: ../src/imap.c:669
 #, c-format
 msgid "IMAP error on %s: CLOSE error\n"
 msgstr "Chyba IMAP na %s: chyba pri CLOSE\n"
 
-#: ../src/imap.c:666
+#: ../src/imap.c:672
 #, c-format
 msgid "IMAP error on %s: EXPUNGE error\n"
 msgstr "Chyba IMAP na %s: chyba pri EXPUNGE\n"
 
-#: ../src/imap.c:669
+#: ../src/imap.c:675
 #, c-format
 msgid "IMAP error on %s: COPY error\n"
 msgstr "Chyba IMAP na %s: chyba pri COPY\n"
 
-#: ../src/imap.c:672
+#: ../src/imap.c:678
 #, c-format
 msgid "IMAP error on %s: UID COPY error\n"
 msgstr "Chyba IMAP na %s: chyba pri UID COPY\n"
 
-#: ../src/imap.c:675
+#: ../src/imap.c:681
 #, c-format
 msgid "IMAP error on %s: CREATE error\n"
 msgstr "Chyba IMAP na %s: chyba pri CREATE\n"
 
-#: ../src/imap.c:678
+#: ../src/imap.c:684
 #, c-format
 msgid "IMAP error on %s: DELETE error\n"
 msgstr "Chyba IMAP na %s: chyba pri DELETE\n"
 
-#: ../src/imap.c:681
+#: ../src/imap.c:687
 #, c-format
 msgid "IMAP error on %s: EXAMINE error\n"
 msgstr "Chyba IMAP na %s: chyba pri EXAMINE\n"
 
-#: ../src/imap.c:684
+#: ../src/imap.c:690
 #, c-format
 msgid "IMAP error on %s: FETCH error\n"
 msgstr "Chyba IMAP na %s: chyba pri FETCH\n"
 
-#: ../src/imap.c:687
+#: ../src/imap.c:693
 #, c-format
 msgid "IMAP error on %s: UID FETCH error\n"
 msgstr "Chyba IMAP na %s: chyba pri UID FETCH\n"
 
-#: ../src/imap.c:690
+#: ../src/imap.c:696
 #, c-format
 msgid "IMAP error on %s: LIST error\n"
 msgstr "Chyba IMAP na %s: chyba pri LIST\n"
 
-#: ../src/imap.c:693
+#: ../src/imap.c:699
 #, c-format
 msgid "IMAP error on %s: LOGIN error\n"
 msgstr "Chyba IMAP na %s: chyba pri LOGIN\n"
 
-#: ../src/imap.c:696
+#: ../src/imap.c:702
 #, c-format
 msgid "IMAP error on %s: LSUB error\n"
 msgstr "Chyba IMAP na %s: chyba pri LSUB\n"
 
-#: ../src/imap.c:699
+#: ../src/imap.c:705
 #, c-format
 msgid "IMAP error on %s: RENAME error\n"
 msgstr "Chyba IMAP na %s: chyba pri RENAME\n"
 
-#: ../src/imap.c:702
+#: ../src/imap.c:708
 #, c-format
 msgid "IMAP error on %s: SEARCH error\n"
 msgstr "Chyba IMAP na %s: chyba pri SEARCH\n"
 
-#: ../src/imap.c:705
+#: ../src/imap.c:711
 #, c-format
 msgid "IMAP error on %s: UID SEARCH error\n"
 msgstr "Chyba IMAP na %s: chyba pri UID SEARCH\n"
 
-#: ../src/imap.c:708
+#: ../src/imap.c:714
 #, c-format
 msgid "IMAP error on %s: SELECT error\n"
 msgstr "Chyba IMAP na %s: chyba pri SELECT\n"
 
-#: ../src/imap.c:711
+#: ../src/imap.c:717
 #, c-format
 msgid "IMAP error on %s: STATUS error\n"
 msgstr "Chyba IMAP na %s: chyba pri STATUS\n"
 
-#: ../src/imap.c:714
+#: ../src/imap.c:720
 #, c-format
 msgid "IMAP error on %s: STORE error\n"
 msgstr "Chyba IMAP na %s: chyba pri STORE\n"
 
-#: ../src/imap.c:717
+#: ../src/imap.c:723
 #, c-format
 msgid "IMAP error on %s: UID STORE error\n"
 msgstr "Chyba IMAP na %s: chyba pri UID STORE\n"
 
-#: ../src/imap.c:720
+#: ../src/imap.c:726
 #, c-format
 msgid "IMAP error on %s: SUBSCRIBE error\n"
 msgstr "Chyba IMAP na %s: chyba pri SUBSCRIBE\n"
 
-#: ../src/imap.c:723
+#: ../src/imap.c:729
 #, c-format
 msgid "IMAP error on %s: UNSUBSCRIBE error\n"
 msgstr "Chyba IMAP na %s: chyba pri UNSUBSCRIBE\n"
 
-#: ../src/imap.c:726
+#: ../src/imap.c:732
 #, c-format
 msgid "IMAP error on %s: STARTTLS error\n"
 msgstr "Chyba IMAP na %s: chyba pri STARTTLS\n"
 
-#: ../src/imap.c:729
+#: ../src/imap.c:735
 #, c-format
 msgid "IMAP error on %s: INVAL error\n"
 msgstr "Chyba IMAP na %s: chyba pri INVAL\n"
 
-#: ../src/imap.c:732
+#: ../src/imap.c:738
 #, c-format
 msgid "IMAP error on %s: EXTENSION error\n"
 msgstr "Chyba IMAP na %s: chyba pri EXTENSION\n"
 
-#: ../src/imap.c:735
+#: ../src/imap.c:741
 #, c-format
 msgid "IMAP error on %s: SASL error\n"
 msgstr "Chyba IMAP na %s: chyba pri SASL\n"
 
-#: ../src/imap.c:739
+#: ../src/imap.c:745
 #, c-format
 msgid "IMAP error on %s: SSL error\n"
 msgstr "Chyba IMAP na %s: chyba pri SSL\n"
 
-#: ../src/imap.c:743
+#: ../src/imap.c:749
 #, c-format
 msgid "IMAP error on %s: Unknown error [%d]\n"
 msgstr "Chyba IMAP na %s: neznáma chyba [%d]\n"
 
-#: ../src/imap.c:928
+#: ../src/imap.c:934
 msgid ""
 "\n"
 "\n"
@@ -5945,7 +6224,7 @@ msgstr ""
 "Prihlásenie CRAM-MD5 funguje len ak bola knižnica libetpan zostavená s "
 "podporou SASL, a je nainštalovaný zásuvný modul CRAM-MD5 SASL."
 
-#: ../src/imap.c:934
+#: ../src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5957,37 +6236,37 @@ msgstr ""
 "Prihlásenie DIGEST-MD5 funguje len ak bola knižnica libetpan zostavená s "
 "podporou SASL, a je nainštalovaný zásuvný modul DIGEST-MD5 SASL."
 
-#: ../src/imap.c:941
+#: ../src/imap.c:947
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Spojenie k %s zlyhalo: prihlásenie odmietnuté.%s"
 
-#: ../src/imap.c:945
+#: ../src/imap.c:951
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Spojenie k %s zlyhalo: prihlásenie odmietnuté.%s\n"
 
-#: ../src/imap.c:963
+#: ../src/imap.c:969
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Spojenie k %s zlyhalo"
 
-#: ../src/imap.c:970 ../src/imap.c:973
+#: ../src/imap.c:976 ../src/imap.c:979
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojenie k %s bolo prerušené. Obnovujem…\n"
 
-#: ../src/imap.c:1003 ../src/imap.c:3583 ../src/imap.c:4242 ../src/imap.c:4339
-#: ../src/imap.c:4517 ../src/imap.c:5314
+#: ../src/imap.c:1009 ../src/imap.c:3619 ../src/imap.c:4278 ../src/imap.c:4375
+#: ../src/imap.c:4555 ../src/imap.c:5364
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Na prístup k serveru IMAP potrebuje Claws Mail pripojenie k sieti."
 
-#: ../src/imap.c:1112 ../src/inc.c:818 ../src/news.c:387
+#: ../src/imap.c:1118 ../src/inc.c:818 ../src/news.c:387
 #: ../src/send_message.c:278
 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 
-#: ../src/imap.c:1113 ../src/inc.c:819 ../src/news.c:388
+#: ../src/imap.c:1119 ../src/inc.c:819 ../src/news.c:388
 #: ../src/send_message.c:279
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
@@ -6002,109 +6281,109 @@ msgstr ""
 "Chcete pokračovať v pripájaní na tento server? Komunikácia nebude "
 "zabezpečená."
 
-#: ../src/imap.c:1119 ../src/inc.c:825 ../src/news.c:394
+#: ../src/imap.c:1125 ../src/inc.c:825 ../src/news.c:394
 #: ../src/send_message.c:285
 msgid "Con_tinue connecting"
 msgstr "Po_kračovať v pripájaní"
 
-#: ../src/imap.c:1129
+#: ../src/imap.c:1135
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Účet „%s”: Pripájanie k serveru IMAP4: %s: %d…"
 
-#: ../src/imap.c:1177
+#: ../src/imap.c:1183
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Nepodarilo sa pripojiť k serveru IMAP4: %s:%d"
 
-#: ../src/imap.c:1180
+#: ../src/imap.c:1186
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru IMAP4: %s:%d\n"
 
-#: ../src/imap.c:1213 ../src/imap.c:4004
+#: ../src/imap.c:1219 ../src/imap.c:4040
 msgid "Can't start TLS session.\n"
 msgstr "Nemožno vytvoriť TLS spojenie.\n"
 
-#: ../src/imap.c:1276
+#: ../src/imap.c:1282
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s.\n"
 
-#: ../src/imap.c:1279
+#: ../src/imap.c:1285
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s."
 
-#: ../src/imap.c:1679
+#: ../src/imap.c:1703
 msgid "Adding messages..."
 msgstr "Pridávam správy…"
 
-#: ../src/imap.c:1883 ../src/mh.c:520
+#: ../src/imap.c:1908 ../src/mh.c:526
 msgid "Copying messages..."
 msgstr "Kopírujem správy…"
 
-#: ../src/imap.c:2465
+#: ../src/imap.c:2492
 msgid "can't set deleted flags\n"
 msgstr "nemožno nastaviť príznak zmazania\n"
 
-#: ../src/imap.c:2472 ../src/imap.c:4944
+#: ../src/imap.c:2499 ../src/imap.c:4994
 msgid "can't expunge\n"
 msgstr "nemožno odstrániť\n"
 
-#: ../src/imap.c:2823
+#: ../src/imap.c:2850
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Hľadám neodoberané zložky v %s…"
 
-#: ../src/imap.c:2826
+#: ../src/imap.c:2853
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Hľadám podzložky %s…"
 
-#: ../src/imap.c:3123
+#: ../src/imap.c:3159
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nemožno vytvoriť schránku: príkaz LIST zlyhal\n"
 
-#: ../src/imap.c:3138
+#: ../src/imap.c:3174
 msgid "can't create mailbox\n"
 msgstr "nemožno vytvoriť schránku\n"
 
-#: ../src/imap.c:3229
+#: ../src/imap.c:3265
 msgid "New folder name must not contain the namespace path separator"
 msgstr "Názov novej zložky nesmie obsahovať oddeľovač mena cesty"
 
-#: ../src/imap.c:3269
+#: ../src/imap.c:3305
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nemožno premenovať schránku: %s na %s\n"
 
-#: ../src/imap.c:3382
+#: ../src/imap.c:3418
 msgid "can't delete mailbox\n"
 msgstr "nemožno odstrániť schránku \n"
 
-#: ../src/imap.c:3661
+#: ../src/imap.c:3697
 msgid "LIST failed\n"
 msgstr "LIST zlyhal\n"
 
-#: ../src/imap.c:3746
+#: ../src/imap.c:3782
 msgid "Flagging messages..."
 msgstr "Označujem správy…"
 
-#: ../src/imap.c:3849
+#: ../src/imap.c:3885
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nemožno vybrať zložku: %s\n"
 
-#: ../src/imap.c:4001
+#: ../src/imap.c:4037
 msgid "Server requires TLS to log in.\n"
 msgstr "Server na prihlásenie vyžaduje TLS.\n"
 
-#: ../src/imap.c:4011
+#: ../src/imap.c:4047
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodarilo  sa obnoviť možnosti servera.\n"
 
-#: ../src/imap.c:4016
+#: ../src/imap.c:4052
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -6113,20 +6392,20 @@ msgstr ""
 "Pripojenie k %s zlyhalo: server vyžaduje TLS, ale Claws Mail bol zostavený "
 "bez podpory OpensSSL.\n"
 
-#: ../src/imap.c:4024
+#: ../src/imap.c:4060
 msgid "Server logins are disabled.\n"
 msgstr "Tento server neumožňuje prihlásenie.\n"
 
-#: ../src/imap.c:4247
+#: ../src/imap.c:4283
 msgid "Fetching message..."
 msgstr "Sťahujem správu…"
 
-#: ../src/imap.c:4937
+#: ../src/imap.c:4987
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nemožno nastaviť príznaky zmazania: %d\n"
 
-#: ../src/imap.c:5973
+#: ../src/imap.c:6023
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6161,7 +6440,7 @@ msgid "Cop_y folder..."
 msgstr "_Kopírovať zložku…"
 
 #: ../src/imap_gtk.c:69 ../src/mh_gtk.c:59
-#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:61
+#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:55
 msgid "_Delete folder..."
 msgstr "_Odstrániť zložku…"
 
@@ -6222,7 +6501,7 @@ msgstr "Zdediť vlastnosti z rodičovskej zložky"
 
 #: ../src/imap_gtk.c:261 ../src/mh_gtk.c:249 ../src/news_gtk.c:306
 #: ../src/plugins/mailmbox/plugin_gtk.c:405
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:331
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:196
 #: ../src/plugins/vcalendar/vcal_folder.c:2032
 #, c-format
 msgid "Input new name for '%s':"
@@ -6230,14 +6509,14 @@ msgstr "Zadajte nový názov pre „%s”:"
 
 #: ../src/imap_gtk.c:263 ../src/mh_gtk.c:251
 #: ../src/plugins/mailmbox/plugin_gtk.c:406
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:332
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:197
 #: ../src/plugins/vcalendar/vcal_folder.c:2033
 msgid "Rename folder"
 msgstr "Premenovať zložku"
 
 #: ../src/imap_gtk.c:292 ../src/mh_gtk.c:274 ../src/news_gtk.c:328
 #: ../src/plugins/mailmbox/plugin_gtk.c:433
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:352
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:217
 #: ../src/plugins/vcalendar/vcal_folder.c:2053
 msgid ""
 "The folder could not be renamed.\n"
@@ -6247,7 +6526,7 @@ msgstr ""
 "Nový názov je neprípustný."
 
 #: ../src/imap_gtk.c:360 ../src/mh_gtk.c:199
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:233
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:149
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6262,7 +6541,7 @@ msgstr ""
 
 #: ../src/imap_gtk.c:381 ../src/mh_gtk.c:220 ../src/news_gtk.c:281
 #: ../src/plugins/mailmbox/plugin_gtk.c:341
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:254
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:170
 #: ../src/plugins/vcalendar/vcal_folder.c:1986
 #, c-format
 msgid "Can't remove the folder '%s'."
@@ -6290,7 +6569,7 @@ msgstr "+_Hľadať"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Zvoľte podzložku %s, ktorú chcete odoberať: "
 
-#: ../src/imap_gtk.c:537 ../src/mainwindow.c:672
+#: ../src/imap_gtk.c:537 ../src/mainwindow.c:674
 msgid "Subscribe"
 msgstr "Odoberať"
 
@@ -6564,7 +6843,7 @@ msgid "Auth failed"
 msgstr "Autentifikácia zlyhala"
 
 #. S_COL_SCORE
-#: ../src/inc.c:662 ../src/prefs_matcher.c:393
+#: ../src/inc.c:662 ../src/prefs_matcher.c:396
 #: ../src/prefs_summary_column.c:88 ../src/summaryview.c:2789
 #: ../src/summaryview.c:6310
 msgid "Locked"
@@ -6752,23 +7031,9 @@ msgstr "%s%sPracujete odpojený. Pripojiť?"
 msgid "On_ly once"
 msgstr "_Len raz"
 
-#: ../src/ldapupdate.c:189
-#, c-format
-msgid "ldapsvr_retrieve_item_person->Unknown status: %d"
-msgstr ""
-
-#: ../src/ldapupdate.c:472
-msgid "ldapsvr_update_book: Could not clean cache\n"
-msgstr ""
-
 #: ../src/ldapupdate.c:1056
 msgid "Some SN"
-msgstr ""
-
-#: ../src/ldapupdate.c:1440
-#, c-format
-msgid "ldapsvr_update_book->Unknown status: %s\n"
-msgstr ""
+msgstr "Niektoré SN"
 
 #: ../src/ldif.c:776
 msgid "Nick Name"
@@ -7113,328 +7378,328 @@ msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: sieť nie je pripojená.\n"
 
 #. menus
-#: ../src/mainwindow.c:503 ../src/messageview.c:209
+#: ../src/mainwindow.c:505 ../src/messageview.c:209
 msgid "_File"
 msgstr "_Súbor"
 
-#: ../src/mainwindow.c:505 ../src/messageview.c:211 ../src/summaryview.c:434
+#: ../src/mainwindow.c:507 ../src/messageview.c:211 ../src/summaryview.c:434
 msgid "_View"
 msgstr "Zo_braziť"
 
-#: ../src/mainwindow.c:508
+#: ../src/mainwindow.c:510
 msgid "_Configuration"
 msgstr "Nastav_enie"
 
 #. File menu
-#: ../src/mainwindow.c:512
+#: ../src/mainwindow.c:514
 msgid "_Add mailbox"
 msgstr "Pridať m_ailbox"
 
-#: ../src/mainwindow.c:513
+#: ../src/mainwindow.c:515
 msgid "MH..."
 msgstr "MH…"
 
-#: ../src/mainwindow.c:516
+#: ../src/mainwindow.c:518
 msgid "Change mailbox order..."
 msgstr "Zmeniť poradie schránok…"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:519
+#: ../src/mainwindow.c:521
 msgid "_Import mbox file..."
 msgstr "_Importovať súbor mbox"
 
-#: ../src/mainwindow.c:520
+#: ../src/mainwindow.c:522
 msgid "_Export to mbox file..."
 msgstr "_Exportovať do súboru mbox"
 
-#: ../src/mainwindow.c:521
+#: ../src/mainwindow.c:523
 msgid "_Export selected to mbox file..."
 msgstr "Exportovať _výber do súboru mbox…"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:523
+#: ../src/mainwindow.c:525
 msgid "Empty all _Trash folders"
 msgstr "Vyčistiť všetky _koše"
 
 #. {"File/---",				NULL, "---" },
 #. File menu
-#: ../src/mainwindow.c:526 ../src/messageview.c:218
+#: ../src/mainwindow.c:528 ../src/messageview.c:218
 msgid "_Save email as..."
 msgstr "_Uložiť email ako…"
 
-#: ../src/mainwindow.c:527 ../src/messageview.c:219
+#: ../src/mainwindow.c:529 ../src/messageview.c:219
 msgid "_Save part as..."
 msgstr "_Uložiť časť ako…"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:530 ../src/messageview.c:220
+#: ../src/mainwindow.c:532 ../src/messageview.c:220
 msgid "Page setup..."
 msgstr "Nastavenie strany…"
 
-#: ../src/mainwindow.c:531 ../src/messageview.c:221
+#: ../src/mainwindow.c:533 ../src/messageview.c:221
 msgid "_Print..."
 msgstr "_Tlačiť…"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:533
+#: ../src/mainwindow.c:535
 msgid "Synchronise folders"
 msgstr "S_ynchronizovať zložky"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:535
+#: ../src/mainwindow.c:537
 msgid "E_xit"
 msgstr "_Skončiť"
 
-#: ../src/mainwindow.c:540
+#: ../src/mainwindow.c:542
 msgid "Select _thread"
 msgstr "Zvoliť _vlákno"
 
-#: ../src/mainwindow.c:541
+#: ../src/mainwindow.c:543
 msgid "_Delete thread"
 msgstr "_Zmazať vlákno"
 
-#: ../src/mainwindow.c:543
+#: ../src/mainwindow.c:545
 msgid "_Find in current message..."
 msgstr "_Nájsť v aktuálnej správe"
 
-#: ../src/mainwindow.c:545
+#: ../src/mainwindow.c:547
 msgid "_Quick search"
 msgstr "_Rýchle vyhľadanie"
 
 #. View menu
-#: ../src/mainwindow.c:548
+#: ../src/mainwindow.c:550
 msgid "Show or hi_de"
 msgstr "_Ukázať alebo skryť"
 
-#: ../src/mainwindow.c:549
+#: ../src/mainwindow.c:551
 msgid "_Toolbar"
 msgstr "Panel nás_trojov"
 
-#: ../src/mainwindow.c:551
+#: ../src/mainwindow.c:553
 msgid "Set displayed _columns"
 msgstr "Nastav_iť zobrazované stĺpce"
 
-#: ../src/mainwindow.c:552
+#: ../src/mainwindow.c:554
 msgid "In _folder list..."
 msgstr "V _zozname zložiek…"
 
-#: ../src/mainwindow.c:553
+#: ../src/mainwindow.c:555
 msgid "In _message list..."
 msgstr "V zozname _správ.."
 
-#: ../src/mainwindow.c:558
+#: ../src/mainwindow.c:560
 msgid "La_yout"
 msgstr "Rozmiestnenie _okien"
 
-#: ../src/mainwindow.c:561
+#: ../src/mainwindow.c:563
 msgid "_Sort"
 msgstr "_Radiť"
 
-#: ../src/mainwindow.c:563
+#: ../src/mainwindow.c:565
 msgid "_Attract by subject"
 msgstr "Zos_kupiť podľa predmetu"
 
-#: ../src/mainwindow.c:565
+#: ../src/mainwindow.c:567
 msgid "E_xpand all threads"
 msgstr "_Rozbaliť všetky vlákna"
 
-#: ../src/mainwindow.c:566
+#: ../src/mainwindow.c:568
 msgid "Co_llapse all threads"
 msgstr "Zba_liť všetky vlákna"
 
 #. View menu
-#: ../src/mainwindow.c:568 ../src/messageview.c:232
+#: ../src/mainwindow.c:570 ../src/messageview.c:232
 msgid "_Go to"
 msgstr "Pre_jsť na"
 
-#: ../src/mainwindow.c:569 ../src/messageview.c:233
+#: ../src/mainwindow.c:571 ../src/messageview.c:233
 msgid "_Previous message"
 msgstr "_Predošlá správa"
 
-#: ../src/mainwindow.c:570 ../src/messageview.c:234
+#: ../src/mainwindow.c:572 ../src/messageview.c:234
 msgid "_Next message"
 msgstr "Ďa_lšia správa"
 
-#: ../src/mainwindow.c:572 ../src/messageview.c:236
+#: ../src/mainwindow.c:574 ../src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "P_redchádzajúca neprečítaná správa"
 
-#: ../src/mainwindow.c:573 ../src/messageview.c:237
+#: ../src/mainwindow.c:575 ../src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Ďalšia _neprečítaná správa."
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:575 ../src/messageview.c:239
+#: ../src/mainwindow.c:577 ../src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Predchádzajúca no_vá správa"
 
-#: ../src/mainwindow.c:576 ../src/messageview.c:240
+#: ../src/mainwindow.c:578 ../src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Ďalšia no_vá správa"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:578 ../src/messageview.c:242
+#: ../src/mainwindow.c:580 ../src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Predchádzajúca _označená správa"
 
-#: ../src/mainwindow.c:579 ../src/messageview.c:243
+#: ../src/mainwindow.c:581 ../src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Ďalšia _označená správa"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:581 ../src/messageview.c:245
+#: ../src/mainwindow.c:583 ../src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Predchádzajúca správa s návestí_m"
 
-#: ../src/mainwindow.c:582 ../src/messageview.c:246
+#: ../src/mainwindow.c:584 ../src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Ďalšia správa s návestí_m"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:584 ../src/messageview.c:248
+#: ../src/mainwindow.c:586 ../src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Naposledy ot_vorená správa"
 
-#: ../src/mainwindow.c:585 ../src/messageview.c:249
+#: ../src/mainwindow.c:587 ../src/messageview.c:249
 msgid "Next opened message"
 msgstr "Ďalšia o_tvorená správa"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:587 ../src/messageview.c:251
+#: ../src/mainwindow.c:589 ../src/messageview.c:251
 msgid "Parent message"
 msgstr "Rodičovská správa"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:589 ../src/messageview.c:253
+#: ../src/mainwindow.c:591 ../src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Ďalšia nepr_ečítaná zložka"
 
-#: ../src/mainwindow.c:590 ../src/messageview.c:254
+#: ../src/mainwindow.c:592 ../src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Iná zložka…"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:592 ../src/messageview.c:256 ../src/mimeview.c:201
+#: ../src/mainwindow.c:594 ../src/messageview.c:256 ../src/mimeview.c:201
 msgid "Next part"
 msgstr "Ďalšia časť"
 
-#: ../src/mainwindow.c:593 ../src/messageview.c:257 ../src/mimeview.c:202
+#: ../src/mainwindow.c:595 ../src/messageview.c:257 ../src/mimeview.c:202
 msgid "Previous part"
 msgstr "Predošlá časť"
 
 #. {"View/Scroll/---",                  NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:596 ../src/messageview.c:258
+#: ../src/mainwindow.c:598 ../src/messageview.c:258
 msgid "Message scroll"
 msgstr "Posúvanie správy"
 
-#: ../src/mainwindow.c:597 ../src/messageview.c:259
+#: ../src/mainwindow.c:599 ../src/messageview.c:259
 msgid "Previous line"
 msgstr "Predošlý riadok"
 
-#: ../src/mainwindow.c:598 ../src/messageview.c:260
+#: ../src/mainwindow.c:600 ../src/messageview.c:260
 msgid "Next line"
 msgstr "Ďalší riadok"
 
-#: ../src/mainwindow.c:599 ../src/messageview.c:261 ../src/printing.c:481
+#: ../src/mainwindow.c:601 ../src/messageview.c:261 ../src/printing.c:481
 msgid "Previous page"
 msgstr "Predošlá strana"
 
-#: ../src/mainwindow.c:600 ../src/messageview.c:262 ../src/printing.c:488
+#: ../src/mainwindow.c:602 ../src/messageview.c:262 ../src/printing.c:488
 msgid "Next page"
 msgstr "Ďalšia strana"
 
-#: ../src/mainwindow.c:618 ../src/messageview.c:280
+#: ../src/mainwindow.c:620 ../src/messageview.c:280
 msgid "Decode"
 msgstr "Dekódovať"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:625
+#: ../src/mainwindow.c:627
 msgid "Open in new _window"
 msgstr "Otvoriť v _novom okne"
 
-#: ../src/mainwindow.c:626 ../src/messageview.c:287
+#: ../src/mainwindow.c:628 ../src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Zdrojový kód správ_y"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:628 ../src/messageview.c:288
+#: ../src/mainwindow.c:630 ../src/messageview.c:288
 msgid "Message part"
 msgstr "Správová časť"
 
-#: ../src/mainwindow.c:629 ../src/messageview.c:289
+#: ../src/mainwindow.c:631 ../src/messageview.c:289
 msgid "View as text"
 msgstr "Zobraziť ako text"
 
-#: ../src/mainwindow.c:630 ../src/messageview.c:290 ../src/toolbar.c:403
+#: ../src/mainwindow.c:632 ../src/messageview.c:290 ../src/toolbar.c:403
 msgid "Open"
 msgstr "Otvoriť"
 
-#: ../src/mainwindow.c:632 ../src/messageview.c:292
+#: ../src/mainwindow.c:634 ../src/messageview.c:292
 msgid "Open with..."
 msgstr "Otvoriť pomocou…"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:636 ../src/messageview.c:295
+#: ../src/mainwindow.c:638 ../src/messageview.c:295
 msgid "Quotes"
 msgstr "Citácia"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:638
+#: ../src/mainwindow.c:640
 msgid "_Update summary"
 msgstr "_Aktualizovať sumár"
 
 #. Message menu
-#: ../src/mainwindow.c:641
+#: ../src/mainwindow.c:643
 msgid "Recei_ve"
 msgstr "P_rijať"
 
-#: ../src/mainwindow.c:642
+#: ../src/mainwindow.c:644
 msgid "Get from _current account"
 msgstr "Prijať z _aktuálneho účtu"
 
-#: ../src/mainwindow.c:643
+#: ../src/mainwindow.c:645
 msgid "Get from _all accounts"
 msgstr "Prijať zo _všetkých účtov"
 
-#: ../src/mainwindow.c:644
+#: ../src/mainwindow.c:646
 msgid "Cancel receivin_g"
 msgstr "_Zrušiť prijímanie"
 
-#: ../src/mainwindow.c:647
+#: ../src/mainwindow.c:649
 msgid "_Send queued messages"
 msgstr "Odoslať _správy z fronty"
 
-#: ../src/mainwindow.c:652
+#: ../src/mainwindow.c:654
 msgid "Compose a_n email message"
 msgstr "_Napísať novú správu"
 
-#: ../src/mainwindow.c:653
+#: ../src/mainwindow.c:655
 msgid "Compose a news message"
 msgstr "Napísať nový príspevok"
 
-#: ../src/mainwindow.c:655 ../src/messageview.c:301
+#: ../src/mainwindow.c:657 ../src/messageview.c:301
 #: ../src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Odpovedať"
 
 #. COMPOSE_REPLY
-#: ../src/mainwindow.c:656 ../src/messageview.c:302 ../src/summaryview.c:426
+#: ../src/mainwindow.c:658 ../src/messageview.c:302 ../src/summaryview.c:426
 msgid "Repl_y to"
 msgstr "O_dpovedať komu"
 
 #. COMPOSE_REPLY_TO_SENDER
-#: ../src/mainwindow.c:659 ../src/messageview.c:305
+#: ../src/mainwindow.c:661 ../src/messageview.c:305
 msgid "Mailing _list"
 msgstr "Emai_lová konferencia"
 
 #. COMPOSE_REPLY_TO_LIST
-#: ../src/mainwindow.c:660
+#: ../src/mainwindow.c:662
 msgid "Follow-up and reply to"
 msgstr "Sledovať a odpovedať na"
 
@@ -7442,177 +7707,177 @@ msgstr "Sledovať a odpovedať na"
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REPLY_TO_LIST
 #. {"Message/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:663 ../src/messageview.c:308 ../src/toolbar.c:2069
+#: ../src/mainwindow.c:665 ../src/messageview.c:308 ../src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Poslať ďalej"
 
 #. COMPOSE_FORWARD_INLINE
-#: ../src/mainwindow.c:664 ../src/messageview.c:309 ../src/toolbar.c:2070
+#: ../src/mainwindow.c:666 ../src/messageview.c:309 ../src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "Poslať ďale_j ako prílohu"
 
 #. COMPOSE_FORWARD_AS_ATTACH
-#: ../src/mainwindow.c:665 ../src/messageview.c:310 ../src/toolbar.c:2071
+#: ../src/mainwindow.c:667 ../src/messageview.c:310 ../src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "P_resmerovať"
 
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:667
+#: ../src/mainwindow.c:669
 msgid "Mailing-_List"
 msgstr "Emai_lová-Konferencia"
 
-#: ../src/mainwindow.c:668
+#: ../src/mainwindow.c:670
 msgid "Post"
 msgstr "Pošta"
 
-#: ../src/mainwindow.c:670
+#: ../src/mainwindow.c:672
 msgid "Help"
 msgstr "_Pomocník"
 
-#: ../src/mainwindow.c:674
+#: ../src/mainwindow.c:676
 msgid "Unsubscribe"
 msgstr "_Odhlásiť sa"
 
-#: ../src/mainwindow.c:676
+#: ../src/mainwindow.c:678
 msgid "View archive"
 msgstr "Zobraziť archív"
 
-#: ../src/mainwindow.c:678
+#: ../src/mainwindow.c:680
 msgid "Contact owner"
 msgstr "kontaktovať vlastníka"
 
 #. separation
-#: ../src/mainwindow.c:682
+#: ../src/mainwindow.c:684
 msgid "M_ove..."
 msgstr "Pre_sunúť…"
 
-#: ../src/mainwindow.c:683
+#: ../src/mainwindow.c:685
 msgid "_Copy..."
 msgstr "_Kopírovať…"
 
-#: ../src/mainwindow.c:684
+#: ../src/mainwindow.c:686
 msgid "Move to _trash"
 msgstr "Presunúť _do koša"
 
-#: ../src/mainwindow.c:685
+#: ../src/mainwindow.c:687
 msgid "_Delete..."
 msgstr "Z_mazať…"
 
-#: ../src/mainwindow.c:686
+#: ../src/mainwindow.c:688
 msgid "Cancel a news message"
 msgstr "Zrušiť príspevo_k"
 
 #. separation
-#: ../src/mainwindow.c:689 ../src/mainwindow.c:690 ../src/summaryview.c:427
+#: ../src/mainwindow.c:691 ../src/mainwindow.c:692 ../src/summaryview.c:427
 msgid "_Mark"
 msgstr "O_značiť"
 
-#: ../src/mainwindow.c:691
+#: ../src/mainwindow.c:693
 msgid "_Unmark"
 msgstr "O_dznačiť"
 
-#: ../src/mainwindow.c:694
+#: ../src/mainwindow.c:696
 msgid "Mark as unr_ead"
 msgstr "Označiť ako n_eprečítané"
 
-#: ../src/mainwindow.c:695
+#: ../src/mainwindow.c:697
 msgid "Mark as rea_d"
 msgstr "Označiť ako _prečítané"
 
 #. separation
-#: ../src/mainwindow.c:697
+#: ../src/mainwindow.c:699
 msgid "Mark all read"
 msgstr "Označiť _všetky ako prečítané"
 
 #. separation
-#: ../src/mainwindow.c:699 ../src/prefs_filtering_action.c:199
+#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:199
 #: ../src/toolbar.c:208 ../src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Ignorovať vlákno"
 
-#: ../src/mainwindow.c:700
+#: ../src/mainwindow.c:702
 msgid "Unignore thread"
 msgstr "Zrušiť ignorovanie vlákna"
 
-#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:200
+#: ../src/mainwindow.c:703 ../src/prefs_filtering_action.c:200
 #: ../src/toolbar.c:209 ../src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Sledovať vlákno"
 
-#: ../src/mainwindow.c:702
+#: ../src/mainwindow.c:704
 msgid "Unwatch thread"
 msgstr "Zrušiť sledovanie vlákna"
 
 #. separation
-#: ../src/mainwindow.c:705
+#: ../src/mainwindow.c:707
 msgid "Mark as _spam"
 msgstr "Označiť ako _spam"
 
-#: ../src/mainwindow.c:706
+#: ../src/mainwindow.c:708
 msgid "Mark as _ham"
 msgstr "Označiť ako _nie spam"
 
 #. separation
-#: ../src/mainwindow.c:709 ../src/prefs_filtering_action.c:181
+#: ../src/mainwindow.c:711 ../src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Zamknúť"
 
-#: ../src/mainwindow.c:710 ../src/prefs_filtering_action.c:182
+#: ../src/mainwindow.c:712 ../src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Odomknúť"
 
-#: ../src/mainwindow.c:712 ../src/summaryview.c:428
+#: ../src/mainwindow.c:714 ../src/summaryview.c:428
 msgid "Color la_bel"
 msgstr "_Farebné označenie"
 
-#: ../src/mainwindow.c:713 ../src/summaryview.c:429
+#: ../src/mainwindow.c:715 ../src/summaryview.c:429
 msgid "Ta_gs"
 msgstr "Z_načky"
 
 #. {"Message/---",			NULL, "---" },
-#: ../src/mainwindow.c:716
+#: ../src/mainwindow.c:718
 msgid "Re-_edit"
 msgstr "Znova _upraviť"
 
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:719 ../src/messageview.c:311 ../src/mimeview.c:1027
+#: ../src/mainwindow.c:721 ../src/messageview.c:311 ../src/mimeview.c:1027
 msgid "Check signature"
 msgstr "Overiť podpis"
 
-#: ../src/mainwindow.c:724 ../src/messageview.c:315
+#: ../src/mainwindow.c:726 ../src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "Pridať odosielateľa _do adresára"
 
-#: ../src/mainwindow.c:726
+#: ../src/mainwindow.c:728
 msgid "C_ollect addresses"
 msgstr "Zoz_bierať adresy"
 
-#: ../src/mainwindow.c:727
+#: ../src/mainwindow.c:729
 msgid "From current _folder..."
 msgstr "Z aktuálnej _zložky…"
 
-#: ../src/mainwindow.c:728
+#: ../src/mainwindow.c:730
 msgid "From selected _messages..."
 msgstr "Z vybraných _správ…"
 
-#: ../src/mainwindow.c:731
+#: ../src/mainwindow.c:733
 msgid "_Filter all messages in folder"
 msgstr "Filtrovať _všetky správy v zložke"
 
-#: ../src/mainwindow.c:732
+#: ../src/mainwindow.c:734
 msgid "Filter _selected messages"
 msgstr "Filtrovať _zvolené správy"
 
-#: ../src/mainwindow.c:733
+#: ../src/mainwindow.c:735
 msgid "Run folder pr_ocessing rules"
 msgstr "Spustiť sprac_ovanie pravidiel"
 
-#: ../src/mainwindow.c:735 ../src/messageview.c:318
+#: ../src/mainwindow.c:737 ../src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "Vytvor_iť pravidlo filtra"
 
-#: ../src/mainwindow.c:736 ../src/mainwindow.c:742 ../src/messageview.c:319
+#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/messageview.c:319
 #: ../src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automaticky"
@@ -7620,7 +7885,7 @@ msgstr "_Automaticky"
 #. FILTER_BY_AUTO
 #. radio SORT_BY_THREAD_DATE
 #. FILTER_BY_AUTO
-#: ../src/mainwindow.c:737 ../src/mainwindow.c:743 ../src/mainwindow.c:845
+#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/mainwindow.c:848
 #: ../src/messageview.c:320 ../src/messageview.c:326
 msgid "By _From"
 msgstr "Podľa _odosielateľa"
@@ -7628,386 +7893,391 @@ msgstr "Podľa _odosielateľa"
 #. FILTER_BY_FROM
 #. radio SORT_BY_FROM
 #. FILTER_BY_FROM
-#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/mainwindow.c:846
+#: ../src/mainwindow.c:740 ../src/mainwindow.c:746 ../src/mainwindow.c:849
 #: ../src/messageview.c:321 ../src/messageview.c:327
 msgid "By _To"
 msgstr "Podľa _adresáta"
 
 #. FILTER_BY_TO
-#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/messageview.c:322
+#: ../src/mainwindow.c:741 ../src/mainwindow.c:747 ../src/messageview.c:322
 #: ../src/messageview.c:328
 msgid "By _Subject"
 msgstr "Podľa _predmetu"
 
 #. FILTER_BY_SUBJECT
-#: ../src/mainwindow.c:741 ../src/messageview.c:324 ../src/summaryview.c:432
+#: ../src/mainwindow.c:743 ../src/messageview.c:324 ../src/summaryview.c:432
 msgid "Create processing rule"
 msgstr "Vytvoriť pravidlo spracovania"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:748 ../src/messageview.c:332
+#: ../src/mainwindow.c:750 ../src/messageview.c:332
 msgid "List _URLs..."
 msgstr "Zobraziť všetky _URL…"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:755
+#: ../src/mainwindow.c:757
 msgid "Ch_eck for new messages in all folders"
 msgstr "Skontrolovať nové správy vo všetkých pri_ečinkoch…"
 
-#: ../src/mainwindow.c:756
+#: ../src/mainwindow.c:758
 msgid "Delete du_plicated messages"
 msgstr "Zmazať du_plikované správy"
 
-#: ../src/mainwindow.c:757
+#: ../src/mainwindow.c:759
 msgid "In selected folder"
 msgstr "V zvolenej zložke"
 
-#: ../src/mainwindow.c:758
+#: ../src/mainwindow.c:760
 msgid "In all folders"
 msgstr "Vo všetkých zložkách"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:761
+#: ../src/mainwindow.c:763
 msgid "E_xecute"
 msgstr "Vyko_nať"
 
-#: ../src/mainwindow.c:762
+#: ../src/mainwindow.c:764
 msgid "Exp_unge"
 msgstr "V_ymazať"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:765
+#: ../src/mainwindow.c:767
 msgid "SSL cer_tificates"
 msgstr "SSL cer_tifikáty"
 
-#: ../src/mainwindow.c:769
+#: ../src/mainwindow.c:771
 msgid "Filtering Lo_g"
 msgstr "Záznam _filtra"
 
-#: ../src/mainwindow.c:771
+#: ../src/mainwindow.c:773
 msgid "Network _Log"
 msgstr "Záznam _siete"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:773
+#: ../src/mainwindow.c:775
 msgid "_Forget all session passwords"
 msgstr "_Zabudnúť všetky heslá relácie"
 
 #. Configuration menu
-#: ../src/mainwindow.c:776
+#: ../src/mainwindow.c:778
 msgid "C_hange current account"
 msgstr "Z_meniť aktívny účet"
 
-#: ../src/mainwindow.c:778
+#: ../src/mainwindow.c:780
 msgid "_Preferences for current account..."
 msgstr "Nastavenie aktívneho _účtu…"
 
-#: ../src/mainwindow.c:779
+#: ../src/mainwindow.c:781
 msgid "Create _new account..."
 msgstr "Vytvoriť _nový účet…"
 
-#: ../src/mainwindow.c:780
+#: ../src/mainwindow.c:782
 msgid "_Edit accounts..."
 msgstr "_Upraviť účty…"
 
-#: ../src/mainwindow.c:783
+#: ../src/mainwindow.c:785
 msgid "P_references..."
 msgstr "Nas_tavenia…"
 
-#: ../src/mainwindow.c:784
+#: ../src/mainwindow.c:786
 msgid "Pre-pr_ocessing..."
 msgstr "Pred-sprac_ovanie…"
 
-#: ../src/mainwindow.c:785
+#: ../src/mainwindow.c:787
 msgid "Post-pro_cessing..."
 msgstr "Po-spra_covanie…"
 
-#: ../src/mainwindow.c:786
+#: ../src/mainwindow.c:788
 msgid "_Filtering..."
 msgstr "_Filtrovanie…"
 
-#: ../src/mainwindow.c:787
+#: ../src/mainwindow.c:789
 msgid "_Templates..."
 msgstr "Ša_blóny…"
 
-#: ../src/mainwindow.c:788
+#: ../src/mainwindow.c:790
 msgid "_Actions..."
 msgstr "_Akcie…"
 
-#: ../src/mainwindow.c:789
+#: ../src/mainwindow.c:791
 msgid "Tag_s..."
 msgstr "Z_načky…"
 
 #. {"Configuration/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:791
+#: ../src/mainwindow.c:793
 msgid "Plu_gins..."
 msgstr "Zásuvné _moduly…"
 
 #. Help menu
-#: ../src/mainwindow.c:794
+#: ../src/mainwindow.c:796
 msgid "_Manual"
 msgstr "_Manuál"
 
-#: ../src/mainwindow.c:795
+#: ../src/mainwindow.c:797
 msgid "_Online User-contributed FAQ"
 msgstr "_Online používateľské FAQ"
 
-#: ../src/mainwindow.c:796
+#: ../src/mainwindow.c:798
 msgid "Icon _Legend"
 msgstr "_Legenda k ikonám"
 
-#: ../src/mainwindow.c:798
+#: ../src/mainwindow.c:800
 msgid "Set as default client"
 msgstr "Nastaviť ako predvoleného klienta"
 
-#: ../src/mainwindow.c:805
+#: ../src/mainwindow.c:807
 msgid "Offline _mode"
 msgstr "Odpojený reži_m"
 
 #. toggle
-#: ../src/mainwindow.c:806
+#: ../src/mainwindow.c:808
+msgid "Men_ubar"
+msgstr "Panel nástr_ojov"
+
+#. toggle
+#: ../src/mainwindow.c:809
 msgid "_Message view"
 msgstr "Zobraze_nie správy"
 
-#: ../src/mainwindow.c:808
+#: ../src/mainwindow.c:811
 msgid "Status _bar"
 msgstr "Stavový ria_dok"
 
-#: ../src/mainwindow.c:810
+#: ../src/mainwindow.c:813
 msgid "Column headers"
 msgstr "Hlavičky stĺpcov"
 
 #. toggle
-#: ../src/mainwindow.c:811
+#: ../src/mainwindow.c:814
 msgid "Th_read view"
 msgstr "Zobraziť _vlákna"
 
 #. toggle
-#: ../src/mainwindow.c:812
+#: ../src/mainwindow.c:815
 msgid "Hide read threads"
 msgstr "Skryť prečítané vlákna"
 
 #. toggle
-#: ../src/mainwindow.c:813
+#: ../src/mainwindow.c:816
 msgid "_Hide read messages"
 msgstr "S_kryť prečítané správy"
 
 #. toggle
-#: ../src/mainwindow.c:814
+#: ../src/mainwindow.c:817
 msgid "Hide deleted messages"
 msgstr "Skryť vymazané správy"
 
 #. toggle
-#: ../src/mainwindow.c:815
+#: ../src/mainwindow.c:818
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
 #. toggle
-#: ../src/mainwindow.c:816 ../src/messageview.c:344
+#: ../src/mainwindow.c:819 ../src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Zobraziť všetky _hlavičky"
 
 #. toggle
-#: ../src/mainwindow.c:817 ../src/messageview.c:345
+#: ../src/mainwindow.c:820 ../src/messageview.c:345
 msgid "_Collapse all"
 msgstr "Zba_liť všetky"
 
 #. 1 toggle
-#: ../src/mainwindow.c:818 ../src/messageview.c:346
+#: ../src/mainwindow.c:821 ../src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Zbaliť od úrovne _2"
 
 #. 2 toggle
-#: ../src/mainwindow.c:819 ../src/messageview.c:347
+#: ../src/mainwindow.c:822 ../src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Zbaliť od úrovne _3"
 
 #. toggle_toolbar_cb
-#: ../src/mainwindow.c:823
+#: ../src/mainwindow.c:826
 msgid "Text _below icons"
 msgstr "Text _pod ikonami"
 
 #. radio TOOLBAR_BOTH
-#: ../src/mainwindow.c:824
+#: ../src/mainwindow.c:827
 msgid "Text be_side icons"
 msgstr "Text _vedľa ikon"
 
 #. radio TOOLBAR_BOTH_HORIZ
-#: ../src/mainwindow.c:825
+#: ../src/mainwindow.c:828
 msgid "_Icons only"
 msgstr "Len _ikony"
 
 #. radio TOOLBAR_ICON
-#: ../src/mainwindow.c:826
+#: ../src/mainwindow.c:829
 msgid "_Text only"
 msgstr "Len _text"
 
 #. set_layout_cb
-#: ../src/mainwindow.c:833
+#: ../src/mainwindow.c:836
 msgid "_Standard"
 msgstr "Šta_ndardný"
 
 #. radio NORMAL_LAYOUT
-#: ../src/mainwindow.c:834
+#: ../src/mainwindow.c:837
 msgid "_Three columns"
 msgstr "_Tri stĺpce"
 
 #. radio VERTICAL_LAYOUT
-#: ../src/mainwindow.c:835
+#: ../src/mainwindow.c:838
 msgid "_Wide message"
 msgstr "Š_iroká správa"
 
 #. radio WIDE_LAYOUT
-#: ../src/mainwindow.c:836
+#: ../src/mainwindow.c:839
 msgid "W_ide message list"
 msgstr "Široký _zoznam správ"
 
 #. radio WIDE_MSGLIST_LAYOUT
-#: ../src/mainwindow.c:837
+#: ../src/mainwindow.c:840
 msgid "S_mall screen"
 msgstr "_Malá obrazovka"
 
 #. sort_summary_cb
-#: ../src/mainwindow.c:841
+#: ../src/mainwindow.c:844
 msgid "By _number"
 msgstr "Podľa _čísla"
 
 #. radio SORT_BY_NUMBER
-#: ../src/mainwindow.c:842
+#: ../src/mainwindow.c:845
 msgid "By s_ize"
 msgstr "Podľa _veľkosti"
 
 #. radio SORT_BY_SIZE
-#: ../src/mainwindow.c:843
+#: ../src/mainwindow.c:846
 msgid "By _date"
 msgstr "Podľa _dátumu"
 
 #. radio SORT_BY_DATE
-#: ../src/mainwindow.c:844
+#: ../src/mainwindow.c:847
 msgid "By thread date"
 msgstr "Podľa dátumu v_lákna"
 
 #. radio SORT_BY_TO
-#: ../src/mainwindow.c:847
+#: ../src/mainwindow.c:850
 msgid "By s_ubject"
 msgstr "Podľa _predmetu"
 
 #. radio SORT_BY_SUBJECT
-#: ../src/mainwindow.c:848
+#: ../src/mainwindow.c:851
 msgid "By _color label"
 msgstr "Podľa _farebnej menovky"
 
 #. radio SORT_BY_LABEL
-#: ../src/mainwindow.c:849
+#: ../src/mainwindow.c:852
 msgid "By tag"
 msgstr "Podľa _značky"
 
 #. radio SORT_BY_TAGS
-#: ../src/mainwindow.c:850
+#: ../src/mainwindow.c:853
 msgid "By _mark"
 msgstr "Podľa _označenia"
 
 #. radio SORT_BY_MARK
-#: ../src/mainwindow.c:851
+#: ../src/mainwindow.c:854
 msgid "By _status"
 msgstr "Podľa _stavu"
 
 #. radio SORT_BY_STATUS
-#: ../src/mainwindow.c:852
+#: ../src/mainwindow.c:855
 msgid "By a_ttachment"
 msgstr "Podľa _prílohy"
 
 #. radio SORT_BY_MIME
-#: ../src/mainwindow.c:853
+#: ../src/mainwindow.c:856
 msgid "By score"
 msgstr "Podľa s_kóre"
 
 #. radio SORT_BY_SCORE
-#: ../src/mainwindow.c:854
+#: ../src/mainwindow.c:857
 msgid "By locked"
 msgstr "Podľa _zamknutia"
 
 #. radio SORT_BY_LOCKED
-#: ../src/mainwindow.c:855
+#: ../src/mainwindow.c:858
 msgid "D_on't sort"
 msgstr "_Neradiť"
 
 #. sort_summary_type_cb
-#: ../src/mainwindow.c:859
+#: ../src/mainwindow.c:862
 msgid "Ascending"
 msgstr "Vzostupne"
 
 #. radio SORT_ASCENDING
-#: ../src/mainwindow.c:860
+#: ../src/mainwindow.c:863
 msgid "Descending"
 msgstr "Zostupne"
 
-#: ../src/mainwindow.c:901 ../src/messageview.c:388
+#: ../src/mainwindow.c:904 ../src/messageview.c:388
 msgid "_Auto detect"
 msgstr "_Automaticky zistiť"
 
-#: ../src/mainwindow.c:1298 ../src/summaryview.c:6236
+#: ../src/mainwindow.c:1301 ../src/summaryview.c:6236
 msgid "Apply tags..."
 msgstr "Použiť značky…"
 
-#: ../src/mainwindow.c:1936
+#: ../src/mainwindow.c:1943
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Nastala chyba(y). Kliknite tu na zobrazenie okna so záznamom."
 
-#: ../src/mainwindow.c:1951
+#: ../src/mainwindow.c:1958
 msgid "You are online. Click the icon to go offline"
 msgstr "Ste pripojený. Kliknite na ikonu ak sa chcete odpojiť"
 
-#: ../src/mainwindow.c:1954
+#: ../src/mainwindow.c:1961
 msgid "You are offline. Click the icon to go online"
 msgstr "Ste odpojený. Kliknite na ikonu ak sa chcete pripojiť"
 
-#: ../src/mainwindow.c:1968
+#: ../src/mainwindow.c:1975
 msgid "Select account"
 msgstr "Zvoliť účet"
 
 #. init log instances data before creating log views
 #. Protocol log
-#: ../src/mainwindow.c:1995 ../src/prefs_logging.c:140
+#: ../src/mainwindow.c:2002 ../src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Záznam komunikácie"
 
-#: ../src/mainwindow.c:1999
+#: ../src/mainwindow.c:2006
 msgid "Filtering/Processing debug log"
 msgstr "Záznam ladenia filtrovania/spracovania"
 
-#: ../src/mainwindow.c:2018 ../src/prefs_logging.c:392
+#: ../src/mainwindow.c:2025 ../src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "záznam filtrovania zapnutý\n"
 
-#: ../src/mainwindow.c:2020 ../src/prefs_logging.c:394
+#: ../src/mainwindow.c:2027 ../src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "záznam filtrovania vypnutý\n"
 
-#: ../src/mainwindow.c:2460 ../src/mainwindow.c:2467 ../src/mainwindow.c:2510
-#: ../src/mainwindow.c:2543 ../src/mainwindow.c:2575 ../src/mainwindow.c:2620
+#: ../src/mainwindow.c:2470 ../src/mainwindow.c:2477 ../src/mainwindow.c:2520
+#: ../src/mainwindow.c:2553 ../src/mainwindow.c:2585 ../src/mainwindow.c:2630
 #: ../src/plugins/notification/notification_trayicon.c:360
-#: ../src/prefs_folder_item.c:1065
+#: ../src/plugins/rssyl/opml_import.c:73 ../src/prefs_folder_item.c:1065
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: ../src/mainwindow.c:2621 ../src/prefs_summary_open.c:114
+#: ../src/mainwindow.c:2631 ../src/prefs_summary_open.c:114
 msgid "none"
 msgstr "žiadny"
 
-#: ../src/mainwindow.c:2878 ../src/mainwindow.c:2882
+#: ../src/mainwindow.c:2888 ../src/mainwindow.c:2892
 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v košoch?"
 
-#: ../src/mainwindow.c:2879
+#: ../src/mainwindow.c:2889
 msgid "Don't quit"
 msgstr "Neskončiť"
 
-#: ../src/mainwindow.c:2908 ../src/plugins/mailmbox/plugin_gtk.c:189
+#: ../src/mainwindow.c:2918 ../src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Pridať poštovú schránku"
 
-#: ../src/mainwindow.c:2909
+#: ../src/mainwindow.c:2919
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -8017,18 +8287,18 @@ msgstr ""
 "Ak zadáte názov existujúcej schránky, bude\n"
 "táto automaticky prehľadaná."
 
-#: ../src/mainwindow.c:2915 ../src/plugins/mailmbox/plugin_gtk.c:196
-#: ../src/plugins/rssyl/rssyl_gtk.c:158
+#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:196
+#: ../src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Schránka „%s” už existuje."
 
-#: ../src/mainwindow.c:2920 ../src/plugins/mailmbox/plugin_gtk.c:202
+#: ../src/mainwindow.c:2930 ../src/plugins/mailmbox/plugin_gtk.c:202
 #: ../src/setup.c:52 ../src/wizard.c:741
 msgid "Mailbox"
 msgstr "Schránka"
 
-#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:209
+#: ../src/mainwindow.c:2935 ../src/plugins/mailmbox/plugin_gtk.c:209
 #: ../src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
@@ -8038,45 +8308,45 @@ msgstr ""
 "Nemožno vytvoriť schránku.\n"
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte právo zápisu."
 
-#: ../src/mainwindow.c:3377
+#: ../src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "Prispievanie nie je povolené"
 
-#: ../src/mainwindow.c:3955
+#: ../src/mainwindow.c:3965
 msgid "Mbox import has failed."
 msgstr "Zlyhal import súboru mbox."
 
-#: ../src/mainwindow.c:3964 ../src/mainwindow.c:3973
+#: ../src/mainwindow.c:3974 ../src/mainwindow.c:3983
 msgid "Export to mbox has failed."
 msgstr "Zlyhal export do mbox."
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit"
 msgstr "Skončiť"
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit Claws Mail?"
 msgstr "Skončiť Claws Mail?"
 
-#: ../src/mainwindow.c:4205
+#: ../src/mainwindow.c:4215
 msgid "Folder synchronisation"
 msgstr "Synchronizácia zložiek"
 
-#: ../src/mainwindow.c:4206
+#: ../src/mainwindow.c:4216
 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete teraz synchronizovať svoje zložky?"
 
-#: ../src/mainwindow.c:4207
+#: ../src/mainwindow.c:4217
 msgid "+_Synchronise"
 msgstr "+_Synchronizovať"
 
-#: ../src/mainwindow.c:4636
+#: ../src/mainwindow.c:4659
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplicitné správy…"
 
-#: ../src/mainwindow.c:4673
+#: ../src/mainwindow.c:4696
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -8084,34 +8354,34 @@ msgstr[0] "Zmazaná %d duplicitná správa v %d zložkách.\n"
 msgstr[1] "Zmazané %d duplicitné správy v %d zložkách.\n"
 msgstr[2] "Zmazaných %d duplicitných správ v %d zložkách.\n"
 
-#: ../src/mainwindow.c:4928 ../src/summaryview.c:5725
+#: ../src/mainwindow.c:4951 ../src/summaryview.c:5725
 msgid "Processing rules to apply before folder rules"
 msgstr "Pravidlá spracovania použité pred pravidlami zložky"
 
-#: ../src/mainwindow.c:4936
+#: ../src/mainwindow.c:4959
 msgid "Processing rules to apply after folder rules"
 msgstr "Pravidlá spracovania použité po pravidlách zložky"
 
-#: ../src/mainwindow.c:4944 ../src/summaryview.c:5736
+#: ../src/mainwindow.c:4967 ../src/summaryview.c:5736
 msgid "Filtering configuration"
 msgstr "Nastavenie filtrovania"
 
-#: ../src/mainwindow.c:5059
+#: ../src/mainwindow.c:5082
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Nemožno registrovať ako predvoleného klienta: nemožné nájsť cestu programu."
 
-#: ../src/mainwindow.c:5118
+#: ../src/mainwindow.c:5141
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail bol zaregistrovaný ako predvolený klient."
 
-#: ../src/mainwindow.c:5120
+#: ../src/mainwindow.c:5143
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Nemožno registrovať ako predvolený klient: nemožné zapisovať do registra."
 
-#: ../src/mainwindow.c:5278
+#: ../src/mainwindow.c:5301
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8119,56 +8389,56 @@ msgstr[0] "Zabudnuté %d heslo v %d účtoch.\n"
 msgstr[1] "Zabudnuté %d heslá v %d účtoch.\n"
 msgstr[2] "Zabudnutých %d hesiel v %d účtoch.\n"
 
-#: ../src/matcher.c:209 ../src/matcher.c:210 ../src/matcher.c:211
-#: ../src/matcher.c:212 ../src/matcher.c:213 ../src/matcher.c:214
-#: ../src/matcher.c:215
+#: ../src/matcher.c:211 ../src/matcher.c:212 ../src/matcher.c:213
+#: ../src/matcher.c:214 ../src/matcher.c:215 ../src/matcher.c:216
+#: ../src/matcher.c:217
 #, c-format
 msgid "%s header"
 msgstr "Hlavička %s"
 
-#: ../src/matcher.c:216
+#: ../src/matcher.c:218
 msgid "header"
 msgstr "hlavička"
 
-#: ../src/matcher.c:217
+#: ../src/matcher.c:219
 msgid "header line"
 msgstr "riadok hlavičky"
 
-#: ../src/matcher.c:218
+#: ../src/matcher.c:220
 msgid "body line"
 msgstr "riadok tela správy"
 
-#: ../src/matcher.c:219
+#: ../src/matcher.c:221
 msgid "tag"
 msgstr "značka"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553 ../src/message_search.c:205 ../src/prefs_matcher.c:739
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555 ../src/message_search.c:205 ../src/prefs_matcher.c:742
 #: ../src/summary_search.c:466
 msgid "Case sensitive"
 msgstr "Záleží na veľkosti písmen"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555
 msgid "Case insensitive"
 msgstr "Nezáleží na veľkosti"
 
-#: ../src/matcher.c:1818
+#: ../src/matcher.c:1843
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "zisťujem či správa vyhovuje [ %s ]\n"
 
-#: ../src/matcher.c:1887 ../src/matcher.c:1906 ../src/matcher.c:1919
+#: ../src/matcher.c:1912 ../src/matcher.c:1931 ../src/matcher.c:1944
 msgid "message matches\n"
 msgstr "správa vyhovuje\n"
 
-#: ../src/matcher.c:1894 ../src/matcher.c:1912 ../src/matcher.c:1921
+#: ../src/matcher.c:1919 ../src/matcher.c:1937 ../src/matcher.c:1946
 msgid "message does not match\n"
 msgstr "správa nevyhovuje\n"
 
-#: ../src/matcher.c:2184 ../src/matcher.c:2185 ../src/matcher.c:2186
-#: ../src/matcher.c:2187 ../src/matcher.c:2188 ../src/matcher.c:2189
-#: ../src/matcher.c:2190 ../src/matcher.c:2191
+#: ../src/matcher.c:2209 ../src/matcher.c:2210 ../src/matcher.c:2211
+#: ../src/matcher.c:2212 ../src/matcher.c:2213 ../src/matcher.c:2214
+#: ../src/matcher.c:2215 ../src/matcher.c:2216
 msgid "(none)"
 msgstr "(žiadna)"
 
@@ -8197,8 +8467,8 @@ msgstr "Prepísať súbor mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tento súbor už existuje. Chcete ho prepísať?"
 
-#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1843
-#: ../src/prefs_themes.c:555 ../src/textview.c:3075
+#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1844
+#: ../src/prefs_themes.c:555 ../src/textview.c:3054
 msgid "Overwrite"
 msgstr "Prepísať"
 
@@ -8293,7 +8563,7 @@ msgstr ""
 msgid "Fetching message (%s)..."
 msgstr "Sťahovanie správy (%s)…"
 
-#: ../src/messageview.c:1357 ../src/procmime.c:1004
+#: ../src/messageview.c:1357 ../src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Nemožno dešifrovať: %s"
@@ -8302,9 +8572,9 @@ msgstr "Nemožno dešifrovať: %s"
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Správa nezodpovedá štandardu MIME. Môže byť zle zobrazená."
 
-#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1996
-#: ../src/plugins/fancy/fancy_viewer.c:667 ../src/summaryview.c:4808
-#: ../src/summaryview.c:4811 ../src/textview.c:3063
+#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1997
+#: ../src/plugins/fancy/fancy_viewer.c:669 ../src/summaryview.c:4808
+#: ../src/summaryview.c:4811 ../src/textview.c:3042
 msgid "Save as"
 msgstr "Uložiť ako"
 
@@ -8408,7 +8678,7 @@ msgstr ""
 "Viac ako jeden účet používa adresu, na ktorú bola táto správa odoslaná.\n"
 "Prosím vyberte účet, ktorý chcete použiť na odoslanie potvrdenia o príjme:"
 
-#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_gtk.c:494
+#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_feed_props.c:533
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
@@ -8445,20 +8715,20 @@ msgstr ""
 "  Správa bola odstránená alebo presunutá do inej zložky"
 
 #: ../src/messageview.c:2971 ../src/messageview.c:2977
-#: ../src/summaryview.c:4191 ../src/summaryview.c:6964
+#: ../src/summaryview.c:4193 ../src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "Nastala chyba pri učení.\n"
 
-#: ../src/mh.c:432
+#: ../src/mh.c:438
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "nemožno kopírovať správu %s do %s\n"
 
-#: ../src/mh.c:518
+#: ../src/mh.c:524
 msgid "Moving messages..."
 msgstr "Presúvam správy…"
 
-#: ../src/mh.c:662 ../src/plugins/mailmbox/mailmbox_folder.c:839
+#: ../src/mh.c:668 ../src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Mažem správy…"
 
@@ -8547,32 +8817,32 @@ msgstr "Overovanie podpisu…"
 msgid "Go back to email"
 msgstr "Naspäť na správu"
 
-#: ../src/mimeview.c:1762 ../src/mimeview.c:1851 ../src/mimeview.c:2043
-#: ../src/mimeview.c:2079 ../src/mimeview.c:2191
-#: ../src/plugins/fancy/fancy_viewer.c:420
+#: ../src/mimeview.c:1763 ../src/mimeview.c:1852 ../src/mimeview.c:2044
+#: ../src/mimeview.c:2080 ../src/mimeview.c:2192
+#: ../src/plugins/fancy/fancy_viewer.c:422
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nemožno uložiť časť viacdielnej správy: %s"
 
-#: ../src/mimeview.c:1840 ../src/textview.c:3073
+#: ../src/mimeview.c:1841 ../src/textview.c:3052
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Prepísať existujúci súbor „%s”?"
 
-#: ../src/mimeview.c:1882 ../src/plugins/archive/archiver_prefs.c:128
+#: ../src/mimeview.c:1883 ../src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
 msgstr "Zvoľte cieľovú zložku"
 
-#: ../src/mimeview.c:1889 ../src/plugins/archive/archiver_prefs.c:134
+#: ../src/mimeview.c:1890 ../src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "„%s” nie je zložka."
 
-#: ../src/mimeview.c:2126 ../src/mimeview.c:2133 ../src/textview.c:2994
+#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2973
 msgid "Open with"
 msgstr "Otvoriť čím"
 
-#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2995
+#: ../src/mimeview.c:2128 ../src/mimeview.c:2135 ../src/textview.c:2974
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8581,11 +8851,11 @@ msgstr ""
 "Zadajte príkazový na otvorenie súboru:\n"
 "(„%s” bude nahradené názvom súboru)"
 
-#: ../src/mimeview.c:2225
+#: ../src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "Spustiť neznámy binárny súbor?"
 
-#: ../src/mimeview.c:2226
+#: ../src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8597,19 +8867,19 @@ msgstr ""
 "\n"
 "Naozaj chcete spustiť tento súbor?"
 
-#: ../src/mimeview.c:2230
+#: ../src/mimeview.c:2231
 msgid "Run binary"
 msgstr "Spustiť binárny súbor"
 
-#: ../src/mimeview.c:2529
+#: ../src/mimeview.c:2530
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/mimeview.c:2530 ../src/plugins/pdf_viewer/poppler_viewer.c:699
+#: ../src/mimeview.c:2531 ../src/plugins/pdf_viewer/poppler_viewer.c:699
 msgid "Size:"
 msgstr "Veľkosť:"
 
-#: ../src/mimeview.c:2544 ../src/plugins/vcalendar/vcalendar.c:1271
+#: ../src/mimeview.c:2545 ../src/plugins/vcalendar/vcalendar.c:1271
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1722
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1732
 msgid "Description:"
@@ -8738,7 +9008,7 @@ msgstr "Naozaj sa chcete odhlásiť z diskusnej skupiny „%s”?"
 msgid "Unsubscribe newsgroup"
 msgstr "Odhlásiť sa z diskusnej skupiny"
 
-#: ../src/news_gtk.c:268 ../src/plugins/rssyl/rssyl_gtk.c:695
+#: ../src/news_gtk.c:268
 msgid "_Unsubscribe"
 msgstr "_Odhlásiť sa"
 
@@ -8884,7 +9154,7 @@ msgstr "Cesta k Adresáru, kde majú byť uchované adresy"
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:201
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:447
 #: ../src/prefs_filtering_action.c:573 ../src/prefs_filtering_action.c:580
-#: ../src/prefs_matcher.c:676
+#: ../src/prefs_matcher.c:679
 msgid "Select..."
 msgstr "Vybrať..."
 
@@ -8996,36 +9266,36 @@ msgstr "Na zastavenie archivácie stlačte tlačidlo Zrušiť"
 msgid "Archiving:"
 msgstr "Archivácia:"
 
-#: ../src/plugins/archive/archiver_gtk.c:506
+#: ../src/plugins/archive/archiver_gtk.c:507
 msgid "Folder and archive must be selected"
 msgstr "Musíte vybrať zložku a archív"
 
-#: ../src/plugins/archive/archiver_gtk.c:515
+#: ../src/plugins/archive/archiver_gtk.c:516
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s: existuje. Pokračovať i tak?"
 
-#: ../src/plugins/archive/archiver_gtk.c:518
+#: ../src/plugins/archive/archiver_gtk.c:519
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: je odkaz. Nemožno pokračovať"
 
-#: ../src/plugins/archive/archiver_gtk.c:521
+#: ../src/plugins/archive/archiver_gtk.c:522
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: je adresár. Nemožno pokračovať"
 
-#: ../src/plugins/archive/archiver_gtk.c:524
+#: ../src/plugins/archive/archiver_gtk.c:525
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: Nedostatočné práva. Nemožno pokračovať"
 
-#: ../src/plugins/archive/archiver_gtk.c:527
+#: ../src/plugins/archive/archiver_gtk.c:528
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: Neznáma chyba. Nemožno pokračovať"
 
-#: ../src/plugins/archive/archiver_gtk.c:564
+#: ../src/plugins/archive/archiver_gtk.c:565
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -9034,7 +9304,7 @@ msgstr ""
 "Neplatné meno súboru:\n"
 "%s."
 
-#: ../src/plugins/archive/archiver_gtk.c:577
+#: ../src/plugins/archive/archiver_gtk.c:578
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -9043,7 +9313,7 @@ msgstr ""
 "Neplatná zložka Claws Mail:\n"
 "%s."
 
-#: ../src/plugins/archive/archiver_gtk.c:606
+#: ../src/plugins/archive/archiver_gtk.c:607
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -9058,180 +9328,180 @@ msgstr ""
 "\n"
 "Pokračovať?"
 
-#: ../src/plugins/archive/archiver_gtk.c:710
+#: ../src/plugins/archive/archiver_gtk.c:711
 msgid "Archive result"
 msgstr "Výsledok archívu"
 
-#: ../src/plugins/archive/archiver_gtk.c:740
+#: ../src/plugins/archive/archiver_gtk.c:741
 msgid "Values"
 msgstr "Hodnoty"
 
-#: ../src/plugins/archive/archiver_gtk.c:749
+#: ../src/plugins/archive/archiver_gtk.c:750
 msgid "Archive"
 msgstr "Archív"
 
-#: ../src/plugins/archive/archiver_gtk.c:755
+#: ../src/plugins/archive/archiver_gtk.c:756
 msgid "Archive format"
 msgstr "Formát archívu"
 
-#: ../src/plugins/archive/archiver_gtk.c:762
+#: ../src/plugins/archive/archiver_gtk.c:763
 msgid "Compression method"
 msgstr "Kompresná metóda"
 
-#: ../src/plugins/archive/archiver_gtk.c:770
+#: ../src/plugins/archive/archiver_gtk.c:771
 msgid "Number of files"
 msgstr "Počet súborov"
 
-#: ../src/plugins/archive/archiver_gtk.c:778
+#: ../src/plugins/archive/archiver_gtk.c:779
 msgid "Archive Size"
 msgstr "Veľkosť archívu"
 
-#: ../src/plugins/archive/archiver_gtk.c:786
+#: ../src/plugins/archive/archiver_gtk.c:787
 msgid "Folder Size"
 msgstr "Veľkosť zložky"
 
-#: ../src/plugins/archive/archiver_gtk.c:795
+#: ../src/plugins/archive/archiver_gtk.c:796
 msgid "Compression level"
 msgstr "Úroveň kompresie"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:718
 #: ../src/prefs_folder_item.c:514
 msgid "Yes"
 msgstr "Áno"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:721
 #: ../src/prefs_folder_item.c:513 ../src/prefs_summaries.c:369
 msgid "No"
 msgstr "Nie"
 
-#: ../src/plugins/archive/archiver_gtk.c:803
+#: ../src/plugins/archive/archiver_gtk.c:804
 msgid "MD5 checksum"
 msgstr "Kontrolný súčet MD5"
 
-#: ../src/plugins/archive/archiver_gtk.c:811
+#: ../src/plugins/archive/archiver_gtk.c:812
 msgid "Descriptive names"
 msgstr "Popisné mená"
 
-#: ../src/plugins/archive/archiver_gtk.c:819
+#: ../src/plugins/archive/archiver_gtk.c:820
 msgid "Delete selected files"
 msgstr "Zmazať zvolené súbory"
 
-#: ../src/plugins/archive/archiver_gtk.c:828
-#: ../src/plugins/archive/archiver_gtk.c:1210
+#: ../src/plugins/archive/archiver_gtk.c:829
+#: ../src/plugins/archive/archiver_gtk.c:1211
 msgid "Select mails before"
 msgstr "Najprv vyberať správy"
 
-#: ../src/plugins/archive/archiver_gtk.c:904
+#: ../src/plugins/archive/archiver_gtk.c:905
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Vyberte meno súboru archívu [prípona musí zodpovedať archívu, napr. .tgz]"
 
-#: ../src/plugins/archive/archiver_gtk.c:952
+#: ../src/plugins/archive/archiver_gtk.c:953
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld z %ld"
 
-#: ../src/plugins/archive/archiver_gtk.c:991
+#: ../src/plugins/archive/archiver_gtk.c:992
 msgid "Create Archive"
 msgstr "Vytvoriť archív"
 
-#: ../src/plugins/archive/archiver_gtk.c:1006
+#: ../src/plugins/archive/archiver_gtk.c:1007
 msgid "Enter Archiver arguments"
 msgstr "Zadajte argumenty archivácie"
 
-#: ../src/plugins/archive/archiver_gtk.c:1019
+#: ../src/plugins/archive/archiver_gtk.c:1020
 msgid "Folder to archive"
 msgstr "Zložka na archiváciu"
 
-#: ../src/plugins/archive/archiver_gtk.c:1026
+#: ../src/plugins/archive/archiver_gtk.c:1027
 msgid "Folder which is the root of the archive"
 msgstr "Zložka, ktorá je koreňom archívu"
 
-#: ../src/plugins/archive/archiver_gtk.c:1031
+#: ../src/plugins/archive/archiver_gtk.c:1032
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr "Týmto tlačidlom vyberiete zložku, ktorá je koreňom archívu"
 
-#: ../src/plugins/archive/archiver_gtk.c:1037
+#: ../src/plugins/archive/archiver_gtk.c:1038
 msgid "Name for archive"
 msgstr "Meno archívu"
 
-#: ../src/plugins/archive/archiver_gtk.c:1043
+#: ../src/plugins/archive/archiver_gtk.c:1044
 msgid "Archive location and name"
 msgstr "Umiestnenie a meno archívu"
 
-#: ../src/plugins/archive/archiver_gtk.c:1045
+#: ../src/plugins/archive/archiver_gtk.c:1046
 #: ../src/plugins/archive/archiver_prefs.c:198
 #: ../src/plugins/pgpcore/select-keys.c:422
 msgid "_Select"
 msgstr "_Zvoliť"
 
-#: ../src/plugins/archive/archiver_gtk.c:1048
+#: ../src/plugins/archive/archiver_gtk.c:1049
 msgid "Click this button to select a name and location for the archive"
 msgstr "Týmto tlačidlom vyberiete zložku meno a umiestnenie archívu"
 
-#: ../src/plugins/archive/archiver_gtk.c:1050
+#: ../src/plugins/archive/archiver_gtk.c:1051
 msgid "Choose compression"
 msgstr "Zvoľte kompresiu"
 
-#: ../src/plugins/archive/archiver_gtk.c:1063
+#: ../src/plugins/archive/archiver_gtk.c:1064
 msgid "Choose this option to use ZIP compression for the archive"
 msgstr "Zvoľte túto možnosť na komprimáciu archívu vo formáte ZIP"
 
-#: ../src/plugins/archive/archiver_gtk.c:1070
+#: ../src/plugins/archive/archiver_gtk.c:1071
 msgid "Choose this option to use BZIP2 compression for the archive"
 msgstr "Zvoľte túto možnosť na komprimáciu archívu vo formáte BZIP2"
 
-#: ../src/plugins/archive/archiver_gtk.c:1078
+#: ../src/plugins/archive/archiver_gtk.c:1079
 msgid "Choose this to use Compress compression for your archive"
 msgstr "Zvoľte túto možnosť na komprimáciu archívu vo formáte Compress"
 
-#: ../src/plugins/archive/archiver_gtk.c:1086
+#: ../src/plugins/archive/archiver_gtk.c:1087
 msgid "Choose this option to disable compression for the archive"
 msgstr "Zvoľte túto možnosť na vypnutie komprimácie archívu"
 
-#: ../src/plugins/archive/archiver_gtk.c:1108
+#: ../src/plugins/archive/archiver_gtk.c:1109
 msgid "Choose format"
 msgstr "Zvoľte formát"
 
-#: ../src/plugins/archive/archiver_gtk.c:1121
+#: ../src/plugins/archive/archiver_gtk.c:1122
 msgid "Choose this option to use TAR as format for the archive"
 msgstr "Zvoľte túto možnosť na použitie formátu archívu TAR"
 
-#: ../src/plugins/archive/archiver_gtk.c:1128
+#: ../src/plugins/archive/archiver_gtk.c:1129
 msgid "Choose this to use SHAR as format for the archive"
 msgstr "Zvoľte túto možnosť na použitie formátu archívu SHAR"
 
-#: ../src/plugins/archive/archiver_gtk.c:1135
+#: ../src/plugins/archive/archiver_gtk.c:1136
 msgid "Choose this option to use CPIO as format for the archive"
 msgstr "Zvoľte túto možnosť na použitie formátu archívu CPIO"
 
-#: ../src/plugins/archive/archiver_gtk.c:1142
+#: ../src/plugins/archive/archiver_gtk.c:1143
 msgid "Choose this option to use PAX as format for the archive"
 msgstr "Zvoľte túto možnosť na použitie formátu archívu PAX"
 
-#: ../src/plugins/archive/archiver_gtk.c:1162
+#: ../src/plugins/archive/archiver_gtk.c:1163
 msgid "Miscellaneous options"
 msgstr "Rôzne voľby"
 
-#: ../src/plugins/archive/archiver_gtk.c:1171
+#: ../src/plugins/archive/archiver_gtk.c:1172
 msgid "_Recursive"
 msgstr "_Rekurzívne"
 
-#: ../src/plugins/archive/archiver_gtk.c:1175
+#: ../src/plugins/archive/archiver_gtk.c:1176
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Zvoľte túto možnosť na zahrnutie podzložiek do archívu"
 
-#: ../src/plugins/archive/archiver_gtk.c:1177
+#: ../src/plugins/archive/archiver_gtk.c:1178
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: ../src/plugins/archive/archiver_gtk.c:1181
+#: ../src/plugins/archive/archiver_gtk.c:1182
 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"
@@ -9242,11 +9512,11 @@ msgstr ""
 "Používajte s rozvahou, pretože dramaticky zvyšuje čas potrebný \n"
 "na vytvorenie archívu"
 
-#: ../src/plugins/archive/archiver_gtk.c:1185
+#: ../src/plugins/archive/archiver_gtk.c:1186
 msgid "R_ename"
 msgstr "Pr_emenovať"
 
-#: ../src/plugins/archive/archiver_gtk.c:1189
+#: ../src/plugins/archive/archiver_gtk.c:1190
 #: ../src/plugins/archive/archiver_prefs.c:333
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9257,7 +9527,7 @@ msgstr ""
 "Súbory budú pomenované v tvare: dátum_od at komu@predmet.\n"
 "Mená budú skrátené na maximálne 96 znakov"
 
-#: ../src/plugins/archive/archiver_gtk.c:1197
+#: ../src/plugins/archive/archiver_gtk.c:1198
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9265,11 +9535,11 @@ msgstr ""
 "Zvoľte túto možnosť na zmazanie správ po ich archivácii\n"
 "Momentálne pracuje len s IMAP4, lokálnym mbox a POP3"
 
-#: ../src/plugins/archive/archiver_gtk.c:1201
+#: ../src/plugins/archive/archiver_gtk.c:1202
 msgid "Selection options"
 msgstr "Voľby výberu"
 
-#: ../src/plugins/archive/archiver_gtk.c:1217
+#: ../src/plugins/archive/archiver_gtk.c:1218
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9357,24 +9627,94 @@ msgstr "Premenovať"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Zvoľte túto možnosť na zmazanie správ po archivácii"
 
-#: ../src/plugins/attachwarner/attachwarner.c:216
-#, c-format
-msgid ""
-"An attachment is mentioned in the mail you're sending, but no file was "
-"attached. Mention appears on line %d, which begins with text: <span weight="
-"\"bold\">%.20s</span>...\n"
-"\n"
-"%s it anyway?"
-msgstr ""
-"V správe, ktorú posielate je spomenutá príloha, ale nebol pripojený žiadny "
-"súbor. Príloha je spomenutá v riadku %d, ktorý začína textom: <span weight="
-"\"bold\">%.20s</span>…\n"
-"\n"
-"%s napriek tomu?"
-
-#: ../src/plugins/attachwarner/attachwarner.c:220
-msgid "Attachment warning"
-msgstr "Upozornenie na prílohu"
+#: ../src/plugins/att_remover/att_remover.c:299
+msgid "<b>Type: </b>"
+msgstr "<b>Typ: </b>"
+
+#: ../src/plugins/att_remover/att_remover.c:300
+msgid "<b>Size: </b>"
+msgstr "<b>Veľkosť: </b>"
+
+#: ../src/plugins/att_remover/att_remover.c:301
+msgid "<b>Filename: </b>"
+msgstr "<b>Meno súboru: </b>"
+
+#: ../src/plugins/att_remover/att_remover.c:332
+msgid "Remove attachments"
+msgstr "Odstrániť prílohy"
+
+#: ../src/plugins/att_remover/att_remover.c:357
+#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
+msgid "Remove"
+msgstr "Odstrániť"
+
+#. S_COL_STATUS
+#: ../src/plugins/att_remover/att_remover.c:365
+#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
+msgid "Attachment"
+msgstr "Príloha"
+
+#: ../src/plugins/att_remover/att_remover.c:417
+msgid "Destroy attachments"
+msgstr "Zrušiť prílohy"
+
+#: ../src/plugins/att_remover/att_remover.c:418
+msgid ""
+"Do you really want to remove all attachments from the selected messages?\n"
+"\n"
+"The deleted data will be unrecoverable."
+msgstr ""
+"Naozaj chcete odstrániť všetky prílohy zo zvolených správ?\n"
+"\n"
+"Odstránenie bude nevratné."
+
+#: ../src/plugins/att_remover/att_remover.c:479
+msgid "This message doesn't have any attachments."
+msgstr "Táto správa nemá žiadne prílohy."
+
+#: ../src/plugins/att_remover/att_remover.c:494
+msgid "Remove attachments..."
+msgstr "Odstrániť prílohy…"
+
+#: ../src/plugins/att_remover/att_remover.c:506
+#: ../src/plugins/att_remover/att_remover.c:566
+msgid "AttRemover"
+msgstr "AttRemover"
+
+#: ../src/plugins/att_remover/att_remover.c:571
+msgid ""
+"This plugin removes attachments from mails.\n"
+"\n"
+"Warning: this operation will be completely un-cancellable and the deleted "
+"attachments will be lost forever, and ever, and ever."
+msgstr ""
+"Tento zásuvný modul odstraňuje zo správ prílohy.\n"
+"\n"
+"Varovanie: táto operácia je úplne nevratná a odstránené prílohy budú navždy "
+"stratené a úplne a úplne."
+
+#: ../src/plugins/att_remover/att_remover.c:595
+msgid "Attachment handling"
+msgstr "Spracovanie prílohy"
+
+#: ../src/plugins/attachwarner/attachwarner.c:216
+#, c-format
+msgid ""
+"An attachment is mentioned in the mail you're sending, but no file was "
+"attached. Mention appears on line %d, which begins with text: <span weight="
+"\"bold\">%.20s</span>...\n"
+"\n"
+"%s it anyway?"
+msgstr ""
+"V správe, ktorú posielate je spomenutá príloha, ale nebol pripojený žiadny "
+"súbor. Príloha je spomenutá v riadku %d, ktorý začína textom: <span weight="
+"\"bold\">%.20s</span>…\n"
+"\n"
+"%s napriek tomu?"
+
+#: ../src/plugins/attachwarner/attachwarner.c:220
+msgid "Attachment warning"
+msgstr "Upozornenie na prílohu"
 
 #: ../src/plugins/attachwarner/attachwarner.c:245
 #: ../src/plugins/attachwarner/attachwarner.c:282
@@ -9456,76 +9796,6 @@ msgstr "Vylúčenie"
 msgid "Attach Warner"
 msgstr "Upozornenie na prílohu"
 
-#: ../src/plugins/att_remover/att_remover.c:299
-msgid "<b>Type: </b>"
-msgstr "<b>Typ: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:300
-msgid "<b>Size: </b>"
-msgstr "<b>Veľkosť: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:301
-msgid "<b>Filename: </b>"
-msgstr "<b>Meno súboru: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:332
-msgid "Remove attachments"
-msgstr "Odstrániť prílohy"
-
-#: ../src/plugins/att_remover/att_remover.c:357
-#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
-msgid "Remove"
-msgstr "Odstrániť"
-
-#. S_COL_STATUS
-#: ../src/plugins/att_remover/att_remover.c:365
-#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
-msgid "Attachment"
-msgstr "Príloha"
-
-#: ../src/plugins/att_remover/att_remover.c:417
-msgid "Destroy attachments"
-msgstr "Zrušiť prílohy"
-
-#: ../src/plugins/att_remover/att_remover.c:418
-msgid ""
-"Do you really want to remove all attachments from the selected messages?\n"
-"\n"
-"The deleted data will be unrecoverable."
-msgstr ""
-"Naozaj chcete odstrániť všetky prílohy zo zvolených správ?\n"
-"\n"
-"Odstránenie bude nevratné."
-
-#: ../src/plugins/att_remover/att_remover.c:479
-msgid "This message doesn't have any attachments."
-msgstr "Táto správa nemá žiadne prílohy."
-
-#: ../src/plugins/att_remover/att_remover.c:494
-msgid "Remove attachments..."
-msgstr "Odstrániť prílohy…"
-
-#: ../src/plugins/att_remover/att_remover.c:506
-#: ../src/plugins/att_remover/att_remover.c:566
-msgid "AttRemover"
-msgstr "AttRemover"
-
-#: ../src/plugins/att_remover/att_remover.c:571
-msgid ""
-"This plugin removes attachments from mails.\n"
-"\n"
-"Warning: this operation will be completely un-cancellable and the deleted "
-"attachments will be lost forever, and ever, and ever."
-msgstr ""
-"Tento zásuvný modul odstraňuje zo správ prílohy.\n"
-"\n"
-"Varovanie: táto operácia je úplne nevratná a odstránené prílohy budú navždy "
-"stratené a úplne a úplne."
-
-#: ../src/plugins/att_remover/att_remover.c:595
-msgid "Attachment handling"
-msgstr "Spracovanie prílohy"
-
 #: ../src/plugins/bogofilter/bogofilter.c:81
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:458
 msgid "Bogofilter"
@@ -10124,63 +10394,63 @@ msgstr ""
 "\n"
 "Nie je veľmi užitočný"
 
-#: ../src/plugins/fancy/fancy_prefs.c:141
+#: ../src/plugins/fancy/fancy_prefs.c:146
 msgid "Display images"
 msgstr "Zobraziť obrázky"
 
-#: ../src/plugins/fancy/fancy_prefs.c:142
+#: ../src/plugins/fancy/fancy_prefs.c:147
 msgid "Display embedded images"
 msgstr "Zobraziť zahrnuté obrázky"
 
-#: ../src/plugins/fancy/fancy_prefs.c:146
+#: ../src/plugins/fancy/fancy_prefs.c:151
 msgid "Execute javascript"
 msgstr "Vykonať JavaScript"
 
-#: ../src/plugins/fancy/fancy_prefs.c:147
+#: ../src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute embedded javascript"
 msgstr "Vykonať zahrnutý JavaScript"
 
-#: ../src/plugins/fancy/fancy_prefs.c:151
+#: ../src/plugins/fancy/fancy_prefs.c:156
 msgid "Execute Java applets"
 msgstr "Vykonať aplety Java"
 
-#: ../src/plugins/fancy/fancy_prefs.c:152
+#: ../src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute embedded Java applets"
 msgstr "Vykonať zahrnuté aplety Java"
 
-#: ../src/plugins/fancy/fancy_prefs.c:156
+#: ../src/plugins/fancy/fancy_prefs.c:161
 msgid "Render objects using plugins"
 msgstr "Spracovať objekty pomocou zásuvných modulov"
 
-#: ../src/plugins/fancy/fancy_prefs.c:157
+#: ../src/plugins/fancy/fancy_prefs.c:162
 msgid "Render embedded objects using plugins"
 msgstr "Spracovať zahrnuté objekty pomocou zásuvných modulov"
 
-#: ../src/plugins/fancy/fancy_prefs.c:164
+#: ../src/plugins/fancy/fancy_prefs.c:169
 msgid "Open in viewer (remote content is enabled)"
 msgstr "Otvoriť v prehliadači (vzdialený obsah je zapnutý)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:167
+#: ../src/plugins/fancy/fancy_prefs.c:172
 msgid "Do nothing (remote content is disabled)"
 msgstr "Neurobiť nič (vzdialený obsah je vypnutý)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:200
+#: ../src/plugins/fancy/fancy_prefs.c:209
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/plugins/fancy/fancy_prefs.c:202
+#: ../src/plugins/fancy/fancy_prefs.c:211
 msgid "Use GNOME's proxy settings"
 msgstr "Použiť nastavenia proxy v GNOME"
 
-#: ../src/plugins/fancy/fancy_prefs.c:210
+#: ../src/plugins/fancy/fancy_prefs.c:219
 msgid "Use proxy:"
 msgstr "Použiť proxy:"
 
-#: ../src/plugins/fancy/fancy_prefs.c:228
+#: ../src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
 msgstr "Vzdialené zdroje"
 
-#: ../src/plugins/fancy/fancy_prefs.c:229
+#: ../src/plugins/fancy/fancy_prefs.c:238
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10194,106 +10464,124 @@ msgstr ""
 "modulov alebo apletov Java môže byť naďalej zapnuté pre obsah,\n"
 "ktorý je súčasťou správy."
 
-#: ../src/plugins/fancy/fancy_prefs.c:235
+#: ../src/plugins/fancy/fancy_prefs.c:244
 msgid "Enable loading of remote content"
 msgstr "Povoliť načítanie vzdialeného obsahu"
 
-#: ../src/plugins/fancy/fancy_prefs.c:267
+#: ../src/plugins/fancy/fancy_prefs.c:276
 msgid "When clicking on a link, by default:"
 msgstr "Pri kliknutí na odkaz, predvolene:"
 
-#: ../src/plugins/fancy/fancy_prefs.c:275
+#: ../src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
 msgstr "Otvoriť v externom prehliadači"
 
-#: ../src/plugins/fancy/fancy_viewer.c:391
+#: ../src/plugins/fancy/fancy_prefs.c:298
+msgid "The CSS in this file will be applied to all HTML parts"
+msgstr "CSS v tomto súbore bude použité na všetky časti HTML"
+
+#: ../src/plugins/fancy/fancy_prefs.c:300
+msgid "Stylesheet:"
+msgstr "Štýlopis"
+
+#: ../src/plugins/fancy/fancy_prefs.c:308 ../src/prefs_account.c:1442
+#: ../src/prefs_account.c:1531 ../src/prefs_account.c:1991
+#: ../src/prefs_customheader.c:237
+msgid "Bro_wse"
+msgstr "P_rehliadať"
+
+#: ../src/plugins/fancy/fancy_prefs.c:350
+msgid "Select stylesheet"
+msgstr "Vyberte štýlopis"
+
+#: ../src/plugins/fancy/fancy_viewer.c:393
 msgid "Remote content loading is disabled."
 msgstr "Načítavanie vzdialeného obsahu je vypnuté."
 
-#: ../src/plugins/fancy/fancy_viewer.c:468
+#: ../src/plugins/fancy/fancy_viewer.c:470
 msgid "Load images"
 msgstr "Načítať obrázky"
 
-#: ../src/plugins/fancy/fancy_viewer.c:470
+#: ../src/plugins/fancy/fancy_viewer.c:472
 msgid "Enable remote content"
 msgstr "Zapnúť vzdialený obsah"
 
-#: ../src/plugins/fancy/fancy_viewer.c:472
+#: ../src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable Javascript"
 msgstr "Povoliť JavaScript"
 
-#: ../src/plugins/fancy/fancy_viewer.c:474
+#: ../src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Plugins"
 msgstr "Povoliť zásuvné moduly"
 
-#: ../src/plugins/fancy/fancy_viewer.c:476
+#: ../src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Java"
 msgstr "Povoliť Java"
 
-#: ../src/plugins/fancy/fancy_viewer.c:478
+#: ../src/plugins/fancy/fancy_viewer.c:480
 msgid "Open links with external browser"
 msgstr "Otvoriť odkazy v externom prehliadači"
 
-#: ../src/plugins/fancy/fancy_viewer.c:647
+#: ../src/plugins/fancy/fancy_viewer.c:649
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Nastala chyba: %d\n"
 
-#: ../src/plugins/fancy/fancy_viewer.c:703
+#: ../src/plugins/fancy/fancy_viewer.c:705
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s je poškodený alebo nepodporovaný kanál"
 
-#: ../src/plugins/fancy/fancy_viewer.c:714
+#: ../src/plugins/fancy/fancy_viewer.c:716
 msgid "Search the Web"
 msgstr "Hľadať na webe"
 
-#: ../src/plugins/fancy/fancy_viewer.c:726
+#: ../src/plugins/fancy/fancy_viewer.c:728
 msgid "Open in Viewer"
 msgstr "Otvoriť v prehliadači"
 
-#: ../src/plugins/fancy/fancy_viewer.c:728
+#: ../src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer (enable remote content)"
 msgstr "Otvoriť v prehliadači (zapnúť vzdialený obsah)"
 
-#: ../src/plugins/fancy/fancy_viewer.c:737
+#: ../src/plugins/fancy/fancy_viewer.c:739
 msgid "Open in Browser"
 msgstr "Otvoriť v prehliadači"
 
-#: ../src/plugins/fancy/fancy_viewer.c:747
+#: ../src/plugins/fancy/fancy_viewer.c:749
 msgid "Open Image"
 msgstr "Otvoriť obrázok"
 
-#: ../src/plugins/fancy/fancy_viewer.c:756
+#: ../src/plugins/fancy/fancy_viewer.c:758
 msgid "Copy Link"
 msgstr "Kopírovať odkaz"
 
-#: ../src/plugins/fancy/fancy_viewer.c:760
+#: ../src/plugins/fancy/fancy_viewer.c:762
 msgid "Download Link"
 msgstr "Stiahnuť odkaz"
 
-#: ../src/plugins/fancy/fancy_viewer.c:771
+#: ../src/plugins/fancy/fancy_viewer.c:773
 msgid "Save Image As"
 msgstr "Uložiť obrázok ako"
 
-#: ../src/plugins/fancy/fancy_viewer.c:781
+#: ../src/plugins/fancy/fancy_viewer.c:783
 msgid "Copy Image"
 msgstr "Kopírovať obrázok"
 
-#: ../src/plugins/fancy/fancy_viewer.c:799
+#: ../src/plugins/fancy/fancy_viewer.c:801
 msgid "Import feed"
 msgstr "Importovať kanál"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1012
+#: ../src/plugins/fancy/fancy_viewer.c:1014
 msgid "Fancy"
 msgstr "Vkusný"
 
 #. i18n: 'Fancy' here is name of the plugin, not the english word.
-#: ../src/plugins/fancy/fancy_viewer.c:1040
+#: ../src/plugins/fancy/fancy_viewer.c:1042
 msgid "Fancy HTML Viewer"
 msgstr "Vkusný zobrazovač HTML"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1045
+#: ../src/plugins/fancy/fancy_viewer.c:1047
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10503,1026 +10791,1000 @@ msgstr "Integrácia GData"
 #: ../src/plugins/geolocation/geolocation_plugin.c:349
 #, c-format
 msgid "Found location: (%.2f,%.2f)"
-msgstr ""
+msgstr "Nájdená lokácia: (%.2f,%.2f)"
 
 #. TRANSLATORS: The country name is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:369
 msgid "Alleged country of origin: "
-msgstr ""
+msgstr "Údajná krajina pôvodu:"
 
 #. TRANSLATORS: The IP address is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:373
-#, fuzzy
 msgid "Could not resolve location of IP address "
-msgstr "Nemožno načítať zoznam adries"
+msgstr "Nemožno zistiť umiestnenie adresy IP"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:512
-#, fuzzy
 msgid "Try to locate sender"
-msgstr "krstné meno odosielateľa"
+msgstr "Skúste lokáciu neskôr"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:528
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:529
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Spojené arabské emiráty"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:530
 msgid "Afghanistan"
-msgstr ""
+msgstr "Afganistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:531
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "Antigua a Barbuda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:532
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguilla"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:533
 msgid "Albania"
-msgstr ""
+msgstr "Albánsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:534
 msgid "Armenia"
-msgstr ""
+msgstr "Arménsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:535
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Holandské Antily"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:536
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:537
 msgid "Antarctica"
-msgstr ""
+msgstr "Antarktída"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:538
-#, fuzzy
 msgid "Argentina"
-msgstr "Fialová"
+msgstr "Argentína"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:539
 msgid "American Samoa"
-msgstr ""
+msgstr "Americká Samoa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:540
 msgid "Austria"
-msgstr ""
+msgstr "Rakúsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:541
 msgid "Australia"
-msgstr ""
+msgstr "Austrália"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:542
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:543
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbajdžan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:544
 msgid "Bosnia And Herzegovina"
-msgstr ""
+msgstr "Bosna a Hercegovina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:545
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:546
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladéš"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:547
 msgid "Belgium"
-msgstr ""
+msgstr "Belgicko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:548
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:549
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulharsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:550
 msgid "Bahrain"
-msgstr ""
+msgstr "Bahrajn"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:551
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:552
 msgid "Benin"
-msgstr ""
+msgstr "Benin"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:553
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermudy"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:554
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunejsko-darussalamský štát"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:555
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolívia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:556
 msgid "Brazil"
-msgstr ""
+msgstr "Brazília"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:557
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahamy"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:558
 msgid "Bhutan"
-msgstr ""
+msgstr "Bhután"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:559
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Bouvetov ostrov"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:560
 msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:561
 msgid "Belarus"
-msgstr ""
+msgstr "Bielorusko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:562
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:563
 msgid "Canada"
-msgstr ""
+msgstr "Kanada"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:564
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Kokosové ostrovy"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:565
 msgid "Central African Republic"
-msgstr ""
+msgstr "Stredoafrická republika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:566
 msgid "Congo"
-msgstr ""
+msgstr "Kongo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:567
 msgid "Switzerland"
-msgstr ""
+msgstr "Švajčiarsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:568
 msgid "Cote D'Ivoire"
-msgstr ""
+msgstr "Pobrežie Slonoviny"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:569
 msgid "Cook Islands"
-msgstr ""
+msgstr "Cookove ostrovy"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:570
 msgid "Chile"
-msgstr ""
+msgstr "Čile"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:571
 msgid "Cameroon"
-msgstr ""
+msgstr "Kamerun"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:572
-#, fuzzy
 msgid "China"
-msgstr "Čínske"
+msgstr "Čína"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:573
-#, fuzzy
 msgid "Colombia"
-msgstr "Zafarbiť"
+msgstr "Kolumbia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:574
 msgid "Costa Rica"
-msgstr ""
+msgstr "Kostarika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:575
 msgid "Cuba"
-msgstr ""
+msgstr "Kuba"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:576
 msgid "Cape Verde"
-msgstr ""
+msgstr "Kapverdy"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:577
 msgid "Christmas Island"
-msgstr ""
+msgstr "Vianočný ostrov"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:578
 msgid "Cyprus"
-msgstr ""
+msgstr "Cyprus"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:579
 msgid "Czech Republic"
-msgstr ""
+msgstr "Česká republika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:580
 msgid "Germany"
-msgstr ""
+msgstr "Nemecko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:581
 msgid "Djibouti"
-msgstr ""
+msgstr "Džibutsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:582
-#, fuzzy
 msgid "Denmark"
-msgstr "Odznačiť"
+msgstr "Dánsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:583
 msgid "Dominica"
-msgstr ""
+msgstr "Dominika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:584
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Dominikánska republika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:585
 msgid "Algeria"
-msgstr ""
+msgstr "Alžírsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:586
 msgid "Ecuador"
-msgstr ""
+msgstr "Ekvádor"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:587
 msgid "Estonia"
-msgstr ""
+msgstr "Estónsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:588
 msgid "Egypt"
-msgstr ""
+msgstr "Egypt"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:589
-#, fuzzy
 msgid "Western Sahara"
-msgstr "Západná Európa (ISO-8859-1)"
+msgstr "Západná Sahara"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:590
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:591
 msgid "Spain"
-msgstr ""
+msgstr "Španielsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:592
 msgid "Ethiopia"
-msgstr ""
+msgstr "Etiópia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:593
 msgid "Finland"
-msgstr ""
+msgstr "Fínsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:594
 msgid "Fiji"
-msgstr ""
+msgstr "Fidži"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:595
 msgid "Falkland Islands (Malvinas)"
-msgstr ""
+msgstr "Falklandy (Malvíny)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:596
 msgid "Micronesia, Federated States Of"
-msgstr ""
+msgstr "Mikronézske federatívne štáty"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:597
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Faerské ostrovy"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:598
-#, fuzzy
 msgid "France"
-msgstr "Zrušiť"
+msgstr "Francúzsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:599
 msgid "France, Metropolitan"
-msgstr ""
+msgstr "Metropolitné Francúzsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:600
 msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:601
 #: ../src/plugins/geolocation/geolocation_plugin.c:747
 msgid "United Kingdom"
-msgstr ""
+msgstr "Spojené kráľovstvo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:602
 msgid "Grenada"
-msgstr ""
+msgstr "Grenada"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:603
 msgid "Georgia"
-msgstr ""
+msgstr "Gruzínsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:604
 msgid "French Guiana"
-msgstr ""
+msgstr "Francúzska Guyana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:605
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:606
-#, fuzzy
 msgid "Gibraltar"
-msgstr "Libravatar"
+msgstr "Gibraltár"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:607
-#, fuzzy
 msgid "Greenland"
-msgstr "Zelená"
+msgstr "Grónsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:608
 msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:609
 msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:610
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Guadeloupe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:611
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Rovníková Guinea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:612
-#, fuzzy
 msgid "Greece"
-msgstr "Zelená"
+msgstr "Grécko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:613
 msgid "South Georgia And The South Sandwich Islands"
-msgstr ""
+msgstr "Južná Georgia a Južné Sandwichove ostrovy"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:614
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:615
 msgid "Guam"
-msgstr ""
+msgstr "Guam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:616
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Guinea-Bissau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:617
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:618
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hongkong"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:619
 msgid "Heard Island And Mcdonald Islands"
-msgstr ""
+msgstr "Heardov ostrov"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:620
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:621
 msgid "Croatia"
-msgstr ""
+msgstr "Chorvátsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:622
 msgid "Haiti"
-msgstr ""
+msgstr "Haiti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:623
 msgid "Hungary"
-msgstr ""
+msgstr "Maďarsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:624
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonézia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:625
 msgid "Ireland"
-msgstr ""
+msgstr "Írsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:626
 msgid "Israel"
-msgstr ""
+msgstr "Izrael"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:627
-#, fuzzy
 msgid "India"
-msgstr "Indikátor"
+msgstr "India"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:628
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Britské indickooceánske územie"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:629
 msgid "Iraq"
-msgstr ""
+msgstr "Irak"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:630
 msgid "Iran, Islamic Republic Of"
-msgstr ""
+msgstr "Iránska islamská republika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:631
 msgid "Iceland"
-msgstr ""
+msgstr "Island"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:632
 msgid "Italy"
-msgstr ""
+msgstr "Taliansko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:633
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamajka"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:634
 msgid "Jordan"
-msgstr ""
+msgstr "Jordánsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:635
-#, fuzzy
 msgid "Japan"
-msgstr "Japonské"
+msgstr "Japonsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:636
 msgid "Kenya"
-msgstr ""
+msgstr "Keňa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:637
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kirgizsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:638
 msgid "Cambodia"
-msgstr ""
+msgstr "Kambodža"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:639
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:640
-#, fuzzy
 msgid "Comoros"
-msgstr "zajtra"
+msgstr "Komory"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:641
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "Svätý Krištof a Nevis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:642
 msgid "Korea, Democratic People'S Republic Of"
-msgstr ""
+msgstr "Kórejská ľudovodemokratická republika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:643
 msgid "Korea, Republic Of"
-msgstr ""
+msgstr "Kórejská republika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:644
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuvajt"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:645
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Kajmanie ostrovy"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:646
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazachstan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:647
 msgid "Lao People'S Democratic Republic"
-msgstr ""
+msgstr "Laoská ľudovodemokratická republika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:648
 msgid "Lebanon"
-msgstr ""
+msgstr "Libanon"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:649
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Svätá Lucia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:650
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Lichtenštajnsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:651
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Srí Lanka"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:652
 msgid "Liberia"
-msgstr ""
+msgstr "Libéria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:653
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:654
 msgid "Lithuania"
-msgstr ""
+msgstr "Litva"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:655
 msgid "Luxembourg"
-msgstr ""
+msgstr "Luxembursko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:656
 msgid "Latvia"
-msgstr ""
+msgstr "Lotyšsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:657
 msgid "Libyan Arab Jamahiriya"
-msgstr ""
+msgstr "Líbya"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:658
 msgid "Morocco"
-msgstr ""
+msgstr "Maroko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:659
 msgid "Monaco"
-msgstr ""
+msgstr "Monako"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:660
 msgid "Moldova, Republic Of"
-msgstr ""
+msgstr "Moldavská republika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:661
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagaskar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:662
-#, fuzzy
 msgid "Marshall Islands"
-msgstr "Označiť všetky ako prečítané"
+msgstr "Marshallove ostrovy"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:663
 msgid "Macedonia, The Former Yugoslav Republic Of"
-msgstr ""
+msgstr "Bývalá juhoslovanská republika Macedónsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:664
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:665
-#, fuzzy
 msgid "Myanmar"
-msgstr "Odznačiť"
+msgstr "Mjanmarsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:666
 msgid "Mongolia"
-msgstr ""
+msgstr "Mongolsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:667
 msgid "Macao"
-msgstr ""
+msgstr "Macao"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:668
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Severné Mariány"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:669
 msgid "Martinique"
-msgstr ""
+msgstr "Martinik"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:670
 msgid "Mauritania"
-msgstr ""
+msgstr "Mauritánia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:671
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:672
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:673
 msgid "Mauritius"
-msgstr ""
+msgstr "Maurícius"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:674
 msgid "Maldives"
-msgstr ""
+msgstr "Maldivy"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:675
 msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:676
 msgid "Mexico"
-msgstr ""
+msgstr "Mexiko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:677
 msgid "Malaysia"
-msgstr ""
+msgstr "Malajzia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:678
 msgid "Mozambique"
-msgstr ""
+msgstr "Mozambik"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:679
 msgid "Namibia"
-msgstr ""
+msgstr "Namíbia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:680
-#, fuzzy
 msgid "New Caledonia"
-msgstr "Nové kontakty"
+msgstr "Nová Kaledónia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:681
 msgid "Niger"
-msgstr ""
+msgstr "Niger"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:682
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Norfolk"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:683
 msgid "Nigeria"
-msgstr ""
+msgstr "Nigéria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:684
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nikaragua"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:685
 msgid "Netherlands"
-msgstr ""
+msgstr "Holandsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:686
-#, fuzzy
 msgid "Norway"
-msgstr "Poslať ďalej"
+msgstr "Nórsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:687
 msgid "Nepal"
-msgstr ""
+msgstr "Nepál"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:688
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:689
 msgid "Niue"
-msgstr ""
+msgstr "Niue"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:690
 msgid "New Zealand"
-msgstr ""
+msgstr "Nový Zéland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:691
 msgid "Oman"
-msgstr ""
+msgstr "Omán"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:692
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:693
 msgid "Peru"
-msgstr ""
+msgstr "Peru"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:694
 msgid "French Polynesia"
-msgstr ""
+msgstr "Francúzska Polynézia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:695
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua - Nová Guinea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:696
-#, fuzzy
 msgid "Philippines"
-msgstr "riadkov"
+msgstr "Filipíny"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:697
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:698
 msgid "Poland"
-msgstr ""
+msgstr "Poľsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:699
 msgid "Saint Pierre And Miquelon"
-msgstr ""
+msgstr "Saint Pierre a Miquelon"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:700
 msgid "Pitcairn"
-msgstr ""
+msgstr "Pitcairnove ostrovy"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:701
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Portoriko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:702
-#, fuzzy
 msgid "Portugal"
-msgstr "Port"
+msgstr "Portugalsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:703
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:704
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguaj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:705
-#, fuzzy
 msgid "Qatar"
-msgstr "Wavatar"
+msgstr "Katar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:706
 msgid "Reunion"
-msgstr ""
+msgstr "Réunion"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:707
 msgid "Romania"
-msgstr ""
+msgstr "Rumunsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:708
 msgid "Russian Federation"
-msgstr ""
+msgstr "Ruská federácia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:709
 msgid "Rwanda"
-msgstr ""
+msgstr "Rwanda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:710
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Saudská Arábia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:711
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Šalamúnove ostrovy"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:712
 msgid "Seychelles"
-msgstr ""
+msgstr "Seychely"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:713
 msgid "Sudan"
-msgstr ""
+msgstr "Sudán"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:714
 msgid "Sweden"
-msgstr ""
+msgstr "Švédsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:715
 msgid "Singapore"
-msgstr ""
+msgstr "Singapur"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:716
 msgid "Saint Helena"
-msgstr ""
+msgstr "Svätá Helena"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:717
 msgid "Slovenia"
-msgstr ""
+msgstr "Slovinsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:718
 msgid "Svalbard And Jan Mayen"
-msgstr ""
+msgstr "Svalbard a Jan Mayen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:719
 msgid "Slovakia"
-msgstr ""
+msgstr "Slovensko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:720
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:721
 msgid "San Marino"
-msgstr ""
+msgstr "San Maríno"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:722
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:723
 msgid "Somalia"
-msgstr ""
+msgstr "Somálsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:724
-#, fuzzy
 msgid "Suriname"
-msgstr "Meno SMTP:"
+msgstr "Surinam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:725
 msgid "Sao Tome And Principe"
-msgstr ""
+msgstr "Svätý Tomáš a Princov ostrov"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:726
 msgid "El Salvador"
-msgstr ""
+msgstr "Salvádor"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:727
 msgid "Syrian Arab Republic"
-msgstr ""
+msgstr "Sýrska arabská republika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:728
 msgid "Swaziland"
-msgstr ""
+msgstr "Svazijsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:729
 msgid "Turks And Caicos Islands"
-msgstr ""
+msgstr "Ostrovy Turks a Caicos"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:730
 msgid "Chad"
-msgstr ""
+msgstr "Čad"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:731
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Francúzske južné a antarktické územia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:732
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:733
-#, fuzzy
 msgid "Thailand"
-msgstr "Thajské"
+msgstr "Thajsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:734
 msgid "Tajikistan"
-msgstr ""
+msgstr "Tadžikistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:735
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:736
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkménsko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:737
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunisko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:738
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:739
 msgid "East Timor"
-msgstr ""
+msgstr "Východný Timor"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:740
 msgid "Turkey"
-msgstr ""
+msgstr "Turecko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:741
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "Trinidad a Tobago"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:742
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:743
 msgid "Taiwan, Province Of China"
-msgstr ""
+msgstr "Taiwan, provincia Číny"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:744
 msgid "Tanzania, United Republic Of"
-msgstr ""
+msgstr "Tanzánijská zjednotená republika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:745
 msgid "Ukraine"
-msgstr ""
+msgstr "Ukrajina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:746
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:748
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "Menšie odľahlé ostrovy Spojených štátov"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:749
 msgid "United States"
-msgstr ""
+msgstr "Spojené štáty"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:750
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguaj"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:751
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:752
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Svätá stolica (Vatikánsky mestský štát)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:753
 msgid "Saint Vincent And The Grenadines"
-msgstr ""
+msgstr "Svätý Vincent a Grenadíny"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:754
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:755
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "Panenské ostrovy, Britské"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:756
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "Panenské ostrovy, Americké"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:757
-#, fuzzy
 msgid "Viet Nam"
-msgstr "Názov súboru"
+msgstr "Vietnam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:758
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:759
 msgid "Wallis And Futuna"
-msgstr ""
+msgstr "Wallis And Futuna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:760
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:761
 msgid "Yemen"
-msgstr ""
+msgstr "Jemen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:762
 msgid "Mayotte"
-msgstr ""
+msgstr "Mayotte"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:763
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "Srbsko a Čierna Hora"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:764
 msgid "South Africa"
-msgstr ""
+msgstr "Južná Afrika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:765
 msgid "Zambia"
-msgstr ""
+msgstr "Zambia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:766
 msgid "Democratic Republic Of The Congo"
-msgstr ""
+msgstr "Konžská demokratická republika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:767
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:777
 #: ../src/plugins/geolocation/geolocation_plugin.c:862
-#, fuzzy
 msgid "GeoLocation"
-msgstr "Miesto:"
+msgstr "GeoLocation:"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:782
-#, fuzzy, c-format
+#, c-format
 msgid "Could not initialize clutter"
-msgstr "Nemožno inicializovať kontrolu preklepov %s."
+msgstr "Nemožno inicializovať kontrolu clutter."
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:788
 #: ../src/plugins/geolocation/geolocation_plugin.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create regular expression: %s\n"
-msgstr "Nemožno vytvoriť dočasný súbor: %s"
+msgstr "Nemožno vytvoriť regulárny výraz: %s\n"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:803
-#, fuzzy
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
 msgstr ""
-"V zásuvnom module Upozornenia zlyhala registrácia obsluhy udalosti „theme "
-"change”"
+"V zásuvnom module GeoLocation zlyhala registrácia obsluhy udalosti "
+"„messageview_show”"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:867
 msgid ""
@@ -11540,36 +11802,48 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome (but only if it's not about marital "
 "quarrels)."
 msgstr ""
+"Tento zásuvný modul poskytuje funkcie GeoLokácie pre Claws Mail.\n"
+"\n"
+"Upozornenie: Je technicky nemožné s istotou určiť zemepisné umiestnenie "
+"odosielateľa z jeho emailu. Výsledky, prezentované týmto zásuvným modulom, "
+"sú len hrubé odhady. Napríklad, emailové konferencie často odstraňujú z "
+"emailov informácie o odosielateľovi, preto emaily z emailovej konferencie "
+"môžu byť priradené umiestneniu servera emailovej konferencie, namiesto "
+"odosielateľa emailu.\n"
+"Ak máte pochybnosti, nedôverujte výsledkom tohoto zásuvného modulu a "
+"nespoliehajte sa na túto informáciu pri rozvode manželstva.\n"
+"\n"
+"Spätná väzba na <berndth at gmx.de> je vítaná (ale len ak nie je o manželských "
+"hádkach)."
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:900
-#, fuzzy
 msgid "GeoLocation integration"
-msgstr "Integrácia GData"
+msgstr "Integrácia GeoLocation"
 
-#: ../src/plugins/libravatar/libravatar.c:374
-#: ../src/plugins/libravatar/libravatar.c:445
-#: ../src/plugins/libravatar/libravatar.c:505
-#: ../src/plugins/libravatar/libravatar_prefs.c:400
+#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:452
+#: ../src/plugins/libravatar/libravatar.c:512
+#: ../src/plugins/libravatar/libravatar_prefs.c:440
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:388
 msgid "Failed to register avatar header update hook"
 msgstr "Zlyhala registrácia obsluhy udalosti „avatar header update”"
 
-#: ../src/plugins/libravatar/libravatar.c:389
+#: ../src/plugins/libravatar/libravatar.c:396
 msgid "Failed to register avatar image render hook"
 msgstr "Zlyhala registrácia obsluhy udalosti „avatar image render”"
 
-#: ../src/plugins/libravatar/libravatar.c:394
+#: ../src/plugins/libravatar/libravatar.c:401
 msgid "Failed to create avatar image cache directory"
 msgstr "Zlyhalo vytvorenie zložky vyrovnávacej pamäte obrázkov avatar"
 
-#: ../src/plugins/libravatar/libravatar.c:403
+#: ../src/plugins/libravatar/libravatar.c:410
 msgid "Failed to load missing items cache"
 msgstr "Zlyhalo načítanie vyrovnávacej pamäte chýbajúcich položiek"
 
-#: ../src/plugins/libravatar/libravatar.c:455
+#: ../src/plugins/libravatar/libravatar.c:462
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -11584,7 +11858,7 @@ msgid ""
 "\n"
 "Feedback to <ricardo at mones.org> is welcome.\n"
 msgstr ""
-"Zobrazuje obrázky profilu libravatar poštových správ. Viac\n"
+"Zobrazuje v emailových správach obrázky profilu libravatar. Viac\n"
 "informácií o libravatar nájdete na http://www.libravatar.org/. Ak\n"
 "máte profil gravatar.com, ale nie libravatar, budú použité i tieto\n"
 "(ak je povolené presmerovanie v nastavení zásuvného modulu).\n"
@@ -11593,90 +11867,90 @@ msgstr ""
 "\n"
 "Tento zásuvný modul používa na získanie obrázkov libcurl, takže ak ste\n"
 "za proxy, prosím, hľadajte podrobnosti o nastavení „http_proxy” v\n"
-"manuálovej stránke curl(1). ďalšie podrobnosti o tomto i iných veciach\n"
+"manuálovej stránke curl(1). Ďalšie podrobnosti o tomto i iných veciach\n"
 "sú v súbore README.\n"
 "\n"
 "Spätná väzba na <ricardo at mones.org> je vítaná.\n"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:112
+#: ../src/plugins/libravatar/libravatar_prefs.c:138
 msgid "_Use cached icons"
 msgstr "Použiť ikony z _vyrovnávacej pamäte"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:113
+#: ../src/plugins/libravatar/libravatar_prefs.c:139
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr "Uchováva ikony na disku namiesto vytvárania ďalšej sieťovej požiadavky"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:121
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
 msgid "Cache refresh interval"
 msgstr "Interval aktualizácie vyrovnávacej pamäte"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:123
-#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:333
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
+#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:335
 msgid "hours"
 msgstr "hodín"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:188
+#: ../src/plugins/libravatar/libravatar_prefs.c:207
 msgid "Mystery man"
 msgstr "Tajomný"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:189
+#: ../src/plugins/libravatar/libravatar_prefs.c:208
 msgid "Identicon"
 msgstr "Identicon"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:190
+#: ../src/plugins/libravatar/libravatar_prefs.c:209
 msgid "MonsterID"
 msgstr "MonsterID"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:191
+#: ../src/plugins/libravatar/libravatar_prefs.c:210
 msgid "Wavatar"
 msgstr "Wavatar"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:192
+#: ../src/plugins/libravatar/libravatar_prefs.c:211
 msgid "Retro"
 msgstr "Retro"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:193
+#: ../src/plugins/libravatar/libravatar_prefs.c:212
 msgid "Custom URL"
 msgstr "Vlastná URL"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:196
+#: ../src/plugins/libravatar/libravatar_prefs.c:215
 msgid "A blank image"
 msgstr "Prázdny obrázok"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:197
+#: ../src/plugins/libravatar/libravatar_prefs.c:216
 msgid "The unobtrusive low-contrast greyish silhouette"
 msgstr "nenápadná silueta s nízkym kontrastom"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:198
+#: ../src/plugins/libravatar/libravatar_prefs.c:217
 msgid "A generated geometric pattern"
 msgstr "Vygenerovaný geometrický vzor"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:199
+#: ../src/plugins/libravatar/libravatar_prefs.c:218
 msgid "A generated full-body monster"
 msgstr "Vygenerovaná príšera s telom"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:200
+#: ../src/plugins/libravatar/libravatar_prefs.c:219
 msgid "A generated almost unique face"
 msgstr "Vygenerovaná skoro jedinečná tvár"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:201
+#: ../src/plugins/libravatar/libravatar_prefs.c:220
 msgid "A generated 8-bit arcade-style pixelated image"
 msgstr "Vygenerovaný 8b obrázok v akčnom štýle"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:202
+#: ../src/plugins/libravatar/libravatar_prefs.c:221
 msgid "Redirect to a user provided URL"
 msgstr "Presmerovať na používateľom zadanú URL"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:229 ../src/prefs_themes.c:878
+#: ../src/plugins/libravatar/libravatar_prefs.c:248 ../src/prefs_themes.c:878
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:256
+#: ../src/plugins/libravatar/libravatar_prefs.c:276
 msgid "_Allow redirects to other sites"
 msgstr "Povoliť presmerov_ania na iné stránky"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:257
+#: ../src/plugins/libravatar/libravatar_prefs.c:277
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
@@ -11684,23 +11958,44 @@ msgstr ""
 "Nasledovať odpovede presmerovania na iné služby avataru (napr. gravatar.com) "
 "prijaté zo servera libravatar."
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:266
+#: ../src/plugins/libravatar/libravatar_prefs.c:286
 msgid "_Enable federated servers"
 msgstr "Povoliť _federalizované servery"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:267
+#: ../src/plugins/libravatar/libravatar_prefs.c:287
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr "Skúsiť získať avatar zo servera libravatar domény odosielateľa"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:312
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+msgid "Request timeout"
+msgstr "Časový limit požiadavky"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+#: ../src/plugins/notification/notification_prefs.c:1028
+#: ../src/plugins/notification/notification_prefs.c:1300
+#: ../src/plugins/notification/notification_prefs.c:1608
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
+#: ../src/prefs_summaries.c:496
+msgid "seconds"
+msgstr "sekúnd"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:305
+msgid ""
+"Set to 0 to use global socket I/O timeout. Maximum value must be also less "
+"than global socket I/O timeout."
+msgstr ""
+"Nastavte na 0, aby bol použitý všeobecný časový limit V/V soketu. Maximálna "
+"hodnota musí byť tiež menšia ako je všeobecný  časový limit V/V soketu."
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:349
 msgid "Icon cache"
 msgstr "Vyrovnávacia pamäť ikon"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:316
+#: ../src/plugins/libravatar/libravatar_prefs.c:353
 msgid "Default missing icon mode"
 msgstr "Predvolený režim chýbajúcej ikony"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:320
+#: ../src/plugins/libravatar/libravatar_prefs.c:357
 msgid "Network"
 msgstr "Sieť"
 
@@ -12032,7 +12327,6 @@ msgstr "Zložky kalendára"
 
 #. Warning-Label
 #: ../src/plugins/notification/notification_prefs.c:639
-#, fuzzy
 msgid "These settings override folder-specific selections."
 msgstr "Tieto nastavenia prepisujú nastavenia zložiek."
 
@@ -12165,14 +12459,6 @@ msgstr "Zapnúť vyskakovacie okno"
 msgid "Popup timeout:"
 msgstr "Časový limit zobrazenia okna:"
 
-#: ../src/plugins/notification/notification_prefs.c:1028
-#: ../src/plugins/notification/notification_prefs.c:1300
-#: ../src/plugins/notification/notification_prefs.c:1608
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
-#: ../src/prefs_summaries.c:496
-msgid "seconds"
-msgstr "sekúnd"
-
 #. Sticky check button
 #: ../src/plugins/notification/notification_prefs.c:1057
 msgid "Make popup sticky"
@@ -12426,7 +12712,7 @@ msgstr "z %d"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1359
 msgid "PDF rendering failed for an unknown reason."
-msgstr ""
+msgstr "Spracovanie PDF zlyhalo z neznámeho dôvodu."
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1722
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1940
@@ -12522,7 +12808,7 @@ msgstr ""
 
 #: ../src/plugins/perl/perl_gtk.c:50
 msgid "Edit perl filter rules (ext)..."
-msgstr ""
+msgstr "Upraviť filtrovacie pravidlá perl (ext)..."
 
 #: ../src/plugins/pgpcore/autocompletion.c:125
 msgid "Failed to register PGP address autocompletion hook"
@@ -12784,12 +13070,12 @@ msgid "Undefined"
 msgstr "Nezadaná"
 
 #: ../src/plugins/pgpcore/select-keys.c:241
-#: ../src/plugins/pgpcore/sgpgme.c:146
+#: ../src/plugins/pgpcore/sgpgme.c:146 ../src/plugins/pgpcore/sgpgme.c:162
 msgid "Marginal"
 msgstr "Čiastočná"
 
 #: ../src/plugins/pgpcore/select-keys.c:247
-#: ../src/plugins/pgpcore/sgpgme.c:150
+#: ../src/plugins/pgpcore/sgpgme.c:150 ../src/plugins/pgpcore/sgpgme.c:166
 msgid "Ultimate"
 msgstr "Úplná"
 
@@ -12850,146 +13136,154 @@ msgstr ""
 msgid "No signature found"
 msgstr "Nebol nájdený žiadny podpis"
 
-#: ../src/plugins/pgpcore/sgpgme.c:184 ../src/plugins/pgpcore/sgpgme.c:203
+#: ../src/plugins/pgpcore/sgpgme.c:160
+msgid "Untrusted"
+msgstr "Nedôveryhodné"
+
+#: ../src/plugins/pgpcore/sgpgme.c:200 ../src/plugins/pgpcore/sgpgme.c:219
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Digitálny podpis nemožno overiť - %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:188 ../src/plugins/pgpcore/sgpgme.c:192
-#: ../src/plugins/pgpcore/sgpgme.c:245
+#: ../src/plugins/pgpcore/sgpgme.c:204 ../src/plugins/pgpcore/sgpgme.c:208
+#: ../src/plugins/pgpcore/sgpgme.c:249
 msgid "The signature has not been checked."
 msgstr "Podpis nebol overený"
 
-#: ../src/plugins/pgpcore/sgpgme.c:198 ../src/plugins/pgpcore/sgpgme.c:200
+#: ../src/plugins/pgpcore/sgpgme.c:214 ../src/plugins/pgpcore/sgpgme.c:216
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: Nemožno získať kľúč – nie je spustený gpg-agent."
 
-#: ../src/plugins/pgpcore/sgpgme.c:215
+#: ../src/plugins/pgpcore/sgpgme.c:228
 #, c-format
 msgid "Good signature from %s."
 msgstr "Platný podpis od %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:222
-#, c-format
-msgid "Good signature (untrusted) from %s."
-msgstr "Platný podpis (bez dôvery) od %s."
-
-#: ../src/plugins/pgpcore/sgpgme.c:227
+#: ../src/plugins/pgpcore/sgpgme.c:231
 #, c-format
 msgid "Expired signature from %s."
 msgstr "Vypršaný podpis od %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:230
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:234
+#, c-format
 msgid "Good signature from %s, but the key has expired."
-msgstr "Platný podpis od %s."
+msgstr "Platný podpis od %s, ale kľúču skončila platnosť."
 
-#: ../src/plugins/pgpcore/sgpgme.c:233
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:237
+#, c-format
 msgid "Good signature from %s, but the key has been revoked."
-msgstr "Platný podpis od %s."
+msgstr "Platný podpis od %s, ale kľúč bol odvolaný."
 
-#: ../src/plugins/pgpcore/sgpgme.c:236
+#: ../src/plugins/pgpcore/sgpgme.c:240
 #, c-format
 msgid "Bad signature from %s."
 msgstr "Chybný podpis od %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:240
+#: ../src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Nemožno nájsť verejný kľúč 0x%s na overenie tohoto podpisu."
 
-#: ../src/plugins/pgpcore/sgpgme.c:264
+#: ../src/plugins/pgpcore/sgpgme.c:268
 #, c-format
 msgid "Error checking signature: no status\n"
 msgstr "Chyba kontroly podpisu: žiadny stav\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:283
+#: ../src/plugins/pgpcore/sgpgme.c:287
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Chyba overenia podpisu: %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:302
+#: ../src/plugins/pgpcore/sgpgme.c:306
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "%s podpísané pomocou kľúča %s s ID %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:308
+#: ../src/plugins/pgpcore/sgpgme.c:312
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Platný podpis od uid „%s” (Dôveryhodnosť %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:313
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:317
+#, c-format
 msgid "Expired key uid \"%s\"\n"
-msgstr "Vypršaný kľúč od %s."
+msgstr "Kľúču od %s skončila platnosť.\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:318
+#: ../src/plugins/pgpcore/sgpgme.c:322
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Skončená platnosť podpisu od uid „%s” (Dôveryhodnosť: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:323
+#: ../src/plugins/pgpcore/sgpgme.c:327
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
-msgstr ""
+msgstr "Odvolaný kľúč od uid \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:328
+#: ../src/plugins/pgpcore/sgpgme.c:332
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "ZLÝ podpis od „%s”\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:339
+#: ../src/plugins/pgpcore/sgpgme.c:343
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                uid „%s” (Dôveryhodnosť: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:346
+#: ../src/plugins/pgpcore/sgpgme.c:345
+msgid "Revoked"
+msgstr "Odvolaný"
+
+#: ../src/plugins/pgpcore/sgpgme.c:349
+#, c-format
+msgid "Owner Trust: %s\n"
+msgstr "Dôvera vlastníka: %s\n"
+
+#: ../src/plugins/pgpcore/sgpgme.c:352
 msgid "Primary key fingerprint:"
 msgstr "Odtlačok primárneho kľúča:"
 
-#: ../src/plugins/pgpcore/sgpgme.c:364
+#: ../src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "UPOZORNENIE: Adresa podpisu „%s” sa nezhoduje so záznamom DNS\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:370
+#: ../src/plugins/pgpcore/sgpgme.c:376
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Overená adresa podpisu je „%s”\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:412
+#: ../src/plugins/pgpcore/sgpgme.c:410
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Nemožno získať údaje zo správy, %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:428
+#: ../src/plugins/pgpcore/sgpgme.c:426
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Nemožno inicializovať údaje, %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:583
+#: ../src/plugins/pgpcore/sgpgme.c:581
 msgid "Secret key specification is ambiguous"
 msgstr "Zadanie súkromného kľúča je nejednoznačné"
 
-#: ../src/plugins/pgpcore/sgpgme.c:593
+#: ../src/plugins/pgpcore/sgpgme.c:591
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Súkromný kľúč nebol nájdený (%s)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:606
+#: ../src/plugins/pgpcore/sgpgme.c:604
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Chyba pri určení súkromného kľúča: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:690
+#: ../src/plugins/pgpcore/sgpgme.c:688
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Protokol Gpgme „%s” je nepoužiteľný. Systém „%s” nie je správne "
 "nainštalovaný."
 
-#: ../src/plugins/pgpcore/sgpgme.c:696
+#: ../src/plugins/pgpcore/sgpgme.c:694
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12998,12 +13292,12 @@ msgstr ""
 "Protokol Gpgme „%s” je nepoužiteľný. Systém „%s” je nainštalovaný vo verzii "
 "%s, ale je potrebná verzia %s.\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:704
+#: ../src/plugins/pgpcore/sgpgme.c:702
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Protokol Gpgme „%s” je nepoužiteľný (neznámy problém)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:720
+#: ../src/plugins/pgpcore/sgpgme.c:718
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -13011,18 +13305,18 @@ msgstr ""
 "GnuPG nie je správne nainštalované, alebo používate zastaralú\n"
 "verziu. Podpora OpenPGP bude vypnutá."
 
-#: ../src/plugins/pgpcore/sgpgme.c:754
+#: ../src/plugins/pgpcore/sgpgme.c:752
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr ""
 "Pred vygenerovaním páru kľúčov musíte uložiť údaje o účte pomocou „OK”.\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:759
+#: ../src/plugins/pgpcore/sgpgme.c:757
 msgid "No PGP key found"
 msgstr "Nebol nájdený žiadny PGP kľúč"
 
-#: ../src/plugins/pgpcore/sgpgme.c:760
+#: ../src/plugins/pgpcore/sgpgme.c:758
 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"
@@ -13032,12 +13326,12 @@ msgstr ""
 "podpisovať správy, ani prijímať šifrované správy.\n"
 "Prajete si teraz vygenerovať nový pár kľúčov?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:830 ../src/plugins/pgpcore/sgpgme.c:846
+#: ../src/plugins/pgpcore/sgpgme.c:828 ../src/plugins/pgpcore/sgpgme.c:844
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Nemožno vygenerovať nový pár kľúčov: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:837
+#: ../src/plugins/pgpcore/sgpgme.c:835
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -13045,11 +13339,11 @@ msgstr ""
 "Prebieha generácia vášho nového páru kľúčov… Prosím, pohybujte myšou, aby "
 "ste zvýšili entropiu v systéme…"
 
-#: ../src/plugins/pgpcore/sgpgme.c:852
+#: ../src/plugins/pgpcore/sgpgme.c:850
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Nemožno vygenerovať nový pár kľúčov: neznáma chyba"
 
-#: ../src/plugins/pgpcore/sgpgme.c:856
+#: ../src/plugins/pgpcore/sgpgme.c:854
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -13062,19 +13356,19 @@ msgstr ""
 "\n"
 "Prajete si exportovať tento pár na kľúčový server?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:860
+#: ../src/plugins/pgpcore/sgpgme.c:858
 msgid "Key generated"
 msgstr "Kľúč vygenerovaný"
 
-#: ../src/plugins/pgpcore/sgpgme.c:899
+#: ../src/plugins/pgpcore/sgpgme.c:897
 msgid "Key exported."
 msgstr "Kľúč vyexportovaný."
 
-#: ../src/plugins/pgpcore/sgpgme.c:901
+#: ../src/plugins/pgpcore/sgpgme.c:899
 msgid "Couldn't export key."
 msgstr "Nemožno exportovať kľúč."
 
-#: ../src/plugins/pgpcore/sgpgme.c:905
+#: ../src/plugins/pgpcore/sgpgme.c:903
 msgid "Key export isn't implemented in Windows."
 msgstr "Export kľúčov nie je v systéme Windows implementovaný."
 
@@ -13101,7 +13395,7 @@ msgstr "Nemožno konvertovať textové dáta do žiadneho známeho kódovania."
 #: ../src/plugins/pgpinline/pgpinline.c:716
 #: ../src/plugins/pgpmime/pgpmime.c:74 ../src/plugins/pgpmime/pgpmime.c:184
 #: ../src/plugins/pgpmime/pgpmime.c:330 ../src/plugins/pgpmime/pgpmime.c:510
-#: ../src/plugins/pgpmime/pgpmime.c:655 ../src/plugins/smime/smime.c:415
+#: ../src/plugins/pgpmime/pgpmime.c:651 ../src/plugins/smime/smime.c:415
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Nemožno inicializovať kontext GPG, %s"
@@ -13198,19 +13492,19 @@ msgstr ""
 "prílohy ani hlavičky správy (napr. Predmet)."
 
 #: ../src/plugins/pgpinline/pgpinline.c:670
-#: ../src/plugins/pgpmime/pgpmime.c:665
+#: ../src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Nemožno pridať GPG kľúč %s, %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:698
-#: ../src/plugins/pgpmime/pgpmime.c:694
+#: ../src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Nemožno vytvoriť dočasný súbor, %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:729
-#: ../src/plugins/pgpmime/pgpmime.c:721
+#: ../src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Šifrovanie zlyhalo, %s"
@@ -13266,13 +13560,17 @@ msgstr "Nemožno spracovať dešifrované časti súboru."
 msgid "Couldn't create temporary file: %s"
 msgstr "Nemožno vytvoriť dočasný súbor: %s"
 
-#: ../src/plugins/pgpmime/pgpmime.c:621
+#: ../src/plugins/pgpmime/pgpmime.c:595
+msgid "OpenPGP digital signature"
+msgstr "Digitálny podpis OpenPGP"
+
+#: ../src/plugins/pgpmime/pgpmime.c:617
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
 msgstr "Pozor, pri použití PGP/Mime systému nebudú šifrované hlavičky správy."
 
-#: ../src/plugins/pgpmime/pgpmime.c:793
+#: ../src/plugins/pgpmime/pgpmime.c:789
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -13344,7 +13642,7 @@ msgid ""
 "\n"
 "These scripts are then available via the menu. You can assign keyboard "
 "shortcuts to them just like it is done with other menu items. You can also "
-"put buttons for script invokation into the toolbars using Claws Mail's "
+"put buttons for script invocation into the toolbars using Claws Mail's "
 "builtin toolbar editor.\n"
 "\n"
 "You can provide scripts working on the main window by placing files into ~/."
@@ -13382,14 +13680,14 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"Tento zásuvný modul poskytuje integráciu vlastností Python.\n"
+"Tento zásuvný modul poskytuje integráciu Python.\n"
 "Kód Python možno zadať interaktívne do zabudovanej konzoly Python, v "
 "Nástroje -> Zobraziť konzolu Python, alebo ich možno uložiť do skriptov.\n"
 "\n"
 "Tieto skripty sú potom dostupné prostredníctvom menu a môžete im priradiť "
 "klávesové skratky presne tak, ako iným položkám menu. Pomocou zabudované "
-"editora panela nsátrojov Clavs Mail môžete do panela nástrojov umiestniť aj "
-"tlačidlá, ktoré skripty spúšťajú.\n"
+"editora panela nástrojov Clavs Mail môžete tiež do panela nástrojov "
+"umiestniť aj tlačidlá, ktoré tieto skripty spúšťajú.\n"
 "\n"
 "Môžete vytvoriť skripty, ktoré pracujú v hlavnom okne, ich umiestnením do ~/."
 "claws-mail/python-scripts/main.\n"
@@ -13429,152 +13727,49 @@ msgstr ""
 msgid "Python integration"
 msgstr "Integrácia Python"
 
-#: ../src/plugins/rssyl/feed.c:126
-msgid "Cannot open temporary file"
-msgstr "Nemožno otvoriť dočasný súbor"
-
-#: ../src/plugins/rssyl/feed.c:137
-msgid "Cannot init libCURL"
-msgstr "Nemožno inicializovať libCURL"
-
-#: ../src/plugins/rssyl/feed.c:234 ../src/plugins/vcalendar/vcal_folder.c:1596
-msgid "401 (Authorisation required)"
-msgstr "401 (Vyžadovaná autorizácia)"
-
-#: ../src/plugins/rssyl/feed.c:237 ../src/plugins/vcalendar/vcal_folder.c:1599
-msgid "403 (Unauthorised)"
-msgstr "403 (Neautorizované)"
-
-#: ../src/plugins/rssyl/feed.c:240 ../src/plugins/vcalendar/vcal_folder.c:1602
-msgid "404 (Not found)"
-msgstr "404 (Nenájdené)"
-
-#: ../src/plugins/rssyl/feed.c:243 ../src/plugins/vcalendar/vcal_folder.c:1605
-#, c-format
-msgid "Error %ld"
-msgstr "Chyba %ld"
-
-#: ../src/plugins/rssyl/feed.c:328
-#, c-format
-msgid "Fetching '%s'..."
-msgstr "Prijímanie „%s”..."
-
-#: ../src/plugins/rssyl/feed.c:387
-msgid "Malformed feed"
-msgstr "Chybný formát kanála"
-
-#: ../src/plugins/rssyl/feed.c:1203
-#, c-format
-msgid "Refreshing feed '%s'..."
-msgstr "Obnovovanie kanála „%s”..."
-
-#: ../src/plugins/rssyl/feed.c:1218
-#, c-format
-msgid ""
-"RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-"comments of '%s'"
-msgstr ""
-"RSSyl: Získavanie komentárov nie je podporované pre kanály RDF. Nemožno "
-"získať komentáre „%s”"
-
-#: ../src/plugins/rssyl/feed.c:1227
-msgid "This feed format is not supported yet."
-msgstr "Tento formát kanála zatiaľ nie je podporovaný."
-
-#: ../src/plugins/rssyl/feed.c:1258
-msgid "N/A"
-msgstr "N/A"
-
-#: ../src/plugins/rssyl/feed.c:1378
-#, c-format
-msgid "%ld byte"
-msgid_plural "%ld bytes"
-msgstr[0] "%ld bajt"
-msgstr[1] "%ld bajty"
-msgstr[2] "%ld bajtov"
-
-#: ../src/plugins/rssyl/feed.c:1381
-msgid "size unknown"
-msgstr "neznáma veľkosť"
-
-#: ../src/plugins/rssyl/feed.c:1555
-#, c-format
-msgid ""
-"RSSyl: Cannot update feed %s:\n"
-"%s\n"
-msgstr ""
-"RSSyl: Nemožno aktualizovať kanál %s:\n"
-"%s\n"
-
-#: ../src/plugins/rssyl/feed.c:1727
-msgid "You are already subscribed to this feed."
-msgstr "Tento kanál už odoberáte."
-
-#: ../src/plugins/rssyl/feed.c:1738
+#: ../src/plugins/rssyl/old_feeds.c:90
 #, c-format
 msgid ""
-"Couldn't fetch URL '%s':\n"
+"Couldn't read contents of old feeds.xml file:\n"
 "%s"
 msgstr ""
-"Nemožno pristupovať k URL „%s”:\n"
+"Nemožno čítať obsah starého súboru feeds.xml:\n"
 "%s"
 
-#: ../src/plugins/rssyl/feed.c:1743
-#, c-format
-msgid ""
-"Couldn't fetch URL '%s':\n"
-"%s\n"
-msgstr ""
-"Nemožno pristupovať k URL „%s”:\n"
-"%s\n"
-
-#: ../src/plugins/rssyl/feed.c:1759
-#, c-format
-msgid "Can't subscribe feed '%s'."
-msgstr "Nemožno sa prihlásiť k odberu kanála „%s”."
-
-#: ../src/plugins/rssyl/feed.c:1861 ../src/plugins/rssyl/rssyl_cb_menu.c:281
-msgid "Claws Mail needs network access in order to update the feed."
-msgid_plural "Claws Mail needs network access in order to update the feeds."
-msgstr[0] "Claws Mail potrebuje na aktualizáciu kanála sieťový prístup."
-msgstr[1] "Claws Mail potrebuje na aktualizáciu kanálov sieťový prístup."
-msgstr[2] "Claws Mail potrebuje na aktualizáciu kanálov sieťový prístup."
-
-#: ../src/plugins/rssyl/feed.h:20
+#: ../src/plugins/rssyl/opml_export.c:110
 #, c-format
-msgid "Time out connecting to URL %s\n"
-msgstr "Vypršal časový limit pripojenia k URL %s\n"
+msgid "RSSyl: Error while writing '%s' to feed export list.\n"
+msgstr "RSSyl: Chyba počas zápisu „%s” do exportu zoznamu kanálov.\n"
 
-#: ../src/plugins/rssyl/feed.h:21
+#: ../src/plugins/rssyl/opml_export.c:131
 #, c-format
-msgid "Couldn't fetch URL %s\n"
-msgstr "Nemožno dosiahnuť URL %s\n"
+msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
+msgstr "RSSyl: Nemožno odstrániť starý súbor OPML „%s”: %s\n"
 
-#: ../src/plugins/rssyl/feed.h:22
+#: ../src/plugins/rssyl/opml_export.c:141
 #, c-format
-msgid "Error parsing feed from URL %s\n"
-msgstr "Chyba spracovanie kanála z URL %s\n"
-
-#: ../src/plugins/rssyl/feed.h:23
-#, c-format
-msgid "Unsupported feed type at URL %s\n"
-msgstr "Nepodporovaný typ kanála na URL %s\n"
+msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
+msgstr ""
+"RSSyl: Nemožno otvoriť súbor „%s” na exportovanie zoznamu kanálov: %s\n"
 
-#: ../src/plugins/rssyl/feed.h:25
-#, c-format
-msgid "RSSyl: Updating feed %s\n"
-msgstr "RSSyl: Aktualizácia kanála %s\n"
+#: ../src/plugins/rssyl/opml_export.c:182
+msgid "RSSyl: Error during writing feed export file.\n"
+msgstr "RSSyl: Chyba počas zápisu súboru exportu kanála.\n"
 
-#: ../src/plugins/rssyl/feed.h:26
+#: ../src/plugins/rssyl/opml_import.c:109
 #, c-format
-msgid "RSSyl: Feed update finished: %s\n"
-msgstr "RSSyl: Aktualizácia kanála dokončená: %s\n"
-
-#: ../src/plugins/rssyl/feed.h:27
-msgid "RSSyl: Feed update aborted, application is exiting.\n"
-msgstr "RSSyl: Aktualizácia kanála zrušená, aplikácia končí.\n"
+msgid ""
+"Error while subscribing feed\n"
+"%s\n"
+"\n"
+"Folder name '%s' is not allowed."
+msgstr ""
+"Chyba pri získavaní kanála\n"
+"%s\n"
+"\n"
+"Názov zložky „%s” nie je povolený."
 
-#: ../src/plugins/rssyl/plugin.c:63
+#: ../src/plugins/rssyl/plugin.c:65
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13589,116 +13784,160 @@ msgstr ""
 "prijatými z webu. Môžete ich čítať a mazať, alebo aj ponechávať staré "
 "položky."
 
-#: ../src/plugins/rssyl/plugin.c:87
+#: ../src/plugins/rssyl/plugin.c:89
 msgid "RSS feed"
 msgstr "RSS kanál"
 
-#: ../src/plugins/rssyl/rssyl.c:133 ../src/plugins/rssyl/rssyl.c:145
+#: ../src/plugins/rssyl/rssyl_add_item.c:295
+msgctxt "Empty RSS feed title placeholder"
+msgid "(empty)"
+msgstr "(prázdne)"
+
+#: ../src/plugins/rssyl/rssyl.c:154 ../src/plugins/rssyl/rssyl.c:165
 msgid "Refresh all feeds"
 msgstr "Obnoviť všetky kanály"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:62
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Subscribe feed"
 msgstr "Odoberať kanál"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:63
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:67
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Zadajte URL kanála noviniek, ktoré chcete odoberať:"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:138
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:100
 #, c-format
-msgid "Really remove the folder tree '%s'?\n"
-msgstr "Naozaj odstrániť strom zložiek „%s” ?\n"
+msgid "'%c' can't be used in folder name."
+msgstr "„%c” nemožno použiť v názve zložky."
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:139
-msgid "Remove folder tree"
-msgstr "Odstrániť strom zložiek"
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:242
+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 potrebuje na aktualizáciu kanála sieťový prístup."
+msgstr[1] "Claws Mail potrebuje na aktualizáciu kanálov sieťový prístup."
+msgstr[2] "Claws Mail potrebuje na aktualizáciu kanálov sieťový prístup."
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:305
 #, c-format
-msgid "Can't remove feed '%s'."
-msgstr "Nemožno odstrániť kanál „%s”."
-
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:374
-msgid "Select a .opml file"
-msgstr "Vybrať súbor .opml"
-
-#: ../src/plugins/rssyl/rssyl_gtk.c:53
-msgid "_Refresh feed"
-msgstr "_Obnoviť kanál"
+msgid "Really remove the feed tree `%s' ?\n"
+msgstr "Naozaj odstrániť strom kanálov „%s” ?\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:54
-msgid "Refresh _all feeds"
-msgstr "Obnoviť _všetky kanály"
-
-#: ../src/plugins/rssyl/rssyl_gtk.c:55
-msgid "Subscribe _new feed..."
-msgstr "Prihlásiť _nový kanál..."
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:306
+msgid "Remove feed tree"
+msgstr "Odstráni strom kanálov"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:56
-msgid "_Unsubscribe feed..."
-msgstr "O_dhlásiť kanál..."
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:341
+msgid "Select an OPML file"
+msgstr "Vybrať súbor OPML"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:57
-msgid "Feed pr_operties..."
-msgstr "V_lastnosti kanála..."
+#: ../src/plugins/rssyl/rssyl_feed.c:75
+#: ../src/plugins/rssyl/rssyl_subscribe.c:139
+#, c-format
+msgid "Couldn't create folder for new feed '%s'."
+msgstr "Nemožno vytvoriť zložku nového kanála „%s”."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:58
-msgid "Import feed list..."
-msgstr "Importovať zoznam kanálov..."
+#: ../src/plugins/rssyl/rssyl_feed.h:10
+#, c-format
+msgid "RSSyl: Subscribing new feed: %s\n"
+msgstr "RSSyl: Prihlasovanie nového kanála: %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:59
-msgid "Rena_me..."
-msgstr "Pre_menovať..."
+#: ../src/plugins/rssyl/rssyl_feed.h:11
+#, c-format
+msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
+msgstr "RSSyl: Nový kanál prihlásený: „%s” (%s)\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:60
-msgid "_Create new folder..."
-msgstr "V_ytvoriť novú zložku..."
+#: ../src/plugins/rssyl/rssyl_feed.h:12
+#, c-format
+msgid "RSSyl: Updating feed: %s\n"
+msgstr "RSSyl: Aktualizácia kanála %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:62
-msgid "Remove folder _tree..."
-msgstr "Odstrániť s_trom zložiek..."
+#: ../src/plugins/rssyl/rssyl_feed.h:13
+#, c-format
+msgid "RSSyl: Feed update finished: %s\n"
+msgstr "RSSyl: Aktualizácia kanála dokončená: %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:152
-msgid "Add RSS folder tree"
-msgstr "Pridať strom RSS zložiek"
+#: ../src/plugins/rssyl/rssyl_feed.h:14
+#, c-format
+msgid "RSSyl: Error fetching feed at '%s': %s\n"
+msgstr "RSSyl: Chyba získavania kanála z „%s” (%s)\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:153
-msgid "Enter name for a new RSS folder tree."
-msgstr "Zadajte meno nového stromu RSS zložiek."
+#: ../src/plugins/rssyl/rssyl_feed.h:15
+#, c-format
+msgid "RSSyl: No valid feed found at '%s'\n"
+msgstr "RSSyl: Nenájdený platný kanál na „%s”\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:169
-msgid ""
-"Creation of folder tree failed.\n"
-"Maybe some files already exist, or you don't have the permission to write "
-"there?"
-msgstr ""
-"Vytvorenie stromu zložiek zlyhalo.\n"
-"Niektoré súbory už možno existujú, alebo nemáte práva na zápis do nich?"
+#: ../src/plugins/rssyl/rssyl_feed.h:16
+#, c-format
+msgid "RSSyl: Couldn't process feed at '%s'\n"
+msgstr "RSSyl: Nemožno spracovať kanál na „%s”\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:184
-msgid "RSSyl..."
-msgstr "RSSyl..."
+#: ../src/plugins/rssyl/rssyl_feed.h:17
+#, c-format
+msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
+msgstr "RSSyl: Aplikácia končí, nemožno dokončiť aktualizáciu kanála na „%s”\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:257
+#: ../src/plugins/rssyl/rssyl_feed_props.c:243
 msgid "Use default refresh interval"
 msgstr "Použiť predvolený interval aktualizácie"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:269
-msgid "Keep default number of expired entries"
-msgstr "Uchovávať predvolený počet starých položiek"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:255
+msgid "Keep old items"
+msgstr "Zachovať staré položky"
+
+#. "Trim" button
+#: ../src/plugins/rssyl/rssyl_feed_props.c:261
+msgid "_Trim"
+msgstr "_Orezať"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:275
+#: ../src/plugins/rssyl/rssyl_feed_props.c:264
+#: ../src/plugins/rssyl/rssyl_feed_props.c:267
+msgid "Update feed, deleting items which are no longer in the source feed"
+msgstr "Aktualizuje kanál, odstráni položky, ktoré už v zdroji kanála nie sú"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:271
 msgid "Fetch comments if possible"
 msgstr "Sťahovať komentáre, ak je to možné"
 
+#: ../src/plugins/rssyl/rssyl_feed_props.c:296
+msgid "Always mark as new"
+msgstr "Vždy označiť ako novú"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:302
+msgid "If only its text changed"
+msgstr "Len ak sa zmení jej text"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:308
+msgid "Never mark as new"
+msgstr "Nikdy neoznačovať ako novú"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:313
+msgid "Add item title to top of message"
+msgstr "Pridať nadpis položky na začiatok správy"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:320
+msgid "Ignore title rename"
+msgstr "Ignorovať zmenu nadpisu"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:326
+#: ../src/plugins/rssyl/rssyl_feed_props.c:329
+msgid ""
+"Enable this to keep current folder name, even if feed author changes title "
+"of the feed."
+msgstr ""
+"Táto možnosť zachová aktuálne meno zložky, hoci autor zmení nadpis kanála."
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:334
+#: ../src/plugins/vcalendar/vcal_prefs.c:518
+msgid "Verify SSL certificate validity"
+msgstr "Overiť platnosť certifikátu SSL"
+
 #. Label for URL frame
-#: ../src/plugins/rssyl/rssyl_gtk.c:308
+#: ../src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "<b>Source URL:</b>"
 msgstr "<b>Zdrojová URL:</b>"
 
-#. Fetch comments for - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:336
+#. Fetch comments max age - label
+#: ../src/plugins/rssyl/rssyl_feed_props.c:378
 msgid ""
 "<b>Fetch comments on posts aged less than:</b>\n"
 "<small>(In days; set to -1 to fetch all comments)</small>"
@@ -13707,7 +13946,7 @@ msgstr ""
 "<small>(V dňoch; nastavte -1 na prijímanie všetkých)</small>"
 
 #. Refresh interval - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:370
+#: ../src/plugins/rssyl/rssyl_feed_props.c:436
 msgid ""
 "<b>Refresh interval in minutes:</b>\n"
 "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
@@ -13716,98 +13955,192 @@ msgstr ""
 "<small>(Nastavte na 0 na vypnutie automatického obnovovania tohoto kanála)</"
 "small>"
 
-#. Expired items - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:403
-msgid ""
-"<b>Number of expired entries to keep:</b>\n"
-"<small>(Set to -1 if you want to keep expired entries)</small>"
-msgstr ""
-"<b>Počet starých položiek, ktoré sa majú uchovávať:</b>\n"
-"<small>(Nastavte na -1, ak chcete uchovávať všetky staré položky)</small>"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:462
+msgid "<b>If an item changes, do not mark it as new:</b>"
+msgstr "<b>Pri zmene položky neoznačiť položku ako novú:</b>"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:429
-msgid "<b>If an item changes, do not mark it as unread:</b>"
-msgstr "<b>Pri zmene položky neoznačovať položku ako neprečítanú:</b>"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:554
+msgid "_OK"
+msgstr "_OK"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:439
-msgid "Always mark as unread"
-msgstr "Vždy označiť ako neprečítanú"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:562
+msgid "Set feed properties"
+msgstr "Nastaviť vlastnosti kanála"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:441
-msgid "If only its text has changed"
-msgstr "Len ak sa zmení jej text"
+#: ../src/plugins/rssyl/rssyl_gtk.c:48
+msgid "_Refresh feed"
+msgstr "_Obnoviť kanál"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:443
-msgid "Never mark as unread"
-msgstr "Nikdy neoznačovať ako neprečítanú"
+#: ../src/plugins/rssyl/rssyl_gtk.c:49
+msgid "Feed pr_operties"
+msgstr "V_lastnosti kanála.."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:459
-#: ../src/plugins/vcalendar/vcal_prefs.c:518
-msgid "Verify SSL certificate validity"
-msgstr "Overiť platnosť certifikátu SSL"
+#: ../src/plugins/rssyl/rssyl_gtk.c:50
+msgid "Rena_me..."
+msgstr "Pre_menovať..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:515
-msgid "_OK"
-msgstr "_OK"
+#: ../src/plugins/rssyl/rssyl_gtk.c:51
+msgid "R_efresh recursively"
+msgstr "Obnoviť r_ekurzívne"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:523
-msgid "Set feed properties"
-msgstr "Nastaviť vlastnosti kanála"
+#: ../src/plugins/rssyl/rssyl_gtk.c:52
+msgid "Subscribe _new feed..."
+msgstr "Prihlásiť _nový kanál..."
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:53
+msgid "Create new _folder..."
+msgstr "V_ytvoriť novú zložku..."
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:54
+msgid "Import feed list..."
+msgstr "Importovať zoznam kanálov..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:651 ../src/plugins/rssyl/rssyl_gtk.c:675
-msgid "Unsubscribe feed"
-msgstr "Odhlásiť kanál"
+#: ../src/plugins/rssyl/rssyl_gtk.c:56
+msgid "Remove tree"
+msgstr "Odstrániť strom"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:676
-msgid "Do you really want to remove feed"
-msgstr "Naozaj chcete odstrániť kanál"
+#: ../src/plugins/rssyl/rssyl_gtk.c:126
+msgid "Add RSS folder tree"
+msgstr "Pridať strom RSS zložiek"
 
-#. Remove cache checkbutton
-#: ../src/plugins/rssyl/rssyl_gtk.c:682
-msgid "Remove cached entries"
-msgstr "Odstrániť položky z vyrovnávacej pamäte"
+#: ../src/plugins/rssyl/rssyl_gtk.c:127
+msgid "Enter name for a new RSS folder tree."
+msgstr "Zadajte meno nového stromu RSS zložiek."
 
-#: ../src/plugins/rssyl/rssyl.h:8
-msgid "RSSyl"
-msgstr "RSSyl"
+#: ../src/plugins/rssyl/rssyl_gtk.c:143
+msgid ""
+"Creation of folder tree failed.\n"
+"Maybe some files already exist, or you don't have the permission to write "
+"there?"
+msgstr ""
+"Vytvorenie stromu zložiek zlyhalo.\n"
+"Niektoré súbory už možno existujú, alebo nemáte práva na zápis do nich?"
 
 #. Default RSSyl mailbox name
-#: ../src/plugins/rssyl/rssyl.h:14
+#: ../src/plugins/rssyl/rssyl.h:17
 msgid "My Feeds"
 msgstr "Moje kanály"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:106
+#: ../src/plugins/rssyl/rssyl_prefs.c:128
 msgid "Default refresh interval in minutes"
 msgstr "Predvolený interval obnovenia v minútach"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:117
-msgid "Set to 0 to disable automatic refreshing"
-msgstr "Nastavte na 0 na vypnutie automatického obnovenia"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:119
-msgid "Default number of expired items to keep"
-msgstr "Predvolený počet uchovávaných starých položiek"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:130
-msgid "Set to -1 to keep expired items"
-msgstr "Nastavte na -1, na uchovávanie starých položiek"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:133
+#: ../src/plugins/rssyl/rssyl_prefs.c:147
 msgid "Refresh all feeds on application start"
 msgstr "Obnoviť všetky kanály pri spustení aplikácie"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:139
+#. Path to cookies file for libcurl to use
+#: ../src/plugins/rssyl/rssyl_prefs.c:155
 msgid "Path to cookies file"
 msgstr "Cesta k súboru cookies"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:149
+#: ../src/plugins/rssyl/rssyl_prefs.c:166
+#: ../src/plugins/rssyl/rssyl_prefs.c:169
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr "Cesta k súboru cookies.txt obsahujúcemu vaše cookies v štýle Netscape"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:152
-msgid "Verify SSL certificate validity for new feeds"
+#: ../src/plugins/rssyl/rssyl_prefs.c:176
+msgid "Verify SSL certificates validity for new feeds"
 msgstr "Overiť platnosť certifikátu SSL nových kanálov"
 
+#. Create window
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+msgid "Subscribe new feed?"
+msgstr "Prihlásiť _nový kanál?"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:72
+msgid "<b>Feed folder:</b>"
+msgstr "<b>Zložka kanála:</b>"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:82
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:86
+msgid ""
+"Instead of using official title, you can enter a different folder name for "
+"the feed."
+msgstr "namiesto oficiálneho nadpisu môžete zadať iné meno zložky kanály."
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:91
+msgid "_Edit feed properties after subscribing"
+msgstr "_Upraviť vlastnosti kanála po prihlásení"
+
+#: ../src/plugins/rssyl/rssyl_update_comments.c:99
+#, c-format
+msgid "Updating comments for '%s'..."
+msgstr "Aktualizácia komentárov pre „%s”…"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:102
+#: ../src/plugins/vcalendar/vcal_folder.c:1596
+msgid "401 (Authorisation required)"
+msgstr "401 (Vyžadovaná autorizácia)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:105
+#: ../src/plugins/vcalendar/vcal_folder.c:1599
+msgid "403 (Unauthorised)"
+msgstr "403 (Neautorizované)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:108
+#: ../src/plugins/vcalendar/vcal_folder.c:1602
+msgid "404 (Not found)"
+msgstr "404 (Nenájdené)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:111
+#, c-format
+msgid "Error %d"
+msgstr "Chyba %d"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:123
+#, c-format
+msgctxt "First parameter is URL, second is error text"
+msgid ""
+"Error fetching feed at\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
+msgstr ""
+"Chyba získania kanála na\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:134
+#, c-format
+msgid ""
+"No valid feed found at\n"
+"<b>%s</b>"
+msgstr ""
+"Nenájdený platný kanál na\n"
+"<b>%s</b>"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:200
+#, c-format
+msgid "Updating feed '%s'..."
+msgstr "Aktualizácia kanála „%s”..."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:221
+#, c-format
+msgid ""
+"Couldn't process feed at\n"
+"<b>%s</b>\n"
+"\n"
+"Please contact developers, this should not happen."
+msgstr ""
+"Nemožno spracovať kanál na\n"
+"<b>%s</b>\n"
+"\n"
+"Prosím, kontaktujte vývojára, toto by nemalo nastať."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:301
+msgid "Claws Mail needs network access in order to update your feeds."
+msgstr "Claws Mail potrebuje na aktualizáciu kanálov sieťový prístup."
+
+#: ../src/plugins/rssyl/rssyl_update_format.c:127
+msgid ""
+"Internal problem while upgrading storage format. This should not happen. "
+"Please report this, with debug output attached.\n"
+msgstr ""
+"Interný problém pri aktualizáciu formátu úložiska. Toto nemá nastať, prosím "
+"nahláste to a pripojte ladiaci výstup.\n"
+
 #: ../src/plugins/smime/plugin.c:38 ../src/plugins/smime/plugin.c:54
 #: ../src/plugins/smime/smime.c:911
 msgid "S/MIME"
@@ -13873,6 +14206,48 @@ msgstr ""
 "prosím dajte pozor na to, že hlavičky emailu, ako predmet, nie sú systémom S/"
 "MIME šifrované."
 
+#: ../src/plugins/spam_report/spam_report.c:295
+msgid "Reporting spam..."
+msgstr "Ohlasovanie SPAM..."
+
+#: ../src/plugins/spam_report/spam_report.c:330
+msgid "Report spam online..."
+msgstr "Ohlásiť SPAM online..."
+
+#: ../src/plugins/spam_report/spam_report.c:341
+#: ../src/plugins/spam_report/spam_report.c:379
+#: ../src/plugins/spam_report/spam_report_prefs.c:80
+msgid "SpamReport"
+msgstr "Hlásenie SPAM"
+
+#: ../src/plugins/spam_report/spam_report.c:384
+msgid ""
+"This plugin reports spam to various places.\n"
+"Currently the following sites or methods are supported:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * lists.debian.org nomination system"
+msgstr ""
+"Tento zásuvný modul ohlasuje SPAM na rôzne miesta.\n"
+"Aktuálne sú podporované tieto stránky alebo metódy:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * nominačný systém lists.debian.org"
+
+#: ../src/plugins/spam_report/spam_report.c:409
+msgid "Spam reporting"
+msgstr "Hlásenie SPAM"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:122
+msgid "Enabled"
+msgstr "Zapnuté"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:149
+msgid "Forward to:"
+msgstr "Poslať ďalej na:"
+
 #: ../src/plugins/spamassassin/spamassassin.c:77
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:649
 msgid "SpamAssassin"
@@ -14000,48 +14375,6 @@ msgid ""
 msgstr ""
 "Maximálny čas povolený na kontrolu. Ak kontrola trvá dlhšie, bude prerušená."
 
-#: ../src/plugins/spam_report/spam_report.c:293
-msgid "Reporting spam..."
-msgstr "Ohlasovanie SPAM..."
-
-#: ../src/plugins/spam_report/spam_report.c:328
-msgid "Report spam online..."
-msgstr "Ohlásiť SPAM online..."
-
-#: ../src/plugins/spam_report/spam_report.c:339
-#: ../src/plugins/spam_report/spam_report.c:377
-#: ../src/plugins/spam_report/spam_report_prefs.c:80
-msgid "SpamReport"
-msgstr "Hlásenie SPAM"
-
-#: ../src/plugins/spam_report/spam_report.c:382
-msgid ""
-"This plugin reports spam to various places.\n"
-"Currently the following sites or methods are supported:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * lists.debian.org nomination system"
-msgstr ""
-"Tento zásuvný modul ohlasuje SPAM na rôzne miesta.\n"
-"Aktuálne sú podporované tieto stránky alebo metódy:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * nominačný systém lists.debian.org"
-
-#: ../src/plugins/spam_report/spam_report.c:407
-msgid "Spam reporting"
-msgstr "Hlásenie SPAM"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:122
-msgid "Enabled"
-msgstr "Zapnuté"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:149
-msgid "Forward to:"
-msgstr "Poslať ďalej na:"
-
 #: ../src/plugins/tnef_parse/tnef_parse.c:65
 #, c-format
 msgid ""
@@ -14117,7 +14450,7 @@ msgstr "Zobraziť"
 
 #: ../src/plugins/vcalendar/day-view.c:614
 #: ../src/plugins/vcalendar/month-view.c:711 ../src/prefs_account.c:1477
-#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:334
+#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:336
 msgid "days"
 msgstr "dní"
 
@@ -14503,6 +14836,11 @@ msgstr ""
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Časový limit (%d sekúnd) pripojenia k %s\n"
 
+#: ../src/plugins/vcalendar/vcal_folder.c:1605
+#, c-format
+msgid "Error %ld"
+msgstr "Chyba %ld"
+
 #: ../src/plugins/vcalendar/vcal_folder.c:1802
 #, c-format
 msgid ""
@@ -14553,9 +14891,9 @@ msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1849
 #: ../src/plugins/vcalendar/vcal_folder.c:1852
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create directory %s"
-msgstr "Nemožno vytvoriť cieľový adresár %s."
+msgstr "Nemožno vytvoriť adresár %s"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1890
 msgid "Claws Mail needs network access in order to update the Webcal feed."
@@ -15229,11 +15567,6 @@ msgstr "Predvolený inbox"
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Nefiltrované správy budú umiestnené v tejto zložke"
 
-#: ../src/prefs_account.c:1442 ../src/prefs_account.c:1531
-#: ../src/prefs_account.c:1991 ../src/prefs_customheader.c:237
-msgid "Bro_wse"
-msgstr "P_rehliadať"
-
 #: ../src/prefs_account.c:1453
 msgid "Use secure authentication (APOP)"
 msgstr "Použiť bezpečnú autentifikáciu (APOP)"
@@ -15318,8 +15651,8 @@ msgid "'Get Mail' checks for new messages on this account"
 msgstr "„Prijať poštu” kontroluje nové správy v tomto účte"
 
 #: ../src/prefs_account.c:1718 ../src/prefs_customheader.c:209
-#: ../src/prefs_matcher.c:620 ../src/prefs_matcher.c:1958
-#: ../src/prefs_matcher.c:1980
+#: ../src/prefs_matcher.c:623 ../src/prefs_matcher.c:1974
+#: ../src/prefs_matcher.c:1996
 msgid "Header"
 msgstr "Hlavička"
 
@@ -15499,7 +15832,7 @@ msgstr "Certifikát na odosielanie"
 
 #: ../src/prefs_account.c:2558
 msgid "Automatically accept unknown valid SSL certificates"
-msgstr "Automaticky prijímať neznáme platné certifikáty SSL"
+msgstr "Automaticky akceptovať platné neznáme certifikáty SSL"
 
 #: ../src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
@@ -15690,8 +16023,8 @@ msgid "Replace the selected action in list with the action above"
 msgstr "Nahradiť zvolenú akciu v zozname akciou vyššie"
 
 #: ../src/prefs_actions.c:337 ../src/prefs_filtering_action.c:616
-#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:778
-#: ../src/prefs_template.c:318 ../src/prefs_toolbar.c:1056
+#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:781
+#: ../src/prefs_template.c:320 ../src/prefs_toolbar.c:1056
 msgid "Re_move"
 msgstr "O_dstrániť"
 
@@ -15700,7 +16033,7 @@ msgid "Delete the selected action from the list"
 msgstr "Zmazať zvolenú akciu zo zoznamu"
 
 #: ../src/prefs_actions.c:355 ../src/prefs_filtering.c:503
-#: ../src/prefs_template.c:336
+#: ../src/prefs_template.c:338
 msgid "Clear all the input fields in the dialog"
 msgstr "Vymazať všetky vstupné polia dialógu"
 
@@ -15721,7 +16054,7 @@ msgstr "Posunúť zvolenú akciu nižšie"
 #: ../src/prefs_actions.c:535 ../src/prefs_filtering_action.c:704
 #: ../src/prefs_filtering.c:836 ../src/prefs_filtering.c:838
 #: ../src/prefs_filtering.c:839 ../src/prefs_filtering.c:949
-#: ../src/prefs_matcher.c:897 ../src/prefs_template.c:469
+#: ../src/prefs_matcher.c:900 ../src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Nová)"
 
@@ -15782,22 +16115,22 @@ msgstr "Naozaj chcete zmazať všetky akcie?"
 
 #: ../src/prefs_actions.c:898 ../src/prefs_actions.c:929
 #: ../src/prefs_filtering.c:1497 ../src/prefs_filtering.c:1519
-#: ../src/prefs_matcher.c:2109 ../src/prefs_template.c:569
-#: ../src/prefs_template.c:594
+#: ../src/prefs_matcher.c:2125 ../src/prefs_template.c:572
+#: ../src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Záznam nebol uložený"
 
 #: ../src/prefs_actions.c:899 ../src/prefs_actions.c:930
 #: ../src/prefs_filtering.c:1498 ../src/prefs_filtering.c:1520
-#: ../src/prefs_template.c:570 ../src/prefs_template.c:595
+#: ../src/prefs_template.c:573 ../src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Záznam nebol uložený. Zavrieť napriek tomu?"
 
 #: ../src/prefs_actions.c:900 ../src/prefs_actions.c:905
 #: ../src/prefs_actions.c:931 ../src/prefs_filtering.c:1477
 #: ../src/prefs_filtering.c:1499 ../src/prefs_filtering.c:1521
-#: ../src/prefs_matcher.c:2111 ../src/prefs_template.c:571
-#: ../src/prefs_template.c:596 ../src/prefs_template.c:601
+#: ../src/prefs_matcher.c:2127 ../src/prefs_template.c:574
+#: ../src/prefs_template.c:599 ../src/prefs_template.c:604
 msgid "+_Continue editing"
 msgstr "+_Pokračovať v úprave"
 
@@ -15905,7 +16238,7 @@ msgstr ""
 "časťou, externé programy."
 
 #: ../src/prefs_actions.c:1092 ../src/prefs_filtering.c:1695
-#: ../src/prefs_template.c:1101
+#: ../src/prefs_template.c:1121
 msgid "D_uplicate"
 msgstr "D_uplikovať"
 
@@ -16040,7 +16373,7 @@ msgid "Custom header configuration"
 msgstr "Nastavenie dodatočných hlavičiek"
 
 #: ../src/prefs_customheader.c:507 ../src/prefs_display_header.c:599
-#: ../src/prefs_matcher.c:1583 ../src/prefs_matcher.c:1598
+#: ../src/prefs_matcher.c:1595 ../src/prefs_matcher.c:1610
 msgid "Header name is not set."
 msgstr "Nebol zadaný názov hlavičky."
 
@@ -16227,7 +16560,7 @@ msgstr "Presmerovať"
 
 #. S_COL_NUMBER
 #: ../src/prefs_filtering_action.c:194 ../src/prefs_filtering_action.c:195
-#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:626
+#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:629
 #: ../src/prefs_summary_column.c:87 ../src/summaryview.c:447
 msgid "Score"
 msgstr "Ohodnotenie"
@@ -16244,7 +16577,7 @@ msgstr "Nastaviť ohodnotenie"
 #. S_COL_SCORE
 #. S_COL_LOCKED
 #: ../src/prefs_filtering_action.c:196 ../src/prefs_filtering_action.c:197
-#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:630
+#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:633
 #: ../src/prefs_summary_column.c:89 ../src/summaryview.c:449
 msgid "Tags"
 msgstr "Značky"
@@ -16274,7 +16607,7 @@ msgid "Action configuration"
 msgstr "Nastavenie akcie"
 
 #: ../src/prefs_filtering_action.c:427 ../src/prefs_filtering.c:1886
-#: ../src/prefs_matcher.c:583
+#: ../src/prefs_matcher.c:586
 msgid "Rule"
 msgstr "Pravidlo"
 
@@ -16316,25 +16649,25 @@ msgid "No action was defined."
 msgstr "Nebola definovaná žiadna akcia."
 
 #. completion of 'To' from address book
-#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2153
+#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2169
 #: ../src/quote_fmt.c:79
 msgid "literal %"
 msgstr "Znak %"
 
-#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2162
+#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2178
 msgid "filename (should not be modified)"
 msgstr "názov súboru (nemal by byť menený)"
 
-#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2163
+#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2179
 #: ../src/quote_fmt.c:87
 msgid "new line"
 msgstr "nový riadok"
 
-#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2164
+#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2180
 msgid "escape character for quotes"
 msgstr "únikový znak citácie"
 
-#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2165
+#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2181
 msgid "quote character"
 msgstr "znak úvodzoviek"
 
@@ -16682,7 +17015,7 @@ msgid "Folder and Message Lists"
 msgstr "Zoznamy zložiek a správ"
 
 #. message font label
-#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2030
+#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2046
 msgid "Message"
 msgstr "Správa"
 
@@ -16874,245 +17207,249 @@ msgstr "Ostatné"
 msgid "Logging"
 msgstr "Záznam"
 
-#: ../src/prefs_matcher.c:328
+#: ../src/prefs_matcher.c:330
 msgid "more than"
 msgstr "viac ako"
 
-#: ../src/prefs_matcher.c:329
+#: ../src/prefs_matcher.c:331
 msgid "less than"
 msgstr "menej ako"
 
-#: ../src/prefs_matcher.c:335
+#: ../src/prefs_matcher.c:337
 msgid "weeks"
 msgstr "týždne"
 
-#: ../src/prefs_matcher.c:339
+#: ../src/prefs_matcher.c:341
 msgid "higher than"
 msgstr "vyšší ako"
 
-#: ../src/prefs_matcher.c:340
+#: ../src/prefs_matcher.c:342
 msgid "lower than"
 msgstr "nižší ako"
 
-#: ../src/prefs_matcher.c:341 ../src/prefs_matcher.c:347
+#: ../src/prefs_matcher.c:343 ../src/prefs_matcher.c:349
 msgid "exactly"
 msgstr "presne"
 
-#: ../src/prefs_matcher.c:345
+#: ../src/prefs_matcher.c:347
 msgid "greater than"
 msgstr "väčší ako"
 
-#: ../src/prefs_matcher.c:346
+#: ../src/prefs_matcher.c:348
 msgid "smaller than"
 msgstr "menší ako"
 
-#: ../src/prefs_matcher.c:351
+#: ../src/prefs_matcher.c:353
 msgid "bytes"
 msgstr "bajty"
 
-#: ../src/prefs_matcher.c:352
+#: ../src/prefs_matcher.c:354
 msgid "kilobytes"
 msgstr "kilobajty"
 
-#: ../src/prefs_matcher.c:353
+#: ../src/prefs_matcher.c:355
 msgid "megabytes"
 msgstr "megabajty"
 
-#: ../src/prefs_matcher.c:357
+#: ../src/prefs_matcher.c:359
 msgid "contains"
 msgstr "obsahuje"
 
-#: ../src/prefs_matcher.c:358
+#: ../src/prefs_matcher.c:360
 msgid "doesn't contain"
 msgstr "neobsahuje"
 
-#: ../src/prefs_matcher.c:381
+#: ../src/prefs_matcher.c:383
 msgid "headers part"
 msgstr "Hlavička správy"
 
-#: ../src/prefs_matcher.c:382
+#: ../src/prefs_matcher.c:384
+msgid "headers values"
+msgstr "hodnoty hlavičky"
+
+#: ../src/prefs_matcher.c:385
 msgid "body part"
 msgstr "Telo správy"
 
-#: ../src/prefs_matcher.c:383
+#: ../src/prefs_matcher.c:386
 msgid "whole message"
 msgstr "Celá správa"
 
-#: ../src/prefs_matcher.c:389 ../src/summaryview.c:6300
+#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6300
 msgid "Marked"
 msgstr "Označená"
 
-#: ../src/prefs_matcher.c:390 ../src/summaryview.c:6298
+#: ../src/prefs_matcher.c:393 ../src/summaryview.c:6298
 msgid "Deleted"
 msgstr "Zmazaná"
 
-#: ../src/prefs_matcher.c:391
+#: ../src/prefs_matcher.c:394
 msgid "Replied"
 msgstr "Odpovedaná"
 
-#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6292
+#: ../src/prefs_matcher.c:395 ../src/summaryview.c:6292
 msgid "Forwarded"
 msgstr "Poslané ďalej"
 
-#: ../src/prefs_matcher.c:394 ../src/summaryview.c:6282 ../src/toolbar.c:416
+#: ../src/prefs_matcher.c:397 ../src/summaryview.c:6282 ../src/toolbar.c:416
 #: ../src/toolbar.c:934 ../src/toolbar.c:1978
 msgid "Spam"
 msgstr "Spam"
 
-#: ../src/prefs_matcher.c:395
+#: ../src/prefs_matcher.c:398
 msgid "Has attachment"
 msgstr "Má prílohu"
 
-#: ../src/prefs_matcher.c:396 ../src/summaryview.c:6318
+#: ../src/prefs_matcher.c:399 ../src/summaryview.c:6318
 msgid "Signed"
 msgstr "Podpísané"
 
-#: ../src/prefs_matcher.c:400
+#: ../src/prefs_matcher.c:403
 msgid "set"
 msgstr "nastavené"
 
-#: ../src/prefs_matcher.c:401
+#: ../src/prefs_matcher.c:404
 msgid "not set"
 msgstr "nenastavené"
 
-#: ../src/prefs_matcher.c:405
+#: ../src/prefs_matcher.c:408
 msgid "yes"
 msgstr "áno"
 
-#: ../src/prefs_matcher.c:406
+#: ../src/prefs_matcher.c:409
 msgid "no"
 msgstr "nie"
 
-#: ../src/prefs_matcher.c:410
+#: ../src/prefs_matcher.c:413
 msgid "Any tags"
 msgstr "Žiadne značky"
 
-#: ../src/prefs_matcher.c:411
+#: ../src/prefs_matcher.c:414
 msgid "Specific tag"
 msgstr "Špecifická značka"
 
-#: ../src/prefs_matcher.c:415
+#: ../src/prefs_matcher.c:418
 msgid "ignored"
 msgstr "ignorované"
 
-#: ../src/prefs_matcher.c:416
+#: ../src/prefs_matcher.c:419
 msgid "not ignored"
 msgstr "neignorované"
 
-#: ../src/prefs_matcher.c:417
+#: ../src/prefs_matcher.c:420
 msgid "watched"
 msgstr "sledované"
 
-#: ../src/prefs_matcher.c:418
+#: ../src/prefs_matcher.c:421
 msgid "not watched"
 msgstr "nesledované"
 
-#: ../src/prefs_matcher.c:422
+#: ../src/prefs_matcher.c:425
 msgid "found"
 msgstr "nájdené"
 
-#: ../src/prefs_matcher.c:423
+#: ../src/prefs_matcher.c:426
 msgid "not found"
 msgstr "nenájdené"
 
-#: ../src/prefs_matcher.c:427
+#: ../src/prefs_matcher.c:430
 msgid "0 (Passed)"
 msgstr "0 (Prešlo)"
 
-#: ../src/prefs_matcher.c:428
+#: ../src/prefs_matcher.c:431
 msgid "non-0 (Failed)"
 msgstr "nenulové (Zlyhalo)"
 
-#: ../src/prefs_matcher.c:566
+#: ../src/prefs_matcher.c:569
 msgid "Condition configuration"
 msgstr "Nastavenie podmienok"
 
 #. criteria combo box
-#: ../src/prefs_matcher.c:610
+#: ../src/prefs_matcher.c:613
 msgid "Match criteria:"
 msgstr "Vyhľadávacie kritériá"
 
-#: ../src/prefs_matcher.c:619
+#: ../src/prefs_matcher.c:622
 msgid "All messages"
 msgstr "Všetky správy"
 
-#: ../src/prefs_matcher.c:621
+#: ../src/prefs_matcher.c:624
 msgid "Age"
 msgstr "Vek"
 
-#: ../src/prefs_matcher.c:622
+#: ../src/prefs_matcher.c:625
 msgid "Phrase"
 msgstr "Fráza"
 
-#: ../src/prefs_matcher.c:623
+#: ../src/prefs_matcher.c:626
 msgid "Flags"
 msgstr "Príznaky"
 
-#: ../src/prefs_matcher.c:624 ../src/prefs_msg_colors.c:410
+#: ../src/prefs_matcher.c:627 ../src/prefs_msg_colors.c:410
 msgid "Color labels"
 msgstr "Farebné označenia"
 
-#: ../src/prefs_matcher.c:625
+#: ../src/prefs_matcher.c:628
 msgid "Thread"
 msgstr "Vlákno"
 
-#: ../src/prefs_matcher.c:628
+#: ../src/prefs_matcher.c:631
 msgid "Partially downloaded"
 msgstr "Čiastočne stiahnutá"
 
-#: ../src/prefs_matcher.c:631
+#: ../src/prefs_matcher.c:634
 msgid "External program test"
 msgstr "Kontrola externým programom"
 
 #. store UNtranslated "Any"/"All" in matcher expressions
-#: ../src/prefs_matcher.c:707 ../src/prefs_matcher.c:1604
-#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:2501
+#: ../src/prefs_matcher.c:710 ../src/prefs_matcher.c:1616
+#: ../src/prefs_matcher.c:1631 ../src/prefs_matcher.c:2521
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Všetky"
 
-#: ../src/prefs_matcher.c:741
+#: ../src/prefs_matcher.c:744
 msgid "Use regexp"
 msgstr "Použiť regulárny výraz"
 
-#: ../src/prefs_matcher.c:818
+#: ../src/prefs_matcher.c:821
 msgid "Message must match"
 msgstr "Správa musí vyhovovať"
 
-#: ../src/prefs_matcher.c:822
+#: ../src/prefs_matcher.c:825
 msgid "at least one"
 msgstr "aspoň jedno"
 
-#: ../src/prefs_matcher.c:823
+#: ../src/prefs_matcher.c:826
 msgid "all"
 msgstr "všetky"
 
-#: ../src/prefs_matcher.c:826
+#: ../src/prefs_matcher.c:829
 msgid "of above rules"
 msgstr "predošlých pravidiel"
 
-#: ../src/prefs_matcher.c:1522 ../src/prefs_matcher.c:1588
+#: ../src/prefs_matcher.c:1534 ../src/prefs_matcher.c:1600
 msgid "Search pattern is not set."
 msgstr "Nebol zadaný vyhľadávací vzor."
 
-#: ../src/prefs_matcher.c:1531
+#: ../src/prefs_matcher.c:1543
 msgid "Test command is not set."
 msgstr "Nie je nastavený testovací príkaz."
 
-#: ../src/prefs_matcher.c:1605
+#: ../src/prefs_matcher.c:1617
 msgid "all addresses in all headers"
 msgstr "všetky adresy vo všetkých hlavičkách"
 
-#: ../src/prefs_matcher.c:1608
+#: ../src/prefs_matcher.c:1620
 msgid "any address in any header"
 msgstr "akákoľvek adresa v akejkoľvek hlavičke"
 
-#: ../src/prefs_matcher.c:1610
+#: ../src/prefs_matcher.c:1622
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "adresy v hlavičke „%s”"
 
-#: ../src/prefs_matcher.c:1611
+#: ../src/prefs_matcher.c:1623
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -17125,79 +17462,83 @@ msgstr ""
 "Ak chcete overiť či %s existuje v rámci celého adresára, vyberte „%s” z "
 "rozbaľovacieho zoznamu adresára/zložky."
 
-#: ../src/prefs_matcher.c:1830
+#: ../src/prefs_matcher.c:1842
 msgid "Headers part"
 msgstr "Záhlavie správy"
 
-#: ../src/prefs_matcher.c:1834
+#: ../src/prefs_matcher.c:1846
+msgid "Headers values"
+msgstr "Hodnoty hlavičky"
+
+#: ../src/prefs_matcher.c:1850
 msgid "Body part"
 msgstr "Telo správy"
 
-#: ../src/prefs_matcher.c:1838
+#: ../src/prefs_matcher.c:1854
 msgid "Whole message"
 msgstr "Celá správa"
 
-#: ../src/prefs_matcher.c:1957 ../src/prefs_matcher.c:2001
+#: ../src/prefs_matcher.c:1973 ../src/prefs_matcher.c:2017
 msgid "in"
 msgstr "v"
 
-#: ../src/prefs_matcher.c:1959
+#: ../src/prefs_matcher.c:1975
 msgid "content is"
 msgstr "obsahuje"
 
-#: ../src/prefs_matcher.c:1968
+#: ../src/prefs_matcher.c:1984
 msgid "Age is"
 msgstr "Vek je"
 
-#: ../src/prefs_matcher.c:1973
+#: ../src/prefs_matcher.c:1989
 msgid "Flag"
 msgstr "Príznak"
 
-#: ../src/prefs_matcher.c:1974 ../src/prefs_matcher.c:1991
+#: ../src/prefs_matcher.c:1990 ../src/prefs_matcher.c:2007
 msgid "is"
 msgstr "je"
 
-#: ../src/prefs_matcher.c:1979
+#: ../src/prefs_matcher.c:1995
 msgid "Name:"
 msgstr "Meno: "
 
-#: ../src/prefs_matcher.c:1990
+#: ../src/prefs_matcher.c:2006
 msgid "Label"
 msgstr "Menovka"
 
-#: ../src/prefs_matcher.c:1996
+#: ../src/prefs_matcher.c:2012
 msgid "Value:"
 msgstr "Hodnota:"
 
-#: ../src/prefs_matcher.c:2013
+#: ../src/prefs_matcher.c:2029
 msgid "Score is"
 msgstr "Skóre je"
 
-#: ../src/prefs_matcher.c:2014
+#: ../src/prefs_matcher.c:2030
 msgid "points"
 msgstr "bodov"
 
-#: ../src/prefs_matcher.c:2024
+#: ../src/prefs_matcher.c:2040
 msgid "Size is"
 msgstr "Veľkosť je"
 
-#: ../src/prefs_matcher.c:2029
+#: ../src/prefs_matcher.c:2045
 msgid "Scope:"
 msgstr "Rozsah:"
 
-#: ../src/prefs_matcher.c:2031
+#: ../src/prefs_matcher.c:2047
 msgid "tags"
 msgstr "Značky"
 
-#: ../src/prefs_matcher.c:2036
+#: ../src/prefs_matcher.c:2052
 msgid "type is"
 msgstr "typ je"
 
-#: ../src/prefs_matcher.c:2040
+#: ../src/prefs_matcher.c:2056
 msgid "Program returns"
 msgstr "Návratová hodnota programu"
 
-#: ../src/prefs_matcher.c:2110
+#: ../src/prefs_matcher.c:2126
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -17205,11 +17546,11 @@ msgstr ""
 "Pravidlo nebolo uložené.\n"
 "Zavrieť napriek tomu?"
 
-#: ../src/prefs_matcher.c:2174
+#: ../src/prefs_matcher.c:2190
 msgid "Match Type: 'Test'"
 msgstr "Typ zhody: „Test”"
 
-#: ../src/prefs_matcher.c:2175
+#: ../src/prefs_matcher.c:2191
 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"
@@ -17221,7 +17562,7 @@ msgstr ""
 "\n"
 "Môžete použiť tieto symboly:"
 
-#: ../src/prefs_matcher.c:2274
+#: ../src/prefs_matcher.c:2290
 msgid "Current condition rules"
 msgstr "Aktuálne pravidlá"
 
@@ -18172,105 +18513,110 @@ msgstr "Možné voľby"
 msgid "Selection on folder opening"
 msgstr "Výber pri otvorení zložky"
 
-#: ../src/prefs_template.c:79
+#: ../src/prefs_template.c:80
 msgid "This name is used as the Menu item"
 msgstr "Tento názov je použitý ako položka v menu"
 
-#: ../src/prefs_template.c:81
+#: ../src/prefs_template.c:82
 msgid ""
 "Override composing account's From header. This doesn't change the composing "
 "account."
 msgstr "Prepísať hlavičku Od účtu. Toto nezmení účet."
 
-#: ../src/prefs_template.c:307
+#: ../src/prefs_template.c:309
 msgid "Append the new template above to the list"
 msgstr "Priať novú šablónu na začiatok zoznamu"
 
-#: ../src/prefs_template.c:316
+#: ../src/prefs_template.c:318
 msgid "Replace the selected template in list with the template above"
 msgstr "Nahradiť zvolenú šablónu v zozname šablónou vyššie"
 
-#: ../src/prefs_template.c:326
+#: ../src/prefs_template.c:328
 msgid "Delete the selected template from the list"
 msgstr "Zmazať zvolenú šablónu zo zoznamu"
 
-#: ../src/prefs_template.c:344
+#: ../src/prefs_template.c:346
 msgid "Show information on configuring templates"
 msgstr "Zobraziť informácie o nastavovaní šablón"
 
-#: ../src/prefs_template.c:368
+#: ../src/prefs_template.c:370
 msgid "Move the selected template to the top"
 msgstr "Presunúť zvolenú šablónu na začiatok"
 
-#: ../src/prefs_template.c:378
+#: ../src/prefs_template.c:380
 msgid "Move the selected template up"
 msgstr "Posunúť zvolenú šablónu vyššie"
 
-#: ../src/prefs_template.c:386
+#: ../src/prefs_template.c:388
 msgid "Move the selected template down"
 msgstr "Posunúť zvolenú šablónu nižšie"
 
-#: ../src/prefs_template.c:396
+#: ../src/prefs_template.c:398
 msgid "Move the selected template to the bottom"
 msgstr "Presunúť zvolenú šablónu na koniec"
 
-#: ../src/prefs_template.c:412
+#: ../src/prefs_template.c:414
 msgid "Template configuration"
 msgstr "Nastavenie šablón"
 
-#: ../src/prefs_template.c:599
+#: ../src/prefs_template.c:602
 msgid "Templates list not saved"
 msgstr "Zoznam šablón nebol uložený"
 
-#: ../src/prefs_template.c:600
+#: ../src/prefs_template.c:603
 msgid "The templates list has been modified. Close anyway?"
 msgstr "Zoznam šablón nebol uložený. Zavrieť napriek tomu?"
 
-#: ../src/prefs_template.c:761
+#: ../src/prefs_template.c:768
 msgid "The template's name is not set."
 msgstr "Nebol zadaný názov šablóny."
 
-#: ../src/prefs_template.c:798
+#: ../src/prefs_template.c:811
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "Pole „Od” šablóny obsahuje neplatnú emailovú adresu."
 
-#: ../src/prefs_template.c:804
+#: ../src/prefs_template.c:817
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "Pole „Komu” šablóny obsahuje neplatnú emailovú adresu."
 
-#: ../src/prefs_template.c:810
+#: ../src/prefs_template.c:823
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "Pole „Kópia” šablóny obsahuje neplatnú emailovú adresu."
 
-#: ../src/prefs_template.c:816
+#: ../src/prefs_template.c:829
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "Pole „Skrytá kópia” šablóny obsahuje neplatnú emailovú adresu."
 
-#: ../src/prefs_template.c:822
+#: ../src/prefs_template.c:835
+msgid ""
+"The \"Reply-To\" field of the template contains an invalid email address."
+msgstr "Pole „Reply-To” šablóny obsahuje neplatnú emailovú adresu."
+
+#: ../src/prefs_template.c:841
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "Pole „Predmet” šablóny nie je platné."
 
-#: ../src/prefs_template.c:892
+#: ../src/prefs_template.c:912
 msgid "Delete template"
 msgstr "Zmazať šablónu"
 
-#: ../src/prefs_template.c:893
+#: ../src/prefs_template.c:913
 msgid "Do you really want to delete this template?"
 msgstr "Naozaj chcete zmazať túto šablónu?"
 
-#: ../src/prefs_template.c:905
+#: ../src/prefs_template.c:925
 msgid "Delete all templates"
 msgstr "Zmazať všetky šablóny"
 
-#: ../src/prefs_template.c:906
+#: ../src/prefs_template.c:926
 msgid "Do you really want to delete all the templates?"
 msgstr "Naozaj chcete zmazať všetky šablóny?"
 
-#: ../src/prefs_template.c:1221
+#: ../src/prefs_template.c:1241
 msgid "Current templates"
 msgstr "Aktuálne šablóny"
 
-#: ../src/prefs_template.c:1249
+#: ../src/prefs_template.c:1269
 msgid "Template"
 msgstr "Šablóna"
 
@@ -18581,7 +18927,7 @@ msgstr "Nie sú dostupné žiadne informácie"
 msgid "No recipient keys defined."
 msgstr "Neboli definované žiadne kľúče príjemcov."
 
-#: ../src/procmime.c:430 ../src/procmime.c:432 ../src/procmime.c:433
+#: ../src/procmime.c:433 ../src/procmime.c:435 ../src/procmime.c:436
 msgid "[Error decoding BASE64]\n"
 msgstr "[Chyba pri dekódovaní BASE64]\n"
 
@@ -19304,23 +19650,23 @@ msgstr ""
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d zvolených (%s/%s), %d neprečítaných"
 
-#: ../src/summaryview.c:2979
+#: ../src/summaryview.c:2981
 msgid "Sorting summary..."
 msgstr "Triedim zoznam správ…"
 
-#: ../src/summaryview.c:3118
+#: ../src/summaryview.c:3120
 msgid "Setting summary from message data..."
 msgstr "Vytváram zoznam správ…"
 
-#: ../src/summaryview.c:3323
+#: ../src/summaryview.c:3325
 msgid "(No Date)"
 msgstr "(Bez dátumu)"
 
-#: ../src/summaryview.c:3375
+#: ../src/summaryview.c:3377
 msgid "(No Recipient)"
 msgstr "(Žiadny príjemca)"
 
-#: ../src/summaryview.c:3410
+#: ../src/summaryview.c:3412
 #, c-format
 msgid ""
 "%s\n"
@@ -19329,7 +19675,7 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Od: %s, na %s</span>"
 
-#: ../src/summaryview.c:3417
+#: ../src/summaryview.c:3419
 #, c-format
 msgid ""
 "%s\n"
@@ -19338,11 +19684,11 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Pre: %s, na %s</span>"
 
-#: ../src/summaryview.c:4294
+#: ../src/summaryview.c:4296
 msgid "You're not the author of the article.\n"
 msgstr "Nie ste autorom tohoto príspevku.\n"
 
-#: ../src/summaryview.c:4387
+#: ../src/summaryview.c:4389
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
@@ -19350,15 +19696,15 @@ msgstr[0] "Naozaj chcete zmazať zvolenú správu?"
 msgstr[1] "Naozaj chcete zmazať %d zvolené správy?"
 msgstr[2] "Naozaj chcete zmazať %d zvolených správ?"
 
-#: ../src/summaryview.c:4390
+#: ../src/summaryview.c:4392
 msgid "Delete message(s)"
 msgstr "Zmazať správy"
 
-#: ../src/summaryview.c:4553
+#: ../src/summaryview.c:4555
 msgid "Destination is same as current folder."
 msgstr "Cieľ je rovnaký ako aktuálna zložka."
 
-#: ../src/summaryview.c:4652
+#: ../src/summaryview.c:4653
 msgid "Destination to copy is same as current folder."
 msgstr "Cieľ kopírovania je rovnaký ako aktuálna zložka."
 
@@ -19464,7 +19810,7 @@ msgstr "Zašifrované"
 msgid "Has attachment(s)"
 msgstr "Má prílohu(y)"
 
-#: ../src/summaryview.c:7929
+#: ../src/summaryview.c:7932
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19473,11 +19819,11 @@ msgstr ""
 "Chyba v regulárnom výraze:\n"
 "%s"
 
-#: ../src/summaryview.c:8034
+#: ../src/summaryview.c:8037
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Prejsť naspäť na zoznam zložiek (Máte neprečítané správy)"
 
-#: ../src/summaryview.c:8039
+#: ../src/summaryview.c:8042
 msgid "Go back to the folder list"
 msgstr "Prejsť naspäť na zoznam zložiek"
 
@@ -19605,11 +19951,11 @@ msgstr ""
 "    %s\n"
 "Návratový kód %d\n"
 
-#: ../src/textview.c:2194
+#: ../src/textview.c:2173
 msgid "Tags: "
 msgstr "Značky: "
 
-#: ../src/textview.c:2896
+#: ../src/textview.c:2875
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
@@ -19628,11 +19974,11 @@ msgstr ""
 "\n"
 "Otvoriť aj napriek tomu?"
 
-#: ../src/textview.c:2905
+#: ../src/textview.c:2884
 msgid "Phishing attempt warning"
 msgstr "Varovanie pred phishingovým podvodom"
 
-#: ../src/textview.c:2906
+#: ../src/textview.c:2885
 msgid "_Open URL"
 msgstr "_Otvoriť URL"
 
@@ -20227,4 +20573,4 @@ msgid ""
 "Click Save to start."
 msgstr ""
 "Program Claws Mail je pripravený.\n"
-"Kliknite na Uložiť."
+"Kliknite na Uložiť a začnite."
diff --git a/po/sv.po b/po/sv.po
index ae911f4..1531b68 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2014-06-13 03:15+0400\n"
-"PO-Revision-Date: 2014-05-19 14:46+0100\n"
+"POT-Creation-Date: 2014-10-13 16:55+0200\n"
+"PO-Revision-Date: 2014-10-13 20:44+0100\n"
 "Last-Translator: Andreas Rönnquist <gusnan at gusnan.se>\n"
 "Language-Team: Swedish\n"
 "Language: sv\n"
@@ -20,39 +20,214 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.6.9\n"
 
-#: ../claws-mail.appdata.xml.in.h:1
-#, fuzzy
+#: ../claws-mail.desktop.in.h:1
+msgid "E-mail client"
+msgstr "E-postklient"
+
+#: ../claws-mail.desktop.in.h:2
+msgid "Lightweight and Fast GTK+ based Mail Client"
+msgstr "Lättviktig och snabb GTK+-baserad E-postklient"
+
+#: ../claws-mail.desktop.in.h:3
+msgid "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
+msgstr ""
+"lättviktig;snabb;gui;utökningsbar;insticksmoduler;pop;pop3;imap;imap4;nntp;"
+"news;"
+
+#: ../appdata/claws-mail.appdata.xml.in.h:1
 msgid "Claws Mail is a fast, powerful and very extensible email client."
-msgstr "Claws-Mail har blivit registrerad som standardklient."
+msgstr ""
+"Claws Mail är en snabb, kraftfull och väldigt utökningsbar e-postklient."
 
-#: ../claws-mail.appdata.xml.in.h:2
+#: ../appdata/claws-mail.appdata.xml.in.h:2
 msgid ""
 "It is highly configurable and handles hundreds of thousands of emails "
 "easily. Messages are managed in an open format, and are easy to interact "
 "with."
 msgstr ""
+"Den är mycket anpassningsbar och hanterar hundratusentals e-postmeddelanden "
+"med lätthet. Meddelanden hanteras i öppet format och är enkla att handha."
 
-#: ../claws-mail.appdata.xml.in.h:3
+#: ../appdata/claws-mail.appdata.xml.in.h:3
 msgid ""
 "Lots of extra functionality is provided by plugins, such as PGP signatures "
 "and encryption, an RSS aggregator, a calendar, powerful spam filtering, Perl "
 "and Python interactions, HTML and PDF rendering, and more."
 msgstr ""
+"Mycket extra funktionalitet tillhandahålls av tilläggsmoduler, så som PGP-"
+"signaturer och kryptering, en RSS-läsare, en kalender, ett kraftfullt "
+"skräppostfilter, Perl och Pythoninteraktioner, rendering av HTML- och PDF-"
+"meddelanden, och mycket mer."
 
-#: ../claws-mail.desktop.in.h:1
-msgid "E-mail client"
+#: ../appdata/claws-mail-acpi_notifier.metainfo.xml.in.h:1
+msgid "Enables mail notification via LEDs on some laptops"
+msgstr "Aktiverar notifiering av ny e-post via LEDs på vissa laptops"
+
+#: ../appdata/claws-mail-address_keeper.metainfo.xml.in.h:1
+msgid ""
+"Allows saving outgoing addresses to a designated folder in the address book"
 msgstr ""
+"Möjliggör lagring av utgående adresser till en bestämd mapp i adressboken"
 
-#: ../claws-mail.desktop.in.h:2
-msgid "Lightweight and Fast GTK+ based Mail Client"
+#: ../appdata/claws-mail-archive.metainfo.xml.in.h:1
+msgid "Allows to make tars or zips of old folders"
+msgstr "Tillåter att skapa tar- eller zip-filer av gamla mappar"
+
+#: ../appdata/claws-mail-att_remover.metainfo.xml.in.h:1
+msgid "Lets you remove attachments from emails"
+msgstr "Låter dig ta bort bifogade filer från e-post"
+
+#: ../appdata/claws-mail-attachwarner.metainfo.xml.in.h:1
+msgid ""
+"Warns when a message mentioning an attachment in the message body without "
+"attaching any files"
+msgstr ""
+"Varnar när ett meddelande som nämner en bifogad fil i meddelandekroppen utan "
+"att bifoga några filer"
+
+#: ../appdata/claws-mail-bogofilter.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using Bogofilter"
+msgstr ""
+"Aktiverar avläsning av inkommande e-post mottagen från POP-, IMAP- elller "
+"LOCAL-konto med hjälp av Bogofilter"
+
+#: ../appdata/claws-mail-bsfilter.metainfo.xml.in.h:1
+msgid ""
+"Check all messages that are received from an IMAP, LOCAL or POP account for "
+"spam using Bsfilter"
+msgstr ""
+"Sök igenom alla meddelanden som tas emot från ett IMAP-, LOCAL- eller POP-"
+"konto efter skräppost med hjälp av Bsfilter"
+
+#: ../appdata/claws-mail-clamd.metainfo.xml.in.h:1
+msgid ""
+"Scans all messages that are received from an IMAP, LOCAL or POP account "
+"using clamd (Clam AV)"
+msgstr ""
+"Avsöker alla meddelanden som har mottagits frǻn ett IMAP-, LOCAL-, eller POP-"
+"konto med hjälp av clamd (Clam AV)"
+
+#: ../appdata/claws-mail-fancy.metainfo.xml.in.h:1
+msgid "Renders HTML e-mail using the WebKit library"
+msgstr "Renderar HTML-e-post med hjälp av biblioteket WebKit"
+
+#: ../appdata/claws-mail-fetchinfo.metainfo.xml.in.h:1
+msgid ""
+"Inserts headers containing: UIDL, Claws' account name, POP server, user ID "
+"and retrieval time"
+msgstr ""
+"Lägger till huvuden som innehåller: UIDL, kontonamn för Claws, POP-server, "
+"användar-ID och mottagningstid"
+
+#: ../appdata/claws-mail-gdata.metainfo.xml.in.h:1
+msgid "Provides an interface to Google services"
+msgstr "Tillhandahåller ett gränssnitt till Googletjänster"
+
+#: ../appdata/claws-mail-geolocation.metainfo.xml.in.h:1
+msgid "Provides GeoLocation functionality"
+msgstr "Tillhandahåller GeoLocation-funktionalitet"
+
+#: ../appdata/claws-mail-libravatar.metainfo.xml.in.h:1
+msgid ""
+"Displays libravatar/gravatar profiles' images or a dynamically generated or "
+"predefined alternative"
+msgstr ""
+"Visar profilbild från libravatar/gravatar eller ett dynamiskt genererat "
+"eller fördefinierat alternativ"
+
+#: ../appdata/claws-mail-mailmbox.metainfo.xml.in.h:1
+msgid "Direct support for mailboxes in mbox format"
+msgstr "Direkt stöd för brevlådor i mbox-format"
+
+#: ../appdata/claws-mail-newmail.metainfo.xml.in.h:1
+msgid ""
+"Writes a msg header summary to a log file on arrival of new mail after "
+"sorting"
+msgstr ""
+"Skriver en sammanfattning av meddelandehuvuden till en loggfil när ny e-post "
+"kommer efter sortering"
+
+#: ../appdata/claws-mail-notification.metainfo.xml.in.h:1
+msgid "Provides various ways to notify the user of new and unread email"
+msgstr ""
+"Tillhandahåller olika sätt att notifiera användaren om ny och oläst e-post"
+
+#: ../appdata/claws-mail-pdf_viewer.metainfo.xml.in.h:1
+msgid ""
+"Enables the viewing of PDF and PostScript attachments using the Poppler "
+"library and GhostScript"
+msgstr ""
+"Aktiverar visning av PDF- och Postscript-bilagor med hjälp av biblioteket "
+"Poppler och Ghostscript"
+
+#: ../appdata/claws-mail-perl.metainfo.xml.in.h:1
+msgid "Allowing the use of full Perl power in email filters"
+msgstr "Tillåter full användning av Perl-kraft i e-postfilter"
+
+#: ../appdata/claws-mail-pgpcore.metainfo.xml.in.h:1
+msgid ""
+"Handles core PGP functions and is a dependency of both the PGP/Inline and "
+"PGP/MIME plugins."
+msgstr ""
+"Hanterar PGPs grundfunktioner och är ett beroende för båda insticksmodulerna "
+"PGP/Inline och PGP/MIME"
+
+#: ../appdata/claws-mail-pgpinline.metainfo.xml.in.h:1
+msgid "Handles PGP/Inline signed and/or encrypted mails"
+msgstr "Hanterar PGP/Inline-signerad och/eller -krypterad e-post"
+
+#: ../appdata/claws-mail-pgpmime.metainfo.xml.in.h:1
+msgid "Handles PGP/MIME signed and/or encrypted mails"
+msgstr "Hanterar PGP/MIME-signerad och/eller -krypterad e-post"
+
+#: ../appdata/claws-mail-python.metainfo.xml.in.h:1
+msgid ""
+"Offers a Python scripting. Code can be entered into an embedded Python "
+"console or stored"
+msgstr ""
+"Tillhandahåller Pythonskriptning. Kod kan matas in i en inbäddad "
+"Pythonkonsol eller lagras"
+
+#: ../appdata/claws-mail-rssyl.metainfo.xml.in.h:1
+msgid "Read your RSS favourite newsfeeds"
+msgstr "Läs dina favorit-RSS-nyhetsflöden"
+
+#: ../appdata/claws-mail-smime.metainfo.xml.in.h:1
+msgid "Handles S/MIME signed and/or encrypted mails"
+msgstr "Hanterar S/MIME-signerad och/eller -krypterad e-post"
+
+#: ../appdata/claws-mail-spam_report.metainfo.xml.in.h:1
+msgid "Reports spam to various places"
+msgstr "Rapporterar skräppost till olika platser"
+
+#: ../appdata/claws-mail-spamassassin.metainfo.xml.in.h:1
+msgid ""
+"Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
+"account using SpamAssassin"
+msgstr ""
+"Aktiverar avsökning av inkommande e-post från ett POP, IMAP, eller LOCAL-"
+"konto med hjälp av SpamAssassin"
+
+#: ../appdata/claws-mail-tnef_parse.metainfo.xml.in.h:1
+msgid "Enables reading application/ms-tnef attachments"
+msgstr "Aktiverar läsning av bifogad application/ms-tnef-fil"
+
+#: ../appdata/claws-mail-vcalendar.metainfo.xml.in.h:1
+msgid ""
+"Enables vCalendar message handling and handles webCal subscriptions. "
+"Provides a calendar import"
 msgstr ""
+"Aktiverar vCalendar-meddelandehantering och hanterar webCal-prenumerationer. "
+"Tillhandahåller kalenderimport"
 
-#: ../src/account.c:392
+#: ../src/account.c:392 ../src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
+"Please close all the composing windows before editing accounts."
 msgstr ""
 "Det finns något Skriv meddelande-fönster öppet.\n"
 "Stäng alla Skriv meddelande-fönster innan du redigerar konton."
@@ -61,11 +236,11 @@ msgstr ""
 msgid "Can't create folder."
 msgstr "Kan inte skapa mapp."
 
-#: ../src/account.c:717
+#: ../src/account.c:724
 msgid "Edit accounts"
 msgstr "Redigera konton"
 
-#: ../src/account.c:734
+#: ../src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -75,44 +250,44 @@ msgstr ""
 "listan, kryssrutan indikerar vilka konton som kommer att inkluderas. Fet "
 "stil anger standardkontot."
 
-#: ../src/account.c:805
+#: ../src/account.c:812
 msgid " _Set as default account "
 msgstr " _Sätt som standardkonto "
 
-#: ../src/account.c:897
+#: ../src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Konton med fjärrmappar kan inte kopieras."
 
 #. copy fields
-#: ../src/account.c:904
+#: ../src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopia av %s"
 
-#: ../src/account.c:1064
+#: ../src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Vill du verkligen ta bort konto '%s'?"
 
-#: ../src/account.c:1066
+#: ../src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Ingen titel)"
 
-#: ../src/account.c:1067
+#: ../src/account.c:1074
 msgid "Delete account"
 msgstr "Ta bort konto"
 
-#: ../src/account.c:1537
+#: ../src/account.c:1544
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "H"
 
-#: ../src/account.c:1543
+#: ../src/account.c:1550
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Hämta e-post' hämtar e-post från valda e-postkonton"
 
-#: ../src/account.c:1550 ../src/addrduplicates.c:471 ../src/addressadd.c:215
-#: ../src/addressbook.c:125 ../src/compose.c:7144 ../src/editaddress.c:1263
+#: ../src/account.c:1557 ../src/addrduplicates.c:471 ../src/addressadd.c:215
+#: ../src/addressbook.c:125 ../src/compose.c:7148 ../src/editaddress.c:1263
 #: ../src/editaddress.c:1320 ../src/editaddress.c:1340
 #: ../src/editaddress_other_attributes_ldap.c:302
 #: ../src/editaddress_other_attributes_ldap.c:350 ../src/editbook.c:170
@@ -120,16 +295,16 @@ msgstr "'Hämta e-post' hämtar e-post från valda e-postkonton"
 #: ../src/editvcard.c:173 ../src/importmutt.c:223 ../src/importpine.c:222
 #: ../src/mimeview.c:275 ../src/plugins/pdf_viewer/poppler_viewer.c:1797
 #: ../src/plugins/pgpcore/select-keys.c:396 ../src/prefs_filtering.c:384
-#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:78
+#: ../src/prefs_filtering.c:1866 ../src/prefs_template.c:79
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/account.c:1558 ../src/prefs_account.c:1103
+#: ../src/account.c:1565 ../src/prefs_account.c:1103
 #: ../src/prefs_account.c:4058
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/account.c:1566 ../src/ssl_manager.c:102
+#: ../src/account.c:1573 ../src/ssl_manager.c:102
 msgid "Server"
 msgstr "Server"
 
@@ -181,8 +356,8 @@ msgstr ""
 "%s"
 
 #: ../src/action.c:990 ../src/ldaputil.c:326
-#: ../src/plugins/bogofilter/bogofilter.c:876 ../src/plugins/rssyl/feed.c:1739
-#: ../src/plugins/rssyl/feed.c:1743 ../src/plugins/tnef_parse/tnef_parse.c:67
+#: ../src/plugins/bogofilter/bogofilter.c:876
+#: ../src/plugins/tnef_parse/tnef_parse.c:67
 #: ../src/plugins/vcalendar/vcal_folder.c:1803
 #: ../src/plugins/vcalendar/vcal_folder.c:1807
 #: ../src/plugins/vcalendar/vcal_folder.c:1818
@@ -239,22 +414,20 @@ msgid "Action's user argument"
 msgstr "Aktivitets användarargument"
 
 #: ../src/addrclip.c:479
-#, fuzzy
 msgid "Cannot copy a folder to itself or to its sub-structure."
-msgstr "Kan inte kopiera en mapp till ett av dess barn."
+msgstr "Kan inte kopiera en mapp till sig självt eller till sin understruktur."
 
 #: ../src/addrclip.c:502
-#, fuzzy
 msgid "Cannot copy an address book to itself."
-msgstr "Kan inte klistra in. Destinations adressboken är skrivskyddad."
+msgstr "Kan inte kopiera en adressbok till sig självt."
 
 #: ../src/addrclip.c:593
-#, fuzzy
 msgid "Cannot move a folder to itself or to its sub-structure."
-msgstr "Kan inte flytta en mapp till ett av dess barn."
+msgstr ""
+"Kan inte flytta en mapp till sig självt eller till sin egen understruktur."
 
 #. that's a group
-#: ../src/addr_compl.c:620 ../src/addressbook.c:4866
+#: ../src/addr_compl.c:685 ../src/addressbook.c:4866
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "Grupp"
@@ -329,14 +502,14 @@ msgstr ""
 
 #: ../src/addrcustomattr.c:212 ../src/addressbook.c:435
 #: ../src/addressbook.c:463 ../src/addressbook.c:480 ../src/edittags.c:272
-#: ../src/plugins/archive/archiver_gtk.c:1193 ../src/prefs_actions.c:1090
-#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1099
+#: ../src/plugins/archive/archiver_gtk.c:1194 ../src/prefs_actions.c:1090
+#: ../src/prefs_filtering.c:1693 ../src/prefs_template.c:1119
 msgid "_Delete"
 msgstr "_Ta bort"
 
 #: ../src/addrcustomattr.c:213 ../src/edittags.c:273
 #: ../src/prefs_actions.c:1091 ../src/prefs_filtering.c:1694
-#: ../src/prefs_template.c:1100
+#: ../src/prefs_template.c:1120
 msgid "Delete _all"
 msgstr "Ta bort _alla"
 
@@ -434,7 +607,7 @@ msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
 #: ../src/addressadd.c:485 ../src/editaddress.c:1582 ../src/headerview.c:281
-#: ../src/textview.c:2064
+#: ../src/textview.c:2043
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -465,17 +638,17 @@ msgstr "Adress_bok"
 
 #. {"Address/---",			NULL, "---", NULL, NULL, NULL },
 #: ../src/addressbook.c:403 ../src/addressbook.c:434 ../src/addressbook.c:462
-#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:504
+#: ../src/addressbook.c:479 ../src/compose.c:581 ../src/mainwindow.c:506
 #: ../src/messageview.c:210
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:507
+#: ../src/addressbook.c:404 ../src/compose.c:586 ../src/mainwindow.c:509
 #: ../src/messageview.c:213
 msgid "_Tools"
 msgstr "V_erktyg"
 
-#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:509
+#: ../src/addressbook.c:405 ../src/compose.c:587 ../src/mainwindow.c:511
 #: ../src/messageview.c:214
 msgid "_Help"
 msgstr "_Hjälp"
@@ -533,7 +706,7 @@ msgstr "Klipp _ut"
 
 #. Edit menu
 #: ../src/addressbook.c:431 ../src/addressbook.c:470 ../src/addressbook.c:486
-#: ../src/compose.c:610 ../src/mainwindow.c:538 ../src/messageview.c:226
+#: ../src/compose.c:610 ../src/mainwindow.c:540 ../src/messageview.c:226
 msgid "_Copy"
 msgstr "_Kopiera"
 
@@ -589,7 +762,7 @@ msgid "Edit custom attributes..."
 msgstr "Ändra anpassade attribut..."
 
 #. Help menu
-#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:801
+#: ../src/addressbook.c:455 ../src/compose.c:690 ../src/mainwindow.c:803
 #: ../src/messageview.c:339
 msgid "_About"
 msgstr "_Om"
@@ -599,9 +772,10 @@ msgid "_Browse Entry"
 msgstr "_Bläddra Post"
 
 #. then add the appointment
-#: ../src/addressbook.c:504 ../src/crash.c:454 ../src/crash.c:473
+#: ../src/addressbook.c:504 ../src/crash.c:457 ../src/crash.c:476
 #: ../src/importldif.c:115 ../src/plugins/pgpcore/select-keys.c:251
-#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/vcalendar/day-view.c:402
+#: ../src/plugins/pgpcore/sgpgme.c:140 ../src/plugins/pgpcore/sgpgme.c:168
+#: ../src/plugins/vcalendar/day-view.c:402
 #: ../src/plugins/vcalendar/month-view.c:428 ../src/prefs_themes.c:707
 #: ../src/prefs_themes.c:739 ../src/prefs_themes.c:740
 msgid "Unknown"
@@ -707,7 +881,7 @@ msgstr "Stark(are) autentisering krävs"
 msgid "Sources"
 msgstr "Källor"
 
-#: ../src/addressbook.c:914 ../src/prefs_matcher.c:629
+#: ../src/addressbook.c:914 ../src/prefs_matcher.c:632
 #: ../src/prefs_other.c:475 ../src/toolbar.c:225 ../src/toolbar.c:2142
 msgid "Address book"
 msgstr "Adressbok"
@@ -758,7 +932,7 @@ msgstr ""
 
 #: ../src/addressbook.c:2921 ../src/imap_gtk.c:363 ../src/mh_gtk.c:202
 #: ../src/plugins/mailmbox/plugin_gtk.c:324
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:236
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:152
 #: ../src/plugins/vcalendar/vcal_folder.c:1966
 msgid "Delete folder"
 msgstr "Ta bort mapp"
@@ -922,10 +1096,10 @@ msgstr "LDAP Fråga"
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:443
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:490
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:613
-#: ../src/prefs_matcher.c:672 ../src/prefs_matcher.c:707
-#: ../src/prefs_matcher.c:1607 ../src/prefs_matcher.c:1614
-#: ../src/prefs_matcher.c:1622 ../src/prefs_matcher.c:1624
-#: ../src/prefs_matcher.c:2504 ../src/prefs_matcher.c:2508
+#: ../src/prefs_matcher.c:675 ../src/prefs_matcher.c:710
+#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:1626
+#: ../src/prefs_matcher.c:1634 ../src/prefs_matcher.c:1636
+#: ../src/prefs_matcher.c:2524 ../src/prefs_matcher.c:2528
 msgid "Any"
 msgstr "Någon"
 
@@ -1029,21 +1203,21 @@ msgstr "Adress(er) uppdaterade"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Uppdatering misslyckades. Ändringar inte skrivna till Katalogen."
 
-#: ../src/alertpanel.c:146 ../src/compose.c:9293
+#: ../src/alertpanel.c:146 ../src/compose.c:9324
 msgid "Notice"
 msgstr "Meddelande"
 
 #: ../src/alertpanel.c:159 ../src/compose.c:5656 ../src/compose.c:6133
-#: ../src/compose.c:11662 ../src/file_checker.c:78 ../src/file_checker.c:100
+#: ../src/compose.c:11670 ../src/file_checker.c:78 ../src/file_checker.c:100
 #: ../src/messageview.c:853 ../src/messageview.c:866
-#: ../src/plugins/pgpcore/sgpgme.c:719
+#: ../src/plugins/pgpcore/sgpgme.c:717
 #: ../src/plugins/vcalendar/vcalendar.c:125 ../src/summaryview.c:4863
 msgid "Warning"
 msgstr "Varning"
 
 #: ../src/alertpanel.c:172 ../src/alertpanel.c:195 ../src/compose.c:5597
 #: ../src/inc.c:669 ../src/plugins/pgpcore/sgpgme.c:152
-#: ../src/plugins/pgpcore/sgpgme.c:249
+#: ../src/plugins/pgpcore/sgpgme.c:253
 msgid "Error"
 msgstr "Fel"
 
@@ -1055,14 +1229,10 @@ msgstr "_Visa logg"
 msgid "Show this message next time"
 msgstr "Visa detta meddelande nästa gång"
 
-#: ../src/avatars.c:97
-msgid "Internal avatars rendering already initialized"
-msgstr ""
-
 #: ../src/avatars.c:102
-#, fuzzy
 msgid "Failed to register avatars internal rendering hook"
-msgstr "Misslyckades att registrera renderingskopplingspunkt för avatarbilder"
+msgstr ""
+"Misslyckades att registrera intern renderingskopplingspunkt för avatarbilder"
 
 #: ../src/browseldap.c:218
 msgid "Browse Directory Entry"
@@ -1172,7 +1342,7 @@ msgstr "Din version av Claws Mail är för gammal för '%s' insticksmodulen."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Din version av Claws Mail är för gammal för insticksmodulen."
 
-#: ../src/common/session.c:177 ../src/imap.c:1171
+#: ../src/common/session.c:177 ../src/imap.c:1177
 msgid "SSL handshake failed\n"
 msgstr "SSL-handskakning misslyckades\n"
 
@@ -1348,212 +1518,212 @@ msgstr "%d,%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: ../src/common/utils.c:4967
+#: ../src/common/utils.c:5000
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "söndag"
 
-#: ../src/common/utils.c:4968
+#: ../src/common/utils.c:5001
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "måndag"
 
-#: ../src/common/utils.c:4969
+#: ../src/common/utils.c:5002
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "tisdag"
 
-#: ../src/common/utils.c:4970
+#: ../src/common/utils.c:5003
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: ../src/common/utils.c:4971
+#: ../src/common/utils.c:5004
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "torsdag"
 
-#: ../src/common/utils.c:4972
+#: ../src/common/utils.c:5005
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "fredag"
 
-#: ../src/common/utils.c:4973
+#: ../src/common/utils.c:5006
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "lördag"
 
-#: ../src/common/utils.c:4975
+#: ../src/common/utils.c:5008
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "januari"
 
-#: ../src/common/utils.c:4976
+#: ../src/common/utils.c:5009
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "februari"
 
-#: ../src/common/utils.c:4977
+#: ../src/common/utils.c:5010
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "mars"
 
-#: ../src/common/utils.c:4978
+#: ../src/common/utils.c:5011
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "april"
 
-#: ../src/common/utils.c:4979
+#: ../src/common/utils.c:5012
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "maj"
 
-#: ../src/common/utils.c:4980
+#: ../src/common/utils.c:5013
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "juni"
 
-#: ../src/common/utils.c:4981
+#: ../src/common/utils.c:5014
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "juli"
 
-#: ../src/common/utils.c:4982
+#: ../src/common/utils.c:5015
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "augusti"
 
-#: ../src/common/utils.c:4983
+#: ../src/common/utils.c:5016
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "september"
 
-#: ../src/common/utils.c:4984
+#: ../src/common/utils.c:5017
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "oktober"
 
-#: ../src/common/utils.c:4985
+#: ../src/common/utils.c:5018
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "november"
 
-#: ../src/common/utils.c:4986
+#: ../src/common/utils.c:5019
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "december"
 
-#: ../src/common/utils.c:4988
+#: ../src/common/utils.c:5021
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "sön"
 
-#: ../src/common/utils.c:4989
+#: ../src/common/utils.c:5022
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "mån"
 
-#: ../src/common/utils.c:4990
+#: ../src/common/utils.c:5023
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "tis"
 
-#: ../src/common/utils.c:4991
+#: ../src/common/utils.c:5024
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "ons"
 
-#: ../src/common/utils.c:4992
+#: ../src/common/utils.c:5025
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "tor"
 
-#: ../src/common/utils.c:4993
+#: ../src/common/utils.c:5026
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "fre"
 
-#: ../src/common/utils.c:4994
+#: ../src/common/utils.c:5027
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "lör"
 
-#: ../src/common/utils.c:4996
+#: ../src/common/utils.c:5029
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "jan"
 
-#: ../src/common/utils.c:4997
+#: ../src/common/utils.c:5030
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "feb"
 
-#: ../src/common/utils.c:4998
+#: ../src/common/utils.c:5031
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "mar"
 
-#: ../src/common/utils.c:4999
+#: ../src/common/utils.c:5032
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "apr"
 
-#: ../src/common/utils.c:5000
+#: ../src/common/utils.c:5033
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "maj"
 
-#: ../src/common/utils.c:5001
+#: ../src/common/utils.c:5034
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "jun"
 
-#: ../src/common/utils.c:5002
+#: ../src/common/utils.c:5035
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "jul"
 
-#: ../src/common/utils.c:5003
+#: ../src/common/utils.c:5036
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "aug"
 
-#: ../src/common/utils.c:5004
+#: ../src/common/utils.c:5037
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "sep"
 
-#: ../src/common/utils.c:5005
+#: ../src/common/utils.c:5038
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "okt"
 
-#: ../src/common/utils.c:5006
+#: ../src/common/utils.c:5039
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "nov"
 
-#: ../src/common/utils.c:5007
+#: ../src/common/utils.c:5040
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "dec"
 
-#: ../src/common/utils.c:5018
+#: ../src/common/utils.c:5051
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "FM"
 
-#: ../src/common/utils.c:5019
+#: ../src/common/utils.c:5052
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "EM"
 
-#: ../src/common/utils.c:5020
+#: ../src/common/utils.c:5053
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "fm"
 
-#: ../src/common/utils.c:5021
+#: ../src/common/utils.c:5054
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "em"
@@ -1564,7 +1734,7 @@ msgstr "_Lägg till..."
 
 #: ../src/compose.c:571 ../src/mh_gtk.c:361
 #: ../src/plugins/mailmbox/plugin_gtk.c:293
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:140
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:307
 msgid "_Remove"
 msgstr "_Ta bort"
 
@@ -1573,7 +1743,7 @@ msgid "_Properties..."
 msgstr "_Egenskaper..."
 
 #. menus
-#: ../src/compose.c:580 ../src/mainwindow.c:506 ../src/messageview.c:212
+#: ../src/compose.c:580 ../src/mainwindow.c:508 ../src/messageview.c:212
 msgid "_Message"
 msgstr "_Meddelande"
 
@@ -1645,7 +1815,7 @@ msgstr "_Radbruten"
 msgid "_Unwrapped"
 msgstr "Ej radbr_uten"
 
-#: ../src/compose.c:618 ../src/mainwindow.c:539
+#: ../src/compose.c:618 ../src/mainwindow.c:541
 msgid "Select _all"
 msgstr "Markera _alla"
 
@@ -1777,48 +1947,48 @@ msgstr "_Prioritet"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
 #. {"View/Scroll/---",          NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:666 ../src/mainwindow.c:603 ../src/messageview.c:265
+#: ../src/compose.c:666 ../src/mainwindow.c:605 ../src/messageview.c:265
 msgid "Character _encoding"
 msgstr "_Teckenkodning"
 
-#: ../src/compose.c:671 ../src/mainwindow.c:608 ../src/messageview.c:270
+#: ../src/compose.c:671 ../src/mainwindow.c:610 ../src/messageview.c:270
 msgid "Western European"
 msgstr "Västeuropeisk (ISO-8859-1)"
 
-#: ../src/compose.c:672 ../src/mainwindow.c:609 ../src/messageview.c:271
+#: ../src/compose.c:672 ../src/mainwindow.c:611 ../src/messageview.c:271
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: ../src/compose.c:673 ../src/mainwindow.c:610 ../src/messageview.c:272
+#: ../src/compose.c:673 ../src/mainwindow.c:612 ../src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebreiska"
 
-#: ../src/compose.c:674 ../src/mainwindow.c:611 ../src/messageview.c:273
+#: ../src/compose.c:674 ../src/mainwindow.c:613 ../src/messageview.c:273
 msgid "Arabic"
 msgstr "Arabiska"
 
-#: ../src/compose.c:675 ../src/mainwindow.c:612 ../src/messageview.c:274
+#: ../src/compose.c:675 ../src/mainwindow.c:614 ../src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Kyrillisk (KOI8-R)"
 
-#: ../src/compose.c:676 ../src/mainwindow.c:613 ../src/messageview.c:275
+#: ../src/compose.c:676 ../src/mainwindow.c:615 ../src/messageview.c:275
 msgid "Japanese"
 msgstr "Japansk (EUC-JP)"
 
-#: ../src/compose.c:677 ../src/mainwindow.c:614 ../src/messageview.c:276
+#: ../src/compose.c:677 ../src/mainwindow.c:616 ../src/messageview.c:276
 msgid "Chinese"
 msgstr "Kinesiska"
 
-#: ../src/compose.c:678 ../src/mainwindow.c:615 ../src/messageview.c:277
+#: ../src/compose.c:678 ../src/mainwindow.c:617 ../src/messageview.c:277
 msgid "Korean"
 msgstr "Koreanska"
 
-#: ../src/compose.c:679 ../src/mainwindow.c:616 ../src/messageview.c:278
+#: ../src/compose.c:679 ../src/mainwindow.c:618 ../src/messageview.c:278
 msgid "Thai"
 msgstr "Thai"
 
 #. Tools menu
-#: ../src/compose.c:682 ../src/mainwindow.c:723 ../src/messageview.c:314
+#: ../src/compose.c:682 ../src/mainwindow.c:725 ../src/messageview.c:314
 msgid "_Address book"
 msgstr "_Adressbok"
 
@@ -1827,7 +1997,7 @@ msgid "_Template"
 msgstr "_Mall"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/compose.c:686 ../src/mainwindow.c:751 ../src/messageview.c:335
+#: ../src/compose.c:686 ../src/mainwindow.c:753 ../src/messageview.c:335
 msgid "Actio_ns"
 msgstr "Aktiviteter"
 
@@ -1871,13 +2041,13 @@ msgid "_Normal"
 msgstr "_Normal"
 
 #. RADIO compose_reply_change_mode_cb
-#: ../src/compose.c:707 ../src/mainwindow.c:657 ../src/messageview.c:303
+#: ../src/compose.c:707 ../src/mainwindow.c:659 ../src/messageview.c:303
 msgid "_All"
 msgstr "_Alla"
 
 #. RADIO compose_reply_change_mode_cb
 #. COMPOSE_REPLY_TO_ALL
-#: ../src/compose.c:708 ../src/mainwindow.c:658 ../src/messageview.c:304
+#: ../src/compose.c:708 ../src/mainwindow.c:660 ../src/messageview.c:304
 msgid "_Sender"
 msgstr "Av_sändare"
 
@@ -1905,19 +2075,19 @@ msgstr "L_åg"
 msgid "_Lowest"
 msgstr "_Lägsta"
 
-#: ../src/compose.c:723 ../src/mainwindow.c:865 ../src/messageview.c:352
+#: ../src/compose.c:723 ../src/mainwindow.c:868 ../src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automatiskt"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:724 ../src/mainwindow.c:866 ../src/messageview.c:353
+#: ../src/compose.c:724 ../src/mainwindow.c:869 ../src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7 bitars ASCII (US-ASC_II)"
 
 #. RADIO compose_set_encoding_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:725 ../src/mainwindow.c:867 ../src/messageview.c:354
+#: ../src/compose.c:725 ../src/mainwindow.c:870 ../src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
@@ -1929,7 +2099,7 @@ msgstr "Unicode (_UTF-8)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:729 ../src/mainwindow.c:871 ../src/messageview.c:358
+#: ../src/compose.c:729 ../src/mainwindow.c:874 ../src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centraleuropeisk (ISO-8859-_2)"
 
@@ -1939,7 +2109,7 @@ msgstr "Centraleuropeisk (ISO-8859-_2)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:732 ../src/mainwindow.c:874 ../src/messageview.c:361
+#: ../src/compose.c:732 ../src/mainwindow.c:877 ../src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grekisk (ISO-8859-_7)"
 
@@ -1953,7 +2123,7 @@ msgstr "Grekisk (ISO-8859-_7)"
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
 #. RADIO set_charset_cb
-#: ../src/compose.c:737 ../src/mainwindow.c:879 ../src/messageview.c:366
+#: ../src/compose.c:737 ../src/mainwindow.c:882 ../src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turkisk (ISO-8859-_9)"
 
@@ -2007,33 +2177,33 @@ msgstr "Vb: många meddelande"
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "\"Omdirigera\"-mallen har ett fel i meddelandetexten på rad %d."
 
-#: ../src/compose.c:2591 ../src/gtk/headers.h:13
+#: ../src/compose.c:2591 ../src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: ../src/compose.c:2594 ../src/gtk/headers.h:14
+#: ../src/compose.c:2594 ../src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Blindkopia:"
 
-#: ../src/compose.c:2597 ../src/gtk/headers.h:11
+#: ../src/compose.c:2597 ../src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Svara till:"
 
 #: ../src/compose.c:2600 ../src/compose.c:4911 ../src/compose.c:4913
-#: ../src/gtk/headers.h:32
+#: ../src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Diskussionsgrupper:"
 
-#: ../src/compose.c:2603 ../src/gtk/headers.h:33
+#: ../src/compose.c:2603 ../src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Uppföljning Till:"
 
-#: ../src/compose.c:2606 ../src/gtk/headers.h:16
+#: ../src/compose.c:2606 ../src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Svar-På:"
 
 #: ../src/compose.c:2610 ../src/compose.c:4908 ../src/compose.c:4916
-#: ../src/gtk/headers.h:12 ../src/summary_search.c:433
+#: ../src/gtk/headers.h:13 ../src/summary_search.c:433
 msgid "To:"
 msgstr "Till:"
 
@@ -2078,7 +2248,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Är du säker?"
 
-#: ../src/compose.c:3603 ../src/compose.c:11144
+#: ../src/compose.c:3603 ../src/compose.c:11152
 msgid "+_Insert"
 msgstr "+_Infoga"
 
@@ -2105,16 +2275,16 @@ msgstr "Kan inte läsa %s."
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:432
+#: ../src/compose.c:4748 ../src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Redigerat]"
 
-#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:435
+#: ../src/compose.c:4755 ../src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Skriv meddelande%s"
 
-#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:438
+#: ../src/compose.c:4758 ../src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[inget ämne] - Skriv meddelande%s"
@@ -2123,7 +2293,7 @@ msgstr "[inget ämne] - Skriv meddelande%s"
 #. * This partly duplicates functionality in compose.c::compose_set_title().
 #. * While it's nice to not have to modify Claws Mail for this to work,
 #. * it would be cleaner to export that function in Claws Mail.
-#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:426
+#: ../src/compose.c:4760 ../src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Skriv meddelande"
 
@@ -2179,7 +2349,7 @@ msgstr "Köa det ändå?"
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: ../src/compose.c:5134 ../src/compose.c:9719
+#: ../src/compose.c:5134 ../src/compose.c:9750
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2189,7 +2359,7 @@ msgstr ""
 "\n"
 "Fel vid omvandling av teckenuppsättning."
 
-#: ../src/compose.c:5137 ../src/compose.c:9722
+#: ../src/compose.c:5137 ../src/compose.c:9753
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2199,7 +2369,7 @@ msgstr ""
 "\n"
 "Kunde inte få tag i mottagarens krypteringsnyckel."
 
-#: ../src/compose.c:5143 ../src/compose.c:9716
+#: ../src/compose.c:5143 ../src/compose.c:9747
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2287,7 +2457,7 @@ msgstr "Valt konto är inte NNTP: Omöjligt att skicka."
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Bilagan %s existerar inte längre. Ignorera?"
 
-#: ../src/compose.c:6133 ../src/mainwindow.c:648 ../src/toolbar.c:231
+#: ../src/compose.c:6133 ../src/mainwindow.c:650 ../src/toolbar.c:231
 #: ../src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Avbryt sändning"
@@ -2305,34 +2475,34 @@ msgstr "Ursprunglig %s del"
 msgid "Add to address _book"
 msgstr "Lägg till i adress_boken"
 
-#: ../src/compose.c:6908
+#: ../src/compose.c:6912
 msgid "Delete entry contents"
 msgstr "Ta bort innehållet i inmatningsfältet"
 
-#: ../src/compose.c:6912 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: ../src/compose.c:6916 ../src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Använd <tabb> för automatisk ifyllning från adressbok"
 
-#: ../src/compose.c:7132
+#: ../src/compose.c:7136
 msgid "Mime type"
 msgstr "Mime typ"
 
 #. S_COL_DATE
-#: ../src/compose.c:7138 ../src/mimeview.c:274
-#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:627
+#: ../src/compose.c:7142 ../src/mimeview.c:274
+#: ../src/plugins/pgpcore/select-keys.c:394 ../src/prefs_matcher.c:630
 #: ../src/prefs_summary_column.c:85 ../src/summaryview.c:445
 msgid "Size"
 msgstr "Storlek"
 
 #. Save Message to folder
-#: ../src/compose.c:7201
+#: ../src/compose.c:7205
 msgid "Save Message to "
 msgstr "Spara meddelande i "
 
-#: ../src/compose.c:7238 ../src/editjpilot.c:276 ../src/editldap.c:520
+#: ../src/compose.c:7242 ../src/editjpilot.c:276 ../src/editldap.c:520
 #: ../src/editvcard.c:192 ../src/export.c:164 ../src/import.c:163
 #: ../src/importmutt.c:239 ../src/importpine.c:238
-#: ../src/plugins/archive/archiver_gtk.c:1028
+#: ../src/plugins/archive/archiver_gtk.c:1029
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:188
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:208
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:181
@@ -2341,24 +2511,23 @@ msgstr "Spara meddelande i "
 msgid "_Browse"
 msgstr "_Bläddra"
 
-#: ../src/compose.c:7710
+#: ../src/compose.c:7714
 msgid "Hea_der"
 msgstr "Brevhuvud"
 
-#: ../src/compose.c:7715
+#: ../src/compose.c:7719
 msgid "_Attachments"
 msgstr "Bilagor"
 
-#: ../src/compose.c:7729
+#: ../src/compose.c:7733
 msgid "Othe_rs"
 msgstr "Övriga"
 
-#: ../src/compose.c:7744 ../src/gtk/headers.h:18
-#: ../src/plugins/pdf_viewer/poppler_viewer.c:702 ../src/summary_search.c:440
-msgid "Subject:"
+#: ../src/compose.c:7748
+msgid "_Subject:"
 msgstr "Ämne:"
 
-#: ../src/compose.c:7966
+#: ../src/compose.c:7970
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2367,20 +2536,20 @@ msgstr ""
 "Felstavningsprogram kunde inte starta.\n"
 "%s"
 
-#: ../src/compose.c:8072
+#: ../src/compose.c:8076
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Från: <i>%s</i>"
 
-#: ../src/compose.c:8106
+#: ../src/compose.c:8119
 msgid "Account to use for this email"
 msgstr "Konto att använda för denna e-post"
 
-#: ../src/compose.c:8108
+#: ../src/compose.c:8121
 msgid "Sender address to be used"
 msgstr "Avsändaradress att användas"
 
-#: ../src/compose.c:8272
+#: ../src/compose.c:8285
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2389,64 +2558,68 @@ msgstr ""
 "Sekretesssystemet '%s' kan inte laddas. Du kommer inte att kunna signera "
 "eller kryptera detta meddelande."
 
-#: ../src/compose.c:8372 ../src/plugins/archive/archiver_gtk.c:1082
+#: ../src/compose.c:8385 ../src/plugins/archive/archiver_gtk.c:1083
 msgid "_None"
 msgstr "Ingen"
 
-#: ../src/compose.c:8473 ../src/prefs_template.c:753
+#: ../src/compose.c:8486 ../src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Mallens meddelandetext har ett fel på rad %d."
 
-#: ../src/compose.c:8589
+#: ../src/compose.c:8602
 msgid "Template From format error."
 msgstr "Fel i Från-mallformat."
 
-#: ../src/compose.c:8607
+#: ../src/compose.c:8620
 msgid "Template To format error."
 msgstr "Fel i Till-mallformat."
 
-#: ../src/compose.c:8625
+#: ../src/compose.c:8638
 msgid "Template Cc format error."
 msgstr "Fel i Kopia-mallformat."
 
-#: ../src/compose.c:8643
+#: ../src/compose.c:8656
 msgid "Template Bcc format error."
 msgstr "Fel i Blindkopia-mallformat."
 
-#: ../src/compose.c:8662
+#: ../src/compose.c:8674
+msgid "Template Reply-To format error."
+msgstr "Fel i malformat för Svara-Till."
+
+#: ../src/compose.c:8693
 msgid "Template subject format error."
 msgstr "Fel i Ärende-mallformat."
 
-#: ../src/compose.c:8930
+#: ../src/compose.c:8961
 msgid "Invalid MIME type."
 msgstr "Felaktig MIME-typ"
 
-#: ../src/compose.c:8945
+#: ../src/compose.c:8976
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: ../src/compose.c:9019
+#: ../src/compose.c:9050
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ../src/compose.c:9036
+#: ../src/compose.c:9067
 msgid "MIME type"
 msgstr "MIME-typ"
 
-#: ../src/compose.c:9077
+#: ../src/compose.c:9108
 msgid "Encoding"
 msgstr "Kodning"
 
-#: ../src/compose.c:9097
+#: ../src/compose.c:9128
 msgid "Path"
 msgstr "Sökväg"
 
-#: ../src/compose.c:9098
+#: ../src/compose.c:9129
 msgid "File name"
 msgstr "Filnamn"
 
-#: ../src/compose.c:9290
+#: ../src/compose.c:9321
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2457,17 +2630,17 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: ../src/compose.c:9685 ../src/messageview.c:1095
+#: ../src/compose.c:9716 ../src/messageview.c:1095
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 "Claws Mail behöver vara uppkopplad mot ett nätverk för att kunna skicka "
 "denna e-post."
 
-#: ../src/compose.c:9711
+#: ../src/compose.c:9742
 msgid "Could not queue message."
 msgstr "Kunde inte köa meddelandet."
 
-#: ../src/compose.c:9713
+#: ../src/compose.c:9744
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2478,15 +2651,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../src/compose.c:9891
+#: ../src/compose.c:9922
 msgid "Could not save draft."
 msgstr "Kunde inte spara utkast."
 
-#: ../src/compose.c:9895
+#: ../src/compose.c:9926
 msgid "Could not save draft"
 msgstr "Kunde inte spara utkast."
 
-#: ../src/compose.c:9896
+#: ../src/compose.c:9927
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2494,24 +2667,24 @@ msgstr ""
 "Kunde inte spara utkast.\n"
 "Vill du avbryta avsluta eller kasta denna e-post?"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Cancel exit"
 msgstr "_Avbryt avslutande"
 
-#: ../src/compose.c:9898
+#: ../src/compose.c:9929
 msgid "_Discard email"
 msgstr "_Överge e-post"
 
-#: ../src/compose.c:10058 ../src/compose.c:10072
+#: ../src/compose.c:10089 ../src/compose.c:10103
 msgid "Select file"
 msgstr "Välj fil"
 
-#: ../src/compose.c:10086
+#: ../src/compose.c:10117
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Filen '%s' kunde inte läsas."
 
-#: ../src/compose.c:10088
+#: ../src/compose.c:10119
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2520,63 +2693,63 @@ msgstr ""
 "Filen '%s' innehåller ogiltiga tecken\n"
 "för den aktuella teckenkodningen, inmatning kan bli fel."
 
-#: ../src/compose.c:10175
+#: ../src/compose.c:10206
 msgid "Discard message"
 msgstr "Överge meddelande"
 
-#: ../src/compose.c:10176
+#: ../src/compose.c:10207
 msgid "This message has been modified. Discard it?"
 msgstr "Detta meddelande har ändrats. Vill du överge det?"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Discard"
 msgstr "_Överge"
 
-#: ../src/compose.c:10177
+#: ../src/compose.c:10208
 msgid "_Save to Drafts"
 msgstr "_Spara till Utkast"
 
-#: ../src/compose.c:10179
+#: ../src/compose.c:10210
 msgid "Save changes"
 msgstr "Spara ändringar"
 
-#: ../src/compose.c:10180
+#: ../src/compose.c:10211
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Detta meddelande har ändrats. Vill du spara de senaste ändringarna?"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "_Don't save"
 msgstr "_Spara inte"
 
-#: ../src/compose.c:10181
+#: ../src/compose.c:10212
 msgid "+_Save to Drafts"
 msgstr "+_Spara till Utkast"
 
-#: ../src/compose.c:10251
+#: ../src/compose.c:10282
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Vill du använda mallen '%s' ?"
 
-#: ../src/compose.c:10253
+#: ../src/compose.c:10284
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: ../src/compose.c:10254 ../src/prefs_actions.c:329
+#: ../src/compose.c:10285 ../src/prefs_actions.c:329
 #: ../src/prefs_filtering_action.c:610 ../src/prefs_filtering.c:477
-#: ../src/prefs_matcher.c:772 ../src/prefs_template.c:309
+#: ../src/prefs_matcher.c:775 ../src/prefs_template.c:311
 #: ../src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: ../src/compose.c:10254
+#: ../src/compose.c:10285
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: ../src/compose.c:11141
+#: ../src/compose.c:11149
 msgid "Insert or attach?"
 msgstr "Infoga eller bifoga"
 
-#: ../src/compose.c:11142
+#: ../src/compose.c:11150
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2584,16 +2757,16 @@ msgstr ""
 "Vill du infoga innehållet i filen(-erna) i meddelandetexten, eller bifoga "
 "det till meddelandet?"
 
-#: ../src/compose.c:11144
+#: ../src/compose.c:11152
 msgid "_Attach"
 msgstr "Bifoga"
 
-#: ../src/compose.c:11361
+#: ../src/compose.c:11369
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Citatformatfel på rad %d."
 
-#: ../src/compose.c:11656
+#: ../src/compose.c:11664
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2852,15 +3025,15 @@ msgstr "Redigera mapp"
 msgid "Input the new name of folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
-#: ../src/editgroup.c:556 ../src/foldersel.c:581 ../src/imap_gtk.c:195
+#: ../src/editgroup.c:556 ../src/foldersel.c:585 ../src/imap_gtk.c:195
 #: ../src/mh_gtk.c:145 ../src/plugins/mailmbox/plugin_gtk.c:239
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:89
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: ../src/editgroup.c:557 ../src/foldersel.c:582 ../src/mh_gtk.c:146
+#: ../src/editgroup.c:557 ../src/foldersel.c:586 ../src/mh_gtk.c:146
 #: ../src/plugins/mailmbox/plugin_gtk.c:240
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:90
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -3201,7 +3374,7 @@ msgstr "Lägg til nytt vCard post"
 
 #: ../src/etpan/etpan-ssl.c:167
 msgid "Impossible to set the client certificate.\n"
-msgstr ""
+msgstr "Omöjligt att sätta klientcertifikatet.\n"
 
 #: ../src/exphtmldlg.c:106
 msgid "Please specify output directory and file to create."
@@ -3272,9 +3445,9 @@ msgstr "Stilmall"
 #. * can always get back the SummaryView pointer.
 #: ../src/exphtmldlg.c:453 ../src/gtk/colorlabel.c:406
 #: ../src/gtk/gtkaspell.c:1571 ../src/gtk/gtkaspell.c:2231
-#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1174
+#: ../src/gtk/menu.c:125 ../src/mainwindow.c:1177
 #: ../src/plugins/archive/archiver_prefs.c:241
-#: ../src/plugins/libravatar/libravatar_prefs.c:187 ../src/prefs_account.c:949
+#: ../src/plugins/libravatar/libravatar_prefs.c:206 ../src/prefs_account.c:949
 #: ../src/prefs_toolbar.c:780 ../src/prefs_toolbar.c:1465
 #: ../src/summaryview.c:6008
 msgid "None"
@@ -3286,7 +3459,7 @@ msgid "Default"
 msgstr "Standard"
 
 #: ../src/exphtmldlg.c:455 ../src/plugins/pgpcore/select-keys.c:244
-#: ../src/plugins/pgpcore/sgpgme.c:148
+#: ../src/plugins/pgpcore/sgpgme.c:148 ../src/plugins/pgpcore/sgpgme.c:164
 msgid "Full"
 msgstr "Fullst. namn"
 
@@ -3514,7 +3687,7 @@ msgstr "Exportera adressbok till LDIF-fil"
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: ../src/export.c:113 ../src/summaryview.c:8117
+#: ../src/export.c:113 ../src/summaryview.c:8120
 msgid "Export to mbox file"
 msgstr "Exportera till mbox-fil"
 
@@ -3551,7 +3724,7 @@ msgid "Full Name"
 msgstr "Fullst. namn"
 
 #: ../src/exporthtml.c:771 ../src/importldif.c:1022
-#: ../src/plugins/archive/archiver_gtk.c:736
+#: ../src/plugins/archive/archiver_gtk.c:737
 msgid "Attributes"
 msgstr "Användarattribut"
 
@@ -3595,7 +3768,7 @@ msgstr ""
 
 #: ../src/filtering.c:619 ../src/filtering.c:694 ../src/filtering.c:723
 msgid "rule is not account-based\n"
-msgstr ""
+msgstr "regeln är inte konto-baserad\n"
 
 #: ../src/filtering.c:623
 #, c-format
@@ -3603,18 +3776,22 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
 msgstr ""
+"regel är kontobaserad [id=%d, namn='%s'], matchar konto som för närvarande "
+"används för att ta emot meddelanden\n"
 
 #: ../src/filtering.c:625 ../src/filtering.c:642 ../src/filtering.c:643
 #: ../src/filtering.c:667 ../src/filtering.c:685 ../src/filtering.c:712
 #: ../src/filtering.c:713 ../src/filtering.c:730 ../src/filtering.c:731
 msgid "NON_EXISTENT"
-msgstr ""
+msgstr "ICKE_EXISTERANDE"
 
 #: ../src/filtering.c:633
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
+"regeln är konto-baserad, men matchar inte kontot som för närvarande används "
+"för att ta emot meddelanden\n"
 
 #: ../src/filtering.c:640
 #, c-format
@@ -3622,11 +3799,15 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
 msgstr ""
+"regel är kontobaserad [id=%d, namn='%s'], matchar inte kontot som för "
+"närvarande används för att ta emot meddelanden [id=%d, namn='%s']\n"
 
 #: ../src/filtering.c:659
 msgid ""
 "rule is not account-based, all rules are applied on user request anyway\n"
 msgstr ""
+"regeln är inte kontobaserad, alla regler appliceras på användarförfrågningar "
+"hursomhelst\n"
 
 #: ../src/filtering.c:665
 #, c-format
@@ -3634,15 +3815,19 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
 "request\n"
 msgstr ""
+"regel är kontobaserad [id=%d, namn='%s'], men alla regler appliceras enligt "
+"användarens önskemål\n"
 
 #: ../src/filtering.c:683
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
+"regel är kontobaserad [id=%d, namn='%s'], hoppar över enligt användarens "
+"önskemål\n"
 
 #: ../src/filtering.c:688
 msgid "rule is account-based, skipped on user request\n"
-msgstr ""
+msgstr "regel är kontobaserad, hoppar över enligt användarens önskemål\n"
 
 #: ../src/filtering.c:710
 #, c-format
@@ -3650,10 +3835,12 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching current account [id="
 "%d, name='%s']\n"
 msgstr ""
+"regel är kontobaserad [id=%d, namn='%s'], matchar inte aktuellt konto [id="
+"%d, namn='%s']\n"
 
 #: ../src/filtering.c:716
 msgid "rule is account-based, not matching current account\n"
-msgstr ""
+msgstr "regel är kontobaserad, och matcher inte aktuellt konto\n"
 
 #: ../src/filtering.c:728
 #, c-format
@@ -3661,70 +3848,65 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], current account [id=%d, "
 "name='%s']\n"
 msgstr ""
+"regel är kontobaserad [id=%d, namn='%s'], aktuellt konto [id=%d, namn='%s']\n"
 
 #: ../src/filtering.c:768
 #, c-format
 msgid "applying action [ %s ]\n"
-msgstr ""
+msgstr "tillämpar åtgärd [ %s ]\n"
 
 #: ../src/filtering.c:773
 msgid "action could not apply\n"
-msgstr ""
+msgstr "åtgärden kunde inte tillämpas\n"
 
 #: ../src/filtering.c:775
 #, c-format
 msgid "no further processing after action [ %s ]\n"
-msgstr ""
+msgstr "ingen fortsatt behandling efter handling [ %s ]\n"
 
 #: ../src/filtering.c:826
-#, fuzzy, c-format
+#, c-format
 msgid "processing rule '%s' [ %s ]\n"
-msgstr "Kör behandlingsregler"
+msgstr "behandlingsregel '%s' [ %s ]\n"
 
 #: ../src/filtering.c:830
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "behandlar regel <ej namngiven> [ %s ]\n"
 
 #: ../src/filtering.c:848
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
-msgstr ""
+msgstr "inaktiverade regel '%s' [ %s ]\n"
 
 #: ../src/filtering.c:852
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "inaktiverade regel <ej namngiven> [ %s ]\n"
 
 #: ../src/filtering.c:890
-#, fuzzy
 msgid "undetermined"
-msgstr "Odefinierad"
+msgstr "obestämd"
 
 #: ../src/filtering.c:894
-#, fuzzy
 msgid "incorporation"
-msgstr "filtrering vid införlivande"
+msgstr "införlivande"
 
 #: ../src/filtering.c:898
-#, fuzzy
 msgid "manually"
-msgstr "_Manual"
+msgstr "manuellt"
 
 #: ../src/filtering.c:902
-#, fuzzy
 msgid "folder processing"
-msgstr "Kör behandlingsregler för mappen"
+msgstr "mappbehandling"
 
 #: ../src/filtering.c:906
-#, fuzzy
 msgid "pre-processing"
-msgstr "Förbehandla..."
+msgstr "förbehandling"
 
 #: ../src/filtering.c:910
-#, fuzzy
 msgid "post-processing"
-msgstr "Efterbehandla..."
+msgstr "efterbehandling"
 
 #: ../src/filtering.c:927
 #, c-format
@@ -3736,10 +3918,16 @@ msgid ""
 "%s%s %s\n"
 "%s%s %s\n"
 msgstr ""
+"filtrerar meddelande (%s%s%s)\n"
+"%smeddelandefil: %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
 
 #: ../src/filtering.c:929 ../src/filtering.c:938
 msgid ": "
-msgstr ""
+msgstr ": "
 
 #: ../src/filtering.c:936
 #, c-format
@@ -3747,6 +3935,8 @@ msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
 msgstr ""
+"filtrerar meddelande (%s%s%s)\n"
+"%smeddelandefil: %s\n"
 
 #: ../src/folder.c:1564 ../src/foldersel.c:403 ../src/prefs_folder_item.c:306
 msgid "Inbox"
@@ -3804,38 +3994,37 @@ msgstr "Synkroniserar %s för frånkopplad användning...\n"
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: ../src/foldersel.c:583 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
+#: ../src/foldersel.c:587 ../src/imap_gtk.c:199 ../src/mh_gtk.c:147
 #: ../src/plugins/mailmbox/plugin_gtk.c:241
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "NewFolder"
 msgstr "Nymapp"
 
-#: ../src/foldersel.c:591 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
+#: ../src/foldersel.c:595 ../src/imap_gtk.c:210 ../src/imap_gtk.c:216
 #: ../src/imap_gtk.c:272 ../src/imap_gtk.c:277 ../src/mh_gtk.c:155
 #: ../src/mh_gtk.c:259 ../src/news_gtk.c:315
 #: ../src/plugins/mailmbox/plugin_gtk.c:249
 #: ../src/plugins/mailmbox/plugin_gtk.c:416
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:97
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:339
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
 #: ../src/plugins/vcalendar/vcal_folder.c:2040
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "Ett mappnamn kan inte innehålla '%c'."
 
-#: ../src/foldersel.c:601 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
+#: ../src/foldersel.c:605 ../src/imap_gtk.c:226 ../src/imap_gtk.c:284
 #: ../src/mh_gtk.c:165 ../src/mh_gtk.c:266 ../src/news_gtk.c:322
 #: ../src/plugins/mailmbox/plugin_gtk.c:261
 #: ../src/plugins/mailmbox/plugin_gtk.c:425
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:107
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:346
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:211
 #: ../src/plugins/vcalendar/vcal_folder.c:2047
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Mappen '%s' finns redan."
 
-#: ../src/foldersel.c:608 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
+#: ../src/foldersel.c:612 ../src/imap_gtk.c:232 ../src/mh_gtk.c:171
 #: ../src/plugins/mailmbox/plugin_gtk.c:268
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:113
+#: ../src/plugins/rssyl/opml_import.c:91
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:121
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Kan inte skapa mappen '%s'."
@@ -3848,7 +4037,7 @@ msgstr "_Markera alla som lästa"
 msgid "R_un processing rules"
 msgstr "Kör behandlingsregler"
 
-#: ../src/folderview.c:233 ../src/mainwindow.c:544
+#: ../src/folderview.c:233 ../src/mainwindow.c:546
 msgid "_Search folder..."
 msgstr "_Sök i mapp..."
 
@@ -3867,7 +4056,7 @@ msgstr "Skicka köade..."
 #. F_COL_FOLDER
 #: ../src/folderview.c:380 ../src/folderview.c:427
 #: ../src/plugins/notification/notification_lcdproc.c:141
-#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:388
+#: ../src/prefs_folder_column.c:79 ../src/prefs_matcher.c:391
 #: ../src/summaryview.c:6284
 msgid "New"
 msgstr "Ny(a)"
@@ -3875,7 +4064,7 @@ msgstr "Ny(a)"
 #. F_COL_NEW
 #: ../src/folderview.c:381 ../src/folderview.c:428
 #: ../src/plugins/notification/notification_lcdproc.c:145
-#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:387
+#: ../src/prefs_folder_column.c:80 ../src/prefs_matcher.c:390
 #: ../src/summaryview.c:6286
 msgid "Unread"
 msgstr "Oläst(a)"
@@ -3897,21 +4086,21 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: ../src/folderview.c:823 ../src/summaryview.c:4117 ../src/summaryview.c:4119
+#: ../src/folderview.c:823 ../src/summaryview.c:4119 ../src/summaryview.c:4121
 msgid "Mark all as read"
 msgstr "Markera alla som lästa"
 
-#: ../src/folderview.c:824 ../src/summaryview.c:4118
+#: ../src/folderview.c:824 ../src/summaryview.c:4120
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Vill du verkligen markera alla meddelanden i denna mapp som lästa?"
 
-#: ../src/folderview.c:982 ../src/imap.c:4528 ../src/mainwindow.c:5134
+#: ../src/folderview.c:982 ../src/imap.c:4574 ../src/mainwindow.c:5157
 #: ../src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Avsöker mapp %s%c%s..."
 
-#: ../src/folderview.c:986 ../src/imap.c:4533 ../src/mainwindow.c:5139
+#: ../src/folderview.c:986 ../src/imap.c:4579 ../src/mainwindow.c:5162
 #: ../src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
@@ -3945,60 +4134,60 @@ msgstr "Kunde inte genomsöka mapp %s\n"
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelande i alla mappar..."
 
-#: ../src/folderview.c:2005
+#: ../src/folderview.c:2046
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Stänger mapp %s..."
 
 #. Open Folder
 #. TODO: wwp: avoid displaying (null) in the status bar
-#: ../src/folderview.c:2100
+#: ../src/folderview.c:2141
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Öppnar mapp %s..."
 
-#: ../src/folderview.c:2118
+#: ../src/folderview.c:2159
 msgid "Folder could not be opened."
 msgstr "Mappen kunde inte öppnas."
 
-#: ../src/folderview.c:2261 ../src/mainwindow.c:2877 ../src/mainwindow.c:2881
+#: ../src/folderview.c:2302 ../src/mainwindow.c:2887 ../src/mainwindow.c:2891
 msgid "Empty trash"
 msgstr "Töm papperskorg"
 
-#: ../src/folderview.c:2262
+#: ../src/folderview.c:2303
 msgid "Delete all messages in trash?"
 msgstr "Ta bort alla meddelande från papperskorgen?"
 
-#: ../src/folderview.c:2263
+#: ../src/folderview.c:2304
 msgid "+_Empty trash"
 msgstr "+_Töm papperskorg"
 
-#: ../src/folderview.c:2307 ../src/inc.c:1540 ../src/toolbar.c:2607
+#: ../src/folderview.c:2348 ../src/inc.c:1540 ../src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Varning om frånkopplat läge"
 
-#: ../src/folderview.c:2308 ../src/toolbar.c:2608
+#: ../src/folderview.c:2349 ../src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Du arbetar frånkopplad. Åsidosätta?"
 
-#: ../src/folderview.c:2319 ../src/toolbar.c:2627
+#: ../src/folderview.c:2360 ../src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Skicka köade meddelanden"
 
-#: ../src/folderview.c:2320 ../src/toolbar.c:2628
+#: ../src/folderview.c:2361 ../src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Skicka alla köade meddelanden?"
 
-#: ../src/folderview.c:2321 ../src/messageview.c:854 ../src/messageview.c:871
+#: ../src/folderview.c:2362 ../src/messageview.c:854 ../src/messageview.c:871
 #: ../src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Skicka"
 
-#: ../src/folderview.c:2329 ../src/toolbar.c:2647
+#: ../src/folderview.c:2370 ../src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Några fel uppstod vid avsändande av meddelanden i kö."
 
-#: ../src/folderview.c:2332 ../src/main.c:2714 ../src/toolbar.c:2650
+#: ../src/folderview.c:2373 ../src/main.c:2714 ../src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4007,65 +4196,65 @@ msgstr ""
 "Några fel uppstod vid skickande av köade meddelanden:\n"
 "%s"
 
-#: ../src/folderview.c:2409
+#: ../src/folderview.c:2450
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Vill du verkligen kopiera mappen '%s' i '%s'?"
 
-#: ../src/folderview.c:2410
+#: ../src/folderview.c:2451
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Vill du verkligen göra mappen '%s' till en undermapp till '%s' ?"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Copy folder"
 msgstr "Kopiera mapp"
 
-#: ../src/folderview.c:2412
+#: ../src/folderview.c:2453
 msgid "Move folder"
 msgstr "Flytta mapp"
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopiera %s till %s..."
 
-#: ../src/folderview.c:2423
+#: ../src/folderview.c:2464
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Flyttar %s till %s..."
 
-#: ../src/folderview.c:2454
+#: ../src/folderview.c:2495
 msgid "Source and destination are the same."
 msgstr "Källa och destination är de samma."
 
-#: ../src/folderview.c:2457
+#: ../src/folderview.c:2498
 msgid "Can't copy a folder to one of its children."
 msgstr "Kan inte kopiera en mapp till ett av dess barn."
 
-#: ../src/folderview.c:2458
+#: ../src/folderview.c:2499
 msgid "Can't move a folder to one of its children."
 msgstr "Kan inte flytta en mapp till ett av dess barn."
 
-#: ../src/folderview.c:2461
+#: ../src/folderview.c:2502
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "En mapp kan inte flyttas mellan olika brevlådor."
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Copy failed!"
 msgstr "Kopiering misslyckades!"
 
-#: ../src/folderview.c:2464
+#: ../src/folderview.c:2505
 msgid "Move failed!"
 msgstr "Flytt misslyckades!"
 
-#: ../src/folderview.c:2515
+#: ../src/folderview.c:2556
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Behandlar konfiguration för mappen %s"
 
-#: ../src/folderview.c:2943 ../src/summaryview.c:4558
-#: ../src/summaryview.c:4657
+#: ../src/folderview.c:2984 ../src/summaryview.c:4560
+#: ../src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Destinationsmappen kan bara användas till att spara undermappar."
 
@@ -4612,92 +4801,91 @@ msgstr ""
 
 #: ../src/gtk/gtkutils.c:1907
 msgid "Failed."
-msgstr ""
+msgstr "Misslyckades."
 
 #: ../src/gtk/gtkutils.c:1970
-#, fuzzy
 msgid "Configuring..."
-msgstr "_Konfiguration"
+msgstr "Konfigurerar..."
 
 #. RFC2822
 #. S_COL_TO
 #. date expression
 #. S_COL_TO
-#: ../src/gtk/headers.h:8 ../src/prefs_filtering_action.c:1259
-#: ../src/prefs_matcher.c:2158 ../src/prefs_summary_column.c:84
+#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1259
+#: ../src/prefs_matcher.c:2174 ../src/prefs_summary_column.c:84
 #: ../src/quote_fmt.c:49 ../src/summaryview.c:444
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/gtk/headers.h:8
+#: ../src/gtk/headers.h:9
 msgid "Date:"
 msgstr "Datum:"
 
 #. S_COL_SUBJECT
 #. date
 #. S_COL_SUBJECT
-#: ../src/gtk/headers.h:9 ../src/prefs_filtering_action.c:1256
-#: ../src/prefs_matcher.c:2155 ../src/prefs_summary_column.c:82
+#: ../src/gtk/headers.h:10 ../src/prefs_filtering_action.c:1256
+#: ../src/prefs_matcher.c:2171 ../src/prefs_summary_column.c:82
 #: ../src/quote_fmt.c:50 ../src/summaryview.c:442
 msgid "From"
 msgstr "Från"
 
-#: ../src/gtk/headers.h:9 ../src/summary_search.c:426
+#: ../src/gtk/headers.h:10 ../src/summary_search.c:426
 msgid "From:"
 msgstr "Från:"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender"
 msgstr "Avsändare"
 
-#: ../src/gtk/headers.h:10
+#: ../src/gtk/headers.h:11
 msgid "Sender:"
 msgstr "Avsändare:"
 
-#: ../src/gtk/headers.h:11
+#: ../src/gtk/headers.h:12
 msgid "Reply-To"
 msgstr "Svara till"
 
 #. S_COL_FROM
 #. subject
 #. S_COL_FROM
-#: ../src/gtk/headers.h:12 ../src/prefs_filtering_action.c:1257
-#: ../src/prefs_matcher.c:2156 ../src/prefs_summary_column.c:83
+#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1257
+#: ../src/prefs_matcher.c:2172 ../src/prefs_summary_column.c:83
 #: ../src/quote_fmt.c:57 ../src/summaryview.c:443
 msgid "To"
 msgstr "Till"
 
 #. to
-#: ../src/gtk/headers.h:13 ../src/prefs_filtering_action.c:1258
-#: ../src/prefs_matcher.c:2157 ../src/quote_fmt.c:58
+#: ../src/gtk/headers.h:14 ../src/prefs_filtering_action.c:1258
+#: ../src/prefs_matcher.c:2173 ../src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Kopia"
 
-#: ../src/gtk/headers.h:14
+#: ../src/gtk/headers.h:15
 msgid "Bcc"
 msgstr "Blindkopia"
 
 #. references
-#: ../src/gtk/headers.h:15 ../src/prefs_filtering_action.c:1260
-#: ../src/prefs_matcher.c:2159 ../src/quote_fmt.c:61
+#: ../src/gtk/headers.h:16 ../src/prefs_filtering_action.c:1260
+#: ../src/prefs_matcher.c:2175 ../src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Meddelande-ID"
 
-#: ../src/gtk/headers.h:15
+#: ../src/gtk/headers.h:16
 msgid "Message-ID:"
 msgstr "Meddelande-ID:"
 
-#: ../src/gtk/headers.h:16
+#: ../src/gtk/headers.h:17
 msgid "In-Reply-To"
 msgstr "Svar-På"
 
 #. newsgroups
-#: ../src/gtk/headers.h:17 ../src/prefs_filtering_action.c:1262
-#: ../src/prefs_matcher.c:2161 ../src/quote_fmt.c:60
+#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1262
+#: ../src/prefs_matcher.c:2177 ../src/quote_fmt.c:60
 msgid "References"
 msgstr "Referenser"
 
-#: ../src/gtk/headers.h:17
+#: ../src/gtk/headers.h:18
 msgid "References:"
 msgstr "Referenser:"
 
@@ -4705,328 +4893,333 @@ msgstr "Referenser:"
 #. initial of sender
 #. S_COL_STATUS
 #. S_COL_MIME
-#: ../src/gtk/headers.h:18 ../src/prefs_filtering_action.c:1255
-#: ../src/prefs_matcher.c:2154 ../src/prefs_summary_column.c:81
+#: ../src/gtk/headers.h:19 ../src/prefs_filtering_action.c:1255
+#: ../src/prefs_matcher.c:2170 ../src/prefs_summary_column.c:81
 #: ../src/quote_fmt.c:56 ../src/summaryview.c:441
 msgid "Subject"
 msgstr "Ämne"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:19 ../src/plugins/pdf_viewer/poppler_viewer.c:702
+#: ../src/summary_search.c:440
+msgid "Subject:"
+msgstr "Ämne:"
+
+#: ../src/gtk/headers.h:20
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: ../src/gtk/headers.h:19
+#: ../src/gtk/headers.h:20
 msgid "Comments:"
 msgstr "Kommando:"
 
-#: ../src/gtk/headers.h:20
+#: ../src/gtk/headers.h:21
 msgid "Keywords"
 msgstr "Nyckelord"
 
-#: ../src/gtk/headers.h:20 ../src/plugins/pdf_viewer/poppler_viewer.c:704
+#: ../src/gtk/headers.h:21 ../src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Keywords:"
 msgstr "Nyckelord:"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date"
 msgstr "Återsänt-Datum"
 
-#: ../src/gtk/headers.h:21
+#: ../src/gtk/headers.h:22
 msgid "Resent-Date:"
 msgstr "Återsänt-Datum:"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From"
 msgstr "Återsänt-Från"
 
-#: ../src/gtk/headers.h:22
+#: ../src/gtk/headers.h:23
 msgid "Resent-From:"
 msgstr "Återsänt-Från:"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender"
 msgstr "Återsänt-Avsändare"
 
-#: ../src/gtk/headers.h:23
+#: ../src/gtk/headers.h:24
 msgid "Resent-Sender:"
 msgstr "Återsänt-Avsändare:"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To"
 msgstr "Återsänt-Till"
 
-#: ../src/gtk/headers.h:24
+#: ../src/gtk/headers.h:25
 msgid "Resent-To:"
 msgstr "Återsänt-Till:"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc"
 msgstr "Återsänt-Kopia"
 
-#: ../src/gtk/headers.h:25
+#: ../src/gtk/headers.h:26
 msgid "Resent-Cc:"
 msgstr "Återsänt-Kopia:"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc"
 msgstr "Återsänt-Blindkopia"
 
-#: ../src/gtk/headers.h:26
+#: ../src/gtk/headers.h:27
 msgid "Resent-Bcc:"
 msgstr "Återsänt-Blindkopia:"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID"
 msgstr "Återsänt-Meddelande-ID"
 
-#: ../src/gtk/headers.h:27
+#: ../src/gtk/headers.h:28
 msgid "Resent-Message-ID:"
 msgstr "Återsänt-Meddelande-ID"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path"
 msgstr "Returväg"
 
-#: ../src/gtk/headers.h:28
+#: ../src/gtk/headers.h:29
 msgid "Return-Path:"
 msgstr "Returväg:"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received"
 msgstr "Mottaget"
 
-#: ../src/gtk/headers.h:29
+#: ../src/gtk/headers.h:30
 msgid "Received:"
 msgstr "Mottaget:"
 
 #. more
 #. cc
-#: ../src/gtk/headers.h:32 ../src/prefs_filtering_action.c:1261
-#: ../src/prefs_matcher.c:2160 ../src/quote_fmt.c:59
+#: ../src/gtk/headers.h:33 ../src/prefs_filtering_action.c:1261
+#: ../src/prefs_matcher.c:2176 ../src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Diskussionsgrupper"
 
-#: ../src/gtk/headers.h:33
+#: ../src/gtk/headers.h:34
 msgid "Followup-To"
 msgstr "Uppföljning Till"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To"
 msgstr "Levererad-Till"
 
-#: ../src/gtk/headers.h:34
+#: ../src/gtk/headers.h:35
 msgid "Delivered-To:"
 msgstr "Levererad-Till:"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen"
 msgstr "Seen"
 
-#: ../src/gtk/headers.h:35
+#: ../src/gtk/headers.h:36
 msgid "Seen:"
 msgstr "Seen:"
 
 #. S_COL_MARK
-#: ../src/gtk/headers.h:36 ../src/gtk/progressdialog.c:149
+#: ../src/gtk/headers.h:37 ../src/gtk/progressdialog.c:149
 #: ../src/gtk/sslcertwindow.c:164 ../src/prefs_summary_column.c:79
 #: ../src/summaryview.c:2793
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtk/headers.h:36 ../src/prefs_themes.c:906
+#: ../src/gtk/headers.h:37 ../src/prefs_themes.c:906
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face"
 msgstr "Ansikte"
 
-#: ../src/gtk/headers.h:37
+#: ../src/gtk/headers.h:38
 msgid "Face:"
 msgstr "Ansikte:"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To"
 msgstr "Disposition-Notification-To"
 
-#: ../src/gtk/headers.h:38
+#: ../src/gtk/headers.h:39
 msgid "Disposition-Notification-To:"
 msgstr "Disposition-Notification-To:"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To"
 msgstr "Läskvitto-Till"
 
-#: ../src/gtk/headers.h:39
+#: ../src/gtk/headers.h:40
 msgid "Return-Receipt-To:"
 msgstr "Läskvitto-Till:"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent"
 msgstr "Användarprogram"
 
-#: ../src/gtk/headers.h:40
+#: ../src/gtk/headers.h:41
 msgid "User-Agent:"
 msgstr "Användarprogram:"
 
-#: ../src/gtk/headers.h:41
+#: ../src/gtk/headers.h:42
 msgid "Content-Type"
 msgstr "Innehållstyp"
 
-#: ../src/gtk/headers.h:41 ../src/image_viewer.c:327
+#: ../src/gtk/headers.h:42 ../src/image_viewer.c:327
 msgid "Content-Type:"
 msgstr "Innehållstyp:"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding"
 msgstr "Överföringskodning"
 
-#: ../src/gtk/headers.h:42
+#: ../src/gtk/headers.h:43
 msgid "Content-Transfer-Encoding:"
 msgstr "Överföringskodning:"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version"
 msgstr "MIME-version"
 
-#: ../src/gtk/headers.h:43
+#: ../src/gtk/headers.h:44
 msgid "MIME-Version:"
 msgstr "MIME-version:"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence"
 msgstr "Företräde"
 
-#: ../src/gtk/headers.h:44
+#: ../src/gtk/headers.h:45
 msgid "Precedence:"
 msgstr "Företräde:"
 
-#: ../src/gtk/headers.h:45 ../src/prefs_account.c:1073
+#: ../src/gtk/headers.h:46 ../src/prefs_account.c:1073
 msgid "Organization"
 msgstr "Organisation"
 
-#: ../src/gtk/headers.h:45
+#: ../src/gtk/headers.h:46
 msgid "Organization:"
 msgstr "Organisation: "
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List"
 msgstr "Sändlista"
 
-#: ../src/gtk/headers.h:47
+#: ../src/gtk/headers.h:48
 msgid "Mailing-List:"
 msgstr "Sändlista:"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post"
 msgstr "Sändlista-Posta"
 
-#: ../src/gtk/headers.h:48
+#: ../src/gtk/headers.h:49
 msgid "List-Post:"
 msgstr "Sändlista-Posta"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe"
 msgstr "Sändlista-Prenumerera"
 
-#: ../src/gtk/headers.h:49
+#: ../src/gtk/headers.h:50
 msgid "List-Subscribe:"
 msgstr "Sändlista-Prenumerera:"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe"
 msgstr "Sändlista-Säg-Upp-Prenumation"
 
-#: ../src/gtk/headers.h:50
+#: ../src/gtk/headers.h:51
 msgid "List-Unsubscribe:"
 msgstr "Sändlista-Säg-Upp-Prenumation:"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help"
 msgstr "Sändlista-Hjälp"
 
-#: ../src/gtk/headers.h:51
+#: ../src/gtk/headers.h:52
 msgid "List-Help:"
 msgstr "Sändlista-Hjälp:"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive"
 msgstr "Sändlista-Arkiv"
 
-#: ../src/gtk/headers.h:52
+#: ../src/gtk/headers.h:53
 msgid "List-Archive:"
 msgstr "Sändlista-Arkiv:"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner"
 msgstr "List-Ägare"
 
-#: ../src/gtk/headers.h:53
+#: ../src/gtk/headers.h:54
 msgid "List-Owner:"
 msgstr "List-Ägare:"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label"
 msgstr "X-Label"
 
-#: ../src/gtk/headers.h:55
+#: ../src/gtk/headers.h:56
 msgid "X-Label:"
 msgstr "X-Label:"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer"
 msgstr "X-Mailer"
 
-#: ../src/gtk/headers.h:56
+#: ../src/gtk/headers.h:57
 msgid "X-Mailer:"
 msgstr "X-Mailer:"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status"
 msgstr "X-Status"
 
-#: ../src/gtk/headers.h:57
+#: ../src/gtk/headers.h:58
 msgid "X-Status:"
 msgstr "X-Status:"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face"
 msgstr "X-Ansikte"
 
-#: ../src/gtk/headers.h:58
+#: ../src/gtk/headers.h:59
 msgid "X-Face:"
 msgstr "X-Ansikte:"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive"
 msgstr "X-No-Archive"
 
-#: ../src/gtk/headers.h:59
+#: ../src/gtk/headers.h:60
 msgid "X-No-Archive:"
 msgstr "X-No-Archive:"
 
 #. some common logical names referring to real header names
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to"
 msgstr "I svar till"
 
-#: ../src/gtk/headers.h:62
+#: ../src/gtk/headers.h:63
 msgid "In reply to:"
 msgstr "I svar till:"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc"
 msgstr "Till eller kopia"
 
-#: ../src/gtk/headers.h:63
+#: ../src/gtk/headers.h:64
 msgid "To or Cc:"
 msgstr "Till eller kopia:"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject"
 msgstr "Från, Till eller Ämne"
 
-#: ../src/gtk/headers.h:64
+#: ../src/gtk/headers.h:65
 msgid "From, To or Subject:"
 msgstr "Från, Till eller Ämne:"
 
@@ -5215,10 +5408,10 @@ msgstr ""
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:457
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:400
 #: ../src/plugins/clamd/clamav_plugin_gtk.c:550
-#: ../src/plugins/fancy/fancy_prefs.c:109
+#: ../src/plugins/fancy/fancy_prefs.c:114
 #: ../src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:178
 #: ../src/plugins/gdata/cm_gdata_prefs.c:145
-#: ../src/plugins/libravatar/libravatar_prefs.c:399
+#: ../src/plugins/libravatar/libravatar_prefs.c:439
 #: ../src/plugins/notification/notification_prefs.c:396
 #: ../src/plugins/notification/notification_prefs.c:410
 #: ../src/plugins/notification/notification_prefs.c:428
@@ -5228,9 +5421,9 @@ msgstr ""
 #: ../src/plugins/notification/notification_prefs.c:496
 #: ../src/plugins/notification/notification_prefs.c:513
 #: ../src/plugins/pgpcore/prefs_gpg.c:569
-#: ../src/plugins/rssyl/rssyl_prefs.c:65
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
+#: ../src/plugins/rssyl/rssyl_prefs.c:69
 #: ../src/plugins/spam_report/spam_report_prefs.c:79
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:648
 #: ../src/plugins/vcalendar/vcal_prefs.c:680 ../src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Insticksmoduler"
@@ -5272,7 +5465,7 @@ msgstr "Inlästa insticksmoduler"
 msgid "Page Index"
 msgstr "Sidindex"
 
-#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:828
+#: ../src/gtk/progressdialog.c:91 ../src/mainwindow.c:831
 msgid "_Hide"
 msgstr "_Dölj"
 
@@ -5285,70 +5478,74 @@ msgstr "_Dölj"
 msgid "Account"
 msgstr "Konto"
 
-#: ../src/gtk/quicksearch.c:452
+#: ../src/gtk/quicksearch.c:451
 msgid "all messages"
 msgstr "alla meddelanden"
 
-#: ../src/gtk/quicksearch.c:453
+#: ../src/gtk/quicksearch.c:452
 msgid "messages whose age is greater than # days"
 msgstr "meddelanden som är äldre än # dagar"
 
-#: ../src/gtk/quicksearch.c:454
+#: ../src/gtk/quicksearch.c:453
 msgid "messages whose age is less than # days"
 msgstr "meddelanden som är yngre än # dagar"
 
-#: ../src/gtk/quicksearch.c:455
+#: ../src/gtk/quicksearch.c:454
 msgid "messages whose age is greater than # hours"
 msgstr "meddelanden som är äldre än # timmar"
 
-#: ../src/gtk/quicksearch.c:456
+#: ../src/gtk/quicksearch.c:455
 msgid "messages whose age is less than # hours"
 msgstr "meddelanden som är yngre än # timmar"
 
-#: ../src/gtk/quicksearch.c:457
+#: ../src/gtk/quicksearch.c:456
 msgid "messages which contain S in the message body"
 msgstr "meddelanden som innehåller S i meddelandetexten"
 
-#: ../src/gtk/quicksearch.c:458
+#: ../src/gtk/quicksearch.c:457
 msgid "messages which contain S in the whole message"
 msgstr "meddelanden som innehåller S i hela meddelandet"
 
-#: ../src/gtk/quicksearch.c:459
+#: ../src/gtk/quicksearch.c:458
 msgid "messages carbon-copied to S"
 msgstr "meddelanden som skickats som kopia till S"
 
-#: ../src/gtk/quicksearch.c:460
+#: ../src/gtk/quicksearch.c:459
 msgid "message is either to: or cc: to S"
 msgstr "meddelanden är antingen till: eller kopia: S"
 
-#: ../src/gtk/quicksearch.c:461
+#: ../src/gtk/quicksearch.c:460
 msgid "deleted messages"
 msgstr "borttagna meddelanden"
 
 #. * how I can filter deleted messages *
-#: ../src/gtk/quicksearch.c:462
+#: ../src/gtk/quicksearch.c:461
 msgid "messages which contain S in the Sender field"
 msgstr "meddelanden som innehåller S i avsändaren"
 
-#: ../src/gtk/quicksearch.c:463
+#: ../src/gtk/quicksearch.c:462
 msgid "true if execute \"S\" succeeds"
 msgstr "sant om \"S\" gick bra att exekvera"
 
-#: ../src/gtk/quicksearch.c:464
+#: ../src/gtk/quicksearch.c:463
 msgid "messages originating from user S"
 msgstr "meddelanden med avsändaren S"
 
-#: ../src/gtk/quicksearch.c:465
+#: ../src/gtk/quicksearch.c:464
 msgid "forwarded messages"
 msgstr "vidarebefordrade meddelanden"
 
-#: ../src/gtk/quicksearch.c:466
+#: ../src/gtk/quicksearch.c:465
 msgid "messages which have attachments"
 msgstr "meddelanden som har bifogade filer"
 
+#: ../src/gtk/quicksearch.c:466
+msgid "messages which contain S in any header name or value"
+msgstr "meddelanden som innehåller S i namn eller värde i något brevhuvud"
+
 #: ../src/gtk/quicksearch.c:467
-msgid "messages which contain header S"
-msgstr "meddelanden som innehåller brevhuvudet S"
+msgid "messages which contain S in the value of any header"
+msgstr "meddelanden som innehåller S i värdet i något brevhuvud"
 
 #: ../src/gtk/quicksearch.c:468
 msgid "messages which contain S in Message-ID header"
@@ -5538,7 +5735,7 @@ msgstr "_Redigera"
 
 #: ../src/gtk/quicksearch.c:819 ../src/gtk/quicksearch.c:834
 #: ../src/prefs_actions.c:347 ../src/prefs_filtering.c:495
-#: ../src/prefs_template.c:328
+#: ../src/prefs_template.c:330
 msgid "C_lear"
 msgstr "Töm"
 
@@ -5690,8 +5887,8 @@ msgstr "Etiketter:"
 #: ../src/plugins/notification/notification_popup.c:316
 #: ../src/plugins/notification/notification_popup.c:621
 #: ../src/plugins/notification/notification_trayicon.c:851
-#: ../src/summaryview.c:3351 ../src/summaryview.c:3369
-#: ../src/summaryview.c:3390
+#: ../src/summaryview.c:3353 ../src/summaryview.c:3371
+#: ../src/summaryview.c:3392
 msgid "(No From)"
 msgstr "(Ingen avsändare)"
 
@@ -5699,7 +5896,7 @@ msgstr "(Ingen avsändare)"
 #: ../src/plugins/notification/notification_popup.c:318
 #: ../src/plugins/notification/notification_popup.c:625
 #: ../src/plugins/notification/notification_trayicon.c:854
-#: ../src/summaryview.c:3403 ../src/summaryview.c:3407
+#: ../src/summaryview.c:3405 ../src/summaryview.c:3409
 msgid "(No Subject)"
 msgstr "(Inget ämne)"
 
@@ -5707,7 +5904,7 @@ msgstr "(Inget ämne)"
 msgid "Error:"
 msgstr "Fel:"
 
-#: ../src/image_viewer.c:299 ../src/mimeview.c:2544
+#: ../src/image_viewer.c:299 ../src/mimeview.c:2545
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:698
 msgid "Filename:"
 msgstr "Filnamn:"
@@ -5720,31 +5917,31 @@ msgstr "Filstorlek:"
 msgid "Load Image"
 msgstr "Ladda bild"
 
-#: ../src/imap.c:577
+#: ../src/imap.c:583
 msgid "IMAP4 connection broken\n"
 msgstr "IMAP4-förbindelse bruten\n"
 
-#: ../src/imap.c:616
+#: ../src/imap.c:622
 #, c-format
 msgid "IMAP error on %s: authenticated\n"
 msgstr "IMAP-fel vid %s: autentiserad\n"
 
-#: ../src/imap.c:619
+#: ../src/imap.c:625
 #, c-format
 msgid "IMAP error on %s: not authenticated\n"
 msgstr "IMAP-fel vid %s: icke autentiserad\n"
 
-#: ../src/imap.c:622
+#: ../src/imap.c:628
 #, c-format
 msgid "IMAP error on %s: bad state\n"
 msgstr "IMAP-fel vid %s: dåligt tillstånd\n"
 
-#: ../src/imap.c:625
+#: ../src/imap.c:631
 #, c-format
 msgid "IMAP error on %s: stream error\n"
 msgstr "IMAP-fel vid %s: strömfel\n"
 
-#: ../src/imap.c:628
+#: ../src/imap.c:634
 #, c-format
 msgid ""
 "IMAP error on %s: parse error (very probably non-RFC compliance from the "
@@ -5753,22 +5950,22 @@ msgstr ""
 "IMAP-fel vid %s: tolkningsfel (mycket troligt följer inte servern RFC-"
 "standarden)\n"
 
-#: ../src/imap.c:632
+#: ../src/imap.c:638
 #, c-format
 msgid "IMAP error on %s: connection refused\n"
 msgstr "IMAP-fel vid %s: anslutning nekad\n"
 
-#: ../src/imap.c:635
+#: ../src/imap.c:641
 #, c-format
 msgid "IMAP error on %s: memory error\n"
 msgstr "IMAP-fel vid %s: minnesfel\n"
 
-#: ../src/imap.c:638
+#: ../src/imap.c:644
 #, c-format
 msgid "IMAP error on %s: fatal error\n"
 msgstr "IMAP-fel vid %s: ödesdigert fel\n"
 
-#: ../src/imap.c:641
+#: ../src/imap.c:647
 #, c-format
 msgid ""
 "IMAP error on %s: protocol error(very probably non-RFC compliance from the "
@@ -5777,172 +5974,172 @@ msgstr ""
 "IMAP-fel vid %s: protokollfel (mycket troligt följer inte servern RFC-"
 "standarden)\n"
 
-#: ../src/imap.c:645
+#: ../src/imap.c:651
 #, c-format
 msgid "IMAP error on %s: connection not accepted\n"
 msgstr "IMAP-fel vid %s: anslutning inte accepterad\n"
 
-#: ../src/imap.c:648
+#: ../src/imap.c:654
 #, c-format
 msgid "IMAP error on %s: APPEND error\n"
 msgstr "IMAP-fel vid %s: APPEND-fel\n"
 
-#: ../src/imap.c:651
+#: ../src/imap.c:657
 #, c-format
 msgid "IMAP error on %s: NOOP error\n"
 msgstr "IMAP-fel vid %s: NOOP-fel\n"
 
-#: ../src/imap.c:654
+#: ../src/imap.c:660
 #, c-format
 msgid "IMAP error on %s: LOGOUT error\n"
 msgstr "IMAP-fel vid %s: LOGOUT-fel\n"
 
-#: ../src/imap.c:657
+#: ../src/imap.c:663
 #, c-format
 msgid "IMAP error on %s: CAPABILITY error\n"
 msgstr "IMAP-fel vid %s: CAPABILITY-fel\n"
 
-#: ../src/imap.c:660
+#: ../src/imap.c:666
 #, c-format
 msgid "IMAP error on %s: CHECK error\n"
 msgstr "IMAP-fel vid %s: CHECK-fel\n"
 
-#: ../src/imap.c:663
+#: ../src/imap.c:669
 #, c-format
 msgid "IMAP error on %s: CLOSE error\n"
 msgstr "IMAP-fel vid %s: CLOSE-fel\n"
 
-#: ../src/imap.c:666
+#: ../src/imap.c:672
 #, c-format
 msgid "IMAP error on %s: EXPUNGE error\n"
 msgstr "IMAP-fel vid %s: EXPUNGE-fel\n"
 
-#: ../src/imap.c:669
+#: ../src/imap.c:675
 #, c-format
 msgid "IMAP error on %s: COPY error\n"
 msgstr "IMAP-fel vid %s: COPY-fel\n"
 
-#: ../src/imap.c:672
+#: ../src/imap.c:678
 #, c-format
 msgid "IMAP error on %s: UID COPY error\n"
 msgstr "IMAP-fel vid %s: UID-fel\n"
 
-#: ../src/imap.c:675
+#: ../src/imap.c:681
 #, c-format
 msgid "IMAP error on %s: CREATE error\n"
 msgstr "IMAP-fel vid %s: CREATE-fel\n"
 
-#: ../src/imap.c:678
+#: ../src/imap.c:684
 #, c-format
 msgid "IMAP error on %s: DELETE error\n"
 msgstr "IMAP-fel vid %s: DELETE-fel\n"
 
-#: ../src/imap.c:681
+#: ../src/imap.c:687
 #, c-format
 msgid "IMAP error on %s: EXAMINE error\n"
 msgstr "IMAP-fel vid %s: EXAMINE-fel\n"
 
-#: ../src/imap.c:684
+#: ../src/imap.c:690
 #, c-format
 msgid "IMAP error on %s: FETCH error\n"
 msgstr "IMAP-fel vid %s: FETCH-fel\n"
 
-#: ../src/imap.c:687
+#: ../src/imap.c:693
 #, c-format
 msgid "IMAP error on %s: UID FETCH error\n"
 msgstr "IMAP-fel vid %s: UID FETCH-fel\n"
 
-#: ../src/imap.c:690
+#: ../src/imap.c:696
 #, c-format
 msgid "IMAP error on %s: LIST error\n"
 msgstr "IMAP-fel vid %s: LIST-fel\n"
 
-#: ../src/imap.c:693
+#: ../src/imap.c:699
 #, c-format
 msgid "IMAP error on %s: LOGIN error\n"
 msgstr "IMAP-fel vid %s: LOGIN-fel\n"
 
-#: ../src/imap.c:696
+#: ../src/imap.c:702
 #, c-format
 msgid "IMAP error on %s: LSUB error\n"
 msgstr "IMAP-fel vid %s: LSUB-fel\n"
 
-#: ../src/imap.c:699
+#: ../src/imap.c:705
 #, c-format
 msgid "IMAP error on %s: RENAME error\n"
 msgstr "IMAP-fel vid %s: RENAME-fel\n"
 
-#: ../src/imap.c:702
+#: ../src/imap.c:708
 #, c-format
 msgid "IMAP error on %s: SEARCH error\n"
 msgstr "IMAP-fel vid %s: SEARCH-fel\n"
 
-#: ../src/imap.c:705
+#: ../src/imap.c:711
 #, c-format
 msgid "IMAP error on %s: UID SEARCH error\n"
 msgstr "IMAP-fel vid %s: UID SEARCH-fel\n"
 
-#: ../src/imap.c:708
+#: ../src/imap.c:714
 #, c-format
 msgid "IMAP error on %s: SELECT error\n"
 msgstr "IMAP-fel vid %s: SELECT-fel\n"
 
-#: ../src/imap.c:711
+#: ../src/imap.c:717
 #, c-format
 msgid "IMAP error on %s: STATUS error\n"
 msgstr "IMAP-fel vid %s: STATUS-fel\n"
 
-#: ../src/imap.c:714
+#: ../src/imap.c:720
 #, c-format
 msgid "IMAP error on %s: STORE error\n"
 msgstr "IMAP-fel vid %s: STORE-fel\n"
 
-#: ../src/imap.c:717
+#: ../src/imap.c:723
 #, c-format
 msgid "IMAP error on %s: UID STORE error\n"
 msgstr "IMAP-fel vid %s: UID STORE-fel\n"
 
-#: ../src/imap.c:720
+#: ../src/imap.c:726
 #, c-format
 msgid "IMAP error on %s: SUBSCRIBE error\n"
 msgstr "IMAP-fel vid %s: SUBSCRIBE-fel\n"
 
-#: ../src/imap.c:723
+#: ../src/imap.c:729
 #, c-format
 msgid "IMAP error on %s: UNSUBSCRIBE error\n"
 msgstr "IMAP-fel vid %s: UNSUBSCRIBE-fel\n"
 
-#: ../src/imap.c:726
+#: ../src/imap.c:732
 #, c-format
 msgid "IMAP error on %s: STARTTLS error\n"
 msgstr "IMAP-fel vid %s: STARTTLS-fel\n"
 
-#: ../src/imap.c:729
+#: ../src/imap.c:735
 #, c-format
 msgid "IMAP error on %s: INVAL error\n"
 msgstr "IMAP-fel vid %s: INVAL-fel\n"
 
-#: ../src/imap.c:732
+#: ../src/imap.c:738
 #, c-format
 msgid "IMAP error on %s: EXTENSION error\n"
 msgstr "IMAP-fel vid %s: EXTENSION-fel\n"
 
-#: ../src/imap.c:735
+#: ../src/imap.c:741
 #, c-format
 msgid "IMAP error on %s: SASL error\n"
 msgstr "IMAP-fel vid %s: SASL-fel\n"
 
-#: ../src/imap.c:739
+#: ../src/imap.c:745
 #, c-format
 msgid "IMAP error on %s: SSL error\n"
 msgstr "IMAP-fel vid %s: SSL-fel\n"
 
-#: ../src/imap.c:743
+#: ../src/imap.c:749
 #, c-format
 msgid "IMAP error on %s: Unknown error [%d]\n"
 msgstr "IMAP-fel vid %s: Okänt fel [%d]\n"
 
-#: ../src/imap.c:928
+#: ../src/imap.c:934
 msgid ""
 "\n"
 "\n"
@@ -5954,7 +6151,7 @@ msgstr ""
 "CRAM-MD5 inloggning fungerar endast om libetpan har kompilerats med SASL-"
 "stöd och om CRAM-MD5 SASL insticksmodulen är installerad."
 
-#: ../src/imap.c:934
+#: ../src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5966,39 +6163,39 @@ msgstr ""
 "DIGEST-MD5 inloggning fungerar endast om libetpan har kompilerats med SASL-"
 "stöd och om DIGEST-MD5 SASL insticksmodulen är installerad."
 
-#: ../src/imap.c:941
+#: ../src/imap.c:947
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Anslutning till %s misslyckades: inloggning avslogs, %s"
 
-#: ../src/imap.c:945
+#: ../src/imap.c:951
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Anslutning till %s misslyckades: inloggning avslogs, %s\n"
 
-#: ../src/imap.c:963
+#: ../src/imap.c:969
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Anslutning till %s misslyckades"
 
-#: ../src/imap.c:970 ../src/imap.c:973
+#: ../src/imap.c:976 ../src/imap.c:979
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-anslutning till %s har blivit nedkopplad. Ansluter igen...\n"
 
-#: ../src/imap.c:1003 ../src/imap.c:3583 ../src/imap.c:4242 ../src/imap.c:4339
-#: ../src/imap.c:4517 ../src/imap.c:5314
+#: ../src/imap.c:1009 ../src/imap.c:3619 ../src/imap.c:4278 ../src/imap.c:4375
+#: ../src/imap.c:4555 ../src/imap.c:5364
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail behöver vara uppkopplad mot ett nätverk för att kunna kontakta "
 "IMAP-servern."
 
-#: ../src/imap.c:1112 ../src/inc.c:818 ../src/news.c:387
+#: ../src/imap.c:1118 ../src/inc.c:818 ../src/news.c:387
 #: ../src/send_message.c:278
 msgid "Insecure connection"
 msgstr "Osäker anslutning"
 
-#: ../src/imap.c:1113 ../src/inc.c:819 ../src/news.c:388
+#: ../src/imap.c:1119 ../src/inc.c:819 ../src/news.c:388
 #: ../src/send_message.c:279
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
@@ -6013,109 +6210,109 @@ msgstr ""
 "Vill du fortsätta att ansluta till den här servern? Kommunikationen kommer "
 "inte vara säker."
 
-#: ../src/imap.c:1119 ../src/inc.c:825 ../src/news.c:394
+#: ../src/imap.c:1125 ../src/inc.c:825 ../src/news.c:394
 #: ../src/send_message.c:285
 msgid "Con_tinue connecting"
 msgstr "Försätt ansluta"
 
-#: ../src/imap.c:1129
+#: ../src/imap.c:1135
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Konto '%s': Ansluter till IMAP4-server: %s:%d..."
 
-#: ../src/imap.c:1177
+#: ../src/imap.c:1183
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Kan inte ansluta till IMAP4-server: %s:%d"
 
-#: ../src/imap.c:1180
+#: ../src/imap.c:1186
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan inte ansluta till IMAP4-server: %s:%d\n"
 
-#: ../src/imap.c:1213 ../src/imap.c:4004
+#: ../src/imap.c:1219 ../src/imap.c:4040
 msgid "Can't start TLS session.\n"
 msgstr "Kan inte starta TLS session.\n"
 
-#: ../src/imap.c:1276
+#: ../src/imap.c:1282
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kunde inte logga in på IMAP4-server %s.\n"
 
-#: ../src/imap.c:1279
+#: ../src/imap.c:1285
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kunde inte logga in på IMAP-server %s."
 
-#: ../src/imap.c:1679
+#: ../src/imap.c:1703
 msgid "Adding messages..."
 msgstr "Lägger till meddelanden..."
 
-#: ../src/imap.c:1883 ../src/mh.c:520
+#: ../src/imap.c:1908 ../src/mh.c:526
 msgid "Copying messages..."
 msgstr "Kopierar meddelanden..."
 
-#: ../src/imap.c:2465
+#: ../src/imap.c:2492
 msgid "can't set deleted flags\n"
 msgstr "kan inte sätta borttaget-flaggor\n"
 
-#: ../src/imap.c:2472 ../src/imap.c:4944
+#: ../src/imap.c:2499 ../src/imap.c:4994
 msgid "can't expunge\n"
 msgstr "kan inte utplåna\n"
 
-#: ../src/imap.c:2823
+#: ../src/imap.c:2850
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Letar efter icke prenumererade mappar i %s..."
 
-#: ../src/imap.c:2826
+#: ../src/imap.c:2853
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Letar efter undermappar till %s...."
 
-#: ../src/imap.c:3123
+#: ../src/imap.c:3159
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan inte skapa brevlåda: LIST mislyckades\n"
 
-#: ../src/imap.c:3138
+#: ../src/imap.c:3174
 msgid "can't create mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: ../src/imap.c:3229
+#: ../src/imap.c:3265
 msgid "New folder name must not contain the namespace path separator"
 msgstr "Nytt mappnamn kan inte innehålla namnrymdens sökvägs-avdelare."
 
-#: ../src/imap.c:3269
+#: ../src/imap.c:3305
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan inte döpa om brevlåda: %s till %s\n"
 
-#: ../src/imap.c:3382
+#: ../src/imap.c:3418
 msgid "can't delete mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: ../src/imap.c:3661
+#: ../src/imap.c:3697
 msgid "LIST failed\n"
 msgstr "LIST misslyckades\n"
 
-#: ../src/imap.c:3746
+#: ../src/imap.c:3782
 msgid "Flagging messages..."
 msgstr "Flaggar meddelande..."
 
-#: ../src/imap.c:3849
+#: ../src/imap.c:3885
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan inte välja mapp: %s\n"
 
-#: ../src/imap.c:4001
+#: ../src/imap.c:4037
 msgid "Server requires TLS to log in.\n"
 msgstr "Servern kräver TLS för att logga in.\n"
 
-#: ../src/imap.c:4011
+#: ../src/imap.c:4047
 msgid "Can't refresh capabilities.\n"
 msgstr "Kan inte uppdatera egenskaper.\n"
 
-#: ../src/imap.c:4016
+#: ../src/imap.c:4052
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -6124,20 +6321,20 @@ msgstr ""
 "Anslutning till %s misslyckades: servern kräver TLS, men Claws-Mail har "
 "kompilerats utan stöd för OpenSSL.\n"
 
-#: ../src/imap.c:4024
+#: ../src/imap.c:4060
 msgid "Server logins are disabled.\n"
 msgstr "Serverinloggningar är avaktiverade.\n"
 
-#: ../src/imap.c:4247
+#: ../src/imap.c:4283
 msgid "Fetching message..."
 msgstr "Hämtar meddelande..."
 
-#: ../src/imap.c:4937
+#: ../src/imap.c:4987
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan inte sätta borttaget-flaggor: %d\n"
 
-#: ../src/imap.c:5973
+#: ../src/imap.c:6023
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6171,7 +6368,7 @@ msgid "Cop_y folder..."
 msgstr "_Kopiera mapp..."
 
 #: ../src/imap_gtk.c:69 ../src/mh_gtk.c:59
-#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:61
+#: ../src/plugins/mailmbox/plugin_gtk.c:63 ../src/plugins/rssyl/rssyl_gtk.c:55
 msgid "_Delete folder..."
 msgstr "_Ta bort mapp..."
 
@@ -6232,7 +6429,7 @@ msgstr "Ärv egenskaper från överliggande mapp"
 
 #: ../src/imap_gtk.c:261 ../src/mh_gtk.c:249 ../src/news_gtk.c:306
 #: ../src/plugins/mailmbox/plugin_gtk.c:405
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:331
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:196
 #: ../src/plugins/vcalendar/vcal_folder.c:2032
 #, c-format
 msgid "Input new name for '%s':"
@@ -6240,14 +6437,14 @@ msgstr "Ange nytt namn för '%s':"
 
 #: ../src/imap_gtk.c:263 ../src/mh_gtk.c:251
 #: ../src/plugins/mailmbox/plugin_gtk.c:406
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:332
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:197
 #: ../src/plugins/vcalendar/vcal_folder.c:2033
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
 #: ../src/imap_gtk.c:292 ../src/mh_gtk.c:274 ../src/news_gtk.c:328
 #: ../src/plugins/mailmbox/plugin_gtk.c:433
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:352
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:217
 #: ../src/plugins/vcalendar/vcal_folder.c:2053
 msgid ""
 "The folder could not be renamed.\n"
@@ -6257,7 +6454,7 @@ msgstr ""
 "Det nya mappnamnet är inte tillåtet."
 
 #: ../src/imap_gtk.c:360 ../src/mh_gtk.c:199
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:233
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:149
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6272,7 +6469,7 @@ msgstr ""
 
 #: ../src/imap_gtk.c:381 ../src/mh_gtk.c:220 ../src/news_gtk.c:281
 #: ../src/plugins/mailmbox/plugin_gtk.c:341
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:254
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:170
 #: ../src/plugins/vcalendar/vcal_folder.c:1986
 #, c-format
 msgid "Can't remove the folder '%s'."
@@ -6300,7 +6497,7 @@ msgstr "+_Sök"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Välj en undermapp till %s att prenumerera på: "
 
-#: ../src/imap_gtk.c:537 ../src/mainwindow.c:672
+#: ../src/imap_gtk.c:537 ../src/mainwindow.c:674
 msgid "Subscribe"
 msgstr "Prenumerera"
 
@@ -6575,7 +6772,7 @@ msgid "Auth failed"
 msgstr "Aut. misslyckades"
 
 #. S_COL_SCORE
-#: ../src/inc.c:662 ../src/prefs_matcher.c:393
+#: ../src/inc.c:662 ../src/prefs_matcher.c:396
 #: ../src/prefs_summary_column.c:88 ../src/summaryview.c:2789
 #: ../src/summaryview.c:6310
 msgid "Locked"
@@ -6761,23 +6958,9 @@ msgstr "%s%sDu arbetar frånkopplad. Åsidosätta?"
 msgid "On_ly once"
 msgstr "Endast en gång"
 
-#: ../src/ldapupdate.c:189
-#, c-format
-msgid "ldapsvr_retrieve_item_person->Unknown status: %d"
-msgstr ""
-
-#: ../src/ldapupdate.c:472
-msgid "ldapsvr_update_book: Could not clean cache\n"
-msgstr ""
-
 #: ../src/ldapupdate.c:1056
 msgid "Some SN"
-msgstr ""
-
-#: ../src/ldapupdate.c:1440
-#, c-format
-msgid "ldapsvr_update_book->Unknown status: %s\n"
-msgstr ""
+msgstr "Något SN"
 
 #: ../src/ldif.c:776
 msgid "Nick Name"
@@ -7115,328 +7298,328 @@ msgid "NetworkManager: network is offline.\n"
 msgstr "Nätverkshanteraren: nätverket är frånkopplat.\n"
 
 #. menus
-#: ../src/mainwindow.c:503 ../src/messageview.c:209
+#: ../src/mainwindow.c:505 ../src/messageview.c:209
 msgid "_File"
 msgstr "_Arkiv"
 
-#: ../src/mainwindow.c:505 ../src/messageview.c:211 ../src/summaryview.c:434
+#: ../src/mainwindow.c:507 ../src/messageview.c:211 ../src/summaryview.c:434
 msgid "_View"
 msgstr "_Visa"
 
-#: ../src/mainwindow.c:508
+#: ../src/mainwindow.c:510
 msgid "_Configuration"
 msgstr "_Konfiguration"
 
 #. File menu
-#: ../src/mainwindow.c:512
+#: ../src/mainwindow.c:514
 msgid "_Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: ../src/mainwindow.c:513
+#: ../src/mainwindow.c:515
 msgid "MH..."
 msgstr "MH..."
 
-#: ../src/mainwindow.c:516
+#: ../src/mainwindow.c:518
 msgid "Change mailbox order..."
 msgstr "Ändra sorteringsordning för brevlådor"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:519
+#: ../src/mainwindow.c:521
 msgid "_Import mbox file..."
 msgstr "_Importera mbox-fil..."
 
-#: ../src/mainwindow.c:520
+#: ../src/mainwindow.c:522
 msgid "_Export to mbox file..."
 msgstr "_Exportera till mbox-fil..."
 
-#: ../src/mainwindow.c:521
+#: ../src/mainwindow.c:523
 msgid "_Export selected to mbox file..."
 msgstr "Exportera _valda till mbox-fil..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:523
+#: ../src/mainwindow.c:525
 msgid "Empty all _Trash folders"
 msgstr "_Töm alla papperskorgar"
 
 #. {"File/---",				NULL, "---" },
 #. File menu
-#: ../src/mainwindow.c:526 ../src/messageview.c:218
+#: ../src/mainwindow.c:528 ../src/messageview.c:218
 msgid "_Save email as..."
 msgstr "_Spara epost som..."
 
-#: ../src/mainwindow.c:527 ../src/messageview.c:219
+#: ../src/mainwindow.c:529 ../src/messageview.c:219
 msgid "_Save part as..."
 msgstr "_Spara del som..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:530 ../src/messageview.c:220
+#: ../src/mainwindow.c:532 ../src/messageview.c:220
 msgid "Page setup..."
 msgstr "Sidinstä_llningar..."
 
-#: ../src/mainwindow.c:531 ../src/messageview.c:221
+#: ../src/mainwindow.c:533 ../src/messageview.c:221
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:533
+#: ../src/mainwindow.c:535
 msgid "Synchronise folders"
 msgstr "Synkronisera mappar"
 
 #. {"File/---",				NULL, "---" },
-#: ../src/mainwindow.c:535
+#: ../src/mainwindow.c:537
 msgid "E_xit"
 msgstr "_Avsluta"
 
-#: ../src/mainwindow.c:540
+#: ../src/mainwindow.c:542
 msgid "Select _thread"
 msgstr "Markera _tråd"
 
-#: ../src/mainwindow.c:541
+#: ../src/mainwindow.c:543
 msgid "_Delete thread"
 msgstr "Ta bort trå_d"
 
-#: ../src/mainwindow.c:543
+#: ../src/mainwindow.c:545
 msgid "_Find in current message..."
 msgstr "_Leta i aktuellt meddelande..."
 
-#: ../src/mainwindow.c:545
+#: ../src/mainwindow.c:547
 msgid "_Quick search"
 msgstr "S_nabbsök"
 
 #. View menu
-#: ../src/mainwindow.c:548
+#: ../src/mainwindow.c:550
 msgid "Show or hi_de"
 msgstr "Visa eller g_öm"
 
-#: ../src/mainwindow.c:549
+#: ../src/mainwindow.c:551
 msgid "_Toolbar"
 msgstr "Verk_tygsraden"
 
-#: ../src/mainwindow.c:551
+#: ../src/mainwindow.c:553
 msgid "Set displayed _columns"
 msgstr "Välj visade _kolumner"
 
-#: ../src/mainwindow.c:552
+#: ../src/mainwindow.c:554
 msgid "In _folder list..."
 msgstr "I _mapplista... "
 
-#: ../src/mainwindow.c:553
+#: ../src/mainwindow.c:555
 msgid "In _message list..."
 msgstr "I m_eddelandelista"
 
-#: ../src/mainwindow.c:558
+#: ../src/mainwindow.c:560
 msgid "La_yout"
 msgstr "La_yout"
 
-#: ../src/mainwindow.c:561
+#: ../src/mainwindow.c:563
 msgid "_Sort"
 msgstr "_Sortera"
 
-#: ../src/mainwindow.c:563
+#: ../src/mainwindow.c:565
 msgid "_Attract by subject"
 msgstr "_Attrahera efter ämne"
 
-#: ../src/mainwindow.c:565
+#: ../src/mainwindow.c:567
 msgid "E_xpand all threads"
 msgstr "E_xpandera alla trådar"
 
-#: ../src/mainwindow.c:566
+#: ../src/mainwindow.c:568
 msgid "Co_llapse all threads"
 msgstr "Ko_llapsa alla trådar"
 
 #. View menu
-#: ../src/mainwindow.c:568 ../src/messageview.c:232
+#: ../src/mainwindow.c:570 ../src/messageview.c:232
 msgid "_Go to"
 msgstr "_Gå till"
 
-#: ../src/mainwindow.c:569 ../src/messageview.c:233
+#: ../src/mainwindow.c:571 ../src/messageview.c:233
 msgid "_Previous message"
 msgstr "_Föregående meddelande"
 
-#: ../src/mainwindow.c:570 ../src/messageview.c:234
+#: ../src/mainwindow.c:572 ../src/messageview.c:234
 msgid "_Next message"
 msgstr "_Nästa meddelande"
 
-#: ../src/mainwindow.c:572 ../src/messageview.c:236
+#: ../src/mainwindow.c:574 ../src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "Fö_regående olästa meddelande"
 
-#: ../src/mainwindow.c:573 ../src/messageview.c:237
+#: ../src/mainwindow.c:575 ../src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "N_ästa olästa meddelanden"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:575 ../src/messageview.c:239
+#: ../src/mainwindow.c:577 ../src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Föregående n_ytt meddelande"
 
-#: ../src/mainwindow.c:576 ../src/messageview.c:240
+#: ../src/mainwindow.c:578 ../src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "N_ästa nya meddelande"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:578 ../src/messageview.c:242
+#: ../src/mainwindow.c:580 ../src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Föregående _markerade meddelande"
 
-#: ../src/mainwindow.c:579 ../src/messageview.c:243
+#: ../src/mainwindow.c:581 ../src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Nästa m_arkerade meddelande"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:581 ../src/messageview.c:245
+#: ../src/mainwindow.c:583 ../src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Föregående _färgade meddelande"
 
-#: ../src/mainwindow.c:582 ../src/messageview.c:246
+#: ../src/mainwindow.c:584 ../src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Nästa fär_gade meddelande"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:584 ../src/messageview.c:248
+#: ../src/mainwindow.c:586 ../src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Föregående öppnat meddelande"
 
-#: ../src/mainwindow.c:585 ../src/messageview.c:249
+#: ../src/mainwindow.c:587 ../src/messageview.c:249
 msgid "Next opened message"
 msgstr "Nästa öppnade meddelande"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:587 ../src/messageview.c:251
+#: ../src/mainwindow.c:589 ../src/messageview.c:251
 msgid "Parent message"
 msgstr "Överliggande meddelande"
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:589 ../src/messageview.c:253
+#: ../src/mainwindow.c:591 ../src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Nästa olästa _mapp"
 
-#: ../src/mainwindow.c:590 ../src/messageview.c:254
+#: ../src/mainwindow.c:592 ../src/messageview.c:254
 msgid "_Other folder..."
 msgstr "Annan ma_pp..."
 
 #. {"View/Goto/---",			NULL, "---", NULL, NULL, NULL },
 #. {"View/Goto/---",		NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:592 ../src/messageview.c:256 ../src/mimeview.c:201
+#: ../src/mainwindow.c:594 ../src/messageview.c:256 ../src/mimeview.c:201
 msgid "Next part"
 msgstr "Nästa del"
 
-#: ../src/mainwindow.c:593 ../src/messageview.c:257 ../src/mimeview.c:202
+#: ../src/mainwindow.c:595 ../src/messageview.c:257 ../src/mimeview.c:202
 msgid "Previous part"
 msgstr "Föregående del"
 
 #. {"View/Scroll/---",                  NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:596 ../src/messageview.c:258
+#: ../src/mainwindow.c:598 ../src/messageview.c:258
 msgid "Message scroll"
 msgstr "Meddelanderullning"
 
-#: ../src/mainwindow.c:597 ../src/messageview.c:259
+#: ../src/mainwindow.c:599 ../src/messageview.c:259
 msgid "Previous line"
 msgstr "Föregående rad"
 
-#: ../src/mainwindow.c:598 ../src/messageview.c:260
+#: ../src/mainwindow.c:600 ../src/messageview.c:260
 msgid "Next line"
 msgstr "Nästa rad"
 
-#: ../src/mainwindow.c:599 ../src/messageview.c:261 ../src/printing.c:481
+#: ../src/mainwindow.c:601 ../src/messageview.c:261 ../src/printing.c:481
 msgid "Previous page"
 msgstr "Föregående sida"
 
-#: ../src/mainwindow.c:600 ../src/messageview.c:262 ../src/printing.c:488
+#: ../src/mainwindow.c:602 ../src/messageview.c:262 ../src/printing.c:488
 msgid "Next page"
 msgstr "Nästa sida"
 
-#: ../src/mainwindow.c:618 ../src/messageview.c:280
+#: ../src/mainwindow.c:620 ../src/messageview.c:280
 msgid "Decode"
 msgstr "Avkoda"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:625
+#: ../src/mainwindow.c:627
 msgid "Open in new _window"
 msgstr "_Öppna i nytt fönster"
 
-#: ../src/mainwindow.c:626 ../src/messageview.c:287
+#: ../src/mainwindow.c:628 ../src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Meddel_andets källkod"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:628 ../src/messageview.c:288
+#: ../src/mainwindow.c:630 ../src/messageview.c:288
 msgid "Message part"
 msgstr " Meddelandedel"
 
-#: ../src/mainwindow.c:629 ../src/messageview.c:289
+#: ../src/mainwindow.c:631 ../src/messageview.c:289
 msgid "View as text"
 msgstr "Visa som text"
 
-#: ../src/mainwindow.c:630 ../src/messageview.c:290 ../src/toolbar.c:403
+#: ../src/mainwindow.c:632 ../src/messageview.c:290 ../src/toolbar.c:403
 msgid "Open"
 msgstr "Öppna"
 
-#: ../src/mainwindow.c:632 ../src/messageview.c:292
+#: ../src/mainwindow.c:634 ../src/messageview.c:292
 msgid "Open with..."
 msgstr "Öppna _med..."
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:636 ../src/messageview.c:295
+#: ../src/mainwindow.c:638 ../src/messageview.c:295
 msgid "Quotes"
 msgstr "Citat"
 
 #. {"View/---",				NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:638
+#: ../src/mainwindow.c:640
 msgid "_Update summary"
 msgstr "_Uppdatera sammanfatting"
 
 #. Message menu
-#: ../src/mainwindow.c:641
+#: ../src/mainwindow.c:643
 msgid "Recei_ve"
 msgstr "Ta emot"
 
-#: ../src/mainwindow.c:642
+#: ../src/mainwindow.c:644
 msgid "Get from _current account"
 msgstr "Hämta från a_ktuellt konto"
 
-#: ../src/mainwindow.c:643
+#: ../src/mainwindow.c:645
 msgid "Get from _all accounts"
 msgstr "Hämta från _alla konton"
 
-#: ../src/mainwindow.c:644
+#: ../src/mainwindow.c:646
 msgid "Cancel receivin_g"
 msgstr "Avbryt hämtnin_g"
 
-#: ../src/mainwindow.c:647
+#: ../src/mainwindow.c:649
 msgid "_Send queued messages"
 msgstr "_Skicka köade meddelanden"
 
-#: ../src/mainwindow.c:652
+#: ../src/mainwindow.c:654
 msgid "Compose a_n email message"
 msgstr "Skriv e-postmeddela_nde"
 
-#: ../src/mainwindow.c:653
+#: ../src/mainwindow.c:655
 msgid "Compose a news message"
 msgstr "Nytt diskussionsgruppsmeddelande"
 
-#: ../src/mainwindow.c:655 ../src/messageview.c:301
+#: ../src/mainwindow.c:657 ../src/messageview.c:301
 #: ../src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "Sva_ra"
 
 #. COMPOSE_REPLY
-#: ../src/mainwindow.c:656 ../src/messageview.c:302 ../src/summaryview.c:426
+#: ../src/mainwindow.c:658 ../src/messageview.c:302 ../src/summaryview.c:426
 msgid "Repl_y to"
 msgstr "Svara t_ill"
 
 #. COMPOSE_REPLY_TO_SENDER
-#: ../src/mainwindow.c:659 ../src/messageview.c:305
+#: ../src/mainwindow.c:661 ../src/messageview.c:305
 msgid "Mailing _list"
 msgstr "Sänd_lista"
 
 #. COMPOSE_REPLY_TO_LIST
-#: ../src/mainwindow.c:660
+#: ../src/mainwindow.c:662
 msgid "Follow-up and reply to"
 msgstr "Följ upp och svara till"
 
@@ -7444,177 +7627,177 @@ msgstr "Följ upp och svara till"
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REPLY_TO_LIST
 #. {"Message/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:663 ../src/messageview.c:308 ../src/toolbar.c:2069
+#: ../src/mainwindow.c:665 ../src/messageview.c:308 ../src/toolbar.c:2069
 msgid "_Forward"
 msgstr "Vidarebe_fordra"
 
 #. COMPOSE_FORWARD_INLINE
-#: ../src/mainwindow.c:664 ../src/messageview.c:309 ../src/toolbar.c:2070
+#: ../src/mainwindow.c:666 ../src/messageview.c:309 ../src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "_Vidarebefordra som bilaga"
 
 #. COMPOSE_FORWARD_AS_ATTACH
-#: ../src/mainwindow.c:665 ../src/messageview.c:310 ../src/toolbar.c:2071
+#: ../src/mainwindow.c:667 ../src/messageview.c:310 ../src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Omdiri_gera"
 
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:667
+#: ../src/mainwindow.c:669
 msgid "Mailing-_List"
 msgstr "Sänd_lista"
 
-#: ../src/mainwindow.c:668
+#: ../src/mainwindow.c:670
 msgid "Post"
 msgstr "Skicka"
 
-#: ../src/mainwindow.c:670
+#: ../src/mainwindow.c:672
 msgid "Help"
 msgstr "_Hjälp"
 
-#: ../src/mainwindow.c:674
+#: ../src/mainwindow.c:676
 msgid "Unsubscribe"
 msgstr "Säg upp prenumeration"
 
-#: ../src/mainwindow.c:676
+#: ../src/mainwindow.c:678
 msgid "View archive"
 msgstr "Visa arkiv"
 
-#: ../src/mainwindow.c:678
+#: ../src/mainwindow.c:680
 msgid "Contact owner"
 msgstr "Kontakta ägare"
 
 #. separation
-#: ../src/mainwindow.c:682
+#: ../src/mainwindow.c:684
 msgid "M_ove..."
 msgstr "_Flytta..."
 
-#: ../src/mainwindow.c:683
+#: ../src/mainwindow.c:685
 msgid "_Copy..."
 msgstr "_Kopiera..."
 
-#: ../src/mainwindow.c:684
+#: ../src/mainwindow.c:686
 msgid "Move to _trash"
 msgstr "Fly_tta till papperskorg"
 
-#: ../src/mainwindow.c:685
+#: ../src/mainwindow.c:687
 msgid "_Delete..."
 msgstr "Ta _bort..."
 
-#: ../src/mainwindow.c:686
+#: ../src/mainwindow.c:688
 msgid "Cancel a news message"
 msgstr "Avbryt ett diskussionsgruppmeddelande"
 
 #. separation
-#: ../src/mainwindow.c:689 ../src/mainwindow.c:690 ../src/summaryview.c:427
+#: ../src/mainwindow.c:691 ../src/mainwindow.c:692 ../src/summaryview.c:427
 msgid "_Mark"
 msgstr "_Markera"
 
-#: ../src/mainwindow.c:691
+#: ../src/mainwindow.c:693
 msgid "_Unmark"
 msgstr "_Avmarkera"
 
-#: ../src/mainwindow.c:694
+#: ../src/mainwindow.c:696
 msgid "Mark as unr_ead"
 msgstr "Markera som _oläst"
 
-#: ../src/mainwindow.c:695
+#: ../src/mainwindow.c:697
 msgid "Mark as rea_d"
 msgstr "Markera som _läst"
 
 #. separation
-#: ../src/mainwindow.c:697
+#: ../src/mainwindow.c:699
 msgid "Mark all read"
 msgstr "Markera alla som lästa"
 
 #. separation
-#: ../src/mainwindow.c:699 ../src/prefs_filtering_action.c:199
+#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:199
 #: ../src/toolbar.c:208 ../src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Ignorera tråd"
 
-#: ../src/mainwindow.c:700
+#: ../src/mainwindow.c:702
 msgid "Unignore thread"
 msgstr "Sluta ignorera tråd"
 
-#: ../src/mainwindow.c:701 ../src/prefs_filtering_action.c:200
+#: ../src/mainwindow.c:703 ../src/prefs_filtering_action.c:200
 #: ../src/toolbar.c:209 ../src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Bevaka tråd"
 
-#: ../src/mainwindow.c:702
+#: ../src/mainwindow.c:704
 msgid "Unwatch thread"
 msgstr "Sluta bevaka tråd"
 
 #. separation
-#: ../src/mainwindow.c:705
+#: ../src/mainwindow.c:707
 msgid "Mark as _spam"
 msgstr "Markera som _skräppost"
 
-#: ../src/mainwindow.c:706
+#: ../src/mainwindow.c:708
 msgid "Mark as _ham"
 msgstr "Markera som ej skräppost"
 
 #. separation
-#: ../src/mainwindow.c:709 ../src/prefs_filtering_action.c:181
+#: ../src/mainwindow.c:711 ../src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Lås"
 
-#: ../src/mainwindow.c:710 ../src/prefs_filtering_action.c:182
+#: ../src/mainwindow.c:712 ../src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Lås upp"
 
-#: ../src/mainwindow.c:712 ../src/summaryview.c:428
+#: ../src/mainwindow.c:714 ../src/summaryview.c:428
 msgid "Color la_bel"
 msgstr "Färgm_arkera"
 
-#: ../src/mainwindow.c:713 ../src/summaryview.c:429
+#: ../src/mainwindow.c:715 ../src/summaryview.c:429
 msgid "Ta_gs"
 msgstr "_Etiketter"
 
 #. {"Message/---",			NULL, "---" },
-#: ../src/mainwindow.c:716
+#: ../src/mainwindow.c:718
 msgid "Re-_edit"
 msgstr "_Omredigera"
 
 #. {"Message/---",			NULL, "---" },
 #. COMPOSE_REDIRECT
-#: ../src/mainwindow.c:719 ../src/messageview.c:311 ../src/mimeview.c:1027
+#: ../src/mainwindow.c:721 ../src/messageview.c:311 ../src/mimeview.c:1027
 msgid "Check signature"
 msgstr "Kontrollera signatur"
 
-#: ../src/mainwindow.c:724 ../src/messageview.c:315
+#: ../src/mainwindow.c:726 ../src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "Lägg till avsändaren till adressbo_ken"
 
-#: ../src/mainwindow.c:726
+#: ../src/mainwindow.c:728
 msgid "C_ollect addresses"
 msgstr "_Samla in adress(er)"
 
-#: ../src/mainwindow.c:727
+#: ../src/mainwindow.c:729
 msgid "From current _folder..."
 msgstr "Från nuvarande m_app..."
 
-#: ../src/mainwindow.c:728
+#: ../src/mainwindow.c:730
 msgid "From selected _messages..."
 msgstr "Från markerade _meddelanden..."
 
-#: ../src/mainwindow.c:731
+#: ../src/mainwindow.c:733
 msgid "_Filter all messages in folder"
 msgstr "_Filtrera alla meddelanden i mapp"
 
-#: ../src/mainwindow.c:732
+#: ../src/mainwindow.c:734
 msgid "Filter _selected messages"
 msgstr "Filtrera _markerade meddelanden"
 
-#: ../src/mainwindow.c:733
+#: ../src/mainwindow.c:735
 msgid "Run folder pr_ocessing rules"
 msgstr "Kör behandlingsregler för mappen"
 
-#: ../src/mainwindow.c:735 ../src/messageview.c:318
+#: ../src/mainwindow.c:737 ../src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "Skapa filter_regel"
 
-#: ../src/mainwindow.c:736 ../src/mainwindow.c:742 ../src/messageview.c:319
+#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/messageview.c:319
 #: ../src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automatiskt"
@@ -7622,7 +7805,7 @@ msgstr "_Automatiskt"
 #. FILTER_BY_AUTO
 #. radio SORT_BY_THREAD_DATE
 #. FILTER_BY_AUTO
-#: ../src/mainwindow.c:737 ../src/mainwindow.c:743 ../src/mainwindow.c:845
+#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/mainwindow.c:848
 #: ../src/messageview.c:320 ../src/messageview.c:326
 msgid "By _From"
 msgstr "Efter _Från"
@@ -7630,386 +7813,391 @@ msgstr "Efter _Från"
 #. FILTER_BY_FROM
 #. radio SORT_BY_FROM
 #. FILTER_BY_FROM
-#: ../src/mainwindow.c:738 ../src/mainwindow.c:744 ../src/mainwindow.c:846
+#: ../src/mainwindow.c:740 ../src/mainwindow.c:746 ../src/mainwindow.c:849
 #: ../src/messageview.c:321 ../src/messageview.c:327
 msgid "By _To"
 msgstr "Efter _Till"
 
 #. FILTER_BY_TO
-#: ../src/mainwindow.c:739 ../src/mainwindow.c:745 ../src/messageview.c:322
+#: ../src/mainwindow.c:741 ../src/mainwindow.c:747 ../src/messageview.c:322
 #: ../src/messageview.c:328
 msgid "By _Subject"
 msgstr "Efter _Ämne"
 
 #. FILTER_BY_SUBJECT
-#: ../src/mainwindow.c:741 ../src/messageview.c:324 ../src/summaryview.c:432
+#: ../src/mainwindow.c:743 ../src/messageview.c:324 ../src/summaryview.c:432
 msgid "Create processing rule"
 msgstr "Skapa behandlingsregel"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:748 ../src/messageview.c:332
+#: ../src/mainwindow.c:750 ../src/messageview.c:332
 msgid "List _URLs..."
 msgstr "Lista _webbadresser..."
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:755
+#: ../src/mainwindow.c:757
 msgid "Ch_eck for new messages in all folders"
 msgstr "L_eta efter nya meddelanden i alla mappar"
 
-#: ../src/mainwindow.c:756
+#: ../src/mainwindow.c:758
 msgid "Delete du_plicated messages"
 msgstr "Ta bort meddelande_dubbletter"
 
-#: ../src/mainwindow.c:757
+#: ../src/mainwindow.c:759
 msgid "In selected folder"
 msgstr "I markerad mapp"
 
-#: ../src/mainwindow.c:758
+#: ../src/mainwindow.c:760
 msgid "In all folders"
 msgstr "I alla mappar"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:761
+#: ../src/mainwindow.c:763
 msgid "E_xecute"
 msgstr "Kör"
 
-#: ../src/mainwindow.c:762
+#: ../src/mainwindow.c:764
 msgid "Exp_unge"
 msgstr "Utplåna"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:765
+#: ../src/mainwindow.c:767
 msgid "SSL cer_tificates"
 msgstr "SSL-cer_tifikat"
 
-#: ../src/mainwindow.c:769
+#: ../src/mainwindow.c:771
 msgid "Filtering Lo_g"
 msgstr "Filtreringslo_gg"
 
-#: ../src/mainwindow.c:771
+#: ../src/mainwindow.c:773
 msgid "Network _Log"
 msgstr "Nätverks_logg"
 
 #. {"Tools/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:773
+#: ../src/mainwindow.c:775
 msgid "_Forget all session passwords"
 msgstr "Gl_öm alla sessionslösenord"
 
 #. Configuration menu
-#: ../src/mainwindow.c:776
+#: ../src/mainwindow.c:778
 msgid "C_hange current account"
 msgstr "_Ändra aktuellt konto"
 
-#: ../src/mainwindow.c:778
+#: ../src/mainwindow.c:780
 msgid "_Preferences for current account..."
 msgstr "Egen_skaper för aktuellt konto..."
 
-#: ../src/mainwindow.c:779
+#: ../src/mainwindow.c:781
 msgid "Create _new account..."
 msgstr "Skapa _nytt konto..."
 
-#: ../src/mainwindow.c:780
+#: ../src/mainwindow.c:782
 msgid "_Edit accounts..."
 msgstr "R_edigera konton..."
 
-#: ../src/mainwindow.c:783
+#: ../src/mainwindow.c:785
 msgid "P_references..."
 msgstr "E_genskaper"
 
-#: ../src/mainwindow.c:784
+#: ../src/mainwindow.c:786
 msgid "Pre-pr_ocessing..."
 msgstr "Förbehandla..."
 
-#: ../src/mainwindow.c:785
+#: ../src/mainwindow.c:787
 msgid "Post-pro_cessing..."
 msgstr "Efterbehandla..."
 
-#: ../src/mainwindow.c:786
+#: ../src/mainwindow.c:788
 msgid "_Filtering..."
 msgstr "_Filtrering..."
 
-#: ../src/mainwindow.c:787
+#: ../src/mainwindow.c:789
 msgid "_Templates..."
 msgstr "Mallar..."
 
-#: ../src/mainwindow.c:788
+#: ../src/mainwindow.c:790
 msgid "_Actions..."
 msgstr "_Aktiviteter..."
 
-#: ../src/mainwindow.c:789
+#: ../src/mainwindow.c:791
 msgid "Tag_s..."
 msgstr "Etiketter..."
 
 #. {"Configuration/---",			NULL, "---", NULL, NULL, NULL },
-#: ../src/mainwindow.c:791
+#: ../src/mainwindow.c:793
 msgid "Plu_gins..."
 msgstr "Insticksmoduler..."
 
 #. Help menu
-#: ../src/mainwindow.c:794
+#: ../src/mainwindow.c:796
 msgid "_Manual"
 msgstr "_Manual"
 
-#: ../src/mainwindow.c:795
+#: ../src/mainwindow.c:797
 msgid "_Online User-contributed FAQ"
 msgstr "_FAQ med frågor från användare"
 
-#: ../src/mainwindow.c:796
+#: ../src/mainwindow.c:798
 msgid "Icon _Legend"
 msgstr "Ikonförk_laring"
 
-#: ../src/mainwindow.c:798
+#: ../src/mainwindow.c:800
 msgid "Set as default client"
 msgstr "Sätt som standardklient"
 
-#: ../src/mainwindow.c:805
+#: ../src/mainwindow.c:807
 msgid "Offline _mode"
 msgstr "Frånkopplat _läge"
 
 #. toggle
-#: ../src/mainwindow.c:806
+#: ../src/mainwindow.c:808
+msgid "Men_ubar"
+msgstr "Men_yrad"
+
+#. toggle
+#: ../src/mainwindow.c:809
 msgid "_Message view"
 msgstr "_Meddelandevy"
 
-#: ../src/mainwindow.c:808
+#: ../src/mainwindow.c:811
 msgid "Status _bar"
 msgstr "_Statusrad"
 
-#: ../src/mainwindow.c:810
+#: ../src/mainwindow.c:813
 msgid "Column headers"
 msgstr "Kolumnrubriker"
 
 #. toggle
-#: ../src/mainwindow.c:811
+#: ../src/mainwindow.c:814
 msgid "Th_read view"
 msgstr "Tr_ådvy"
 
 #. toggle
-#: ../src/mainwindow.c:812
+#: ../src/mainwindow.c:815
 msgid "Hide read threads"
 msgstr "Dölj lästa trådar"
 
 #. toggle
-#: ../src/mainwindow.c:813
+#: ../src/mainwindow.c:816
 msgid "_Hide read messages"
 msgstr "_Dölj lästa meddelanden"
 
 #. toggle
-#: ../src/mainwindow.c:814
+#: ../src/mainwindow.c:817
 msgid "Hide deleted messages"
 msgstr "Dölj borttagna meddelanden"
 
 #. toggle
-#: ../src/mainwindow.c:815
+#: ../src/mainwindow.c:818
 msgid "_Fullscreen"
 msgstr "_Helskärm"
 
 #. toggle
-#: ../src/mainwindow.c:816 ../src/messageview.c:344
+#: ../src/mainwindow.c:819 ../src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Visa alla brev_huvuden"
 
 #. toggle
-#: ../src/mainwindow.c:817 ../src/messageview.c:345
+#: ../src/mainwindow.c:820 ../src/messageview.c:345
 msgid "_Collapse all"
 msgstr "Ko_llapsa alla"
 
 #. 1 toggle
-#: ../src/mainwindow.c:818 ../src/messageview.c:346
+#: ../src/mainwindow.c:821 ../src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Kollapsa från nivå _2"
 
 #. 2 toggle
-#: ../src/mainwindow.c:819 ../src/messageview.c:347
+#: ../src/mainwindow.c:822 ../src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Kollapsa från nivå _3"
 
 #. toggle_toolbar_cb
-#: ../src/mainwindow.c:823
+#: ../src/mainwindow.c:826
 msgid "Text _below icons"
 msgstr "Text under ikoner"
 
 #. radio TOOLBAR_BOTH
-#: ../src/mainwindow.c:824
+#: ../src/mainwindow.c:827
 msgid "Text be_side icons"
 msgstr "Text bredvid ikoner"
 
 #. radio TOOLBAR_BOTH_HORIZ
-#: ../src/mainwindow.c:825
+#: ../src/mainwindow.c:828
 msgid "_Icons only"
 msgstr "Endast _ikoner"
 
 #. radio TOOLBAR_ICON
-#: ../src/mainwindow.c:826
+#: ../src/mainwindow.c:829
 msgid "_Text only"
 msgstr "Endast _text"
 
 #. set_layout_cb
-#: ../src/mainwindow.c:833
+#: ../src/mainwindow.c:836
 msgid "_Standard"
 msgstr "_Standard"
 
 #. radio NORMAL_LAYOUT
-#: ../src/mainwindow.c:834
+#: ../src/mainwindow.c:837
 msgid "_Three columns"
 msgstr "_Tre kolumner"
 
 #. radio VERTICAL_LAYOUT
-#: ../src/mainwindow.c:835
+#: ../src/mainwindow.c:838
 msgid "_Wide message"
 msgstr "_Brett meddelande"
 
 #. radio WIDE_LAYOUT
-#: ../src/mainwindow.c:836
+#: ../src/mainwindow.c:839
 msgid "W_ide message list"
 msgstr "Bred meddelandelista"
 
 #. radio WIDE_MSGLIST_LAYOUT
-#: ../src/mainwindow.c:837
+#: ../src/mainwindow.c:840
 msgid "S_mall screen"
 msgstr "Liten skärm"
 
 #. sort_summary_cb
-#: ../src/mainwindow.c:841
+#: ../src/mainwindow.c:844
 msgid "By _number"
 msgstr "Efter _Nummer"
 
 #. radio SORT_BY_NUMBER
-#: ../src/mainwindow.c:842
+#: ../src/mainwindow.c:845
 msgid "By s_ize"
 msgstr "Efter storlek"
 
 #. radio SORT_BY_SIZE
-#: ../src/mainwindow.c:843
+#: ../src/mainwindow.c:846
 msgid "By _date"
 msgstr "Efter _datum"
 
 #. radio SORT_BY_DATE
-#: ../src/mainwindow.c:844
+#: ../src/mainwindow.c:847
 msgid "By thread date"
 msgstr "Efter Datum för tråd"
 
 #. radio SORT_BY_TO
-#: ../src/mainwindow.c:847
+#: ../src/mainwindow.c:850
 msgid "By s_ubject"
 msgstr "Efter _ämne"
 
 #. radio SORT_BY_SUBJECT
-#: ../src/mainwindow.c:848
+#: ../src/mainwindow.c:851
 msgid "By _color label"
 msgstr "Efter färgmarkering"
 
 #. radio SORT_BY_LABEL
-#: ../src/mainwindow.c:849
+#: ../src/mainwindow.c:852
 msgid "By tag"
 msgstr "Efter etikett"
 
 #. radio SORT_BY_TAGS
-#: ../src/mainwindow.c:850
+#: ../src/mainwindow.c:853
 msgid "By _mark"
 msgstr "Efter _markering"
 
 #. radio SORT_BY_MARK
-#: ../src/mainwindow.c:851
+#: ../src/mainwindow.c:854
 msgid "By _status"
 msgstr "Efter _status"
 
 #. radio SORT_BY_STATUS
-#: ../src/mainwindow.c:852
+#: ../src/mainwindow.c:855
 msgid "By a_ttachment"
 msgstr "Efter _bilaga"
 
 #. radio SORT_BY_MIME
-#: ../src/mainwindow.c:853
+#: ../src/mainwindow.c:856
 msgid "By score"
 msgstr "Efter poäng"
 
 #. radio SORT_BY_SCORE
-#: ../src/mainwindow.c:854
+#: ../src/mainwindow.c:857
 msgid "By locked"
 msgstr "Efter låst"
 
 #. radio SORT_BY_LOCKED
-#: ../src/mainwindow.c:855
+#: ../src/mainwindow.c:858
 msgid "D_on't sort"
 msgstr "S_ortera inte"
 
 #. sort_summary_type_cb
-#: ../src/mainwindow.c:859
+#: ../src/mainwindow.c:862
 msgid "Ascending"
 msgstr "Stigande"
 
 #. radio SORT_ASCENDING
-#: ../src/mainwindow.c:860
+#: ../src/mainwindow.c:863
 msgid "Descending"
 msgstr "Fallande"
 
-#: ../src/mainwindow.c:901 ../src/messageview.c:388
+#: ../src/mainwindow.c:904 ../src/messageview.c:388
 msgid "_Auto detect"
 msgstr "Upptäck _automatiskt"
 
-#: ../src/mainwindow.c:1298 ../src/summaryview.c:6236
+#: ../src/mainwindow.c:1301 ../src/summaryview.c:6236
 msgid "Apply tags..."
 msgstr "Lägg till etiketter..."
 
-#: ../src/mainwindow.c:1936
+#: ../src/mainwindow.c:1943
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Något/några fel inträffade. Klicka här för att se loggen."
 
-#: ../src/mainwindow.c:1951
+#: ../src/mainwindow.c:1958
 msgid "You are online. Click the icon to go offline"
 msgstr "Du är ansluten. Klicka här för att koppla ifrån"
 
-#: ../src/mainwindow.c:1954
+#: ../src/mainwindow.c:1961
 msgid "You are offline. Click the icon to go online"
 msgstr "Du är inte ansluten. Klicka här för att ansluta"
 
-#: ../src/mainwindow.c:1968
+#: ../src/mainwindow.c:1975
 msgid "Select account"
 msgstr "Välj konto"
 
 #. init log instances data before creating log views
 #. Protocol log
-#: ../src/mainwindow.c:1995 ../src/prefs_logging.c:140
+#: ../src/mainwindow.c:2002 ../src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Nätverkslogg"
 
-#: ../src/mainwindow.c:1999
+#: ../src/mainwindow.c:2006
 msgid "Filtering/Processing debug log"
 msgstr "Felsökningslogg för filtrerings- och behandllingsregler"
 
-#: ../src/mainwindow.c:2018 ../src/prefs_logging.c:392
+#: ../src/mainwindow.c:2025 ../src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "filtreringslogg aktiverad\n"
 
-#: ../src/mainwindow.c:2020 ../src/prefs_logging.c:394
+#: ../src/mainwindow.c:2027 ../src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "filtreringslogg avaktiverad\n"
 
-#: ../src/mainwindow.c:2460 ../src/mainwindow.c:2467 ../src/mainwindow.c:2510
-#: ../src/mainwindow.c:2543 ../src/mainwindow.c:2575 ../src/mainwindow.c:2620
+#: ../src/mainwindow.c:2470 ../src/mainwindow.c:2477 ../src/mainwindow.c:2520
+#: ../src/mainwindow.c:2553 ../src/mainwindow.c:2585 ../src/mainwindow.c:2630
 #: ../src/plugins/notification/notification_trayicon.c:360
-#: ../src/prefs_folder_item.c:1065
+#: ../src/plugins/rssyl/opml_import.c:73 ../src/prefs_folder_item.c:1065
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: ../src/mainwindow.c:2621 ../src/prefs_summary_open.c:114
+#: ../src/mainwindow.c:2631 ../src/prefs_summary_open.c:114
 msgid "none"
 msgstr "inget"
 
-#: ../src/mainwindow.c:2878 ../src/mainwindow.c:2882
+#: ../src/mainwindow.c:2888 ../src/mainwindow.c:2892
 msgid "Delete all messages in trash folders?"
 msgstr "Ta bort alla meddelande från papperskorgar?"
 
-#: ../src/mainwindow.c:2879
+#: ../src/mainwindow.c:2889
 msgid "Don't quit"
 msgstr "A_vsluta inte"
 
-#: ../src/mainwindow.c:2908 ../src/plugins/mailmbox/plugin_gtk.c:189
+#: ../src/mainwindow.c:2918 ../src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: ../src/mainwindow.c:2909
+#: ../src/mainwindow.c:2919
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -8019,18 +8207,18 @@ msgstr ""
 "Om en existerande brevlåda specificeras, kommer den\n"
 "att genomsökas automatiskt."
 
-#: ../src/mainwindow.c:2915 ../src/plugins/mailmbox/plugin_gtk.c:196
-#: ../src/plugins/rssyl/rssyl_gtk.c:158
+#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:196
+#: ../src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Brevlådan '%s' finns redan."
 
-#: ../src/mainwindow.c:2920 ../src/plugins/mailmbox/plugin_gtk.c:202
+#: ../src/mainwindow.c:2930 ../src/plugins/mailmbox/plugin_gtk.c:202
 #: ../src/setup.c:52 ../src/wizard.c:741
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: ../src/mainwindow.c:2925 ../src/plugins/mailmbox/plugin_gtk.c:209
+#: ../src/mainwindow.c:2935 ../src/plugins/mailmbox/plugin_gtk.c:209
 #: ../src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
@@ -8040,136 +8228,136 @@ msgstr ""
 "Skapande av brevlåda misslyckades.\n"
 "Några filer finns kanske redan, eller så saknar du skrivrättigheter där."
 
-#: ../src/mainwindow.c:3377
+#: ../src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "Inte tillåtet att skicka"
 
-#: ../src/mainwindow.c:3955
+#: ../src/mainwindow.c:3965
 msgid "Mbox import has failed."
 msgstr "Fel vid import av mbox-fil."
 
-#: ../src/mainwindow.c:3964 ../src/mainwindow.c:3973
+#: ../src/mainwindow.c:3974 ../src/mainwindow.c:3983
 msgid "Export to mbox has failed."
 msgstr "Export till mbox-fil misslyckades"
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit"
 msgstr "Avsluta"
 
-#: ../src/mainwindow.c:4014
+#: ../src/mainwindow.c:4024
 #: ../src/plugins/notification/notification_trayicon.c:515
 msgid "Exit Claws Mail?"
 msgstr "Avsluta Claws Mail?"
 
-#: ../src/mainwindow.c:4205
+#: ../src/mainwindow.c:4215
 msgid "Folder synchronisation"
 msgstr "Synkronisera mappar"
 
-#: ../src/mainwindow.c:4206
+#: ../src/mainwindow.c:4216
 msgid "Do you want to synchronise your folders now?"
 msgstr "Vill du synkronisera dina mappar nu?"
 
-#: ../src/mainwindow.c:4207
+#: ../src/mainwindow.c:4217
 msgid "+_Synchronise"
 msgstr "+_Synkronisera"
 
-#: ../src/mainwindow.c:4636
+#: ../src/mainwindow.c:4659
 msgid "Deleting duplicated messages..."
 msgstr "Tar bort meddelandedubbletter..."
 
-#: ../src/mainwindow.c:4673
+#: ../src/mainwindow.c:4696
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Ta bort %d meddelandedubbletter i %d mappar.\n"
 msgstr[1] "Ta bort %d dubblerade meddelande i %d mappar.\n"
 
-#: ../src/mainwindow.c:4928 ../src/summaryview.c:5725
+#: ../src/mainwindow.c:4951 ../src/summaryview.c:5725
 msgid "Processing rules to apply before folder rules"
 msgstr "Behandlingsregler att applicera före mappregler"
 
-#: ../src/mainwindow.c:4936
+#: ../src/mainwindow.c:4959
 msgid "Processing rules to apply after folder rules"
 msgstr "Behandlingsregler att applicera efter mappregler"
 
-#: ../src/mainwindow.c:4944 ../src/summaryview.c:5736
+#: ../src/mainwindow.c:4967 ../src/summaryview.c:5736
 msgid "Filtering configuration"
 msgstr "Filtreringskonfiguration"
 
-#: ../src/mainwindow.c:5059
+#: ../src/mainwindow.c:5082
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Kan inte registrera som standardklient: omöjligt att hitta sökväg till "
 "exekverbar fil."
 
-#: ../src/mainwindow.c:5118
+#: ../src/mainwindow.c:5141
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws-Mail har blivit registrerad som standardklient."
 
-#: ../src/mainwindow.c:5120
+#: ../src/mainwindow.c:5143
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Kan inte registrera som standardklient: omöjligt att skriva till registret."
 
-#: ../src/mainwindow.c:5278
+#: ../src/mainwindow.c:5301
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "Glömde %d lösenord i %d konton.\n"
 msgstr[1] "Glömde %d lösenord i %d konton.\n"
 
-#: ../src/matcher.c:209 ../src/matcher.c:210 ../src/matcher.c:211
-#: ../src/matcher.c:212 ../src/matcher.c:213 ../src/matcher.c:214
-#: ../src/matcher.c:215
+#: ../src/matcher.c:211 ../src/matcher.c:212 ../src/matcher.c:213
+#: ../src/matcher.c:214 ../src/matcher.c:215 ../src/matcher.c:216
+#: ../src/matcher.c:217
 #, c-format
 msgid "%s header"
 msgstr "%s brevhuvud"
 
-#: ../src/matcher.c:216
+#: ../src/matcher.c:218
 msgid "header"
 msgstr "Brevhuvud"
 
-#: ../src/matcher.c:217
+#: ../src/matcher.c:219
 msgid "header line"
 msgstr "brevhuvudsrad"
 
-#: ../src/matcher.c:218
+#: ../src/matcher.c:220
 msgid "body line"
 msgstr "meddelandetextrad"
 
-#: ../src/matcher.c:219
+#: ../src/matcher.c:221
 msgid "tag"
 msgstr "etikett"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553 ../src/message_search.c:205 ../src/prefs_matcher.c:739
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555 ../src/message_search.c:205 ../src/prefs_matcher.c:742
 #: ../src/summary_search.c:466
 msgid "Case sensitive"
 msgstr "Gemen-/versalkänslig"
 
-#: ../src/matcher.c:523 ../src/matcher.c:528 ../src/matcher.c:548
-#: ../src/matcher.c:553
+#: ../src/matcher.c:525 ../src/matcher.c:530 ../src/matcher.c:550
+#: ../src/matcher.c:555
 msgid "Case insensitive"
 msgstr "Gemen-/versalokänslig"
 
-#: ../src/matcher.c:1818
+#: ../src/matcher.c:1843
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "kollar om meddelande matchar [ %s ]\n"
 
-#: ../src/matcher.c:1887 ../src/matcher.c:1906 ../src/matcher.c:1919
+#: ../src/matcher.c:1912 ../src/matcher.c:1931 ../src/matcher.c:1944
 msgid "message matches\n"
 msgstr "meddelande matchar\n"
 
-#: ../src/matcher.c:1894 ../src/matcher.c:1912 ../src/matcher.c:1921
+#: ../src/matcher.c:1919 ../src/matcher.c:1937 ../src/matcher.c:1946
 msgid "message does not match\n"
 msgstr "meddelande matchar inte\n"
 
-#: ../src/matcher.c:2184 ../src/matcher.c:2185 ../src/matcher.c:2186
-#: ../src/matcher.c:2187 ../src/matcher.c:2188 ../src/matcher.c:2189
-#: ../src/matcher.c:2190 ../src/matcher.c:2191
+#: ../src/matcher.c:2209 ../src/matcher.c:2210 ../src/matcher.c:2211
+#: ../src/matcher.c:2212 ../src/matcher.c:2213 ../src/matcher.c:2214
+#: ../src/matcher.c:2215 ../src/matcher.c:2216
 msgid "(none)"
 msgstr "(ingen)"
 
@@ -8197,8 +8385,8 @@ msgstr "Skriv mbox-fil"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Filen finns redan. Vill du skriva över den?"
 
-#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1843
-#: ../src/prefs_themes.c:555 ../src/textview.c:3075
+#: ../src/mbox.c:556 ../src/messageview.c:1846 ../src/mimeview.c:1844
+#: ../src/prefs_themes.c:555 ../src/textview.c:3054
 msgid "Overwrite"
 msgstr "Skriv över"
 
@@ -8293,7 +8481,7 @@ msgstr ""
 msgid "Fetching message (%s)..."
 msgstr "Hämtar meddelande (%s)..."
 
-#: ../src/messageview.c:1357 ../src/procmime.c:1004
+#: ../src/messageview.c:1357 ../src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Kunde inte dekryptera: %s"
@@ -8302,9 +8490,9 @@ msgstr "Kunde inte dekryptera: %s"
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Meddelandet följer inte MIME-standarden. Det kan återges fel."
 
-#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1996
-#: ../src/plugins/fancy/fancy_viewer.c:667 ../src/summaryview.c:4808
-#: ../src/summaryview.c:4811 ../src/textview.c:3063
+#: ../src/messageview.c:1838 ../src/messageview.c:1841 ../src/mimeview.c:1997
+#: ../src/plugins/fancy/fancy_viewer.c:669 ../src/summaryview.c:4808
+#: ../src/summaryview.c:4811 ../src/textview.c:3042
 msgid "Save as"
 msgstr "Spara som"
 
@@ -8412,7 +8600,7 @@ msgstr ""
 "Vänligen välj vilket av kontona som du vill använda för att skicka "
 "läskvittot:"
 
-#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_gtk.c:494
+#: ../src/messageview.c:2099 ../src/plugins/rssyl/rssyl_feed_props.c:533
 msgid "_Cancel"
 msgstr "_Avbryt"
 
@@ -8449,20 +8637,20 @@ msgstr ""
 "  Meddelandet har flyttats till papperskorgen eller till en annan mapp"
 
 #: ../src/messageview.c:2971 ../src/messageview.c:2977
-#: ../src/summaryview.c:4191 ../src/summaryview.c:6964
+#: ../src/summaryview.c:4193 ../src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "fel uppstod vid inlärning.\n"
 
-#: ../src/mh.c:432
+#: ../src/mh.c:438
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kan inte kopiera meddelande %s till %s\n"
 
-#: ../src/mh.c:518
+#: ../src/mh.c:524
 msgid "Moving messages..."
 msgstr "Flyttar meddelanden..."
 
-#: ../src/mh.c:662 ../src/plugins/mailmbox/mailmbox_folder.c:839
+#: ../src/mh.c:668 ../src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Tar bort meddelanden..."
 
@@ -8553,32 +8741,32 @@ msgstr "kontrollera signatur..."
 msgid "Go back to email"
 msgstr "Gå tillbaka till e-post"
 
-#: ../src/mimeview.c:1762 ../src/mimeview.c:1851 ../src/mimeview.c:2043
-#: ../src/mimeview.c:2079 ../src/mimeview.c:2191
-#: ../src/plugins/fancy/fancy_viewer.c:420
+#: ../src/mimeview.c:1763 ../src/mimeview.c:1852 ../src/mimeview.c:2044
+#: ../src/mimeview.c:2080 ../src/mimeview.c:2192
+#: ../src/plugins/fancy/fancy_viewer.c:422
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Kan inte spara del av flerdelsmeddelande: %s"
 
-#: ../src/mimeview.c:1840 ../src/textview.c:3073
+#: ../src/mimeview.c:1841 ../src/textview.c:3052
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Skriv över befintlig fil '%s'?"
 
-#: ../src/mimeview.c:1882 ../src/plugins/archive/archiver_prefs.c:128
+#: ../src/mimeview.c:1883 ../src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
 msgstr "Välj destinationsmapp"
 
-#: ../src/mimeview.c:1889 ../src/plugins/archive/archiver_prefs.c:134
+#: ../src/mimeview.c:1890 ../src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' är inte en mapp."
 
-#: ../src/mimeview.c:2126 ../src/mimeview.c:2133 ../src/textview.c:2994
+#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2973
 msgid "Open with"
 msgstr "Öppna med"
 
-#: ../src/mimeview.c:2127 ../src/mimeview.c:2134 ../src/textview.c:2995
+#: ../src/mimeview.c:2128 ../src/mimeview.c:2135 ../src/textview.c:2974
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8587,11 +8775,11 @@ msgstr ""
 "Skriv in kommandoraden för att öppna filen:\n"
 "('%s' kommer att ersättas med filnamnet)"
 
-#: ../src/mimeview.c:2225
+#: ../src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "Kör icke betrodd binär?"
 
-#: ../src/mimeview.c:2226
+#: ../src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8603,19 +8791,19 @@ msgstr ""
 "\n"
 "Vill du köra denna fil?"
 
-#: ../src/mimeview.c:2230
+#: ../src/mimeview.c:2231
 msgid "Run binary"
 msgstr "Kör binär"
 
-#: ../src/mimeview.c:2529
+#: ../src/mimeview.c:2530
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/mimeview.c:2530 ../src/plugins/pdf_viewer/poppler_viewer.c:699
+#: ../src/mimeview.c:2531 ../src/plugins/pdf_viewer/poppler_viewer.c:699
 msgid "Size:"
 msgstr "Storlek:"
 
-#: ../src/mimeview.c:2544 ../src/plugins/vcalendar/vcalendar.c:1271
+#: ../src/mimeview.c:2545 ../src/plugins/vcalendar/vcalendar.c:1271
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1722
 #: ../src/plugins/vcalendar/vcal_meeting_gtk.c:1732
 msgid "Description:"
@@ -8746,7 +8934,7 @@ msgstr "Verkligen avsluta prenumeration på diskussionsgrupp '%s'?"
 msgid "Unsubscribe newsgroup"
 msgstr "Avsluta prenumeration på diskussionsgrupp"
 
-#: ../src/news_gtk.c:268 ../src/plugins/rssyl/rssyl_gtk.c:695
+#: ../src/news_gtk.c:268
 msgid "_Unsubscribe"
 msgstr "S_äg upp prenumeration"
 
@@ -8893,7 +9081,7 @@ msgstr "Sökväg till adressboken där adresser behålls"
 #: ../src/plugins/bsfilter/bsfilter_gtk.c:201
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:447
 #: ../src/prefs_filtering_action.c:573 ../src/prefs_filtering_action.c:580
-#: ../src/prefs_matcher.c:676
+#: ../src/prefs_matcher.c:679
 msgid "Select..."
 msgstr "Välj ..."
 
@@ -9006,36 +9194,36 @@ msgstr "Tryck Avbryt-knappen för att stoppa arkivering"
 msgid "Archiving:"
 msgstr "Arkiverar:"
 
-#: ../src/plugins/archive/archiver_gtk.c:506
+#: ../src/plugins/archive/archiver_gtk.c:507
 msgid "Folder and archive must be selected"
 msgstr "Mapp och arkiv måste väljas"
 
-#: ../src/plugins/archive/archiver_gtk.c:515
+#: ../src/plugins/archive/archiver_gtk.c:516
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s: Existerar. Fortsätt ändå?"
 
-#: ../src/plugins/archive/archiver_gtk.c:518
+#: ../src/plugins/archive/archiver_gtk.c:519
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: är en länk. Kan inte fortsätta"
 
-#: ../src/plugins/archive/archiver_gtk.c:521
+#: ../src/plugins/archive/archiver_gtk.c:522
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: är en mapp. Kan inte fortsätta"
 
-#: ../src/plugins/archive/archiver_gtk.c:524
+#: ../src/plugins/archive/archiver_gtk.c:525
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: Saknar behörighet. Kan inte fortsätta"
 
-#: ../src/plugins/archive/archiver_gtk.c:527
+#: ../src/plugins/archive/archiver_gtk.c:528
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: Okänt fel. Kan inte fortsätta"
 
-#: ../src/plugins/archive/archiver_gtk.c:564
+#: ../src/plugins/archive/archiver_gtk.c:565
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -9044,7 +9232,7 @@ msgstr ""
 "Inte ett giltigt filnamn:\n"
 "%s."
 
-#: ../src/plugins/archive/archiver_gtk.c:577
+#: ../src/plugins/archive/archiver_gtk.c:578
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -9053,7 +9241,7 @@ msgstr ""
 "Inte en giltig Claws-Mail-mapp:\n"
 "%s."
 
-#: ../src/plugins/archive/archiver_gtk.c:606
+#: ../src/plugins/archive/archiver_gtk.c:607
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -9068,183 +9256,183 @@ msgstr ""
 "\n"
 "Fortsätt ändå?"
 
-#: ../src/plugins/archive/archiver_gtk.c:710
+#: ../src/plugins/archive/archiver_gtk.c:711
 msgid "Archive result"
 msgstr "Arkivresultat"
 
-#: ../src/plugins/archive/archiver_gtk.c:740
+#: ../src/plugins/archive/archiver_gtk.c:741
 msgid "Values"
 msgstr "Värden"
 
-#: ../src/plugins/archive/archiver_gtk.c:749
+#: ../src/plugins/archive/archiver_gtk.c:750
 msgid "Archive"
 msgstr "Arkiv"
 
-#: ../src/plugins/archive/archiver_gtk.c:755
+#: ../src/plugins/archive/archiver_gtk.c:756
 msgid "Archive format"
 msgstr "Arkivformat"
 
-#: ../src/plugins/archive/archiver_gtk.c:762
+#: ../src/plugins/archive/archiver_gtk.c:763
 msgid "Compression method"
 msgstr "Kompressionsmetod"
 
-#: ../src/plugins/archive/archiver_gtk.c:770
+#: ../src/plugins/archive/archiver_gtk.c:771
 msgid "Number of files"
 msgstr "Antal filer"
 
-#: ../src/plugins/archive/archiver_gtk.c:778
+#: ../src/plugins/archive/archiver_gtk.c:779
 msgid "Archive Size"
 msgstr "Arkivstorlek"
 
-#: ../src/plugins/archive/archiver_gtk.c:786
+#: ../src/plugins/archive/archiver_gtk.c:787
 msgid "Folder Size"
 msgstr "Mappstorlek"
 
-#: ../src/plugins/archive/archiver_gtk.c:795
+#: ../src/plugins/archive/archiver_gtk.c:796
 msgid "Compression level"
 msgstr "Komprimeringsnivå"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:718
 #: ../src/prefs_folder_item.c:514
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/plugins/archive/archiver_gtk.c:800
-#: ../src/plugins/archive/archiver_gtk.c:808
-#: ../src/plugins/archive/archiver_gtk.c:816
+#: ../src/plugins/archive/archiver_gtk.c:801
+#: ../src/plugins/archive/archiver_gtk.c:809
+#: ../src/plugins/archive/archiver_gtk.c:817
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:721
 #: ../src/prefs_folder_item.c:513 ../src/prefs_summaries.c:369
 msgid "No"
 msgstr "Inga"
 
-#: ../src/plugins/archive/archiver_gtk.c:803
+#: ../src/plugins/archive/archiver_gtk.c:804
 msgid "MD5 checksum"
 msgstr "MD5-kontrollsumma"
 
-#: ../src/plugins/archive/archiver_gtk.c:811
+#: ../src/plugins/archive/archiver_gtk.c:812
 msgid "Descriptive names"
 msgstr "Beskrivande namn"
 
-#: ../src/plugins/archive/archiver_gtk.c:819
+#: ../src/plugins/archive/archiver_gtk.c:820
 msgid "Delete selected files"
 msgstr "Ta bort valda filer"
 
-#: ../src/plugins/archive/archiver_gtk.c:828
-#: ../src/plugins/archive/archiver_gtk.c:1210
+#: ../src/plugins/archive/archiver_gtk.c:829
+#: ../src/plugins/archive/archiver_gtk.c:1211
 msgid "Select mails before"
 msgstr "Välj epost före"
 
-#: ../src/plugins/archive/archiver_gtk.c:904
+#: ../src/plugins/archive/archiver_gtk.c:905
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Välj filnamn för arkiv [filändelsen bör reflektera att det är ett arkiv som ."
 "tgz]"
 
-#: ../src/plugins/archive/archiver_gtk.c:952
+#: ../src/plugins/archive/archiver_gtk.c:953
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld av %ld"
 
-#: ../src/plugins/archive/archiver_gtk.c:991
+#: ../src/plugins/archive/archiver_gtk.c:992
 msgid "Create Archive"
 msgstr "Skapa Arkiv"
 
-#: ../src/plugins/archive/archiver_gtk.c:1006
+#: ../src/plugins/archive/archiver_gtk.c:1007
 msgid "Enter Archiver arguments"
 msgstr "Mata in Arkiverarens användarargument"
 
-#: ../src/plugins/archive/archiver_gtk.c:1019
+#: ../src/plugins/archive/archiver_gtk.c:1020
 msgid "Folder to archive"
 msgstr "Mapp att arkivera"
 
-#: ../src/plugins/archive/archiver_gtk.c:1026
+#: ../src/plugins/archive/archiver_gtk.c:1027
 msgid "Folder which is the root of the archive"
 msgstr "Mapp som är rooten på arkivet"
 
-#: ../src/plugins/archive/archiver_gtk.c:1031
+#: ../src/plugins/archive/archiver_gtk.c:1032
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 "Klicka på denna knapp för att välja vilken mapp som skall vara root för "
 "arkivet"
 
-#: ../src/plugins/archive/archiver_gtk.c:1037
+#: ../src/plugins/archive/archiver_gtk.c:1038
 msgid "Name for archive"
 msgstr "Namn på arkiv"
 
-#: ../src/plugins/archive/archiver_gtk.c:1043
+#: ../src/plugins/archive/archiver_gtk.c:1044
 msgid "Archive location and name"
 msgstr "Plats och namn för arkivet"
 
-#: ../src/plugins/archive/archiver_gtk.c:1045
+#: ../src/plugins/archive/archiver_gtk.c:1046
 #: ../src/plugins/archive/archiver_prefs.c:198
 #: ../src/plugins/pgpcore/select-keys.c:422
 msgid "_Select"
 msgstr "Välj"
 
-#: ../src/plugins/archive/archiver_gtk.c:1048
+#: ../src/plugins/archive/archiver_gtk.c:1049
 msgid "Click this button to select a name and location for the archive"
 msgstr "Klicka på denna knapp för att välja ett namn och plats på arkivet"
 
-#: ../src/plugins/archive/archiver_gtk.c:1050
+#: ../src/plugins/archive/archiver_gtk.c:1051
 msgid "Choose compression"
 msgstr "Välj kompression"
 
-#: ../src/plugins/archive/archiver_gtk.c:1063
+#: ../src/plugins/archive/archiver_gtk.c:1064
 msgid "Choose this option to use ZIP compression for the archive"
 msgstr "Välj detta alternativ för att använda ZIP-kompression för arkivet"
 
-#: ../src/plugins/archive/archiver_gtk.c:1070
+#: ../src/plugins/archive/archiver_gtk.c:1071
 msgid "Choose this option to use BZIP2 compression for the archive"
 msgstr "Välj detta alternativ för att använda BZIP2-kompression för arkivet"
 
-#: ../src/plugins/archive/archiver_gtk.c:1078
+#: ../src/plugins/archive/archiver_gtk.c:1079
 msgid "Choose this to use Compress compression for your archive"
 msgstr "Välj detta för att använda Compress-kompression för ditt arkiv"
 
-#: ../src/plugins/archive/archiver_gtk.c:1086
+#: ../src/plugins/archive/archiver_gtk.c:1087
 msgid "Choose this option to disable compression for the archive"
 msgstr "Välj detta alternativ för att stänga av kompression för arkivet"
 
-#: ../src/plugins/archive/archiver_gtk.c:1108
+#: ../src/plugins/archive/archiver_gtk.c:1109
 msgid "Choose format"
 msgstr "Välj format"
 
-#: ../src/plugins/archive/archiver_gtk.c:1121
+#: ../src/plugins/archive/archiver_gtk.c:1122
 msgid "Choose this option to use TAR as format for the archive"
 msgstr "Välj denna inställning för att använda TAR som format för arkivet"
 
-#: ../src/plugins/archive/archiver_gtk.c:1128
+#: ../src/plugins/archive/archiver_gtk.c:1129
 msgid "Choose this to use SHAR as format for the archive"
 msgstr "Välj detta för att använda SHAR som format för arkivet"
 
-#: ../src/plugins/archive/archiver_gtk.c:1135
+#: ../src/plugins/archive/archiver_gtk.c:1136
 msgid "Choose this option to use CPIO as format for the archive"
 msgstr "Välj detta alternativ för att använda CPIO som format för arkivet"
 
-#: ../src/plugins/archive/archiver_gtk.c:1142
+#: ../src/plugins/archive/archiver_gtk.c:1143
 msgid "Choose this option to use PAX as format for the archive"
 msgstr "Välj detta alternativ för att använda PAX som format för arkivet"
 
-#: ../src/plugins/archive/archiver_gtk.c:1162
+#: ../src/plugins/archive/archiver_gtk.c:1163
 msgid "Miscellaneous options"
 msgstr "Blandade inställningar"
 
-#: ../src/plugins/archive/archiver_gtk.c:1171
+#: ../src/plugins/archive/archiver_gtk.c:1172
 msgid "_Recursive"
 msgstr "_Rekursivt"
 
-#: ../src/plugins/archive/archiver_gtk.c:1175
+#: ../src/plugins/archive/archiver_gtk.c:1176
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Välj detta alternativ för att inkludera undermappar i arkivet"
 
-#: ../src/plugins/archive/archiver_gtk.c:1177
+#: ../src/plugins/archive/archiver_gtk.c:1178
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: ../src/plugins/archive/archiver_gtk.c:1181
+#: ../src/plugins/archive/archiver_gtk.c:1182
 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"
@@ -9255,11 +9443,11 @@ msgstr ""
 "Lägg dock märke till, att detta dramatiskt ökar tiden det\n"
 "kommer ta att skapa arkivet"
 
-#: ../src/plugins/archive/archiver_gtk.c:1185
+#: ../src/plugins/archive/archiver_gtk.c:1186
 msgid "R_ename"
 msgstr "Byt n_amn"
 
-#: ../src/plugins/archive/archiver_gtk.c:1189
+#: ../src/plugins/archive/archiver_gtk.c:1190
 #: ../src/plugins/archive/archiver_prefs.c:333
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9271,7 +9459,7 @@ msgstr ""
 "Namnschema: datum_från at till@ämne.\n"
 "Namn kommer att klippas av till max 96 tecken"
 
-#: ../src/plugins/archive/archiver_gtk.c:1197
+#: ../src/plugins/archive/archiver_gtk.c:1198
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9279,11 +9467,11 @@ msgstr ""
 "Välj detta alternativ för att ta bort meddelanden efter arkivering\n"
 "För närvarande hanterar detta bara IMAP, Lokal mbox och POP3"
 
-#: ../src/plugins/archive/archiver_gtk.c:1201
+#: ../src/plugins/archive/archiver_gtk.c:1202
 msgid "Selection options"
 msgstr "Markeringsalternativ"
 
-#: ../src/plugins/archive/archiver_gtk.c:1217
+#: ../src/plugins/archive/archiver_gtk.c:1218
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9372,26 +9560,95 @@ msgstr "Byt namn"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Välj detta alternativ för att ta bort mail efter arkivering"
 
-#: ../src/plugins/attachwarner/attachwarner.c:216
-#, c-format
-msgid ""
-"An attachment is mentioned in the mail you're sending, but no file was "
-"attached. Mention appears on line %d, which begins with text: <span weight="
-"\"bold\">%.20s</span>...\n"
-"\n"
-"%s it anyway?"
-msgstr ""
-"En bilaga nämns i e-posten du skickar, men det finns ingen fil  bifogad. På "
-"rad %d nämns bilagan, som börjar med texten: <span weight=\"bold\">%.20s</"
-"span>...\n"
-"\n"
-"%s den ändå?"
-
-#: ../src/plugins/attachwarner/attachwarner.c:220
-msgid "Attachment warning"
-msgstr "Bilagevarning"
+#: ../src/plugins/att_remover/att_remover.c:299
+msgid "<b>Type: </b>"
+msgstr "<b>Typ: </b>"
 
-#: ../src/plugins/attachwarner/attachwarner.c:245
+#: ../src/plugins/att_remover/att_remover.c:300
+msgid "<b>Size: </b>"
+msgstr "<b>Storlek: </b>"
+
+#: ../src/plugins/att_remover/att_remover.c:301
+msgid "<b>Filename: </b>"
+msgstr "<b>Filnamn: </b>"
+
+#: ../src/plugins/att_remover/att_remover.c:332
+msgid "Remove attachments"
+msgstr "Ta bort bilagor"
+
+#: ../src/plugins/att_remover/att_remover.c:357
+#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
+msgid "Remove"
+msgstr "Ta bort"
+
+#. S_COL_STATUS
+#: ../src/plugins/att_remover/att_remover.c:365
+#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
+msgid "Attachment"
+msgstr "Bilaga"
+
+#: ../src/plugins/att_remover/att_remover.c:417
+msgid "Destroy attachments"
+msgstr "Förstör bilagor"
+
+#: ../src/plugins/att_remover/att_remover.c:418
+msgid ""
+"Do you really want to remove all attachments from the selected messages?\n"
+"\n"
+"The deleted data will be unrecoverable."
+msgstr ""
+"Vill du verkligen ta bort alla bilagor från de valda meddelandena?n\n"
+"Den borttagna datan kommer inte gå att återställa."
+
+#: ../src/plugins/att_remover/att_remover.c:479
+msgid "This message doesn't have any attachments."
+msgstr "Detta meddelande har inga bilagor."
+
+#: ../src/plugins/att_remover/att_remover.c:494
+msgid "Remove attachments..."
+msgstr "Ta bort bilagor..."
+
+#: ../src/plugins/att_remover/att_remover.c:506
+#: ../src/plugins/att_remover/att_remover.c:566
+msgid "AttRemover"
+msgstr "AttRemover"
+
+#: ../src/plugins/att_remover/att_remover.c:571
+msgid ""
+"This plugin removes attachments from mails.\n"
+"\n"
+"Warning: this operation will be completely un-cancellable and the deleted "
+"attachments will be lost forever, and ever, and ever."
+msgstr ""
+"Denna insticksmodul tar bort bilagor från e-post.\n"
+"\n"
+"Varning: denna operation går inte att avbryta och de borttagna bilagorna "
+"kommer att vara borta för alltid."
+
+#: ../src/plugins/att_remover/att_remover.c:595
+msgid "Attachment handling"
+msgstr "Bilagehantering"
+
+#: ../src/plugins/attachwarner/attachwarner.c:216
+#, c-format
+msgid ""
+"An attachment is mentioned in the mail you're sending, but no file was "
+"attached. Mention appears on line %d, which begins with text: <span weight="
+"\"bold\">%.20s</span>...\n"
+"\n"
+"%s it anyway?"
+msgstr ""
+"En bilaga nämns i e-posten du skickar, men det finns ingen fil  bifogad. På "
+"rad %d nämns bilagan, som börjar med texten: <span weight=\"bold\">%.20s</"
+"span>...\n"
+"\n"
+"%s den ändå?"
+
+#: ../src/plugins/attachwarner/attachwarner.c:220
+msgid "Attachment warning"
+msgstr "Bilagevarning"
+
+#: ../src/plugins/attachwarner/attachwarner.c:245
 #: ../src/plugins/attachwarner/attachwarner.c:282
 #: ../src/plugins/attachwarner/attachwarner.c:334
 msgid "Attach warner"
@@ -9471,75 +9728,6 @@ msgstr "Exkluderande"
 msgid "Attach Warner"
 msgstr "Bilagevarnare"
 
-#: ../src/plugins/att_remover/att_remover.c:299
-msgid "<b>Type: </b>"
-msgstr "<b>Typ: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:300
-msgid "<b>Size: </b>"
-msgstr "<b>Storlek: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:301
-msgid "<b>Filename: </b>"
-msgstr "<b>Filnamn: </b>"
-
-#: ../src/plugins/att_remover/att_remover.c:332
-msgid "Remove attachments"
-msgstr "Ta bort bilagor"
-
-#: ../src/plugins/att_remover/att_remover.c:357
-#: ../src/plugins/vcalendar/vcal_meeting_gtk.c:324 ../src/prefs_themes.c:975
-msgid "Remove"
-msgstr "Ta bort"
-
-#. S_COL_STATUS
-#: ../src/plugins/att_remover/att_remover.c:365
-#: ../src/prefs_summary_column.c:80 ../src/summaryview.c:2777
-msgid "Attachment"
-msgstr "Bilaga"
-
-#: ../src/plugins/att_remover/att_remover.c:417
-msgid "Destroy attachments"
-msgstr "Förstör bilagor"
-
-#: ../src/plugins/att_remover/att_remover.c:418
-msgid ""
-"Do you really want to remove all attachments from the selected messages?\n"
-"\n"
-"The deleted data will be unrecoverable."
-msgstr ""
-"Vill du verkligen ta bort alla bilagor från de valda meddelandena?n\n"
-"Den borttagna datan kommer inte gå att återställa."
-
-#: ../src/plugins/att_remover/att_remover.c:479
-msgid "This message doesn't have any attachments."
-msgstr "Detta meddelande har inga bilagor."
-
-#: ../src/plugins/att_remover/att_remover.c:494
-msgid "Remove attachments..."
-msgstr "Ta bort bilagor..."
-
-#: ../src/plugins/att_remover/att_remover.c:506
-#: ../src/plugins/att_remover/att_remover.c:566
-msgid "AttRemover"
-msgstr "AttRemover"
-
-#: ../src/plugins/att_remover/att_remover.c:571
-msgid ""
-"This plugin removes attachments from mails.\n"
-"\n"
-"Warning: this operation will be completely un-cancellable and the deleted "
-"attachments will be lost forever, and ever, and ever."
-msgstr ""
-"Denna insticksmodul tar bort bilagor från e-post.\n"
-"\n"
-"Varning: denna operation går inte att avbryta och de borttagna bilagorna "
-"kommer att vara borta för alltid."
-
-#: ../src/plugins/att_remover/att_remover.c:595
-msgid "Attachment handling"
-msgstr "Bilagehantering"
-
 #: ../src/plugins/bogofilter/bogofilter.c:81
 #: ../src/plugins/bogofilter/bogofilter_gtk.c:458
 msgid "Bogofilter"
@@ -10132,63 +10320,63 @@ msgstr ""
 "\n"
 "Den är verkligen inte användbar."
 
-#: ../src/plugins/fancy/fancy_prefs.c:141
+#: ../src/plugins/fancy/fancy_prefs.c:146
 msgid "Display images"
 msgstr "Visa bilder"
 
-#: ../src/plugins/fancy/fancy_prefs.c:142
+#: ../src/plugins/fancy/fancy_prefs.c:147
 msgid "Display embedded images"
 msgstr "Visa inbäddade bilder"
 
-#: ../src/plugins/fancy/fancy_prefs.c:146
+#: ../src/plugins/fancy/fancy_prefs.c:151
 msgid "Execute javascript"
 msgstr "Exekvera Javascript"
 
-#: ../src/plugins/fancy/fancy_prefs.c:147
+#: ../src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute embedded javascript"
 msgstr "Exekvera inbäddade javascript"
 
-#: ../src/plugins/fancy/fancy_prefs.c:151
+#: ../src/plugins/fancy/fancy_prefs.c:156
 msgid "Execute Java applets"
 msgstr "Exekvera Java-applet"
 
-#: ../src/plugins/fancy/fancy_prefs.c:152
+#: ../src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute embedded Java applets"
 msgstr "Exekvera inbäddade Java-applets"
 
-#: ../src/plugins/fancy/fancy_prefs.c:156
+#: ../src/plugins/fancy/fancy_prefs.c:161
 msgid "Render objects using plugins"
 msgstr "Rendera objekt med hjälp av insticksmoduler"
 
-#: ../src/plugins/fancy/fancy_prefs.c:157
+#: ../src/plugins/fancy/fancy_prefs.c:162
 msgid "Render embedded objects using plugins"
 msgstr "Rendera inbäddade objekt med hjälp av insicksmoduler"
 
-#: ../src/plugins/fancy/fancy_prefs.c:164
+#: ../src/plugins/fancy/fancy_prefs.c:169
 msgid "Open in viewer (remote content is enabled)"
 msgstr "Öppna i visare (fjärrinnehåll är aktiverat)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:167
+#: ../src/plugins/fancy/fancy_prefs.c:172
 msgid "Do nothing (remote content is disabled)"
 msgstr "Gör ingenting (fjärrinnehåll är inaktiverat)"
 
-#: ../src/plugins/fancy/fancy_prefs.c:200
+#: ../src/plugins/fancy/fancy_prefs.c:209
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/plugins/fancy/fancy_prefs.c:202
+#: ../src/plugins/fancy/fancy_prefs.c:211
 msgid "Use GNOME's proxy settings"
 msgstr "Använd proxyinställningar från GNOME"
 
-#: ../src/plugins/fancy/fancy_prefs.c:210
+#: ../src/plugins/fancy/fancy_prefs.c:219
 msgid "Use proxy:"
 msgstr "Använd proxy:"
 
-#: ../src/plugins/fancy/fancy_prefs.c:228
+#: ../src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
 msgstr "Fjärrresurser"
 
-#: ../src/plugins/fancy/fancy_prefs.c:229
+#: ../src/plugins/fancy/fancy_prefs.c:238
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10203,106 +10391,124 @@ msgstr ""
 "javaappletar kan fortfarande vara aktiverat för innehåll som är\n"
 "bifogat i e-brevet."
 
-#: ../src/plugins/fancy/fancy_prefs.c:235
+#: ../src/plugins/fancy/fancy_prefs.c:244
 msgid "Enable loading of remote content"
 msgstr "Aktivera laddning av fjärrinnehåll"
 
-#: ../src/plugins/fancy/fancy_prefs.c:267
+#: ../src/plugins/fancy/fancy_prefs.c:276
 msgid "When clicking on a link, by default:"
 msgstr "Vid klickning av länkar, som standard:"
 
-#: ../src/plugins/fancy/fancy_prefs.c:275
+#: ../src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
 msgstr "Öppna med extern webbläsare"
 
-#: ../src/plugins/fancy/fancy_viewer.c:391
+#: ../src/plugins/fancy/fancy_prefs.c:298
+msgid "The CSS in this file will be applied to all HTML parts"
+msgstr "CSSen i denna fil kommer att appliceras på alla HTML-delar"
+
+#: ../src/plugins/fancy/fancy_prefs.c:300
+msgid "Stylesheet:"
+msgstr "Stilmall:"
+
+#: ../src/plugins/fancy/fancy_prefs.c:308 ../src/prefs_account.c:1442
+#: ../src/prefs_account.c:1531 ../src/prefs_account.c:1991
+#: ../src/prefs_customheader.c:237
+msgid "Bro_wse"
+msgstr "Bläddra"
+
+#: ../src/plugins/fancy/fancy_prefs.c:350
+msgid "Select stylesheet"
+msgstr "Välj stilmall"
+
+#: ../src/plugins/fancy/fancy_viewer.c:393
 msgid "Remote content loading is disabled."
 msgstr "Laddning av fjärrinnehåll är avaktiverat."
 
-#: ../src/plugins/fancy/fancy_viewer.c:468
+#: ../src/plugins/fancy/fancy_viewer.c:470
 msgid "Load images"
 msgstr "Ladda bilder"
 
-#: ../src/plugins/fancy/fancy_viewer.c:470
+#: ../src/plugins/fancy/fancy_viewer.c:472
 msgid "Enable remote content"
 msgstr "Tillåt externt innehåll"
 
-#: ../src/plugins/fancy/fancy_viewer.c:472
+#: ../src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable Javascript"
 msgstr "Aktivera Javascript"
 
-#: ../src/plugins/fancy/fancy_viewer.c:474
+#: ../src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Plugins"
 msgstr "Aktivera Insticksmoduler"
 
-#: ../src/plugins/fancy/fancy_viewer.c:476
+#: ../src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Java"
 msgstr "Aktivera Java"
 
-#: ../src/plugins/fancy/fancy_viewer.c:478
+#: ../src/plugins/fancy/fancy_viewer.c:480
 msgid "Open links with external browser"
 msgstr "Öppna länkar med extern browser"
 
-#: ../src/plugins/fancy/fancy_viewer.c:647
+#: ../src/plugins/fancy/fancy_viewer.c:649
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ett fel uppstod: %d\n"
 
-#: ../src/plugins/fancy/fancy_viewer.c:703
+#: ../src/plugins/fancy/fancy_viewer.c:705
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s är ett felaktigt eller ett flöde som inte stöds"
 
-#: ../src/plugins/fancy/fancy_viewer.c:714
+#: ../src/plugins/fancy/fancy_viewer.c:716
 msgid "Search the Web"
 msgstr "Sök webben"
 
-#: ../src/plugins/fancy/fancy_viewer.c:726
+#: ../src/plugins/fancy/fancy_viewer.c:728
 msgid "Open in Viewer"
 msgstr "Öppna i visare"
 
-#: ../src/plugins/fancy/fancy_viewer.c:728
+#: ../src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer (enable remote content)"
 msgstr "Öppna i Visare (aktivera fjärrinnehåll)"
 
-#: ../src/plugins/fancy/fancy_viewer.c:737
+#: ../src/plugins/fancy/fancy_viewer.c:739
 msgid "Open in Browser"
 msgstr "Öppna i browser"
 
-#: ../src/plugins/fancy/fancy_viewer.c:747
+#: ../src/plugins/fancy/fancy_viewer.c:749
 msgid "Open Image"
 msgstr "Öppna Bild"
 
-#: ../src/plugins/fancy/fancy_viewer.c:756
+#: ../src/plugins/fancy/fancy_viewer.c:758
 msgid "Copy Link"
 msgstr "Kopiera Länk"
 
-#: ../src/plugins/fancy/fancy_viewer.c:760
+#: ../src/plugins/fancy/fancy_viewer.c:762
 msgid "Download Link"
 msgstr "Ladda ner Länk"
 
-#: ../src/plugins/fancy/fancy_viewer.c:771
+#: ../src/plugins/fancy/fancy_viewer.c:773
 msgid "Save Image As"
 msgstr "Spara Bild Som"
 
-#: ../src/plugins/fancy/fancy_viewer.c:781
+#: ../src/plugins/fancy/fancy_viewer.c:783
 msgid "Copy Image"
 msgstr "Kopiera Bild"
 
-#: ../src/plugins/fancy/fancy_viewer.c:799
+#: ../src/plugins/fancy/fancy_viewer.c:801
 msgid "Import feed"
 msgstr "Importera flöde"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1012
+#: ../src/plugins/fancy/fancy_viewer.c:1014
 msgid "Fancy"
 msgstr "Fancy"
 
 #. i18n: 'Fancy' here is name of the plugin, not the english word.
-#: ../src/plugins/fancy/fancy_viewer.c:1040
+#: ../src/plugins/fancy/fancy_viewer.c:1042
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML-Visare"
 
-#: ../src/plugins/fancy/fancy_viewer.c:1045
+#: ../src/plugins/fancy/fancy_viewer.c:1047
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10512,1026 +10718,1000 @@ msgstr "GData-integrering"
 #: ../src/plugins/geolocation/geolocation_plugin.c:349
 #, c-format
 msgid "Found location: (%.2f,%.2f)"
-msgstr ""
+msgstr "Funnen plats: (%.2f,%.2f)"
 
 #. TRANSLATORS: The country name is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:369
 msgid "Alleged country of origin: "
-msgstr ""
+msgstr "Påstått ursprungsland:"
 
 #. TRANSLATORS: The IP address is appended to the string
 #: ../src/plugins/geolocation/geolocation_plugin.c:373
-#, fuzzy
 msgid "Could not resolve location of IP address "
-msgstr "Kunde inte läsa adressindex"
+msgstr "Kunde inte avgöra IP-adressens lokalisering"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:512
-#, fuzzy
 msgid "Try to locate sender"
-msgstr "avsändarens förnamn"
+msgstr "Försök att lokalisera avsändare"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:528
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:529
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Förenade Arabemiraten"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:530
 msgid "Afghanistan"
-msgstr ""
+msgstr "Afghanistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:531
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "Antigua och Barbuda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:532
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguilla"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:533
 msgid "Albania"
-msgstr ""
+msgstr "Albanien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:534
 msgid "Armenia"
-msgstr ""
+msgstr "Armenien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:535
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Nederländska Antillerna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:536
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:537
 msgid "Antarctica"
-msgstr ""
+msgstr "Antarktis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:538
-#, fuzzy
 msgid "Argentina"
-msgstr "Magenta"
+msgstr "Argentina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:539
 msgid "American Samoa"
-msgstr ""
+msgstr "Amerikanska Samoa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:540
 msgid "Austria"
-msgstr ""
+msgstr "Österrike"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:541
 msgid "Australia"
-msgstr ""
+msgstr "Australien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:542
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:543
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbajdzjan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:544
 msgid "Bosnia And Herzegovina"
-msgstr ""
+msgstr "Bosnien-Herzegovina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:545
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:546
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladesh"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:547
 msgid "Belgium"
-msgstr ""
+msgstr "Belgien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:548
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:549
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgarien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:550
 msgid "Bahrain"
-msgstr ""
+msgstr "Bahrain"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:551
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:552
 msgid "Benin"
-msgstr ""
+msgstr "Benin"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:553
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermuda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:554
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:555
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolivia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:556
 msgid "Brazil"
-msgstr ""
+msgstr "Brasilien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:557
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahamas"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:558
 msgid "Bhutan"
-msgstr ""
+msgstr "Bhutan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:559
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Bouvetön"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:560
 msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:561
 msgid "Belarus"
-msgstr ""
+msgstr "Vitryssland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:562
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:563
 msgid "Canada"
-msgstr ""
+msgstr "Kanada"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:564
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Kokosöarna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:565
 msgid "Central African Republic"
-msgstr ""
+msgstr "Centralafrikanska Republiken"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:566
 msgid "Congo"
-msgstr ""
+msgstr "Kongo"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:567
 msgid "Switzerland"
-msgstr ""
+msgstr "Schweiz"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:568
 msgid "Cote D'Ivoire"
-msgstr ""
+msgstr "Elfenbenskusten"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:569
 msgid "Cook Islands"
-msgstr ""
+msgstr "Cooköarna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:570
 msgid "Chile"
-msgstr ""
+msgstr "Chile"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:571
 msgid "Cameroon"
-msgstr ""
+msgstr "Kamerun"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:572
-#, fuzzy
 msgid "China"
-msgstr "Kinesiska"
+msgstr "Kina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:573
-#, fuzzy
 msgid "Colombia"
-msgstr "Färger"
+msgstr "Colombia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:574
 msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:575
 msgid "Cuba"
-msgstr ""
+msgstr "Kuba"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:576
 msgid "Cape Verde"
-msgstr ""
+msgstr "Kap Verde"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:577
 msgid "Christmas Island"
-msgstr ""
+msgstr "julön"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:578
 msgid "Cyprus"
-msgstr ""
+msgstr "Cypern"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:579
 msgid "Czech Republic"
-msgstr ""
+msgstr "Tjeckien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:580
 msgid "Germany"
-msgstr ""
+msgstr "Tyskland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:581
 msgid "Djibouti"
-msgstr ""
+msgstr "Djibouti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:582
-#, fuzzy
 msgid "Denmark"
-msgstr "Avmarkera"
+msgstr "Danmark"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:583
 msgid "Dominica"
-msgstr ""
+msgstr "Dominica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:584
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Dominikanska republiken"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:585
 msgid "Algeria"
-msgstr ""
+msgstr "Algeriet"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:586
 msgid "Ecuador"
-msgstr ""
+msgstr "Ecuador"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:587
 msgid "Estonia"
-msgstr ""
+msgstr "Estland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:588
 msgid "Egypt"
-msgstr ""
+msgstr "Egypten"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:589
-#, fuzzy
 msgid "Western Sahara"
-msgstr "Västeuropeisk (ISO-8859-1)"
+msgstr "Västsahara"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:590
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:591
 msgid "Spain"
-msgstr ""
+msgstr "Spanien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:592
 msgid "Ethiopia"
-msgstr ""
+msgstr "Etiopien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:593
 msgid "Finland"
-msgstr ""
+msgstr "Finland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:594
 msgid "Fiji"
-msgstr ""
+msgstr "Fiji"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:595
 msgid "Falkland Islands (Malvinas)"
-msgstr ""
+msgstr "Falklandsöarna (Malvinas)"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:596
 msgid "Micronesia, Federated States Of"
-msgstr ""
+msgstr "Mikronesien, federala staterna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:597
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Färöarna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:598
-#, fuzzy
 msgid "France"
-msgstr "Avbryt"
+msgstr "Frankrike"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:599
 msgid "France, Metropolitan"
-msgstr ""
+msgstr "Frankrike, egentliga"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:600
 msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:601
 #: ../src/plugins/geolocation/geolocation_plugin.c:747
 msgid "United Kingdom"
-msgstr ""
+msgstr "Förenad Kungariket"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:602
 msgid "Grenada"
-msgstr ""
+msgstr "Grenada"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:603
 msgid "Georgia"
-msgstr ""
+msgstr "Georgien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:604
 msgid "French Guiana"
-msgstr ""
+msgstr "Franska Guiana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:605
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:606
-#, fuzzy
 msgid "Gibraltar"
-msgstr "Libravatar"
+msgstr "Gibraltar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:607
-#, fuzzy
 msgid "Greenland"
-msgstr "Grön"
+msgstr "Grönland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:608
 msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:609
 msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:610
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Guadeloupe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:611
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Ekvartorialguinea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:612
-#, fuzzy
 msgid "Greece"
-msgstr "Grön"
+msgstr "Grekland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:613
 msgid "South Georgia And The South Sandwich Islands"
-msgstr ""
+msgstr "Sydgeorgien och södra Sandwichöarna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:614
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:615
 msgid "Guam"
-msgstr ""
+msgstr "Guam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:616
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Guinea-Bissau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:617
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:618
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:619
 msgid "Heard Island And Mcdonald Islands"
-msgstr ""
+msgstr "Heardön och McDonaldöarna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:620
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:621
 msgid "Croatia"
-msgstr ""
+msgstr "Kroatien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:622
 msgid "Haiti"
-msgstr ""
+msgstr "Haiti"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:623
 msgid "Hungary"
-msgstr ""
+msgstr "Ungern"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:624
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonesien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:625
 msgid "Ireland"
-msgstr ""
+msgstr "Irland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:626
 msgid "Israel"
-msgstr ""
+msgstr "Israel"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:627
-#, fuzzy
 msgid "India"
-msgstr "Indikator"
+msgstr "Indien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:628
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Brittiskt territorium i Indiska Oceanen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:629
 msgid "Iraq"
-msgstr ""
+msgstr "Irak"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:630
 msgid "Iran, Islamic Republic Of"
-msgstr ""
+msgstr "Iran, Islamska republiken"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:631
 msgid "Iceland"
-msgstr ""
+msgstr "Island"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:632
 msgid "Italy"
-msgstr ""
+msgstr "Italien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:633
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamaica"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:634
 msgid "Jordan"
-msgstr ""
+msgstr "Jordanien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:635
-#, fuzzy
 msgid "Japan"
-msgstr "Japansk (EUC-JP)"
+msgstr "Japan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:636
 msgid "Kenya"
-msgstr ""
+msgstr "Kenya"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:637
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kirgisistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:638
 msgid "Cambodia"
-msgstr ""
+msgstr "Kambodja"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:639
 msgid "Kiribati"
-msgstr ""
+msgstr "Karibati"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:640
-#, fuzzy
 msgid "Comoros"
-msgstr "imorgon"
+msgstr "Comorerna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:641
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "Saint Kitts och Nevis"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:642
 msgid "Korea, Democratic People'S Republic Of"
-msgstr ""
+msgstr "Korea, demokratiska folkrepubliken"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:643
 msgid "Korea, Republic Of"
-msgstr ""
+msgstr "Sydkorea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:644
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuwait"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:645
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Caymanöarna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:646
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazakstan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:647
 msgid "Lao People'S Democratic Republic"
-msgstr ""
+msgstr "Demokratiska folkrepubliken Lao"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:648
 msgid "Lebanon"
-msgstr ""
+msgstr "Libanon"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:649
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Saint Lucia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:650
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:651
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:652
 msgid "Liberia"
-msgstr ""
+msgstr "Liberia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:653
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:654
 msgid "Lithuania"
-msgstr ""
+msgstr "Litauen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:655
 msgid "Luxembourg"
-msgstr ""
+msgstr "Luxemburg"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:656
 msgid "Latvia"
-msgstr ""
+msgstr "Lettland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:657
 msgid "Libyan Arab Jamahiriya"
-msgstr ""
+msgstr "Libyen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:658
 msgid "Morocco"
-msgstr ""
+msgstr "Marocko"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:659
 msgid "Monaco"
-msgstr ""
+msgstr "Monaco"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:660
 msgid "Moldova, Republic Of"
-msgstr ""
+msgstr "Moldavien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:661
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagaskar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:662
-#, fuzzy
 msgid "Marshall Islands"
-msgstr "Markera alla som lästa"
+msgstr "Marshallöarna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:663
 msgid "Macedonia, The Former Yugoslav Republic Of"
-msgstr ""
+msgstr "Makedonien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:664
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:665
-#, fuzzy
 msgid "Myanmar"
-msgstr "Avmarkera"
+msgstr "Burma"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:666
 msgid "Mongolia"
-msgstr ""
+msgstr "Mongoliet"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:667
 msgid "Macao"
-msgstr ""
+msgstr "Macao"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:668
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Nordmarianerna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:669
 msgid "Martinique"
-msgstr ""
+msgstr "Martinique"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:670
 msgid "Mauritania"
-msgstr ""
+msgstr "Mauretanien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:671
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:672
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:673
 msgid "Mauritius"
-msgstr ""
+msgstr "Mauritius"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:674
 msgid "Maldives"
-msgstr ""
+msgstr "Maldiverna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:675
 msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:676
 msgid "Mexico"
-msgstr ""
+msgstr "Mexico"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:677
 msgid "Malaysia"
-msgstr ""
+msgstr "Malaysia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:678
 msgid "Mozambique"
-msgstr ""
+msgstr "Moçambique"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:679
 msgid "Namibia"
-msgstr ""
+msgstr "Namibia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:680
-#, fuzzy
 msgid "New Caledonia"
-msgstr "Ny Kontakt"
+msgstr "Nya Kaledonien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:681
 msgid "Niger"
-msgstr ""
+msgstr "Niger"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:682
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Norfolköarna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:683
 msgid "Nigeria"
-msgstr ""
+msgstr "Nigeria"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:684
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicaragua"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:685
 msgid "Netherlands"
-msgstr ""
+msgstr "Nederländerna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:686
-#, fuzzy
 msgid "Norway"
-msgstr "Vidarebefordra"
+msgstr "Norge"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:687
 msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:688
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:689
 msgid "Niue"
-msgstr ""
+msgstr "Niue"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:690
 msgid "New Zealand"
-msgstr ""
+msgstr "Nya Zeeland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:691
 msgid "Oman"
-msgstr ""
+msgstr "Oman"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:692
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:693
 msgid "Peru"
-msgstr ""
+msgstr "Peru"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:694
 msgid "French Polynesia"
-msgstr ""
+msgstr "Franska Polynesien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:695
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua Nya Guinea"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:696
-#, fuzzy
 msgid "Philippines"
-msgstr "rader"
+msgstr "Filippinerna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:697
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:698
 msgid "Poland"
-msgstr ""
+msgstr "Polen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:699
 msgid "Saint Pierre And Miquelon"
-msgstr ""
+msgstr "Sankt Pierre och Miquelon"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:700
 msgid "Pitcairn"
-msgstr ""
+msgstr "Pitcairn"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:701
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Puerto Rico"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:702
-#, fuzzy
 msgid "Portugal"
-msgstr "Port"
+msgstr "Portugal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:703
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:704
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguay"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:705
-#, fuzzy
 msgid "Qatar"
-msgstr "Wavatar"
+msgstr "Qatar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:706
 msgid "Reunion"
-msgstr ""
+msgstr "Reunion"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:707
 msgid "Romania"
-msgstr ""
+msgstr "Rumänien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:708
 msgid "Russian Federation"
-msgstr ""
+msgstr "Ryska Federationen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:709
 msgid "Rwanda"
-msgstr ""
+msgstr "Rwanda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:710
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Saudiarabien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:711
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Solomonöarna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:712
 msgid "Seychelles"
-msgstr ""
+msgstr "Seychellerna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:713
 msgid "Sudan"
-msgstr ""
+msgstr "Sudan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:714
 msgid "Sweden"
-msgstr ""
+msgstr "Sverige"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:715
 msgid "Singapore"
-msgstr ""
+msgstr "Singapore"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:716
 msgid "Saint Helena"
-msgstr ""
+msgstr "Saint Helena, Ascension och Tristan da Cunha"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:717
 msgid "Slovenia"
-msgstr ""
+msgstr "Slovenien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:718
 msgid "Svalbard And Jan Mayen"
-msgstr ""
+msgstr "Svalbard och Jan Mayen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:719
 msgid "Slovakia"
-msgstr ""
+msgstr "Slovakien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:720
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:721
 msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:722
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:723
 msgid "Somalia"
-msgstr ""
+msgstr "Somalia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:724
-#, fuzzy
 msgid "Suriname"
-msgstr "SMTP användarnamn:"
+msgstr "Surinam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:725
 msgid "Sao Tome And Principe"
-msgstr ""
+msgstr "São Tomé och Príncipe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:726
 msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:727
 msgid "Syrian Arab Republic"
-msgstr ""
+msgstr "Syrianska arabrepubliken"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:728
 msgid "Swaziland"
-msgstr ""
+msgstr "Swaziland"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:729
 msgid "Turks And Caicos Islands"
-msgstr ""
+msgstr "Turks- och Caicosöarna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:730
 msgid "Chad"
-msgstr ""
+msgstr "Tchad"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:731
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Franska sydterritorierna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:732
 msgid "Togo"
-msgstr ""
+msgstr "Franska sydterritorierna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:733
-#, fuzzy
 msgid "Thailand"
-msgstr "Thai"
+msgstr "Thailand"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:734
 msgid "Tajikistan"
-msgstr ""
+msgstr "Tadzjikistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:735
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:736
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkmenistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:737
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunisien"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:738
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:739
 msgid "East Timor"
-msgstr ""
+msgstr "Östtimor"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:740
 msgid "Turkey"
-msgstr ""
+msgstr "Turkiet"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:741
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "Trinidad och Tobago"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:742
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:743
 msgid "Taiwan, Province Of China"
-msgstr ""
+msgstr "Taiwan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:744
 msgid "Tanzania, United Republic Of"
-msgstr ""
+msgstr "Tanzania, förenade republiken"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:745
 msgid "Ukraine"
-msgstr ""
+msgstr "Ukraina"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:746
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:748
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "USA:s avlägsna mindre öar"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:749
 msgid "United States"
-msgstr ""
+msgstr "USA"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:750
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguay"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:751
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekistan"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:752
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Vatikanstaten"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:753
 msgid "Saint Vincent And The Grenadines"
-msgstr ""
+msgstr "Sankt Vincent och Grenadinerna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:754
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:755
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "Jungfruöarna, brittiska"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:756
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "Jungfruöarna, amerikanska"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:757
-#, fuzzy
 msgid "Viet Nam"
-msgstr "Filnamn"
+msgstr "Vietnam"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:758
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:759
 msgid "Wallis And Futuna"
-msgstr ""
+msgstr "Wallis och Futuna"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:760
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:761
 msgid "Yemen"
-msgstr ""
+msgstr "Yemen"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:762
 msgid "Mayotte"
-msgstr ""
+msgstr "Mayotte"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:763
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "Serbien och Montenegro"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:764
 msgid "South Africa"
-msgstr ""
+msgstr "Sydafrika"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:765
 msgid "Zambia"
-msgstr ""
+msgstr "Zambia"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:766
 msgid "Democratic Republic Of The Congo"
-msgstr ""
+msgstr "Kongo, demokratiska republiken"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:767
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:777
 #: ../src/plugins/geolocation/geolocation_plugin.c:862
-#, fuzzy
 msgid "GeoLocation"
-msgstr "Plats:"
+msgstr "GeoLocation"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:782
-#, fuzzy, c-format
+#, c-format
 msgid "Could not initialize clutter"
-msgstr "Kunde inte starta %s stavningsprogram."
+msgstr "Kunde inte initiera clutter"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:788
 #: ../src/plugins/geolocation/geolocation_plugin.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create regular expression: %s\n"
-msgstr "Kunde inte skapa tillfällig fil: %s"
+msgstr "Kunde inte skapa reguljärt uttryck: %s\n"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:803
-#, fuzzy
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
 msgstr ""
-"Misslyckades registrera kopplingspunkt för temaförändring i "
-"Notifieringsinsticksmodulen"
+"Misslyckades att registrera kopplingspunkt för messageview_show i "
+"insticksmodulen Geolocation"
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:867
 msgid ""
@@ -11549,37 +11729,50 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome (but only if it's not about marital "
 "quarrels)."
 msgstr ""
+"Denna insticksmodul tillhandahåller GeoLocation-funktionalitet för Claws "
+"Mail.\n"
+"\n"
+"Varning: Det är tekniskt omöjligt att få den geografiska läget från "
+"avsändare från deras e-postadress med någon sorts precision. Resultaten som "
+"presenteras av denna insticksmodul är endast grova uppskattningar. Speciellt "
+"så brukar ansvariga för sändlistor ta bort avsändarinformation från "
+"meddelanden, så e-post från sändlistor kan anses vara från platsen där "
+"sändlisteservern finns istället för meddelandets avsändare.\n"
+"När du är osäker, lita inte på insticksmodulens resultat, och förlita dig "
+"inte på denna information för att skilja dig från din maka eller make.\n"
+"\n"
+"Återkoppling till <berndth at gmx.de> uppskattas (men endast om det inte rör "
+"äktenskapliga gräl)."
 
 #: ../src/plugins/geolocation/geolocation_plugin.c:900
-#, fuzzy
 msgid "GeoLocation integration"
-msgstr "GData-integrering"
+msgstr "GeoLocation-integrering"
 
-#: ../src/plugins/libravatar/libravatar.c:374
-#: ../src/plugins/libravatar/libravatar.c:445
-#: ../src/plugins/libravatar/libravatar.c:505
-#: ../src/plugins/libravatar/libravatar_prefs.c:400
+#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:452
+#: ../src/plugins/libravatar/libravatar.c:512
+#: ../src/plugins/libravatar/libravatar_prefs.c:440
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: ../src/plugins/libravatar/libravatar.c:381
+#: ../src/plugins/libravatar/libravatar.c:388
 msgid "Failed to register avatar header update hook"
 msgstr ""
 "Misslyckades att registrera uppdateringskopplingspunkt för avatarrubriker"
 
-#: ../src/plugins/libravatar/libravatar.c:389
+#: ../src/plugins/libravatar/libravatar.c:396
 msgid "Failed to register avatar image render hook"
 msgstr "Misslyckades att registrera renderingskopplingspunkt för avatarbilder"
 
-#: ../src/plugins/libravatar/libravatar.c:394
+#: ../src/plugins/libravatar/libravatar.c:401
 msgid "Failed to create avatar image cache directory"
 msgstr "Misslyckades att skapa cachemapp för avatarbilder"
 
-#: ../src/plugins/libravatar/libravatar.c:403
+#: ../src/plugins/libravatar/libravatar.c:410
 msgid "Failed to load missing items cache"
 msgstr "Misslyckades att ladda cache med saknade objekt"
 
-#: ../src/plugins/libravatar/libravatar.c:455
+#: ../src/plugins/libravatar/libravatar.c:462
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -11610,87 +11803,87 @@ msgstr ""
 "\n"
 "Feedback till <ricardo at mones.org> välkomnas.\n"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:112
+#: ../src/plugins/libravatar/libravatar_prefs.c:138
 msgid "_Use cached icons"
 msgstr "Använd cachade ikoner"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:113
+#: ../src/plugins/libravatar/libravatar_prefs.c:139
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr ""
 "Behåll ikoner på disk för återanvändning istället för att göra ytterligare "
 "en nätverksförfrågan"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:121
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
 msgid "Cache refresh interval"
 msgstr "Interval för Cacheuppdatering"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:123
-#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:333
+#: ../src/plugins/libravatar/libravatar_prefs.c:154
+#: ../src/prefs_account.c:1487 ../src/prefs_matcher.c:335
 msgid "hours"
 msgstr "timmar"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:188
+#: ../src/plugins/libravatar/libravatar_prefs.c:207
 msgid "Mystery man"
 msgstr "Mystery man"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:189
+#: ../src/plugins/libravatar/libravatar_prefs.c:208
 msgid "Identicon"
 msgstr "Identicon"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:190
+#: ../src/plugins/libravatar/libravatar_prefs.c:209
 msgid "MonsterID"
 msgstr "MonsterID"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:191
+#: ../src/plugins/libravatar/libravatar_prefs.c:210
 msgid "Wavatar"
 msgstr "Wavatar"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:192
+#: ../src/plugins/libravatar/libravatar_prefs.c:211
 msgid "Retro"
 msgstr "Retro"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:193
+#: ../src/plugins/libravatar/libravatar_prefs.c:212
 msgid "Custom URL"
 msgstr "Anpassad URL"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:196
+#: ../src/plugins/libravatar/libravatar_prefs.c:215
 msgid "A blank image"
 msgstr "Tom bild"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:197
+#: ../src/plugins/libravatar/libravatar_prefs.c:216
 msgid "The unobtrusive low-contrast greyish silhouette"
 msgstr "Den diskreta gråaktiga lågkontrastsiluetten"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:198
+#: ../src/plugins/libravatar/libravatar_prefs.c:217
 msgid "A generated geometric pattern"
 msgstr "Ett genererat geometriskt mönster"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:199
+#: ../src/plugins/libravatar/libravatar_prefs.c:218
 msgid "A generated full-body monster"
 msgstr "Ett genererat fullkroppsmonster"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:200
+#: ../src/plugins/libravatar/libravatar_prefs.c:219
 msgid "A generated almost unique face"
 msgstr "Ett genererat nästan unikt ansikte"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:201
+#: ../src/plugins/libravatar/libravatar_prefs.c:220
 msgid "A generated 8-bit arcade-style pixelated image"
 msgstr "En genererad 8-bitars pixlad bild"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:202
+#: ../src/plugins/libravatar/libravatar_prefs.c:221
 msgid "Redirect to a user provided URL"
 msgstr "Omdirigering till en URL tillhandahållen av användare"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:229 ../src/prefs_themes.c:878
+#: ../src/plugins/libravatar/libravatar_prefs.c:248 ../src/prefs_themes.c:878
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:256
+#: ../src/plugins/libravatar/libravatar_prefs.c:276
 msgid "_Allow redirects to other sites"
 msgstr "Tillåt omdirigeringar till _andra sajter"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:257
+#: ../src/plugins/libravatar/libravatar_prefs.c:277
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
@@ -11698,23 +11891,44 @@ msgstr ""
 "Följ omdirigeringssvar mottagna från libravatarservern till andra "
 "avatartjänster som gravatar.com"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:266
+#: ../src/plugins/libravatar/libravatar_prefs.c:286
 msgid "_Enable federated servers"
 msgstr "Aktiv_era federerade servrar"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:267
+#: ../src/plugins/libravatar/libravatar_prefs.c:287
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr "Försök att få avatar från avsändarens libravatarserver på deras domän"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:312
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+msgid "Request timeout"
+msgstr "Efterfrågad tidsgräns"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:304
+#: ../src/plugins/notification/notification_prefs.c:1028
+#: ../src/plugins/notification/notification_prefs.c:1300
+#: ../src/plugins/notification/notification_prefs.c:1608
+#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
+#: ../src/prefs_summaries.c:496
+msgid "seconds"
+msgstr "sekunder"
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:305
+msgid ""
+"Set to 0 to use global socket I/O timeout. Maximum value must be also less "
+"than global socket I/O timeout."
+msgstr ""
+"Sätt till 0 för använda global socket I/O timeout. Maximalt värde måste även "
+"vara lägre än globala socket I/O timeouten."
+
+#: ../src/plugins/libravatar/libravatar_prefs.c:349
 msgid "Icon cache"
 msgstr "Ikoncache"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:316
+#: ../src/plugins/libravatar/libravatar_prefs.c:353
 msgid "Default missing icon mode"
 msgstr "Standardläge för saknad ikon"
 
-#: ../src/plugins/libravatar/libravatar_prefs.c:320
+#: ../src/plugins/libravatar/libravatar_prefs.c:357
 msgid "Network"
 msgstr "Nätverk"
 
@@ -12043,9 +12257,8 @@ msgstr "Kalendermappar"
 
 #. Warning-Label
 #: ../src/plugins/notification/notification_prefs.c:639
-#, fuzzy
 msgid "These settings override folder-specific selections."
-msgstr "Dessa inställningar skriver över mappspecifika val."
+msgstr "Dessa inställningar åsidosätter mappspecifika val."
 
 #. Frame
 #: ../src/plugins/notification/notification_prefs.c:650
@@ -12172,14 +12385,6 @@ msgstr "Aktivera popup"
 msgid "Popup timeout:"
 msgstr "Tidsgräns för popup:"
 
-#: ../src/plugins/notification/notification_prefs.c:1028
-#: ../src/plugins/notification/notification_prefs.c:1300
-#: ../src/plugins/notification/notification_prefs.c:1608
-#: ../src/plugins/spamassassin/spamassassin_gtk.c:391 ../src/prefs_other.c:558
-#: ../src/prefs_summaries.c:496
-msgid "seconds"
-msgstr "sekunder"
-
 #. Sticky check button
 #: ../src/plugins/notification/notification_prefs.c:1057
 msgid "Make popup sticky"
@@ -12430,7 +12635,7 @@ msgstr "av %d"
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1359
 msgid "PDF rendering failed for an unknown reason."
-msgstr ""
+msgstr "Rendering av PDF misslyckas av okänd anledning."
 
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1722
 #: ../src/plugins/pdf_viewer/poppler_viewer.c:1940
@@ -12526,7 +12731,7 @@ msgstr ""
 
 #: ../src/plugins/perl/perl_gtk.c:50
 msgid "Edit perl filter rules (ext)..."
-msgstr ""
+msgstr "Redigera perl-filterregler (ext)..."
 
 #: ../src/plugins/pgpcore/autocompletion.c:125
 msgid "Failed to register PGP address autocompletion hook"
@@ -12617,7 +12822,7 @@ msgstr "   Den här nyckeln finns inte i din nyckelring.\n"
 
 #: ../src/plugins/pgpcore/pgp_viewer.c:133
 msgid "   It should be possible to import it "
-msgstr "   Det ska vara möjligt att importera den"
+msgstr "   Det ska vara möjligt att importera den "
 
 #: ../src/plugins/pgpcore/pgp_viewer.c:135
 msgid ""
@@ -12790,12 +12995,12 @@ msgid "Undefined"
 msgstr "Odefinierad"
 
 #: ../src/plugins/pgpcore/select-keys.c:241
-#: ../src/plugins/pgpcore/sgpgme.c:146
+#: ../src/plugins/pgpcore/sgpgme.c:146 ../src/plugins/pgpcore/sgpgme.c:162
 msgid "Marginal"
 msgstr "Marginal"
 
 #: ../src/plugins/pgpcore/select-keys.c:247
-#: ../src/plugins/pgpcore/sgpgme.c:150
+#: ../src/plugins/pgpcore/sgpgme.c:150 ../src/plugins/pgpcore/sgpgme.c:166
 msgid "Ultimate"
 msgstr "Ultimat"
 
@@ -12856,145 +13061,153 @@ msgstr ""
 msgid "No signature found"
 msgstr "Ingen signatur funnen"
 
-#: ../src/plugins/pgpcore/sgpgme.c:184 ../src/plugins/pgpcore/sgpgme.c:203
+#: ../src/plugins/pgpcore/sgpgme.c:160
+msgid "Untrusted"
+msgstr "Icke betrodd"
+
+#: ../src/plugins/pgpcore/sgpgme.c:200 ../src/plugins/pgpcore/sgpgme.c:219
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Signaturen kan inte kontrolleras - %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:188 ../src/plugins/pgpcore/sgpgme.c:192
-#: ../src/plugins/pgpcore/sgpgme.c:245
+#: ../src/plugins/pgpcore/sgpgme.c:204 ../src/plugins/pgpcore/sgpgme.c:208
+#: ../src/plugins/pgpcore/sgpgme.c:249
 msgid "The signature has not been checked."
 msgstr "Signaturen har inte kontrollerats."
 
-#: ../src/plugins/pgpcore/sgpgme.c:198 ../src/plugins/pgpcore/sgpgme.c:200
+#: ../src/plugins/pgpcore/sgpgme.c:214 ../src/plugins/pgpcore/sgpgme.c:216
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: Kan inte hämta nyckel - ingen gpg-agent körs."
 
-#: ../src/plugins/pgpcore/sgpgme.c:215
+#: ../src/plugins/pgpcore/sgpgme.c:228
 #, c-format
 msgid "Good signature from %s."
 msgstr "Bra signatur från %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:222
-#, c-format
-msgid "Good signature (untrusted) from %s."
-msgstr "Bra signatur (ej betrodd) från %s. "
-
-#: ../src/plugins/pgpcore/sgpgme.c:227
+#: ../src/plugins/pgpcore/sgpgme.c:231
 #, c-format
 msgid "Expired signature from %s."
 msgstr "Utgången signatur från %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:230
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:234
+#, c-format
 msgid "Good signature from %s, but the key has expired."
-msgstr "Bra signatur från %s."
+msgstr "Bra signatur från %s, men nyckeln har utgått."
 
-#: ../src/plugins/pgpcore/sgpgme.c:233
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:237
+#, c-format
 msgid "Good signature from %s, but the key has been revoked."
-msgstr "Bra signatur från %s."
+msgstr "Bra signatur från %s, men nyckeln har makulerats."
 
-#: ../src/plugins/pgpcore/sgpgme.c:236
+#: ../src/plugins/pgpcore/sgpgme.c:240
 #, c-format
 msgid "Bad signature from %s."
 msgstr "Ogiltig signatur från %s."
 
-#: ../src/plugins/pgpcore/sgpgme.c:240
+#: ../src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Nyckel 0x%s är inte tillgänglig för att verifiera denna signatur."
 
-#: ../src/plugins/pgpcore/sgpgme.c:264
+#: ../src/plugins/pgpcore/sgpgme.c:268
 #, c-format
 msgid "Error checking signature: no status\n"
 msgstr "Fel vid signaturkontroll: ingen status\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:283
+#: ../src/plugins/pgpcore/sgpgme.c:287
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Fel vid signaturkontroll: %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:302
+#: ../src/plugins/pgpcore/sgpgme.c:306
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Signatur skapad på %s med hjälp av %s nyckel-ID %s\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:308
+#: ../src/plugins/pgpcore/sgpgme.c:312
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Bra signatur från uid \"%s\" (Giltighet %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:313
-#, fuzzy, c-format
+#: ../src/plugins/pgpcore/sgpgme.c:317
+#, c-format
 msgid "Expired key uid \"%s\"\n"
-msgstr "Utgången nyckel från %s."
+msgstr "Utgången nyckel uid \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:318
+#: ../src/plugins/pgpcore/sgpgme.c:322
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Utgången signatur från uid \"%s\" (Giltighet %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:323
+#: ../src/plugins/pgpcore/sgpgme.c:327
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
-msgstr ""
+msgstr "Spärrad nyckel-uid \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:328
+#: ../src/plugins/pgpcore/sgpgme.c:332
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "DÅLIG signatur från \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:339
+#: ../src/plugins/pgpcore/sgpgme.c:343
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                    uid \"%s\" (Giltighet: %s)\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:346
+#: ../src/plugins/pgpcore/sgpgme.c:345
+msgid "Revoked"
+msgstr "Spärrad"
+
+#: ../src/plugins/pgpcore/sgpgme.c:349
+#, c-format
+msgid "Owner Trust: %s\n"
+msgstr "Ägartillit: %s\n"
+
+#: ../src/plugins/pgpcore/sgpgme.c:352
 msgid "Primary key fingerprint:"
 msgstr "Primärnyckel fingeravtryck:"
 
-#: ../src/plugins/pgpcore/sgpgme.c:364
+#: ../src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "VARNING: Signerarens adress \"%s\" matchar inte DNS-post\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:370
+#: ../src/plugins/pgpcore/sgpgme.c:376
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Verifierad signerares adress är \"%s\"\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:412
+#: ../src/plugins/pgpcore/sgpgme.c:410
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Kunde inte hämta data från meddelande, %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:428
+#: ../src/plugins/pgpcore/sgpgme.c:426
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Kunde inte initiera data, %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:583
+#: ../src/plugins/pgpcore/sgpgme.c:581
 msgid "Secret key specification is ambiguous"
 msgstr "Hemlig nyckels specifikation är inte entydig"
 
-#: ../src/plugins/pgpcore/sgpgme.c:593
+#: ../src/plugins/pgpcore/sgpgme.c:591
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Hemlig nyckel kunde inte hittas (%s)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:606
+#: ../src/plugins/pgpcore/sgpgme.c:604
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Fel vid inställning av hemlig nyckel %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:690
+#: ../src/plugins/pgpcore/sgpgme.c:688
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme-protokoll '%s' är oanvändbar: Motor '%s' är inte korrekt installerad."
 
-#: ../src/plugins/pgpcore/sgpgme.c:696
+#: ../src/plugins/pgpcore/sgpgme.c:694
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -13003,12 +13216,12 @@ msgstr ""
 "Gpgme-protokoll '%s' är oanvändbar: Motor '%s' version %s är installerad, "
 "men version %s krävs.\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:704
+#: ../src/plugins/pgpcore/sgpgme.c:702
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme-protokoll '%s' är oanvändbar (okänt problem)"
 
-#: ../src/plugins/pgpcore/sgpgme.c:720
+#: ../src/plugins/pgpcore/sgpgme.c:718
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -13016,7 +13229,7 @@ msgstr ""
 "GnuPG är inte korrekt installerat eller behöver uppgraderas.\n"
 "OpenPGP-stöd avstängt."
 
-#: ../src/plugins/pgpcore/sgpgme.c:754
+#: ../src/plugins/pgpcore/sgpgme.c:752
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -13024,11 +13237,11 @@ msgstr ""
 "Du måste spara kontots information med \"OK\" innan du kan generera ett "
 "nyckelpar.\n"
 
-#: ../src/plugins/pgpcore/sgpgme.c:759
+#: ../src/plugins/pgpcore/sgpgme.c:757
 msgid "No PGP key found"
 msgstr "Ingen PGP-nyckel hittad"
 
-#: ../src/plugins/pgpcore/sgpgme.c:760
+#: ../src/plugins/pgpcore/sgpgme.c:758
 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"
@@ -13038,12 +13251,12 @@ msgstr ""
 "kommer inte kunna signera e-post eller ta emot krypterad e-post.\n"
 "Vill du skapa ett nytt nyckelpar nu? "
 
-#: ../src/plugins/pgpcore/sgpgme.c:830 ../src/plugins/pgpcore/sgpgme.c:846
+#: ../src/plugins/pgpcore/sgpgme.c:828 ../src/plugins/pgpcore/sgpgme.c:844
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Kunde inte generera ett nytt nyckelpar: %s"
 
-#: ../src/plugins/pgpcore/sgpgme.c:837
+#: ../src/plugins/pgpcore/sgpgme.c:835
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -13051,11 +13264,11 @@ msgstr ""
 "Genererar ditt nya nyckelpar... Flytta runt muspekaren för att hjälpa till "
 "att generera entropi..."
 
-#: ../src/plugins/pgpcore/sgpgme.c:852
+#: ../src/plugins/pgpcore/sgpgme.c:850
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Kunde inte generera nytt nyckelpar: okänt fel"
 
-#: ../src/plugins/pgpcore/sgpgme.c:856
+#: ../src/plugins/pgpcore/sgpgme.c:854
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -13068,19 +13281,19 @@ msgstr ""
 "\n"
 "Vill du exportera det till en nyckelserver?"
 
-#: ../src/plugins/pgpcore/sgpgme.c:860
+#: ../src/plugins/pgpcore/sgpgme.c:858
 msgid "Key generated"
 msgstr "Nyckel genererad"
 
-#: ../src/plugins/pgpcore/sgpgme.c:899
+#: ../src/plugins/pgpcore/sgpgme.c:897
 msgid "Key exported."
 msgstr "Nyckel exporterad."
 
-#: ../src/plugins/pgpcore/sgpgme.c:901
+#: ../src/plugins/pgpcore/sgpgme.c:899
 msgid "Couldn't export key."
 msgstr "Kunde inte exportera nyckel."
 
-#: ../src/plugins/pgpcore/sgpgme.c:905
+#: ../src/plugins/pgpcore/sgpgme.c:903
 msgid "Key export isn't implemented in Windows."
 msgstr "Export av nyckel är inte implementerad i Windows."
 
@@ -13107,7 +13320,7 @@ msgstr "Kunde inte konvertera text-data till någon vettig teckenuppsättning."
 #: ../src/plugins/pgpinline/pgpinline.c:716
 #: ../src/plugins/pgpmime/pgpmime.c:74 ../src/plugins/pgpmime/pgpmime.c:184
 #: ../src/plugins/pgpmime/pgpmime.c:330 ../src/plugins/pgpmime/pgpmime.c:510
-#: ../src/plugins/pgpmime/pgpmime.c:655 ../src/plugins/smime/smime.c:415
+#: ../src/plugins/pgpmime/pgpmime.c:651 ../src/plugins/smime/smime.c:415
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Kunde inte initiera GPG-sammanhang, %s"
@@ -13204,19 +13417,19 @@ msgstr ""
 "brevhuvuden, så som Ämne."
 
 #: ../src/plugins/pgpinline/pgpinline.c:670
-#: ../src/plugins/pgpmime/pgpmime.c:665
+#: ../src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Kunde inte lägga till GPG-nyckel %s, %s"
 
 #: ../src/plugins/pgpinline/pgpinline.c:698
-#: ../src/plugins/pgpmime/pgpmime.c:694
+#: ../src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Kunde inte skapa tillfällig fil, %s."
 
 #: ../src/plugins/pgpinline/pgpinline.c:729
-#: ../src/plugins/pgpmime/pgpmime.c:721
+#: ../src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Kryptering misslyckades, %s"
@@ -13272,7 +13485,11 @@ msgstr "Kunde inte tolka dekrypterade fildelar."
 msgid "Couldn't create temporary file: %s"
 msgstr "Kunde inte skapa tillfällig fil: %s"
 
-#: ../src/plugins/pgpmime/pgpmime.c:621
+#: ../src/plugins/pgpmime/pgpmime.c:595
+msgid "OpenPGP digital signature"
+msgstr "OpenPGP digital signatur"
+
+#: ../src/plugins/pgpmime/pgpmime.c:617
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -13280,7 +13497,7 @@ msgstr ""
 "Vänligen notera att brevhuvuden, så som Ämne, inte krypteras av PGP/Mime-"
 "systemet."
 
-#: ../src/plugins/pgpmime/pgpmime.c:793
+#: ../src/plugins/pgpmime/pgpmime.c:789
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -13352,7 +13569,7 @@ msgid ""
 "\n"
 "These scripts are then available via the menu. You can assign keyboard "
 "shortcuts to them just like it is done with other menu items. You can also "
-"put buttons for script invokation into the toolbars using Claws Mail's "
+"put buttons for script invocation into the toolbars using Claws Mail's "
 "builtin toolbar editor.\n"
 "\n"
 "You can provide scripts working on the main window by placing files into ~/."
@@ -13397,7 +13614,7 @@ msgstr ""
 "Dessa skript är då tillgängliga via menyn. Du kan tilldela "
 "tangentborgsgenvägar till dessa precis som man gör med andra menyval. Du kan "
 "även lägga till knappar för att köra skript i verktygsraden med hjälp av "
-"Claws Mails verktygsradsredigerare.\n"
+"Claws Mails inbyggda verktygsradsredigerare.\n"
 "\n"
 "Du kan tillhandahålla skript som kör i huvudfönstret genom att lägga till "
 "filer i ~/.claws-mail/python-scripts/main.\n"
@@ -13437,152 +13654,48 @@ msgstr ""
 msgid "Python integration"
 msgstr "Pythonintegrering"
 
-#: ../src/plugins/rssyl/feed.c:126
-msgid "Cannot open temporary file"
-msgstr "Kan inte öppna temporär fil"
-
-#: ../src/plugins/rssyl/feed.c:137
-msgid "Cannot init libCURL"
-msgstr "Kan inte initiera libCURL"
-
-#: ../src/plugins/rssyl/feed.c:234 ../src/plugins/vcalendar/vcal_folder.c:1596
-msgid "401 (Authorisation required)"
-msgstr "401 (Behörighet krävs)"
-
-#: ../src/plugins/rssyl/feed.c:237 ../src/plugins/vcalendar/vcal_folder.c:1599
-msgid "403 (Unauthorised)"
-msgstr "403 (Obehörig)"
-
-#: ../src/plugins/rssyl/feed.c:240 ../src/plugins/vcalendar/vcal_folder.c:1602
-msgid "404 (Not found)"
-msgstr "404 (Hittades inte)"
-
-#: ../src/plugins/rssyl/feed.c:243 ../src/plugins/vcalendar/vcal_folder.c:1605
-#, c-format
-msgid "Error %ld"
-msgstr "Fel: %ld"
-
-#: ../src/plugins/rssyl/feed.c:328
-#, c-format
-msgid "Fetching '%s'..."
-msgstr "Hämtar '%s'..."
-
-#: ../src/plugins/rssyl/feed.c:387
-msgid "Malformed feed"
-msgstr "Missformat flöde"
-
-#: ../src/plugins/rssyl/feed.c:1203
-#, c-format
-msgid "Refreshing feed '%s'..."
-msgstr "Updaterar flöde '%s'..."
-
-#: ../src/plugins/rssyl/feed.c:1218
-#, c-format
-msgid ""
-"RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-"comments of '%s'"
-msgstr ""
-"RSSyl: Hämtning av kommentarer stöds inte för RDF-flöden. Kan inte hämta "
-"kommentarer för '%s'"
-
-#: ../src/plugins/rssyl/feed.c:1227
-msgid "This feed format is not supported yet."
-msgstr "Detta flödesformat stöds inte ännu."
-
-#: ../src/plugins/rssyl/feed.c:1258
-msgid "N/A"
-msgstr "N/A"
-
-#: ../src/plugins/rssyl/feed.c:1378
-#, c-format
-msgid "%ld byte"
-msgid_plural "%ld bytes"
-msgstr[0] "%ld byte"
-msgstr[1] "%ld bytes"
-
-#: ../src/plugins/rssyl/feed.c:1381
-msgid "size unknown"
-msgstr "storlek okänd"
-
-#: ../src/plugins/rssyl/feed.c:1555
-#, c-format
-msgid ""
-"RSSyl: Cannot update feed %s:\n"
-"%s\n"
-msgstr ""
-"RSSyl: Kunde inte uppdatera flöde %s:\n"
-"%s\n"
-
-#: ../src/plugins/rssyl/feed.c:1727
-msgid "You are already subscribed to this feed."
-msgstr "Du prenumererar redan på detta flöde."
-
-#: ../src/plugins/rssyl/feed.c:1738
+#: ../src/plugins/rssyl/old_feeds.c:90
 #, c-format
 msgid ""
-"Couldn't fetch URL '%s':\n"
+"Couldn't read contents of old feeds.xml file:\n"
 "%s"
 msgstr ""
-"Kunde inte hämta URL '%s':\n"
+"Kunde inte läsa innehållet i gamla filen feeds.xml:\n"
 "%s"
 
-#: ../src/plugins/rssyl/feed.c:1743
-#, c-format
-msgid ""
-"Couldn't fetch URL '%s':\n"
-"%s\n"
-msgstr ""
-"Kunde inte hämta URL '%s':\n"
-"%s\n"
-
-#: ../src/plugins/rssyl/feed.c:1759
-#, c-format
-msgid "Can't subscribe feed '%s'."
-msgstr "Kan inte prenumera på '%s'."
-
-#: ../src/plugins/rssyl/feed.c:1861 ../src/plugins/rssyl/rssyl_cb_menu.c:281
-msgid "Claws Mail needs network access in order to update the feed."
-msgid_plural "Claws Mail needs network access in order to update the feeds."
-msgstr[0] ""
-"Claws Mail behöver ett nätverk tillgängligt för att uppdatera flödet."
-msgstr[1] ""
-"Claws Mail behöver ett nätverk tillgängligt för att uppdatera flödena"
-
-#: ../src/plugins/rssyl/feed.h:20
-#, c-format
-msgid "Time out connecting to URL %s\n"
-msgstr "Överskred tidsgränsen vid anslutning till URL %s\n"
-
-#: ../src/plugins/rssyl/feed.h:21
-#, c-format
-msgid "Couldn't fetch URL %s\n"
-msgstr "Kunde inte hämta URL %s\n"
-
-#: ../src/plugins/rssyl/feed.h:22
+#: ../src/plugins/rssyl/opml_export.c:110
 #, c-format
-msgid "Error parsing feed from URL %s\n"
-msgstr "Fel vid tolkning av flöde från URL %s\n"
+msgid "RSSyl: Error while writing '%s' to feed export list.\n"
+msgstr "RSSyl: Fel vid skrivning av '%s' till flödesexportlistan.\n"
 
-#: ../src/plugins/rssyl/feed.h:23
+#: ../src/plugins/rssyl/opml_export.c:131
 #, c-format
-msgid "Unsupported feed type at URL %s\n"
-msgstr "Flödestypen vid URL %s stöds inte\n"
+msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
+msgstr "RSSyl: Kunde inte ta bort gammal OPML-fil '%s': %s\n"
 
-#: ../src/plugins/rssyl/feed.h:25
+#: ../src/plugins/rssyl/opml_export.c:141
 #, c-format
-msgid "RSSyl: Updating feed %s\n"
-msgstr "RSSyl: Uppdaterar flöde %s\n"
+msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
+msgstr "RSSyl: Kunde inte öppna filen '%s' för export av flödeslistan: %s\n"
 
-#: ../src/plugins/rssyl/feed.h:26
-#, c-format
-msgid "RSSyl: Feed update finished: %s\n"
-msgstr "RSSyl: Flödesuppdatering klart: %s\n"
+#: ../src/plugins/rssyl/opml_export.c:182
+msgid "RSSyl: Error during writing feed export file.\n"
+msgstr "RSSyl: Fel vid skrivning av flödesexportfilen.\n"
 
-#: ../src/plugins/rssyl/feed.h:27
-msgid "RSSyl: Feed update aborted, application is exiting.\n"
-msgstr "RSSyl: Flödesuppdatering avbröts, applikationen avslutas.\n"
+#: ../src/plugins/rssyl/opml_import.c:109
+#, c-format
+msgid ""
+"Error while subscribing feed\n"
+"%s\n"
+"\n"
+"Folder name '%s' is not allowed."
+msgstr ""
+"Fel vid prenumeration av flöde\n"
+"%s\n"
+"\n"
+"Mappnamnet '%s' är inte tillåtet."
 
-#: ../src/plugins/rssyl/plugin.c:63
+#: ../src/plugins/rssyl/plugin.c:65
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13596,117 +13709,161 @@ msgstr ""
 "Varje nyhetsmating kommer att hamna i en egen mapp, hämtad från webben. Du "
 "kan läsa dem och ta bort eller spara gamla nyheter."
 
-#: ../src/plugins/rssyl/plugin.c:87
+#: ../src/plugins/rssyl/plugin.c:89
 msgid "RSS feed"
 msgstr "RSS-flöde"
 
-#: ../src/plugins/rssyl/rssyl.c:133 ../src/plugins/rssyl/rssyl.c:145
+#: ../src/plugins/rssyl/rssyl_add_item.c:295
+msgctxt "Empty RSS feed title placeholder"
+msgid "(empty)"
+msgstr "(tom)"
+
+#: ../src/plugins/rssyl/rssyl.c:154 ../src/plugins/rssyl/rssyl.c:165
 msgid "Refresh all feeds"
 msgstr "Uppdatera alla flöden"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:62
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Subscribe feed"
 msgstr "Prenumerara på flöde"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:63
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:67
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Ange URL för nyhetsflödet du vill preumerera på:"
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:138
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:100
 #, c-format
-msgid "Really remove the folder tree '%s'?\n"
-msgstr "Vill du verkligen ta bort mappträdet '%s' ?\n"
+msgid "'%c' can't be used in folder name."
+msgstr "'%c' kan inte användas i mappnamn."
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:139
-msgid "Remove folder tree"
-msgstr "Ta bort mapp"
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:242
+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 behöver nätverksåtkomst för att kunna uppdatera flödet."
+msgstr[1] "Claws Mail behöver nätverksåtkomst för att kunna uppdatera flöden."
 
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:204
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:305
 #, c-format
-msgid "Can't remove feed '%s'."
-msgstr "Kan inte ta bort flöde '%s'."
-
-#: ../src/plugins/rssyl/rssyl_cb_menu.c:374
-msgid "Select a .opml file"
-msgstr "Välj en .opml-fil"
-
-#: ../src/plugins/rssyl/rssyl_gtk.c:53
-msgid "_Refresh feed"
-msgstr "_Uppdatera flöde"
-
-#: ../src/plugins/rssyl/rssyl_gtk.c:54
-msgid "Refresh _all feeds"
-msgstr "Uppdatera _alla flöden"
+msgid "Really remove the feed tree `%s' ?\n"
+msgstr "Vill du verkligen ta bort flödesmappen `%s' ?\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:55
-msgid "Subscribe _new feed..."
-msgstr "_Prenumerera på nytt flöde..."
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:306
+msgid "Remove feed tree"
+msgstr "Ta bort flödesmapp"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:56
-msgid "_Unsubscribe feed..."
-msgstr "A_vsluta preumeration..."
+#: ../src/plugins/rssyl/rssyl_cb_menu.c:341
+msgid "Select an OPML file"
+msgstr "Välj en OPML-fil"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:57
-msgid "Feed pr_operties..."
-msgstr "Egenskaper f_ör flöde..."
+#: ../src/plugins/rssyl/rssyl_feed.c:75
+#: ../src/plugins/rssyl/rssyl_subscribe.c:139
+#, c-format
+msgid "Couldn't create folder for new feed '%s'."
+msgstr "Kunde inte skapa mapp för nytt flöde '%s'."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:58
-msgid "Import feed list..."
-msgstr "Importera flödeslista..."
+#: ../src/plugins/rssyl/rssyl_feed.h:10
+#, c-format
+msgid "RSSyl: Subscribing new feed: %s\n"
+msgstr "RSSyl: Prenumererar på nytt flöde: %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:59
-msgid "Rena_me..."
-msgstr "Byt na_mn"
+#: ../src/plugins/rssyl/rssyl_feed.h:11
+#, c-format
+msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
+msgstr "RSSyl: Prenumererar på nytt flöde: '%s' (%s)\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:60
-msgid "_Create new folder..."
-msgstr "Skapa ny folder"
+#: ../src/plugins/rssyl/rssyl_feed.h:12
+#, c-format
+msgid "RSSyl: Updating feed: %s\n"
+msgstr "RSSyl: Uppdaterar flöde: %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:62
-msgid "Remove folder _tree..."
-msgstr "Ta bort _mapp..."
+#: ../src/plugins/rssyl/rssyl_feed.h:13
+#, c-format
+msgid "RSSyl: Feed update finished: %s\n"
+msgstr "RSSyl: Flödesuppdatering klart: %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:152
-msgid "Add RSS folder tree"
-msgstr "Lägg till RSS mapp"
+#: ../src/plugins/rssyl/rssyl_feed.h:14
+#, c-format
+msgid "RSSyl: Error fetching feed at '%s': %s\n"
+msgstr "RSSyl: Fel vid hämtning av flöde vid '%s': %s\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:153
-msgid "Enter name for a new RSS folder tree."
-msgstr "Ange namnet på den nya RSS mappen."
+#: ../src/plugins/rssyl/rssyl_feed.h:15
+#, c-format
+msgid "RSSyl: No valid feed found at '%s'\n"
+msgstr "RSSyl: Inget giltigt flöde hittat på '%s'\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:169
-msgid ""
-"Creation of folder tree failed.\n"
-"Maybe some files already exist, or you don't have the permission to write "
-"there?"
-msgstr ""
-"Fel vid skapandet av mapp.\n"
-"Det finns kanske redan filer, eller så har du inte rättigheter att skriva "
-"där?"
+#: ../src/plugins/rssyl/rssyl_feed.h:16
+#, c-format
+msgid "RSSyl: Couldn't process feed at '%s'\n"
+msgstr "RSSyl: Kunde inte behandla flöde vid '%s'\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:184
-msgid "RSSyl..."
-msgstr "RSSyl..."
+#: ../src/plugins/rssyl/rssyl_feed.h:17
+#, c-format
+msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
+msgstr "RSSyl: Applikationen avslutas, kunde inte uppdatera flöde vid '%s'\n"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:257
+#: ../src/plugins/rssyl/rssyl_feed_props.c:243
 msgid "Use default refresh interval"
 msgstr "Använd standard uppdateringsintervall"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:269
-msgid "Keep default number of expired entries"
-msgstr "Behåll standard antal av utgångna nyheter"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:255
+msgid "Keep old items"
+msgstr "Behåll gamla objekt"
+
+#. "Trim" button
+#: ../src/plugins/rssyl/rssyl_feed_props.c:261
+msgid "_Trim"
+msgstr "_Trimma"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:275
+#: ../src/plugins/rssyl/rssyl_feed_props.c:264
+#: ../src/plugins/rssyl/rssyl_feed_props.c:267
+msgid "Update feed, deleting items which are no longer in the source feed"
+msgstr ""
+"Uppdatera flöde, och ta bort objekt som inte längre finns i flödeskällan"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:271
 msgid "Fetch comments if possible"
 msgstr "Hämta kommentarer om möjligt"
 
+#: ../src/plugins/rssyl/rssyl_feed_props.c:296
+msgid "Always mark as new"
+msgstr "Markera alltid som ny"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:302
+msgid "If only its text changed"
+msgstr "Om bara dess text har ändrats"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:308
+msgid "Never mark as new"
+msgstr "Markera aldrig som ny"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:313
+msgid "Add item title to top of message"
+msgstr "Lägg till objekttitel vid toppen av meddelandet"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:320
+msgid "Ignore title rename"
+msgstr "Ignorera byte av titel"
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:326
+#: ../src/plugins/rssyl/rssyl_feed_props.c:329
+msgid ""
+"Enable this to keep current folder name, even if feed author changes title "
+"of the feed."
+msgstr ""
+"Aktivera detta för behålla aktuellt mappnamn, även om flödesförfattaren "
+"ändrar titel på flödet."
+
+#: ../src/plugins/rssyl/rssyl_feed_props.c:334
+#: ../src/plugins/vcalendar/vcal_prefs.c:518
+msgid "Verify SSL certificate validity"
+msgstr "Verifiera SSL-certifikatets giltighet"
+
 #. Label for URL frame
-#: ../src/plugins/rssyl/rssyl_gtk.c:308
+#: ../src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "<b>Source URL:</b>"
 msgstr "<b>URL källa:</b>"
 
-#. Fetch comments for - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:336
+#. Fetch comments max age - label
+#: ../src/plugins/rssyl/rssyl_feed_props.c:378
 msgid ""
 "<b>Fetch comments on posts aged less than:</b>\n"
 "<small>(In days; set to -1 to fetch all comments)</small>"
@@ -13715,7 +13872,7 @@ msgstr ""
 "<small>(I dagar; sätt till -1 för att hämta alla kommentarer)</small>"
 
 #. Refresh interval - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:370
+#: ../src/plugins/rssyl/rssyl_feed_props.c:436
 msgid ""
 "<b>Refresh interval in minutes:</b>\n"
 "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
@@ -13724,97 +13881,193 @@ msgstr ""
 "<small>(Sätt 0 för att avaktivera automatisk uppdatering av detta flöde)</"
 "small>"
 
-#. Expired items - label
-#: ../src/plugins/rssyl/rssyl_gtk.c:403
-msgid ""
-"<b>Number of expired entries to keep:</b>\n"
-"<small>(Set to -1 if you want to keep expired entries)</small>"
-msgstr ""
-"<b>Antal utgångna nyheter att behålla:</b>\n"
-"<small>(Sätt -1 om du vill behålla alla)</small>"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:462
+msgid "<b>If an item changes, do not mark it as new:</b>"
+msgstr "<b>Om en enhet ändras, markera den inte som ny:</b>"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:429
-msgid "<b>If an item changes, do not mark it as unread:</b>"
-msgstr "<b>Om en enhet ändras, markera det inte som oläst:</b>"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:554
+msgid "_OK"
+msgstr "_OK"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:439
-msgid "Always mark as unread"
-msgstr "Markera alltid som oläst"
+#: ../src/plugins/rssyl/rssyl_feed_props.c:562
+msgid "Set feed properties"
+msgstr "Ställ egenskaper för flöde"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:441
-msgid "If only its text has changed"
-msgstr "om bara text har ändrats"
+#: ../src/plugins/rssyl/rssyl_gtk.c:48
+msgid "_Refresh feed"
+msgstr "_Uppdatera flöde"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:443
-msgid "Never mark as unread"
-msgstr "Markera aldrig som oläst"
+#: ../src/plugins/rssyl/rssyl_gtk.c:49
+msgid "Feed pr_operties"
+msgstr "Egenskaper f_ör flöde"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:459
-#: ../src/plugins/vcalendar/vcal_prefs.c:518
-msgid "Verify SSL certificate validity"
-msgstr "Verifiera SSL-certifikatets giltighet"
+#: ../src/plugins/rssyl/rssyl_gtk.c:50
+msgid "Rena_me..."
+msgstr "Byt na_mn"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:515
-msgid "_OK"
-msgstr "_OK"
+#: ../src/plugins/rssyl/rssyl_gtk.c:51
+msgid "R_efresh recursively"
+msgstr "Förnya rekursivt"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:523
-msgid "Set feed properties"
-msgstr "Ställ egenskaper för flöde"
+#: ../src/plugins/rssyl/rssyl_gtk.c:52
+msgid "Subscribe _new feed..."
+msgstr "_Prenumerera på nytt flöde..."
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:53
+msgid "Create new _folder..."
+msgstr "Skapa ny mapp..."
+
+#: ../src/plugins/rssyl/rssyl_gtk.c:54
+msgid "Import feed list..."
+msgstr "Importera flödeslista..."
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:651 ../src/plugins/rssyl/rssyl_gtk.c:675
-msgid "Unsubscribe feed"
-msgstr "Avbryt prenumeration på flöde"
+#: ../src/plugins/rssyl/rssyl_gtk.c:56
+msgid "Remove tree"
+msgstr "Ta bort träd"
 
-#: ../src/plugins/rssyl/rssyl_gtk.c:676
-msgid "Do you really want to remove feed"
-msgstr "Vill du verkligen ta bort flöde"
+#: ../src/plugins/rssyl/rssyl_gtk.c:126
+msgid "Add RSS folder tree"
+msgstr "Lägg till RSS mapp"
 
-#. Remove cache checkbutton
-#: ../src/plugins/rssyl/rssyl_gtk.c:682
-msgid "Remove cached entries"
-msgstr "Ta bort buffrade nyheter"
+#: ../src/plugins/rssyl/rssyl_gtk.c:127
+msgid "Enter name for a new RSS folder tree."
+msgstr "Ange namnet på den nya RSS mappen."
 
-#: ../src/plugins/rssyl/rssyl.h:8
-msgid "RSSyl"
-msgstr "RSSyl"
+#: ../src/plugins/rssyl/rssyl_gtk.c:143
+msgid ""
+"Creation of folder tree failed.\n"
+"Maybe some files already exist, or you don't have the permission to write "
+"there?"
+msgstr ""
+"Fel vid skapandet av mapp.\n"
+"Det finns kanske redan filer, eller så har du inte rättigheter att skriva "
+"där?"
 
 #. Default RSSyl mailbox name
-#: ../src/plugins/rssyl/rssyl.h:14
+#: ../src/plugins/rssyl/rssyl.h:17
 msgid "My Feeds"
 msgstr "Mina flöden"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:106
+#: ../src/plugins/rssyl/rssyl_prefs.c:128
 msgid "Default refresh interval in minutes"
 msgstr "Standard uppdateringsintervall i minuter"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:117
-msgid "Set to 0 to disable automatic refreshing"
-msgstr "Sätt till 0 för att stänga av automatisk uppdatering"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:119
-msgid "Default number of expired items to keep"
-msgstr "Standardantal för antal utgångna enheter att behålla"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:130
-msgid "Set to -1 to keep expired items"
-msgstr "Sätt till -1 för att behålla utgångna enheter"
-
-#: ../src/plugins/rssyl/rssyl_prefs.c:133
+#: ../src/plugins/rssyl/rssyl_prefs.c:147
 msgid "Refresh all feeds on application start"
 msgstr "Uppdatera alla flöden vid applikationsstart"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:139
+#. Path to cookies file for libcurl to use
+#: ../src/plugins/rssyl/rssyl_prefs.c:155
 msgid "Path to cookies file"
 msgstr "Sökväg till kakfil"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:149
+#: ../src/plugins/rssyl/rssyl_prefs.c:166
+#: ../src/plugins/rssyl/rssyl_prefs.c:169
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr "Sökväg till Netscape-formatterad cookies.txt som innehåller dina kakor"
 
-#: ../src/plugins/rssyl/rssyl_prefs.c:152
-msgid "Verify SSL certificate validity for new feeds"
-msgstr "Verifiera SSL-certifikatets giltighet för nya flöden"
+#: ../src/plugins/rssyl/rssyl_prefs.c:176
+msgid "Verify SSL certificates validity for new feeds"
+msgstr "Verifiera SSL-certifikatens giltighet för nya flöden"
+
+#. Create window
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+msgid "Subscribe new feed?"
+msgstr "Prenumerera på nytt flöde?"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:72
+msgid "<b>Feed folder:</b>"
+msgstr "<b>Földesmapp:</b>"
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:82
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:86
+msgid ""
+"Instead of using official title, you can enter a different folder name for "
+"the feed."
+msgstr ""
+"Istället för att använda den officiella titeln kan du mata ett annat "
+"mappnamn för flödet."
+
+#: ../src/plugins/rssyl/rssyl_subscribe_gtk.c:91
+msgid "_Edit feed properties after subscribing"
+msgstr "R_edigera flödesegenskaper efter prenumerering"
+
+#: ../src/plugins/rssyl/rssyl_update_comments.c:99
+#, c-format
+msgid "Updating comments for '%s'..."
+msgstr "Uppdaterar kommentarer för '%s'..."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:102
+#: ../src/plugins/vcalendar/vcal_folder.c:1596
+msgid "401 (Authorisation required)"
+msgstr "401 (Behörighet krävs)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:105
+#: ../src/plugins/vcalendar/vcal_folder.c:1599
+msgid "403 (Unauthorised)"
+msgstr "403 (Obehörig)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:108
+#: ../src/plugins/vcalendar/vcal_folder.c:1602
+msgid "404 (Not found)"
+msgstr "404 (Hittades inte)"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:111
+#, c-format
+msgid "Error %d"
+msgstr "Fel %d"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:123
+#, c-format
+msgctxt "First parameter is URL, second is error text"
+msgid ""
+"Error fetching feed at\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
+msgstr ""
+"Fel vid hämtning av flöde vid\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:134
+#, c-format
+msgid ""
+"No valid feed found at\n"
+"<b>%s</b>"
+msgstr "Inget giltigt flöde hittat vid <b>%s</b>"
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:200
+#, c-format
+msgid "Updating feed '%s'..."
+msgstr "Updaterar flöde '%s'..."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:221
+#, c-format
+msgid ""
+"Couldn't process feed at\n"
+"<b>%s</b>\n"
+"\n"
+"Please contact developers, this should not happen."
+msgstr ""
+"Kunde inte behandla flöde vid\n"
+"<b>%s</b>\n"
+"\n"
+"Vänligen kontakta utvecklarna, detta skall inte hända."
+
+#: ../src/plugins/rssyl/rssyl_update_feed.c:301
+msgid "Claws Mail needs network access in order to update your feeds."
+msgstr ""
+"Claws Mail behöver nätverksåtkomst för att kunna uppdatera dina flöden."
+
+#: ../src/plugins/rssyl/rssyl_update_format.c:127
+msgid ""
+"Internal problem while upgrading storage format. This should not happen. "
+"Please report this, with debug output attached.\n"
+msgstr ""
+"Intern problem vid uppgradering av lagringsformatet. Detta skall inte hända. "
+"Var vänlig och rapportera detta, med debugutdata bifogat.\n"
 
 #: ../src/plugins/smime/plugin.c:38 ../src/plugins/smime/plugin.c:54
 #: ../src/plugins/smime/smime.c:911
@@ -13883,6 +14136,48 @@ msgstr ""
 "Vänligen notera att brevhuvuden, så som Ämne, inte krypteras av S/MIME-"
 "systemet. "
 
+#: ../src/plugins/spam_report/spam_report.c:295
+msgid "Reporting spam..."
+msgstr "Rapporterar skräppost..."
+
+#: ../src/plugins/spam_report/spam_report.c:330
+msgid "Report spam online..."
+msgstr "Rapportera skräppost online..."
+
+#: ../src/plugins/spam_report/spam_report.c:341
+#: ../src/plugins/spam_report/spam_report.c:379
+#: ../src/plugins/spam_report/spam_report_prefs.c:80
+msgid "SpamReport"
+msgstr "Skräppostrapportering"
+
+#: ../src/plugins/spam_report/spam_report.c:384
+msgid ""
+"This plugin reports spam to various places.\n"
+"Currently the following sites or methods are supported:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * lists.debian.org nomination system"
+msgstr ""
+"Den här insticksmodulen rapporterar skräppost till olika platser.\n"
+"För närvarande städs följande webbplatser eller metoder:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * nomineringssystemet på lists.debian.org."
+
+#: ../src/plugins/spam_report/spam_report.c:409
+msgid "Spam reporting"
+msgstr "Skräppostrapportering"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:122
+msgid "Enabled"
+msgstr "Aktiverad"
+
+#: ../src/plugins/spam_report/spam_report_prefs.c:149
+msgid "Forward to:"
+msgstr "Vidarebefordra till:"
+
 #: ../src/plugins/spamassassin/spamassassin.c:77
 #: ../src/plugins/spamassassin/spamassassin_gtk.c:649
 msgid "SpamAssassin"
@@ -14017,48 +14312,6 @@ msgstr ""
 "Maximal tillåten tid för kontroll. Om kontrollen tar längre tid kommer den "
 "att avbrytas."
 
-#: ../src/plugins/spam_report/spam_report.c:293
-msgid "Reporting spam..."
-msgstr "Rapporterar skräppost..."
-
-#: ../src/plugins/spam_report/spam_report.c:328
-msgid "Report spam online..."
-msgstr "Rapportera skräppost online..."
-
-#: ../src/plugins/spam_report/spam_report.c:339
-#: ../src/plugins/spam_report/spam_report.c:377
-#: ../src/plugins/spam_report/spam_report_prefs.c:80
-msgid "SpamReport"
-msgstr "Skräppostrapportering"
-
-#: ../src/plugins/spam_report/spam_report.c:382
-msgid ""
-"This plugin reports spam to various places.\n"
-"Currently the following sites or methods are supported:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * lists.debian.org nomination system"
-msgstr ""
-"Den här insticksmodulen rapporterar skräppost till olika platser.\n"
-"För närvarande städs följande webbplatser eller metoder:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * nomineringssystemet på lists.debian.org."
-
-#: ../src/plugins/spam_report/spam_report.c:407
-msgid "Spam reporting"
-msgstr "Skräppostrapportering"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:122
-msgid "Enabled"
-msgstr "Aktiverad"
-
-#: ../src/plugins/spam_report/spam_report_prefs.c:149
-msgid "Forward to:"
-msgstr "Vidarebefordra till:"
-
 #: ../src/plugins/tnef_parse/tnef_parse.c:65
 #, c-format
 msgid ""
@@ -14135,7 +14388,7 @@ msgstr "Visa"
 
 #: ../src/plugins/vcalendar/day-view.c:614
 #: ../src/plugins/vcalendar/month-view.c:711 ../src/prefs_account.c:1477
-#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:334
+#: ../src/prefs_folder_item.c:560 ../src/prefs_matcher.c:336
 msgid "days"
 msgstr "dagar"
 
@@ -14522,6 +14775,11 @@ msgstr ""
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Timeout (%d sekunder) vid anslutning till %s\n"
 
+#: ../src/plugins/vcalendar/vcal_folder.c:1605
+#, c-format
+msgid "Error %ld"
+msgstr "Fel: %ld"
+
 #: ../src/plugins/vcalendar/vcal_folder.c:1802
 #, c-format
 msgid ""
@@ -14572,9 +14830,9 @@ msgstr ""
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1849
 #: ../src/plugins/vcalendar/vcal_folder.c:1852
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create directory %s"
-msgstr "Kunde inte skapa målmapp %s."
+msgstr "Kunde inte skapa mapp %s"
 
 #: ../src/plugins/vcalendar/vcal_folder.c:1890
 msgid "Claws Mail needs network access in order to update the Webcal feed."
@@ -15248,11 +15506,6 @@ msgstr "Standardinkorg"
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ofiltrerade meddelande kommer sparas i denna mapp"
 
-#: ../src/prefs_account.c:1442 ../src/prefs_account.c:1531
-#: ../src/prefs_account.c:1991 ../src/prefs_customheader.c:237
-msgid "Bro_wse"
-msgstr "Bläddra"
-
 #: ../src/prefs_account.c:1453
 msgid "Use secure authentication (APOP)"
 msgstr "Använd säker autentisering (APOP)"
@@ -15337,8 +15590,8 @@ msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Hämta e-post' hämtar nya meddelanden för detta konto"
 
 #: ../src/prefs_account.c:1718 ../src/prefs_customheader.c:209
-#: ../src/prefs_matcher.c:620 ../src/prefs_matcher.c:1958
-#: ../src/prefs_matcher.c:1980
+#: ../src/prefs_matcher.c:623 ../src/prefs_matcher.c:1974
+#: ../src/prefs_matcher.c:1996
 msgid "Header"
 msgstr "Brevhuvud"
 
@@ -15710,8 +15963,8 @@ msgid "Replace the selected action in list with the action above"
 msgstr "Ersätt vald aktivitet i listan med aktiviteten ovan "
 
 #: ../src/prefs_actions.c:337 ../src/prefs_filtering_action.c:616
-#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:778
-#: ../src/prefs_template.c:318 ../src/prefs_toolbar.c:1056
+#: ../src/prefs_filtering.c:486 ../src/prefs_matcher.c:781
+#: ../src/prefs_template.c:320 ../src/prefs_toolbar.c:1056
 msgid "Re_move"
 msgstr "Ta bort"
 
@@ -15720,7 +15973,7 @@ msgid "Delete the selected action from the list"
 msgstr "Ta bort vald aktivitet från listan"
 
 #: ../src/prefs_actions.c:355 ../src/prefs_filtering.c:503
-#: ../src/prefs_template.c:336
+#: ../src/prefs_template.c:338
 msgid "Clear all the input fields in the dialog"
 msgstr "Rensa alla inmatningsfält i dialogrutan"
 
@@ -15741,7 +15994,7 @@ msgstr "Flytta ner vald aktivitet"
 #: ../src/prefs_actions.c:535 ../src/prefs_filtering_action.c:704
 #: ../src/prefs_filtering.c:836 ../src/prefs_filtering.c:838
 #: ../src/prefs_filtering.c:839 ../src/prefs_filtering.c:949
-#: ../src/prefs_matcher.c:897 ../src/prefs_template.c:469
+#: ../src/prefs_matcher.c:900 ../src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Ny)"
 
@@ -15802,22 +16055,22 @@ msgstr "Vill du verkligen ta bort alla denna aktiviteter? "
 
 #: ../src/prefs_actions.c:898 ../src/prefs_actions.c:929
 #: ../src/prefs_filtering.c:1497 ../src/prefs_filtering.c:1519
-#: ../src/prefs_matcher.c:2109 ../src/prefs_template.c:569
-#: ../src/prefs_template.c:594
+#: ../src/prefs_matcher.c:2125 ../src/prefs_template.c:572
+#: ../src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Posten sparades inte"
 
 #: ../src/prefs_actions.c:899 ../src/prefs_actions.c:930
 #: ../src/prefs_filtering.c:1498 ../src/prefs_filtering.c:1520
-#: ../src/prefs_template.c:570 ../src/prefs_template.c:595
+#: ../src/prefs_template.c:573 ../src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Posten sparades inte. Stänga ändå?"
 
 #: ../src/prefs_actions.c:900 ../src/prefs_actions.c:905
 #: ../src/prefs_actions.c:931 ../src/prefs_filtering.c:1477
 #: ../src/prefs_filtering.c:1499 ../src/prefs_filtering.c:1521
-#: ../src/prefs_matcher.c:2111 ../src/prefs_template.c:571
-#: ../src/prefs_template.c:596 ../src/prefs_template.c:601
+#: ../src/prefs_matcher.c:2127 ../src/prefs_template.c:574
+#: ../src/prefs_template.c:599 ../src/prefs_template.c:604
 msgid "+_Continue editing"
 msgstr "+_Fortsätt redigering"
 
@@ -15928,7 +16181,7 @@ msgstr ""
 "för att behandla ett helt meddelande eller bara någon av dess delar."
 
 #: ../src/prefs_actions.c:1092 ../src/prefs_filtering.c:1695
-#: ../src/prefs_template.c:1101
+#: ../src/prefs_template.c:1121
 msgid "D_uplicate"
 msgstr "D_uplicera"
 
@@ -16063,7 +16316,7 @@ msgid "Custom header configuration"
 msgstr "Anpassad brehuvudsinställning"
 
 #: ../src/prefs_customheader.c:507 ../src/prefs_display_header.c:599
-#: ../src/prefs_matcher.c:1583 ../src/prefs_matcher.c:1598
+#: ../src/prefs_matcher.c:1595 ../src/prefs_matcher.c:1610
 msgid "Header name is not set."
 msgstr "Brevhuvudsnamn är inte angivet."
 
@@ -16250,7 +16503,7 @@ msgstr "Omdirigera"
 
 #. S_COL_NUMBER
 #: ../src/prefs_filtering_action.c:194 ../src/prefs_filtering_action.c:195
-#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:626
+#: ../src/prefs_filtering_action.c:1442 ../src/prefs_matcher.c:629
 #: ../src/prefs_summary_column.c:87 ../src/summaryview.c:447
 msgid "Score"
 msgstr "Poäng"
@@ -16267,7 +16520,7 @@ msgstr "Ange poäng"
 #. S_COL_SCORE
 #. S_COL_LOCKED
 #: ../src/prefs_filtering_action.c:196 ../src/prefs_filtering_action.c:197
-#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:630
+#: ../src/prefs_filtering_action.c:198 ../src/prefs_matcher.c:633
 #: ../src/prefs_summary_column.c:89 ../src/summaryview.c:449
 msgid "Tags"
 msgstr "Etiketter"
@@ -16297,7 +16550,7 @@ msgid "Action configuration"
 msgstr "Aktivitetskonfiguration"
 
 #: ../src/prefs_filtering_action.c:427 ../src/prefs_filtering.c:1886
-#: ../src/prefs_matcher.c:583
+#: ../src/prefs_matcher.c:586
 msgid "Rule"
 msgstr "Regel"
 
@@ -16340,25 +16593,25 @@ msgstr "Ingen aktivitet är definierad."
 
 # xxxx här är jag xxxx
 #. completion of 'To' from address book
-#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2153
+#: ../src/prefs_filtering_action.c:1254 ../src/prefs_matcher.c:2169
 #: ../src/quote_fmt.c:79
 msgid "literal %"
 msgstr "procent-tecken"
 
-#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2162
+#: ../src/prefs_filtering_action.c:1263 ../src/prefs_matcher.c:2178
 msgid "filename (should not be modified)"
 msgstr "filnamn (får inte ändras)"
 
-#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2163
+#: ../src/prefs_filtering_action.c:1264 ../src/prefs_matcher.c:2179
 #: ../src/quote_fmt.c:87
 msgid "new line"
 msgstr "ny rad"
 
-#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2164
+#: ../src/prefs_filtering_action.c:1265 ../src/prefs_matcher.c:2180
 msgid "escape character for quotes"
 msgstr "undantagstecken för citat"
 
-#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2165
+#: ../src/prefs_filtering_action.c:1266 ../src/prefs_matcher.c:2181
 msgid "quote character"
 msgstr "citattecken"
 
@@ -16707,7 +16960,7 @@ msgid "Folder and Message Lists"
 msgstr "Mapp- och meddelandelistor"
 
 #. message font label
-#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2030
+#: ../src/prefs_fonts.c:99 ../src/prefs_matcher.c:2046
 msgid "Message"
 msgstr "Meddelande"
 
@@ -16903,245 +17156,249 @@ msgstr "Övrigt"
 msgid "Logging"
 msgstr "Loggning"
 
-#: ../src/prefs_matcher.c:328
+#: ../src/prefs_matcher.c:330
 msgid "more than"
 msgstr "mer än"
 
-#: ../src/prefs_matcher.c:329
+#: ../src/prefs_matcher.c:331
 msgid "less than"
 msgstr "mindre än"
 
-#: ../src/prefs_matcher.c:335
+#: ../src/prefs_matcher.c:337
 msgid "weeks"
 msgstr "veckor"
 
-#: ../src/prefs_matcher.c:339
+#: ../src/prefs_matcher.c:341
 msgid "higher than"
 msgstr "högre än"
 
-#: ../src/prefs_matcher.c:340
+#: ../src/prefs_matcher.c:342
 msgid "lower than"
 msgstr "lägre än"
 
-#: ../src/prefs_matcher.c:341 ../src/prefs_matcher.c:347
+#: ../src/prefs_matcher.c:343 ../src/prefs_matcher.c:349
 msgid "exactly"
 msgstr "exakt"
 
-#: ../src/prefs_matcher.c:345
+#: ../src/prefs_matcher.c:347
 msgid "greater than"
 msgstr "större än"
 
-#: ../src/prefs_matcher.c:346
+#: ../src/prefs_matcher.c:348
 msgid "smaller than"
 msgstr "mindre än"
 
-#: ../src/prefs_matcher.c:351
+#: ../src/prefs_matcher.c:353
 msgid "bytes"
 msgstr "byte"
 
-#: ../src/prefs_matcher.c:352
+#: ../src/prefs_matcher.c:354
 msgid "kilobytes"
 msgstr "kilobyte"
 
-#: ../src/prefs_matcher.c:353
+#: ../src/prefs_matcher.c:355
 msgid "megabytes"
 msgstr "megabyte"
 
-#: ../src/prefs_matcher.c:357
+#: ../src/prefs_matcher.c:359
 msgid "contains"
 msgstr "innehåller"
 
-#: ../src/prefs_matcher.c:358
+#: ../src/prefs_matcher.c:360
 msgid "doesn't contain"
 msgstr "innehåller ej"
 
-#: ../src/prefs_matcher.c:381
+#: ../src/prefs_matcher.c:383
 msgid "headers part"
 msgstr "brevhuvudsdel"
 
-#: ../src/prefs_matcher.c:382
+#: ../src/prefs_matcher.c:384
+msgid "headers values"
+msgstr "värden i brevhuvud"
+
+#: ../src/prefs_matcher.c:385
 msgid "body part"
 msgstr "meddelandedel"
 
-#: ../src/prefs_matcher.c:383
+#: ../src/prefs_matcher.c:386
 msgid "whole message"
 msgstr "hela meddelandet"
 
-#: ../src/prefs_matcher.c:389 ../src/summaryview.c:6300
+#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6300
 msgid "Marked"
 msgstr "Markerad"
 
-#: ../src/prefs_matcher.c:390 ../src/summaryview.c:6298
+#: ../src/prefs_matcher.c:393 ../src/summaryview.c:6298
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: ../src/prefs_matcher.c:391
+#: ../src/prefs_matcher.c:394
 msgid "Replied"
 msgstr "Besvarat"
 
-#: ../src/prefs_matcher.c:392 ../src/summaryview.c:6292
+#: ../src/prefs_matcher.c:395 ../src/summaryview.c:6292
 msgid "Forwarded"
 msgstr "Vidarebefordrat"
 
-#: ../src/prefs_matcher.c:394 ../src/summaryview.c:6282 ../src/toolbar.c:416
+#: ../src/prefs_matcher.c:397 ../src/summaryview.c:6282 ../src/toolbar.c:416
 #: ../src/toolbar.c:934 ../src/toolbar.c:1978
 msgid "Spam"
 msgstr "Skräppost"
 
-#: ../src/prefs_matcher.c:395
+#: ../src/prefs_matcher.c:398
 msgid "Has attachment"
 msgstr "Har bilaga"
 
-#: ../src/prefs_matcher.c:396 ../src/summaryview.c:6318
+#: ../src/prefs_matcher.c:399 ../src/summaryview.c:6318
 msgid "Signed"
 msgstr "Signerat"
 
-#: ../src/prefs_matcher.c:400
+#: ../src/prefs_matcher.c:403
 msgid "set"
 msgstr "satt"
 
-#: ../src/prefs_matcher.c:401
+#: ../src/prefs_matcher.c:404
 msgid "not set"
 msgstr "inte satt"
 
-#: ../src/prefs_matcher.c:405
+#: ../src/prefs_matcher.c:408
 msgid "yes"
 msgstr "ja"
 
-#: ../src/prefs_matcher.c:406
+#: ../src/prefs_matcher.c:409
 msgid "no"
 msgstr "nej"
 
-#: ../src/prefs_matcher.c:410
+#: ../src/prefs_matcher.c:413
 msgid "Any tags"
 msgstr "Någon etikett"
 
-#: ../src/prefs_matcher.c:411
+#: ../src/prefs_matcher.c:414
 msgid "Specific tag"
 msgstr "Specifik etikett"
 
-#: ../src/prefs_matcher.c:415
+#: ../src/prefs_matcher.c:418
 msgid "ignored"
 msgstr "ignorerad"
 
-#: ../src/prefs_matcher.c:416
+#: ../src/prefs_matcher.c:419
 msgid "not ignored"
 msgstr "inte ignorerad"
 
-#: ../src/prefs_matcher.c:417
+#: ../src/prefs_matcher.c:420
 msgid "watched"
 msgstr "bevakad"
 
-#: ../src/prefs_matcher.c:418
+#: ../src/prefs_matcher.c:421
 msgid "not watched"
 msgstr "inte bevakad"
 
-#: ../src/prefs_matcher.c:422
+#: ../src/prefs_matcher.c:425
 msgid "found"
 msgstr "hittat"
 
-#: ../src/prefs_matcher.c:423
+#: ../src/prefs_matcher.c:426
 msgid "not found"
 msgstr "inte hittat"
 
-#: ../src/prefs_matcher.c:427
+#: ../src/prefs_matcher.c:430
 msgid "0 (Passed)"
 msgstr "0 (Lyckas)"
 
-#: ../src/prefs_matcher.c:428
+#: ../src/prefs_matcher.c:431
 msgid "non-0 (Failed)"
 msgstr "icke-0 (misslyckas)"
 
-#: ../src/prefs_matcher.c:566
+#: ../src/prefs_matcher.c:569
 msgid "Condition configuration"
 msgstr "Villkorsinställning"
 
 #. criteria combo box
-#: ../src/prefs_matcher.c:610
+#: ../src/prefs_matcher.c:613
 msgid "Match criteria:"
 msgstr "Villkor:"
 
-#: ../src/prefs_matcher.c:619
+#: ../src/prefs_matcher.c:622
 msgid "All messages"
 msgstr "Alla meddelanden"
 
-#: ../src/prefs_matcher.c:621
+#: ../src/prefs_matcher.c:624
 msgid "Age"
 msgstr "Ålder"
 
-#: ../src/prefs_matcher.c:622
+#: ../src/prefs_matcher.c:625
 msgid "Phrase"
 msgstr "Uttryck"
 
-#: ../src/prefs_matcher.c:623
+#: ../src/prefs_matcher.c:626
 msgid "Flags"
 msgstr "Flaggor"
 
-#: ../src/prefs_matcher.c:624 ../src/prefs_msg_colors.c:410
+#: ../src/prefs_matcher.c:627 ../src/prefs_msg_colors.c:410
 msgid "Color labels"
 msgstr "Färgmarkering"
 
-#: ../src/prefs_matcher.c:625
+#: ../src/prefs_matcher.c:628
 msgid "Thread"
 msgstr "Tråd"
 
-#: ../src/prefs_matcher.c:628
+#: ../src/prefs_matcher.c:631
 msgid "Partially downloaded"
 msgstr "Delvis nedladdat"
 
-#: ../src/prefs_matcher.c:631
+#: ../src/prefs_matcher.c:634
 msgid "External program test"
 msgstr "Externt programtest"
 
 #. store UNtranslated "Any"/"All" in matcher expressions
-#: ../src/prefs_matcher.c:707 ../src/prefs_matcher.c:1604
-#: ../src/prefs_matcher.c:1619 ../src/prefs_matcher.c:2501
+#: ../src/prefs_matcher.c:710 ../src/prefs_matcher.c:1616
+#: ../src/prefs_matcher.c:1631 ../src/prefs_matcher.c:2521
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Alla"
 
-#: ../src/prefs_matcher.c:741
+#: ../src/prefs_matcher.c:744
 msgid "Use regexp"
 msgstr "Anv. regex"
 
-#: ../src/prefs_matcher.c:818
+#: ../src/prefs_matcher.c:821
 msgid "Message must match"
 msgstr "Meddelande måste matcha"
 
-#: ../src/prefs_matcher.c:822
+#: ../src/prefs_matcher.c:825
 msgid "at least one"
 msgstr "minst en av"
 
-#: ../src/prefs_matcher.c:823
+#: ../src/prefs_matcher.c:826
 msgid "all"
 msgstr "alla"
 
-#: ../src/prefs_matcher.c:826
+#: ../src/prefs_matcher.c:829
 msgid "of above rules"
 msgstr "ovanstående regler"
 
-#: ../src/prefs_matcher.c:1522 ../src/prefs_matcher.c:1588
+#: ../src/prefs_matcher.c:1534 ../src/prefs_matcher.c:1600
 msgid "Search pattern is not set."
 msgstr "Sökmönster är inte angivet."
 
-#: ../src/prefs_matcher.c:1531
+#: ../src/prefs_matcher.c:1543
 msgid "Test command is not set."
 msgstr "Testkommando är inte angivet."
 
-#: ../src/prefs_matcher.c:1605
+#: ../src/prefs_matcher.c:1617
 msgid "all addresses in all headers"
 msgstr "alla e-postadresser i alla brevhuvud"
 
-#: ../src/prefs_matcher.c:1608
+#: ../src/prefs_matcher.c:1620
 msgid "any address in any header"
 msgstr "någon e-postadress i något brevhuvud"
 
-#: ../src/prefs_matcher.c:1610
+#: ../src/prefs_matcher.c:1622
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "adressen(erna) i brevhuvudet '%s'"
 
-#: ../src/prefs_matcher.c:1611
+#: ../src/prefs_matcher.c:1623
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -17154,79 +17411,83 @@ msgstr ""
 "Om du vill matcha %s mot hela adressboken, så måste du välja '%s' från "
 "adressbokens/adressmapens rullgardinsmeny."
 
-#: ../src/prefs_matcher.c:1830
+#: ../src/prefs_matcher.c:1842
 msgid "Headers part"
 msgstr "Brevhuvudsdel"
 
-#: ../src/prefs_matcher.c:1834
+#: ../src/prefs_matcher.c:1846
+msgid "Headers values"
+msgstr "Värden i Brevhuvud"
+
+#: ../src/prefs_matcher.c:1850
 msgid "Body part"
 msgstr "Meddelandedel"
 
-#: ../src/prefs_matcher.c:1838
+#: ../src/prefs_matcher.c:1854
 msgid "Whole message"
 msgstr "Hela meddelandet"
 
-#: ../src/prefs_matcher.c:1957 ../src/prefs_matcher.c:2001
+#: ../src/prefs_matcher.c:1973 ../src/prefs_matcher.c:2017
 msgid "in"
 msgstr "i"
 
-#: ../src/prefs_matcher.c:1959
+#: ../src/prefs_matcher.c:1975
 msgid "content is"
 msgstr "innehåll är"
 
-#: ../src/prefs_matcher.c:1968
+#: ../src/prefs_matcher.c:1984
 msgid "Age is"
 msgstr "Ålder är"
 
-#: ../src/prefs_matcher.c:1973
+#: ../src/prefs_matcher.c:1989
 msgid "Flag"
 msgstr "Flagga"
 
-#: ../src/prefs_matcher.c:1974 ../src/prefs_matcher.c:1991
+#: ../src/prefs_matcher.c:1990 ../src/prefs_matcher.c:2007
 msgid "is"
 msgstr "är"
 
-#: ../src/prefs_matcher.c:1979
+#: ../src/prefs_matcher.c:1995
 msgid "Name:"
 msgstr "Namn: "
 
-#: ../src/prefs_matcher.c:1990
+#: ../src/prefs_matcher.c:2006
 msgid "Label"
 msgstr "Etikett"
 
-#: ../src/prefs_matcher.c:1996
+#: ../src/prefs_matcher.c:2012
 msgid "Value:"
 msgstr "Värde:"
 
-#: ../src/prefs_matcher.c:2013
+#: ../src/prefs_matcher.c:2029
 msgid "Score is"
 msgstr "Poäng är"
 
-#: ../src/prefs_matcher.c:2014
+#: ../src/prefs_matcher.c:2030
 msgid "points"
 msgstr "poäng"
 
-#: ../src/prefs_matcher.c:2024
+#: ../src/prefs_matcher.c:2040
 msgid "Size is"
 msgstr "Storlek är"
 
-#: ../src/prefs_matcher.c:2029
+#: ../src/prefs_matcher.c:2045
 msgid "Scope:"
 msgstr "Omfattning:"
 
-#: ../src/prefs_matcher.c:2031
+#: ../src/prefs_matcher.c:2047
 msgid "tags"
 msgstr "etiketter"
 
-#: ../src/prefs_matcher.c:2036
+#: ../src/prefs_matcher.c:2052
 msgid "type is"
 msgstr "typ är"
 
-#: ../src/prefs_matcher.c:2040
+#: ../src/prefs_matcher.c:2056
 msgid "Program returns"
 msgstr "Programmet returnerar"
 
-#: ../src/prefs_matcher.c:2110
+#: ../src/prefs_matcher.c:2126
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -17234,11 +17495,11 @@ msgstr ""
 "Posten sparades inte.\n"
 "Stäng ändå?"
 
-#: ../src/prefs_matcher.c:2174
+#: ../src/prefs_matcher.c:2190
 msgid "Match Type: 'Test'"
 msgstr "Matchningstyp: 'Test'"
 
-#: ../src/prefs_matcher.c:2175
+#: ../src/prefs_matcher.c:2191
 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"
@@ -17251,7 +17512,7 @@ msgstr ""
 "\n"
 "Följande symboler kan användas:"
 
-#: ../src/prefs_matcher.c:2274
+#: ../src/prefs_matcher.c:2290
 msgid "Current condition rules"
 msgstr "Nuvarande villkorsregler"
 
@@ -18202,11 +18463,11 @@ msgstr "Möjliga val"
 msgid "Selection on folder opening"
 msgstr "Val vid öppnande av mapp"
 
-#: ../src/prefs_template.c:79
+#: ../src/prefs_template.c:80
 msgid "This name is used as the Menu item"
 msgstr "Det här namnet används redan som Meny-val"
 
-#: ../src/prefs_template.c:81
+#: ../src/prefs_template.c:82
 msgid ""
 "Override composing account's From header. This doesn't change the composing "
 "account."
@@ -18214,95 +18475,100 @@ msgstr ""
 "Åsidosätt skapande kontots Från-brevhuvud. Detta ändrar inte vilket konto "
 "som används för att skapa."
 
-#: ../src/prefs_template.c:307
+#: ../src/prefs_template.c:309
 msgid "Append the new template above to the list"
 msgstr "Lägg till den nya mallen ovan sist i listan"
 
-#: ../src/prefs_template.c:316
+#: ../src/prefs_template.c:318
 msgid "Replace the selected template in list with the template above"
 msgstr "Byt ut den valda mallen i listan med mallen ovan"
 
-#: ../src/prefs_template.c:326
+#: ../src/prefs_template.c:328
 msgid "Delete the selected template from the list"
 msgstr "Ta bort den valda mallen från listan"
 
-#: ../src/prefs_template.c:344
+#: ../src/prefs_template.c:346
 msgid "Show information on configuring templates"
 msgstr "Visa information om konfigurering av mallar"
 
-#: ../src/prefs_template.c:368
+#: ../src/prefs_template.c:370
 msgid "Move the selected template to the top"
 msgstr "Flytta den valda mallen överst"
 
-#: ../src/prefs_template.c:378
+#: ../src/prefs_template.c:380
 msgid "Move the selected template up"
 msgstr "Flytta upp vald mallen"
 
-#: ../src/prefs_template.c:386
+#: ../src/prefs_template.c:388
 msgid "Move the selected template down"
 msgstr "Flytta ned vald mall"
 
-#: ../src/prefs_template.c:396
+#: ../src/prefs_template.c:398
 msgid "Move the selected template to the bottom"
 msgstr "Flytta den valda mallen sist"
 
-#: ../src/prefs_template.c:412
+#: ../src/prefs_template.c:414
 msgid "Template configuration"
 msgstr "Mallkonfiguration"
 
-#: ../src/prefs_template.c:599
+#: ../src/prefs_template.c:602
 msgid "Templates list not saved"
 msgstr "Malllistan är inte sparad."
 
-#: ../src/prefs_template.c:600
+#: ../src/prefs_template.c:603
 msgid "The templates list has been modified. Close anyway?"
 msgstr "Listan med mallar har ändrats. Stänga ändå?"
 
-#: ../src/prefs_template.c:761
+#: ../src/prefs_template.c:768
 msgid "The template's name is not set."
 msgstr "Mallens namn är inte angivet."
 
-#: ../src/prefs_template.c:798
+#: ../src/prefs_template.c:811
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "\"Från\"-fältet i mallen innehåller en felaktig email-adress."
 
-#: ../src/prefs_template.c:804
+#: ../src/prefs_template.c:817
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "\"Till\"-fältet av mallen innehåller en ogiltig email-adress."
 
-#: ../src/prefs_template.c:810
+#: ../src/prefs_template.c:823
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "\"Cc\"-fältet av mallen innehåller en ogiltig email-adress."
 
-#: ../src/prefs_template.c:816
+#: ../src/prefs_template.c:829
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "\"Bcc\"-fältet av mallen innehåller en ogiltig email-adress."
 
-#: ../src/prefs_template.c:822
+#: ../src/prefs_template.c:835
+msgid ""
+"The \"Reply-To\" field of the template contains an invalid email address."
+msgstr "\"Svara-Till\"-fältet i mallen innehåller en ogiltig e-postadress."
+
+#: ../src/prefs_template.c:841
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "\"Ämne\"-fältet i mallen är ogiltig."
 
-#: ../src/prefs_template.c:892
+#: ../src/prefs_template.c:912
 msgid "Delete template"
 msgstr "Ta bort mall"
 
-#: ../src/prefs_template.c:893
+#: ../src/prefs_template.c:913
 msgid "Do you really want to delete this template?"
 msgstr "Vill du verkligen ta bort denna mall?"
 
-#: ../src/prefs_template.c:905
+#: ../src/prefs_template.c:925
 msgid "Delete all templates"
 msgstr "Ta bort alla mallar"
 
-#: ../src/prefs_template.c:906
+#: ../src/prefs_template.c:926
 msgid "Do you really want to delete all the templates?"
 msgstr "Vill du verkligen ta bort alla mallar?"
 
-#: ../src/prefs_template.c:1221
+#: ../src/prefs_template.c:1241
 msgid "Current templates"
 msgstr "Befintliga mallar"
 
-#: ../src/prefs_template.c:1249
+#: ../src/prefs_template.c:1269
 msgid "Template"
 msgstr "Mall"
 
@@ -18613,7 +18879,7 @@ msgstr "Ingen information tillgänglig"
 msgid "No recipient keys defined."
 msgstr "Ingen mottagarnyckel är definierad."
 
-#: ../src/procmime.c:430 ../src/procmime.c:432 ../src/procmime.c:433
+#: ../src/procmime.c:433 ../src/procmime.c:435 ../src/procmime.c:436
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fel vid avkodning av BASE64]\n"
 
@@ -19344,23 +19610,23 @@ msgstr ""
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d valda (%s/%s), %d olästa"
 
-#: ../src/summaryview.c:2979
+#: ../src/summaryview.c:2981
 msgid "Sorting summary..."
 msgstr "Sorterar sammanfattning..."
 
-#: ../src/summaryview.c:3118
+#: ../src/summaryview.c:3120
 msgid "Setting summary from message data..."
 msgstr "Skapar sammanfattning från meddelandedata..."
 
-#: ../src/summaryview.c:3323
+#: ../src/summaryview.c:3325
 msgid "(No Date)"
 msgstr "(Inget datum)"
 
-#: ../src/summaryview.c:3375
+#: ../src/summaryview.c:3377
 msgid "(No Recipient)"
 msgstr "(Ingen mottagare)"
 
-#: ../src/summaryview.c:3410
+#: ../src/summaryview.c:3412
 #, c-format
 msgid ""
 "%s\n"
@@ -19369,7 +19635,7 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Från: %s, på %s</span>"
 
-#: ../src/summaryview.c:3417
+#: ../src/summaryview.c:3419
 #, c-format
 msgid ""
 "%s\n"
@@ -19378,26 +19644,26 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Till: %s, på %s</span>"
 
-#: ../src/summaryview.c:4294
+#: ../src/summaryview.c:4296
 msgid "You're not the author of the article.\n"
 msgstr "Du är inte artikelns författare.\n"
 
-#: ../src/summaryview.c:4387
+#: ../src/summaryview.c:4389
 #, 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] "Vill du verkligen ta bort det valda meddelandet?"
 msgstr[1] "Vill du verkligen ta bort de %d valda meddelanden?"
 
-#: ../src/summaryview.c:4390
+#: ../src/summaryview.c:4392
 msgid "Delete message(s)"
 msgstr "Ta bort meddelandet"
 
-#: ../src/summaryview.c:4553
+#: ../src/summaryview.c:4555
 msgid "Destination is same as current folder."
 msgstr "Destinationen är samma som aktuell mapp."
 
-#: ../src/summaryview.c:4652
+#: ../src/summaryview.c:4653
 msgid "Destination to copy is same as current folder."
 msgstr "Destinationen att kopiera är samma som aktuell mapp."
 
@@ -19504,7 +19770,7 @@ msgstr "Krypterad"
 msgid "Has attachment(s)"
 msgstr "Har bilaga(or)"
 
-#: ../src/summaryview.c:7929
+#: ../src/summaryview.c:7932
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19513,11 +19779,11 @@ msgstr ""
 "Fel i reguljärt uttryck (regexp):\n"
 "%s"
 
-#: ../src/summaryview.c:8034
+#: ../src/summaryview.c:8037
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Gå tillbaka till mapplistan (Du har olästa meddelanden)"
 
-#: ../src/summaryview.c:8039
+#: ../src/summaryview.c:8042
 msgid "Go back to the folder list"
 msgstr "Gå tillbaka till mapplistan"
 
@@ -19645,11 +19911,11 @@ msgstr ""
 "    %s\n"
 "Slutstatus %d\n"
 
-#: ../src/textview.c:2194
+#: ../src/textview.c:2173
 msgid "Tags: "
 msgstr "Etiketter:"
 
-#: ../src/textview.c:2896
+#: ../src/textview.c:2875
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
@@ -19668,11 +19934,11 @@ msgstr ""
 "\n"
 "Öppna ändå?"
 
-#: ../src/textview.c:2905
+#: ../src/textview.c:2884
 msgid "Phishing attempt warning"
 msgstr "Varning försök till nätfiske"
 
-#: ../src/textview.c:2906
+#: ../src/textview.c:2885
 msgid "_Open URL"
 msgstr "_Öppna URL"
 
@@ -20270,3 +20536,4 @@ msgid ""
 msgstr ""
 "Claws är nu klart att användas.\n"
 "Klicka Spara för att starta."
+

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list