[Commits] [SCM] claws branch, master, updated. 3.16.0-6-g1554586

claws at claws-mail.org claws at claws-mail.org
Wed Dec 20 17:28:21 CET 2017


The branch, master has been updated
       via  15545864c2bb60d373518be810b9685718d5bf5c (commit)
      from  b190f09ab3534533751306dd4c2529aabc387ad4 (commit)

Summary of changes:
 po/cs.po    | 4879 ++++++++++++++++++++++++++++++++++++++---------------------
 po/zh_TW.po | 4141 ++++++++++++++++++++++++++++----------------------
 2 files changed, 5502 insertions(+), 3518 deletions(-)


- Log -----------------------------------------------------------------
commit 15545864c2bb60d373518be810b9685718d5bf5c
Author: Paul <paul at claws-mail.org>
Date:   Wed Dec 20 16:28:14 2017 +0000

    a couple late translation update
    
    from David Vachulka and Mark Chang

diff --git a/po/cs.po b/po/cs.po
index 0382a85..d6d6d55 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,8 +8,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: 2017-03-27 16:04+0100\n"
-"PO-Revision-Date: 2017-03-26 14:59+0200\n"
+"POT-Creation-Date: 2017-12-10 00:07+0000\n"
+"PO-Revision-Date: 2017-12-17 13:37+0100\n"
 "Last-Translator: David Vachulka <david at konstrukce-cad.com>\n"
 "Language-Team: Czech <cs at li.org>\n"
 "Language: cs\n"
@@ -17,9 +17,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 2.0.4\n"
 
-#: src/account.c:396 src/account.c:463
+#: src/account.c:395 src/account.c:462
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -27,15 +27,15 @@ msgstr ""
 "Jsou stále otevřena nějaká okna s rozepsanou zprávou.\n"
 "Před úpravou účtů zavřete prosím všechna tato okna."
 
-#: src/account.c:441
+#: src/account.c:440
 msgid "Can't create folder."
 msgstr "Nemohu vytvořit složku."
 
-#: src/account.c:728
+#: src/account.c:727
 msgid "Edit accounts"
 msgstr "Úpravy účtů"
 
-#: src/account.c:745
+#: src/account.c:744
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -45,63 +45,63 @@ msgstr ""
 "zde uvedeny. Zaškrtnutím ve sloupci 'P' určíte, zda účet bude touto funkcí "
 "zpracován. Tučný text značí aktuální účet."
 
-#: src/account.c:816
+#: src/account.c:815
 msgid " _Set as default account "
 msgstr " Nastavit účet jako _výchozí "
 
-#: src/account.c:908
+#: src/account.c:907
 msgid "Accounts with remote folders cannot be copied."
 msgstr ""
 "Účty se vzdáleně umístěnými složkami (např. IMAP) nemohou být kopírovány."
 
-#: src/account.c:915
+#: src/account.c:914
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopie %s"
 
-#: src/account.c:1096
+#: src/account.c:1097
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Opravdu chcete odstranit účet '%s'?"
 
-#: src/account.c:1098
+#: src/account.c:1099
 msgid "(Untitled)"
 msgstr "(Nepojmenovaný)"
 
-#: src/account.c:1099
+#: src/account.c:1100
 msgid "Delete account"
 msgstr "Odstranit účet"
 
-#: src/account.c:1589
+#: src/account.c:1590
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "P"
 
-#: src/account.c:1595
+#: src/account.c:1596
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 "Funkce 'Přijmout poštu ze všech účtů' načte zprávy z účtů označených "
 "zaškrtnutím"
 
-#: src/account.c:1602 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7333 src/editaddress.c:1264
+#: src/account.c:1603 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7424 src/editaddress.c:1264
 #: src/editaddress.c:1321 src/editaddress.c:1341
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
 #: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:465
-#: src/plugins/pdf_viewer/poppler_viewer.c:1792
-#: src/plugins/pgpcore/select-keys.c:395 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1868 src/prefs_template.c:79
+#: src/plugins/pdf_viewer/poppler_viewer.c:1803
+#: src/plugins/pgpcore/select-keys.c:409 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1870 src/prefs_template.c:79
 msgid "Name"
 msgstr "Jméno"
 
-#: src/account.c:1610 src/prefs_account.c:1096 src/prefs_account.c:4141
+#: src/account.c:1611 src/prefs_account.c:1108 src/prefs_account.c:4241
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:1618 src/ssl_manager.c:100
+#: src/account.c:1619 src/ssl_manager.c:100
 msgid "Server"
 msgstr "Server"
 
@@ -154,10 +154,10 @@ msgstr ""
 
 #: src/action.c:988 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:857
 #: src/plugins/tnef_parse/tnef_parse.c:75
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1831
-#: src/plugins/vcalendar/vcal_folder.c:1844
-#: src/plugins/vcalendar/vcal_folder.c:1847 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1840
+#: src/plugins/vcalendar/vcal_folder.c:1843 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
@@ -209,19 +209,19 @@ msgstr ""
 msgid "Action's user argument"
 msgstr "Uživatelský parametr akce"
 
-#: src/addrclip.c:479
+#: src/addrclip.c:480
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr "Nelze kopírovat složku do sebe sama nebo do své vlastní podsložky."
 
-#: src/addrclip.c:502
+#: src/addrclip.c:503
 msgid "Cannot copy an address book to itself."
 msgstr "Nelze kopírovat knihu adres do sebe sama."
 
-#: src/addrclip.c:593
+#: src/addrclip.c:594
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "Nelze přesunout složku do sebe sama nebo do své vlastní podsložky."
 
-#: src/addr_compl.c:689 src/addressbook.c:4946
+#: src/addr_compl.c:689 src/addressbook.c:4945
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "Skupina"
@@ -295,14 +295,14 @@ msgstr ""
 "výchozím nastavením?"
 
 #: src/addrcustomattr.c:212 src/addressbook.c:438 src/addressbook.c:466
-#: src/addressbook.c:483 src/edittags.c:272
+#: src/addressbook.c:483 src/edittags.c:279
 #: src/plugins/archive/archiver_gtk.c:1307 src/prefs_actions.c:1084
-#: src/prefs_filtering.c:1695 src/prefs_template.c:1109
+#: src/prefs_filtering.c:1697 src/prefs_template.c:1111
 msgid "_Delete"
 msgstr "_Odstranit"
 
-#: src/addrcustomattr.c:213 src/edittags.c:273 src/prefs_actions.c:1085
-#: src/prefs_filtering.c:1696 src/prefs_template.c:1110
+#: src/addrcustomattr.c:213 src/edittags.c:280 src/prefs_actions.c:1085
+#: src/prefs_filtering.c:1698 src/prefs_template.c:1112
 msgid "Delete _all"
 msgstr "Odstranit _vše"
 
@@ -357,7 +357,7 @@ msgid "Duplicate email addresses"
 msgstr "Duplikovat emailovou adresu(y)"
 
 #: src/addrduplicates.c:442 src/addressadd.c:227
-#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:526
+#: src/plugins/pgpcore/select-keys.c:410 src/toolbar.c:529
 msgid "Address"
 msgstr "Adresa"
 
@@ -365,11 +365,11 @@ msgstr "Adresa"
 msgid "Address book path"
 msgstr "Cesta ke knize adres"
 
-#: src/addrduplicates.c:793 src/addressbook.c:1438 src/addressbook.c:1491
+#: src/addrduplicates.c:793 src/addressbook.c:1439 src/addressbook.c:1492
 msgid "Delete address(es)"
 msgstr "Odstranit adresu(y)"
 
-#: src/addrduplicates.c:794 src/addressbook.c:1492
+#: src/addrduplicates.c:794 src/addressbook.c:1493
 msgid "Really delete the address(es)?"
 msgstr "Opravdu chcete odstranit tuto adresu(y)?"
 
@@ -377,7 +377,7 @@ msgstr "Opravdu chcete odstranit tuto adresu(y)?"
 msgid "Delete address"
 msgstr "Odstranit adresu(y)"
 
-#: src/addrduplicates.c:843 src/addressbook.c:1439
+#: src/addrduplicates.c:843 src/addressbook.c:1440
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Tato data jsou pouze pro čtení a nelze je odstranit."
 
@@ -398,7 +398,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku pro knihu adres"
 
-#: src/addressadd.c:534 src/addressbook.c:3216 src/addressbook.c:3267
+#: src/addressadd.c:534 src/addressbook.c:3214 src/addressbook.c:3265
 msgid "Add address(es)"
 msgstr "Přidat adresu(y)"
 
@@ -406,7 +406,7 @@ msgstr "Přidat adresu(y)"
 msgid "Can't add the specified address"
 msgstr "Nebylo možno přidat zadanou adresu"
 
-#: src/addressbook.c:126 src/addressbook.c:4934 src/editaddress.c:1053
+#: src/addressbook.c:126 src/addressbook.c:4933 src/editaddress.c:1053
 #: src/editaddress.c:1114 src/editgroup.c:289 src/expldifdlg.c:517
 #: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:762
 msgid "Email Address"
@@ -417,17 +417,17 @@ msgid "_Book"
 msgstr "_Kniha"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:602 src/mainwindow.c:514
+#: src/addressbook.c:482 src/compose.c:600 src/mainwindow.c:514
 #: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "Ú_pravy"
 
-#: src/addressbook.c:407 src/compose.c:607 src/mainwindow.c:517
+#: src/addressbook.c:407 src/compose.c:605 src/mainwindow.c:517
 #: src/messageview.c:212
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: src/addressbook.c:408 src/compose.c:608 src/mainwindow.c:519
+#: src/addressbook.c:408 src/compose.c:606 src/mainwindow.c:519
 #: src/messageview.c:213
 msgid "_Help"
 msgstr "Nápo_věda"
@@ -460,14 +460,14 @@ msgstr "Up_ravit knihu"
 msgid "_Delete book"
 msgstr "_Odstranit knihu"
 
-#: src/addressbook.c:427 src/compose.c:619
+#: src/addressbook.c:427 src/compose.c:617
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:433
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Save"
 msgstr "_Uložit"
 
-#: src/addressbook.c:428 src/compose.c:623 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:621 src/messageview.c:222
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
@@ -482,13 +482,13 @@ msgid "C_ut"
 msgstr "_Vyjmout"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:631 src/mainwindow.c:548 src/messageview.c:225
+#: src/compose.c:629 src/mainwindow.c:548 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopírovat"
 
 #: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:97
+#: src/compose.c:630 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "V_ložit"
 
@@ -532,7 +532,7 @@ msgstr "Najít duplikované..."
 msgid "Edit custom attributes..."
 msgstr "Upravit uživatelské atributy..."
 
-#: src/addressbook.c:458 src/compose.c:709 src/mainwindow.c:815
+#: src/addressbook.c:458 src/compose.c:707 src/mainwindow.c:813
 #: src/messageview.c:337
 msgid "_About"
 msgstr "_O programu"
@@ -542,10 +542,10 @@ msgid "_Browse Entry"
 msgstr "_Prohlížet záznam"
 
 #: src/addressbook.c:507 src/crash.c:456 src/crash.c:475 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:250 src/plugins/pgpcore/sgpgme.c:143
+#: src/plugins/pgpcore/select-keys.c:253 src/plugins/pgpcore/sgpgme.c:143
 #: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:402
-#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:782
-#: src/prefs_themes.c:814 src/prefs_themes.c:815
+#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:819
+#: src/prefs_themes.c:851 src/prefs_themes.c:852
 msgid "Unknown"
 msgstr "Neznámá(ý)"
 
@@ -645,24 +645,24 @@ msgstr "Pod tímto klíčem je již existující kontakt"
 msgid "Strong(er) authentication required"
 msgstr "Vyžadována silnější autentizace"
 
-#: src/addressbook.c:913
+#: src/addressbook.c:914
 msgid "Sources"
 msgstr "Zdroje adres"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
-#: src/toolbar.c:268 src/toolbar.c:2441
+#: src/addressbook.c:918 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/toolbar.c:268 src/toolbar.c:2519
 msgid "Address book"
 msgstr "Kniha adres"
 
-#: src/addressbook.c:1112 src/editldap.c:781
+#: src/addressbook.c:1113 src/editldap.c:798
 msgid "Search"
 msgstr "Hledání"
 
-#: src/addressbook.c:1483
+#: src/addressbook.c:1484
 msgid "Delete group"
 msgstr "Odstranit skupinu"
 
-#: src/addressbook.c:1484
+#: src/addressbook.c:1485
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -670,26 +670,26 @@ msgstr ""
 "Chcete odstranit skupinu (skupiny)?\n"
 "Adresy v ní (v nich) obsažené budou ztraceny."
 
-#: src/addressbook.c:2195
+#: src/addressbook.c:2193
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Nelze vložit. Cílová kniha adres je pouze pro čtení."
 
-#: src/addressbook.c:2205
+#: src/addressbook.c:2203
 msgid "Cannot paste into an address group."
 msgstr "Nelze provést vložení do skupiny adres."
 
-#: src/addressbook.c:2913
+#: src/addressbook.c:2911
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Opravdu chcete odstranit výsledky vyhledávání a adresy v '%s'?"
 
-#: src/addressbook.c:2916 src/addressbook.c:2942 src/addressbook.c:2949
+#: src/addressbook.c:2914 src/addressbook.c:2940 src/addressbook.c:2947
 #: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:177
-#: src/toolbar.c:494
+#: src/toolbar.c:497
 msgid "Delete"
 msgstr "Odstranit"
 
-#: src/addressbook.c:2925
+#: src/addressbook.c:2923
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -698,20 +698,20 @@ msgstr ""
 "Chcete odstranit '%s'? Pokud odstraníte pouze složku, adresy v ní obsažené "
 "budou přesunuty do nadřazené složky."
 
-#: src/addressbook.c:2928 src/imap_gtk.c:370 src/mh_gtk.c:206
+#: src/addressbook.c:2926 src/imap_gtk.c:368 src/mh_gtk.c:206
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
 msgid "Delete folder"
 msgstr "Odstranit složku"
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2927
 msgid "Delete _folder only"
 msgstr "Odstranit pouze _složku"
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2927
 msgid "Delete folder and _addresses"
 msgstr "Odstranit složku a _adresy"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2938
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -720,7 +720,7 @@ msgstr ""
 "Chcete odstranit '%s'?\n"
 "Adresy v ní obsažené budou ztraceny."
 
-#: src/addressbook.c:2947
+#: src/addressbook.c:2945
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -729,28 +729,28 @@ msgstr ""
 "Chcete odstranit '%s'?\n"
 "Adresy v ní obsažené budou ztraceny."
 
-#: src/addressbook.c:3061
+#: src/addressbook.c:3059
 #, c-format
 msgid "Search '%s'"
 msgstr "Hledání '%s'"
 
-#: src/addressbook.c:3199 src/addressbook.c:3248
+#: src/addressbook.c:3197 src/addressbook.c:3246
 msgid "New Contacts"
 msgstr "Nový kontakt"
 
-#: src/addressbook.c:4087
+#: src/addressbook.c:4085
 msgid "New user, could not save index file."
 msgstr "Nový uživatel, nelze uložit index soubor."
 
-#: src/addressbook.c:4091
+#: src/addressbook.c:4089
 msgid "New user, could not save address book files."
 msgstr "Nový uživatel, nelze uložit soubory s knihou adres."
 
-#: src/addressbook.c:4101
+#: src/addressbook.c:4099
 msgid "Old address book converted successfully."
 msgstr "Konverze staré knihy adres proběhla úspěšně."
 
-#: src/addressbook.c:4106
+#: src/addressbook.c:4104
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -758,7 +758,7 @@ msgstr ""
 "Stará kniha adres zkonvertována,\n"
 "nepodařilo se uložit nový soubor s indexem adres."
 
-#: src/addressbook.c:4119
+#: src/addressbook.c:4117
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -766,7 +766,7 @@ msgstr ""
 "Nepodařilo se provést konverzi knihy adres,\n"
 "ale byl vytvořen nové prázdné soubory knihy adres."
 
-#: src/addressbook.c:4125
+#: src/addressbook.c:4123
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -774,7 +774,7 @@ msgstr ""
 "Nepodařilo se provést konverzi knihy adres,\n"
 "nepodařilo se uložit nový soubor s indexem adres."
 
-#: src/addressbook.c:4130
+#: src/addressbook.c:4128
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -782,52 +782,52 @@ msgstr ""
 "Nepodařilo se provést konverzi knihy adres\n"
 "a nepodařilo se vytvořit nové soubory knihy adres."
 
-#: src/addressbook.c:4137 src/addressbook.c:4143
+#: src/addressbook.c:4135 src/addressbook.c:4141
 msgid "Addressbook conversion error"
 msgstr "Chyba při konverzi knihy adres"
 
-#: src/addressbook.c:4257
+#: src/addressbook.c:4256
 msgid "Addressbook Error"
 msgstr "Chyba v knize adres"
 
-#: src/addressbook.c:4258
+#: src/addressbook.c:4257
 msgid "Could not read address index"
 msgstr "Nelze načíst index adres"
 
-#: src/addressbook.c:4589
+#: src/addressbook.c:4588
 msgid "Busy searching..."
 msgstr "Prohledávám..."
 
-#: src/addressbook.c:4898 src/prefs_send.c:188
+#: src/addressbook.c:4897 src/prefs_send.c:216
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/addressbook.c:4910
+#: src/addressbook.c:4909
 msgid "Address Books"
 msgstr "Kniha adres"
 
-#: src/addressbook.c:4922
+#: src/addressbook.c:4921
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:355
-#: src/folderview.c:443 src/prefs_account.c:2799 src/prefs_folder_column.c:78
+#: src/addressbook.c:4957 src/exporthtml.c:884 src/folderview.c:355
+#: src/folderview.c:443 src/prefs_account.c:2860 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Složka"
 
-#: src/addressbook.c:4970
+#: src/addressbook.c:4969
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4982 src/addressbook.c:4994
+#: src/addressbook.c:4981 src/addressbook.c:4993
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5006
+#: src/addressbook.c:5005
 msgid "LDAP servers"
 msgstr "LDAP servery"
 
-#: src/addressbook.c:5018
+#: src/addressbook.c:5017
 msgid "LDAP Query"
 msgstr "LDAP dotaz"
 
@@ -847,9 +847,9 @@ msgstr "Kniha adres"
 #: src/plugins/spamassassin/spamassassin_gtk.c:443
 #: src/plugins/spamassassin/spamassassin_gtk.c:490
 #: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:675
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1619 src/prefs_matcher.c:1626
-#: src/prefs_matcher.c:1634 src/prefs_matcher.c:1636 src/prefs_matcher.c:2520
-#: src/prefs_matcher.c:2524
+#: src/prefs_matcher.c:710 src/prefs_matcher.c:1621 src/prefs_matcher.c:1628
+#: src/prefs_matcher.c:1636 src/prefs_matcher.c:1638 src/prefs_matcher.c:2522
+#: src/prefs_matcher.c:2526
 msgid "Any"
 msgstr "Kterákoliv"
 
@@ -903,7 +903,7 @@ msgstr "Zpracovat tato pole z hlavičky zprávy"
 msgid "Include subfolders"
 msgstr "Zahrnout podsložky"
 
-#: src/addrgather.c:450 src/prefs_filtering_action.c:1426
+#: src/addrgather.c:450 src/prefs_filtering_action.c:1429
 msgid "Header Name"
 msgstr "Záhlaví"
 
@@ -950,21 +950,21 @@ msgstr "Aktualizace adres"
 
 #: src/addrindex.c:1830
 msgid "Update failed. Changes not written to Directory."
-msgstr "Aktualizace selhala. Změny do slovníku nebyly zapsány. "
+msgstr "Aktualizace selhala. Změny do slovníku nebyly zapsány."
 
-#: src/alertpanel.c:146 src/compose.c:9624
+#: src/alertpanel.c:146 src/compose.c:9761
 msgid "Notice"
 msgstr "Poznámka"
 
-#: src/alertpanel.c:159 src/compose.c:5780 src/compose.c:6301
-#: src/compose.c:12047 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:855 src/messageview.c:882 src/plugins/pgpcore/sgpgme.c:788
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4895
+#: src/alertpanel.c:159 src/compose.c:5848 src/compose.c:6376
+#: src/compose.c:12218 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:882 src/plugins/pgpcore/sgpgme.c:806
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4937
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5717 src/inc.c:663
-#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5785 src/inc.c:663
+#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:310
 msgid "Error"
 msgstr "Chyba"
 
@@ -1248,548 +1248,548 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4759
+#: src/common/utils.c:4781
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Neděle"
 
-#: src/common/utils.c:4760
+#: src/common/utils.c:4782
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Pondělí"
 
-#: src/common/utils.c:4761
+#: src/common/utils.c:4783
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: src/common/utils.c:4762
+#: src/common/utils.c:4784
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Středa"
 
-#: src/common/utils.c:4763
+#: src/common/utils.c:4785
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: src/common/utils.c:4764
+#: src/common/utils.c:4786
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Pátek"
 
-#: src/common/utils.c:4765
+#: src/common/utils.c:4787
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/common/utils.c:4767
+#: src/common/utils.c:4789
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Leden"
 
-#: src/common/utils.c:4768
+#: src/common/utils.c:4790
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Únor"
 
-#: src/common/utils.c:4769
+#: src/common/utils.c:4791
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Březen"
 
-#: src/common/utils.c:4770
+#: src/common/utils.c:4792
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Duben"
 
-#: src/common/utils.c:4771
+#: src/common/utils.c:4793
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Květen"
 
-#: src/common/utils.c:4772
+#: src/common/utils.c:4794
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Červen"
 
-#: src/common/utils.c:4773
+#: src/common/utils.c:4795
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Červenec"
 
-#: src/common/utils.c:4774
+#: src/common/utils.c:4796
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Srpen"
 
-#: src/common/utils.c:4775
+#: src/common/utils.c:4797
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Září"
 
-#: src/common/utils.c:4776
+#: src/common/utils.c:4798
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Říjen"
 
-#: src/common/utils.c:4777
+#: src/common/utils.c:4799
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Listopad"
 
-#: src/common/utils.c:4778
+#: src/common/utils.c:4800
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Prosinec"
 
-#: src/common/utils.c:4780
+#: src/common/utils.c:4802
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
-msgstr "ne"
+msgstr "Ne"
 
-#: src/common/utils.c:4781
+#: src/common/utils.c:4803
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
-msgstr "po"
+msgstr "Po"
 
-#: src/common/utils.c:4782
+#: src/common/utils.c:4804
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
-msgstr "út"
+msgstr "Út"
 
-#: src/common/utils.c:4783
+#: src/common/utils.c:4805
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
-msgstr "st"
+msgstr "St"
 
-#: src/common/utils.c:4784
+#: src/common/utils.c:4806
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
-msgstr "čt"
+msgstr "Čt"
 
-#: src/common/utils.c:4785
+#: src/common/utils.c:4807
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
-msgstr "pá"
+msgstr "Pá"
 
-#: src/common/utils.c:4786
+#: src/common/utils.c:4808
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
-msgstr "so"
+msgstr "So"
 
-#: src/common/utils.c:4788
+#: src/common/utils.c:4810
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
-msgstr "led"
+msgstr "Led"
 
-#: src/common/utils.c:4789
+#: src/common/utils.c:4811
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
-msgstr "úno"
+msgstr "Úno"
 
-#: src/common/utils.c:4790
+#: src/common/utils.c:4812
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
-msgstr "bře"
+msgstr "Bře"
 
-#: src/common/utils.c:4791
+#: src/common/utils.c:4813
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
-msgstr "dub"
+msgstr "Dub"
 
-#: src/common/utils.c:4792
+#: src/common/utils.c:4814
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
-msgstr "kvě"
+msgstr "Kvě"
 
-#: src/common/utils.c:4793
+#: src/common/utils.c:4815
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
-msgstr "čen"
+msgstr "Čen"
 
-#: src/common/utils.c:4794
+#: src/common/utils.c:4816
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
-msgstr "čvc"
+msgstr "Čvc"
 
-#: src/common/utils.c:4795
+#: src/common/utils.c:4817
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
-msgstr "srp"
+msgstr "Srp"
 
-#: src/common/utils.c:4796
+#: src/common/utils.c:4818
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
-msgstr "zář"
+msgstr "Zář"
 
-#: src/common/utils.c:4797
+#: src/common/utils.c:4819
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
-msgstr "říj"
+msgstr "Říj"
 
-#: src/common/utils.c:4798
+#: src/common/utils.c:4820
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
-msgstr "lis"
+msgstr "Lis"
 
-#: src/common/utils.c:4799
+#: src/common/utils.c:4821
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
-msgstr "pro"
+msgstr "Pro"
 
-#: src/common/utils.c:4810
+#: src/common/utils.c:4832
 msgctxt "For use by strftime (morning)"
 msgid "AM"
-msgstr "DOP."
+msgstr "DOP"
 
-#: src/common/utils.c:4811
+#: src/common/utils.c:4833
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
-msgstr "ODP."
+msgstr "ODP"
 
-#: src/common/utils.c:4812
+#: src/common/utils.c:4834
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
-msgstr "dop."
+msgstr "dop"
 
-#: src/common/utils.c:4813
+#: src/common/utils.c:4835
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
-msgstr "odp."
+msgstr "odp"
 
-#: src/compose.c:591
+#: src/compose.c:589
 msgid "_Add..."
 msgstr "_Přidat..."
 
-#: src/compose.c:592 src/mh_gtk.c:377 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:590 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:316
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: src/compose.c:594 src/folderview.c:254
+#: src/compose.c:592 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
-#: src/compose.c:601 src/mainwindow.c:516 src/messageview.c:211
+#: src/compose.c:599 src/mainwindow.c:516 src/messageview.c:211
 msgid "_Message"
 msgstr "_Zpráva"
 
-#: src/compose.c:604
+#: src/compose.c:602
 msgid "_Spelling"
 msgstr "_Pravopis"
 
-#: src/compose.c:606 src/compose.c:673
+#: src/compose.c:604 src/compose.c:671
 msgid "_Options"
 msgstr "Nastav_ení"
 
-#: src/compose.c:610
+#: src/compose.c:608
 msgid "S_end"
 msgstr "_Odeslat"
 
-#: src/compose.c:611
+#: src/compose.c:609
 msgid "Send _later"
 msgstr "Poslat _později"
 
-#: src/compose.c:614
+#: src/compose.c:612
 msgid "_Attach file"
 msgstr "Připojit _soubor"
 
-#: src/compose.c:615
+#: src/compose.c:613
 msgid "_Insert file"
 msgstr "_Vložit soubor"
 
-#: src/compose.c:616
+#: src/compose.c:614
 msgid "Insert si_gnature"
 msgstr "Vložit p_odpis"
 
-#: src/compose.c:617
+#: src/compose.c:615
 msgid "_Replace signature"
 msgstr "Na_hradit podpis"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "_Print"
 msgstr "_Tisk"
 
-#: src/compose.c:626 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:624 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Zpět"
 
-#: src/compose.c:627 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:625 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "Z_novu"
 
-#: src/compose.c:630 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:628 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "_Vyjmout"
 
-#: src/compose.c:634
+#: src/compose.c:632
 msgid "_Special paste"
 msgstr "_Vložit jinak"
 
-#: src/compose.c:635
+#: src/compose.c:633
 msgid "As _quotation"
 msgstr "Jako _citaci"
 
-#: src/compose.c:636
+#: src/compose.c:634
 msgid "_Wrapped"
 msgstr "_Zalomené"
 
-#: src/compose.c:637
+#: src/compose.c:635
 msgid "_Unwrapped"
 msgstr "_Nezalomené"
 
-#: src/compose.c:639 src/mainwindow.c:549
+#: src/compose.c:637 src/mainwindow.c:549
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Vybrat vš_e"
 
-#: src/compose.c:641
+#: src/compose.c:639
 msgid "A_dvanced"
 msgstr "Po_kročilé"
 
-#: src/compose.c:642
+#: src/compose.c:640
 msgid "Move a character backward"
 msgstr "Přesun o znak zpět"
 
-#: src/compose.c:643
+#: src/compose.c:641
 msgid "Move a character forward"
 msgstr "Přesun o znak dále"
 
-#: src/compose.c:644
+#: src/compose.c:642
 msgid "Move a word backward"
 msgstr "Přesun o slovo zpět"
 
-#: src/compose.c:645
+#: src/compose.c:643
 msgid "Move a word forward"
 msgstr "Přesun o slovo dále"
 
-#: src/compose.c:646
+#: src/compose.c:644
 msgid "Move to beginning of line"
 msgstr "Přesun na začátek řádku"
 
-#: src/compose.c:647
+#: src/compose.c:645
 msgid "Move to end of line"
 msgstr "Přesun na konec řádku"
 
-#: src/compose.c:648
+#: src/compose.c:646
 msgid "Move to previous line"
 msgstr "Přesun na předchozí řádek"
 
-#: src/compose.c:649
+#: src/compose.c:647
 msgid "Move to next line"
 msgstr "Přesun na další řádek"
 
-#: src/compose.c:650
+#: src/compose.c:648
 msgid "Delete a character backward"
 msgstr "Smazat znak zpět"
 
-#: src/compose.c:651
+#: src/compose.c:649
 msgid "Delete a character forward"
 msgstr "Smazat znak vpřed"
 
-#: src/compose.c:652
+#: src/compose.c:650
 msgid "Delete a word backward"
 msgstr "Smazat slovo zpět"
 
-#: src/compose.c:653
+#: src/compose.c:651
 msgid "Delete a word forward"
 msgstr "Smazat slovo vpřed"
 
-#: src/compose.c:654
+#: src/compose.c:652
 msgid "Delete line"
 msgstr "Smazat řádek"
 
-#: src/compose.c:655
+#: src/compose.c:653
 msgid "Delete to end of line"
 msgstr "Smazat do konce řádku"
 
-#: src/compose.c:658 src/messageview.c:228
+#: src/compose.c:656 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Najít"
 
-#: src/compose.c:661
+#: src/compose.c:659
 msgid "_Wrap current paragraph"
 msgstr "_Zalomit aktuální odstavec"
 
-#: src/compose.c:662
+#: src/compose.c:660
 msgid "Wrap all long _lines"
 msgstr "Zalomit všechny _dlouhé řádky"
 
-#: src/compose.c:664
+#: src/compose.c:662
 msgid "Edit with e_xternal editor"
 msgstr "Upravit e_xterním editorem"
 
-#: src/compose.c:667
+#: src/compose.c:665
 msgid "_Check all or check selection"
 msgstr "_Zkontrolovat vše nebo výběr"
 
-#: src/compose.c:668
+#: src/compose.c:666
 msgid "_Highlight all misspelled words"
 msgstr "Z_výraznit nesprávná slova"
 
-#: src/compose.c:669
+#: src/compose.c:667
 msgid "Check _backwards misspelled word"
 msgstr "Přejít na _předchozí chybu"
 
-#: src/compose.c:670
+#: src/compose.c:668
 msgid "_Forward to next misspelled word"
 msgstr "Přejít na _následující chybu"
 
-#: src/compose.c:677
+#: src/compose.c:675
 msgid "Reply _mode"
 msgstr "_Mód odpovědi"
 
-#: src/compose.c:679
+#: src/compose.c:677
 msgid "Privacy _System"
 msgstr "Systém _zabezpečení"
 
-#: src/compose.c:683
+#: src/compose.c:681
 msgid "_Priority"
 msgstr "_Priorita"
 
-#: src/compose.c:685 src/mainwindow.c:611 src/messageview.c:264
+#: src/compose.c:683 src/mainwindow.c:611 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "_Kódování znaků"
 
-#: src/compose.c:690 src/mainwindow.c:616 src/messageview.c:269
+#: src/compose.c:688 src/mainwindow.c:616 src/messageview.c:269
 msgid "Western European"
 msgstr "Západní Evropa"
 
-#: src/compose.c:691 src/mainwindow.c:617 src/messageview.c:270
+#: src/compose.c:689 src/mainwindow.c:617 src/messageview.c:270
 msgid "Baltic"
 msgstr "Baltské"
 
-#: src/compose.c:692 src/mainwindow.c:618 src/messageview.c:271
+#: src/compose.c:690 src/mainwindow.c:618 src/messageview.c:271
 msgid "Hebrew"
 msgstr "Hebrejština"
 
-#: src/compose.c:693 src/mainwindow.c:619 src/messageview.c:272
+#: src/compose.c:691 src/mainwindow.c:619 src/messageview.c:272
 msgid "Arabic"
 msgstr "Arabština"
 
-#: src/compose.c:694 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:692 src/mainwindow.c:620 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "Azbuka"
 
-#: src/compose.c:695 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:693 src/mainwindow.c:621 src/messageview.c:274
 msgid "Japanese"
 msgstr "Japonština"
 
-#: src/compose.c:696 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:694 src/mainwindow.c:622 src/messageview.c:275
 msgid "Chinese"
 msgstr "Čínština"
 
-#: src/compose.c:697 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:695 src/mainwindow.c:623 src/messageview.c:276
 msgid "Korean"
 msgstr "Korejština"
 
-#: src/compose.c:698 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:696 src/mainwindow.c:624 src/messageview.c:277
 msgid "Thai"
 msgstr "Thajština"
 
-#: src/compose.c:701 src/mainwindow.c:734 src/messageview.c:313
+#: src/compose.c:699 src/mainwindow.c:734 src/messageview.c:313
 msgid "_Address book"
 msgstr "_Kniha adres"
 
-#: src/compose.c:703
+#: src/compose.c:701
 msgid "_Template"
 msgstr "Ša_blona"
 
-#: src/compose.c:705 src/mainwindow.c:762 src/messageview.c:333
+#: src/compose.c:703 src/mainwindow.c:762 src/messageview.c:333
 msgid "Actio_ns"
 msgstr "Ak_ce"
 
-#: src/compose.c:714
+#: src/compose.c:712
 msgid "Aut_o wrapping"
 msgstr "Aut_omatické zalamování"
 
-#: src/compose.c:715
+#: src/compose.c:713
 msgid "Auto _indent"
 msgstr "Automatické _odsazení"
 
-#: src/compose.c:716
+#: src/compose.c:714
 msgid "Si_gn"
 msgstr "Po_depsat"
 
-#: src/compose.c:717
+#: src/compose.c:715
 msgid "_Encrypt"
 msgstr "Ši_frovat"
 
-#: src/compose.c:718
+#: src/compose.c:716
 msgid "_Request Return Receipt"
 msgstr "_Vyžadovat potvrzení o doručení"
 
-#: src/compose.c:719
+#: src/compose.c:717
 msgid "Remo_ve references"
 msgstr "Odstranit reference"
 
-#: src/compose.c:720
+#: src/compose.c:718
 msgid "Show _ruler"
 msgstr "Zobrazit _pravítko"
 
-#: src/compose.c:725 src/compose.c:735
+#: src/compose.c:723 src/compose.c:733
 msgid "_Normal"
 msgstr "_Normální"
 
-#: src/compose.c:726 src/mainwindow.c:665 src/messageview.c:302
+#: src/compose.c:724 src/mainwindow.c:665 src/messageview.c:302
 msgid "_All"
 msgstr "_Všem"
 
-#: src/compose.c:727 src/mainwindow.c:666 src/messageview.c:303
+#: src/compose.c:725 src/mainwindow.c:666 src/messageview.c:303
 msgid "_Sender"
 msgstr "_Odesílateli"
 
-#: src/compose.c:728
+#: src/compose.c:726
 msgid "_Mailing-list"
 msgstr "Kon_ference"
 
-#: src/compose.c:733
+#: src/compose.c:731
 msgid "_Highest"
 msgstr "_Nejvyšší"
 
-#: src/compose.c:734
+#: src/compose.c:732
 msgid "Hi_gh"
 msgstr "Vy_soká"
 
-#: src/compose.c:736
+#: src/compose.c:734
 msgid "Lo_w"
 msgstr "Ní_zká"
 
-#: src/compose.c:737
+#: src/compose.c:735
 msgid "_Lowest"
 msgstr "Ne_jnižsí"
 
-#: src/compose.c:742 src/mainwindow.c:880 src/messageview.c:350
+#: src/compose.c:740 src/mainwindow.c:878 src/messageview.c:350
 msgid "_Automatic"
 msgstr "_Automaticky"
 
-#: src/compose.c:743 src/mainwindow.c:881 src/messageview.c:351
+#: src/compose.c:741 src/mainwindow.c:879 src/messageview.c:351
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bitové ASCII (US-ASC_II)"
 
-#: src/compose.c:744 src/mainwindow.c:882 src/messageview.c:352
+#: src/compose.c:742 src/mainwindow.c:880 src/messageview.c:352
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:748 src/mainwindow.c:886 src/messageview.c:356
+#: src/compose.c:746 src/mainwindow.c:884 src/messageview.c:356
 msgid "Central European (ISO-8859-_2)"
 msgstr "Střední Evropa (ISO-8859-_2)"
 
-#: src/compose.c:751 src/mainwindow.c:889 src/messageview.c:359
+#: src/compose.c:749 src/mainwindow.c:887 src/messageview.c:359
 msgid "Greek (ISO-8859-_7)"
 msgstr "Řečtina (ISO-8859-_7)"
 
-#: src/compose.c:756 src/mainwindow.c:894 src/messageview.c:364
+#: src/compose.c:754 src/mainwindow.c:892 src/messageview.c:364
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turečtina (ISO-8859-_9)"
 
-#: src/compose.c:1085
+#: src/compose.c:1083
 msgid "New message From format error."
 msgstr "Chyba ve formátu pole Od nové zprávy."
 
-#: src/compose.c:1177
+#: src/compose.c:1176
 msgid "New message subject format error."
 msgstr "Chyba v předmětu šablony nové zprávy."
 
@@ -1798,77 +1798,77 @@ msgstr "Chyba v předmětu šablony nové zprávy."
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Napsat\" na řádku %d."
 
-#: src/compose.c:1469
+#: src/compose.c:1473
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Není možno odpovědět. Originální email pravděpodobně neexistuje."
 
-#: src/compose.c:1652 src/quote_fmt.c:587
+#: src/compose.c:1656 src/quote_fmt.c:587
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 "Pole \"Od\" v šabloně \"Odpovědět\" obsahuje neplatnou emailovou adresu."
 
-#: src/compose.c:1700 src/quote_fmt.c:590
+#: src/compose.c:1705 src/quote_fmt.c:590
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Odpovědět\" na řádku %d."
 
-#: src/compose.c:1834 src/compose.c:2025 src/quote_fmt.c:607
+#: src/compose.c:1839 src/compose.c:2031 src/quote_fmt.c:607
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "Pole \"Od\" v šabloně \"Předat\" obsahuje neplatnou emailovou adresu."
 
-#: src/compose.c:1894 src/quote_fmt.c:610
+#: src/compose.c:1900 src/quote_fmt.c:610
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Předat\" na řádku %d."
 
-#: src/compose.c:2067
+#: src/compose.c:2074
 msgid "Fw: multiple emails"
 msgstr "Fw: vice zprav"
 
-#: src/compose.c:2569
+#: src/compose.c:2576
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Přesměrovat\" na řádku %d."
 
-#: src/compose.c:2636 src/gtk/headers.h:14
+#: src/compose.c:2643 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/compose.c:2639 src/gtk/headers.h:15
+#: src/compose.c:2646 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
 
-#: src/compose.c:2642 src/gtk/headers.h:12
+#: src/compose.c:2649 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Odpovědět komu:"
 
-#: src/compose.c:2645 src/compose.c:4963 src/compose.c:4965
+#: src/compose.c:2652 src/compose.c:5019 src/compose.c:5021
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Diskusní skupiny:"
 
-#: src/compose.c:2648 src/gtk/headers.h:34
+#: src/compose.c:2655 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Pokračování:"
 
-#: src/compose.c:2651 src/gtk/headers.h:17
+#: src/compose.c:2658 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "V odpovědi komu:"
 
-#: src/compose.c:2655 src/compose.c:4960 src/compose.c:4968
+#: src/compose.c:2662 src/compose.c:5016 src/compose.c:5024
 #: src/gtk/headers.h:13 src/summary_search.c:481
 msgid "To:"
 msgstr "Komu:"
 
-#: src/compose.c:2841
+#: src/compose.c:2852
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Nepodařilo se připojit soubor (konverze znakové sady se nezdařila)."
 
-#: src/compose.c:2847
+#: src/compose.c:2858
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1886,73 +1886,73 @@ msgstr[2] ""
 "Následující soubory byly připojeny: \n"
 "%s"
 
-#: src/compose.c:3124
+#: src/compose.c:3138
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"Značka pro citaci\" v šabloně je neplatná."
 
-#: src/compose.c:3630
+#: src/compose.c:3667
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Nemohu získat velikost souboru '%s'."
 
-#: src/compose.c:3641
+#: src/compose.c:3685
 #, 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 "Chystáte se vložit soubor %s do těla zprávy. Jste si tím jistý?"
 
-#: src/compose.c:3644
+#: src/compose.c:3688
 msgid "Are you sure?"
 msgstr "Jste si jistý?"
 
-#: src/compose.c:3645 src/compose.c:10650 src/compose.c:11526
+#: src/compose.c:3689 src/compose.c:10817 src/compose.c:11695
 msgid "_Insert"
 msgstr "_Vložit"
 
-#: src/compose.c:3769
+#: src/compose.c:3813
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:3770
+#: src/compose.c:3814
 msgid "Empty file"
 msgstr "Prázdný soubor"
 
-#: src/compose.c:3771
+#: src/compose.c:3815
 msgid "_Attach anyway"
 msgstr "_Přesto přiložit"
 
-#: src/compose.c:3780
+#: src/compose.c:3824
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemohu načíst %s."
 
-#: src/compose.c:3807
+#: src/compose.c:3851
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:4800 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4856 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Upraveno]"
 
-#: src/compose.c:4807 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4863 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:4810 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4866 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[žádný předmět] - Psaní zprávy%s"
 
-#: src/compose.c:4812 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4868 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Napsat zprávu"
 
-#: src/compose.c:4839 src/messageview.c:903
+#: src/compose.c:4895 src/messageview.c:903
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1960,57 +1960,57 @@ msgstr ""
 "Není zadán účet pro odesílání mailů.\n"
 "Před odesláním vyberte prosím nějaký účet."
 
-#: src/compose.c:5060 src/compose.c:5097
+#: src/compose.c:5116 src/compose.c:5153
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "Jediný adresát je výchozí %s příjemce. Opravdu odeslat?"
 
-#: src/compose.c:5062 src/compose.c:5099 src/compose.c:5142 src/compose.c:5190
-#: src/prefs_account.c:3323 src/toolbar.c:484 src/toolbar.c:516
+#: src/compose.c:5118 src/compose.c:5155 src/compose.c:5198 src/compose.c:5247
+#: src/prefs_account.c:3405 src/toolbar.c:487 src/toolbar.c:519
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/compose.c:5064 src/compose.c:5101 src/compose.c:5135 src/compose.c:5183
-#: src/compose.c:5718 src/folderview.c:2543 src/messageview.c:856
+#: src/compose.c:5120 src/compose.c:5157 src/compose.c:5191 src/compose.c:5240
+#: src/compose.c:5786 src/folderview.c:2543 src/messageview.c:856
 #: src/messageview.c:884 src/plugins/attachwarner/attachwarner.c:210
-#: src/toolbar.c:2933
+#: src/toolbar.c:3030
 msgid "_Send"
 msgstr "_Odeslat"
 
-#: src/compose.c:5118
+#: src/compose.c:5174
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:5137 src/compose.c:5185
+#: src/compose.c:5193 src/compose.c:5242
 #: src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_Fronta"
 
-#: src/compose.c:5138
+#: src/compose.c:5194
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Předmět je prázdný.  %s"
 
-#: src/compose.c:5139 src/compose.c:5187
+#: src/compose.c:5195 src/compose.c:5244
 #: src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Přesto odeslat?"
 
-#: src/compose.c:5140 src/compose.c:5188
+#: src/compose.c:5196 src/compose.c:5245
 #: src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Opravdu zařadit do fronty?"
 
-#: src/compose.c:5142 src/compose.c:5190 src/toolbar.c:517
+#: src/compose.c:5198 src/compose.c:5247 src/toolbar.c:520
 msgid "Send later"
 msgstr "Poslat později"
 
-#: src/compose.c:5186
+#: src/compose.c:5243
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Posílám %d příjemcům. %s"
 
-#: src/compose.c:5243 src/compose.c:10122
+#: src/compose.c:5300 src/compose.c:10259
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2020,7 +2020,7 @@ msgstr ""
 "\n"
 "Konverze znakové sady se nezdařila."
 
-#: src/compose.c:5246 src/compose.c:10125
+#: src/compose.c:5303 src/compose.c:10262
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2030,7 +2030,7 @@ msgstr ""
 "\n"
 "Nepodařilo se získat šifrovací klíč příjemce."
 
-#: src/compose.c:5252 src/compose.c:10119
+#: src/compose.c:5309 src/compose.c:10256
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2041,7 +2041,7 @@ msgstr ""
 "\n"
 "Podepisování se nezdařilo: %s"
 
-#: src/compose.c:5255
+#: src/compose.c:5312
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2052,11 +2052,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5257
+#: src/compose.c:5314
 msgid "Could not queue message for sending."
 msgstr "Zprávu nelze uložit do fronty pro odeslání."
 
-#: src/compose.c:5272 src/compose.c:5332
+#: src/compose.c:5329 src/compose.c:5389
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2064,7 +2064,7 @@ msgstr ""
 "Zpráva byla uložena do fronty ale nemohla být odeslána.\n"
 "Použijte nabídku \"Odeslat pozdržené zprávy \" z hlavního okna."
 
-#: src/compose.c:5328
+#: src/compose.c:5385
 #, c-format
 msgid ""
 "%s\n"
@@ -2073,7 +2073,7 @@ msgstr ""
 "%s\n"
 "Použijte nabídku \"Odeslat pozdržené zprávy \" z hlavního okna."
 
-#: src/compose.c:5714
+#: src/compose.c:5782
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2084,7 +2084,7 @@ msgstr ""
 "na %s.\n"
 "Odeslat v kódování %s?"
 
-#: src/compose.c:5776
+#: src/compose.c:5844
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2097,72 +2097,72 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:5887
+#: src/compose.c:5955
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Nepodařilo se zašifrovat zprávu: %s"
 
-#: src/compose.c:6008
+#: src/compose.c:6076
 msgid "Encryption warning"
 msgstr "Varování šifrování"
 
-#: src/compose.c:6009
+#: src/compose.c:6077
 msgid "C_ontinue"
 msgstr "_Pokračovat"
 
-#: src/compose.c:6058
+#: src/compose.c:6126
 msgid "No account for sending mails available!"
 msgstr "Není dostupný žádný účet pro odeslání pošty!"
 
-#: src/compose.c:6067
+#: src/compose.c:6135
 msgid "Selected account isn't NNTP: Posting is impossible."
-msgstr "Vybraný účet není NNTP: Odeslání není možné. "
+msgstr "Vybraný účet není NNTP: Odeslání není možné."
 
-#: src/compose.c:6300
+#: src/compose.c:6375
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Příloha %s už neexistuje. Ignorovat?"
 
-#: src/compose.c:6301 src/mainwindow.c:656 src/toolbar.c:274 src/toolbar.c:2466
+#: src/compose.c:6376 src/mainwindow.c:656 src/toolbar.c:276 src/toolbar.c:2560
 msgid "Cancel sending"
 msgstr "Zrušit posílání"
 
-#: src/compose.c:6301
+#: src/compose.c:6376
 msgid "Ignore attachment"
 msgstr "Ignorovat přílohu"
 
-#: src/compose.c:6341
+#: src/compose.c:6432
 #, c-format
 msgid "Original %s part"
 msgstr "Část originálu %s"
 
-#: src/compose.c:6941
+#: src/compose.c:7032
 msgid "Add to address _book"
 msgstr "Přidat do knihy adres"
 
-#: src/compose.c:7102
+#: src/compose.c:7193
 msgid "Delete entry contents"
 msgstr "Smazat obsah pole"
 
-#: src/compose.c:7106 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7197 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Použijte <tab> pro automatické dokončení podle knihy adres"
 
-#: src/compose.c:7321
+#: src/compose.c:7412
 msgid "Mime type"
 msgstr "MIME typ"
 
-#: src/compose.c:7327 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
-#: src/prefs_matcher.c:630 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:85 src/summaryview.c:446
+#: src/compose.c:7418 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:407
+#: src/prefs_matcher.c:630 src/prefs_summaries.c:441
+#: src/prefs_summary_column.c:84 src/summaryview.c:447
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:7390
+#: src/compose.c:7481
 msgid "Save Message to "
 msgstr "Uložit zprávu do "
 
-#: src/compose.c:7427 src/editjpilot.c:276 src/editldap.c:519
+#: src/compose.c:7518 src/editjpilot.c:276 src/editldap.c:519
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
 #: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1075
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2173,27 +2173,27 @@ msgstr "Uložit zprávu do "
 msgid "_Browse"
 msgstr "P_rocházet"
 
-#: src/compose.c:7449
+#: src/compose.c:7540
 msgid "Select folder to save message to"
 msgstr "Vybrat složku pro uložení zprávy"
 
-#: src/compose.c:7906
+#: src/compose.c:7997
 msgid "Hea_der"
 msgstr "_Záhlaví"
 
-#: src/compose.c:7911
+#: src/compose.c:8002
 msgid "_Attachments"
 msgstr "_Přílohy"
 
-#: src/compose.c:7925
+#: src/compose.c:8016
 msgid "Othe_rs"
 msgstr "_Ostatní"
 
-#: src/compose.c:7940
+#: src/compose.c:8031
 msgid "S_ubject:"
 msgstr "Pře_dmět:"
 
-#: src/compose.c:8164
+#: src/compose.c:8255
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2202,19 +2202,19 @@ msgstr ""
 "Nelze spustit kontrolu pravopisu.\n"
 "%s"
 
-#: src/compose.c:8311
+#: src/compose.c:8402
 msgid "_From:"
 msgstr "_Od:"
 
-#: src/compose.c:8328
+#: src/compose.c:8419
 msgid "Account to use for this email"
 msgstr "Účet použitý pro tuto zprávu"
 
-#: src/compose.c:8330
+#: src/compose.c:8421
 msgid "Sender address to be used"
 msgstr "Adresa odesílatele musí být uvedena"
 
-#: src/compose.c:8496
+#: src/compose.c:8603
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2223,50 +2223,50 @@ msgstr ""
 "Systém zabezpečení '%s' se nepodařilo načíst. Nebudete moci digitálně "
 "podepsat nebo šifrovat zprávu."
 
-#: src/compose.c:8597 src/plugins/archive/archiver_gtk.c:1174
+#: src/compose.c:8714 src/plugins/archive/archiver_gtk.c:1174
 msgid "_None"
 msgstr "Žá_dné"
 
-#: src/compose.c:8698 src/prefs_template.c:750
+#: src/compose.c:8815 src/prefs_template.c:752
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Chyba v těle šablony na řádku %d."
 
-#: src/compose.c:8793
+#: src/compose.c:8912
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Chyba formátu %s šablony."
 
-#: src/compose.c:9194
+#: src/compose.c:9331
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:9209
+#: src/compose.c:9346
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:9283
+#: src/compose.c:9420
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:9300
+#: src/compose.c:9437
 msgid "MIME type"
 msgstr "MIME typ"
 
-#: src/compose.c:9341
+#: src/compose.c:9478
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:9361
+#: src/compose.c:9498
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:9362
+#: src/compose.c:9499
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:9621
+#: src/compose.c:9758
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2277,15 +2277,15 @@ msgstr ""
 "Mám přerušit proces?\n"
 "číslo procesu: %d"
 
-#: src/compose.c:10088 src/messageview.c:1105
+#: src/compose.c:10225 src/messageview.c:1105
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail potřebuje přístup k síti, aby mohl odeslat tuto zprávu."
 
-#: src/compose.c:10114
+#: src/compose.c:10251
 msgid "Could not queue message."
 msgstr "Zprávu nelze uložit do fronty pro odeslání."
 
-#: src/compose.c:10116
+#: src/compose.c:10253
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2296,15 +2296,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10294
+#: src/compose.c:10431
 msgid "Could not save draft."
 msgstr "Nelze uložit koncept."
 
-#: src/compose.c:10298
+#: src/compose.c:10435
 msgid "Could not save draft"
 msgstr "Nelze uložit koncept"
 
-#: src/compose.c:10299
+#: src/compose.c:10436
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2312,24 +2312,24 @@ msgstr ""
 "Nemohu uložit koncept.\n"
 "Chcete zrušit ukončení nebo zahodit tuto zprávu?"
 
-#: src/compose.c:10301
+#: src/compose.c:10438
 msgid "_Cancel exit"
 msgstr "_Zrušit ukončení"
 
-#: src/compose.c:10301
+#: src/compose.c:10438
 msgid "_Discard email"
 msgstr "_Zahodit zprávu"
 
-#: src/compose.c:10461 src/compose.c:10475
+#: src/compose.c:10628 src/compose.c:10642
 msgid "Select file"
 msgstr "Výběr souboru"
 
-#: src/compose.c:10489
+#: src/compose.c:10656
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Soubor '%s' nelze číst."
 
-#: src/compose.c:10491
+#: src/compose.c:10658
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2338,50 +2338,50 @@ msgstr ""
 "Soubor '%s' obsahuje neplatné znaky\n"
 "pro nastavené kódování, vložení může obsahovat chyby."
 
-#: src/compose.c:10570
+#: src/compose.c:10737
 msgid "Discard message"
 msgstr "Zrušit zprávu"
 
-#: src/compose.c:10571
+#: src/compose.c:10738
 msgid "This message has been modified. Discard it?"
 msgstr "Zpráva byla modifikována. Chcete ji zahodit?"
 
-#: src/compose.c:10572 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10739 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Zahodit"
 
-#: src/compose.c:10572 src/compose.c:10576
+#: src/compose.c:10739 src/compose.c:10743
 msgid "_Save to Drafts"
 msgstr "Uložit jako _koncept"
 
-#: src/compose.c:10574 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10741 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Uložit změny"
 
-#: src/compose.c:10575
+#: src/compose.c:10742
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Zpráva byla modifikována. Chcete uložit poslední změny?"
 
-#: src/compose.c:10576
+#: src/compose.c:10743
 msgid "_Don't save"
 msgstr "_Neukládat"
 
-#: src/compose.c:10647
+#: src/compose.c:10814
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použít šablonu '%s'?"
 
-#: src/compose.c:10649
+#: src/compose.c:10816
 msgid "Apply template"
 msgstr "Použít šablonu"
 
-#: src/compose.c:10650 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/compose.c:10817 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
 #: src/prefs_filtering.c:477 src/prefs_matcher.c:774 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1063
 msgid "_Replace"
 msgstr "_Nahradit"
 
-#: src/compose.c:11519
+#: src/compose.c:11688
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2399,20 +2399,20 @@ msgstr[2] ""
 "Chcete obsah %d souborů vložit do textu zprávy nebo soubory připojit ke "
 "zprávě jako přílohu?"
 
-#: src/compose.c:11525
+#: src/compose.c:11694
 msgid "Insert or attach?"
 msgstr "Vložit nebo připojit?"
 
-#: src/compose.c:11526
+#: src/compose.c:11695
 msgid "_Attach"
 msgstr "_Přiložit"
 
-#: src/compose.c:11744
+#: src/compose.c:11915
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba formátu citace na řádku %d."
 
-#: src/compose.c:12041
+#: src/compose.c:12212
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2443,7 +2443,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Debug log"
 
-#: src/crash.c:251 src/toolbar.c:534
+#: src/crash.c:251 src/toolbar.c:539
 msgid "Close"
 msgstr "Zavřít"
 
@@ -2629,7 +2629,7 @@ msgid " Check File "
 msgstr " Otestovat soubor "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1976
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2023
 #: src/wizard.c:1196 src/wizard.c:1616
 msgid "File"
 msgstr "Soubor"
@@ -2678,12 +2678,12 @@ msgstr "Upravit složku"
 msgid "Input the new name of folder:"
 msgstr "Zadejte název složky:"
 
-#: src/editgroup.c:556 src/foldersel.c:594 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/editgroup.c:556 src/foldersel.c:571 src/imap_gtk.c:193 src/mh_gtk.c:144
 #: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:91
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:557 src/foldersel.c:595 src/mh_gtk.c:145
+#: src/editgroup.c:557 src/foldersel.c:572 src/mh_gtk.c:145
 #: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "Input the name of new folder:"
 msgstr "Zadejte název složky:"
@@ -2753,7 +2753,7 @@ msgstr "Alespoň jeden atribut musí být uveden."
 msgid "Connected successfully to server"
 msgstr "Úspěšně připojeno k serveru"
 
-#: src/editldap.c:336 src/editldap.c:971
+#: src/editldap.c:336 src/editldap.c:995
 msgid "Edit LDAP Server"
 msgstr "Upravit LDAP server"
 
@@ -2776,7 +2776,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3396
+#: src/editldap.c:471 src/prefs_account.c:3478
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
@@ -2916,11 +2916,11 @@ msgstr ""
 "výkonu používá automatické dokončování adres při vyhledávání vždy podmínku "
 "\"začíná na\" bez ohledu na toto nastavení."
 
-#: src/editldap.c:702
+#: src/editldap.c:712
 msgid "Bind DN"
 msgstr "Připojovací jméno"
 
-#: src/editldap.c:711
+#: src/editldap.c:721
 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 "
@@ -2932,47 +2932,52 @@ msgstr ""
 "\"cn=user,dc=claws-mail,dc=org\". Pro prohledávání obvykle není nutno "
 "vyplňovat."
 
-#: src/editldap.c:718
+#: src/editldap.c:728
 msgid "Bind Password"
 msgstr "Připojovací heslo"
 
-#: src/editldap.c:728
+#: src/editldap.c:738
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr ""
 "Heslo, které bude použito pro připojení spolu s údajem \"Přihlašovací jméno"
 "\"."
 
-#: src/editldap.c:733
+#: src/editldap.c:741 src/prefs_account.c:1314 src/prefs_account.c:1868
+#: src/prefs_account.c:2587 src/prefs_account.c:2615
+msgid "Show password"
+msgstr "Zobrazit heslo"
+
+#: src/editldap.c:750
 msgid "Timeout (secs)"
 msgstr "Časový limit (s)"
 
-#: src/editldap.c:747
+#: src/editldap.c:764
 msgid "The timeout period in seconds."
 msgstr "Časový limit v sekundách."
 
-#: src/editldap.c:751
+#: src/editldap.c:768
 msgid "Maximum Entries"
 msgstr "Maximum položek"
 
-#: src/editldap.c:765
+#: src/editldap.c:782
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Maximální počet položek, které budou vráceny při prohledávání."
 
-#: src/editldap.c:780 src/prefs_account.c:3287
+#: src/editldap.c:797 src/prefs_account.c:3369
 msgid "Basic"
 msgstr "Server"
 
-#: src/editldap.c:782 src/gtk/quicksearch.c:708
+#: src/editldap.c:799 src/gtk/quicksearch.c:708
 msgid "Extended"
 msgstr "Ostatní"
 
-#: src/editldap.c:976
+#: src/editldap.c:1000
 msgid "Add New LDAP Server"
 msgstr "Přidat nový LDAP server"
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1447
-#: src/prefs_summaries.c:449
+#: src/edittags.c:187 src/prefs_filtering_action.c:1450
+#: src/prefs_summaries.c:448
 msgid "Tag"
 msgstr "Značka"
 
@@ -2984,32 +2989,32 @@ msgstr "Odstranit značku"
 msgid "Do you really want to delete this tag?"
 msgstr "Opravdu chcete odstranit tuto značku?"
 
-#: src/edittags.c:244
+#: src/edittags.c:251
 msgid "Delete all tags"
 msgstr "Odstranit všechny značky"
 
-#: src/edittags.c:245
+#: src/edittags.c:252
 msgid "Do you really want to delete all tags?"
 msgstr "Opravdu chcete odstranit všechny značky?"
 
-#: src/edittags.c:416
+#: src/edittags.c:423
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr "Vložili jste rezervované jméno tagu, prosím vyberte jiné."
 
-#: src/edittags.c:458
+#: src/edittags.c:465
 msgid "Tag is not set."
 msgstr "Hodnota není nastavena."
 
-#: src/edittags.c:523
+#: src/edittags.c:530
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "Použít značky"
 
-#: src/edittags.c:537
+#: src/edittags.c:544
 msgid "New tag:"
 msgstr "Nová značka:"
 
-#: src/edittags.c:570
+#: src/edittags.c:577
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr "Vyberte značku pro přidání/odstranění. Změny jsou okamžité."
 
@@ -3033,6 +3038,14 @@ msgstr "Přidat nový vCard záznam"
 msgid "Impossible to set the client certificate.\n"
 msgstr "Není možné nastavit klientský certifikát.\n"
 
+#: src/etpan/nntp-thread.c:865
+msgid "couldn't get xover range\n"
+msgstr "nelze získat xover rozsah\n"
+
+#: src/etpan/nntp-thread.c:963
+msgid "couldn't get xhdr range\n"
+msgstr "nelze získat xhdr rozsah\n"
+
 #: src/exphtmldlg.c:105
 msgid "Please specify output directory and file to create."
 msgstr "Zadejte prosím adresář pro výstup a soubor, který se bude vytvořen."
@@ -3093,10 +3106,10 @@ msgid "Stylesheet"
 msgstr "Šablona stylu"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:387 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1190
+#: src/gtk/gtkaspell.c:2225 src/gtk/menu.c:125 src/mainwindow.c:1188
 #: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:941
-#: src/prefs_toolbar.c:790 src/prefs_toolbar.c:1479 src/summaryview.c:6019
+#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:949
+#: src/prefs_toolbar.c:790 src/prefs_toolbar.c:1479 src/summaryview.c:6061
 msgid "None"
 msgstr "Žádná"
 
@@ -3105,7 +3118,7 @@ msgstr "Žádná"
 msgid "Default"
 msgstr "Výchozí"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:243
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:246
 #: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:167
 msgid "Full"
 msgstr "Úplná"
@@ -3335,7 +3348,7 @@ msgstr "Exportovat knihu adres do LDIF souboru"
 msgid "Distinguished Name"
 msgstr "Rozlišovací jméno (dn)"
 
-#: src/export.c:113 src/summaryview.c:8177
+#: src/export.c:113 src/summaryview.c:8233
 msgid "Export to mbox file"
 msgstr "Exportovat do mbox souboru"
 
@@ -3561,7 +3574,7 @@ msgstr "před zpracování"
 msgid "post-processing"
 msgstr "následné zpracování"
 
-#: src/filtering.c:911
+#: src/filtering.c:909
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3578,11 +3591,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:913 src/filtering.c:922
+#: src/filtering.c:911 src/filtering.c:920
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:920
+#: src/filtering.c:918
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3591,23 +3604,23 @@ msgstr ""
 "filtrování zprávy (%s%s%s)\n"
 "%ssoubor zprávy: %s\n"
 
-#: src/folder.c:1570 src/foldersel.c:412 src/prefs_folder_item.c:315
+#: src/folder.c:1570 src/prefs_folder_item.c:315
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: src/folder.c:1574 src/foldersel.c:416
+#: src/folder.c:1574
 msgid "Sent"
 msgstr "Odeslaná pošta"
 
-#: src/folder.c:1578 src/foldersel.c:420 src/prefs_folder_item.c:318
+#: src/folder.c:1578 src/prefs_folder_item.c:318
 msgid "Queue"
 msgstr "Fronta"
 
-#: src/folder.c:1582 src/foldersel.c:424 src/prefs_folder_item.c:319
+#: src/folder.c:1582 src/prefs_folder_item.c:319
 msgid "Trash"
 msgstr "Koš"
 
-#: src/folder.c:1586 src/foldersel.c:428 src/prefs_folder_item.c:317
+#: src/folder.c:1586 src/prefs_folder_item.c:317
 msgid "Drafts"
 msgstr "Koncepty"
 
@@ -3652,29 +3665,29 @@ msgstr "Jméno složky nemůže končit tečkou."
 msgid "Select folder"
 msgstr "Vybrat složku"
 
-#: src/foldersel.c:596 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/foldersel.c:573 src/imap_gtk.c:197 src/mh_gtk.c:146
 #: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "NewFolder"
 msgstr "Nová složka"
 
-#: src/foldersel.c:604 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:581 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
 #: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:432
+#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
 #: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2063
+#: src/plugins/vcalendar/vcal_folder.c:2059
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' nemůže být obsaženo ve jméně složky."
 
-#: src/foldersel.c:619 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/foldersel.c:596 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2070
+#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:217
+#: src/plugins/vcalendar/vcal_folder.c:2066
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Složka '%s' už existuje."
 
-#: src/foldersel.c:626 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:603 src/imap_gtk.c:230 src/mh_gtk.c:173
 #: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
 #: src/plugins/rssyl/rssyl_cb_menu.c:124
 #, c-format
@@ -3719,24 +3732,24 @@ msgstr "Odeslat _frontu..."
 
 #: src/folderview.c:397 src/folderview.c:444
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6293
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:393 src/summaryview.c:6335
 msgid "New"
 msgstr "Nové"
 
 #: src/folderview.c:398 src/folderview.c:445
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6295
-#: src/toolbar.c:509
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:392 src/summaryview.c:6337
+#: src/toolbar.c:512
 msgid "Unread"
 msgstr "Nepřečtené"
 
 #: src/folderview.c:399 src/plugins/notification/notification_lcdproc.c:149
-#: src/prefs_folder_column.c:81
+#: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "Celkem"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:447 src/summaryview.c:447
+#: src/folderview.c:447 src/summaryview.c:448
 msgid "#"
 msgstr "#"
 
@@ -3744,7 +3757,7 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o složce..."
 
-#: src/folderview.c:867 src/summaryview.c:4140
+#: src/folderview.c:867 src/summaryview.c:4182
 msgid "Mark all as read"
 msgstr "Označit všechny jako přečtené"
 
@@ -3756,11 +3769,11 @@ msgstr ""
 "Opravdu chcete označit všechny zprávy v této složce a jejích podsložkách "
 "jako přečtené?"
 
-#: src/folderview.c:870 src/summaryview.c:4141
+#: src/folderview.c:870 src/summaryview.c:4183
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Opravdu chcete označit všechny zprávy v této složce jako přečtené?"
 
-#: src/folderview.c:873 src/summaryview.c:4179
+#: src/folderview.c:873 src/summaryview.c:4221
 msgid "Mark all as unread"
 msgstr "Označit všechny jako nepřečtené"
 
@@ -3772,16 +3785,16 @@ msgstr ""
 "Opravdu chcete označit všechny zprávy v této složce a jejích podsložkách "
 "jako nepřečtené?"
 
-#: src/folderview.c:876 src/summaryview.c:4180
+#: src/folderview.c:876 src/summaryview.c:4222
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr "Opravdu chcete označit všechny zprávy v této složce jako nepřečtené?"
 
-#: src/folderview.c:1066 src/imap.c:4605
+#: src/folderview.c:1066 src/imap.c:4606
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Prohledávám složku %s/%s..."
 
-#: src/folderview.c:1069 src/imap.c:4609 src/mainwindow.c:5249 src/setup.c:96
+#: src/folderview.c:1069 src/imap.c:4610 src/mainwindow.c:5245 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Prohledávám složku %s..."
@@ -3828,7 +3841,7 @@ msgstr "Otevírám složku %s..."
 msgid "Folder could not be opened."
 msgstr "Složku nelze otevřít."
 
-#: src/folderview.c:2484 src/mainwindow.c:2906 src/mainwindow.c:2910
+#: src/folderview.c:2484 src/mainwindow.c:2902 src/mainwindow.c:2906
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
@@ -3840,27 +3853,27 @@ msgstr "Odstranit všechny zprávy v koši?"
 msgid "_Empty trash"
 msgstr "_Vyprázdnit koš"
 
-#: src/folderview.c:2529 src/inc.c:1533 src/toolbar.c:2911
+#: src/folderview.c:2529 src/inc.c:1533 src/toolbar.c:3008
 msgid "Offline warning"
 msgstr "Varování offline režimu"
 
-#: src/folderview.c:2530 src/toolbar.c:2912
+#: src/folderview.c:2530 src/toolbar.c:3009
 msgid "You're working offline. Override?"
 msgstr "Pracujete v režimu offline. Přepnout?"
 
-#: src/folderview.c:2541 src/toolbar.c:2931
+#: src/folderview.c:2541 src/toolbar.c:3028
 msgid "Send queued messages"
 msgstr "Odeslat pozdržené zprávy"
 
-#: src/folderview.c:2542 src/toolbar.c:2932
+#: src/folderview.c:2542 src/toolbar.c:3029
 msgid "Send all queued messages?"
 msgstr "Odeslat všechny zprávy ve frontě pozdržených zpráv?"
 
-#: src/folderview.c:2551 src/toolbar.c:2951
+#: src/folderview.c:2551 src/toolbar.c:3048
 msgid "Some errors occurred while sending queued messages."
 msgstr "Při posílání pozdržených zpráv nastala stejná chyba."
 
-#: src/folderview.c:2554 src/main.c:2752 src/toolbar.c:2954
+#: src/folderview.c:2554 src/main.c:2780 src/toolbar.c:3051
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3926,7 +3939,7 @@ msgstr "Přesun se nezdařil!"
 msgid "Processing configuration for folder %s"
 msgstr "Zpracování složky - pravidla pro složku %s"
 
-#: src/folderview.c:3177 src/summaryview.c:4576 src/summaryview.c:4682
+#: src/folderview.c:3177 src/summaryview.c:4618 src/summaryview.c:4724
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Cílová složka může být použita pouze k uložení podsložek."
 
@@ -3950,7 +3963,7 @@ msgstr " Vyhledat "
 msgid "Newsgroup name"
 msgstr "Název diskusní skupiny"
 
-#: src/grouplistdialog.c:205 src/prefs_send.c:171
+#: src/grouplistdialog.c:205 src/prefs_send.c:184
 msgid "Messages"
 msgstr "Zprávy"
 
@@ -3966,7 +3979,7 @@ msgstr "moderovaný"
 msgid "readonly"
 msgstr "pouze pro čtení"
 
-#: src/grouplistdialog.c:351 src/plugins/att_remover/att_remover.c:297
+#: src/grouplistdialog.c:351 src/plugins/att_remover/att_remover.c:302
 #: src/plugins/vcalendar/vcal_manager.c:114
 #: src/plugins/vcalendar/vcal_manager.c:148
 msgid "unknown"
@@ -3976,7 +3989,7 @@ msgstr "neznámý"
 msgid "Can't retrieve newsgroup list."
 msgstr "Nemohu načíst seznam diskuzních skupin."
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1922 src/summaryview.c:1587
+#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1934 src/summaryview.c:1600
 msgid "Done."
 msgstr "Hotovo."
 
@@ -4006,11 +4019,11 @@ msgstr ""
 "Claws Mail je volně šiřitelný software distribuovaný pod licencí GPL. Pokud "
 "chcete přispět na projekt Claws Mail, můžete tak učinit na:"
 
-#: src/gtk/about.c:162
+#: src/gtk/about.c:162 src/gtk/about.c:850
 msgid ""
 "Copyright (C) 1999-2017\n"
 "The Claws Mail Team\n"
-" and Hiroyuki Yamamoto"
+"and Hiroyuki Yamamoto"
 msgstr ""
 "Copyright (C) 1999-2017\n"
 "The Claws Mail Team\n"
@@ -4047,7 +4060,7 @@ msgstr ""
 "Lokalizace: %s (znaková sada: %s)\n"
 "Operační systém: neznámý"
 
-#: src/gtk/about.c:247 src/prefs_themes.c:805 src/wizard.c:527
+#: src/gtk/about.c:247 src/prefs_themes.c:842 src/wizard.c:527
 msgid "The Claws Mail Team"
 msgstr "Tým Claws Mail"
 
@@ -4161,46 +4174,46 @@ msgid ""
 "this program. If not, see "
 msgstr ""
 "Kopii GNU General Public License byste měli obdržet společně s tímto "
-"programem. Pokud ne, viz."
+"programem. Pokud ne, viz. "
 
-#: src/gtk/about.c:717 src/main.c:2576
+#: src/gtk/about.c:717 src/main.c:2604
 msgid "Session statistics\n"
 msgstr "Statistiky relace\n"
 
-#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2586 src/main.c:2589
+#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2614 src/main.c:2617
 #, c-format
 msgid "Started: %s\n"
 msgstr "Spuštěno: %s\n"
 
-#: src/gtk/about.c:737 src/main.c:2595
+#: src/gtk/about.c:737 src/main.c:2623
 msgid "Incoming traffic\n"
 msgstr "Příchozí provoz\n"
 
-#: src/gtk/about.c:740 src/main.c:2598
+#: src/gtk/about.c:740 src/main.c:2626
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Přijaté zprávy: %d\n"
 
-#: src/gtk/about.c:747 src/main.c:2604
+#: src/gtk/about.c:747 src/main.c:2632
 msgid "Outgoing traffic\n"
 msgstr "Odchozí provoz\n"
 
-#: src/gtk/about.c:750 src/main.c:2607
+#: src/gtk/about.c:750 src/main.c:2635
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nové/přesměrované zprávy: %d\n"
 
-#: src/gtk/about.c:755 src/main.c:2611
+#: src/gtk/about.c:755 src/main.c:2639
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Zodpovězené zprávy: %d\n"
 
-#: src/gtk/about.c:760 src/main.c:2615
+#: src/gtk/about.c:760 src/main.c:2643
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Přeposlané zprávy: %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2619
+#: src/gtk/about.c:765 src/main.c:2647
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Celkem odchozích zpráv: %d\n"
@@ -4209,16 +4222,6 @@ msgstr "Celkem odchozích zpráv: %d\n"
 msgid "About Claws Mail"
 msgstr "O Claws Mail"
 
-#: src/gtk/about.c:850
-msgid ""
-"Copyright (C) 1999-2017\n"
-"The Claws Mail Team\n"
-"and Hiroyuki Yamamoto"
-msgstr ""
-"Copyright (C) 1999-2017\n"
-"The Claws Mail Team\n"
-"a Hiroyuki Yamamoto"
-
 #: src/gtk/about.c:864
 msgid "_Info"
 msgstr "_Informace"
@@ -4243,63 +4246,63 @@ msgstr "_Poznámky k verzi"
 msgid "_Statistics"
 msgstr "_Statistiky"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:367
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:362
 msgid "Orange"
 msgstr "Oranžová"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:371
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:366
 msgid "Red"
 msgstr "Červená"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:375
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:370
 msgid "Pink"
 msgstr "Růžová"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:379
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:374
 msgid "Sky blue"
 msgstr "Nebeská modř"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:383
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:378
 msgid "Blue"
 msgstr "Modrá"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:387
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:382
 msgid "Green"
 msgstr "Zelená"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:391
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:386
 msgid "Brown"
 msgstr "Hnědá"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:395
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:390
 msgid "Grey"
 msgstr "Šedá"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:399
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:394
 msgid "Light brown"
 msgstr "Světle hnědá"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:403
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:398
 msgid "Dark red"
 msgstr "Tmavě červená"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:407
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:402
 msgid "Dark pink"
 msgstr "Tmavě růžová"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:411
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:406
 msgid "Steel blue"
 msgstr "Ocelově modrá"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:415
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:410
 msgid "Gold"
 msgstr "Zlatá"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:419
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:414
 msgid "Bright green"
 msgstr "Světle zelená"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:423
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:418
 msgid "Magenta"
 msgstr "Fialová"
 
@@ -4354,59 +4357,55 @@ msgstr ""
 "Podržení klávesy Control při stisku Enter\n"
 "aktivuje učení z chyby.\n"
 
-#: src/gtk/gtkaspell.c:1800
-msgid "Change to..."
-msgstr "Změnit na..."
-
-#: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
+#: src/gtk/gtkaspell.c:1805 src/gtk/gtkaspell.c:1943
 msgid "More..."
 msgstr "Více..."
 
-#: src/gtk/gtkaspell.c:1867
+#: src/gtk/gtkaspell.c:1861
 #, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
 msgstr "\"%s\" neznámé ve slovníku '%s'"
 
-#: src/gtk/gtkaspell.c:1883
+#: src/gtk/gtkaspell.c:1877
 msgid "Accept in this session"
 msgstr "Přijmout pro tuto relaci"
 
-#: src/gtk/gtkaspell.c:1893
+#: src/gtk/gtkaspell.c:1887
 msgid "Add to personal dictionary"
 msgstr "Přidat do vlastního slovníku"
 
-#: src/gtk/gtkaspell.c:1903
+#: src/gtk/gtkaspell.c:1897
 msgid "Replace with..."
 msgstr "Nahradit čím..."
 
-#: src/gtk/gtkaspell.c:1916
+#: src/gtk/gtkaspell.c:1910
 #, c-format
 msgid "Check with %s"
 msgstr "Otestovat pomocí %s"
 
-#: src/gtk/gtkaspell.c:1938
+#: src/gtk/gtkaspell.c:1932
 msgid "(no suggestions)"
 msgstr "(nejsou návrhy)"
 
-#: src/gtk/gtkaspell.c:2012
+#: src/gtk/gtkaspell.c:2006
 #, c-format
 msgid "Dictionary: %s"
 msgstr "Slovník: %s"
 
-#: src/gtk/gtkaspell.c:2027
+#: src/gtk/gtkaspell.c:2021
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Použít předchozí (%s)"
 
-#: src/gtk/gtkaspell.c:2038
+#: src/gtk/gtkaspell.c:2032
 msgid "Use both dictionaries"
 msgstr "Použít oba slovníky"
 
-#: src/gtk/gtkaspell.c:2054 src/prefs_spelling.c:144
+#: src/gtk/gtkaspell.c:2048 src/prefs_spelling.c:143
 msgid "Check while typing"
 msgstr "Kontrolovat během psaní"
 
-#: src/gtk/gtkaspell.c:2153
+#: src/gtk/gtkaspell.c:2147
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
@@ -4415,7 +4414,7 @@ msgstr ""
 "Nepodařilo se změnit slovník pro kontrolu pravopisu.\n"
 "%s"
 
-#: src/gtk/gtkaspell.c:2209
+#: src/gtk/gtkaspell.c:2203
 #, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
@@ -4424,26 +4423,26 @@ msgstr ""
 "Nepodařilo se změnit alternativní slovník pro kontrolu pravopisu.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1927
+#: src/gtk/gtkutils.c:1939
 msgid "Failed: no service record found."
 msgstr "Selhalo: nenalezen záznam o službě."
 
-#: src/gtk/gtkutils.c:1930
+#: src/gtk/gtkutils.c:1942
 msgid "Failed: network error."
 msgstr "Selhalo: chyba sítě."
 
-#: src/gtk/gtkutils.c:1933
+#: src/gtk/gtkutils.c:1945
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Selhalo: neznámá chyba (%d)."
 
-#: src/gtk/gtkutils.c:2003
+#: src/gtk/gtkutils.c:2015
 msgid "Configuring..."
 msgstr "Nastavování..."
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2166 src/prefs_summaries.c:443
-#: src/prefs_summary_column.c:84 src/quote_fmt.c:49 src/summaryview.c:445
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1262
+#: src/prefs_matcher.c:2168 src/prefs_summaries.c:442
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:446
 msgid "Date"
 msgstr "Datum"
 
@@ -4451,9 +4450,9 @@ msgstr "Datum"
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2163 src/prefs_summaries.c:445
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:50 src/summaryview.c:443
+#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1259
+#: src/prefs_matcher.c:2165 src/prefs_summaries.c:444
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:444
 msgid "From"
 msgstr "Od"
 
@@ -4473,14 +4472,14 @@ msgstr "Odesílatel:"
 msgid "Reply-To"
 msgstr "Odpovědět komu"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1257
-#: src/prefs_matcher.c:2164 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:57 src/summaryview.c:444
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1260
+#: src/prefs_matcher.c:2166 src/prefs_summaries.c:445
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:445
 msgid "To"
 msgstr "Komu"
 
-#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1258
-#: src/prefs_matcher.c:2165 src/quote_fmt.c:58
+#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1261
+#: src/prefs_matcher.c:2167 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Kopie"
 
@@ -4488,8 +4487,8 @@ msgstr "Kopie"
 msgid "Bcc"
 msgstr "Skrytá kopie"
 
-#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2167 src/quote_fmt.c:61
+#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1263
+#: src/prefs_matcher.c:2169 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Message-ID"
 
@@ -4501,8 +4500,8 @@ msgstr "Message-ID:"
 msgid "In-Reply-To"
 msgstr "V odpovědi komu"
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2169 src/quote_fmt.c:60
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1265
+#: src/prefs_matcher.c:2171 src/quote_fmt.c:60
 msgid "References"
 msgstr "References"
 
@@ -4510,13 +4509,13 @@ msgstr "References"
 msgid "References:"
 msgstr "References:"
 
-#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2162 src/prefs_summaries.c:447
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:56 src/summaryview.c:442
+#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1258
+#: src/prefs_matcher.c:2164 src/prefs_summaries.c:446
+#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:443
 msgid "Subject"
 msgstr "Předmět"
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:700
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:702
 #: src/summary_search.c:488
 msgid "Subject:"
 msgstr "Předmět:"
@@ -4533,7 +4532,7 @@ msgstr "Komentáře:"
 msgid "Keywords"
 msgstr "Klíčová slova"
 
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:702
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Keywords:"
 msgstr "Klíčová slova:"
 
@@ -4609,8 +4608,8 @@ msgstr "Příjmuto"
 msgid "Received:"
 msgstr "Příjmuto:"
 
-#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2168 src/quote_fmt.c:59
+#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1264
+#: src/prefs_matcher.c:2170 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Diskusní skupiny"
 
@@ -4635,12 +4634,12 @@ msgid "Seen:"
 msgstr "Zobrazen:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:451
-#: src/prefs_summary_column.c:79 src/summaryview.c:2810
+#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:450
+#: src/prefs_summary_column.c:78 src/summaryview.c:2823
 msgid "Status"
 msgstr "Stav"
 
-#: src/gtk/headers.h:37 src/prefs_themes.c:996
+#: src/gtk/headers.h:37 src/prefs_themes.c:1033
 msgid "Status:"
 msgstr "Stav:"
 
@@ -4708,7 +4707,7 @@ msgstr "Priorita"
 msgid "Precedence:"
 msgstr "Priorita:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1066
+#: src/gtk/headers.h:46 src/prefs_account.c:1078
 msgid "Organization"
 msgstr "Organizace"
 
@@ -5027,7 +5026,7 @@ msgstr ""
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:137
 #: src/plugins/libravatar/libravatar_prefs.c:545
-#: src/plugins/managesieve/sieve_prefs.c:424
+#: src/plugins/managesieve/sieve_prefs.c:427
 #: src/plugins/notification/notification_prefs.c:398
 #: src/plugins/notification/notification_prefs.c:413
 #: src/plugins/notification/notification_prefs.c:432
@@ -5036,7 +5035,8 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:486
 #: src/plugins/notification/notification_prefs.c:504
 #: src/plugins/notification/notification_prefs.c:522
-#: src/plugins/pgpcore/prefs_gpg.c:617 src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/pgpcore/prefs_gpg.c:686 src/plugins/pgpcore/prefs_gpg.c:706
+#: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:648
 #: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:957
@@ -5044,32 +5044,32 @@ msgid "Plugins"
 msgstr "Zásuvné moduly"
 
 #: src/gtk/pluginwindow.c:336
-msgid "Load..."
-msgstr "Zavést..."
+msgid "_Load..."
+msgstr "_Zavést..."
 
 #: src/gtk/pluginwindow.c:337
-msgid "Unload"
-msgstr "Odebrat"
+msgid "_Unload"
+msgstr "_Odebrat"
 
-#: src/gtk/pluginwindow.c:350 src/prefs_summaries.c:229
+#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:229
 msgid "Description"
 msgstr "Popis"
 
-#: src/gtk/pluginwindow.c:374
+#: src/gtk/pluginwindow.c:375
 #, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr ""
 "Pro více informací o zásuvných modulech navštivte %stránku Claws Mail%s."
 
-#: src/gtk/pluginwindow.c:415
+#: src/gtk/pluginwindow.c:416
 msgid "Click here to load one or more plugins"
 msgstr "Klikněte zde pro načtení jednoho nebo více modulů"
 
-#: src/gtk/pluginwindow.c:418
+#: src/gtk/pluginwindow.c:419
 msgid "Unload the selected plugin"
 msgstr "Odebrat vybraný zásuvný modul"
 
-#: src/gtk/pluginwindow.c:483
+#: src/gtk/pluginwindow.c:484
 msgid "Loaded plugins"
 msgstr "Zavedené moduly"
 
@@ -5077,16 +5077,16 @@ msgstr "Zavedené moduly"
 msgid "Page Index"
 msgstr "Index stránky"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:843
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
 msgid "_Hide"
 msgstr "_Skrýt"
 
-#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3286 src/prefs_account.c:3304 src/prefs_account.c:3322
-#: src/prefs_account.c:3340 src/prefs_account.c:3358 src/prefs_account.c:3376
-#: src/prefs_account.c:3395 src/prefs_account.c:3488
-#: src/prefs_filtering_action.c:1422 src/prefs_filtering.c:397
-#: src/prefs_filtering.c:1877
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:688
+#: src/prefs_account.c:3368 src/prefs_account.c:3386 src/prefs_account.c:3404
+#: src/prefs_account.c:3422 src/prefs_account.c:3440 src/prefs_account.c:3458
+#: src/prefs_account.c:3477 src/prefs_account.c:3570
+#: src/prefs_filtering_action.c:1425 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1879
 msgid "Account"
 msgstr "Účet"
 
@@ -5363,7 +5363,7 @@ msgid "Signer"
 msgstr "Podepsal"
 
 #: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:952
+#: src/prefs_themes.c:989
 msgid "Name: "
 msgstr "Jméno: "
 
@@ -5495,15 +5495,15 @@ msgstr "Značky:"
 
 #: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3381
-#: src/summaryview.c:3399 src/summaryview.c:3420
+#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3423
+#: src/summaryview.c:3441 src/summaryview.c:3462
 msgid "(No From)"
 msgstr "(Neznámý odesílatel)"
 
 #: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3432
-#: src/summaryview.c:3435
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3474
+#: src/summaryview.c:3477
 msgid "(No Subject)"
 msgstr "(Žádný předmět)"
 
@@ -5512,8 +5512,8 @@ msgid "Error:"
 msgstr "Chyba:"
 
 #: src/image_viewer.c:299 src/mimeview.c:2611
-#: src/plugins/att_remover/att_remover.c:301
-#: src/plugins/pdf_viewer/poppler_viewer.c:696
+#: src/plugins/att_remover/att_remover.c:306
+#: src/plugins/pdf_viewer/poppler_viewer.c:698
 msgid "Filename:"
 msgstr "Název souboru:"
 
@@ -5608,7 +5608,7 @@ msgstr "CLOSE chyba"
 
 #: src/imap.c:665
 msgid "EXPUNGE error"
-msgstr " EXPUNGE chyba"
+msgstr "EXPUNGE chyba"
 
 #: src/imap.c:668
 msgid "COPY error"
@@ -5791,8 +5791,8 @@ msgstr "Připojení k %s selhalo"
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP spojení s %s bylo rozpojeno. Obnovuji spojení...\n"
 
-#: src/imap.c:1039 src/imap.c:3655 src/imap.c:4314 src/imap.c:4408
-#: src/imap.c:4586 src/imap.c:5397
+#: src/imap.c:1039 src/imap.c:3656 src/imap.c:4315 src/imap.c:4409
+#: src/imap.c:4587 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail potřebuje přístup k síti, aby mohl přistupovat k IMAP serveru."
@@ -5833,7 +5833,7 @@ msgstr "Nemohu se spojit s IMAP serverem: %s:%d"
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Nemohu se spojit s IMAP serverem: %s:%d\n"
 
-#: src/imap.c:1249 src/imap.c:4076
+#: src/imap.c:1249 src/imap.c:4077
 msgid "Can't start STARTTLS session.\n"
 msgstr "Nelze spustit STARTTLS relaci.\n"
 
@@ -5847,71 +5847,71 @@ msgstr "Nepodařilo se přihlásit k IMAP serveru %s.\n"
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodařilo se přihlásit k IMAP serveru %s."
 
-#: src/imap.c:1746
+#: src/imap.c:1747
 msgid "Adding messages..."
 msgstr "Přidávám zprávy..."
 
-#: src/imap.c:1951 src/mh.c:529
+#: src/imap.c:1952 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Kopíruji zprávy..."
 
-#: src/imap.c:2544
+#: src/imap.c:2545
 msgid "can't set deleted flags\n"
 msgstr "nelze nastavit příznak odstranění\n"
 
-#: src/imap.c:2551 src/imap.c:5027
+#: src/imap.c:2552 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "nelze odstranit\n"
 
-#: src/imap.c:2902
+#: src/imap.c:2903
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Vyhledávám odhlášené složky v %s..."
 
-#: src/imap.c:2905
+#: src/imap.c:2906
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Hledám podsložky %s..."
 
-#: src/imap.c:3195
+#: src/imap.c:3196
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nelze vytvořit mailbox: selhal příkaz LIST\n"
 
-#: src/imap.c:3210
+#: src/imap.c:3211
 msgid "can't create mailbox\n"
 msgstr "nelze vytvořit mailbox\n"
 
-#: src/imap.c:3341
+#: src/imap.c:3342
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nelze přejmenovat mailbox: %s na %s\n"
 
-#: src/imap.c:3454
+#: src/imap.c:3455
 msgid "can't delete mailbox\n"
 msgstr "nelze odstranit mailbox\n"
 
-#: src/imap.c:3733
+#: src/imap.c:3734
 msgid "LIST failed\n"
 msgstr "LIST selhal\n"
 
-#: src/imap.c:3818
+#: src/imap.c:3819
 msgid "Flagging messages..."
 msgstr "Označuji zprávy..."
 
-#: src/imap.c:3921
+#: src/imap.c:3922
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: src/imap.c:4073
+#: src/imap.c:4074
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Server vyžaduje STARTTLS pro přihlášení.\n"
 
-#: src/imap.c:4083
+#: src/imap.c:4084
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodařilo se načíst údaje o schopnostech serveru IMAP.\n"
 
-#: src/imap.c:4088
+#: src/imap.c:4089
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5920,20 +5920,20 @@ msgstr ""
 "Připojení k %s selhalo: server požaduje STARTTLS, ale Claws Mail je "
 "zkompilován bez podpory STARTTLS.\n"
 
-#: src/imap.c:4096
+#: src/imap.c:4097
 msgid "Server logins are disabled.\n"
 msgstr "Přihlašování k serveru je mimo provoz.\n"
 
-#: src/imap.c:4319
+#: src/imap.c:4320
 msgid "Fetching message..."
 msgstr "Stahuji zprávu..."
 
-#: src/imap.c:5020
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nelze nastavit příznak odstranění: %d\n"
 
-#: src/imap.c:6055
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -6019,21 +6019,21 @@ msgid "Inherit properties from parent folder"
 msgstr "Zdědit vlastnosti z rodičovské složky"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:421 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2055
+#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:197
+#: src/plugins/vcalendar/vcal_folder.c:2051
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Zadejte nové jméno pro '%s':"
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:422
+#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
 #: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2056
+#: src/plugins/vcalendar/vcal_folder.c:2052
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:452 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2076
+#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:224
+#: src/plugins/vcalendar/vcal_folder.c:2072
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6041,23 +6041,17 @@ msgstr ""
 "Složka nemohla být přejmenována.\n"
 "Nové jméno složky není dovoleno."
 
-#: src/imap_gtk.c:318 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:373
-#: src/summaryview.c:4626
-msgid "Select folder to move selected message to"
-msgid_plural "Select folder to move selected messages to"
-msgstr[0] "Vybrat složku pro přesunutí vybrané zprávy"
-msgstr[1] "Vybrat složku pro přesunutí vybrané zprávy"
-msgstr[2] "Vybrat složku pro přesunutí vybrané zprávy"
+#: src/imap_gtk.c:317 src/mh_gtk.c:307 src/plugins/mailmbox/plugin_gtk.c:372
+#, c-format
+msgid "Select folder to move folder '%s' to"
+msgstr "Vybrat složku pro přesunutí složky '%s'"
 
-#: src/imap_gtk.c:339 src/mh_gtk.c:329 src/plugins/mailmbox/plugin_gtk.c:394
-#: src/summaryview.c:4711
-msgid "Select folder to copy selected message to"
-msgid_plural "Select folder to copy selected messages to"
-msgstr[0] "Vybrat složku pro kopírování vybrané zprávy"
-msgstr[1] "Vybrat složku pro kopírování vybrané zprávy"
-msgstr[2] "Vybrat složku pro kopírování vybrané zprávy"
+#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:392
+#, c-format
+msgid "Select folder to copy folder '%s' to"
+msgstr "Vybrat složku pro kopírování složky '%s'"
 
-#: src/imap_gtk.c:367 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
+#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6070,44 +6064,44 @@ msgstr ""
 "\n"
 "Chcete je opravdu odstranit?"
 
-#: src/imap_gtk.c:386 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
+#: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
 #: src/plugins/rssyl/rssyl_cb_menu.c:171
-#: src/plugins/vcalendar/vcal_folder.c:2009
+#: src/plugins/vcalendar/vcal_folder.c:2005
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
-#: src/imap_gtk.c:508
+#: src/imap_gtk.c:506
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr "Chcete vyhledat odhlášené podsložky v '%s'?"
 
-#: src/imap_gtk.c:511
+#: src/imap_gtk.c:509
 msgid "Search recursively"
 msgstr "Vyhledávat i v podsložkách"
 
-#: src/imap_gtk.c:516 src/imap_gtk.c:575
+#: src/imap_gtk.c:514 src/imap_gtk.c:573
 msgid "Subscriptions"
 msgstr "Odebírání"
 
-#: src/imap_gtk.c:517
+#: src/imap_gtk.c:515
 msgid "_Search"
 msgstr "_Vyhledat"
 
-#: src/imap_gtk.c:527
+#: src/imap_gtk.c:525
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Vyberte podsložku ve složce %s, kterou chcete odebírat: "
 
-#: src/imap_gtk.c:538 src/mainwindow.c:680
+#: src/imap_gtk.c:536 src/mainwindow.c:680
 msgid "Subscribe"
 msgstr "Odebírat"
 
-#: src/imap_gtk.c:540 src/imap_gtk.c:542
+#: src/imap_gtk.c:538 src/imap_gtk.c:540
 msgid "All of them"
 msgstr "Všechny"
 
-#: src/imap_gtk.c:558
+#: src/imap_gtk.c:556
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -6119,29 +6113,29 @@ msgstr ""
 "Jestliže existují nové složky, vytvořené a přihlášené z jiného klienta, "
 "použijte \"Vyhledat nové složky\" v rodičovském adresáři."
 
-#: src/imap_gtk.c:567
+#: src/imap_gtk.c:565
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "Chcete %s složku '%s'?"
 
-#: src/imap_gtk.c:568
+#: src/imap_gtk.c:566
 msgid "subscribe"
 msgstr "odebírat"
 
-#: src/imap_gtk.c:568
+#: src/imap_gtk.c:566
 msgid "unsubscribe"
 msgstr "odhlásit"
 
-#: src/imap_gtk.c:570 src/prefs_folder_item.c:1447 src/prefs_folder_item.c:1475
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1447 src/prefs_folder_item.c:1475
 #: src/prefs_folder_item.c:1503
 msgid "Apply to subfolders"
 msgstr "Nastavit u podsložek"
 
-#: src/imap_gtk.c:576
+#: src/imap_gtk.c:574
 msgid "_Subscribe"
 msgstr "_Odebírat"
 
-#: src/imap_gtk.c:577 src/news_gtk.c:252
+#: src/imap_gtk.c:575 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr "_Odhlásit"
 
@@ -6232,7 +6226,7 @@ msgstr "Vyberte LDIF soubor k importování."
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:726 src/summaryview.c:440
+#: src/importldif.c:726 src/summaryview.c:441
 msgid "S"
 msgstr "V"
 
@@ -6375,8 +6369,8 @@ msgstr "Spojení selhalo"
 msgid "Auth failed"
 msgstr "Autentizace selhala"
 
-#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:454
-#: src/prefs_summary_column.c:88 src/summaryview.c:2806 src/summaryview.c:6319
+#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:453
+#: src/prefs_summary_column.c:87 src/summaryview.c:2819 src/summaryview.c:6361
 msgid "Locked"
 msgstr "Zamknuto"
 
@@ -6560,7 +6554,7 @@ msgstr "%s%sPracujete v režimu offline. Přepnout?"
 msgid "On_ly once"
 msgstr "Pouze _jednou"
 
-#: src/ldapupdate.c:1056
+#: src/ldapupdate.c:1044
 msgid "Some SN"
 msgstr "SN"
 
@@ -6568,7 +6562,7 @@ msgstr "SN"
 msgid "Nick Name"
 msgstr "Přezdívka"
 
-#: src/main.c:246
+#: src/main.c:249
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6577,7 +6571,7 @@ msgstr ""
 "Soubor '%s' už existuje.\n"
 "Nemohu vytvořit složku."
 
-#: src/main.c:367
+#: src/main.c:370
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6586,7 +6580,7 @@ msgstr ""
 "Byla nalezena konfigurace pro %s.\n"
 "Chcete převést tuto konfiguraci?"
 
-#: src/main.c:369
+#: src/main.c:372
 #, c-format
 msgid ""
 "\n"
@@ -6599,11 +6593,11 @@ msgstr ""
 "Vaše pravidla filtrování Sylpheed mohou být převedena pomocí\n"
 "skriptu dostupného na %s."
 
-#: src/main.c:381
+#: src/main.c:384
 msgid "Keep old configuration"
 msgstr "Ponechat původní nastavení"
 
-#: src/main.c:384
+#: src/main.c:387
 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 "
@@ -6614,31 +6608,31 @@ msgstr ""
 "pro IMAP nebo diskuzní skupiny. Záloha také vyžaduje určité místo na vašem "
 "disku."
 
-#: src/main.c:392
+#: src/main.c:395
 msgid "Migration of configuration"
 msgstr "Převedení konfigurace"
 
-#: src/main.c:403
+#: src/main.c:406
 msgid "Copying configuration... This may take a while..."
 msgstr "Kopíruji konfiguraci... Může to chvíli trvat..."
 
-#: src/main.c:412
+#: src/main.c:415
 msgid "Migration failed!"
 msgstr "Převedení selhalo!"
 
-#: src/main.c:421
+#: src/main.c:424
 msgid "Migrating configuration..."
 msgstr "Převádím konfiguraci..."
 
-#: src/main.c:1128
+#: src/main.c:1138
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread není v glib podporován.\n"
 
-#: src/main.c:1148 src/main.c:1152 src/main.c:1156
+#: src/main.c:1158 src/main.c:1162 src/main.c:1166
 msgid "(or older)"
 msgstr "(nebo starší)"
 
-#: src/main.c:1457
+#: src/main.c:1483
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6658,7 +6652,7 @@ msgstr[2] ""
 "Následující zásuvné moduly se nepodařilo načíst. Zkontrolujte nastavení.\n"
 "%s"
 
-#: src/main.c:1508
+#: src/main.c:1525
 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 "
@@ -6668,7 +6662,7 @@ msgstr ""
 "Pravděpodobně chyba IMAP účtu. Použijte \"Obnovit strom složek\" v menu "
 "rodičovské složky pro opravu."
 
-#: src/main.c:1514
+#: src/main.c:1531
 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 "
@@ -6678,36 +6672,36 @@ msgstr ""
 "pochází od zastaralého externího modulu. Prosím přeinstalujte modul a zkuste "
 "to znovu."
 
-#: src/main.c:1759
+#: src/main.c:1776
 msgid "Missing filename\n"
 msgstr "Chybějící jméno souboru\n"
 
-#: src/main.c:1766
+#: src/main.c:1783
 msgid "Cannot open filename for reading\n"
 msgstr "Nepodařilo se otevřít soubor pro čtení\n"
 
-#: src/main.c:1777
+#: src/main.c:1794
 msgid "Malformed header\n"
 msgstr "Poškozená hlavička\n"
 
-#: src/main.c:1784
+#: src/main.c:1801
 msgid "Duplicated 'To:' header\n"
 msgstr "Duplikovaná hlavička 'To:'\n"
 
-#: src/main.c:1795
+#: src/main.c:1812
 msgid "Missing required 'To:' header\n"
 msgstr "Chybějící požadovaná hlavička 'To:'\n"
 
-#: src/main.c:1938
+#: src/main.c:1958
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použití: %s [VOLBY]...\n"
 
-#: src/main.c:1940
+#: src/main.c:1960
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]             otevře okno pro psaní nové zprávy"
 
-#: src/main.c:1941
+#: src/main.c:1961
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6726,13 +6720,13 @@ msgstr ""
 "do\n"
 "                         prázdné řádky, pak tělo do konce souboru."
 
-#: src/main.c:1946
+#: src/main.c:1966
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe [uri]              přihlásí se k odběru zadaného URI pokud to "
 "lze"
 
-#: src/main.c:1947
+#: src/main.c:1967
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6742,23 +6736,33 @@ msgstr ""
 "                         otevře okno pro psaní zprávy s připojeným\n"
 "                         souborem(y)"
 
-#: src/main.c:1950
+#: src/main.c:1970
+msgid ""
+"  --insert file1 [file2]...\n"
+"                         open composition window with specified files\n"
+"                         inserted"
+msgstr ""
+"  --insert soubor1 [soubor2]...\n"
+"                         otevře okno pro psaní zprávy s vloženým\n"
+"                         souborem(y)"
+
+#: src/main.c:1973
 msgid "  --receive              receive new messages"
 msgstr "  --receive                      načte nové zprávy"
 
-#: src/main.c:1951
+#: src/main.c:1974
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all                  načte nové zprávy ze všech účtů"
 
-#: src/main.c:1952
+#: src/main.c:1975
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     zrušit přijímání zpráv"
 
-#: src/main.c:1953
+#: src/main.c:1976
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       zrušit odesílání zpráv"
 
-#: src/main.c:1954
+#: src/main.c:1977
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6777,15 +6781,15 @@ msgstr ""
 "                         rekurzivně: nepravda když argument startuje s 0, n, "
 "N, f nebo F"
 
-#: src/main.c:1961
+#: src/main.c:1984
 msgid "  --send                 send all queued messages"
 msgstr "  --send                         pošle všechny pozdržené zprávy"
 
-#: src/main.c:1962
+#: src/main.c:1985
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [složka]...           zobrazit celkový počet zpráv"
 
-#: src/main.c:1963
+#: src/main.c:1986
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6793,15 +6797,15 @@ msgstr ""
 "  --status-full [složka]...\n"
 "                         zobrazí status každé složky"
 
-#: src/main.c:1965
+#: src/main.c:1988
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           zobrazí statistiky relace"
 
-#: src/main.c:1966
+#: src/main.c:1989
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     resetuje statistiky relace"
 
-#: src/main.c:1967
+#: src/main.c:1990
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6809,35 +6813,35 @@ msgstr ""
 "  --select složka[/msg]  přejde na uvedenou složku/zprávu\n"
 "                         složka je id složky, např. 'složka/podsložka'"
 
-#: src/main.c:1969
+#: src/main.c:1992
 msgid "  --online               switch to online mode"
 msgstr "  --online                       přejde do online režimu"
 
-#: src/main.c:1970
+#: src/main.c:1993
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline                      přejde do offline režimu"
 
-#: src/main.c:1971
+#: src/main.c:1994
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit  --quit -q                       ukončí Claws Mail"
 
-#: src/main.c:1972
+#: src/main.c:1995
 msgid "  --debug                debug mode"
 msgstr "  --debug                        režim trasování"
 
-#: src/main.c:1973
+#: src/main.c:1996
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug                        přepne režim trasování"
 
-#: src/main.c:1974
+#: src/main.c:1997
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h                         vypíše tuto nápovědu a skončí"
 
-#: src/main.c:1975
+#: src/main.c:1998
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v                   vypíše informace o verzi a skončí"
 
-#: src/main.c:1976
+#: src/main.c:1999
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6845,11 +6849,11 @@ msgstr ""
 "  --version-full -V     vypíše informace o verzi a vestavěných vlastnostech "
 "a skončí"
 
-#: src/main.c:1977
+#: src/main.c:2000
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir                   vypíše název adresáře s konfigurací"
 
-#: src/main.c:1978
+#: src/main.c:2001
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6857,7 +6861,7 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                  použije zadaný adresář s konfigurací"
 
-#: src/main.c:1980
+#: src/main.c:2003
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
@@ -6865,32 +6869,32 @@ msgstr ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         nastaví polohu a velikost hlavního okna"
 
-#: src/main.c:2033
+#: src/main.c:2056
 msgid "Unknown option\n"
 msgstr "Neznámá volba\n"
 
-#: src/main.c:2051
+#: src/main.c:2074
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Zpracovávám (%s)..."
 
-#: src/main.c:2054
+#: src/main.c:2077
 msgid "top level folder"
 msgstr "nejvyšší složka v hierarchii"
 
-#: src/main.c:2137
+#: src/main.c:2160
 msgid "Queued messages"
 msgstr "Pozdržené zprávy"
 
-#: src/main.c:2138
+#: src/main.c:2161
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Ve frontě jsou neodeslaně zprávy. Skončit nyní?"
 
-#: src/main.c:2880
+#: src/main.c:2908
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: network is online.\n"
 
-#: src/main.c:2886
+#: src/main.c:2914
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: síť je odpojena.\n"
 
@@ -6898,7 +6902,7 @@ msgstr "NetworkManager: síť je odpojena.\n"
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/mainwindow.c:515 src/messageview.c:210 src/summaryview.c:435
+#: src/mainwindow.c:515 src/messageview.c:210 src/summaryview.c:436
 msgid "_View"
 msgstr "Z_obrazit"
 
@@ -7122,7 +7126,7 @@ msgstr "Část zprávy"
 msgid "View as text"
 msgstr "Zobrazit jako text"
 
-#: src/mainwindow.c:638 src/messageview.c:289 src/toolbar.c:491
+#: src/mainwindow.c:638 src/messageview.c:289 src/toolbar.c:494
 msgid "Open"
 msgstr "Otevřít"
 
@@ -7171,7 +7175,7 @@ msgstr "_Napsat news zprávu"
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: src/mainwindow.c:664 src/messageview.c:301 src/summaryview.c:427
+#: src/mainwindow.c:664 src/messageview.c:301 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "Odpovědět ko_mu"
 
@@ -7183,15 +7187,15 @@ msgstr "Kon_ference"
 msgid "Follow-up and reply to"
 msgstr "Postoupit a odpovědět"
 
-#: src/mainwindow.c:671 src/messageview.c:307 src/toolbar.c:2368
+#: src/mainwindow.c:671 src/messageview.c:307 src/toolbar.c:2446
 msgid "_Forward"
 msgstr "Pře_dat"
 
-#: src/mainwindow.c:672 src/messageview.c:308 src/toolbar.c:2369
+#: src/mainwindow.c:672 src/messageview.c:308 src/toolbar.c:2447
 msgid "For_ward as attachment"
 msgstr "Předat jako pří_lohu"
 
-#: src/mainwindow.c:673 src/messageview.c:309 src/toolbar.c:2370
+#: src/mainwindow.c:673 src/messageview.c:309 src/toolbar.c:2448
 msgid "Redirec_t"
 msgstr "Pře_směrovat"
 
@@ -7247,7 +7251,7 @@ msgstr "Odstranit _vlákno"
 msgid "Cancel a news message"
 msgstr "Stornovat news zprávu"
 
-#: src/mainwindow.c:699 src/mainwindow.c:700 src/summaryview.c:428
+#: src/mainwindow.c:699 src/mainwindow.c:700 src/summaryview.c:429
 msgid "_Mark"
 msgstr "Označ_it"
 
@@ -7272,7 +7276,7 @@ msgid "Mark all unread"
 msgstr "Označit všechny jako nepřečtené"
 
 #: src/mainwindow.c:710 src/prefs_filtering_action.c:199 src/toolbar.c:242
-#: src/toolbar.c:500
+#: src/toolbar.c:503
 msgid "Ignore thread"
 msgstr "Ignorovat vlákno"
 
@@ -7281,7 +7285,7 @@ msgid "Unignore thread"
 msgstr "Přestat ignorovat vlákno"
 
 #: src/mainwindow.c:712 src/prefs_filtering_action.c:200 src/toolbar.c:243
-#: src/toolbar.c:501
+#: src/toolbar.c:504
 msgid "Watch thread"
 msgstr "Sledovat vlákno"
 
@@ -7297,19 +7301,19 @@ msgstr "Označit jako _spam"
 msgid "Mark as _ham"
 msgstr "Označit jako n_e spam"
 
-#: src/mainwindow.c:720 src/prefs_filtering_action.c:181 src/toolbar.c:504
+#: src/mainwindow.c:720 src/prefs_filtering_action.c:181 src/toolbar.c:507
 msgid "Lock"
 msgstr "Zamknout"
 
-#: src/mainwindow.c:721 src/prefs_filtering_action.c:182 src/toolbar.c:505
+#: src/mainwindow.c:721 src/prefs_filtering_action.c:182 src/toolbar.c:508
 msgid "Unlock"
 msgstr "Odemknout"
 
-#: src/mainwindow.c:723 src/summaryview.c:429
+#: src/mainwindow.c:723 src/summaryview.c:430
 msgid "Color la_bel"
 msgstr "O_barvit"
 
-#: src/mainwindow.c:724 src/summaryview.c:430
+#: src/mainwindow.c:724 src/summaryview.c:431
 msgid "Ta_gs"
 msgstr "Zn_ačky"
 
@@ -7358,12 +7362,12 @@ msgstr "Vytvořit pravidlo _filtru"
 msgid "_Automatically"
 msgstr "_Automaticky"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/mainwindow.c:860
+#: src/mainwindow.c:748 src/mainwindow.c:754 src/mainwindow.c:858
 #: src/messageview.c:319 src/messageview.c:325
 msgid "By _From"
 msgstr "Podle _Od"
 
-#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:861
+#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:859
 #: src/messageview.c:320 src/messageview.c:326
 msgid "By _To"
 msgstr "Podle _Komu"
@@ -7373,7 +7377,7 @@ msgstr "Podle _Komu"
 msgid "By _Subject"
 msgstr "Podle _Předmětu"
 
-#: src/mainwindow.c:752 src/messageview.c:323 src/summaryview.c:433
+#: src/mainwindow.c:752 src/messageview.c:323 src/summaryview.c:434
 msgid "Create processing rule"
 msgstr "Vytvořit pravidlo zpracování"
 
@@ -7409,304 +7413,304 @@ msgstr "Vy_mazat"
 msgid "SSL/TLS cer_tificates"
 msgstr "SSL/TLS cer_tifikáty"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:779
 msgid "Filtering Lo_g"
 msgstr "Záznam filtrování"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:780
 msgid "Network _Log"
 msgstr "Záznam o připojení"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:782
 msgid "_Forget all session passwords"
 msgstr "_Zapomenout všechna hesla relace"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:784
 msgid "Forget _master passphrase"
 msgstr "Zapomenout _hlavní heslo"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:788
 msgid "C_hange current account"
 msgstr "_Zvolit aktuální účet"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:790
 msgid "_Preferences for current account..."
 msgstr "Upravit a_ktuální účet..."
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:791
 msgid "Create _new account..."
 msgstr "Vytvořit _nový účet..."
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:792
 msgid "_Edit accounts..."
 msgstr "U_pravit účty..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:795
 msgid "P_references..."
 msgstr "_Volby..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:796
 msgid "Pre-pr_ocessing..."
 msgstr "Před zpracování..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:797
 msgid "Post-pro_cessing..."
 msgstr "Následné zpracování..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:798
 msgid "_Filtering..."
 msgstr "_Filtrování..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:799
 msgid "_Templates..."
 msgstr "Ša_blony..."
 
-#: src/mainwindow.c:802
+#: src/mainwindow.c:800
 msgid "_Actions..."
 msgstr "_Akce..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:801
 msgid "Tag_s..."
 msgstr "Znač_ky..."
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:803
 msgid "Plu_gins..."
 msgstr "Zásuvné _moduly..."
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:806
 msgid "_Manual"
 msgstr "_Manuál"
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:807
 msgid "_Online User-contributed FAQ"
 msgstr "FAQ (online)"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:808
 msgid "Icon _Legend"
 msgstr "_Význam ikon"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:810
 msgid "Set as default client"
 msgstr "Nastavit jako výchozí klient"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:817
 msgid "Offline _mode"
 msgstr "Offline _mód"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:818
 msgid "Men_ubar"
 msgstr "Řádek men_u"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:819
 msgid "_Message view"
 msgstr "_Náhled zprávy"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:821
 msgid "Status _bar"
 msgstr "_Stavový řádek"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:823
 msgid "Column headers"
 msgstr "Záhlaví sloupců"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:824
 msgid "Th_read view"
 msgstr "Zobrazit _vlákna"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:825
 msgid "Hide read threads"
 msgstr "Skrýt přečtená vlákna"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:826
 msgid "_Hide read messages"
 msgstr "Skrýt přeč_tené zprávy"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:827
 msgid "Hide deleted messages"
 msgstr "Skrýt odstraněné zprávy"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:828
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
-#: src/mainwindow.c:831 src/messageview.c:342
+#: src/mainwindow.c:829 src/messageview.c:342
 msgid "Show all _headers"
 msgstr "Zobrazit všechny _hlavičky"
 
-#: src/mainwindow.c:832 src/messageview.c:343
+#: src/mainwindow.c:830 src/messageview.c:343
 msgid "_Collapse all"
 msgstr "_Sbalit vše"
 
-#: src/mainwindow.c:833 src/messageview.c:344
+#: src/mainwindow.c:831 src/messageview.c:344
 msgid "Collapse from level _2"
 msgstr "Sbalit od úrovně _2"
 
-#: src/mainwindow.c:834 src/messageview.c:345
+#: src/mainwindow.c:832 src/messageview.c:345
 msgid "Collapse from level _3"
 msgstr "Sbalit od úrovně _3"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:836
 msgid "Text _below icons"
 msgstr "Text _pod ikonami"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:837
 msgid "Text be_side icons"
 msgstr "Text _vedle ikon"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:838
 msgid "_Icons only"
 msgstr "Jen _ikony"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:839
 msgid "_Text only"
 msgstr "Jen _text"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:846
 msgid "_Standard"
 msgstr "_Standartní"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:847
 msgid "_Three columns"
 msgstr "_Tři sloupce"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:848
 msgid "_Wide message"
 msgstr "Široký náhled _zpráv"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:849
 msgid "W_ide message list"
 msgstr "Široký _seznam zpráv"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:850
 msgid "S_mall screen"
 msgstr "_Malá obrazovka"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:854
 msgid "By _number"
 msgstr "Podle čí_sla"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:855
 msgid "By s_ize"
 msgstr "Podle _velikosti"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:856
 msgid "By _date"
 msgstr "Podle _data"
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:857
 msgid "By thread date"
 msgstr "Podle data vlákna"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:860
 msgid "By s_ubject"
 msgstr "Podle _předmětu"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:861
 msgid "By _color label"
 msgstr "Podle _barevného označení zprávy"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:862
 msgid "By tag"
 msgstr "Podle tag"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:863
 msgid "By _mark"
 msgstr "Podle _značky"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:864
 msgid "By _status"
 msgstr "Podle _stavu"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:865
 msgid "By a_ttachment"
 msgstr "Podle _přílohy"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:866
 msgid "By score"
 msgstr "Podle skóre"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:867
 msgid "By locked"
 msgstr "Podle zamknuto"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:868
 msgid "D_on't sort"
 msgstr "N_eřadit"
 
-#: src/mainwindow.c:874 src/prefs_summaries.c:463
+#: src/mainwindow.c:872 src/prefs_summaries.c:462
 msgid "Ascending"
 msgstr "Vzestupně"
 
-#: src/mainwindow.c:875 src/prefs_summaries.c:464
+#: src/mainwindow.c:873 src/prefs_summaries.c:463
 msgid "Descending"
 msgstr "Sestupně"
 
-#: src/mainwindow.c:917 src/messageview.c:387
+#: src/mainwindow.c:915 src/messageview.c:387
 msgid "_Auto detect"
 msgstr "_Autodetekce"
 
-#: src/mainwindow.c:1314 src/summaryview.c:6245
+#: src/mainwindow.c:1312 src/summaryview.c:6287
 msgid "Apply tags..."
 msgstr "Použít značky..."
 
-#: src/mainwindow.c:1962
+#: src/mainwindow.c:1958
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Došlo k chybě (chybám). Klikněte zde pro zobrazení protokolu."
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1973
 msgid "You are online. Click the icon to go offline"
 msgstr ""
 "Pracujete v režimu online. Klikněte na ikonu pro přechod do režimu offline"
 
-#: src/mainwindow.c:1980
+#: src/mainwindow.c:1976
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 "Pracujete v režimu offline. Klikněte na ikonu pro přechod do režimu online"
 
-#: src/mainwindow.c:1994
+#: src/mainwindow.c:1990
 msgid "Select account"
 msgstr "Vybrat účet"
 
-#: src/mainwindow.c:2021 src/prefs_logging.c:140
+#: src/mainwindow.c:2017 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Síťový protokol"
 
-#: src/mainwindow.c:2025
+#: src/mainwindow.c:2021
 msgid "Filtering/Processing debug log"
 msgstr "Protokol filtrování zpráv a zpracování složek"
 
-#: src/mainwindow.c:2044 src/prefs_logging.c:392
+#: src/mainwindow.c:2040 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "protokolování filtrů zapnuto\n"
 
-#: src/mainwindow.c:2046 src/prefs_logging.c:394
+#: src/mainwindow.c:2042 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "protokolování filtrů vypnuto\n"
 
-#: src/mainwindow.c:2489 src/mainwindow.c:2496 src/mainwindow.c:2539
-#: src/mainwindow.c:2572 src/mainwindow.c:2604 src/mainwindow.c:2649
+#: src/mainwindow.c:2485 src/mainwindow.c:2492 src/mainwindow.c:2535
+#: src/mainwindow.c:2568 src/mainwindow.c:2600 src/mainwindow.c:2645
 #: src/plugins/notification/notification_trayicon.c:372
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1077
 msgid "Untitled"
 msgstr "Neoznačený"
 
-#: src/mainwindow.c:2650 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2646 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:2907 src/mainwindow.c:2911
+#: src/mainwindow.c:2903 src/mainwindow.c:2907
 msgid "Delete all messages in trash folders?"
 msgstr "Odstranit všechny zprávy ve VŠECH koších?"
 
-#: src/mainwindow.c:2908
+#: src/mainwindow.c:2904
 msgid "Don't quit"
 msgstr "Neukončit"
 
-#: src/mainwindow.c:2937 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2933 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Přidat mailbox"
 
-#: src/mainwindow.c:2938
+#: src/mainwindow.c:2934
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7716,18 +7720,18 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/mainwindow.c:2944 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2940 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Mailbox '%s' již existuje."
 
-#: src/mainwindow.c:2949 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2945 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
 #: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:2954 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2950 src/plugins/mailmbox/plugin_gtk.c:215 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 "
@@ -7737,47 +7741,47 @@ msgstr ""
 "Může to být tím, že mailbox již existuje, nebo nemáte dostatečná práva pro "
 "zápis."
 
-#: src/mainwindow.c:3423
+#: src/mainwindow.c:3419
 msgid "No posting allowed"
 msgstr "Zasílání zpráv do konference není povoleno"
 
-#: src/mainwindow.c:4006
+#: src/mainwindow.c:4002
 msgid "Mbox import has failed."
 msgstr "Import souboru mbox se nezdařil."
 
-#: src/mainwindow.c:4015 src/mainwindow.c:4024
+#: src/mainwindow.c:4011 src/mainwindow.c:4020
 msgid "Export to mbox has failed."
 msgstr "Export do mbox souboru se nezdařil."
 
-#: src/mainwindow.c:4065 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Ukončení programu"
 
-#: src/mainwindow.c:4065 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "Ukončit Claws Mail?"
 
-#: src/mainwindow.c:4256
+#: src/mainwindow.c:4252
 msgid "Folder synchronisation"
 msgstr "Synchronizace složek"
 
-#: src/mainwindow.c:4257
+#: src/mainwindow.c:4253
 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete nyní synchronizovat složky?"
 
-#: src/mainwindow.c:4258
+#: src/mainwindow.c:4254
 msgid "_Synchronise"
 msgstr "_Synchronizovat"
 
-#: src/mainwindow.c:4706
+#: src/mainwindow.c:4702
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávám duplikované zprávy..."
 
-#: src/mainwindow.c:4716
+#: src/mainwindow.c:4712
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Žádná duplicitní zpráva ve vybrané složce.\n"
 
-#: src/mainwindow.c:4722
+#: src/mainwindow.c:4718
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
@@ -7785,7 +7789,7 @@ msgstr[0] "Odstraněna %d duplicitní zpráva ve vybrané složce.\n"
 msgstr[1] "Odstraněny %d duplicitní zprávy ve vybrané složce.\n"
 msgstr[2] "Odstraněno %d duplicitních zpráv ve vybrané složce.\n"
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4722
 #, c-format
 msgid "Marked %d duplicate message for deletion in selected folder.\n"
 msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
@@ -7793,11 +7797,11 @@ msgstr[0] "Označit %d duplicitní zprávu ve vybrané složce.\n"
 msgstr[1] "Označit %d duplicitní zprávy ve vybrané složce.\n"
 msgstr[2] "Označit %d duplicitních zpráv ve vybrané složce.\n"
 
-#: src/mainwindow.c:4764
+#: src/mainwindow.c:4760
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Vymazávám duplikované zprávy ve všech složkách..."
 
-#: src/mainwindow.c:4770
+#: src/mainwindow.c:4766
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -7805,47 +7809,47 @@ msgstr[0] "Odstraněna %d duplicitní zpráva v %d složkách.\n"
 msgstr[1] "Odstraněny %d duplicitní zprávy v %d složkách.\n"
 msgstr[2] "Odstraněno %d duplicitních zpráv v %d složkách.\n"
 
-#: src/mainwindow.c:4775
+#: src/mainwindow.c:4771
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "Žádné duplicitní zprávy v %d složkách.\n"
 
-#: src/mainwindow.c:4937 src/messageview.c:2657
+#: src/mainwindow.c:4933 src/messageview.c:2657
 msgid "Select folder to go to"
 msgstr "Vybrat složku pro přejití"
 
-#: src/mainwindow.c:5038 src/summaryview.c:5736
+#: src/mainwindow.c:5034 src/summaryview.c:5778
 msgid "Processing rules to apply before folder rules"
 msgstr "Zpracování složky - pravidla prováděná před pravidly složky"
 
-#: src/mainwindow.c:5046
+#: src/mainwindow.c:5042
 msgid "Processing rules to apply after folder rules"
 msgstr "Zpracování složky - pravidla prováděná po pravidlech složky"
 
-#: src/mainwindow.c:5054 src/summaryview.c:5747
+#: src/mainwindow.c:5050 src/summaryview.c:5789
 msgid "Filtering configuration"
 msgstr "Filtr pro příjem - nastavení pravidel"
 
-#: src/mainwindow.c:5169
+#: src/mainwindow.c:5165
 msgid "Can not register as default client: impossible to get executable path."
 msgstr "Nemohu zaregistrovat jako výchozí klient: není možné získat cestu."
 
-#: src/mainwindow.c:5228
+#: src/mainwindow.c:5224
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail byl zaregistrován jako výchozí klient."
 
-#: src/mainwindow.c:5230
+#: src/mainwindow.c:5226
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Nemohu zaregistrovat jako výchozí klient: není možné zapisovat do registrů."
 
-#: src/mainwindow.c:5244 src/setup.c:91
+#: src/mainwindow.c:5240 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Prohledávám složku %s%c%s..."
 
-#: src/mainwindow.c:5388
+#: src/mainwindow.c:5384
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7884,21 +7888,21 @@ msgstr "Rozlišovat malá a velká písmena"
 msgid "Case insensitive"
 msgstr "Rozlišovat malá a velká písmena"
 
-#: src/matcher.c:1862
+#: src/matcher.c:1859
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "zkontrolovat jestli zpráva odpovídá [ %s ]\n"
 
-#: src/matcher.c:1933 src/matcher.c:1952 src/matcher.c:1965
+#: src/matcher.c:1930 src/matcher.c:1949 src/matcher.c:1962
 msgid "message matches\n"
 msgstr "zpráva odpovídá\n"
 
-#: src/matcher.c:1940 src/matcher.c:1958 src/matcher.c:1967
+#: src/matcher.c:1937 src/matcher.c:1955 src/matcher.c:1964
 msgid "message does not match\n"
 msgstr "zpráva neodpovídá\n"
 
-#: src/matcher.c:2230 src/matcher.c:2231 src/matcher.c:2232 src/matcher.c:2233
-#: src/matcher.c:2234 src/matcher.c:2235 src/matcher.c:2236 src/matcher.c:2237
+#: src/matcher.c:2227 src/matcher.c:2228 src/matcher.c:2229 src/matcher.c:2230
+#: src/matcher.c:2231 src/matcher.c:2232 src/matcher.c:2233 src/matcher.c:2234
 msgid "(none)"
 msgstr "(žádný)"
 
@@ -7928,7 +7932,7 @@ msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tento soubor již existuje. Chcete ho přepsat?"
 
 #: src/mbox.c:551 src/messageview.c:1864 src/mimeview.c:1843
-#: src/prefs_themes.c:561 src/textview.c:3086
+#: src/prefs_themes.c:598 src/textview.c:3095
 msgid "Overwrite"
 msgstr "Přepsat"
 
@@ -8022,7 +8026,7 @@ msgstr ""
 msgid "Fetching message (%s)..."
 msgstr "Přijímaní zprávy (%s)..."
 
-#: src/messageview.c:1421 src/procmime.c:1008
+#: src/messageview.c:1421 src/procmime.c:1009
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Nepodařilo se rozšifrovat: %s"
@@ -8032,8 +8036,8 @@ msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Zpráva nevyhovuje MIME standardu. Může být špatně zobrazena."
 
 #: src/messageview.c:1856 src/messageview.c:1859 src/mimeview.c:2048
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4840
-#: src/summaryview.c:4843 src/textview.c:3074
+#: src/plugins/fancy/fancy_viewer.c:709 src/summaryview.c:4882
+#: src/summaryview.c:4885 src/textview.c:3083
 msgid "Save as"
 msgstr "Uložit jako"
 
@@ -8041,8 +8045,8 @@ msgstr "Uložit jako"
 msgid "Overwrite existing file?"
 msgstr "Přepsat existující soubor?"
 
-#: src/messageview.c:1873 src/summaryview.c:4860 src/summaryview.c:4863
-#: src/summaryview.c:4878
+#: src/messageview.c:1873 src/summaryview.c:4902 src/summaryview.c:4905
+#: src/summaryview.c:4920
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Nemohu uložit soubor '%s'."
@@ -8109,7 +8113,7 @@ msgstr ""
 "je %s a bude stažena úplně."
 
 #: src/messageview.c:2033 src/messageview.c:2046
-#: src/prefs_filtering_action.c:180 src/toolbar.c:503
+#: src/prefs_filtering_action.c:180 src/toolbar.c:506
 msgid "Unmark"
 msgstr "Odoznačit"
 
@@ -8172,8 +8176,8 @@ msgstr ""
 "\n"
 "  Zpráva byla smazána nebo přesunuta do jiné složky"
 
-#: src/messageview.c:3009 src/messageview.c:3015 src/summaryview.c:4253
-#: src/summaryview.c:7012
+#: src/messageview.c:3009 src/messageview.c:3015 src/summaryview.c:4295
+#: src/summaryview.c:7054
 msgid "An error happened while learning.\n"
 msgstr "Během učení došlo k chybě.\n"
 
@@ -8200,7 +8204,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:298
+#: src/mh_gtk.c:372 src/plugins/mailmbox/plugin_gtk.c:298
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
@@ -8209,7 +8213,7 @@ msgstr ""
 "Opravdu odstranit mailbox '%s' ?\n"
 "(Zprávy NEBUDOU odstraněny z disku)"
 
-#: src/mh_gtk.c:376 src/plugins/mailmbox/plugin_gtk.c:300
+#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:300
 msgid "Remove mailbox"
 msgstr "Odstranit mailbox"
 
@@ -8282,12 +8286,12 @@ msgid "Go back to email"
 msgstr "Zpět na zprávu"
 
 #: src/mimeview.c:1761 src/mimeview.c:1853 src/mimeview.c:2095
-#: src/mimeview.c:2131 src/mimeview.c:2243 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2131 src/mimeview.c:2243 src/plugins/fancy/fancy_viewer.c:449
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nepodařilo se uložit tuto část zprávy: %s"
 
-#: src/mimeview.c:1840 src/textview.c:3084
+#: src/mimeview.c:1840 src/textview.c:3093
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Přepsat existující soubor '%s'?"
@@ -8317,9 +8321,9 @@ msgstr "Vše přeskočit"
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
-msgstr[0] "%d soubor úspěšně uložen"
-msgstr[1] "%d soubory úspěšně uloženy"
-msgstr[2] "%d souborů úspěšně uloženo"
+msgstr[0] "%d soubor úspěšně uložen."
+msgstr[1] "%d soubory úspěšně uloženy."
+msgstr[2] "%d souborů úspěšně uloženo."
 
 #: src/mimeview.c:1886
 #, c-format
@@ -8338,7 +8342,7 @@ msgstr[1] "%s, %d soubory selhaly."
 msgstr[2] "%s, %d souborů selhalo."
 
 #: src/mimeview.c:1924 src/plugins/archive/archiver_prefs.c:142
-#: src/prefs_filtering_action.c:1297
+#: src/prefs_filtering_action.c:1300
 msgid "Select destination folder"
 msgstr "Vybrat cílovou složku"
 
@@ -8347,11 +8351,11 @@ msgstr "Vybrat cílovou složku"
 msgid "'%s' is not a directory."
 msgstr "'%s' není adresář."
 
-#: src/mimeview.c:2178 src/mimeview.c:2185 src/textview.c:3001
+#: src/mimeview.c:2178 src/mimeview.c:2185 src/textview.c:3010
 msgid "Open with"
 msgstr "Otevřít čím"
 
-#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3002
+#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3011
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8391,12 +8395,12 @@ msgstr ""
 msgid "Run binary"
 msgstr "Spustit binární soubor"
 
-#: src/mimeview.c:2596 src/plugins/att_remover/att_remover.c:299
+#: src/mimeview.c:2596 src/plugins/att_remover/att_remover.c:304
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/mimeview.c:2597 src/plugins/att_remover/att_remover.c:300
-#: src/plugins/pdf_viewer/poppler_viewer.c:697 src/summaryview.c:2700
+#: src/mimeview.c:2597 src/plugins/att_remover/att_remover.c:305
+#: src/plugins/pdf_viewer/poppler_viewer.c:699 src/summaryview.c:2713
 msgid "Size:"
 msgstr "Velikost:"
 
@@ -8452,7 +8456,7 @@ msgstr ""
 msgid "couldn't select group: %s\n"
 msgstr "nemohu vybrat skupinu: %s\n"
 
-#: src/news.c:1054 src/news.c:1224
+#: src/news.c:1054 src/news.c:1232
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "nemohu nastavit skupinu: %s\n"
@@ -8462,24 +8466,24 @@ msgstr "nemohu nastavit skupinu: %s\n"
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatný rozsah příspěvků: %d - %d\n"
 
-#: src/news.c:1133 src/news.c:1157 src/news.c:1181
+#: src/news.c:1133 src/news.c:1160 src/news.c:1187
 msgid "couldn't get xhdr\n"
 msgstr "nelze získat xhdr\n"
 
-#: src/news.c:1217
+#: src/news.c:1225
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "získávám xover %d - %d v %s...\n"
 
-#: src/news.c:1232
+#: src/news.c:1240
 msgid "couldn't get xover\n"
 msgstr "nelze získat xover\n"
 
-#: src/news.c:1247
+#: src/news.c:1257
 msgid "invalid xover line\n"
 msgstr "neplatná xover řádka\n"
 
-#: src/news.c:1449
+#: src/news.c:1459
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -8644,7 +8648,7 @@ msgstr "ACPI soubor: "
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:406
 msgid "values - On: "
-msgstr "Hodnoty: - zapnuto"
+msgstr "hodnoty - zapnuto: "
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:411
 msgid " - Off: "
@@ -8921,14 +8925,14 @@ msgstr "Úroveň komprese"
 #: src/plugins/archive/archiver_gtk.c:833
 #: src/plugins/archive/archiver_gtk.c:841
 #: src/plugins/archive/archiver_gtk.c:849
-#: src/plugins/pdf_viewer/poppler_viewer.c:716 src/prefs_folder_item.c:522
+#: src/plugins/pdf_viewer/poppler_viewer.c:718 src/prefs_folder_item.c:522
 msgid "Yes"
 msgstr "Ano"
 
 #: src/plugins/archive/archiver_gtk.c:833
 #: src/plugins/archive/archiver_gtk.c:841
 #: src/plugins/archive/archiver_gtk.c:849
-#: src/plugins/pdf_viewer/poppler_viewer.c:719 src/prefs_folder_item.c:521
+#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:521
 #: src/prefs_summaries.c:380
 msgid "No"
 msgstr "Ne"
@@ -8994,7 +8998,7 @@ msgstr "Umístění a jméno archivu"
 
 #: src/plugins/archive/archiver_gtk.c:1092
 #: src/plugins/archive/archiver_prefs.c:225
-#: src/plugins/pgpcore/select-keys.c:421
+#: src/plugins/pgpcore/select-keys.c:435
 msgid "_Select"
 msgstr "_Vybrat"
 
@@ -9158,7 +9162,7 @@ msgstr ""
 "potřebný pro vytvoření archivu"
 
 #: src/plugins/archive/archiver_prefs.c:425
-#: src/plugins/managesieve/sieve_manager.c:761
+#: src/plugins/managesieve/sieve_manager.c:765
 msgid "Rename"
 msgstr "Přejmenovat"
 
@@ -9166,25 +9170,25 @@ msgstr "Přejmenovat"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Vyberte tuto možnost pro mazání mailů po archivování"
 
-#: src/plugins/att_remover/att_remover.c:332
+#: src/plugins/att_remover/att_remover.c:337
 msgid "Remove attachments"
 msgstr "Odebrat přílohy"
 
-#: src/plugins/att_remover/att_remover.c:357
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:1060
+#: src/plugins/att_remover/att_remover.c:362
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:1097
 msgid "Remove"
 msgstr "Odstranit"
 
-#: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:452
-#: src/prefs_summary_column.c:80 src/summaryview.c:2794
+#: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:451
+#: src/prefs_summary_column.c:79 src/summaryview.c:2807
 msgid "Attachment"
 msgstr "Příloha"
 
-#: src/plugins/att_remover/att_remover.c:417
+#: src/plugins/att_remover/att_remover.c:422
 msgid "Destroy attachments"
 msgstr "Zničit přílohy"
 
-#: src/plugins/att_remover/att_remover.c:418
+#: src/plugins/att_remover/att_remover.c:423
 msgid ""
 "Do you really want to remove all attachments from the selected messages?\n"
 "\n"
@@ -9194,20 +9198,20 @@ msgstr ""
 "\n"
 "Smazaná data budou neobnovitelná."
 
-#: src/plugins/att_remover/att_remover.c:479
+#: src/plugins/att_remover/att_remover.c:484
 msgid "This message doesn't have any attachments."
 msgstr "Tyto zprávy nemají žádné přílohy."
 
-#: src/plugins/att_remover/att_remover.c:494
+#: src/plugins/att_remover/att_remover.c:499
 msgid "Remove attachments..."
 msgstr "Odebrat přílohy..."
 
-#: src/plugins/att_remover/att_remover.c:506
-#: src/plugins/att_remover/att_remover.c:566
+#: src/plugins/att_remover/att_remover.c:511
+#: src/plugins/att_remover/att_remover.c:571
 msgid "AttRemover"
 msgstr "AttRemover"
 
-#: src/plugins/att_remover/att_remover.c:571
+#: src/plugins/att_remover/att_remover.c:576
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -9219,7 +9223,7 @@ msgstr ""
 "Varování: operace bude nezrušitelná a smazané přílohy bude ztraceny navždy "
 "opravdu navždy."
 
-#: src/plugins/att_remover/att_remover.c:595
+#: src/plugins/att_remover/att_remover.c:600
 msgid "Attachment handling"
 msgstr "Zpracování přílohy"
 
@@ -9294,7 +9298,7 @@ msgstr ""
 "Text zpráv, které předáváte (forward) nebo přesměrováváte (redirect) nebude "
 "kontrolován"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:353
 msgid "Signatures"
 msgstr "Podpisy"
 
@@ -9432,7 +9436,7 @@ msgstr "Zprávy větší než tato velikost nebudou kontrolovány"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1511
+#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1544
 msgid "KB"
 msgstr "KB"
 
@@ -9892,8 +9896,8 @@ msgstr "Ukázkový modul"
 #: src/plugins/demo/demo.c:52
 msgid "Failed to register log text hook"
 msgstr ""
-"Nepovedlo se zaregistrovat ovladač Nepodařilo se zaregistrovat funkci pro "
-"obsloužení události \"zápis do protokolu\""
+"Nepodařilo se zaregistrovat funkci pro obsloužení události \"zápis do "
+"protokolu\""
 
 #: src/plugins/demo/demo.c:76
 msgid ""
@@ -9995,8 +9999,8 @@ msgstr "CSS z tohoto souboru bude aplikováno na všechny HTML části"
 
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1346
-#: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1445 src/prefs_account.c:1534 src/prefs_account.c:2008
+#: src/plugins/pgpcore/prefs_gpg.c:209 src/plugins/rssyl/rssyl_prefs.c:186
+#: src/prefs_account.c:1478 src/prefs_account.c:1567 src/prefs_account.c:2055
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "_Procházet"
@@ -10005,93 +10009,93 @@ msgstr "_Procházet"
 msgid "Select stylesheet"
 msgstr "Vyberte šablona stylu"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:418
 msgid "Remote content loading is disabled."
 msgstr "Načítání vzdáleného obsahu je zakázáno."
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:497
 msgid "Load images"
 msgstr "Načíst obrázky"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:499
 msgid "Enable remote content"
 msgstr "Odblokovat externí obsah"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:501
 msgid "Enable Javascript"
 msgstr "Povolit Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:503
 msgid "Enable Plugins"
 msgstr "Povolit zásuvné moduly"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:505
 msgid "Enable Java"
 msgstr "Povolit Javu"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:507
 msgid "Open links with external browser"
 msgstr "Otevřít odkazy v externím prohlížeči"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:689
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Nastala chyba: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:745
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s je poškozený nebo není podporovaný kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:756
 msgid "Search the Web"
 msgstr "Prohledat web"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:768
 msgid "Open in Viewer"
 msgstr "Otevřít v prohlížeči"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:770
 msgid "Open in Viewer (enable remote content)"
 msgstr "Otevřít v prohlížeči (povolit vzdálený obsah)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:779
 msgid "Open in Browser"
 msgstr "Otevřít v prohlížeči"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:789
 msgid "Open Image"
 msgstr "Otevřít obrázek"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Copy Link"
 msgstr "Kopírovat odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:802
 msgid "Download Link"
 msgstr "Stáhnout odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:813
 msgid "Save Image As"
 msgstr "Uložit obrázek jako"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:823
 msgid "Copy Image"
 msgstr "Kopírovat obrázek"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:841
 msgid "Import feed"
 msgstr "Načíst kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1120
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1148
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML prohlížeč"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1153
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10306,7 +10310,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Zásuvný modul GData: Pokus o obnovení autentizace\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1752
+#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1786
 msgid "Authentication"
 msgstr "Autentizace"
 
@@ -10484,7 +10488,7 @@ msgid "Cache refresh interval"
 msgstr "Interval obnovy vyrovnávací paměti"
 
 #: src/plugins/libravatar/libravatar_prefs.c:229
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1490
+#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1523
 #: src/prefs_matcher.c:336 src/prefs_receive.c:177
 msgid "hours"
 msgstr "hodin"
@@ -10686,7 +10690,7 @@ msgstr "Metoda autentizace nedostupná"
 msgid "sending error on Sieve session: %s\n"
 msgstr "chyba odesílání na Sieve relaci: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5634
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5676
 msgid "_Filter"
 msgstr "_Filtrovat"
 
@@ -10743,7 +10747,7 @@ msgid "%s - Sieve Filter%s"
 msgstr "%s - Sieve Filtr%s"
 
 #: src/plugins/managesieve/sieve_editor.c:742
-#: src/plugins/pdf_viewer/poppler_viewer.c:1272
+#: src/plugins/pdf_viewer/poppler_viewer.c:1282
 msgid "Loading..."
 msgstr "Načítám..."
 
@@ -10781,19 +10785,19 @@ msgstr "Účet může jen jeden aktivní skript současně."
 msgid "Unable to connect"
 msgstr "Nemohu připojit"
 
-#: src/plugins/managesieve/sieve_manager.c:620
+#: src/plugins/managesieve/sieve_manager.c:623
 msgid "Listing scripts..."
 msgstr "Vypisování skriptů..."
 
-#: src/plugins/managesieve/sieve_manager.c:623
+#: src/plugins/managesieve/sieve_manager.c:626
 msgid "Connecting..."
 msgstr "Připojení..."
 
-#: src/plugins/managesieve/sieve_manager.c:655
+#: src/plugins/managesieve/sieve_manager.c:658
 msgid "Manage Sieve Filters"
 msgstr "Spravovat Sieve filtry"
 
-#: src/plugins/managesieve/sieve_manager.c:796
+#: src/plugins/managesieve/sieve_manager.c:800
 msgid "To use Sieve, enable it in an account's preferences."
 msgstr "Pro použití Sieve ho povolte v nastavení účtů."
 
@@ -10814,7 +10818,7 @@ msgstr "Spravovat sieve filtry na serveru pomocí ManageSieve protokolu."
 msgid "Enable Sieve"
 msgstr "Povolit Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1090
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1102
 msgid "Server information"
 msgstr "Informace o serveru"
 
@@ -10865,40 +10869,40 @@ msgstr "Nastavit autentizaci"
 
 #: src/plugins/managesieve/sieve_prefs.c:240
 #: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1275
-#: src/prefs_account.c:1798
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1297
+#: src/prefs_account.c:1832
 msgid "User ID"
 msgstr "Uživatelské jméno"
 
 #: src/plugins/managesieve/sieve_prefs.c:250
 #: src/plugins/rssyl/rssyl_feed_props.c:393
 #: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1281
-#: src/prefs_account.c:1818 src/prefs_account.c:2535 src/prefs_account.c:2557
+#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1303
+#: src/prefs_account.c:1855 src/prefs_account.c:2583 src/prefs_account.c:2611
 #: src/wizard.c:1214 src/wizard.c:1634
 msgid "Password"
 msgstr "Heslo"
 
-#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1573
-#: src/prefs_account.c:1770
+#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1606
+#: src/prefs_account.c:1804
 msgid "Authentication method"
 msgstr "Metoda autentizace"
 
-#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1583
-#: src/prefs_account.c:1779 src/prefs_send.c:233 src/prefs_send.c:304
-#: src/prefs_themes.c:1075
+#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1616
+#: src/prefs_account.c:1813 src/prefs_send.c:261 src/prefs_send.c:332
+#: src/prefs_themes.c:1112
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/plugins/managesieve/sieve_prefs.c:391
+#: src/plugins/managesieve/sieve_prefs.c:394
 msgid "Sieve server must not contain a space."
 msgstr "Sieve server nesmí obsahovat mezery."
 
-#: src/plugins/managesieve/sieve_prefs.c:397
+#: src/plugins/managesieve/sieve_prefs.c:400
 msgid "Sieve server is not entered."
 msgstr "Nebyl zadán Sieve server."
 
-#: src/plugins/managesieve/sieve_prefs.c:425
+#: src/plugins/managesieve/sieve_prefs.c:428
 msgid "Sieve"
 msgstr "Sieve"
 
@@ -11040,7 +11044,7 @@ msgstr "Zpráva"
 
 #: src/plugins/notification/notification_popup.c:332
 msgid "New News post"
-msgstr "Nová News zpráva "
+msgstr "Nová News zpráva"
 
 #: src/plugins/notification/notification_popup.c:333
 msgid "A new message arrived"
@@ -11201,19 +11205,19 @@ msgid "Show banner"
 msgstr "Zobrazovat proužek"
 
 #: src/plugins/notification/notification_prefs.c:766
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:147
-#: src/prefs_receive.c:231
+#: src/plugins/pgpcore/select-keys.c:240 src/plugins/pgpcore/sgpgme.c:147
+#: src/prefs_receive.c:228
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
-#: src/prefs_summaries.c:494 src/prefs_summaries.c:504
+#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:226
+#: src/prefs_summaries.c:493 src/prefs_summaries.c:503
 msgid "Always"
 msgstr "Vždy"
 
 #: src/plugins/notification/notification_prefs.c:770
 msgid "Only when not empty"
-msgstr "pokud není prázdný"
+msgstr "Pokud není prázdný"
 
 #: src/plugins/notification/notification_prefs.c:789
 msgid "Banner speed"
@@ -11282,8 +11286,8 @@ msgstr "Barva popředí"
 
 #: src/plugins/notification/notification_prefs.c:927
 #: src/plugins/notification/notification_prefs.c:1146
-#: src/prefs_msg_colors.c:281 src/prefs_msg_colors.c:302
-#: src/prefs_msg_colors.c:323
+#: src/prefs_msg_colors.c:276 src/prefs_msg_colors.c:296
+#: src/prefs_msg_colors.c:316
 msgid "Background"
 msgstr "Pozadí"
 
@@ -11305,8 +11309,8 @@ msgstr "Časový limit pro zobrazení okna"
 #: src/plugins/notification/notification_prefs.c:1072
 #: src/plugins/notification/notification_prefs.c:1367
 #: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:575
-#: src/prefs_receive.c:203 src/prefs_summaries.c:544
+#: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:574
+#: src/prefs_receive.c:200 src/prefs_summaries.c:542
 msgid "seconds"
 msgstr "sekund"
 
@@ -11457,7 +11461,7 @@ msgstr "Nová mailová zpráva"
 
 #: src/plugins/notification/notification_trayicon.c:859
 msgid "New news post"
-msgstr "Nová News zpráva "
+msgstr "Nová News zpráva"
 
 #: src/plugins/notification/notification_trayicon.c:861
 msgid "New calendar message"
@@ -11495,124 +11499,128 @@ msgstr[0] "Přišel %d nový článek v RSS kanálu"
 msgstr[1] "Přišli %d nové články v RSS kanálu"
 msgstr[2] "Přišlo %d nových článků v RSS kanálu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:699
+#: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Title:"
 msgstr "Titul:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/plugins/pdf_viewer/poppler_viewer.c:703
 msgid "Author:"
 msgstr "Autor:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:703
+#: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Creator:"
 msgstr "Tvůrce:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:704
+#: src/plugins/pdf_viewer/poppler_viewer.c:706
 msgid "Producer:"
 msgstr "Produkováno:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:707
+#: src/plugins/pdf_viewer/poppler_viewer.c:709
 msgid "Created:"
 msgstr "Vytvořeno:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:711
+#: src/plugins/pdf_viewer/poppler_viewer.c:713
 msgid "Modified:"
 msgstr "Upraveno:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:714
+#: src/plugins/pdf_viewer/poppler_viewer.c:716
 msgid "Format:"
 msgstr "Formát:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:716
-#: src/plugins/pdf_viewer/poppler_viewer.c:719
+#: src/plugins/pdf_viewer/poppler_viewer.c:718
+#: src/plugins/pdf_viewer/poppler_viewer.c:721
 msgid "Optimized:"
 msgstr "Optimalizováno:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1177
+#: src/plugins/pdf_viewer/poppler_viewer.c:1185
 msgid "PDF properties"
 msgstr "Vlastnosti PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1323
+#: src/plugins/pdf_viewer/poppler_viewer.c:1333
 msgid "Enter password"
 msgstr "Zadejte heslo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1324
+#: src/plugins/pdf_viewer/poppler_viewer.c:1334
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr "Tento dokument je uzamčen a vyžaduje heslo před jeho otevřením."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1339
+#: src/plugins/pdf_viewer/poppler_viewer.c:1349
 #, c-format
 msgid "%s Document"
 msgstr "%s dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1345
+#: src/plugins/pdf_viewer/poppler_viewer.c:1355
 #, c-format
 msgid "of %d"
 msgstr "z %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1361
+#: src/plugins/pdf_viewer/poppler_viewer.c:1371
 msgid "PDF rendering failed for an unknown reason."
 msgstr "Renderovaní PDF selhalo z neznámého důvodu."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1725
-#: src/plugins/pdf_viewer/poppler_viewer.c:1934
+#: src/plugins/pdf_viewer/poppler_viewer.c:1735
+#: src/plugins/pdf_viewer/poppler_viewer.c:1950
 msgid "Document Index"
 msgstr "Index dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1902
+#: src/plugins/pdf_viewer/poppler_viewer.c:1915
 msgid "First Page"
 msgstr "První stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1905
+#: src/plugins/pdf_viewer/poppler_viewer.c:1918
 msgid "Previous Page"
 msgstr "Předchozí stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1908
+#: src/plugins/pdf_viewer/poppler_viewer.c:1921
 msgid "Next Page"
 msgstr "Následující stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1911
+#: src/plugins/pdf_viewer/poppler_viewer.c:1924
 msgid "Last Page"
 msgstr "Poslední stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1914
+#: src/plugins/pdf_viewer/poppler_viewer.c:1927
 msgid "Zoom In"
 msgstr "Zvětšit"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1916
+#: src/plugins/pdf_viewer/poppler_viewer.c:1929
 msgid "Zoom Out"
 msgstr "Zmenšit"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1919
+#: src/plugins/pdf_viewer/poppler_viewer.c:1932
 msgid "Fit Page"
 msgstr "Přizpůsobit stránce"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1922
+#: src/plugins/pdf_viewer/poppler_viewer.c:1935
 msgid "Fit Page Width"
 msgstr "Přizpůsobit šířce stránky"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1925
+#: src/plugins/pdf_viewer/poppler_viewer.c:1938
 msgid "Rotate Left"
 msgstr "Otočit vlevo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1928
+#: src/plugins/pdf_viewer/poppler_viewer.c:1941
 msgid "Rotate Right"
 msgstr "Otočit vpravo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1931
+#: src/plugins/pdf_viewer/poppler_viewer.c:1944
+msgid "Print Document"
+msgstr "Vytisknout dokument"
+
+#: src/plugins/pdf_viewer/poppler_viewer.c:1947
 msgid "Document Info"
 msgstr "Informace o dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1936
+#: src/plugins/pdf_viewer/poppler_viewer.c:1952
 msgid "Page Number"
 msgstr "Číslo stránky"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1938
+#: src/plugins/pdf_viewer/poppler_viewer.c:1954
 msgid "Zoom Factor"
 msgstr "Faktor zobrazení"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2043
+#: src/plugins/pdf_viewer/poppler_viewer.c:2064
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11625,13 +11633,13 @@ msgstr ""
 "\n"
 "Jakákoliv zpětná vazba je vítána: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2049
-#: src/plugins/pdf_viewer/poppler_viewer.c:2057
-#: src/plugins/pdf_viewer/poppler_viewer.c:2077
+#: src/plugins/pdf_viewer/poppler_viewer.c:2070
+#: src/plugins/pdf_viewer/poppler_viewer.c:2078
+#: src/plugins/pdf_viewer/poppler_viewer.c:2098
 msgid "PDF Viewer"
 msgstr "Prohlížeč PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2053
+#: src/plugins/pdf_viewer/poppler_viewer.c:2074
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11654,7 +11662,7 @@ msgstr "Úprava pravidla perl filtru (externě)..."
 msgid "Failed to register PGP address autocompletion hook"
 msgstr "Selhala registrace PGP kompletace adres"
 
-#: src/plugins/pgpcore/passphrase.c:85 src/plugins/pgpcore/prefs_gpg.c:127
+#: src/plugins/pgpcore/passphrase.c:85 src/plugins/pgpcore/prefs_gpg.c:147
 msgid "Passphrase"
 msgstr "Heslo"
 
@@ -11758,7 +11766,7 @@ msgstr ""
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:283
+#: src/plugins/pgpcore/pgp_viewer.c:289
 msgid "   This key is in your keyring.\n"
 msgstr "   Tento klíč je ve vašem seznamu klíčů.\n"
 
@@ -11792,49 +11800,49 @@ msgstr ""
 msgid "Core operations"
 msgstr "Klíčové operace"
 
-#: src/plugins/pgpcore/prefs_gpg.c:122
+#: src/plugins/pgpcore/prefs_gpg.c:142
 msgid "Automatically check signatures"
 msgstr "Automaticky kontrolovat digitální podpisy"
 
-#: src/plugins/pgpcore/prefs_gpg.c:125
+#: src/plugins/pgpcore/prefs_gpg.c:145
 msgid "Use keyring for address autocompletion"
 msgstr "Použít klíčenku pro automatické doplňování adres"
 
-#: src/plugins/pgpcore/prefs_gpg.c:130
+#: src/plugins/pgpcore/prefs_gpg.c:150
 msgid "Use gpg-agent to manage passwords"
 msgstr "Použít gpg-agenta pro správu hesel"
 
-#: src/plugins/pgpcore/prefs_gpg.c:135
+#: src/plugins/pgpcore/prefs_gpg.c:155
 msgid "Store passphrase in memory"
 msgstr "Ukládat hesla v paměti"
 
-#: src/plugins/pgpcore/prefs_gpg.c:145
+#: src/plugins/pgpcore/prefs_gpg.c:165
 msgid "Expire after"
 msgstr "Vyprší za"
 
-#: src/plugins/pgpcore/prefs_gpg.c:159
+#: src/plugins/pgpcore/prefs_gpg.c:179
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Nastavte '0' pro uložení hesla po celou dobu relace"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:474
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1874
+#: src/plugins/pgpcore/prefs_gpg.c:183 src/plugins/rssyl/rssyl_feed_props.c:474
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1921
 #: src/prefs_receive.c:187
 msgid "minutes"
 msgstr "minut(y)"
 
-#: src/plugins/pgpcore/prefs_gpg.c:173
+#: src/plugins/pgpcore/prefs_gpg.c:193
 msgid "Grab input while entering a passphrase"
 msgstr "Zachytávat vstup během vyplňování hesla"
 
-#: src/plugins/pgpcore/prefs_gpg.c:180
+#: src/plugins/pgpcore/prefs_gpg.c:200
 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "Zobrazit varování pokud GnuPG nefunguje"
 
-#: src/plugins/pgpcore/prefs_gpg.c:183
+#: src/plugins/pgpcore/prefs_gpg.c:203
 msgid "Path to GnuPG executable"
 msgstr "Cesta ke spustitelnému souboru GnuPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:188
+#: src/plugins/pgpcore/prefs_gpg.c:208
 msgid ""
 "If left blank the location of the GnuPG executable will be automatically "
 "determined."
@@ -11842,42 +11850,47 @@ msgstr ""
 "Pokud ponecháte prázdné umístění spustitelného souboru GnuPG bude určeno "
 "automaticky."
 
-#: src/plugins/pgpcore/prefs_gpg.c:229
+#: src/plugins/pgpcore/prefs_gpg.c:249
 msgid "Select GnuPG executable"
 msgstr "Vybrat spustitelný soubor GnuPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:356
+#: src/plugins/pgpcore/prefs_gpg.c:361
 msgid "Sign key"
 msgstr "Klíč pro podpis"
 
-#: src/plugins/pgpcore/prefs_gpg.c:364
+#: src/plugins/pgpcore/prefs_gpg.c:369
 msgid "Use default GnuPG key"
 msgstr "Použít výchozí GnuPG klíč"
 
-#: src/plugins/pgpcore/prefs_gpg.c:375
+#: src/plugins/pgpcore/prefs_gpg.c:380
 msgid "Select key by your email address"
 msgstr "Vybrat klíč podle e-mailové adresy"
 
-#: src/plugins/pgpcore/prefs_gpg.c:386
+#: src/plugins/pgpcore/prefs_gpg.c:391
 msgid "Specify key manually"
 msgstr "Zadat klíč ručně"
 
-#: src/plugins/pgpcore/prefs_gpg.c:396
+#: src/plugins/pgpcore/prefs_gpg.c:401
 msgid "User or key ID:"
 msgstr "Uživatel nebo ID klíče:"
 
-#: src/plugins/pgpcore/prefs_gpg.c:437
+#: src/plugins/pgpcore/prefs_gpg.c:445
 msgid "No secret key found."
 msgstr "Žádný tajný klíč nebyl nalezen."
 
-#: src/plugins/pgpcore/prefs_gpg.c:440
+#: src/plugins/pgpcore/prefs_gpg.c:448
 msgid "Generate a new key pair"
 msgstr "Generovat nový pár klíčů"
 
-#: src/plugins/pgpcore/prefs_gpg.c:618
+#: src/plugins/pgpcore/prefs_gpg.c:687
 msgid "GPG"
 msgstr "GPG"
 
+#: src/plugins/pgpcore/prefs_gpg.c:707 src/plugins/smime/plugin.c:38
+#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:913
+msgid "S/MIME"
+msgstr "S/MIME"
+
 #: src/plugins/pgpcore/select-keys.c:94
 #, c-format
 msgid "No exact match for '%s'; please select the key."
@@ -11888,54 +11901,54 @@ msgstr "Nenalezena shoda pro '%s'; prosím vyberte klíč."
 msgid "Collecting info for '%s' ... %c"
 msgstr "Získávám informace pro '%s' ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:145
+#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:145
 msgid "Undefined"
 msgstr "Nedefinovaná"
 
-#: src/plugins/pgpcore/select-keys.c:240 src/plugins/pgpcore/sgpgme.c:149
+#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:149
 #: src/plugins/pgpcore/sgpgme.c:165
 msgid "Marginal"
 msgstr "Částečná"
 
-#: src/plugins/pgpcore/select-keys.c:246 src/plugins/pgpcore/sgpgme.c:153
+#: src/plugins/pgpcore/select-keys.c:249 src/plugins/pgpcore/sgpgme.c:153
 #: src/plugins/pgpcore/sgpgme.c:169
 msgid "Ultimate"
 msgstr "Absolutní"
 
-#: src/plugins/pgpcore/select-keys.c:367
+#: src/plugins/pgpcore/select-keys.c:381
 msgid "Select Keys"
 msgstr "Vybrat klíče"
 
-#: src/plugins/pgpcore/select-keys.c:394
+#: src/plugins/pgpcore/select-keys.c:408
 msgid "Key ID"
 msgstr "ID klíče"
 
-#: src/plugins/pgpcore/select-keys.c:397
+#: src/plugins/pgpcore/select-keys.c:411
 msgid "Trust"
 msgstr "Důvěřovat"
 
-#: src/plugins/pgpcore/select-keys.c:422
+#: src/plugins/pgpcore/select-keys.c:436
 msgid "_Other"
 msgstr "_Ostatní"
 
-#: src/plugins/pgpcore/select-keys.c:423
+#: src/plugins/pgpcore/select-keys.c:437
 msgid "Do_n't encrypt"
 msgstr "_Nešifrovat"
 
-#: src/plugins/pgpcore/select-keys.c:582
+#: src/plugins/pgpcore/select-keys.c:596
 msgid "Add key"
 msgstr "Přidat klíč"
 
-#: src/plugins/pgpcore/select-keys.c:583
+#: src/plugins/pgpcore/select-keys.c:597
 msgid "Enter another user or key ID:"
 msgstr "Zadejte dalšího uživatele nebo ID klíče:"
 
-#: src/plugins/pgpcore/select-keys.c:605
+#: src/plugins/pgpcore/select-keys.c:619
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Šifrování %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:606
+#: src/plugins/pgpcore/select-keys.c:620
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -11996,137 +12009,137 @@ msgstr "Správný podpis od \"%s\" [marginal]"
 msgid "Good signature from \"%s\""
 msgstr "Správný podpis od \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:305
+#: src/plugins/pgpcore/sgpgme.c:284 src/plugins/pgpcore/sgpgme.c:302
 #, c-format
 msgid "Key 0x%s not available to verify this signature"
 msgstr "Klíč 0x%s pro ověření tohoto podpisu není dostupný"
 
-#: src/plugins/pgpcore/sgpgme.c:292
+#: src/plugins/pgpcore/sgpgme.c:290
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s prošlou platností od \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:295
+#: src/plugins/pgpcore/sgpgme.c:293
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Správný podpis od \"%s\", ale klíč vypršel"
 
-#: src/plugins/pgpcore/sgpgme.c:298
+#: src/plugins/pgpcore/sgpgme.c:296
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Správný podpis od \"%s\", ale klíč byl odvolán"
 
-#: src/plugins/pgpcore/sgpgme.c:301
+#: src/plugins/pgpcore/sgpgme.c:299
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Špatný podpis od \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:310
+#: src/plugins/pgpcore/sgpgme.c:306
 msgid "The signature has not been checked"
 msgstr "Digitální podpis nebyl zkontrolován"
 
-#: src/plugins/pgpcore/sgpgme.c:329
+#: src/plugins/pgpcore/sgpgme.c:325
 msgid "Error checking signature: no status\n"
 msgstr "Chyba při kontrole podpisu: žádný status\n"
 
-#: src/plugins/pgpcore/sgpgme.c:347
+#: src/plugins/pgpcore/sgpgme.c:343
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Chyba při kontrole podpisu: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:365
+#: src/plugins/pgpcore/sgpgme.c:361
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Digitálně podepsáno na %s pomocí %s ID klíče %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:371
+#: src/plugins/pgpcore/sgpgme.c:367
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Správný podpis od uid \"%s\" (Platnost: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:372
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Klíč s prošlou platností \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:381
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Podpis s prošlou platností od uid\"%s\" (Platnost: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:386
+#: src/plugins/pgpcore/sgpgme.c:382
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Odvolaný klíč \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:391
+#: src/plugins/pgpcore/sgpgme.c:387
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "ŠPATNÝ podpis od \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:404
+#: src/plugins/pgpcore/sgpgme.c:400
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid \"%s\" (Platnost: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:406
+#: src/plugins/pgpcore/sgpgme.c:402
 msgid "Revoked"
 msgstr "Odvolán"
 
-#: src/plugins/pgpcore/sgpgme.c:411
+#: src/plugins/pgpcore/sgpgme.c:407
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Majitel Trust: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:412
+#: src/plugins/pgpcore/sgpgme.c:408
 msgid "No key!"
 msgstr "Žádný klíč!"
 
-#: src/plugins/pgpcore/sgpgme.c:414
+#: src/plugins/pgpcore/sgpgme.c:410
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint primárního klíče:"
 
-#: src/plugins/pgpcore/sgpgme.c:432
+#: src/plugins/pgpcore/sgpgme.c:428
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "VAROVÁNÍ: Adresa autora podpisu \"%s\" nesouhlasí s DNS záznamem\n"
 
-#: src/plugins/pgpcore/sgpgme.c:438
+#: src/plugins/pgpcore/sgpgme.c:434
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Ověřená adresa autora podpisu je \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:472
+#: src/plugins/pgpcore/sgpgme.c:468
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Nelze načíst obsah zprávy, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:488
+#: src/plugins/pgpcore/sgpgme.c:484
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Nelze inicializovat data, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:643
+#: src/plugins/pgpcore/sgpgme.c:661
 msgid "Secret key specification is ambiguous"
 msgstr "Specifikace tajného klíče není jednoznačná"
 
-#: src/plugins/pgpcore/sgpgme.c:653
+#: src/plugins/pgpcore/sgpgme.c:671
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Tajný klíč nebyl nalezen (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:666
+#: src/plugins/pgpcore/sgpgme.c:684
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Nepodařilo se nastavit tajný klíč: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:759
+#: src/plugins/pgpcore/sgpgme.c:777
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme protokol '%s' je nepoužitelný: Jádro '%s' není správně nainstalováno."
 
-#: src/plugins/pgpcore/sgpgme.c:765
+#: src/plugins/pgpcore/sgpgme.c:783
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12135,12 +12148,12 @@ msgstr ""
 "Gpgme protokol '%s' je nepoužitelný: Je nainstalováno jádro '%s' verze %s, "
 "ale pro správnou funkci je vyžadována verze %s.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:773
+#: src/plugins/pgpcore/sgpgme.c:791
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme protokol '%s' je nepoužitelný (neznámý problém)"
 
-#: src/plugins/pgpcore/sgpgme.c:789
+#: src/plugins/pgpcore/sgpgme.c:807
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12148,7 +12161,7 @@ msgstr ""
 "GnuPG není korektně instalováno, nebo je verze příliš stará.\n"
 "Podpora pro OpenPGP je vypnuta."
 
-#: src/plugins/pgpcore/sgpgme.c:866
+#: src/plugins/pgpcore/sgpgme.c:884
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12156,11 +12169,11 @@ msgstr ""
 "Chcete-li generovat klíče, musíte nejprve uložit informace o účtu tlačítkem "
 "\"OK\".\n"
 
-#: src/plugins/pgpcore/sgpgme.c:871
+#: src/plugins/pgpcore/sgpgme.c:889
 msgid "No PGP key found"
 msgstr "Nenalezen PGP klíč"
 
-#: src/plugins/pgpcore/sgpgme.c:872
+#: src/plugins/pgpcore/sgpgme.c:890
 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"
@@ -12170,12 +12183,12 @@ msgstr ""
 "podepisovat zprávy a přijímat šifrované zprávy.\n"
 "Chcete vytvořit nový pár klíčů?"
 
-#: src/plugins/pgpcore/sgpgme.c:961 src/plugins/pgpcore/sgpgme.c:983
+#: src/plugins/pgpcore/sgpgme.c:979 src/plugins/pgpcore/sgpgme.c:1001
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Nepodařilo se vygenerovat nový pár klíčů: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:971
+#: src/plugins/pgpcore/sgpgme.c:989
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12183,11 +12196,11 @@ msgstr ""
 "Generuji nový pár klíčů... Prosím pohybujte myší abyste pomohli generátoru "
 "získat dostatek entropie..."
 
-#: src/plugins/pgpcore/sgpgme.c:989
+#: src/plugins/pgpcore/sgpgme.c:1007
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Nepodařilo se vygenerovat nový pár klíčů: neznámá chyba"
 
-#: src/plugins/pgpcore/sgpgme.c:993
+#: src/plugins/pgpcore/sgpgme.c:1011
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12200,15 +12213,15 @@ msgstr ""
 "\n"
 "Chcete je uložit na server klíčů?"
 
-#: src/plugins/pgpcore/sgpgme.c:997
+#: src/plugins/pgpcore/sgpgme.c:1015
 msgid "Key generated"
 msgstr "Klíč vygenerován"
 
-#: src/plugins/pgpcore/sgpgme.c:1073
+#: src/plugins/pgpcore/sgpgme.c:1091
 msgid "Key exported."
 msgstr "Klíč exportován."
 
-#: src/plugins/pgpcore/sgpgme.c:1075
+#: src/plugins/pgpcore/sgpgme.c:1093
 msgid "Couldn't export key."
 msgstr "Nelze exportovat klíč."
 
@@ -12231,7 +12244,7 @@ msgstr "Nelze převést text do žádné znakové sady."
 #: src/plugins/pgpinline/pgpinline.c:196 src/plugins/pgpinline/pgpinline.c:518
 #: src/plugins/pgpinline/pgpinline.c:657 src/plugins/pgpinline/pgpinline.c:713
 #: src/plugins/pgpmime/pgpmime.c:183 src/plugins/pgpmime/pgpmime.c:329
-#: src/plugins/pgpmime/pgpmime.c:510 src/plugins/pgpmime/pgpmime.c:653
+#: src/plugins/pgpmime/pgpmime.c:511 src/plugins/pgpmime/pgpmime.c:654
 #: src/plugins/smime/smime.c:413
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
@@ -12286,26 +12299,26 @@ msgid "Malformed message"
 msgstr "Chybná zpráva"
 
 #: src/plugins/pgpinline/pgpinline.c:503 src/plugins/pgpinline/pgpinline.c:695
-#: src/plugins/pgpmime/pgpmime.c:693
+#: src/plugins/pgpmime/pgpmime.c:694
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Nelze vytvořit dočasný soubor, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:537
+#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:538
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Digitální podepisování selhalo, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:564
+#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:565
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Digitální podepisování selhalo - neplatný podepisující: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:573
+#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:574
 msgid "Data signing failed, no results."
 msgstr "Digitální podepisování selhalo - žádný výstup."
 
-#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:584
+#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:585
 msgid "Data signing failed, no contents."
 msgstr "Digitální podepisování selhalo - žádný obsah."
 
@@ -12317,12 +12330,12 @@ msgstr ""
 "Upozornění, že přílohy nejsou šifrovány PGP/Inline systémem, stejně tak "
 "záhlaví, jako Předmět."
 
-#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:663
+#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:664
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Nepodařilo se přidat GPG klíč %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:720
+#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:722
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Šifrování selhalo, %s"
@@ -12378,18 +12391,18 @@ msgstr "Nelze analyzovat části dešifrového souboru."
 msgid "Couldn't create temporary file: %s"
 msgstr "Nepodařilo se vytvořit dočasný soubor: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:597
+#: src/plugins/pgpmime/pgpmime.c:598
 msgid "OpenPGP digital signature"
 msgstr "Digitální podpis OpenPGP"
 
-#: src/plugins/pgpmime/pgpmime.c:619
+#: src/plugins/pgpmime/pgpmime.c:620
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
 msgstr ""
 "Upozornění, že záhlaví, jako Předmět, nejsou šifrovány PGP/Mime systémem."
 
-#: src/plugins/pgpmime/pgpmime.c:792
+#: src/plugins/pgpmime/pgpmime.c:794
 msgid "PGP/Mime"
 msgstr "PGP/MIME"
 
@@ -12436,8 +12449,8 @@ msgstr "Zobrazit konzoli Pythonu..."
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2524
-#: src/prefs_account.c:2546 src/prefs_account.c:2822 src/wizard.c:1204
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2572
+#: src/prefs_account.c:2600 src/prefs_account.c:2883 src/wizard.c:1204
 #: src/wizard.c:1624
 msgid "Browse"
 msgstr "Procházet"
@@ -12757,7 +12770,7 @@ msgstr "Stahovat komentáře staré méně než"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:424
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1480 src/prefs_folder_item.c:568 src/prefs_matcher.c:337
+#: src/prefs_account.c:1513 src/prefs_folder_item.c:568 src/prefs_matcher.c:337
 msgid "days"
 msgstr "dnech"
 
@@ -12984,11 +12997,6 @@ msgstr ""
 "Interní problém během upgrade formátu ukládání. Toto by nemělo nastat. "
 "Prosím reportujte to s přiloženým výstupem ladění.\n"
 
-#: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:913
-msgid "S/MIME"
-msgstr "S/MIME"
-
 #: src/plugins/smime/plugin.c:59
 msgid ""
 "This plugin handles S/MIME signed and/or encrypted mails. You can decrypt "
@@ -13206,7 +13214,7 @@ msgstr ""
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:317
 msgid "spamd"
-msgstr "Server"
+msgstr "smapd"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:335
 msgid "Hostname or IP address of spamd server"
@@ -13672,7 +13680,7 @@ msgstr "Čas (%d sekund) připojení k %s\n"
 msgid "Error %ld"
 msgstr "Chyba %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1815
+#: src/plugins/vcalendar/vcal_folder.c:1811
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13685,7 +13693,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1841
+#: src/plugins/vcalendar/vcal_folder.c:1837
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -13696,46 +13704,46 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1872
-#: src/plugins/vcalendar/vcal_folder.c:1875
+#: src/plugins/vcalendar/vcal_folder.c:1868
+#: src/plugins/vcalendar/vcal_folder.c:1871
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Nepodařilo se vytvořit složku %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1915
+#: src/plugins/vcalendar/vcal_folder.c:1911
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail potřebuje přístup na síť pro update Webcal kanálu."
 
-#: src/plugins/vcalendar/vcal_folder.c:1926
+#: src/plugins/vcalendar/vcal_folder.c:1922
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Stahování kalendáře pro %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1923
 msgid "new subscription"
 msgstr "nové přihlášení"
 
-#: src/plugins/vcalendar/vcal_folder.c:1938
+#: src/plugins/vcalendar/vcal_folder.c:1934
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail potřebuje přístup na síť pro update přihlášení."
 
-#: src/plugins/vcalendar/vcal_folder.c:1950
+#: src/plugins/vcalendar/vcal_folder.c:1946
 msgid "Subscribe to Webcal"
 msgstr "Přihlásit Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1950
+#: src/plugins/vcalendar/vcal_folder.c:1946
 msgid "Enter the WebCal URL:"
 msgstr "Vložte WebCal URL:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1962
+#: src/plugins/vcalendar/vcal_folder.c:1958
 msgid "Could not parse the URL."
 msgstr "Nemohu parsovat URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1990
+#: src/plugins/vcalendar/vcal_folder.c:1986
 msgid "Do you really want to unsubscribe?"
 msgstr "Skutečně chcete odhlásit?"
 
-#: src/plugins/vcalendar/vcal_folder.c:1991
+#: src/plugins/vcalendar/vcal_folder.c:1987
 msgid "Delete subscription"
 msgstr "Smazat odběr"
 
@@ -13797,11 +13805,11 @@ msgstr "Přijaté: "
 
 #: src/plugins/vcalendar/vcal_manager.c:1248
 msgid "Declined: "
-msgstr "Odmítnuté:"
+msgstr "Odmítnuté: "
 
 #: src/plugins/vcalendar/vcal_manager.c:1250
 msgid "Tentatively Accepted: "
-msgstr "Předběžně přijaté:"
+msgstr "Předběžně přijaté: "
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:307
 msgid "Individual"
@@ -14016,7 +14024,7 @@ msgstr "na:"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
 msgid "Ends at:"
-msgstr "<b>Končí v:</b>"
+msgstr "Končí v:"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1650
 msgid "New meeting"
@@ -14246,56 +14254,56 @@ msgstr "nastala chyba v POP relaci\n"
 msgid "TOP command unsupported\n"
 msgstr "Příkaz TOP není podporován\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1454 src/prefs_account.c:2452
+#: src/prefs_account.c:335 src/prefs_account.c:1487 src/prefs_account.c:2500
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1567 src/prefs_account.c:2467
+#: src/prefs_account.c:336 src/prefs_account.c:1600 src/prefs_account.c:2515
 #: src/wizard.c:1499
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:336
+#: src/prefs_account.c:337
 msgid "News (NNTP)"
 msgstr "Diskusní skupiny (NNTP)"
 
-#: src/prefs_account.c:337 src/wizard.c:1500
+#: src/prefs_account.c:338 src/wizard.c:1500
 msgid "Local mbox file"
 msgstr "Lokální mbox soubor"
 
-#: src/prefs_account.c:338
+#: src/prefs_account.c:339
 msgid "None (SMTP only)"
 msgstr "Žádný (pouze odesílání SMTP)"
 
-#: src/prefs_account.c:1028
+#: src/prefs_account.c:1040
 msgid "Name of account"
 msgstr "Název účtu"
 
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1049
 msgid "Set as default"
 msgstr "Nastavit jako výchozí"
 
-#: src/prefs_account.c:1045
+#: src/prefs_account.c:1057
 msgid "Personal information"
 msgstr "Osobní informace"
 
-#: src/prefs_account.c:1054
+#: src/prefs_account.c:1066
 msgid "Full name"
 msgstr "Celé jméno"
 
-#: src/prefs_account.c:1060
+#: src/prefs_account.c:1072
 msgid "Mail address"
 msgstr "Poštovní adresa"
 
-#: src/prefs_account.c:1123 src/wizard.c:1523
+#: src/prefs_account.c:1135 src/wizard.c:1523
 msgid "Auto-configure"
 msgstr "Automatická konfigurace"
 
-#: src/prefs_account.c:1125 src/wizard.c:1524
+#: src/prefs_account.c:1137 src/wizard.c:1524
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/prefs_account.c:1142
+#: src/prefs_account.c:1154
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14303,77 +14311,77 @@ msgstr ""
 "Varování: tato verze Claws Mail byla zkompilována\n"
 "bez podpory IMAP a News."
 
-#: src/prefs_account.c:1171
+#: src/prefs_account.c:1185
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizaci"
 
-#: src/prefs_account.c:1178
+#: src/prefs_account.c:1192
 msgid "Authenticate on connect"
 msgstr "Autentizace při připojení"
 
-#: src/prefs_account.c:1232
+#: src/prefs_account.c:1254
 msgid "News server"
 msgstr "Server diskuzních skupin"
 
-#: src/prefs_account.c:1238
+#: src/prefs_account.c:1260
 msgid "Server for receiving"
 msgstr "Server pro příjem"
 
-#: src/prefs_account.c:1244
+#: src/prefs_account.c:1266
 msgid "Local mailbox"
 msgstr "Lokální mailbox"
 
-#: src/prefs_account.c:1251
+#: src/prefs_account.c:1273
 msgid "SMTP server (send)"
 msgstr "SMTP server (odesílání)"
 
-#: src/prefs_account.c:1259
+#: src/prefs_account.c:1281
 msgid "Use mail command rather than SMTP server"
 msgstr "Použít místo SMTP serveru příkaz pro odeslání"
 
-#: src/prefs_account.c:1268
+#: src/prefs_account.c:1290
 msgid "command to send mails"
 msgstr "příkaz pro odeslání pošty"
 
-#: src/prefs_account.c:1332
+#: src/prefs_account.c:1365
 #, c-format
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account.c:1428
+#: src/prefs_account.c:1461
 msgid "Local"
 msgstr "Lokální mbox soubor"
 
-#: src/prefs_account.c:1434 src/prefs_account.c:1523
+#: src/prefs_account.c:1467 src/prefs_account.c:1556
 msgid "Default Inbox"
 msgstr "Výchozí inbox"
 
-#: src/prefs_account.c:1441 src/prefs_account.c:1448 src/prefs_account.c:1530
-#: src/prefs_account.c:1537
+#: src/prefs_account.c:1474 src/prefs_account.c:1481 src/prefs_account.c:1563
+#: src/prefs_account.c:1570
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Nefiltrované zprávy budou uloženy v této složce"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1489
 msgid "Use secure authentication (APOP)"
 msgstr "Použít zabezpečenou autentizaci (APOP)"
 
-#: src/prefs_account.c:1459
+#: src/prefs_account.c:1492
 msgid "Remove messages on server when received"
 msgstr "Odstranit zprávy na serveru po jejich přijmutí"
 
-#: src/prefs_account.c:1470
+#: src/prefs_account.c:1503
 msgid "Remove after"
 msgstr "Odstranit po"
 
-#: src/prefs_account.c:1477 src/prefs_account.c:1487
+#: src/prefs_account.c:1510 src/prefs_account.c:1520
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dnů a 0 hodin: odstranit ihned"
 
-#: src/prefs_account.c:1500
+#: src/prefs_account.c:1533
 msgid "Receive size limit"
 msgstr "Limit velikosti pro příjem"
 
-#: src/prefs_account.c:1503
+#: src/prefs_account.c:1536
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14381,82 +14389,82 @@ msgstr ""
 "Zprávy překračující tento limit budou staženy pouze částečně. Když takovou "
 "zprávu vyberete, budete moci dokončit stažení nebo ji odstranit."
 
-#: src/prefs_account.c:1543 src/prefs_account.c:2482
+#: src/prefs_account.c:1576 src/prefs_account.c:2530
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1550
+#: src/prefs_account.c:1583
 msgid "Maximum number of articles to download"
 msgstr "Maximální počet příspěvků pro stažení"
 
-#: src/prefs_account.c:1560
+#: src/prefs_account.c:1593
 msgid "unlimited if 0 is specified"
 msgstr "(pokud je 0, je to neomezený počet)"
 
-#: src/prefs_account.c:1585
+#: src/prefs_account.c:1618
 msgid "Plain text"
 msgstr "Prostý text"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1631
 msgid "IMAP server directory"
-msgstr "adresář pro IMAP server"
+msgstr "Adresář pro IMAP server"
 
-#: src/prefs_account.c:1602
+#: src/prefs_account.c:1635
 msgid "(usually empty)"
 msgstr "(obvykle prázdné)"
 
-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1649
 msgid "Show subscribed folders only"
 msgstr "Zobrazovat pouze odebírané složky"
 
-#: src/prefs_account.c:1623
+#: src/prefs_account.c:1656
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Mód efektivní šířka pásma (prevence stahování vzdálených značek)"
 
-#: src/prefs_account.c:1625
+#: src/prefs_account.c:1658
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Tento mód používá menší šířku pásma, ale může být pomalejší s některými "
 "servery."
 
-#: src/prefs_account.c:1632
+#: src/prefs_account.c:1665
 msgid "Filter messages on receiving"
 msgstr "Při načítání zpracovat zprávy filtrem pro příjem"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1672
 msgid "Allow filtering using plugins on receiving"
 msgstr "Při načítání filtrovat zprávy zásuvnými moduly"
 
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1676
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "Zpracovat tento účet při volbě 'Přijmout poštu ze všech účtů'"
 
-#: src/prefs_account.c:1725 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:623 src/prefs_matcher.c:1968 src/prefs_matcher.c:1990
+#: src/prefs_account.c:1759 src/prefs_customheader.c:208
+#: src/prefs_matcher.c:623 src/prefs_matcher.c:1970 src/prefs_matcher.c:1992
 msgid "Header"
 msgstr "Záhlaví"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1761
 msgid "Generate Message-ID"
 msgstr "Generovat číslo zprávy"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1764
 msgid "Send account mail address in Message-ID"
 msgstr "Poslat mailovou adresu účtu v Message-ID"
 
-#: src/prefs_account.c:1733
+#: src/prefs_account.c:1767
 msgid "Add user agent header"
 msgstr "Přidat záhlaví user agent"
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1774
 msgid "Add user-defined header"
 msgstr "Přidat uživatelsky definované záhlaví"
 
-#: src/prefs_account.c:1755
+#: src/prefs_account.c:1789
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autentizace (SMTP AUTH)"
 
-#: src/prefs_account.c:1840
+#: src/prefs_account.c:1887
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14464,164 +14472,164 @@ msgstr ""
 "Pokud necháte tyto položky prázdné, bude použito uživatelské jméno a heslo "
 "stejné jako pro příjem."
 
-#: src/prefs_account.c:1851
+#: src/prefs_account.c:1898
 msgid "Authenticate with POP before sending"
 msgstr "Autentizace POP před odesláním"
 
-#: src/prefs_account.c:1866
+#: src/prefs_account.c:1913
 msgid "POP authentication timeout: "
 msgstr "Časový limit pro POP autentizaci: "
 
-#: src/prefs_account.c:1954 src/prefs_account.c:2000
+#: src/prefs_account.c:2001 src/prefs_account.c:2047
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:2004
 msgid "Automatically insert signature"
 msgstr "Automaticky vložit podpis"
 
-#: src/prefs_account.c:1962
+#: src/prefs_account.c:2009
 msgid "Signature separator"
 msgstr "Oddělovač podpisu"
 
-#: src/prefs_account.c:1987
+#: src/prefs_account.c:2034
 msgid "Command output"
 msgstr "Výstup příkazu"
 
-#: src/prefs_account.c:2020
+#: src/prefs_account.c:2067
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastavit následující adresy"
 
-#: src/prefs_account.c:2072
+#: src/prefs_account.c:2119
 msgid "Spell check dictionaries"
 msgstr "Slovníky pro kontrolu pravopisu"
 
-#: src/prefs_account.c:2082 src/prefs_folder_item.c:1104
-#: src/prefs_spelling.c:163
+#: src/prefs_account.c:2129 src/prefs_folder_item.c:1104
+#: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Výchozí slovník"
 
-#: src/prefs_account.c:2095 src/prefs_folder_item.c:1138
-#: src/prefs_spelling.c:176
+#: src/prefs_account.c:2142 src/prefs_folder_item.c:1138
+#: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Výchozí alternativní slovník"
 
-#: src/prefs_account.c:2181 src/prefs_account.c:3341
-#: src/prefs_compose_writing.c:373 src/prefs_folder_item.c:1449
-#: src/prefs_folder_item.c:1841 src/prefs_quote.c:119 src/prefs_quote.c:237
-#: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
+#: src/prefs_account.c:2228 src/prefs_account.c:3423
+#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1449
+#: src/prefs_folder_item.c:1842 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/prefs_account.c:2196 src/prefs_folder_item.c:1477 src/prefs_quote.c:134
-#: src/toolbar.c:487
+#: src/prefs_account.c:2243 src/prefs_folder_item.c:1477 src/prefs_quote.c:134
+#: src/toolbar.c:490
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1505 src/prefs_quote.c:149 src/toolbar.c:492
+#: src/prefs_account.c:2258 src/prefs_filtering_action.c:191
+#: src/prefs_folder_item.c:1505 src/prefs_quote.c:149 src/toolbar.c:495
 msgid "Forward"
 msgstr "Předat"
 
-#: src/prefs_account.c:2258
+#: src/prefs_account.c:2305
 msgid "Default privacy system"
 msgstr "Výchozí systém zabezpečení"
 
-#: src/prefs_account.c:2287
+#: src/prefs_account.c:2334
 msgid "Always sign messages"
 msgstr "Zprávy vždy digitálně podepsat"
 
-#: src/prefs_account.c:2289
+#: src/prefs_account.c:2336
 msgid "Always encrypt messages"
 msgstr "Zprávy vždy šifrovat"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2338
 msgid "Always sign messages when replying to a signed message"
 msgstr "Odpověď na podepsanou zprávu vždy podepsat"
 
-#: src/prefs_account.c:2294
+#: src/prefs_account.c:2341
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Odpověď na šifrovanou zprávu vždy šifrovat"
 
-#: src/prefs_account.c:2297
+#: src/prefs_account.c:2344
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Odesílanou zprávu šifrovat také vaším klíčem"
 
-#: src/prefs_account.c:2299
+#: src/prefs_account.c:2346
 msgid "Save sent encrypted messages as clear text"
 msgstr "Odeslané šifrované zprávy uložit jako čistý text"
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2485
+#: src/prefs_account.c:2504 src/prefs_account.c:2519 src/prefs_account.c:2533
 msgid "Don't use SSL/TLS"
 msgstr "Nepoužívat SSL/TLS"
 
-#: src/prefs_account.c:2459 src/prefs_account.c:2474 src/prefs_account.c:2494
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2507 src/prefs_account.c:2522 src/prefs_account.c:2542
+#: src/prefs_account.c:2553
 msgid "Use SSL/TLS"
 msgstr "Použít SSL/TLS"
 
-#: src/prefs_account.c:2462 src/prefs_account.c:2477 src/prefs_account.c:2508
+#: src/prefs_account.c:2510 src/prefs_account.c:2525 src/prefs_account.c:2556
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Použít příkaz STARTTLS pro spuštění šifrovaného relace"
 
-#: src/prefs_account.c:2498
+#: src/prefs_account.c:2546
 msgid "Send (SMTP)"
 msgstr "Odesílání (SMTP)"
 
-#: src/prefs_account.c:2502
+#: src/prefs_account.c:2550
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "Nepoužívat SSL_TLS (pokud je to ale nutné, použít STARTTLS)"
 
-#: src/prefs_account.c:2513
+#: src/prefs_account.c:2561
 msgid "Client certificates"
 msgstr "Klientské certifikáty"
 
-#: src/prefs_account.c:2521
+#: src/prefs_account.c:2569
 msgid "Certificate for receiving"
 msgstr "Certifikát pro příjem"
 
-#: src/prefs_account.c:2526 src/prefs_account.c:2528 src/prefs_account.c:2548
-#: src/prefs_account.c:2550
+#: src/prefs_account.c:2574 src/prefs_account.c:2576 src/prefs_account.c:2602
+#: src/prefs_account.c:2604
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Soubor klientského certifikátu jako PKCS12 nebo PEM soubor"
 
-#: src/prefs_account.c:2543
+#: src/prefs_account.c:2597
 msgid "Certificate for sending"
 msgstr "Certifikát pro odeslání"
 
-#: src/prefs_account.c:2576
+#: src/prefs_account.c:2637
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "Automaticky přijímat platné certifikáty SSL/TLS"
 
-#: src/prefs_account.c:2579
+#: src/prefs_account.c:2640
 msgid "Use non-blocking SSL/TLS"
 msgstr "Použít neblokující SSL/TLS"
 
-#: src/prefs_account.c:2591
+#: src/prefs_account.c:2652
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "Vypněte, pokud máte problémy se SSL/TLS připojením"
 
-#: src/prefs_account.c:2726
+#: src/prefs_account.c:2787
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: src/prefs_account.c:2733
+#: src/prefs_account.c:2794
 msgid "POP port"
 msgstr "POP port"
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2801
 msgid "IMAP port"
 msgstr "IMAP port"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2808
 msgid "NNTP port"
 msgstr "NNTP port"
 
-#: src/prefs_account.c:2753
+#: src/prefs_account.c:2814
 msgid "Domain name"
 msgstr "Název domény"
 
-#: src/prefs_account.c:2756
+#: src/prefs_account.c:2817
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14629,112 +14637,128 @@ msgstr ""
 "Jméno domény bude použito pro generované Message-ID a při připojení SMTP "
 "serverů."
 
-#: src/prefs_account.c:2770
+#: src/prefs_account.c:2831
 msgid "Use command to communicate with server"
 msgstr "Příkaz pro komunikaci se serverem"
 
-#: src/prefs_account.c:2779
+#: src/prefs_account.c:2840
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Zprávu zaslanou do více skupin označit jako přečtenou a obarvit:"
 
-#: src/prefs_account.c:2835
+#: src/prefs_account.c:2896
 msgid "Put sent messages in"
 msgstr "Ukládat odeslané zprávy do"
 
-#: src/prefs_account.c:2837
+#: src/prefs_account.c:2898
 msgid "Put queued messages in"
 msgstr "Ukládat odložené zprávy do"
 
-#: src/prefs_account.c:2839
+#: src/prefs_account.c:2900
 msgid "Put draft messages in"
 msgstr "Ukládat koncepty do"
 
-#: src/prefs_account.c:2841
+#: src/prefs_account.c:2902
 msgid "Put deleted messages in"
 msgstr "Ukládat odstraněné zprávy do"
 
-#: src/prefs_account.c:2900
+#: src/prefs_account.c:2961
 msgid "Account name is not entered."
 msgstr "Nebylo zadáno jméno účtu."
 
-#: src/prefs_account.c:2904
+#: src/prefs_account.c:2965
 msgid "Mail address is not entered."
 msgstr "Nebyla zadána poštovní adresa."
 
-#: src/prefs_account.c:2911
+#: src/prefs_account.c:2973
 msgid "SMTP server is not entered."
 msgstr "Nebyl zadán SMTP server."
 
-#: src/prefs_account.c:2916
+#: src/prefs_account.c:2978
 msgid "User ID is not entered."
 msgstr "Nebylo zadáno uživatelské číslo."
 
-#: src/prefs_account.c:2921
+#: src/prefs_account.c:2983
 msgid "POP server is not entered."
 msgstr "Nebyl zadán POP server."
 
-#: src/prefs_account.c:2941
+#: src/prefs_account.c:3003
 msgid "The default Inbox folder doesn't exist."
 msgstr "Výchozí složka pro doručování zpráv (inbox) neexistuje."
 
-#: src/prefs_account.c:2947
+#: src/prefs_account.c:3009
 msgid "IMAP server is not entered."
 msgstr "Nebyl zadán IMAP server."
 
-#: src/prefs_account.c:2952
+#: src/prefs_account.c:3014
 msgid "NNTP server is not entered."
 msgstr "Nebyl zadán NNTP server."
 
-#: src/prefs_account.c:2958
+#: src/prefs_account.c:3020
 msgid "local mailbox filename is not entered."
-msgstr "Nebyl zadán název lokálního mailbox souboru."
+msgstr "nebyl zadán název lokálního mailbox souboru."
 
-#: src/prefs_account.c:2964
+#: src/prefs_account.c:3026
 msgid "mail command is not entered."
-msgstr "Nebyl zadán příkaz pro odeslání."
+msgstr "nebyl zadán příkaz pro odeslání."
+
+#: src/prefs_account.c:3036
+msgid "User ID cannot contain a newline character."
+msgstr "User ID nemůže obsahovat znak nového řádku."
+
+#: src/prefs_account.c:3041
+msgid "Password cannot contain a newline character."
+msgstr "Heslo nemůže obsahovat znak nového řádku."
 
-#: src/prefs_account.c:3305
+#: src/prefs_account.c:3069
+msgid "SMTP user ID cannot contain a newline character."
+msgstr "SMTP user ID nemůže obsahovat znak nového řádku."
+
+#: src/prefs_account.c:3074
+msgid "SMTP password cannot contain a newline character."
+msgstr "SMTP heslo nemůže obsahovat znak nového řádku."
+
+#: src/prefs_account.c:3387
 msgid "Receive"
 msgstr "Přijmout"
 
-#: src/prefs_account.c:3359 src/prefs_folder_item.c:1857 src/prefs_quote.c:238
+#: src/prefs_account.c:3441 src/prefs_folder_item.c:1858 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Šablony"
 
-#: src/prefs_account.c:3377
+#: src/prefs_account.c:3459
 msgid "Privacy"
 msgstr "Zabezpečení"
 
-#: src/prefs_account.c:3489
+#: src/prefs_account.c:3571
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/prefs_account.c:3806
+#: src/prefs_account.c:3906
 msgid "Preferences for new account"
 msgstr "Nastavení pro nový účet"
 
-#: src/prefs_account.c:3808
+#: src/prefs_account.c:3908
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - nastavení účtu"
 
-#: src/prefs_account.c:3929 src/wizard.c:1388
+#: src/prefs_account.c:4029 src/wizard.c:1388
 msgid "Failed (wrong address)"
 msgstr "Selhalo (špatná adresa)"
 
-#: src/prefs_account.c:4014
+#: src/prefs_account.c:4114
 msgid "Select signature file"
 msgstr "Soubor s podpisem"
 
-#: src/prefs_account.c:4032 src/prefs_account.c:4049 src/wizard.c:1065
+#: src/prefs_account.c:4132 src/prefs_account.c:4149 src/wizard.c:1065
 msgid "Select certificate file"
 msgstr "Vybrat soubor s certifikátem"
 
-#: src/prefs_account.c:4145
+#: src/prefs_account.c:4245
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:4285
+#: src/prefs_account.c:4385
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (modul nebyl načten)"
@@ -14793,7 +14817,7 @@ msgstr "Přesunout vybranou akci nahoru"
 msgid "Move selected action down"
 msgstr "Přesunout vybranou akci dolů"
 
-#: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
+#: src/prefs_actions.c:535 src/prefs_filtering_action.c:707
 #: src/prefs_filtering.c:838 src/prefs_filtering.c:840
 #: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:897
 #: src/prefs_template.c:472
@@ -14851,20 +14875,20 @@ msgstr "Odstranit všechny akce"
 msgid "Do you really want to delete all the actions?"
 msgstr "Opravdu chcete odstranit všechny akce?"
 
-#: src/prefs_actions.c:892 src/prefs_actions.c:923 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2115 src/prefs_template.c:572
+#: src/prefs_actions.c:892 src/prefs_actions.c:923 src/prefs_filtering.c:1501
+#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2117 src/prefs_template.c:572
 #: src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Neuložený záznam"
 
-#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1500
-#: src/prefs_filtering.c:1522 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1502
+#: src/prefs_filtering.c:1524 src/prefs_template.c:573 src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Záznam nebyl uložen. Chcete přesto okno zavřít?"
 
 #: src/prefs_actions.c:894 src/prefs_actions.c:899 src/prefs_actions.c:925
-#: src/prefs_filtering.c:1479 src/prefs_filtering.c:1501
-#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2118 src/prefs_template.c:574
+#: src/prefs_filtering.c:1481 src/prefs_filtering.c:1503
+#: src/prefs_filtering.c:1525 src/prefs_matcher.c:2120 src/prefs_template.c:574
 #: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Pokračovat v úpravách"
@@ -14929,7 +14953,7 @@ msgstr "<span weight=\"bold\">Použijte:</span>"
 
 #: src/prefs_actions.c:981
 msgid "for the file of the selected message in RFC822/2822 format "
-msgstr "pro soubor s vybranou zprávou ve formátu RFC822/2822"
+msgstr "pro soubor s vybranou zprávou ve formátu RFC822/2822 "
 
 #: src/prefs_actions.c:982
 msgid ""
@@ -14960,7 +14984,7 @@ msgstr "pro aplikaci filtrovacích pravidel mezi {} na vybrané zprávy"
 msgid "for a literal %"
 msgstr "pro znak %"
 
-#: src/prefs_actions.c:998 src/prefs_themes.c:1051
+#: src/prefs_actions.c:998 src/prefs_themes.c:1088
 msgid "Actions"
 msgstr "Akce"
 
@@ -14971,8 +14995,8 @@ msgid ""
 msgstr ""
 "Akce umožňují spouštět externí příkazy ke zpracování zpráv nebo jejich částí."
 
-#: src/prefs_actions.c:1086 src/prefs_filtering.c:1697
-#: src/prefs_template.c:1111
+#: src/prefs_actions.c:1086 src/prefs_filtering.c:1699
+#: src/prefs_template.c:1113
 msgid "D_uplicate"
 msgstr "D_uplikáty"
 
@@ -14980,20 +15004,20 @@ msgstr "D_uplikáty"
 msgid "Current actions"
 msgstr "Nadefinované akce"
 
-#: src/prefs_actions.c:1305 src/prefs_filtering.c:1076
-#: src/prefs_filtering.c:1134
+#: src/prefs_actions.c:1305 src/prefs_filtering.c:1078
+#: src/prefs_filtering.c:1136
 msgid "Action string is not valid."
 msgstr "Definice akce není platná."
 
-#: src/prefs_common.c:237 src/prefs_quote.c:69
+#: src/prefs_common.c:236 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Nazdar,\\n"
 
-#: src/prefs_common.c:315
+#: src/prefs_common.c:314
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "V %d\\n%f napsáno:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:321 src/prefs_quote.c:85
+#: src/prefs_common.c:320 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"
@@ -15001,7 +15025,7 @@ msgstr ""
 "\\n\\nZačátek předané zprávy:\\n\\n?d{Datum: %d\\n}?f{Od: %f\\n}?t{Komu: %t"
 "\\n}?c{Kopie: %c\\n}?n{Diskuzní skupina: %n\\n}?s{Předmět: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:453
+#: src/prefs_common.c:448
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15033,68 +15057,68 @@ msgstr "Automaticky spustit externí editor"
 msgid "Automatically save message to Drafts folder every"
 msgstr "Automaticky uložit text do složky s koncepty každých"
 
-#: src/prefs_compose_writing.c:163 src/prefs_wrapping.c:101
+#: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:100
 msgid "characters"
 msgstr "znaků"
 
-#: src/prefs_compose_writing.c:174
+#: src/prefs_compose_writing.c:173
 msgid "Even if message is to be encrypted"
 msgstr "I když zpráva musí být šifrována"
 
-#: src/prefs_compose_writing.c:181
+#: src/prefs_compose_writing.c:180
 msgid "Undo level"
 msgstr "Úroveň zpětných kroků"
 
-#: src/prefs_compose_writing.c:199
+#: src/prefs_compose_writing.c:197
 msgid "Warn when inserting a file larger than"
 msgstr "Varovat při vložení souboru většího než"
 
-#: src/prefs_compose_writing.c:211
+#: src/prefs_compose_writing.c:208
 msgid "KB into message body "
-msgstr "KB v těle zprávy"
+msgstr "KB v těle zprávy "
 
-#: src/prefs_compose_writing.c:217
+#: src/prefs_compose_writing.c:214
 msgid "Replying"
 msgstr "Odpovídání"
 
-#: src/prefs_compose_writing.c:220
+#: src/prefs_compose_writing.c:217
 msgid "Reply will quote by default"
 msgstr "Odpověď bude vždy s citací"
 
-#: src/prefs_compose_writing.c:223
+#: src/prefs_compose_writing.c:220
 msgid "Reply button invokes mailing list reply"
 msgstr "Tlačítko \"Odpovědět\" odpovídá do konference"
 
-#: src/prefs_compose_writing.c:225
+#: src/prefs_compose_writing.c:222
 msgid "Forwarding"
 msgstr "Předávání"
 
-#: src/prefs_compose_writing.c:228 src/prefs_filtering_action.c:192
+#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:192
 msgid "Forward as attachment"
 msgstr "Předat dál jako přílohu"
 
-#: src/prefs_compose_writing.c:230
+#: src/prefs_compose_writing.c:227
 #, c-format
 msgid "Keep the original '%s' header when redirecting"
 msgstr "Při přesměrování zachovat původní záhlaví '%s'"
 
-#: src/prefs_compose_writing.c:236
+#: src/prefs_compose_writing.c:233
 msgid "When dropping files into the Compose window"
 msgstr "Při přetažení souboru do okna s rozepsanou zprávou"
 
-#: src/prefs_compose_writing.c:245
+#: src/prefs_compose_writing.c:242
 msgid "Ask"
 msgstr "Zeptat se"
 
-#: src/prefs_compose_writing.c:246 src/toolbar.c:519
+#: src/prefs_compose_writing.c:243 src/toolbar.c:522
 msgid "Insert"
 msgstr "Vložit"
 
-#: src/prefs_compose_writing.c:247 src/toolbar.c:520
+#: src/prefs_compose_writing.c:244 src/toolbar.c:523
 msgid "Attach"
 msgstr "Přiložit"
 
-#: src/prefs_compose_writing.c:374
+#: src/prefs_compose_writing.c:371
 msgid "Writing"
 msgstr "Psaní"
 
@@ -15103,7 +15127,7 @@ msgid "Custom header configuration"
 msgstr "Nastavení vlastního záhlaví"
 
 #: src/prefs_customheader.c:506 src/prefs_display_header.c:601
-#: src/prefs_matcher.c:1595 src/prefs_matcher.c:1610
+#: src/prefs_matcher.c:1597 src/prefs_matcher.c:1612
 msgid "Header name is not set."
 msgstr "Není nastaven název záhlaví."
 
@@ -15255,8 +15279,8 @@ msgstr "Skrýt"
 msgid "Message flags"
 msgstr "Příznaky zpráv"
 
-#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:450
-#: src/prefs_summary_column.c:78 src/summaryview.c:2800 src/toolbar.c:502
+#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:449
+#: src/prefs_summary_column.c:77 src/summaryview.c:2813 src/toolbar.c:505
 msgid "Mark"
 msgstr "Označit"
 
@@ -15276,12 +15300,12 @@ msgstr "Označit jako spam"
 msgid "Mark as ham"
 msgstr "Označit jako ne spam"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1439
-#: src/toolbar.c:238 src/toolbar.c:496 src/toolbar.c:2387
+#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1442
+#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2465
 msgid "Execute"
 msgstr "Provést odložené operace"
 
-#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:448
+#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:447
 msgid "Color label"
 msgstr "Barevné značení zpráv"
 
@@ -15295,9 +15319,9 @@ msgid "Redirect"
 msgstr "Přesměrovat"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1443 src/prefs_matcher.c:629
-#: src/prefs_summaries.c:453 src/prefs_summary_column.c:87
-#: src/summaryview.c:448
+#: src/prefs_filtering_action.c:1446 src/prefs_matcher.c:629
+#: src/prefs_summaries.c:452 src/prefs_summary_column.c:86
+#: src/summaryview.c:449
 msgid "Score"
 msgstr "Ohodnocení"
 
@@ -15311,7 +15335,7 @@ msgstr "Nastavit ohodnocení"
 
 #: src/prefs_filtering_action.c:196 src/prefs_filtering_action.c:197
 #: src/prefs_filtering_action.c:198 src/prefs_matcher.c:633
-#: src/prefs_summary_column.c:89 src/summaryview.c:450
+#: src/prefs_summary_column.c:88 src/summaryview.c:451
 msgid "Tags"
 msgstr "Značky"
 
@@ -15339,7 +15363,7 @@ msgstr "Zastavit filtrování"
 msgid "Action configuration"
 msgstr "Nastavení akcí"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1888
+#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1890
 #: src/prefs_matcher.c:586
 msgid "Rule"
 msgstr "Pravidlo"
@@ -15348,65 +15372,65 @@ msgstr "Pravidlo"
 msgid "Action"
 msgstr "Akce"
 
-#: src/prefs_filtering_action.c:935
+#: src/prefs_filtering_action.c:938
 msgid "Command-line not set"
 msgstr "Příkazová řádka není nastavena"
 
-#: src/prefs_filtering_action.c:936
+#: src/prefs_filtering_action.c:939
 msgid "Destination is not set."
 msgstr "Místo určení není nastaveno."
 
-#: src/prefs_filtering_action.c:947
+#: src/prefs_filtering_action.c:950
 msgid "Recipient is not set."
 msgstr "Příjemce není nastaven."
 
-#: src/prefs_filtering_action.c:965
+#: src/prefs_filtering_action.c:968
 msgid "Score is not set"
 msgstr "Ohodnocení není nastaveno"
 
-#: src/prefs_filtering_action.c:973
+#: src/prefs_filtering_action.c:976
 msgid "Header is not set."
 msgstr "Záhlaví není nastaveno."
 
-#: src/prefs_filtering_action.c:980
+#: src/prefs_filtering_action.c:983
 msgid "Target addressbook/folder is not set."
 msgstr "Cílová kniha adres/složka není nastavena."
 
-#: src/prefs_filtering_action.c:994
+#: src/prefs_filtering_action.c:997
 msgid "Tag name is empty."
 msgstr "Jméno značky je prázdné."
 
-#: src/prefs_filtering_action.c:1216
+#: src/prefs_filtering_action.c:1219
 msgid "No action was defined."
 msgstr "Není nastavena žádná akce."
 
-#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2161
+#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2163
 #: src/quote_fmt.c:79
 msgid "literal %"
-msgstr "Procento - znak %"
+msgstr "znak %"
 
-#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2170
+#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2172
 msgid "filename (should not be modified)"
 msgstr "název souboru (neměl by být měněn)"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2171
+#: src/prefs_filtering_action.c:1267 src/prefs_matcher.c:2173
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "nový řádek"
 
-#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2172
+#: src/prefs_filtering_action.c:1268 src/prefs_matcher.c:2174
 msgid "escape character for quotes"
 msgstr "únikový znak pro citaci"
 
-#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2173
+#: src/prefs_filtering_action.c:1269 src/prefs_matcher.c:2175
 msgid "quote character"
 msgstr "uvozovka (znak \")"
 
-#: src/prefs_filtering_action.c:1275
+#: src/prefs_filtering_action.c:1278
 msgid "Filtering Action: 'Execute'"
 msgstr "Filtrovací akce: 'Provést'"
 
-#: src/prefs_filtering_action.c:1276
+#: src/prefs_filtering_action.c:1279
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
@@ -15416,23 +15440,23 @@ msgstr ""
 "skriptu.\n"
 "Při definici mohou být použity následující symboly:"
 
-#: src/prefs_filtering_action.c:1423
+#: src/prefs_filtering_action.c:1426
 msgid "Recipient"
 msgstr "Příjemce"
 
-#: src/prefs_filtering_action.c:1427
+#: src/prefs_filtering_action.c:1430
 msgid "Book/Folder"
 msgstr "Kniha/složka"
 
-#: src/prefs_filtering_action.c:1431
+#: src/prefs_filtering_action.c:1434
 msgid "Destination"
 msgstr "Místo určení"
 
-#: src/prefs_filtering_action.c:1435
+#: src/prefs_filtering_action.c:1438
 msgid "Color"
 msgstr "Barva"
 
-#: src/prefs_filtering_action.c:1521
+#: src/prefs_filtering_action.c:1524
 msgid "Current action list"
 msgstr "Platný seznam akcí"
 
@@ -15441,10 +15465,10 @@ msgid "Filtering/Processing configuration"
 msgstr "Nastavení filtrování/zpracování"
 
 #: src/prefs_filtering.c:266 src/prefs_filtering.c:869
-#: src/prefs_filtering.c:983
+#: src/prefs_filtering.c:985
 msgctxt "Filtering Account Menu"
 msgid "All"
-msgstr "všechny"
+msgstr "Všechny"
 
 #: src/prefs_filtering.c:411
 msgid "Condition"
@@ -15502,59 +15526,59 @@ msgstr "Přesunout vybrané pravidlo o stránku níže"
 msgid "Move the selected rule to the bottom"
 msgstr "Přesunout vybrané pravidlo dospodu"
 
-#: src/prefs_filtering.c:1040 src/prefs_filtering.c:1126
+#: src/prefs_filtering.c:1042 src/prefs_filtering.c:1128
 msgid "Condition string is not valid."
 msgstr "Definice podmínky není platná."
 
-#: src/prefs_filtering.c:1113
+#: src/prefs_filtering.c:1115
 msgid "Condition string is empty."
 msgstr "Podmínka je prázdná."
 
-#: src/prefs_filtering.c:1119
+#: src/prefs_filtering.c:1121
 msgid "Action string is empty."
 msgstr "Akce je prázdná."
 
-#: src/prefs_filtering.c:1207
+#: src/prefs_filtering.c:1209
 msgid "Delete rule"
 msgstr "Odstranit pravidlo"
 
-#: src/prefs_filtering.c:1208
+#: src/prefs_filtering.c:1210
 msgid "Do you really want to delete this rule?"
 msgstr "Opravdu chcete odstranit toto pravidlo?"
 
-#: src/prefs_filtering.c:1226
+#: src/prefs_filtering.c:1228
 msgid "Delete all rules"
 msgstr "Odstranit všechna pravidla"
 
-#: src/prefs_filtering.c:1227
+#: src/prefs_filtering.c:1229
 msgid "Do you really want to delete all the rules?"
 msgstr "Opravdu chcete odstranit všechna pravidla?"
 
-#: src/prefs_filtering.c:1477
+#: src/prefs_filtering.c:1479
 msgid "Filtering rules not saved"
 msgstr "Pravidla filtrování neuložena"
 
-#: src/prefs_filtering.c:1478
+#: src/prefs_filtering.c:1480
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "Seznam pravidel filtrování byl změněn. Přesto zavřít?"
 
-#: src/prefs_filtering.c:1700
+#: src/prefs_filtering.c:1702
 msgid "Move one page up"
 msgstr "Přesunout o stránku výš"
 
-#: src/prefs_filtering.c:1701
+#: src/prefs_filtering.c:1703
 msgid "Move one page down"
 msgstr "Jít o stránku dolů"
 
-#: src/prefs_filtering.c:1856
+#: src/prefs_filtering.c:1858
 msgid "Enable"
 msgstr "Povolit"
 
-#: src/prefs_folder_column.c:212
+#: src/prefs_folder_column.c:211
 msgid "Folder list columns configuration"
 msgstr "Nastavení sloupců zobrazovaných v seznamu složek"
 
-#: src/prefs_folder_column.c:229
+#: src/prefs_folder_column.c:228
 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."
@@ -15566,13 +15590,13 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Skryté sloupce"
 
-#: src/prefs_folder_column.c:290 src/prefs_summaries.c:417
-#: src/prefs_summaries.c:593 src/prefs_summary_column.c:304
+#: src/prefs_folder_column.c:299 src/prefs_summaries.c:416
+#: src/prefs_summaries.c:591 src/prefs_summary_column.c:313
 msgid "Displayed columns"
 msgstr "Zobrazené sloupce"
 
-#: src/prefs_folder_column.c:329 src/prefs_msg_colors.c:494
-#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1077
+#: src/prefs_folder_column.c:332 src/prefs_msg_colors.c:484
+#: src/prefs_summary_column.c:346 src/prefs_toolbar.c:1077
 msgid " Use default "
 msgstr " Použít výchozí "
 
@@ -15716,11 +15740,11 @@ msgstr "Zrušit cache"
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr "Opravdu chcete zahodit lokálně kešovaná data pro tuto složku?"
 
-#: src/prefs_folder_item.c:1824
+#: src/prefs_folder_item.c:1825
 msgid "General"
 msgstr "Obecné"
 
-#: src/prefs_folder_item.c:1903
+#: src/prefs_folder_item.c:1904
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Vlastnosti složky %s"
@@ -15729,7 +15753,7 @@ msgstr "Vlastnosti složky %s"
 msgid "Folder and Message Lists"
 msgstr "Seznam složek a seznam zpráv"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2036
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2038
 msgid "Message"
 msgstr "Text zprávy"
 
@@ -15753,8 +15777,8 @@ msgstr "Použít jiné písmo pro tisk"
 msgid "Message Printing"
 msgstr "Tisk zpráv"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:768
-#: src/prefs_themes.c:389
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:830 src/prefs_summaries.c:766
+#: src/prefs_themes.c:421
 msgid "Display"
 msgstr "Zobrazení"
 
@@ -15762,7 +15786,7 @@ msgstr "Zobrazení"
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/prefs_gtk.c:908 src/toolbar.c:256 src/toolbar.c:514
+#: src/prefs_gtk.c:910 src/toolbar.c:256 src/toolbar.c:517
 msgid "Preferences"
 msgstr "Předvolby"
 
@@ -15790,27 +15814,27 @@ msgstr "Tisknout obrázky"
 msgid "Image Viewer"
 msgstr "Prohlížeč obrázků"
 
-#: src/prefs_logging.c:147 src/prefs_logging.c:254
+#: src/prefs_logging.c:143 src/prefs_logging.c:249
 msgid "Restrict the log window to"
 msgstr "Omezit okno záznamu na"
 
-#: src/prefs_logging.c:159 src/prefs_logging.c:266
+#: src/prefs_logging.c:154 src/prefs_logging.c:260
 msgid "0 to stop logging in the log window"
 msgstr "Zadejte 0 (nula) pro zastavení ukládání záznamů do okna"
 
-#: src/prefs_logging.c:161 src/prefs_logging.c:268
+#: src/prefs_logging.c:156 src/prefs_logging.c:262
 msgid "lines"
 msgstr "řádků"
 
-#: src/prefs_logging.c:171
+#: src/prefs_logging.c:165
 msgid "Filtering/processing log"
 msgstr "Protokol filtrování zpráv a zpracování složek"
 
-#: src/prefs_logging.c:174
+#: src/prefs_logging.c:168
 msgid "Enable logging of filtering/processing rules"
 msgstr "Povolit zaznamenávání pravidel filtrování/zpracování"
 
-#: src/prefs_logging.c:180
+#: src/prefs_logging.c:174
 msgid ""
 "If checked, turns on logging of filtering and processing rules.\n"
 "The log is accessible from 'Tools/Filtering log'.\n"
@@ -15822,47 +15846,47 @@ msgstr ""
 "Upozornění: povolení této volby zpomalí filtrování/zpracování. To může být "
 "kritické při aplikaci mnoha pravidel přes tisíce zpráv."
 
-#: src/prefs_logging.c:187
+#: src/prefs_logging.c:181
 msgid "Log filtering/processing when..."
 msgstr "Zapisovat do protokolu filtrování/zpracování, probíhá-li..."
 
-#: src/prefs_logging.c:191
+#: src/prefs_logging.c:185
 msgid "filtering at incorporation"
 msgstr "filtrování při začlenění zpráv"
 
-#: src/prefs_logging.c:193
+#: src/prefs_logging.c:187
 msgid "pre-processing folders"
 msgstr "zpracování složky před aplikací lokálních pravidel"
 
-#: src/prefs_logging.c:198
+#: src/prefs_logging.c:192
 msgid "manually filtering"
 msgstr "ruční filtrování"
 
-#: src/prefs_logging.c:200
+#: src/prefs_logging.c:194
 msgid "post-processing folders"
 msgstr "zpracování složky po aplikaci lokálních pravidel"
 
-#: src/prefs_logging.c:207
+#: src/prefs_logging.c:201
 msgid "processing folders"
 msgstr "zpracování složky dle lokálních pravidel"
 
-#: src/prefs_logging.c:222
+#: src/prefs_logging.c:217
 msgid "Log level"
 msgstr "Úroveň záznamu"
 
-#: src/prefs_logging.c:231
+#: src/prefs_logging.c:226
 msgid "Low"
 msgstr "Nízká"
 
-#: src/prefs_logging.c:232
+#: src/prefs_logging.c:227
 msgid "Medium"
 msgstr "Střední"
 
-#: src/prefs_logging.c:233
+#: src/prefs_logging.c:228
 msgid "High"
 msgstr "Vysoká"
 
-#: src/prefs_logging.c:238
+#: src/prefs_logging.c:233
 msgid ""
 "Select the level of detail of the logging.\n"
 "Choose Low to see when rules are applied, which conditions match or don't "
@@ -15882,35 +15906,35 @@ msgstr ""
 "nebo přeskočena a proč podmínky odpovídají nebo ne.\n"
 "Upozornění: vyšší úrovně, větší vliv na výkon."
 
-#: src/prefs_logging.c:280
+#: src/prefs_logging.c:274
 msgid "Disk log"
 msgstr "Záznam disku"
 
-#: src/prefs_logging.c:282
+#: src/prefs_logging.c:276
 msgid "Write the following information to disk..."
 msgstr "Zapsat následující informace na disk..."
 
-#: src/prefs_logging.c:290
+#: src/prefs_logging.c:284
 msgid "Warning messages"
 msgstr "Upozorňovací zprávy"
 
-#: src/prefs_logging.c:291
+#: src/prefs_logging.c:285
 msgid "Network protocol messages"
 msgstr "Zprávy síťového protokolu"
 
-#: src/prefs_logging.c:295
+#: src/prefs_logging.c:289
 msgid "Error messages"
 msgstr "Chybové zprávy"
 
-#: src/prefs_logging.c:296
+#: src/prefs_logging.c:290
 msgid "Status messages for filtering/processing log"
 msgstr "Zprávy pro záznam filtrování/zpracování"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:144 src/prefs_other.c:776
 msgid "Other"
 msgstr "Ostatní"
 
-#: src/prefs_logging.c:428
+#: src/prefs_logging.c:411
 msgid "Logging"
 msgstr "Zaznamenávání"
 
@@ -15982,11 +16006,11 @@ msgstr "část těla"
 msgid "whole message"
 msgstr "celá zpráva"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6309
+#: src/prefs_matcher.c:394 src/summaryview.c:6351
 msgid "Marked"
 msgstr "Označené"
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6307
+#: src/prefs_matcher.c:395 src/summaryview.c:6349
 msgid "Deleted"
 msgstr "Odstraněné"
 
@@ -15994,12 +16018,12 @@ msgstr "Odstraněné"
 msgid "Replied"
 msgstr "Odpovězené"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6301
+#: src/prefs_matcher.c:397 src/summaryview.c:6343
 msgid "Forwarded"
 msgstr "Předané"
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6291 src/toolbar.c:512
-#: src/toolbar.c:981 src/toolbar.c:2261
+#: src/prefs_matcher.c:399 src/summaryview.c:6333 src/toolbar.c:515
+#: src/toolbar.c:988 src/toolbar.c:2339
 msgid "Spam"
 msgstr "Spam"
 
@@ -16007,7 +16031,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Má přílohu"
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6327
+#: src/prefs_matcher.c:401 src/summaryview.c:6369
 msgid "Signed"
 msgstr "Podepsané"
 
@@ -16091,7 +16115,7 @@ msgstr "Fráze"
 msgid "Flags"
 msgstr "Příznaky"
 
-#: src/prefs_matcher.c:627 src/prefs_msg_colors.c:410
+#: src/prefs_matcher.c:627 src/prefs_msg_colors.c:399
 msgid "Color labels"
 msgstr "Obarvování zpráv"
 
@@ -16107,11 +16131,11 @@ msgstr "Částečně staženo"
 msgid "External program test"
 msgstr "Test externího programu"
 
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1616 src/prefs_matcher.c:1631
-#: src/prefs_matcher.c:2517
+#: src/prefs_matcher.c:710 src/prefs_matcher.c:1618 src/prefs_matcher.c:1633
+#: src/prefs_matcher.c:2519
 msgctxt "Filtering Matcher Menu"
 msgid "All"
-msgstr "všechny"
+msgstr "Všechny"
 
 #: src/prefs_matcher.c:744
 msgid "Use regexp"
@@ -16133,28 +16157,28 @@ msgstr "vše"
 msgid "of above rules"
 msgstr "výše uvedenými pravidly"
 
-#: src/prefs_matcher.c:1534 src/prefs_matcher.c:1600
+#: src/prefs_matcher.c:1536 src/prefs_matcher.c:1602
 msgid "Search pattern is not set."
 msgstr "Není nastaven vzor pro vyhledávání."
 
-#: src/prefs_matcher.c:1543
+#: src/prefs_matcher.c:1545
 msgid "Test command is not set."
 msgstr "Není nastaven test příkazu."
 
-#: src/prefs_matcher.c:1617
+#: src/prefs_matcher.c:1619
 msgid "all addresses in all headers"
 msgstr "každá adresa ze všech položek záhlaví zprávy"
 
-#: src/prefs_matcher.c:1620
+#: src/prefs_matcher.c:1622
 msgid "any address in any header"
 msgstr "libovolná adresa z libovolného záhlaví zprávy"
 
-#: src/prefs_matcher.c:1622
+#: src/prefs_matcher.c:1624
 #, c-format
 msgid "the address(es) in header '%s'"
-msgstr "adresa ze záhlaví '%s' zprávy"
+msgstr "adresa ze záhlaví zprávy '%s'"
 
-#: src/prefs_matcher.c:1623
+#: src/prefs_matcher.c:1625
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16167,83 +16191,83 @@ msgstr ""
 "Pokud chcete zjišťovat zda %s existuje v rámci celé knihy, vyberte '%s' z "
 "knihy/složky přetáhněte do seznamu."
 
-#: src/prefs_matcher.c:1842
+#: src/prefs_matcher.c:1844
 msgid "Headers part"
 msgstr "Část záhlaví"
 
-#: src/prefs_matcher.c:1846
+#: src/prefs_matcher.c:1848
 msgid "Headers values"
 msgstr "Hodnoty záhlaví"
 
-#: src/prefs_matcher.c:1850
+#: src/prefs_matcher.c:1852
 msgid "Body part"
 msgstr "Část těla"
 
-#: src/prefs_matcher.c:1854
+#: src/prefs_matcher.c:1856
 msgid "Whole message"
 msgstr "Celá zpráva"
 
-#: src/prefs_matcher.c:1967 src/prefs_matcher.c:2009
+#: src/prefs_matcher.c:1969 src/prefs_matcher.c:2011
 msgid "in"
 msgstr "v"
 
-#: src/prefs_matcher.c:1969
+#: src/prefs_matcher.c:1971
 msgid "content is"
 msgstr "obsahuje"
 
-#: src/prefs_matcher.c:1978
+#: src/prefs_matcher.c:1980
 msgid "Age is"
 msgstr "Věk je"
 
-#: src/prefs_matcher.c:1983
+#: src/prefs_matcher.c:1985
 msgid "Flag"
 msgstr "Příznak"
 
-#: src/prefs_matcher.c:1984 src/prefs_matcher.c:1999
+#: src/prefs_matcher.c:1986 src/prefs_matcher.c:2001
 msgid "is"
 msgstr "je"
 
-#: src/prefs_matcher.c:1989
+#: src/prefs_matcher.c:1991
 msgid "Name:"
-msgstr "Jméno: "
+msgstr "Jméno:"
 
-#: src/prefs_matcher.c:1998
+#: src/prefs_matcher.c:2000
 msgid "Label"
 msgstr "Označení"
 
-#: src/prefs_matcher.c:2004
+#: src/prefs_matcher.c:2006
 msgid "Value:"
 msgstr "Hodnota:"
 
-#: src/prefs_matcher.c:2019
+#: src/prefs_matcher.c:2021
 msgid "Score is"
 msgstr "Skóre je"
 
-#: src/prefs_matcher.c:2020
+#: src/prefs_matcher.c:2022
 msgid "points"
 msgstr "body"
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2032
 msgid "Size is"
 msgstr "Velikost je"
 
-#: src/prefs_matcher.c:2035
+#: src/prefs_matcher.c:2037
 msgid "Scope:"
 msgstr "Rozsah:"
 
-#: src/prefs_matcher.c:2037
+#: src/prefs_matcher.c:2039
 msgid "tags"
 msgstr "značky"
 
-#: src/prefs_matcher.c:2042
+#: src/prefs_matcher.c:2044
 msgid "type is"
 msgstr "typ je"
 
-#: src/prefs_matcher.c:2046
+#: src/prefs_matcher.c:2048
 msgid "Program returns"
 msgstr "Návratové hodnoty programu"
 
-#: src/prefs_matcher.c:2116
+#: src/prefs_matcher.c:2118
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -16251,11 +16275,11 @@ msgstr ""
 "Záznam nebyl uložen.\n"
 "Chcete přesto okno zavřít?"
 
-#: src/prefs_matcher.c:2182
+#: src/prefs_matcher.c:2184
 msgid "Match Type: 'Test'"
 msgstr "Typ podmínky: 'Test'"
 
-#: src/prefs_matcher.c:2183
+#: src/prefs_matcher.c:2185
 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"
@@ -16267,7 +16291,7 @@ msgstr ""
 "\n"
 "Následující symboly mohou být použity:"
 
-#: src/prefs_matcher.c:2282
+#: src/prefs_matcher.c:2284
 msgid "Current condition rules"
 msgstr "Aktuální pravidla podmínky"
 
@@ -16351,7 +16375,7 @@ msgstr "Považovat tyto znaky za znaky pro citaci: "
 msgid "Text Options"
 msgstr "Text"
 
-#: src/prefs_migration.c:95
+#: src/prefs_migration.c:50
 #, c-format
 msgid ""
 "Your Claws Mail configuration is from a newer version than the version which "
@@ -16371,101 +16395,101 @@ msgstr ""
 "\n"
 "Chcete nyní program ukončit?"
 
-#: src/prefs_migration.c:104
+#: src/prefs_migration.c:59
 msgid "Configuration warning"
 msgstr "Konfigurace varování"
 
-#: src/prefs_msg_colors.c:147
+#: src/prefs_msg_colors.c:146
 msgid "Message view"
 msgstr "Náhled zprávy"
 
-#: src/prefs_msg_colors.c:154
+#: src/prefs_msg_colors.c:153
 msgid "Enable coloration of message text"
 msgstr "Povolit obarvování textu zprávy"
 
-#: src/prefs_msg_colors.c:162
+#: src/prefs_msg_colors.c:161
 msgid "Quote"
 msgstr "Citace"
 
-#: src/prefs_msg_colors.c:174
+#: src/prefs_msg_colors.c:173
 msgid "Cycle quote colors"
 msgstr "Rotovat barvy citací"
 
-#: src/prefs_msg_colors.c:178
+#: src/prefs_msg_colors.c:177
 msgid "If there are more than 3 quote levels, the colors will be reused"
 msgstr ""
 "Pokud budou více než 3 úrovně citace, znovu se použijí barvy od první úrovně"
 
-#: src/prefs_msg_colors.c:184
+#: src/prefs_msg_colors.c:183
 msgid "1st Level"
 msgstr "1. úroveň"
 
-#: src/prefs_msg_colors.c:190 src/prefs_msg_colors.c:216
-#: src/prefs_msg_colors.c:242
+#: src/prefs_msg_colors.c:189 src/prefs_msg_colors.c:214
+#: src/prefs_msg_colors.c:239
 msgid "Text"
 msgstr "Písmo"
 
-#: src/prefs_msg_colors.c:204
+#: src/prefs_msg_colors.c:202
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text"
 msgstr "Vybrat barvu písma pro 1. úroveň citace"
 
-#: src/prefs_msg_colors.c:210
+#: src/prefs_msg_colors.c:208
 msgid "2nd Level"
 msgstr "2. úroveň"
 
-#: src/prefs_msg_colors.c:230
+#: src/prefs_msg_colors.c:227
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text"
 msgstr "Vybrat barvu písma pro 2. úroveň citace"
 
-#: src/prefs_msg_colors.c:236
+#: src/prefs_msg_colors.c:233
 msgid "3rd Level"
 msgstr "3. úroveň"
 
-#: src/prefs_msg_colors.c:256
+#: src/prefs_msg_colors.c:252
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text"
 msgstr "Vybrat barvu písma pro 3. úroveň citace"
 
-#: src/prefs_msg_colors.c:263
+#: src/prefs_msg_colors.c:259
 msgid "Enable coloration of text background"
 msgstr "Povolit obarvování pozadí textu"
 
-#: src/prefs_msg_colors.c:279
+#: src/prefs_msg_colors.c:274
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text background"
 msgstr "Vybrat barvu pozadí pro 1. úroveň citace"
 
-#: src/prefs_msg_colors.c:300
+#: src/prefs_msg_colors.c:294
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text background"
 msgstr "Vybrat barvu pozadí pro 2. úroveň citace"
 
-#: src/prefs_msg_colors.c:321
+#: src/prefs_msg_colors.c:314
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text background"
 msgstr "Vybrat barvu pozadí pro 3. úroveň citace"
 
-#: src/prefs_msg_colors.c:341
+#: src/prefs_msg_colors.c:333
 msgctxt "Tooltip"
 msgid "Pick color for links"
 msgstr "Vybrat barvu pro odkazy"
 
-#: src/prefs_msg_colors.c:343
+#: src/prefs_msg_colors.c:335
 msgid "URI link"
 msgstr "URI odkaz"
 
-#: src/prefs_msg_colors.c:360
+#: src/prefs_msg_colors.c:351
 msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Vybrat barvu pro podpisy"
 
-#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:365
+#: src/prefs_msg_colors.c:358 src/prefs_summaries.c:365
 msgid "Folder list"
 msgstr "Seznam složek"
 
-#: src/prefs_msg_colors.c:380
+#: src/prefs_msg_colors.c:370
 msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"
@@ -16473,92 +16497,92 @@ msgstr ""
 "Barva pro cílovou složku. Cílová složka je označována při vypnuté volbě "
 "'Přesun a mazání provádět ihned'"
 
-#: src/prefs_msg_colors.c:384
+#: src/prefs_msg_colors.c:374
 msgid "Target folder"
 msgstr "Cílová složka"
 
-#: src/prefs_msg_colors.c:399
+#: src/prefs_msg_colors.c:388
 msgid "Pick color for folders containing new messages"
 msgstr "Barva pro složky obsahující nové zprávy"
 
-#: src/prefs_msg_colors.c:401
+#: src/prefs_msg_colors.c:390
 msgid "Folder containing new messages"
 msgstr "Složka obsahující nové zprávy"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:428 src/prefs_msg_colors.c:459
+#: src/prefs_msg_colors.c:417 src/prefs_msg_colors.c:449
 #, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
-msgstr "Vybrat barvu, která bude dostupná pod číslem %d"
+msgstr "Vybrat barvu, která bude dostupná pod 'barva %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
+#: src/prefs_msg_colors.c:421 src/prefs_msg_colors.c:453
 #, c-format
 msgid "Set label for 'color %d'"
-msgstr "Název barvy, která bude dostupná pod číslem %d"
+msgstr "Název barvy, která bude dostupná pod 'barva %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:592
+#: src/prefs_msg_colors.c:582
 #, c-format
 msgctxt "Dialog title"
 msgid "Pick color for 'color %d'"
-msgstr "Barva, která bude dostupná pod číslem %d"
+msgstr "Barva, která bude dostupná jako 'barva %d'"
 
-#: src/prefs_msg_colors.c:600
+#: src/prefs_msg_colors.c:590
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text"
 msgstr "Barva písma pro 1. úroveň citace"
 
-#: src/prefs_msg_colors.c:603
+#: src/prefs_msg_colors.c:593
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text"
 msgstr "Barva písma pro 2. úroveň citace"
 
-#: src/prefs_msg_colors.c:606
+#: src/prefs_msg_colors.c:596
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text"
 msgstr "Barva písma pro 3. úroveň citace"
 
-#: src/prefs_msg_colors.c:609
+#: src/prefs_msg_colors.c:599
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text background"
 msgstr "Barva pozadí pro 1. úroveň citace"
 
-#: src/prefs_msg_colors.c:612
+#: src/prefs_msg_colors.c:602
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text background"
 msgstr "Barva pozadí pro 2. úroveň citace"
 
-#: src/prefs_msg_colors.c:615
+#: src/prefs_msg_colors.c:605
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text background"
 msgstr "Barva pozadí pro 3. úroveň citace"
 
-#: src/prefs_msg_colors.c:618
+#: src/prefs_msg_colors.c:608
 msgctxt "Dialog title"
 msgid "Pick color for links"
 msgstr "Barva pro odkazy"
 
-#: src/prefs_msg_colors.c:621
+#: src/prefs_msg_colors.c:611
 msgctxt "Dialog title"
 msgid "Pick color for target folder"
 msgstr "Barva pro cílovou složku"
 
-#: src/prefs_msg_colors.c:624
+#: src/prefs_msg_colors.c:614
 msgctxt "Dialog title"
 msgid "Pick color for signatures"
 msgstr "Barva pro podpisy"
 
-#: src/prefs_msg_colors.c:627
+#: src/prefs_msg_colors.c:617
 msgctxt "Dialog title"
 msgid "Pick color for folder"
 msgstr "Barva pro složku"
 
-#: src/prefs_msg_colors.c:840
+#: src/prefs_msg_colors.c:831
 msgid "Colors"
 msgstr "Barvy"
 
@@ -16644,21 +16668,21 @@ msgstr "Rychleji"
 msgid "Socket I/O timeout"
 msgstr "Časový limit pro V/V operace se socketem"
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:583
 msgid "Ask before emptying trash"
 msgstr "Dotázat se před vymazáním koše"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:585
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 "Dotázat se na filtrovací pravidla pro specifické účty při manuálním "
 "filtrování"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:590
 msgid "Use secure file deletion if possible"
 msgstr "Použít bezpečné smazání souboru, když je to možné"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:594
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16666,7 +16690,7 @@ msgstr ""
 "Použít bezpečné smazání souboru, když je to možné\n"
 "(program 'shred' není dostupný)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:599
 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."
@@ -16674,19 +16698,19 @@ msgstr ""
 "Použít program 'shred' pro přepsání souboru náhodnými daty před smazáním. "
 "Zpomalí mazání. Ujistěte se jste přečetl manuál shredu pro výstrahu."
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:603
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synchronizovat offline složky jakmile to bude možné"
 
-#: src/prefs_other.c:607
+#: src/prefs_other.c:606
 msgid "Master passphrase"
 msgstr "Hlavní heslo"
 
-#: src/prefs_other.c:610
+#: src/prefs_other.c:609
 msgid "Use a master passphrase"
 msgstr "Používat hlavní heslo"
 
-#: src/prefs_other.c:613
+#: src/prefs_other.c:612
 msgid ""
 "If checked, your saved account passwords will be protected by a master "
 "passphrase. If no master passphrase is set, you will be prompted to set one."
@@ -16694,11 +16718,11 @@ msgstr ""
 "Pokud zaškrtnete, uložená hesla budou chráněna hlavním heslem. Pokud není "
 "nastaveno, bude vyzváni k jeho nastavení."
 
-#: src/prefs_other.c:618
+#: src/prefs_other.c:617
 msgid "Change master passphrase"
 msgstr "Změňte hlavní heslo"
 
-#: src/prefs_other.c:778
+#: src/prefs_other.c:777
 msgid "Miscellaneous"
 msgstr "Různé"
 
@@ -16722,55 +16746,55 @@ msgstr "Automatický příjem pošty"
 msgid "Check for new mail every"
 msgstr "Přijímat poštu každých"
 
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:212
 msgid "Check for new mail on start-up"
 msgstr "Přijmout poštu po spuštění"
 
-#: src/prefs_receive.c:218
+#: src/prefs_receive.c:215
 msgid "Dialogs"
 msgstr "Dialogy"
 
-#: src/prefs_receive.c:220
+#: src/prefs_receive.c:217
 msgid "Show receive dialog"
 msgstr "Zobrazit dialogové okno o přijetí"
 
-#: src/prefs_receive.c:230
+#: src/prefs_receive.c:227
 msgid "Only on manual receiving"
 msgstr "Pouze při ručním příjmu"
 
-#: src/prefs_receive.c:241
+#: src/prefs_receive.c:238
 msgid "Close receive dialog when finished"
 msgstr "Zavřít po dokončení"
 
-#: src/prefs_receive.c:244
+#: src/prefs_receive.c:241
 msgid "Don't popup error dialog on receive error"
 msgstr "Nezobrazovat dialog o chybě v příjmu zpráv"
 
-#: src/prefs_receive.c:247
+#: src/prefs_receive.c:244
 msgid "After receiving new mail"
 msgstr "Po přijetí nových zpráv"
 
-#: src/prefs_receive.c:249
+#: src/prefs_receive.c:246
 msgid "Go to Inbox"
 msgstr "Přejít do složky \"Doručená pošta\""
 
-#: src/prefs_receive.c:251
+#: src/prefs_receive.c:248
 msgid "Update all local folders"
 msgstr "Aktualizovat všechny lokální složky"
 
-#: src/prefs_receive.c:253
+#: src/prefs_receive.c:250
 msgid "Run command"
 msgstr "Spustit příkaz"
 
-#: src/prefs_receive.c:258
+#: src/prefs_receive.c:255
 msgid "after automatic check"
 msgstr "po automatickém příjmu"
 
-#: src/prefs_receive.c:260
+#: src/prefs_receive.c:257
 msgid "after manual check"
 msgstr "po ručním příjmu"
 
-#: src/prefs_receive.c:268
+#: src/prefs_receive.c:265
 #, c-format
 msgid ""
 "Command to execute:\n"
@@ -16779,39 +16803,43 @@ msgstr ""
 "Příkaz:\n"
 "(použijte %d jako počet nových zpráv)"
 
-#: src/prefs_receive.c:411 src/prefs_send.c:371
+#: src/prefs_receive.c:408 src/prefs_send.c:415
 msgid "Mail Handling"
 msgstr "Zpracování pošty"
 
-#: src/prefs_receive.c:412
+#: src/prefs_receive.c:409
 msgid "Receiving"
 msgstr "Příjem zpráv"
 
-#: src/prefs_send.c:159
+#: src/prefs_send.c:172
 msgid "Save sent messages"
 msgstr "Ukládat odeslané zprávy"
 
-#: src/prefs_send.c:162
+#: src/prefs_send.c:175
 msgid "Never send Return Receipts"
 msgstr "Nikdy neodesílat potvrzení o doručení"
 
-#: src/prefs_send.c:180
+#: src/prefs_send.c:193
 msgid "Confirm before sending queued messages"
 msgstr "Potvrzení před odesláním pozdržených zpráv"
 
-#: src/prefs_send.c:183
+#: src/prefs_send.c:196
 msgid "Show send dialog"
 msgstr "Zobrazit dialog o odesílání"
 
-#: src/prefs_send.c:186
+#: src/prefs_send.c:199
 msgid "Warn when Subject is empty"
 msgstr "Varovat, když je Předmět prázdný"
 
-#: src/prefs_send.c:193
+#: src/prefs_send.c:205
+msgid "Warn when sending to more recipients than:"
+msgstr "Varovat při vložení souboru většího než:"
+
+#: src/prefs_send.c:221
 msgid "Outgoing encoding"
 msgstr "Kódování znaků"
 
-#: src/prefs_send.c:218
+#: src/prefs_send.c:246
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
@@ -16819,131 +16847,131 @@ msgstr ""
 "Pokud je zvoleno 'Autodetekce', bude použita optimální znaková sada pro "
 "nastavené locale"
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:263
 msgid "7bit ASCII (US-ASCII)"
 msgstr "7bitové ASCII (US-ASCII)"
 
-#: src/prefs_send.c:236
+#: src/prefs_send.c:264
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_send.c:238
+#: src/prefs_send.c:266
 msgid "Western European (ISO-8859-1)"
 msgstr "Západní Evropa (ISO-8859-1)"
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:267
 msgid "Western European (ISO-8859-15)"
 msgstr "Západní Evropa(ISO-8859-15)"
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:269
 msgid "Central European (ISO-8859-2)"
 msgstr "Střední Evropa (ISO-8859-2)"
 
-#: src/prefs_send.c:243
+#: src/prefs_send.c:271
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltí (ISO-8859-13)"
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:272
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltí (ISO-8859-4)"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:274
 msgid "Greek (ISO-8859-7)"
 msgstr "Řečtina (ISO-8859-7)"
 
-#: src/prefs_send.c:248
+#: src/prefs_send.c:276
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrejština (ISO-8859-8)"
 
-#: src/prefs_send.c:249
+#: src/prefs_send.c:277
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrejština (Windows-1255)"
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:279
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabština (ISO-8859-6)"
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:280
 msgid "Arabic (Windows-1256)"
 msgstr "Arabština (Windows-1256)"
 
-#: src/prefs_send.c:254
+#: src/prefs_send.c:282
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turečtina (ISO-8859-9)"
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:284
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Azbuka (ISO-8859-5)"
 
-#: src/prefs_send.c:257
+#: src/prefs_send.c:285
 msgid "Cyrillic (KOI8-R)"
 msgstr "Azbuka (KOI8-R)"
 
-#: src/prefs_send.c:258
+#: src/prefs_send.c:286
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr "Azbuka (X-MAC-CYRILLIC)"
 
-#: src/prefs_send.c:259
+#: src/prefs_send.c:287
 msgid "Cyrillic (KOI8-U)"
 msgstr "Azbuka (KOI8-U)"
 
-#: src/prefs_send.c:260
+#: src/prefs_send.c:288
 msgid "Cyrillic (Windows-1251)"
 msgstr "Azbuka (Windows-1251)"
 
-#: src/prefs_send.c:262
+#: src/prefs_send.c:290
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonština (ISO-2022-JP)"
 
-#: src/prefs_send.c:264
+#: src/prefs_send.c:292
 msgid "Japanese (EUC-JP)"
 msgstr "Japonština (EUC-JP)"
 
-#: src/prefs_send.c:265
+#: src/prefs_send.c:293
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonština (Shift_JIS)"
 
-#: src/prefs_send.c:268
+#: src/prefs_send.c:296
 msgid "Simplified Chinese (GB18030)"
 msgstr "Zjednodušená čínština (GB18030)"
 
-#: src/prefs_send.c:269
+#: src/prefs_send.c:297
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínština (GB2312)"
 
-#: src/prefs_send.c:270
+#: src/prefs_send.c:298
 msgid "Simplified Chinese (GBK)"
 msgstr "Zjednodušená čínština (GBK)"
 
-#: src/prefs_send.c:271
+#: src/prefs_send.c:299
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradiční čínština (Big5)"
 
-#: src/prefs_send.c:273
+#: src/prefs_send.c:301
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradiční čínština (EUC-TW)"
 
-#: src/prefs_send.c:274
+#: src/prefs_send.c:302
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínština (ISO-2022-CN)"
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:305
 msgid "Korean (EUC-KR)"
 msgstr "Korejština (EUC-KR)"
 
-#: src/prefs_send.c:279
+#: src/prefs_send.c:307
 msgid "Thai (TIS-620)"
 msgstr "Thajština (TIS-620)"
 
-#: src/prefs_send.c:280
+#: src/prefs_send.c:308
 msgid "Thai (Windows-874)"
 msgstr "Thajština (Windows-874)"
 
-#: src/prefs_send.c:284
+#: src/prefs_send.c:312
 msgid "Transfer encoding"
 msgstr "Kódování přenosu"
 
-#: src/prefs_send.c:295
+#: src/prefs_send.c:323
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
@@ -16951,56 +16979,56 @@ msgstr ""
 "Určete kódování (Content-Transfer-Encoding), které bude použito, pokud "
 "zpráva obsahuje znaky neobsažené v ASCII"
 
-#: src/prefs_send.c:372 src/send_message.c:501 src/send_message.c:505
+#: src/prefs_send.c:416 src/send_message.c:501 src/send_message.c:505
 #: src/send_message.c:510
 msgid "Sending"
 msgstr "Odesílání"
 
-#: src/prefs_spelling.c:81
+#: src/prefs_spelling.c:80
 msgid "Pick color for misspelled word"
 msgstr "Zvolte barvu pro špatně napsaná slova"
 
-#: src/prefs_spelling.c:129
+#: src/prefs_spelling.c:128
 msgid "Enable spell checker"
 msgstr "Povolit kontrolu pravopisu"
 
-#: src/prefs_spelling.c:134
+#: src/prefs_spelling.c:133
 msgid "Enable alternate dictionary"
 msgstr "Povolit alternativní slovník"
 
-#: src/prefs_spelling.c:139
+#: src/prefs_spelling.c:138
 msgid "Faster switching with last used dictionary"
 msgstr "Umožňuje rychlejší přepínání na předchozí slovník"
 
-#: src/prefs_spelling.c:141
+#: src/prefs_spelling.c:140
 msgid "Automatic spell checking"
 msgstr "Automatická kontrola pravopisu"
 
-#: src/prefs_spelling.c:149
+#: src/prefs_spelling.c:148
 msgid "Re-check message when changing dictionary"
 msgstr "Znovu zkontrolovat zprávu při změně slovníku"
 
-#: src/prefs_spelling.c:153
+#: src/prefs_spelling.c:152
 msgid "Dictionary"
 msgstr "Slovník"
 
-#: src/prefs_spelling.c:190
+#: src/prefs_spelling.c:187
 msgid "Check with both dictionaries"
 msgstr "Kontrolovat oběma slovníky"
 
-#: src/prefs_spelling.c:197
+#: src/prefs_spelling.c:194
 msgid "Get more dictionaries..."
 msgstr "Získat více slovníků..."
 
-#: src/prefs_spelling.c:207
+#: src/prefs_spelling.c:204
 msgid "Misspelled word color"
 msgstr "Barva špatně napsaných slov"
 
-#: src/prefs_spelling.c:220
+#: src/prefs_spelling.c:216
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Barva pro slova s chybou. Je-li vybrána černá, budou slova podtrhována"
 
-#: src/prefs_spelling.c:337
+#: src/prefs_spelling.c:333
 msgid "Spell Checking"
 msgstr "Kontrola pravopisu"
 
@@ -17054,7 +17082,7 @@ msgstr "minuty číselně"
 
 #: src/prefs_summaries.c:172
 msgid "either AM or PM"
-msgstr "AM nebo PM"
+msgstr "buď AM nebo PM"
 
 #: src/prefs_summaries.c:173
 msgid "the second as a decimal number"
@@ -17081,7 +17109,7 @@ msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, název nebo zkratka"
 
 #: src/prefs_summaries.c:199 src/prefs_summaries.c:247
-#: src/prefs_summaries.c:567
+#: src/prefs_summaries.c:565
 msgid "Date format"
 msgstr "Formát datumu"
 
@@ -17113,79 +17141,79 @@ msgstr "Po startu otevřít naposledy otevřenou složku"
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Zkrátit názvy diskuzních skupin delší než"
 
-#: src/prefs_summaries.c:409
+#: src/prefs_summaries.c:408
 msgid "letters"
 msgstr "dopisy(ů)"
 
-#: src/prefs_summaries.c:427
+#: src/prefs_summaries.c:426
 msgid "Message list"
 msgstr "Seznam zpráv"
 
-#: src/prefs_summaries.c:433
+#: src/prefs_summaries.c:432
 msgid "Sort new folders by"
 msgstr "Řadit nové složky podle"
 
-#: src/prefs_summaries.c:441 src/prefs_summary_column.c:86
+#: src/prefs_summaries.c:440 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr "Číslo"
 
-#: src/prefs_summaries.c:444
+#: src/prefs_summaries.c:443
 msgid "Thread date"
 msgstr "Datum vlákna"
 
-#: src/prefs_summaries.c:455
+#: src/prefs_summaries.c:454
 msgid "Don't sort"
 msgstr "Neřadit"
 
-#: src/prefs_summaries.c:472
+#: src/prefs_summaries.c:471
 msgid "Set default selection when entering a folder"
 msgstr "Nastavit výchozí výběr při vstupu do složky"
 
-#: src/prefs_summaries.c:485
+#: src/prefs_summaries.c:484
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Zobrazit dotaz \"nejsou nepřečtené (nebo nové) zprávy\""
 
-#: src/prefs_summaries.c:495
+#: src/prefs_summaries.c:494
 msgid "Assume 'Yes'"
 msgstr "Předpokládat 'Ano'"
 
-#: src/prefs_summaries.c:496
+#: src/prefs_summaries.c:495
 msgid "Assume 'No'"
 msgstr "Předpokládat 'Ne'"
 
-#: src/prefs_summaries.c:501
+#: src/prefs_summaries.c:500
 msgid "Open message when selected"
 msgstr "Zobrazit zprávu ihned po vybrání"
 
-#: src/prefs_summaries.c:506
+#: src/prefs_summaries.c:505
 msgid "When opening a folder"
 msgstr "Při vstupu do složky"
 
-#: src/prefs_summaries.c:508
+#: src/prefs_summaries.c:507
 msgid "When displaying search results"
 msgstr "Při zobrazení výsledku hledání"
 
-#: src/prefs_summaries.c:510
+#: src/prefs_summaries.c:509
 msgid "When selecting next or previous message using shortcuts"
 msgstr "Při vybrání následující nebo předchozí zprávy pomocí klávesové zkratky"
 
-#: src/prefs_summaries.c:512
+#: src/prefs_summaries.c:511
 msgid "When deleting or moving messages"
 msgstr "Při odstraňování  nebo přesouvání zpráv"
 
-#: src/prefs_summaries.c:514
+#: src/prefs_summaries.c:513
 msgid "When using directional keys"
 msgstr "Při použití navigačních kláves"
 
-#: src/prefs_summaries.c:518
+#: src/prefs_summaries.c:517
 msgid "Thread using subject in addition to standard headers"
 msgstr "Vlákno z předmětu jako přídavek ke standardních záhlavím"
 
-#: src/prefs_summaries.c:522
+#: src/prefs_summaries.c:521
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Přesun a mazání provádět ihned"
 
-#: src/prefs_summaries.c:524
+#: src/prefs_summaries.c:523
 msgid ""
 "Defers moving, copying and deleting of messages until you choose 'Tools/"
 "Execute'"
@@ -17193,39 +17221,39 @@ msgstr ""
 "Odkládá přesouvání, kopírování a mazání zpráv do okamžiku, kdy použijete "
 "nabídku 'Nástroje/Provést odložené operace'"
 
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:526
 msgid "Mark message as read"
 msgstr "Označit zprávu za přečtenou"
 
-#: src/prefs_summaries.c:530
+#: src/prefs_summaries.c:529
 msgid "when selected, after"
 msgstr "když vybrána, potom"
 
-#: src/prefs_summaries.c:550
+#: src/prefs_summaries.c:548
 msgid "only when opened in a new window, or replied to"
 msgstr "jen při otevření v novém okně nebo odpovědi na ni"
 
-#: src/prefs_summaries.c:557
+#: src/prefs_summaries.c:555
 msgid "Display sender using address book"
 msgstr "Zobrazit odesílatele pomocí knihy adres"
 
-#: src/prefs_summaries.c:561
+#: src/prefs_summaries.c:559
 msgid "Show tooltips"
 msgstr "Zobrazovat tipy"
 
-#: src/prefs_summaries.c:587
+#: src/prefs_summaries.c:585
 msgid "Date format help"
 msgstr "Nápověda k formátu datumu"
 
-#: src/prefs_summaries.c:605
+#: src/prefs_summaries.c:603
 msgid "Confirm before marking all messages in a folder as read"
 msgstr "Potvrzení před označením všech zpráv ve složce jako přečtené"
 
-#: src/prefs_summaries.c:608
+#: src/prefs_summaries.c:606
 msgid "Translate header names"
 msgstr "Překládat záhlaví"
 
-#: src/prefs_summaries.c:610
+#: src/prefs_summaries.c:608
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
@@ -17233,15 +17261,15 @@ msgstr ""
 "Standardní záhlaví zpráv (jako 'From:', 'Subject:') budou překládána do "
 "vašeho jazyka."
 
-#: src/prefs_summaries.c:769
+#: src/prefs_summaries.c:767
 msgid "Summaries"
 msgstr "Seznamy"
 
-#: src/prefs_summary_column.c:226
+#: src/prefs_summary_column.c:225
 msgid "Message list columns configuration"
 msgstr "Nastavení sloupců zobrazovaných v seznamu zpráv"
 
-#: src/prefs_summary_column.c:243
+#: src/prefs_summary_column.c:242
 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."
@@ -17339,86 +17367,86 @@ msgstr "Seznam šablon neuložen"
 msgid "The templates list has been modified. Close anyway?"
 msgstr "Seznam šablon změněn. Chcete přesto zavřít?"
 
-#: src/prefs_template.c:758
+#: src/prefs_template.c:760
 msgid "The template's name is not set."
 msgstr "Název šablony není nastaven."
 
-#: src/prefs_template.c:801
+#: src/prefs_template.c:803
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "Pole \"Od\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:807
+#: src/prefs_template.c:809
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "Pole \"Komu\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:813
+#: src/prefs_template.c:815
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "Pole \"Kopie\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:819
+#: src/prefs_template.c:821
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "Pole \"Skrytá kopie\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:825
+#: src/prefs_template.c:827
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr "Pole \"Komu\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:831
+#: src/prefs_template.c:833
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "Pole \"Předmět\" šablony je neplatné."
 
-#: src/prefs_template.c:902
+#: src/prefs_template.c:904
 msgid "Delete template"
 msgstr "Odstranit šablonu"
 
-#: src/prefs_template.c:903
+#: src/prefs_template.c:905
 msgid "Do you really want to delete this template?"
 msgstr "Opravdu chcete odstranit tuto šablonu?"
 
-#: src/prefs_template.c:915
+#: src/prefs_template.c:917
 msgid "Delete all templates"
 msgstr "Odstranit všechny šablony"
 
-#: src/prefs_template.c:916
+#: src/prefs_template.c:918
 msgid "Do you really want to delete all the templates?"
 msgstr "Opravdu chcete odstranit všechny šablony?"
 
-#: src/prefs_template.c:1231
+#: src/prefs_template.c:1233
 msgid "Current templates"
 msgstr "Aktuální šablony"
 
-#: src/prefs_template.c:1259
+#: src/prefs_template.c:1261
 msgid "Template"
 msgstr "Šablona"
 
-#: src/prefs_themes.c:368 src/prefs_themes.c:804
+#: src/prefs_themes.c:400 src/prefs_themes.c:841
 msgid "Default internal theme"
 msgstr "Výchozí vnitřní motiv"
 
-#: src/prefs_themes.c:390
+#: src/prefs_themes.c:422
 msgid "Themes"
 msgstr "Motivy"
 
-#: src/prefs_themes.c:464
+#: src/prefs_themes.c:501
 msgid "Only root can remove system themes"
 msgstr "Pouze root může odstranit systémové motivy"
 
-#: src/prefs_themes.c:467
+#: src/prefs_themes.c:504
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "Odstranit systémový motiv '%s'"
 
-#: src/prefs_themes.c:470
+#: src/prefs_themes.c:507
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Odstranit motiv '%s'"
 
-#: src/prefs_themes.c:476
+#: src/prefs_themes.c:513
 msgid "Are you sure you want to remove this theme?"
 msgstr "Opravdu chcete odstranit tento motiv?"
 
-#: src/prefs_themes.c:486
+#: src/prefs_themes.c:523
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17427,24 +17455,24 @@ msgstr ""
 "Soubor %s selhal\n"
 "během odstraňování motivu."
 
-#: src/prefs_themes.c:490
+#: src/prefs_themes.c:527
 msgid "Removing theme directory failed."
 msgstr "Odstraňování složky motivu selhalo."
 
-#: src/prefs_themes.c:493
+#: src/prefs_themes.c:530
 msgid "Theme removed successfully"
 msgstr "Motiv byl úspěšně odstraněn"
 
-#: src/prefs_themes.c:513
+#: src/prefs_themes.c:550
 msgid "Select theme folder"
 msgstr "Vyberte složku s motivem"
 
-#: src/prefs_themes.c:528
+#: src/prefs_themes.c:565
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Instalovat motiv '%s'"
 
-#: src/prefs_themes.c:531
+#: src/prefs_themes.c:568
 msgid ""
 "This folder doesn't seem to be a theme folder.\n"
 "Install anyway?"
@@ -17452,15 +17480,15 @@ msgstr ""
 "Tato složka zřejmě neobsahuje motiv.\n"
 "Přesto nainstalovat?"
 
-#: src/prefs_themes.c:538
+#: src/prefs_themes.c:575
 msgid "Do you want to install theme for all users?"
 msgstr "Chcete instalovat motiv pro všechny uživatele?"
 
-#: src/prefs_themes.c:558
+#: src/prefs_themes.c:595
 msgid "Theme exists"
 msgstr "Motiv existuje"
 
-#: src/prefs_themes.c:559
+#: src/prefs_themes.c:596
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -17472,25 +17500,25 @@ msgstr ""
 "\n"
 "Chcete ho nahradit?"
 
-#: src/prefs_themes.c:565
+#: src/prefs_themes.c:602
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "Nepodařilo se odstranit starý motiv v %s."
 
-#: src/prefs_themes.c:573
+#: src/prefs_themes.c:610
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "Nepodařilo se vytvořit cílovou složku %s."
 
-#: src/prefs_themes.c:586
+#: src/prefs_themes.c:623
 msgid "Theme installed successfully."
 msgstr "Motiv byl úspěšně nainstalován."
 
-#: src/prefs_themes.c:593
+#: src/prefs_themes.c:630
 msgid "Failed installing theme"
 msgstr "Instalace motivu se nezdařila"
 
-#: src/prefs_themes.c:596
+#: src/prefs_themes.c:633
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17499,70 +17527,70 @@ msgstr ""
 "Soubor %s selhal\n"
 "během instalace motivu."
 
-#: src/prefs_themes.c:766
+#: src/prefs_themes.c:803
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d dostupných motivů (uživatelské: %d, systémové: %d, vnitřní: 1)"
 
-#: src/prefs_themes.c:807
+#: src/prefs_themes.c:844
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "Vnitřní motiv má %d ikon"
 
-#: src/prefs_themes.c:813
+#: src/prefs_themes.c:850
 msgid "No info file available for this theme"
 msgstr "Pro tento motiv není dostupná žádná informace"
 
-#: src/prefs_themes.c:831
+#: src/prefs_themes.c:868
 msgid "Error: couldn't get theme status"
 msgstr "Chyba: nelze získat stav motivu"
 
-#: src/prefs_themes.c:861
+#: src/prefs_themes.c:898
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d souborů (%d ikon), velikost: %s"
 
-#: src/prefs_themes.c:919
+#: src/prefs_themes.c:956
 msgid "Selector"
 msgstr "Výběr"
 
-#: src/prefs_themes.c:930
+#: src/prefs_themes.c:967
 msgid "Install new..."
 msgstr "Instalovat nový..."
 
-#: src/prefs_themes.c:935
+#: src/prefs_themes.c:972
 msgid "Get more..."
 msgstr "Získat další..."
 
-#: src/prefs_themes.c:946
+#: src/prefs_themes.c:983
 msgid "Information"
 msgstr "Informace"
 
-#: src/prefs_themes.c:960
+#: src/prefs_themes.c:997
 msgid "Author: "
 msgstr "Autor: "
 
-#: src/prefs_themes.c:968
+#: src/prefs_themes.c:1005
 msgid "URL:"
 msgstr "URL:"
 
-#: src/prefs_themes.c:1010
+#: src/prefs_themes.c:1047
 msgid "Preview"
 msgstr "Náhled"
 
-#: src/prefs_themes.c:1066
+#: src/prefs_themes.c:1103
 msgid "SVG rendering"
 msgstr "SVG renderování"
 
-#: src/prefs_themes.c:1073
+#: src/prefs_themes.c:1110
 msgid "Enable alpha channel"
 msgstr "Povolit alfa kanál"
 
-#: src/prefs_themes.c:1074
+#: src/prefs_themes.c:1111
 msgid "Force scaling"
 msgstr "Přesto změnit velikost"
 
-#: src/prefs_themes.c:1080
+#: src/prefs_themes.c:1117
 msgid "Pixels per inch (PPI)"
 msgstr "Pixelů na inch (PPI)"
 
@@ -17598,7 +17626,7 @@ msgstr "Vnitřní funkce"
 msgid "User Action"
 msgstr "Uživatelské akce"
 
-#: src/prefs_toolbar.c:958 src/toolbar.c:277
+#: src/prefs_toolbar.c:958 src/toolbar.c:279
 msgid "Separator"
 msgstr "Separátor"
 
@@ -17666,7 +17694,7 @@ msgstr "Automatické odsazení"
 msgid "Wrap text at"
 msgstr "Zalomit text v"
 
-#: src/prefs_wrapping.c:154
+#: src/prefs_wrapping.c:153
 msgid "Wrapping"
 msgstr "Zalamování"
 
@@ -17719,27 +17747,27 @@ msgstr "[Chyba při dekódování BASE64]\n"
 msgid "Already trying to send."
 msgstr "Již probíhá pokus o odeslání."
 
-#: src/procmsg.c:1558 src/procmsg.c:1618
+#: src/procmsg.c:1558 src/procmsg.c:1619
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Nepodařilo se otevřít soubor%s."
 
-#: src/procmsg.c:1628
+#: src/procmsg.c:1629
 msgid "Queued message header is broken."
 msgstr "Hlavička zprávy ve frontě je poškozená."
 
-#: src/procmsg.c:1648
+#: src/procmsg.c:1649
 msgid "An error happened during SMTP session."
 msgstr "Nastala chyba během SMTP relace."
 
-#: src/procmsg.c:1662
+#: src/procmsg.c:1663
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr ""
 "Nebyl nalezen účet pro odeslání zprávy a nastala chyba během SMTP relace."
 
-#: src/procmsg.c:1670
+#: src/procmsg.c:1671
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17747,20 +17775,20 @@ msgstr ""
 "Nepodařilo se zjistit informace nutné pro odeslání. Tento e-mail "
 "pravděpodobně nebyl vygenerován programem Claws Mail."
 
-#: src/procmsg.c:1693
+#: src/procmsg.c:1694
 msgid "Couldn't create temporary file for news sending."
 msgstr "Nelze vytvořit dočasný soubor pro odesílání do diskusní skupiny."
 
-#: src/procmsg.c:1706
+#: src/procmsg.c:1707
 msgid "Error when writing temporary file for news sending."
 msgstr "Chyba při zápisu dočasného souboru pro odesílání do diskusní skupiny."
 
-#: src/procmsg.c:1720
+#: src/procmsg.c:1721
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Nastala chyba při posílání zprávy do %s."
 
-#: src/procmsg.c:2272
+#: src/procmsg.c:2273
 msgid "Filtering messages...\n"
 msgstr "Filtruji zprávy...\n"
 
@@ -17786,7 +17814,7 @@ msgstr "jméno odesílatele"
 
 #: src/quote_fmt.c:54
 msgid "last name of sender"
-msgstr "Příjmení odesílatele"
+msgstr "příjmení odesílatele"
 
 #: src/quote_fmt.c:55
 msgid "initials of sender"
@@ -17862,15 +17890,15 @@ msgstr "kniha adres <span style=\"oblique\">kompletace</span>: Komu"
 
 #: src/quote_fmt.c:80
 msgid "literal backslash"
-msgstr "zpětné lomítko - znak \\"
+msgstr "znak - zpětné lomítko \\"
 
 #: src/quote_fmt.c:81
 msgid "literal question mark"
-msgstr "otazník - znak ?"
+msgstr "znak otazníku"
 
 #: src/quote_fmt.c:82
 msgid "literal exclamation mark"
-msgstr "vykřičník - znak !"
+msgstr "znak - vykřičník"
 
 #: src/quote_fmt.c:83
 msgid "literal pipe"
@@ -17878,7 +17906,7 @@ msgstr "\"roura\" - znak |"
 
 #: src/quote_fmt.c:84
 msgid "literal opening curly brace"
-msgstr "levá složená závorka - znak {"
+msgstr "znak { - levá složená závorka"
 
 #: src/quote_fmt.c:85
 msgid "literal closing curly brace"
@@ -18187,11 +18215,11 @@ msgstr "%s - Zdroj"
 msgid "Saved SSL/TLS certificates"
 msgstr "Uložené SSL/TLS certifikáty"
 
-#: src/ssl_manager.c:436
+#: src/ssl_manager.c:410
 msgid "Delete certificate"
 msgstr "Odstranit certifikát"
 
-#: src/ssl_manager.c:437
+#: src/ssl_manager.c:411
 msgid "Do you really want to delete this certificate?"
 msgstr "Opravdu chcete odstranit tento certifikát?"
 
@@ -18219,7 +18247,7 @@ msgstr "Podmínka:"
 msgid "Find _all"
 msgstr "Najít _všechny"
 
-#: src/summary_search.c:751 src/summaryview.c:1089 src/summaryview.c:1351
+#: src/summary_search.c:751 src/summaryview.c:1090 src/summaryview.c:1352
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Hledám v %s... \n"
@@ -18232,213 +18260,213 @@ msgstr "Dosažen začátek seznamu, pokračovat od konce?"
 msgid "End of list reached; continue from beginning?"
 msgstr "Dosažen konec seznamu, pokračovat od začátku?"
 
-#: src/summaryview.c:431
+#: src/summaryview.c:432
 msgid "Create _filter rule"
 msgstr "Vytvořit pravidlo _filtru"
 
-#: src/summaryview.c:559
+#: src/summaryview.c:560
 msgid "Toggle quick search bar"
 msgstr "Přepnout panel rychlého vyhledávání"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:597
 msgid "Toggle multiple selection"
 msgstr "Přepnout násobný výběr"
 
-#: src/summaryview.c:1279
+#: src/summaryview.c:1280
 msgid "Process mark"
 msgstr "Zpracovat označené"
 
-#: src/summaryview.c:1280
+#: src/summaryview.c:1281
 msgid "Some marks are left. Process them?"
 msgstr "Zbyly nějaké označené. Zpracovat je?"
 
-#: src/summaryview.c:1330
+#: src/summaryview.c:1331
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Prohledávám složku (%s)..."
 
-#: src/summaryview.c:1870 src/summaryview.c:1918
+#: src/summaryview.c:1883 src/summaryview.c:1931
 msgid "No more unread messages"
 msgstr "Nejsou další nepřečtené zprávy"
 
-#: src/summaryview.c:1871
+#: src/summaryview.c:1884
 msgid "No unread message found. Search from the end?"
 msgstr "Nebyla nalezena nepřečtená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1883 src/summaryview.c:1931 src/summaryview.c:1968
-#: src/summaryview.c:2016 src/summaryview.c:2083
+#: src/summaryview.c:1896 src/summaryview.c:1944 src/summaryview.c:1981
+#: src/summaryview.c:2029 src/summaryview.c:2096
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Interní chyba: neočekávaná hodnota pro prefs_common.next_unread_msg_dialog\n"
 
-#: src/summaryview.c:1895
+#: src/summaryview.c:1908
 msgid "No unread messages."
 msgstr "Žádné nepřečtené zprávy."
 
-#: src/summaryview.c:1919
+#: src/summaryview.c:1932
 msgid "No unread message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Chcete jít do další složky?"
 
-#: src/summaryview.c:1955 src/summaryview.c:2003
+#: src/summaryview.c:1968 src/summaryview.c:2016
 msgid "No more new messages"
 msgstr "Nejsou další nové zprávy"
 
-#: src/summaryview.c:1956
+#: src/summaryview.c:1969
 msgid "No new message found. Search from the end?"
 msgstr "Nebyla nalezena nová zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1980
+#: src/summaryview.c:1993
 msgid "No new messages."
 msgstr "Žádné nové zprávy."
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2017
 msgid "No new message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná nová zpráva. Chcete jít do další složky?"
 
-#: src/summaryview.c:2037 src/summaryview.c:2070
+#: src/summaryview.c:2050 src/summaryview.c:2083
 msgid "No more marked messages"
 msgstr "Nejsou další označené zprávy"
 
-#: src/summaryview.c:2038
+#: src/summaryview.c:2051
 msgid "No marked message found. Search from the end?"
 msgstr "Nebyla nalezena žádná označená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:2047
+#: src/summaryview.c:2060
 msgid "No marked messages."
 msgstr "Žádné označené zprávy."
 
-#: src/summaryview.c:2071
+#: src/summaryview.c:2084
 msgid "No marked message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná označená zpráva. Chcete jít do další složky?"
 
-#: src/summaryview.c:2104 src/summaryview.c:2133
+#: src/summaryview.c:2117 src/summaryview.c:2146
 msgid "No more labeled messages"
 msgstr "Nejsou další obarvené zprávy"
 
-#: src/summaryview.c:2105
+#: src/summaryview.c:2118
 msgid "No labeled message found. Search from the end?"
 msgstr "Nebyla nalezena žádná obarvená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:2114 src/summaryview.c:2147
+#: src/summaryview.c:2127 src/summaryview.c:2160
 msgid "No labeled messages."
 msgstr "Žádné obarvené zprávy."
 
-#: src/summaryview.c:2134
+#: src/summaryview.c:2147
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nebyla nalezena žádná obarvená zpráva. Hledat od začátku?"
 
-#: src/summaryview.c:2451
+#: src/summaryview.c:2464
 msgid "Attracting messages by subject..."
 msgstr "Seskupuji zprávy dle předmětu..."
 
-#: src/summaryview.c:2636
+#: src/summaryview.c:2649
 #, c-format
 msgid "%d deleted"
 msgstr "%d odstraněno"
 
-#: src/summaryview.c:2640
+#: src/summaryview.c:2653
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d přemístěno"
 
-#: src/summaryview.c:2641 src/summaryview.c:2648
+#: src/summaryview.c:2654 src/summaryview.c:2661
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2646
+#: src/summaryview.c:2659
 #, c-format
 msgid "%s%d copied"
 msgstr "%s %d zkopírováno"
 
-#: src/summaryview.c:2660
+#: src/summaryview.c:2673
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " položka vybrána"
 msgstr[1] " položky vybrány"
 msgstr[2] " položek vybráno"
 
-#: src/summaryview.c:2678 src/summaryview.c:2721
+#: src/summaryview.c:2691 src/summaryview.c:2734
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nová(é), %d nepřečtená(é), celkem %d (%s)"
 
-#: src/summaryview.c:2696
+#: src/summaryview.c:2709
 msgid "Message summary"
 msgstr "Shrnutí zprávy"
 
-#: src/summaryview.c:2697
+#: src/summaryview.c:2710
 msgid "New:"
 msgstr "Nové:"
 
-#: src/summaryview.c:2698
+#: src/summaryview.c:2711
 msgid "Unread:"
 msgstr "Nepřečtené:"
 
-#: src/summaryview.c:2699
+#: src/summaryview.c:2712
 msgid "Total:"
 msgstr "Celkem:"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2714
 msgid "Marked:"
 msgstr "Označené:"
 
-#: src/summaryview.c:2702
+#: src/summaryview.c:2715
 msgid "Replied:"
 msgstr "Odpovězené:"
 
-#: src/summaryview.c:2703
+#: src/summaryview.c:2716
 msgid "Forwarded:"
 msgstr "Předané:"
 
-#: src/summaryview.c:2704
+#: src/summaryview.c:2717
 msgid "Locked:"
 msgstr "Zamknuté:"
 
-#: src/summaryview.c:2705
+#: src/summaryview.c:2718
 msgid "Ignored:"
 msgstr "Ignorované:"
 
-#: src/summaryview.c:2706
+#: src/summaryview.c:2719
 msgid "Watched:"
 msgstr "Sledováné:"
 
-#: src/summaryview.c:2716
+#: src/summaryview.c:2729
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d vybráno (%s/%s), %d nepřečteno"
 
-#: src/summaryview.c:3009
+#: src/summaryview.c:3022
 msgid "Sorting summary..."
 msgstr "Celkové setřídění..."
 
-#: src/summaryview.c:3148
+#: src/summaryview.c:3190
 msgid "Setting summary from message data..."
 msgstr "Nastavuji přehled z dat zpráv..."
 
-#: src/summaryview.c:3353
+#: src/summaryview.c:3395
 msgid "(No Date)"
 msgstr "(Žádné datum)"
 
-#: src/summaryview.c:3405
+#: src/summaryview.c:3447
 msgid "(No Recipient)"
 msgstr "(Žádný příjemce)"
 
-#: src/summaryview.c:3440
+#: src/summaryview.c:3482
 #, c-format
 msgid "From: %s, on %s"
 msgstr "Od: %s, na %s"
 
-#: src/summaryview.c:3449
+#: src/summaryview.c:3491
 #, c-format
 msgid "To: %s, on %s"
 msgstr "Pro: %s, na %s"
 
-#: src/summaryview.c:4314
+#: src/summaryview.c:4356
 msgid "You're not the author of the article.\n"
 msgstr "Nejste autorem tohoto příspěvku.\n"
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4446
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
@@ -18446,65 +18474,79 @@ msgstr[0] "Opravdu chcete odstranit vybranou zprávu?"
 msgstr[1] "Opravdu chcete odstranit %d vybrané zprávy?"
 msgstr[2] "Opravdu chcete odstranit %d vybraných zpráv?"
 
-#: src/summaryview.c:4407
+#: src/summaryview.c:4449
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Odstranit zprávu"
 msgstr[1] "Odstranit zprávy"
 msgstr[2] "Odstranit zprávy"
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4613
 msgid "Destination is same as current folder."
 msgstr "Cílová položka je stejná jako aktuální složka."
 
-#: src/summaryview.c:4677
+#: src/summaryview.c:4668
+msgid "Select folder to move selected message to"
+msgid_plural "Select folder to move selected messages to"
+msgstr[0] "Vybrat složku pro přesunutí vybrané zprávy"
+msgstr[1] "Vybrat složku pro přesunutí vybrané zprávy"
+msgstr[2] "Vybrat složku pro přesunutí vybrané zprávy"
+
+#: src/summaryview.c:4719
 msgid "Destination to copy is same as current folder."
 msgstr "Cíl kopírování je stejný jako aktuální složka."
 
-#: src/summaryview.c:4847
+#: src/summaryview.c:4753
+msgid "Select folder to copy selected message to"
+msgid_plural "Select folder to copy selected messages to"
+msgstr[0] "Vybrat složku pro kopírování vybrané zprávy"
+msgstr[1] "Vybrat složku pro kopírování vybrané zprávy"
+msgstr[2] "Vybrat složku pro kopírování vybrané zprávy"
+
+#: src/summaryview.c:4889
 msgid "Append or Overwrite"
 msgstr "Přidat nebo přepsat"
 
-#: src/summaryview.c:4848
+#: src/summaryview.c:4890
 msgid "Append or overwrite existing file?"
 msgstr "Přidat nebo přepsat existující soubor?"
 
-#: src/summaryview.c:4849
+#: src/summaryview.c:4891
 msgid "_Append"
 msgstr "_Přidat"
 
-#: src/summaryview.c:4849
+#: src/summaryview.c:4891
 msgid "_Overwrite"
 msgstr "Př_epsat"
 
-#: src/summaryview.c:4890
+#: src/summaryview.c:4932
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr ""
 "Chystáte se vytisknout okolo %d zpráv postupně po jedné. Chcete pokračovat?"
 
-#: src/summaryview.c:5348
+#: src/summaryview.c:5390
 msgid "Building threads..."
 msgstr "Vytvářím vlákna..."
 
-#: src/summaryview.c:5596
+#: src/summaryview.c:5638
 msgid "Skip these rules"
 msgstr "Přeskočit"
 
-#: src/summaryview.c:5599
+#: src/summaryview.c:5641
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Aplikovat bez ohledu na účet ke kterému jsou přiřazena"
 
-#: src/summaryview.c:5602
+#: src/summaryview.c:5644
 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplikovat, jsou-li přiřazena k aktuálnímu účtu"
 
-#: src/summaryview.c:5631
+#: src/summaryview.c:5673
 msgid "Filtering"
 msgstr "Filtrování"
 
-#: src/summaryview.c:5632
+#: src/summaryview.c:5674
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18512,55 +18554,55 @@ msgstr ""
 "Některá filtrovací pravidla jsou přiřazena specifickým účtům.\n"
 "Zvolte prosím způsob aplikace těchto pravidel:"
 
-#: src/summaryview.c:5662
+#: src/summaryview.c:5704
 msgid "Filtering..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:5741
+#: src/summaryview.c:5783
 msgid "Processing configuration"
 msgstr "Zpracovávám nastavení"
 
-#: src/summaryview.c:6287
+#: src/summaryview.c:6329
 msgid "Ignored thread"
 msgstr "Ignorované vlákno"
 
-#: src/summaryview.c:6289
+#: src/summaryview.c:6331
 msgid "Watched thread"
 msgstr "Sledované vlákno"
 
-#: src/summaryview.c:6297
+#: src/summaryview.c:6339
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Odpovězeno ale také přeposláno - klikněte pro zobrazení odpovědi"
 
-#: src/summaryview.c:6299
+#: src/summaryview.c:6341
 msgid "Replied - click to see reply"
 msgstr "Odpovězeno - klikněte pro zobrazení odpovědi"
 
-#: src/summaryview.c:6311
+#: src/summaryview.c:6353
 msgid "To be moved"
 msgstr "K přesunutí"
 
-#: src/summaryview.c:6313
+#: src/summaryview.c:6355
 msgid "To be copied"
 msgstr "Bude zkopírováno"
 
-#: src/summaryview.c:6325
+#: src/summaryview.c:6367
 msgid "Signed, has attachment(s)"
 msgstr "Zpráva je podepsaná a má přílohu/přílohy"
 
-#: src/summaryview.c:6329
+#: src/summaryview.c:6371
 msgid "Encrypted, has attachment(s)"
 msgstr "Zpráva je šifrovaná a má přílohu/přílohy"
 
-#: src/summaryview.c:6331
+#: src/summaryview.c:6373
 msgid "Encrypted"
 msgstr "Šifrovaná zpráva"
 
-#: src/summaryview.c:6333
+#: src/summaryview.c:6375
 msgid "Has attachment(s)"
 msgstr "Má přílohu/přílohy"
 
-#: src/summaryview.c:7990
+#: src/summaryview.c:8046
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18569,11 +18611,11 @@ msgstr ""
 "Chyba v regulárním výrazu (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8093
+#: src/summaryview.c:8149
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Přejít zpět na seznam složek (Máte nepřečtené zprávy)"
 
-#: src/summaryview.c:8098
+#: src/summaryview.c:8154
 msgid "Go back to the folder list"
 msgstr "Přejít zpět na seznam složek"
 
@@ -18672,7 +18714,7 @@ msgstr "     - Otevřít externím programem pomocí "
 
 #: src/textview.c:1016
 msgid "'Open'"
-msgstr "'Otevřít' "
+msgstr "'Otevřít'"
 
 #: src/textview.c:1024
 msgid "       (alternately double-click, or click the middle "
@@ -18684,13 +18726,13 @@ msgstr "tlačítkem myši)\n"
 
 #: src/textview.c:1027
 msgid "     - Or use "
-msgstr "     - Nebo použijte"
+msgstr "     - Nebo použijte "
 
 #: src/textview.c:1028
 msgid "'Open with...'"
 msgstr "'Otevřít čím...'"
 
-#: src/textview.c:1146
+#: src/textview.c:1147
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -18701,47 +18743,47 @@ msgstr ""
 "    %s\n"
 "Návratový kód %d\n"
 
-#: src/textview.c:2197
+#: src/textview.c:2206
 msgid "Tags: "
-msgstr "Značky:"
+msgstr "Značky: "
 
-#: src/textview.c:2905
+#: src/textview.c:2914
 msgid "The real URL is different from the displayed URL."
 msgstr "Skutečné URL se liší od zobrazeného."
 
-#: src/textview.c:2906
+#: src/textview.c:2915
 msgid "Displayed URL:"
 msgstr "Zobrazované URL:"
 
-#: src/textview.c:2907
+#: src/textview.c:2916
 msgid "Real URL:"
 msgstr "Reálná URL:"
 
-#: src/textview.c:2908
+#: src/textview.c:2917
 msgid "Open it anyway?"
 msgstr "Přesto otevřít?"
 
-#: src/textview.c:2909
+#: src/textview.c:2918
 msgid "Phishing attempt warning"
 msgstr "Upozornění na možný pokus o podvrh"
 
-#: src/textview.c:2910
+#: src/textview.c:2919
 msgid "_Open URL"
 msgstr "_Otevřít URL"
 
-#: src/toolbar.c:224 src/toolbar.c:2213
+#: src/toolbar.c:224 src/toolbar.c:2291
 msgid "Receive Mail from all Accounts"
 msgstr "Přijmout poštu ze všech účtů"
 
-#: src/toolbar.c:225 src/toolbar.c:2218
+#: src/toolbar.c:225 src/toolbar.c:2296
 msgid "Receive Mail from current Account"
 msgstr "Přijmout poštu z aktuálního účtu"
 
-#: src/toolbar.c:226 src/toolbar.c:2222
+#: src/toolbar.c:226 src/toolbar.c:2300
 msgid "Send Queued Messages"
 msgstr "Odeslat pozdržené zprávy"
 
-#: src/toolbar.c:227 src/toolbar.c:952 src/toolbar.c:2240 src/toolbar.c:2251
+#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2318 src/toolbar.c:2329
 msgid "Compose Email"
 msgstr "Napsat novou zprávu"
 
@@ -18749,35 +18791,35 @@ msgstr "Napsat novou zprávu"
 msgid "Compose News"
 msgstr "Napsat diskusní příspěvek"
 
-#: src/toolbar.c:229 src/toolbar.c:2295 src/toolbar.c:2305
+#: src/toolbar.c:229 src/toolbar.c:2373 src/toolbar.c:2383
 msgid "Reply to Message"
 msgstr "Odpovědět na zprávu"
 
-#: src/toolbar.c:230 src/toolbar.c:2312 src/toolbar.c:2322
+#: src/toolbar.c:230 src/toolbar.c:2390 src/toolbar.c:2400
 msgid "Reply to Sender"
 msgstr "Odpovědět odesílateli"
 
-#: src/toolbar.c:231 src/toolbar.c:2329 src/toolbar.c:2339
+#: src/toolbar.c:231 src/toolbar.c:2407 src/toolbar.c:2417
 msgid "Reply to All"
 msgstr "Odpovědět všem"
 
-#: src/toolbar.c:232 src/toolbar.c:2346 src/toolbar.c:2356
+#: src/toolbar.c:232 src/toolbar.c:2424 src/toolbar.c:2434
 msgid "Reply to Mailing-list"
 msgstr "Odpovědět do konference"
 
-#: src/toolbar.c:233 src/toolbar.c:2234
+#: src/toolbar.c:233 src/toolbar.c:2312
 msgid "Open email"
 msgstr "Otevřít email"
 
-#: src/toolbar.c:234 src/toolbar.c:2363 src/toolbar.c:2374
+#: src/toolbar.c:234 src/toolbar.c:2441 src/toolbar.c:2452
 msgid "Forward Message"
 msgstr "Předat zprávu"
 
-#: src/toolbar.c:235 src/toolbar.c:2379
+#: src/toolbar.c:235 src/toolbar.c:2457
 msgid "Trash Message"
 msgstr "Hodit zprávu do koše"
 
-#: src/toolbar.c:236 src/toolbar.c:2383
+#: src/toolbar.c:236 src/toolbar.c:2461
 msgid "Delete Message"
 msgstr "Odstranit zprávu"
 
@@ -18785,11 +18827,11 @@ msgstr "Odstranit zprávu"
 msgid "Delete duplicate messages"
 msgstr "Odstranit duplikáty zpráv"
 
-#: src/toolbar.c:239 src/toolbar.c:2391
+#: src/toolbar.c:239 src/toolbar.c:2469
 msgid "Go to Previous Unread Message"
 msgstr "Jít na předchozí nepřečtenou zprávu"
 
-#: src/toolbar.c:240 src/toolbar.c:2395
+#: src/toolbar.c:240 src/toolbar.c:2473
 msgid "Go to Next Unread Message"
 msgstr "Jít na následující nepřečtenou zprávu"
 
@@ -18825,7 +18867,7 @@ msgstr "Označit zprávu za přečtenou"
 msgid "Mark Message as unread"
 msgstr "Označit zprávu za nepřečtenou"
 
-#: src/toolbar.c:253 src/toolbar.c:511
+#: src/toolbar.c:253 src/toolbar.c:514
 msgid "Print"
 msgstr "Tisk"
 
@@ -18837,242 +18879,266 @@ msgstr "Naučit se rozpoznat spam nebo ham"
 msgid "Open folder/Go to folder list"
 msgstr "Otevřít složku/Přejít na seznam složek"
 
-#: src/toolbar.c:258 src/toolbar.c:2401
+#: src/toolbar.c:258 src/toolbar.c:2479
 msgid "Send Message"
 msgstr "Odeslat zprávu"
 
-#: src/toolbar.c:259 src/toolbar.c:2405
+#: src/toolbar.c:259 src/toolbar.c:2483
 msgid "Put into queue folder and send later"
 msgstr "Zařadit do fronty a odeslat později"
 
-#: src/toolbar.c:260 src/toolbar.c:2409
+#: src/toolbar.c:260 src/toolbar.c:2487
 msgid "Save to draft folder"
 msgstr "Uložit do složky konceptů"
 
-#: src/toolbar.c:261 src/toolbar.c:2413
+#: src/toolbar.c:261 src/toolbar.c:2491
 msgid "Insert file"
 msgstr "Vložit soubor"
 
-#: src/toolbar.c:262 src/toolbar.c:2417
+#: src/toolbar.c:262 src/toolbar.c:2495
 msgid "Attach file"
 msgstr "Připojit soubor"
 
-#: src/toolbar.c:263 src/toolbar.c:2421
+#: src/toolbar.c:263 src/toolbar.c:2499
 msgid "Insert signature"
 msgstr "Vložit podpis"
 
-#: src/toolbar.c:264 src/toolbar.c:2425
+#: src/toolbar.c:264 src/toolbar.c:2503
 msgid "Replace signature"
 msgstr "Nahradit podpis"
 
-#: src/toolbar.c:265 src/toolbar.c:2429
+#: src/toolbar.c:265 src/toolbar.c:2507
 msgid "Edit with external editor"
 msgstr "Upravit externím editorem"
 
-#: src/toolbar.c:266 src/toolbar.c:2433
+#: src/toolbar.c:266 src/toolbar.c:2511
 msgid "Wrap long lines of current paragraph"
 msgstr "Zalomit dlouhé řádky aktuálního odstavce"
 
-#: src/toolbar.c:267 src/toolbar.c:2437
+#: src/toolbar.c:267 src/toolbar.c:2515
 msgid "Wrap all long lines"
 msgstr "Zalomit všechny dlouhé řádky"
 
-#: src/toolbar.c:270 src/toolbar.c:528 src/toolbar.c:2446
+#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2524
 msgid "Check spelling"
 msgstr "Zkontrolovat pravopis"
 
-#: src/toolbar.c:272
+#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2529
+msgid "Sign"
+msgstr "Podepsat"
+
+#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2537
+msgid "Encrypt"
+msgstr "Šifrovat"
+
+#: src/toolbar.c:274
 msgid "Claws Mail Actions Feature"
 msgstr "Akce Claws Mail"
 
-#: src/toolbar.c:273 src/toolbar.c:2462
+#: src/toolbar.c:275 src/toolbar.c:2556
 msgid "Cancel receiving"
 msgstr "Přerušit stahování zpráv"
 
-#: src/toolbar.c:275 src/toolbar.c:2470
+#: src/toolbar.c:277 src/toolbar.c:2564
 msgid "Cancel receiving/sending"
 msgstr "Zrušit stahování/posílání zpráv"
 
-#: src/toolbar.c:276 src/toolbar.c:2226
+#: src/toolbar.c:278 src/toolbar.c:2304
 msgid "Close window"
 msgstr "Zavřít okno"
 
-#: src/toolbar.c:278
+#: src/toolbar.c:280
 msgid "Claws Mail Plugins"
 msgstr "Zásuvné moduly Claws Mail"
 
-#: src/toolbar.c:442 src/toolbar.c:493
+#: src/toolbar.c:445 src/toolbar.c:496
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Koš"
 
-#: src/toolbar.c:482
+#: src/toolbar.c:485
 msgid "Get Mail"
 msgstr "Přijmout poštu"
 
-#: src/toolbar.c:483
+#: src/toolbar.c:486
 msgid "Get"
 msgstr "Získat"
 
-#: src/toolbar.c:485 src/toolbar.c:486
+#: src/toolbar.c:488 src/toolbar.c:489
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Napsat zprávu"
 
-#: src/toolbar.c:488
+#: src/toolbar.c:491
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "Odesílatel"
 
-#: src/toolbar.c:489
+#: src/toolbar.c:492
 msgid "All"
 msgstr "Všem"
 
-#: src/toolbar.c:490
+#: src/toolbar.c:493
 msgid "List"
 msgstr "Seznam"
 
-#: src/toolbar.c:495 src/toolbar.c:2279 src/toolbar.c:2288
+#: src/toolbar.c:498 src/toolbar.c:2357 src/toolbar.c:2366
 msgid "Delete duplicates"
 msgstr "Odstranit duplikáty"
 
-#: src/toolbar.c:497
+#: src/toolbar.c:500
 msgid "Prev"
 msgstr "Předchozí"
 
-#: src/toolbar.c:498
+#: src/toolbar.c:501
 msgid "Next"
 msgstr "Další"
 
-#: src/toolbar.c:506
+#: src/toolbar.c:509
 msgid "All read"
 msgstr "Všechny přečtené"
 
-#: src/toolbar.c:507
+#: src/toolbar.c:510
 msgid "All unread"
 msgstr "Všechny nepřečtené"
 
-#: src/toolbar.c:508
+#: src/toolbar.c:511
 msgid "Read"
 msgstr "Číst"
 
-#: src/toolbar.c:513
+#: src/toolbar.c:516
 msgid "Folders"
 msgstr "Složky"
 
-#: src/toolbar.c:518
+#: src/toolbar.c:521
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/toolbar.c:521
+#: src/toolbar.c:524
 msgid "Insert sig."
 msgstr "Vložit podpis"
 
-#: src/toolbar.c:522
+#: src/toolbar.c:525
 msgid "Replace sig."
 msgstr "Nahradit podpis"
 
-#: src/toolbar.c:523
+#: src/toolbar.c:526
 msgid "Edit"
 msgstr "Úpravy"
 
-#: src/toolbar.c:524
+#: src/toolbar.c:527
 msgid "Wrap para."
 msgstr "Zalomit odstavec"
 
-#: src/toolbar.c:525
+#: src/toolbar.c:528
 msgid "Wrap all"
 msgstr "Zalomit vše"
 
-#: src/toolbar.c:531 src/toolbar.c:532
+#: src/toolbar.c:536 src/toolbar.c:537
 msgid "Stop"
 msgstr "Zastavit"
 
-#: src/toolbar.c:533
+#: src/toolbar.c:538
 msgid "Stop all"
 msgstr "Vše zastavit"
 
-#: src/toolbar.c:944
+#: src/toolbar.c:951
 msgid "Compose News message"
 msgstr "Napsat novou zprávu"
 
-#: src/toolbar.c:983
+#: src/toolbar.c:990
 msgid "Learn spam"
 msgstr "Naučit se, že jde o nevyžádanou zprávu (spam)"
 
-#: src/toolbar.c:992
+#: src/toolbar.c:999
 msgid "Ham"
 msgstr "Ham"
 
-#: src/toolbar.c:994
+#: src/toolbar.c:1001
 msgid "Learn ham"
 msgstr "Naučit se, že nejde o nevyžádanou zprávu (ham)"
 
-#: src/toolbar.c:2208
+#: src/toolbar.c:1916
+msgid "Message will be signed"
+msgstr "Zpráva bude podepsána"
+
+#: src/toolbar.c:1918
+msgid "Message will not be signed"
+msgstr "Zpráva nebude podepsána"
+
+#: src/toolbar.c:1937
+msgid "Message will be encrypted"
+msgstr "Zpráva bude šifrována"
+
+#: src/toolbar.c:1939
+msgid "Message will not be encrypted"
+msgstr "Zpráva nebude šifrována"
+
+#: src/toolbar.c:2286
 msgid "Go to folder list"
 msgstr "Přejít na seznam složek"
 
-#: src/toolbar.c:2214
+#: src/toolbar.c:2292
 msgid "Receive Mail from selected Account"
 msgstr "Přijmout poštu z vybraného účtu"
 
-#: src/toolbar.c:2230
+#: src/toolbar.c:2308
 msgid "Open preferences"
 msgstr "Otevřít předvolby"
 
-#: src/toolbar.c:2241
+#: src/toolbar.c:2319
 msgid "Compose with selected Account"
 msgstr "Napsat novou zprávu pomocí vybraného účtu"
 
-#: src/toolbar.c:2262
+#: src/toolbar.c:2340
 msgid "Learn as..."
 msgstr "Učit se jako..."
 
-#: src/toolbar.c:2272
+#: src/toolbar.c:2350
 msgid "Learn as _Spam"
 msgstr "Učit jako _Spam"
 
-#: src/toolbar.c:2273
+#: src/toolbar.c:2351
 msgid "Learn as _Ham"
 msgstr "Učit jako _Ne spam"
 
-#: src/toolbar.c:2280
+#: src/toolbar.c:2358
 msgid "Delete duplicates options"
 msgstr "Volby odstranění duplikátů"
 
-#: src/toolbar.c:2284
+#: src/toolbar.c:2362
 msgid "Delete duplicates in selected folder"
 msgstr "Odstranit duplikáty ve vybraných složkách"
 
-#: src/toolbar.c:2285
+#: src/toolbar.c:2363
 msgid "Delete duplicates in all folders"
 msgstr "Odstranit duplikáty ve všech složkách"
 
-#: src/toolbar.c:2296
+#: src/toolbar.c:2374
 msgid "Reply to Message options"
 msgstr "Odpovědět na zprávu"
 
-#: src/toolbar.c:2300 src/toolbar.c:2317 src/toolbar.c:2334 src/toolbar.c:2351
+#: src/toolbar.c:2378 src/toolbar.c:2395 src/toolbar.c:2412 src/toolbar.c:2429
 msgid "_Reply with quote"
 msgstr "Odpovědět s _citací"
 
-#: src/toolbar.c:2301 src/toolbar.c:2318 src/toolbar.c:2335 src/toolbar.c:2352
+#: src/toolbar.c:2379 src/toolbar.c:2396 src/toolbar.c:2413 src/toolbar.c:2430
 msgid "Reply without _quote"
 msgstr "Odpovědět _bez citace"
 
-#: src/toolbar.c:2313
+#: src/toolbar.c:2391
 msgid "Reply to Sender options"
 msgstr "Odpovědět odesílateli"
 
-#: src/toolbar.c:2330
+#: src/toolbar.c:2408
 msgid "Reply to All options"
 msgstr "Odpovědět všem"
 
-#: src/toolbar.c:2347
+#: src/toolbar.c:2425
 msgid "Reply to Mailing-list options"
 msgstr "Odpovědět do konference"
 
-#: src/toolbar.c:2364
+#: src/toolbar.c:2442
 msgid "Forward Message options"
 msgstr "Předat zprávu"
 
@@ -19375,3 +19441,1388 @@ msgid ""
 msgstr ""
 "Claws Mail je nyní připraven.\n"
 "Stiskněte uložit a můžeme začít."
+
+#~ msgid ""
+#~ "Copyright (C) 1999-2017\n"
+#~ "The Claws Mail Team\n"
+#~ " and Hiroyuki Yamamoto"
+#~ msgstr ""
+#~ "Copyright (C) 1999-2017\n"
+#~ "The Claws Mail Team\n"
+#~ "a Hiroyuki Yamamoto"
+
+#~ msgid "Change to..."
+#~ msgstr "Změnit na..."
+
+#~ msgid "The only recipient is the default BCC address. Send anyway?"
+#~ msgstr ""
+#~ "Jediný adresát je výchozí příjemce skrytých kopií (viz nastavení účtu). "
+#~ "Opravdu odeslat?"
+
+#~ msgid "Template From format error."
+#~ msgstr "Chyba v poli 'Od' šablony."
+
+#~ msgid "Template Cc format error."
+#~ msgstr "Chyba v poli 'Kopie' šablony."
+
+#~ msgid "Template Bcc format error."
+#~ msgstr "Chyba v poli 'Skrytá kopie' šablony."
+
+#~ msgid "Template Reply-To format error."
+#~ msgstr "Chyba v poli 'Komu' šablony."
+
+#~ msgid "Template subject format error."
+#~ msgstr "Chyba v poli 'Předmět' šablony."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1999-2016\n"
+#~ "The Claws Mail Team\n"
+#~ " and Hiroyuki Yamamoto"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1999-2016\n"
+#~ "The Claws Mail Team\n"
+#~ " a Hiroyuki Yamamoto"
+
+#~ msgid "all filtering expressions are allowed"
+#~ msgstr "všechny filtrovací výrazy jsou povoleny"
+
+#~ msgid "Keep addresses which appear in 'Cc' headers"
+#~ msgstr "Uchová adresy, které jsou v 'Cc' hlavičce"
+
+#~ msgid "Keep addresses which appear in 'Bcc' headers"
+#~ msgstr "Uchová adresy, které jsou v 'Bcc' hlavičce"
+
+#~ msgid "Folder and archive must be selected"
+#~ msgstr "Složka a archiv musí být vybrán"
+
+#~ msgid "Choose this option to use BZIP2 compression for the archive"
+#~ msgstr "Vyberte tuto možnost pro používání BZIP2 komprese pro archivy"
+
+#~ msgid "Choose this to use Compress compression for your archive"
+#~ msgstr "Vyberte tuto možnost pro používání COMPRESS komprese pro archivy"
+
+#~ msgid "Choose this option to disable compression for the archive"
+#~ msgstr "Vyberte tuto možnost pro vypnutí komprese pro archivy"
+
+#~ msgid "Choose this option to use TAR as format for the archive"
+#~ msgstr "Vyberte tuto možnost pro používání TAR formátu pro archivy"
+
+#~ msgid "Choose this option to use CPIO as format for the archive"
+#~ msgstr "Vyberte tuto možnost pro používání CPIO formát pro archivy"
+
+#~ msgid "Choose this option to use PAX as format for the archive"
+#~ msgstr "Vyberte tuto možnost pro používání PAX formátu pro archivy"
+
+#~ msgid "Choose this option to use BZIP2 compression by default"
+#~ msgstr "Vyberte tuto možnost pro používání BZIP2 komprese"
+
+#~ msgid "Choose this option to use COMPRESS compression by default"
+#~ msgstr "Vyberte tuto možnost pro používání COMPRESS komprese"
+
+#~ msgid "Choose this option to disable compression by default"
+#~ msgstr "Vyberte tuto možnost pro vypnutí komprese"
+
+#~ msgid "Choose this option to use the SHAR format by default"
+#~ msgstr "Vyberte tuto možnost pro používání SHAR komprese"
+
+#~ msgid "Choose this option to use the CPIO format by default"
+#~ msgstr "Vyberte tuto možnost pro používání CPIO komprese"
+
+#~ msgid "Choose this option to use the PAX format by default"
+#~ msgstr "Vyberte tuto možnost pro používání PAX komprese"
+
+#~ msgid "Couldn't create temporary file."
+#~ msgstr "Nelze vytvořit dočasný soubor."
+
+#~ msgid "vCalendar"
+#~ msgstr "vCalendar"
+
+#~ msgid ""
+#~ "Could not retrieve the Webcal URL:\n"
+#~ "%s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Nemohl získat Webcal URL:\n"
+#~ "%s:\n"
+#~ "\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "This URL does not look like a Webcal URL:\n"
+#~ "%s\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "URL nevypadá jako Webcal URL:\n"
+#~ "%s\n"
+#~ "%s\n"
+
+#~ msgid "There is an action with this name already."
+#~ msgstr "Existuje akce stejného jména."
+
+#~ msgid "When message view is visible"
+#~ msgstr "Když je okno zpráv zobrazené"
+
+#~ msgid "TLS"
+#~ msgstr "TLS"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ 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 ""
+#~ "Povoluje zabezpečené připojení k LDAP serveru pomocí SSL. Pokud "
+#~ "připojování selže, zkontrolujte nastavení v ldap.conf (volby "
+#~ "TLS_CACERTDIR a TLS_REQCERT)."
+
+#~ msgid "No TLS"
+#~ msgstr "Žádné TLS"
+
+#~ msgid "Register Claws Mail"
+#~ msgstr "Registrovat Claws Mail"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Použít SSL pro POP3 spojení"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Použít SSL pro IMAP4 spojení"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Použít SSL pro NNTP připojení"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Použít SSL pro SMTP připojení"
+
+#~ msgid "Re_move"
+#~ msgstr "Odstranit"
+
+#~ msgid "_Other folder..."
+#~ msgstr "_Jiná složka..."
+
+#~ msgid "   Key import isn't implemented in Windows.\n"
+#~ msgstr "   Import klíče není ve Windows implementován.\n"
+
+#~ msgid "minute(s)"
+#~ msgstr "minut"
+
+#~ msgid "The signature can't be checked - %s."
+#~ msgstr "Podpis nemůže být zkontrolován - %s."
+
+#~ msgid "Key export isn't implemented in Windows."
+#~ msgstr "Export klíče není ve Windows implementován."
+
+#~ msgid "day(s)"
+#~ msgstr "den(ů)"
+
+#~ msgid "Move deleted mails to trash and expunge immediately"
+#~ msgstr "Přesunout smazané maily do koše a okamžitě vymazat"
+
+#~ msgid ""
+#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
+#~ "expunging."
+#~ msgstr ""
+#~ "Přesunout smazané maily do koše namísto použití \\Deleted flag, bez "
+#~ "vymazání."
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Autodetekce (doporučeno)"
+
+#~ msgid "Delete message(s)"
+#~ msgstr "Odstranit zprávu(y)"
+
+#~ msgid "+_Insert"
+#~ msgstr "+_Vložit"
+
+#~ msgid "+_Send"
+#~ msgstr "+_Odeslat"
+
+#~ msgid "<i>%s</i>"
+#~ msgstr "<i>%s</i>"
+
+#~ msgid "+_Save to Drafts"
+#~ msgstr "+Uložit jako _koncept"
+
+#~ msgid ""
+#~ ">. \n"
+#~ "\n"
+#~ msgstr ""
+#~ ">. \n"
+#~ "\n"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Nahradit \"%s\" s: </span>"
+
+#~ msgid "IMAP error on %s: authenticated\n"
+#~ msgstr "IMAP chyba na %s: ověřen\n"
+
+#~ msgid "IMAP error on %s: not authenticated\n"
+#~ msgstr "IMAP chyba na %s: neověřen\n"
+
+#~ msgid "IMAP error on %s: stream error\n"
+#~ msgstr "IMAP chyba na %s: chyba streamu\n"
+
+#~ msgid "IMAP error on %s: connection refused\n"
+#~ msgstr "IMAP chyba na %s: připojení odmítnuto\n"
+
+#~ msgid "IMAP error on %s: fatal error\n"
+#~ msgstr "IMAP chyba na %s: fatální chyba\n"
+
+#~ msgid "IMAP error on %s: NOOP error\n"
+#~ msgstr "IMAP chyba na %s: NOOP chyba\n"
+
+#~ msgid "IMAP error on %s: COPY error\n"
+#~ msgstr "IMAP chyba na %s: COPY chyba\n"
+
+#~ msgid "IMAP error on %s: LIST error\n"
+#~ msgstr "IMAP chyba na %s: LIST chyba\n"
+
+#~ msgid "IMAP error on %s: LSUB error\n"
+#~ msgstr "IMAP chyba na %s: LSUB chyba\n"
+
+#~ msgid "IMAP error on %s: SASL error\n"
+#~ msgstr "IMAP chyba na %s: SASL chyba\n"
+
+#~ msgid "IMAP error on %s: SSL error\n"
+#~ msgstr "IMAP chyba na %s: SSL chyba\n"
+
+#~ msgid "IMAP error on %s: Unknown error [%d]\n"
+#~ msgstr "IMAP chyba na %s: Neznámá chyba [%d]\n"
+
+#~ msgid "+_Unsubscribe"
+#~ msgstr "+_Odhlásit"
+
+#~ msgid "Sylpheed-Claws 2.6.0 (or older)"
+#~ msgstr "Sylpheed-Claws 2.6.0 (nebo starší)"
+
+#~ msgid "Sylpheed-Claws 1.9.15 (or older)"
+#~ msgstr "Sylpheed-Claws 1.9.15 (nebo starší)"
+
+#~ msgid "Sylpheed-Claws 1.0.5 (or older)"
+#~ msgstr "Sylpheed-Claws 1.0.5 (nebo starší)"
+
+#~ msgid "<b>Type: </b>"
+#~ msgstr "<b>Typ: </b>"
+
+#~ msgid "<b>Size: </b>"
+#~ msgstr "<b>Velikost: </b>"
+
+#~ msgid "<b>Filename: </b>"
+#~ msgstr "<b>Název souboru: </b>"
+
+#~ msgid "<span color=\"red\">Error reading cache stats</span>"
+#~ msgstr ""
+#~ "<span color=\"red\">Chyba čtení statistiky vyrovnávací paměti</span>"
+
+#~ msgid ""
+#~ "<span color=\"red\">Using %s in %d files, %d directories, %d others and "
+#~ "%d errors</span>"
+#~ msgstr ""
+#~ "<span color=\"red\">Použití %s v %d souborech, %d adresářích, %d dalších "
+#~ "a %d chybách</span>"
+
+#~ msgid "<span color=\"red\">Error clearing icon cache.</span>"
+#~ msgstr "<span color=\"red\">Chyba čištění vyrovnávací paměti</span>"
+
+#~ msgid "mbox (etPan!)..."
+#~ msgstr "mbox (etPan!)..."
+
+#~ msgid "+_Save"
+#~ msgstr "+_Uložit"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
+#~ "span>\n"
+#~ "\n"
+#~ "%.*s\n"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">%sProsím vložte heslo pro:</span>\n"
+#~ "\n"
+#~ "%.*s\n"
+
+#~ msgid "                    uid \"%s\" (Validity: %s)\n"
+#~ msgstr "                    uid \"%s\" (Platnost: %s)\n"
+
+#~ msgid ""
+#~ "<b>Fetch comments on posts aged less than:</b>\n"
+#~ "<small>(In days; set to -1 to fetch all comments)</small>"
+#~ msgstr ""
+#~ "<b>Stáhnout komentáře pro zprávy mladší než:</b>\n"
+#~ "<small>(Ve dnech; nastavení -1 stáhnout všechny komentáře)</small>"
+
+#~ msgid ""
+#~ "<b>Refresh interval in minutes:</b>\n"
+#~ "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
+#~ msgstr ""
+#~ "<b>Interval aktualizace:</b>\n"
+#~ "<small>(Vložte 0, pokud tento kanál nechcete aktualizovat automaticky.)</"
+#~ "small>"
+
+#~ msgid "<b>If an item changes, do not mark it as new:</b>"
+#~ msgstr "<b>Jestli se položka změní, neoznačovat jako nepřečtenou:</b>"
+
+#~ msgid "%s <span weight=\"bold\">(this event recurs)</span>"
+#~ msgstr "%s <span weight=\"bold\">(událost se opakuje)</span>"
+
+#~ msgid "<b> on:</b>"
+#~ msgstr "<b> přes:</b>"
+
+#~ msgid "+Discard"
+#~ msgstr "+Zahodit"
+
+#~ msgid ""
+#~ "<b>Message summary</b>\n"
+#~ "<b>New:</b> %d\n"
+#~ "<b>Unread:</b> %d\n"
+#~ "<b>Total:</b> %d\n"
+#~ "<b>Size:</b> %s\n"
+#~ "\n"
+#~ "<b>Marked:</b> %d\n"
+#~ "<b>Replied:</b> %d\n"
+#~ "<b>Forwarded:</b> %d\n"
+#~ "<b>Locked:</b> %d\n"
+#~ "<b>Ignored:</b> %d\n"
+#~ "<b>Watched:</b> %d"
+#~ msgstr ""
+#~ "<b>Shrnutí zpráv</b>\n"
+#~ "<b>Nové:</b> %d\n"
+#~ "<b>Nepřečtené:</b> %d\n"
+#~ "<b>Celkem:</b> %d\n"
+#~ "<b>Velikost:</b> %s\n"
+#~ "\n"
+#~ "<b>Označené:</b> %d\n"
+#~ "<b>S odpovědí:</b> %d\n"
+#~ "<b>Přeposlané:</b> %d\n"
+#~ "<b>Zamčené:</b> %d\n"
+#~ "<b>Ignorované:</b> %d\n"
+#~ "<b>Sledované:</b> %d"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<span color='%s' style='italic'>From: %s, on %s</span>"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<span color='%s' style='italic'>Od: %s, on %s</span>"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<span color='%s' style='italic'>To: %s, on %s</span>"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<span color='%s' style='italic'>Komu: %s, on %s</span>"
+
+#~ msgid "<span weight=\"bold\">Your name:</span>"
+#~ msgstr "<span weight=\"bold\">Vaše jméno:</span>"
+
+#~ msgid "<span weight=\"bold\">Your email address:</span>"
+#~ msgstr "<span weight=\"bold\">Vaše e-mailová adresa:</span>"
+
+#~ msgid "<span weight=\"bold\">Mailbox name:</span>"
+#~ msgstr "<span weight=\"bold\">Název schránky (mailbox):</span>"
+
+#~ msgid "<span weight=\"bold\">SMTP server address:</span>"
+#~ msgstr "<span weight=\"bold\">SMTP server:</span>"
+
+#~ msgid "<span weight=\"bold\">Server address:</span>"
+#~ msgstr "<span weight=\"bold\">Server:</span>"
+
+#~ msgid "<span weight=\"bold\">Local mailbox:</span>"
+#~ msgstr "<span weight=\"bold\">Lokální mailbox:</span>"
+
+#~ msgid "<span weight=\"bold\">Server type:</span>"
+#~ msgstr "<span weight=\"bold\">Typ serveru:</span>"
+
+#~ msgid "<span weight=\"bold\">Username:</span>"
+#~ msgstr "<span weight=\"bold\">Přihlašovací jméno:</span>"
+
+#~ msgid "Failed to register avatars internal rendering hook"
+#~ msgstr "Selhala registrace renderování avatarů"
+
+#~ msgid "%s: host lookup timed out.\n"
+#~ msgstr "%s: časový limit pro hledání hostitele vypršel.\n"
+
+#~ msgid "%s: unknown host.\n"
+#~ msgstr "%s: neznámý hostitel.\n"
+
+#~ msgid "Failed."
+#~ msgstr "Selhalo."
+
+#~ msgid "New folder name must not contain the namespace path separator"
+#~ msgstr ""
+#~ "Název složky nesmí obsahovat znaky používané serverem IMAP jako oddělovače"
+
+#~ msgid "Failed to register folder item update hook"
+#~ msgstr ""
+#~ "Nepodařilo se zaregistrovat funkci pro obsloužení události \"změna "
+#~ "položky složky\""
+
+#~ msgid "Failed to register folder update hook"
+#~ msgstr ""
+#~ "Nepodařilo se zaregistrovat funkci pro obsloužení události \"změna složky"
+#~ "\""
+
+#~ msgid "can't copy message %s to %s\n"
+#~ msgstr "Nemohu zkopírovat zprávu %s do %s\n"
+
+#~ msgid "failed to write Fetchinfo configuration to file\n"
+#~ msgstr "Selhal zápis konfigurace Fetchinfo\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "GData Plugin: Failed to write plugin configuration to file\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Zásuvný modul GData: Selhalo zapsání konfigurace do souboru\n"
+
+#~ msgid "Found location: (%.2f,%.2f)"
+#~ msgstr "Nalezeno místo: (%.2f,%.2f)"
+
+#~ msgid "Alleged country of origin: "
+#~ msgstr "Údajná země původu: "
+
+#~ msgid "Could not resolve location of IP address "
+#~ msgstr "Nelze získat umístění IP adresy "
+
+#~ msgid "Try to locate sender"
+#~ msgstr "Pokusit se určit místo odesílatele"
+
+#~ msgid "Andorra"
+#~ msgstr "Andorra "
+
+#~ msgid "United Arab Emirates"
+#~ msgstr "Spojené Arabské Emiráty"
+
+#~ msgid "Afghanistan"
+#~ msgstr "Afghánistán "
+
+#~ msgid "Antigua And Barbuda"
+#~ msgstr "Antigua a Barbuda"
+
+#~ msgid "Anguilla"
+#~ msgstr "Anguilla"
+
+#~ msgid "Albania"
+#~ msgstr "Albánie"
+
+#~ msgid "Armenia"
+#~ msgstr "Arménie"
+
+#~ msgid "Netherlands Antilles"
+#~ msgstr "Nizozemské Antily"
+
+#~ msgid "Angola"
+#~ msgstr "Angola"
+
+#~ msgid "Antarctica"
+#~ msgstr "Antarktida"
+
+#~ msgid "Argentina"
+#~ msgstr "Argentina"
+
+#~ msgid "American Samoa"
+#~ msgstr "Americká Samoa"
+
+#~ msgid "Austria"
+#~ msgstr "Rakousko"
+
+#~ msgid "Australia"
+#~ msgstr "Austrálie"
+
+#~ msgid "Aruba"
+#~ msgstr "Aruba"
+
+#~ msgid "Azerbaijan"
+#~ msgstr "Azerbajdžán"
+
+#~ msgid "Bosnia And Herzegovina"
+#~ msgstr "Bosna a Hercegovina"
+
+#~ msgid "Barbados"
+#~ msgstr "Barbados"
+
+#~ msgid "Bangladesh"
+#~ msgstr "Bangladéš"
+
+#~ msgid "Belgium"
+#~ msgstr "Belgie"
+
+#~ msgid "Burkina Faso"
+#~ msgstr "Burkina Faso"
+
+#~ msgid "Bulgaria"
+#~ msgstr "Bulharsko"
+
+#~ msgid "Bahrain"
+#~ msgstr "Bahrajn"
+
+#~ msgid "Burundi"
+#~ msgstr "Burundi"
+
+#~ msgid "Benin"
+#~ msgstr "Benin"
+
+#~ msgid "Bermuda"
+#~ msgstr "Bermudy"
+
+#~ msgid "Brunei Darussalam"
+#~ msgstr "Sultanát Brunei"
+
+#~ msgid "Bolivia"
+#~ msgstr "Bolívie"
+
+#~ msgid "Brazil"
+#~ msgstr "Brazílie"
+
+#~ msgid "Bahamas"
+#~ msgstr "Bahamy"
+
+#~ msgid "Bhutan"
+#~ msgstr "Bhútán"
+
+#~ msgid "Bouvet Island"
+#~ msgstr "Bouvetův ostrov"
+
+#~ msgid "Botswana"
+#~ msgstr "Botswana"
+
+#~ msgid "Belarus"
+#~ msgstr "Bělorusko"
+
+#~ msgid "Belize"
+#~ msgstr "Belize"
+
+#~ msgid "Canada"
+#~ msgstr "Kanada"
+
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "Kokosové ostrovy (Keeling)"
+
+#~ msgid "Central African Republic"
+#~ msgstr "Středoafrická republika"
+
+#~ msgid "Congo"
+#~ msgstr "Kongo"
+
+#~ msgid "Switzerland"
+#~ msgstr "Švýcarsko"
+
+#~ msgid "Cote D'Ivoire"
+#~ msgstr "Pobřeží slonoviny"
+
+#~ msgid "Cook Islands"
+#~ msgstr "Cookovy ostrovy"
+
+#~ msgid "Chile"
+#~ msgstr "Chile"
+
+#~ msgid "Cameroon"
+#~ msgstr "Kamerun"
+
+#~ msgid "China"
+#~ msgstr "Čína"
+
+#~ msgid "Colombia"
+#~ msgstr "Kolumbie"
+
+#~ msgid "Costa Rica"
+#~ msgstr "Kostarika"
+
+#~ msgid "Cuba"
+#~ msgstr "Kuba"
+
+#~ msgid "Cape Verde"
+#~ msgstr "Cape Verde"
+
+#~ msgid "Christmas Island"
+#~ msgstr "Vánoční ostrov"
+
+#~ msgid "Cyprus"
+#~ msgstr "Kypr"
+
+#~ msgid "Czech Republic"
+#~ msgstr "Česká republika"
+
+#~ msgid "Germany"
+#~ msgstr "Německo"
+
+#~ msgid "Djibouti"
+#~ msgstr "Džibutsko"
+
+#~ msgid "Denmark"
+#~ msgstr "Dánsko"
+
+#~ msgid "Dominica"
+#~ msgstr "Dominika"
+
+#~ msgid "Dominican Republic"
+#~ msgstr "Dominikánská republika"
+
+#~ msgid "Algeria"
+#~ msgstr "Alžír"
+
+#~ msgid "Ecuador"
+#~ msgstr "Ekvádor"
+
+#~ msgid "Estonia"
+#~ msgstr "Estonsko"
+
+#~ msgid "Egypt"
+#~ msgstr "Egypt"
+
+#~ msgid "Western Sahara"
+#~ msgstr "Západní Sahara"
+
+#~ msgid "Eritrea"
+#~ msgstr "Eritrea"
+
+#~ msgid "Spain"
+#~ msgstr "Španělsko"
+
+#~ msgid "Ethiopia"
+#~ msgstr "Etiopie"
+
+#~ msgid "Finland"
+#~ msgstr "Finsko"
+
+#~ msgid "Fiji"
+#~ msgstr "Fidži"
+
+#~ msgid "Falkland Islands (Malvinas)"
+#~ msgstr "Falklandy"
+
+#~ msgid "Micronesia, Federated States Of"
+#~ msgstr "Mikronésie"
+
+#~ msgid "Faroe Islands"
+#~ msgstr "Faerské ostrovy"
+
+#~ msgid "France"
+#~ msgstr "Francie"
+
+#~ msgid "France, Metropolitan"
+#~ msgstr "Francie, Metropolitan"
+
+#~ msgid "Gabon"
+#~ msgstr "Gabon"
+
+#~ msgid "United Kingdom"
+#~ msgstr "Velké Británie"
+
+#~ msgid "Grenada"
+#~ msgstr "Grenada"
+
+#~ msgid "Georgia"
+#~ msgstr "Gruzie"
+
+#~ msgid "French Guiana"
+#~ msgstr "Francouzská Guyana"
+
+#~ msgid "Ghana"
+#~ msgstr "Ghana"
+
+#~ msgid "Gibraltar"
+#~ msgstr "Gibraltar"
+
+#~ msgid "Greenland"
+#~ msgstr "Grónsko"
+
+#~ msgid "Gambia"
+#~ msgstr "Gambie"
+
+#~ msgid "Guinea"
+#~ msgstr "Guinea"
+
+#~ msgid "Guadeloupe"
+#~ msgstr "Guadeloupe"
+
+#~ msgid "Equatorial Guinea"
+#~ msgstr "Rovníková Guinea"
+
+#~ msgid "Greece"
+#~ msgstr "Řecko"
+
+#~ msgid "South Georgia And The South Sandwich Islands"
+#~ msgstr "Jižní Georgie a Jižní Sandwichovy ostrovy"
+
+#~ msgid "Guatemala"
+#~ msgstr "Guatemala"
+
+#~ msgid "Guam"
+#~ msgstr "Guam"
+
+#~ msgid "Guinea-Bissau"
+#~ msgstr "Guinea-Bissau"
+
+#~ msgid "Guyana"
+#~ msgstr "Guyana"
+
+#~ msgid "Hong Kong"
+#~ msgstr "Hong Kong"
+
+#~ msgid "Heard Island And Mcdonald Islands"
+#~ msgstr "Heardův ostrov a McDonaldovy ostrovy"
+
+#~ msgid "Honduras"
+#~ msgstr "Honduras"
+
+#~ msgid "Croatia"
+#~ msgstr "Chorvatsko"
+
+#~ msgid "Haiti"
+#~ msgstr "Haiti"
+
+#~ msgid "Hungary"
+#~ msgstr "Maďarsko"
+
+#~ msgid "Indonesia"
+#~ msgstr "Indonésie"
+
+#~ msgid "Ireland"
+#~ msgstr "Irsko"
+
+#~ msgid "Israel"
+#~ msgstr "Izrael"
+
+#~ msgid "India"
+#~ msgstr "Indie"
+
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "Britské území v Indickém oceánu"
+
+#~ msgid "Iraq"
+#~ msgstr "Írák"
+
+#~ msgid "Iran, Islamic Republic Of"
+#~ msgstr "Írán"
+
+#~ msgid "Iceland"
+#~ msgstr "Island"
+
+#~ msgid "Italy"
+#~ msgstr "Itálie"
+
+#~ msgid "Jamaica"
+#~ msgstr "Jamajka"
+
+#~ msgid "Jordan"
+#~ msgstr "Jordánsko"
+
+#~ msgid "Japan"
+#~ msgstr "Japonsko"
+
+#~ msgid "Kenya"
+#~ msgstr "Keňa"
+
+#~ msgid "Kyrgyzstan"
+#~ msgstr "Kyrgyzstán"
+
+#~ msgid "Cambodia"
+#~ msgstr "Kambodža"
+
+#~ msgid "Kiribati"
+#~ msgstr "Kiribati"
+
+#~ msgid "Comoros"
+#~ msgstr "Komory"
+
+#~ msgid "Saint Kitts And Nevis"
+#~ msgstr "Svatý Kryštof a Nevis"
+
+#~ msgid "Korea, Democratic People'S Republic Of"
+#~ msgstr "KLDR"
+
+#~ msgid "Korea, Republic Of"
+#~ msgstr "Jižní Korea"
+
+#~ msgid "Kuwait"
+#~ msgstr "Kuvajt"
+
+#~ msgid "Cayman Islands"
+#~ msgstr "Kajmanské ostrovy"
+
+#~ msgid "Kazakhstan"
+#~ msgstr "Kazachstán"
+
+#~ msgid "Lao People'S Democratic Republic"
+#~ msgstr "Laos"
+
+#~ msgid "Lebanon"
+#~ msgstr "Libanon"
+
+#~ msgid "Saint Lucia"
+#~ msgstr "Svatá Lucie"
+
+#~ msgid "Liechtenstein"
+#~ msgstr "Lichtenštejnsko"
+
+#~ msgid "Sri Lanka"
+#~ msgstr "Srí Lanka"
+
+#~ msgid "Liberia"
+#~ msgstr "Libérie"
+
+#~ msgid "Lesotho"
+#~ msgstr "Lesotho"
+
+#~ msgid "Lithuania"
+#~ msgstr "Litva"
+
+#~ msgid "Luxembourg"
+#~ msgstr "Lucembursko"
+
+#~ msgid "Latvia"
+#~ msgstr "Lotyšsko"
+
+#~ msgid "Libyan Arab Jamahiriya"
+#~ msgstr "Libye"
+
+#~ msgid "Morocco"
+#~ msgstr "Maroko"
+
+#~ msgid "Monaco"
+#~ msgstr "Monako"
+
+#~ msgid "Moldova, Republic Of"
+#~ msgstr "Moldávie"
+
+#~ msgid "Madagascar"
+#~ msgstr "Madagaskar"
+
+#~ msgid "Marshall Islands"
+#~ msgstr "Marshallovy ostrovy"
+
+#~ msgid "Macedonia, The Former Yugoslav Republic Of"
+#~ msgstr "Makedonie"
+
+#~ msgid "Mali"
+#~ msgstr "Mali"
+
+#~ msgid "Myanmar"
+#~ msgstr "Myanmar"
+
+#~ msgid "Mongolia"
+#~ msgstr "Mongolsko"
+
+#~ msgid "Macao"
+#~ msgstr "Macao"
+
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "Severní Mariany"
+
+#~ msgid "Martinique"
+#~ msgstr "Martinik"
+
+#~ msgid "Mauritania"
+#~ msgstr "Mauretánie"
+
+#~ msgid "Montserrat"
+#~ msgstr "Montserrat"
+
+#~ msgid "Malta"
+#~ msgstr "Malta"
+
+#~ msgid "Mauritius"
+#~ msgstr "Mauricius"
+
+#~ msgid "Maldives"
+#~ msgstr "Maledivy"
+
+#~ msgid "Malawi"
+#~ msgstr "Malawi"
+
+#~ msgid "Mexico"
+#~ msgstr "Mexiko"
+
+#~ msgid "Malaysia"
+#~ msgstr "Malajsie"
+
+#~ msgid "Mozambique"
+#~ msgstr "Mozambik"
+
+#~ msgid "Namibia"
+#~ msgstr "Namibie"
+
+#~ msgid "New Caledonia"
+#~ msgstr "Nová Kaledonie"
+
+#~ msgid "Niger"
+#~ msgstr "Niger"
+
+#~ msgid "Norfolk Island"
+#~ msgstr "Norfolků ostrov"
+
+#~ msgid "Nigeria"
+#~ msgstr "Nigérie"
+
+#~ msgid "Nicaragua"
+#~ msgstr "Nikaragua"
+
+#~ msgid "Netherlands"
+#~ msgstr "Nizozemí"
+
+#~ msgid "Norway"
+#~ msgstr "Norsko"
+
+#~ msgid "Nepal"
+#~ msgstr "Nepál"
+
+#~ msgid "Nauru"
+#~ msgstr "Nauru"
+
+#~ msgid "Niue"
+#~ msgstr "Niue"
+
+#~ msgid "New Zealand"
+#~ msgstr "Nový Zéland"
+
+#~ msgid "Oman"
+#~ msgstr "Omán"
+
+#~ msgid "Panama"
+#~ msgstr "Panama"
+
+#~ msgid "Peru"
+#~ msgstr "Peru"
+
+#~ msgid "French Polynesia"
+#~ msgstr "Francouzská Polynésie"
+
+#~ msgid "Papua New Guinea"
+#~ msgstr "Papua Nová Guinea"
+
+#~ msgid "Philippines"
+#~ msgstr "Filipíny"
+
+#~ msgid "Pakistan"
+#~ msgstr "Pakistán"
+
+#~ msgid "Poland"
+#~ msgstr "Polsko"
+
+#~ msgid "Saint Pierre And Miquelon"
+#~ msgstr "Saint-Pierre a Miquelon"
+
+#~ msgid "Pitcairn"
+#~ msgstr "Pitcairn"
+
+#~ msgid "Puerto Rico"
+#~ msgstr "Portoriko"
+
+#~ msgid "Portugal"
+#~ msgstr "Portugalsko"
+
+#~ msgid "Palau"
+#~ msgstr "Palau"
+
+#~ msgid "Paraguay"
+#~ msgstr "Paraguay "
+
+#~ msgid "Qatar"
+#~ msgstr "Katar"
+
+#~ msgid "Reunion"
+#~ msgstr "Réunion"
+
+#~ msgid "Romania"
+#~ msgstr "Rumunsko"
+
+#~ msgid "Russian Federation"
+#~ msgstr "Rusko"
+
+#~ msgid "Rwanda"
+#~ msgstr "Rwanda"
+
+#~ msgid "Saudi Arabia"
+#~ msgstr "Saudská Arábie"
+
+#~ msgid "Solomon Islands"
+#~ msgstr "Solomonovy ostrovy"
+
+#~ msgid "Seychelles"
+#~ msgstr "Seychely"
+
+#~ msgid "Sudan"
+#~ msgstr "Súdán"
+
+#~ msgid "Sweden"
+#~ msgstr "Švédsko"
+
+#~ msgid "Singapore"
+#~ msgstr "Singapur"
+
+#~ msgid "Saint Helena"
+#~ msgstr "Svatá Helena"
+
+#~ msgid "Slovenia"
+#~ msgstr "Slovinsko"
+
+#~ msgid "Svalbard And Jan Mayen"
+#~ msgstr "Špicberky a Jan Mayen"
+
+#~ msgid "Slovakia"
+#~ msgstr "Slovensko"
+
+#~ msgid "Sierra Leone"
+#~ msgstr "Sierra Leone"
+
+#~ msgid "San Marino"
+#~ msgstr "San Marino"
+
+#~ msgid "Senegal"
+#~ msgstr "Senegal"
+
+#~ msgid "Somalia"
+#~ msgstr "Somálsko"
+
+#~ msgid "Suriname"
+#~ msgstr "Surinam"
+
+#~ msgid "Sao Tome And Principe"
+#~ msgstr "Sao Tome a Principe"
+
+#~ msgid "El Salvador"
+#~ msgstr "Salvador"
+
+#~ msgid "Syrian Arab Republic"
+#~ msgstr "Sýrie"
+
+#~ msgid "Swaziland"
+#~ msgstr "Svazijsko"
+
+#~ msgid "Turks And Caicos Islands"
+#~ msgstr "Ostrovy Turks a Caicos"
+
+#~ msgid "Chad"
+#~ msgstr "Čad"
+
+#~ msgid "French Southern Territories"
+#~ msgstr "Francouzská jižní území"
+
+#~ msgid "Togo"
+#~ msgstr "Togo"
+
+#~ msgid "Thailand"
+#~ msgstr "Thajsko"
+
+#~ msgid "Tajikistan"
+#~ msgstr "Tadžikistán"
+
+#~ msgid "Tokelau"
+#~ msgstr "Tokelau"
+
+#~ msgid "Turkmenistan"
+#~ msgstr "Turkmenistán"
+
+#~ msgid "Tunisia"
+#~ msgstr "Tunisko"
+
+#~ msgid "Tonga"
+#~ msgstr "Tonga"
+
+#~ msgid "East Timor"
+#~ msgstr "Východní Timor"
+
+#~ msgid "Turkey"
+#~ msgstr "Turecko"
+
+#~ msgid "Trinidad And Tobago"
+#~ msgstr "Trinidad a Tobago"
+
+#~ msgid "Tuvalu"
+#~ msgstr "Tuvalu"
+
+#~ msgid "Taiwan, Province Of China"
+#~ msgstr "Tchaj-wan"
+
+#~ msgid "Tanzania, United Republic Of"
+#~ msgstr "Tanzanie"
+
+#~ msgid "Ukraine"
+#~ msgstr "Ukrajina"
+
+#~ msgid "Uganda"
+#~ msgstr "Uganda"
+
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "Spojené státy Menší odlehlé ostrovy"
+
+#~ msgid "United States"
+#~ msgstr "Spojené Státy"
+
+#~ msgid "Uruguay"
+#~ msgstr "Uruguay"
+
+#~ msgid "Uzbekistan"
+#~ msgstr "Uzbekistán"
+
+#~ msgid "Holy See (Vatican City State)"
+#~ msgstr "Vatikán"
+
+#~ msgid "Saint Vincent And The Grenadines"
+#~ msgstr "Svatý Vincenc a Grenadiny"
+
+#~ msgid "Venezuela"
+#~ msgstr "Venezuela"
+
+#~ msgid "Virgin Islands, British"
+#~ msgstr "Britské Panenské ostrovy"
+
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "Americké Panenské ostrovy"
+
+#~ msgid "Viet Nam"
+#~ msgstr "Vietnam"
+
+#~ msgid "Vanuatu"
+#~ msgstr "Vanuatu"
+
+#~ msgid "Wallis And Futuna"
+#~ msgstr "Wallis a Futuna"
+
+#~ msgid "Samoa"
+#~ msgstr "Samoa"
+
+#~ msgid "Yemen"
+#~ msgstr "Jemen"
+
+#~ msgid "Mayotte"
+#~ msgstr "Mayotte"
+
+#~ msgid "Serbia And Montenegro"
+#~ msgstr "Srbsko a Černá Hora"
+
+#~ msgid "South Africa"
+#~ msgstr "Jižní Afrika"
+
+#~ msgid "Zambia"
+#~ msgstr "Zambie"
+
+#~ msgid "Democratic Republic Of The Congo"
+#~ msgstr "Demokratická republika Kongo"
+
+#~ msgid "Zimbabwe"
+#~ msgstr "Zimbabwe"
+
+#~ msgid "GeoLocation"
+#~ msgstr "GeoLocation"
+
+#~ msgid "Could not initialize clutter"
+#~ msgstr "Nelze inicializovat nepořádek"
+
+#~ msgid "Could not create regular expression: %s\n"
+#~ msgstr "Nepodařilo se vytvořit regulární výraz: %s\n"
+
+#~ msgid "Failed to register messageview_show hook in the GeoLocation plugin"
+#~ msgstr ""
+#~ "Zásuvnému modulu GeoLocation se nepodařilo se zaregistrovat zobrazení "
+#~ "Okna zprávy"
+
+#~ 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)."
+#~ msgstr ""
+#~ "Tento zásuvný modul poskytuje funkčnost GeoLocation pro Claws Mail.\n"
+#~ "\n"
+#~ "Varování: Je technicky nemožné určit lokalizaci odesílatele s jistou "
+#~ "dávkou jistoty. Výsledek poskytovaný zásuvným modulem je jen hrubý odhad. "
+#~ "Zejména, správci emailových konferencí často odstraňují informace o "
+#~ "odesílateli, takže maily z e-mailových konferencí mohou být přiřazeny k "
+#~ "umístění serveru namísto odesílatele.\n"
+#~ "Pokud si nejste jisti, nevěřte výsledkům tohoto zásuvného modulu a "
+#~ "nespoléhejte na tyto informace při rozvodu.\n"
+#~ "\n"
+#~ "Zpětná vazba na <berndth at gmx.de> je vítána (ale pouze v případě, že to "
+#~ "není o manželských hádkách)."
+
+#~ msgid "GeoLocation integration"
+#~ msgstr "GeoLocation integrace"
+
+#~ msgid ""
+#~ "\n"
+#~ "Notification Plugin: Failed to write plugin configuration to file\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Zásuvný modul \"Upozorňování\": Nepodařilo se zapsat konfiguraci modoulu "
+#~ "do souboru\n"
+
+#~ msgid "Save sent messages to Sent folder"
+#~ msgstr "Uložit odeslané zprávy do složky Odeslaná pošta"
+
+#, fuzzy
+#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
+#~ msgstr "Claws Mail byl zaregistrován jako výchozí klient."
+
+#~ msgid "messages which contain header S"
+#~ msgstr "zprávy obsahující záhlaví S"
+
+#~ msgid "Keep 'To' addresses"
+#~ msgstr "Uchová 'To' adresy"
+
+#~ msgid "Keep 'Cc' addresses"
+#~ msgstr "Uchová 'Cc' adresy"
+
+#~ msgid "Keep 'Bcc' addresses"
+#~ msgstr "Uchová 'Bcc' adresy"
+
+#~ msgid "GData plugin: Authenticated\n"
+#~ msgstr "Zásuvný modul GData: Autentizován\n"
+
+#~ msgid "slow"
+#~ msgstr "pomalu"
+
+#~ msgid "fast"
+#~ msgstr "rychle"
+
+#~ msgid "Banner width in pixels (0 means screen size)"
+#~ msgstr "Šířka banneru v pixelech (0 znamená velikost obrazovky)"
+
+#~ msgid "Enable Popup"
+#~ msgstr "Povolit vyskakovací okno"
+
+#~ msgid "Good signature (untrusted) from %s."
+#~ msgstr "Správný podpis (nedůvěryhodný) od %s."
+
+#~ msgid "Cannot open temporary file"
+#~ msgstr "Nepodařilo se otevřít pomocný soubor"
+
+#~ msgid "Cannot init libCURL"
+#~ msgstr "Nepodařilo se inicializovat knihovnu libCURL"
+
+#~ msgid "Fetching '%s'..."
+#~ msgstr "Stahuji '%s'..."
+
+#~ msgid "Malformed feed"
+#~ msgstr "Poškozený kanál"
+
+#~ msgid ""
+#~ "RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
+#~ "comments of '%s'"
+#~ msgstr ""
+#~ "RSSyl: Pro RDF kanály není stahování komentářů podporováno. Nepodařilo se "
+#~ "stáhnout komentáře pro '%s'."
+
+#~ msgid "This feed format is not supported yet."
+#~ msgstr "Formát tohoto kanálu zatím není podporován."
+
+#~ msgid "N/A"
+#~ msgstr "N/A"
+
+#~ msgid "%ld byte"
+#~ msgid_plural "%ld bytes"
+#~ msgstr[0] "%ld bajt"
+#~ msgstr[1] "%ld bajty"
+#~ msgstr[2] "%ld bajtů"
+
+#~ msgid "size unknown"
+#~ msgstr "neznámá velikost"
+
+#~ msgid ""
+#~ "RSSyl: Cannot update feed %s:\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "RSSyl: Nepodarilo sa aktualizovať kanál %s:\n"
+#~ "%s\n"
+
+#~ msgid "You are already subscribed to this feed."
+#~ msgstr "Tento kanál už odebíráte."
+
+#~ msgid ""
+#~ "Couldn't fetch URL '%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nepodařilo se stáhnout URL '%s':\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Couldn't fetch URL '%s':\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Nepodařilo se stáhnout URL '%s':\n"
+#~ "%s\n"
+
+#~ msgid "Can't subscribe feed '%s'."
+#~ msgstr "Nepodařilo se přihlásit k odběru kanálu '%s'."
+
+#~ msgid "Time out connecting to URL %s\n"
+#~ msgstr "Časový limit pro připojení k URL %s vypršel\n"
+
+#~ msgid "Couldn't fetch URL %s\n"
+#~ msgstr "Nepodařilo se stáhnout URL %s\n"
+
+#~ msgid "Error parsing feed from URL %s\n"
+#~ msgstr "Nepodařilo se zpracovat data z URL %s\n"
+
+#~ msgid "Unsupported feed type at URL %s\n"
+#~ msgstr "Nepodporovaný typ kanálu na URL %s\n"
+
+#~ msgid "RSSyl: Feed update aborted, application is exiting.\n"
+#~ msgstr "RSSyl: Feed update zrušen, aplikace se ukončí.\n"
+
+#~ msgid "Can't remove feed '%s'."
+#~ msgstr "Nepodařilo se odstranit kanál '%s'."
+
+#~ msgid "Refresh _all feeds"
+#~ msgstr "Aktualizovat _všechny kanály"
+
+#~ msgid "_Unsubscribe feed..."
+#~ msgstr "Odhlásit kanál..."
+
+#~ msgid "Remove folder _tree..."
+#~ msgstr "Odstranit strom složek..."
+
+#~ msgid "RSSyl..."
+#~ msgstr "RSSyl..."
+
+#~ msgid "Keep default number of expired entries"
+#~ msgstr "Použít výchozí počet ponechávaných starých zpráv"
+
+#~ 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 ponechávaných starých zpráv:</b>\n"
+#~ "<small>(Vložte -1, pokud chcete ponechat všechny staré zprávy.)</small>"
+
+#~ msgid "Unsubscribe feed"
+#~ msgstr "Odhlášení kanálu"
+
+#~ msgid "Do you really want to remove feed"
+#~ msgstr "Opravdu chcete odhlásit kanál"
+
+#~ msgid "Remove cached entries"
+#~ msgstr "Odstranit lokální (offline) kopie zpráv"
+
+#~ msgid "RSSyl"
+#~ msgstr "RSSyl"
+
+#~ msgid "Default refresh interval in minutes"
+#~ msgstr "Výchozí interval aktualizace kanálu (v minutách)"
+
+#~ msgid "Default number of expired items to keep"
+#~ msgstr "Výchozí počet starých zpráv, které budou ponechány"
+
+#~ msgid "Set to -1 to keep expired items"
+#~ msgstr "Vložte -1, pokud chcete ponechat všechny staré zprávy"
+
+#~ msgid "Use this"
+#~ msgstr "Použít tento"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index efdbc1d..f952fb8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.14.0git127\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2017-03-22 13:43+0800\n"
+"POT-Creation-Date: 2017-12-17 11:51+0000\n"
 "PO-Revision-Date: 2016-11-02 01:34+8\n"
 "Last-Translator: Mark Chang <mark.cyj at gmail.com>\n"
 "Language-Team: Mark Chang <mark.cyj at gmail.com>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/account.c:396 src/account.c:463
+#: src/account.c:395 src/account.c:462
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -25,15 +25,15 @@ msgstr ""
 "發現已開啟的新郵件視窗\n"
 "編輯帳號前請先關閉所有的新郵件視窗"
 
-#: src/account.c:441
+#: src/account.c:440
 msgid "Can't create folder."
 msgstr "無法新增資料夾"
 
-#: src/account.c:728
+#: src/account.c:727
 msgid "Edit accounts"
 msgstr "編輯帳號"
 
-#: src/account.c:745
+#: src/account.c:744
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -42,62 +42,65 @@ msgstr ""
 "「收信」功能可從你已設定的帳號中標示為「已勾選」的項目,依序收取信件,其中預"
 "設的帳號將以粗體顯示。"
 
-#: src/account.c:816
+#: src/account.c:815
 msgid " _Set as default account "
 msgstr " 設定為預設帳號 (_S)"
 
-#: src/account.c:908
+#: src/account.c:907
 msgid "Accounts with remote folders cannot be copied."
 msgstr "包含遠端資料夾的帳號無法被複製"
 
-#: src/account.c:915
+#: src/account.c:914
+#, c-format
 msgid "Copy of %s"
 msgstr "複製 %s"
 
-#: src/account.c:1096
+#: src/account.c:1097
+#, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "你確認要刪除帳號 '%s' 嗎?"
 
-#: src/account.c:1098
+#: src/account.c:1099
 msgid "(Untitled)"
 msgstr "(無標題)"
 
-#: src/account.c:1099
+#: src/account.c:1100
 msgid "Delete account"
 msgstr "刪除帳號"
 
-#: src/account.c:1589
+#: src/account.c:1590
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1595
+#: src/account.c:1596
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "「收信」將從選取的帳號下取回郵件"
 
-#: src/account.c:1602 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7333 src/editaddress.c:1264
+#: src/account.c:1603 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:126 src/compose.c:7456 src/editaddress.c:1264
 #: src/editaddress.c:1321 src/editaddress.c:1341
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
-#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
+#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:427
 #: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
 #: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:465
-#: src/plugins/pdf_viewer/poppler_viewer.c:1792
-#: src/plugins/pgpcore/select-keys.c:395 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1868 src/prefs_template.c:79
+#: src/plugins/pdf_viewer/poppler_viewer.c:1803
+#: src/plugins/pgpcore/select-keys.c:409 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1870 src/prefs_template.c:79
 msgid "Name"
 msgstr "名稱"
 
-#: src/account.c:1610 src/prefs_account.c:1096 src/prefs_account.c:4141
+#: src/account.c:1611 src/prefs_account.c:1108 src/prefs_account.c:4241
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/account.c:1618 src/ssl_manager.c:100
+#: src/account.c:1619 src/ssl_manager.c:100
 msgid "Server"
 msgstr "伺服器"
 
 #: src/action.c:380
+#, c-format
 msgid "Could not get message file %d"
 msgstr "無法取得訊息檔案 %d"
 
@@ -106,10 +109,12 @@ msgid "Could not get message part."
 msgstr "無法取得部份的訊息"
 
 #: src/action.c:435
+#, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "無法取得多重郵件中的部份 %s"
 
 #: src/action.c:607
+#, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
 "because it contains %%f, %%F, %%as or %%p."
@@ -121,6 +126,7 @@ msgid "There is no filtering action set"
 msgstr "沒有設定任何的過濾行為"
 
 #: src/action.c:721
+#, c-format
 msgid ""
 "Invalid filtering action(s):\n"
 "%s"
@@ -129,6 +135,7 @@ msgstr ""
 "%s"
 
 #: src/action.c:986
+#, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
 "%s\n"
@@ -140,10 +147,10 @@ msgstr ""
 
 #: src/action.c:988 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:857
 #: src/plugins/tnef_parse/tnef_parse.c:75
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1831
-#: src/plugins/vcalendar/vcal_folder.c:1844
-#: src/plugins/vcalendar/vcal_folder.c:1847 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1840
+#: src/plugins/vcalendar/vcal_folder.c:1843 src/privacy.c:62
 msgid "Unknown error"
 msgstr "未知的錯誤"
 
@@ -152,10 +159,12 @@ msgid "Completed"
 msgstr "完成"
 
 #: src/action.c:1242
+#, c-format
 msgid "--- Running: %s\n"
 msgstr "--- 執行: %s\n"
 
 #: src/action.c:1246
+#, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- 已結束: %s\n"
 
@@ -164,6 +173,7 @@ msgid "Action's input/output"
 msgstr "輸出/入的動作"
 
 #: src/action.c:1607
+#, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 "('%%h' will be replaced with the argument)\n"
@@ -178,6 +188,7 @@ msgid "Action's hidden user argument"
 msgstr "隱藏使用者命令的動作"
 
 #: src/action.c:1616
+#, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 "('%%u' will be replaced with the argument)\n"
@@ -191,19 +202,19 @@ msgstr ""
 msgid "Action's user argument"
 msgstr "使用者命令的動作"
 
-#: src/addrclip.c:479
+#: src/addrclip.c:480
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr "無法複製資料夾到當前位置"
 
-#: src/addrclip.c:502
+#: src/addrclip.c:503
 msgid "Cannot copy an address book to itself."
 msgstr "無法複製通訊錄到當前位置"
 
-#: src/addrclip.c:593
+#: src/addrclip.c:594
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "無法移動資料夾到當前位置"
 
-#: src/addr_compl.c:689 src/addressbook.c:4946
+#: src/addr_compl.c:689 src/addressbook.c:4967
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "群組"
@@ -274,15 +285,15 @@ msgid ""
 "with the default set?"
 msgstr "確認要以預設值覆蓋所有的屬性名稱嗎?"
 
-#: src/addrcustomattr.c:212 src/addressbook.c:438 src/addressbook.c:466
-#: src/addressbook.c:483 src/edittags.c:272
+#: src/addrcustomattr.c:212 src/addressbook.c:439 src/addressbook.c:467
+#: src/addressbook.c:484 src/edittags.c:279
 #: src/plugins/archive/archiver_gtk.c:1307 src/prefs_actions.c:1084
-#: src/prefs_filtering.c:1695 src/prefs_template.c:1109
+#: src/prefs_filtering.c:1697 src/prefs_template.c:1110
 msgid "_Delete"
 msgstr "刪除"
 
-#: src/addrcustomattr.c:213 src/edittags.c:273 src/prefs_actions.c:1085
-#: src/prefs_filtering.c:1696 src/prefs_template.c:1110
+#: src/addrcustomattr.c:213 src/edittags.c:280 src/prefs_actions.c:1085
+#: src/prefs_filtering.c:1698 src/prefs_template.c:1111
 msgid "Delete _all"
 msgstr "刪除所有"
 
@@ -335,7 +346,7 @@ msgid "Duplicate email addresses"
 msgstr "重複的email"
 
 #: src/addrduplicates.c:442 src/addressadd.c:227
-#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:526
+#: src/plugins/pgpcore/select-keys.c:410 src/toolbar.c:529
 msgid "Address"
 msgstr "地址"
 
@@ -343,11 +354,11 @@ msgstr "地址"
 msgid "Address book path"
 msgstr "通訊錄路徑"
 
-#: src/addrduplicates.c:793 src/addressbook.c:1438 src/addressbook.c:1491
+#: src/addrduplicates.c:793 src/addressbook.c:1440 src/addressbook.c:1493
 msgid "Delete address(es)"
 msgstr "刪除地址"
 
-#: src/addrduplicates.c:794 src/addressbook.c:1492
+#: src/addrduplicates.c:794 src/addressbook.c:1494
 msgid "Really delete the address(es)?"
 msgstr "確定要刪除地址嗎?"
 
@@ -355,7 +366,7 @@ msgstr "確定要刪除地址嗎?"
 msgid "Delete address"
 msgstr "刪除地址"
 
-#: src/addrduplicates.c:843 src/addressbook.c:1439
+#: src/addrduplicates.c:843 src/addressbook.c:1441
 msgid "This address data is readonly and cannot be deleted."
 msgstr "這個地址資訊是唯讀的,而且不能被刪除"
 
@@ -367,7 +378,7 @@ msgstr "加入通訊錄"
 msgid "Contact"
 msgstr "連絡人"
 
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1056
+#: src/addressadd.c:238 src/addressbook.c:128 src/editaddress.c:1056
 #: src/editaddress.c:1131 src/editgroup.c:290
 msgid "Remarks"
 msgstr "備註"
@@ -376,7 +387,7 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇通訊錄資料夾"
 
-#: src/addressadd.c:534 src/addressbook.c:3216 src/addressbook.c:3267
+#: src/addressadd.c:534 src/addressbook.c:3215 src/addressbook.c:3266
 msgid "Add address(es)"
 msgstr "新增連絡人地址"
 
@@ -384,263 +395,263 @@ msgstr "新增連絡人地址"
 msgid "Can't add the specified address"
 msgstr "無法新增指定的連絡人地址"
 
-#: src/addressbook.c:126 src/addressbook.c:4934 src/editaddress.c:1053
+#: src/addressbook.c:127 src/addressbook.c:4955 src/editaddress.c:1053
 #: src/editaddress.c:1114 src/editgroup.c:289 src/expldifdlg.c:517
 #: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:762
 msgid "Email Address"
 msgstr "Email 地址"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:406
 msgid "_Book"
 msgstr "通訊錄(_B)"
 
-#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:602 src/mainwindow.c:514
+#: src/addressbook.c:407 src/addressbook.c:438 src/addressbook.c:466
+#: src/addressbook.c:483 src/compose.c:604 src/mainwindow.c:514
 #: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: src/addressbook.c:407 src/compose.c:607 src/mainwindow.c:517
+#: src/addressbook.c:408 src/compose.c:609 src/mainwindow.c:517
 #: src/messageview.c:212
 msgid "_Tools"
 msgstr "工具(_T)"
 
-#: src/addressbook.c:408 src/compose.c:608 src/mainwindow.c:519
+#: src/addressbook.c:409 src/compose.c:610 src/mainwindow.c:519
 #: src/messageview.c:213
 msgid "_Help"
 msgstr "協助(_H)"
 
-#: src/addressbook.c:411 src/addressbook.c:468
+#: src/addressbook.c:412 src/addressbook.c:469
 msgid "New _Book"
 msgstr "新增通訊錄(_B)"
 
-#: src/addressbook.c:412 src/addressbook.c:469
+#: src/addressbook.c:413 src/addressbook.c:470
 msgid "New _Folder"
 msgstr "新增資料夾(_F)"
 
-#: src/addressbook.c:413
+#: src/addressbook.c:414
 msgid "New _vCard"
 msgstr "新增vCard(_v)"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:418
 msgid "New _JPilot"
 msgstr "新增JPilot(_J)"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:421
 msgid "New LDAP _Server"
 msgstr "新增 LDAP Server"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:425
 msgid "_Edit book"
 msgstr "編輯通訊錄"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:426
 msgid "_Delete book"
 msgstr "刪除通訊錄"
 
-#: src/addressbook.c:427 src/compose.c:619
+#: src/addressbook.c:428 src/compose.c:621
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:433
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Save"
 msgstr "儲存"
 
-#: src/addressbook.c:428 src/compose.c:623 src/messageview.c:222
+#: src/addressbook.c:429 src/compose.c:625 src/messageview.c:222
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "關閉"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:432 src/addressbook.c:481 src/messageview.c:226
 msgid "_Select all"
 msgstr "全選"
 
-#: src/addressbook.c:433 src/addressbook.c:472 src/addressbook.c:488
+#: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
 msgid "C_ut"
 msgstr "剪下"
 
-#: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:631 src/mainwindow.c:548 src/messageview.c:225
+#: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
+#: src/compose.c:633 src/mainwindow.c:548 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "複製"
 
-#: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:436 src/addressbook.c:475 src/addressbook.c:491
+#: src/compose.c:634 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "貼上"
 
-#: src/addressbook.c:440 src/addressbook.c:485
+#: src/addressbook.c:441 src/addressbook.c:486
 msgid "New _Address"
 msgstr "新連絡人"
 
-#: src/addressbook.c:441 src/addressbook.c:470 src/addressbook.c:486
+#: src/addressbook.c:442 src/addressbook.c:471 src/addressbook.c:487
 msgid "New _Group"
 msgstr "新群組"
 
-#: src/addressbook.c:443 src/addressbook.c:492
+#: src/addressbook.c:444 src/addressbook.c:493
 msgid "_Mail To"
 msgstr "寄給"
 
-#: src/addressbook.c:447
+#: src/addressbook.c:448
 msgid "Import _LDIF file..."
 msgstr "匯入 _LDIF 檔案..."
 
-#: src/addressbook.c:448
+#: src/addressbook.c:449
 msgid "Import M_utt file..."
 msgstr "匯入 M_utt 檔案..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:450
 msgid "Import _Pine file..."
 msgstr "匯入 _Pine 檔案..."
 
-#: src/addressbook.c:451
+#: src/addressbook.c:452
 msgid "Export _HTML..."
 msgstr "匯出 _HTML 檔案..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:453
 msgid "Export LDI_F..."
 msgstr "匯出 LDI_F 檔案..."
 
-#: src/addressbook.c:454
+#: src/addressbook.c:455
 msgid "Find duplicates..."
 msgstr "尋找重複連絡人..."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:456
 msgid "Edit custom attributes..."
 msgstr "編輯使用者屬性"
 
-#: src/addressbook.c:458 src/compose.c:709 src/mainwindow.c:815
+#: src/addressbook.c:459 src/compose.c:711 src/mainwindow.c:813
 #: src/messageview.c:337
 msgid "_About"
 msgstr "關於"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:495
 msgid "_Browse Entry"
 msgstr "瀏覽(_B)"
 
-#: src/addressbook.c:507 src/crash.c:456 src/crash.c:475 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:250 src/plugins/pgpcore/sgpgme.c:143
+#: src/addressbook.c:508 src/crash.c:456 src/crash.c:475 src/importldif.c:114
+#: src/plugins/pgpcore/select-keys.c:253 src/plugins/pgpcore/sgpgme.c:143
 #: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:402
-#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:782
-#: src/prefs_themes.c:814 src/prefs_themes.c:815
+#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:819
+#: src/prefs_themes.c:851 src/prefs_themes.c:852
 msgid "Unknown"
 msgstr "未知"
 
-#: src/addressbook.c:514 src/addressbook.c:533 src/importldif.c:121
+#: src/addressbook.c:515 src/addressbook.c:534 src/importldif.c:121
 msgid "Success"
 msgstr "成功"
 
-#: src/addressbook.c:515 src/importldif.c:122
+#: src/addressbook.c:516 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "錯誤的命令"
 
-#: src/addressbook.c:516 src/importldif.c:123
+#: src/addressbook.c:517 src/importldif.c:123
 msgid "File not specified"
 msgstr "未指定檔案"
 
-#: src/addressbook.c:517 src/importldif.c:124
+#: src/addressbook.c:518 src/importldif.c:124
 msgid "Error opening file"
 msgstr "檔案開啟失敗"
 
-#: src/addressbook.c:518 src/importldif.c:125
+#: src/addressbook.c:519 src/importldif.c:125
 msgid "Error reading file"
 msgstr "讀取檔案錯誤"
 
-#: src/addressbook.c:519 src/importldif.c:126
+#: src/addressbook.c:520 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "已達檔案結尾"
 
-#: src/addressbook.c:520 src/importldif.c:127
+#: src/addressbook.c:521 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "記憶體配置錯誤"
 
-#: src/addressbook.c:521 src/importldif.c:128
+#: src/addressbook.c:522 src/importldif.c:128
 msgid "Bad file format"
 msgstr "檔案格式錯誤"
 
-#: src/addressbook.c:522 src/importldif.c:129
+#: src/addressbook.c:523 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "檔案寫入錯誤"
 
-#: src/addressbook.c:523 src/importldif.c:130
+#: src/addressbook.c:524 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "目錄開啟錯誤"
 
-#: src/addressbook.c:524 src/importldif.c:131
+#: src/addressbook.c:525 src/importldif.c:131
 msgid "No path specified"
 msgstr "指定的路徑不存在"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:535
 msgid "Error connecting to LDAP server"
 msgstr "連線至LDAP伺服器錯誤"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:536
 msgid "Error initializing LDAP"
 msgstr "LDAP初始化錯誤"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:537
 msgid "Error binding to LDAP server"
 msgstr "LDAP伺服器綁定錯誤"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:538
 msgid "Error searching LDAP database"
 msgstr "搜尋LDAP資料庫錯誤"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:539
 msgid "Timeout performing LDAP operation"
 msgstr "進行LDAP操作超時"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:540
 msgid "Error in LDAP search criteria"
 msgstr "LDAP搜尋標準錯誤"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:541
 msgid "No LDAP entries found for search criteria"
 msgstr "LDAP的搜尋標準進入點不存在"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:542
 msgid "LDAP search terminated on request"
 msgstr "LDAP搜尋被要求終止"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:543
 msgid "Error starting STARTTLS connection"
 msgstr "TLS連線起始失敗"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:544
 msgid "Distinguished Name (dn) is missing"
 msgstr "缺少識別名稱?"
 
-#: src/addressbook.c:544
+#: src/addressbook.c:545
 msgid "Missing required information"
 msgstr "缺少要求的資訊"
 
-#: src/addressbook.c:545
+#: src/addressbook.c:546
 msgid "Another contact exists with that key"
 msgstr "發現另一個連絡人存在相同的金鑰"
 
-#: src/addressbook.c:546
+#: src/addressbook.c:547
 msgid "Strong(er) authentication required"
 msgstr "需要更強而有力的認證碼"
 
-#: src/addressbook.c:913
+#: src/addressbook.c:915
 msgid "Sources"
 msgstr "來源"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
-#: src/toolbar.c:268 src/toolbar.c:2441
+#: src/addressbook.c:919 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/toolbar.c:268 src/toolbar.c:2519
 msgid "Address book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:1112 src/editldap.c:781
+#: src/addressbook.c:1114 src/editldap.c:793
 msgid "Search"
 msgstr "搜尋"
 
-#: src/addressbook.c:1483
+#: src/addressbook.c:1485
 msgid "Delete group"
 msgstr "刪除群組"
 
-#: src/addressbook.c:1484
+#: src/addressbook.c:1486
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -648,45 +659,48 @@ msgstr ""
 "確認要刪除群組嗎?\n"
 "所有的地址將遺失"
 
-#: src/addressbook.c:2195
+#: src/addressbook.c:2194
 msgid "Cannot paste. Target address book is readonly."
 msgstr "無法貼上,此地址是唯讀的"
 
-#: src/addressbook.c:2205
+#: src/addressbook.c:2204
 msgid "Cannot paste into an address group."
 msgstr "無法貼在地址群組上"
 
-#: src/addressbook.c:2913
+#: src/addressbook.c:2912
+#, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "確認要刪除%s內所有搜尋的結果和地址嗎?"
 
-#: src/addressbook.c:2916 src/addressbook.c:2942 src/addressbook.c:2949
+#: src/addressbook.c:2915 src/addressbook.c:2941 src/addressbook.c:2948
 #: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:177
-#: src/toolbar.c:494
+#: src/toolbar.c:497
 msgid "Delete"
 msgstr "刪除"
 
-#: src/addressbook.c:2925
+#: src/addressbook.c:2924
+#, 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嗎?如果只刪除資料夾,則裡面原有的地址都將被自動移至上層資料夾內"
 
-#: src/addressbook.c:2928 src/imap_gtk.c:370 src/mh_gtk.c:206
+#: src/addressbook.c:2927 src/imap_gtk.c:368 src/mh_gtk.c:206
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2928
 msgid "Delete _folder only"
 msgstr "只刪除資料夾(_f)"
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2928
 msgid "Delete folder and _addresses"
 msgstr "刪除資料夾和地址(_a)"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2939
+#, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will not be lost."
@@ -694,7 +708,8 @@ msgstr ""
 "確認刪除%s嗎?\n"
 "所有的地址將不會遺失"
 
-#: src/addressbook.c:2947
+#: src/addressbook.c:2946
+#, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will be lost."
@@ -702,27 +717,28 @@ msgstr ""
 "確認刪除%s嗎?\n"
 "所有的地址都將遺失"
 
-#: src/addressbook.c:3061
+#: src/addressbook.c:3060
+#, c-format
 msgid "Search '%s'"
 msgstr "尋找 %s"
 
-#: src/addressbook.c:3199 src/addressbook.c:3248
+#: src/addressbook.c:3198 src/addressbook.c:3247
 msgid "New Contacts"
 msgstr "新增連絡人"
 
-#: src/addressbook.c:4087
+#: src/addressbook.c:4086
 msgid "New user, could not save index file."
 msgstr "新連絡人無法儲存至索引檔中"
 
-#: src/addressbook.c:4091
+#: src/addressbook.c:4090
 msgid "New user, could not save address book files."
 msgstr "新連絡人無法儲存至通訊錄檔案"
 
-#: src/addressbook.c:4101
+#: src/addressbook.c:4100
 msgid "Old address book converted successfully."
 msgstr "舊通訊錄轉換成功"
 
-#: src/addressbook.c:4106
+#: src/addressbook.c:4105
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -730,7 +746,7 @@ msgstr ""
 "舊通訊錄已轉換,\n"
 "無法儲存新地址索引檔"
 
-#: src/addressbook.c:4119
+#: src/addressbook.c:4118
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -738,7 +754,7 @@ msgstr ""
 "無法轉換通訊錄,\n"
 "但已建立新的空通訊錄檔案"
 
-#: src/addressbook.c:4125
+#: src/addressbook.c:4124
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -746,7 +762,7 @@ msgstr ""
 "無法轉換通訊錄,\n"
 "無法儲存新的地址索引檔"
 
-#: src/addressbook.c:4130
+#: src/addressbook.c:4129
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -754,7 +770,7 @@ msgstr ""
 "無法轉換通訊錄,\n"
 "且無法建立新的通訊錄檔案"
 
-#: src/addressbook.c:4137 src/addressbook.c:4143
+#: src/addressbook.c:4136 src/addressbook.c:4142
 msgid "Addressbook conversion error"
 msgstr "通訊錄轉換失敗"
 
@@ -770,36 +786,36 @@ msgstr "無法讀取地址索引"
 msgid "Busy searching..."
 msgstr "正在搜尋..."
 
-#: src/addressbook.c:4898 src/prefs_send.c:188
+#: src/addressbook.c:4919 src/prefs_send.c:216
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:4910
+#: src/addressbook.c:4931
 msgid "Address Books"
 msgstr "通訊錄"
 
-#: src/addressbook.c:4922
+#: src/addressbook.c:4943
 msgid "Person"
 msgstr "人員"
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:355
-#: src/folderview.c:443 src/prefs_account.c:2799 src/prefs_folder_column.c:78
+#: src/addressbook.c:4979 src/exporthtml.c:884 src/folderview.c:355
+#: src/folderview.c:443 src/prefs_account.c:2860 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "資料夾"
 
-#: src/addressbook.c:4970
+#: src/addressbook.c:4991
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4982 src/addressbook.c:4994
+#: src/addressbook.c:5003 src/addressbook.c:5015
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5006
+#: src/addressbook.c:5027
 msgid "LDAP servers"
 msgstr "LDAP伺服器"
 
-#: src/addressbook.c:5018
+#: src/addressbook.c:5039
 msgid "LDAP Query"
 msgstr "LDAP查詢"
 
@@ -819,9 +835,9 @@ msgstr "通訊錄"
 #: src/plugins/spamassassin/spamassassin_gtk.c:443
 #: src/plugins/spamassassin/spamassassin_gtk.c:490
 #: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:675
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1619 src/prefs_matcher.c:1626
-#: src/prefs_matcher.c:1634 src/prefs_matcher.c:1636 src/prefs_matcher.c:2520
-#: src/prefs_matcher.c:2524
+#: src/prefs_matcher.c:710 src/prefs_matcher.c:1621 src/prefs_matcher.c:1628
+#: src/prefs_matcher.c:1636 src/prefs_matcher.c:1638 src/prefs_matcher.c:2522
+#: src/prefs_matcher.c:2526
 msgid "Any"
 msgstr "任何"
 
@@ -874,7 +890,7 @@ msgstr "郵件標頭區處理中"
 msgid "Include subfolders"
 msgstr "包含子資料夾"
 
-#: src/addrgather.c:450 src/prefs_filtering_action.c:1426
+#: src/addrgather.c:450 src/prefs_filtering_action.c:1429
 msgid "Header Name"
 msgstr "標頭名稱"
 
@@ -923,19 +939,19 @@ msgstr "地址更新"
 msgid "Update failed. Changes not written to Directory."
 msgstr "更新錯誤!所有的改變將不會被儲存"
 
-#: src/alertpanel.c:146 src/compose.c:9624
+#: src/alertpanel.c:146 src/compose.c:9800
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:159 src/compose.c:5780 src/compose.c:6301
-#: src/compose.c:12047 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:855 src/messageview.c:882 src/plugins/pgpcore/sgpgme.c:788
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4893
+#: src/alertpanel.c:159 src/compose.c:5852 src/compose.c:6380
+#: src/compose.c:12257 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:882 src/plugins/pgpcore/sgpgme.c:806
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4937
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5717 src/inc.c:663
-#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5789 src/inc.c:663
+#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:310
 msgid "Error"
 msgstr "錯誤"
 
@@ -1004,6 +1020,7 @@ msgid "things"
 msgstr "東西"
 
 #: src/common/plugin.c:334
+#, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "這個外掛提供了 %s (%s), 而這個功能已經在 %s 外掛中被提供了"
@@ -1025,6 +1042,7 @@ msgid "This module is for Claws Mail GTK1."
 msgstr "此模組適用於 Claws Mail GTK1"
 
 #: src/common/plugin.c:769
+#, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
@@ -1037,6 +1055,7 @@ msgid ""
 msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要新"
 
 #: src/common/plugin.c:781
+#, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要舊"
 
@@ -1069,6 +1088,7 @@ msgid "error occurred on authentication\n"
 msgstr "認證發生錯誤\n"
 
 #: src/common/smtp.c:585
+#, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "訊息太多(最大的容許量是 %s)\n"
 
@@ -1085,30 +1105,37 @@ msgid "Connection timed out.\n"
 msgstr "連線超時\n"
 
 #: src/common/socket.c:734
+#, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: 連線失敗 (%s)\n"
 
 #: src/common/socket.c:974
+#, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: 不知名的主機\n"
 
 #: src/common/socket.c:1066
+#, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: 尋找主機失敗 (%s)\n"
 
 #: src/common/socket.c:1370
+#, c-format
 msgid "write on fd%d: %s\n"
 msgstr "寫入 fd%d: %s\n"
 
 #: src/common/ssl_certificate.c:326
+#, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr "無法指定P12認證檔 (%s)\n"
 
 #: src/common/ssl_certificate.c:334
+#, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr "無法讀取P12認證檔 (%s)\n"
 
 #: src/common/ssl_certificate.c:343
+#, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr "無法匯入P12認證檔 (%s)\n"
 
@@ -1137,30 +1164,37 @@ msgid "Certificate issuer is not a CA"
 msgstr "簽證發行者不是CA"
 
 #: src/common/ssl_certificate.c:869
+#, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr "無法開啟簽證檔案 %s: %s\n"
 
 #: src/common/ssl_certificate.c:873
+#, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr "簽證檔案%s遺失(%s)\n"
 
 #: src/common/ssl_certificate.c:892
+#, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr "無法開啟金鑰檔案 %s (%s)\n"
 
 #: src/common/ssl_certificate.c:896
+#, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr "金鑰檔案%s遺失(%s)\n"
 
 #: src/common/ssl_certificate.c:1044
+#, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr "讀取P12簽證檔案%s失敗\n"
 
 #: src/common/ssl_certificate.c:1047
+#, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr "開啟P12簽證檔案 %s (%s)失敗\n"
 
 #: src/common/ssl_certificate.c:1051
+#, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "P12簽證檔案%s遺失 (%s)\n"
 
@@ -1176,637 +1210,646 @@ msgid "(Subject cleared by RegExp)"
 msgstr "標題已被RegExp清除"
 
 #: src/common/utils.c:256
+#, c-format
 msgid "%dB"
 msgstr "%dB"
 
 #: src/common/utils.c:257
+#, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dKB"
 
 #: src/common/utils.c:258
+#, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMB"
 
 #: src/common/utils.c:259
+#, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4759
+#: src/common/utils.c:4781
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "星期日"
 
-#: src/common/utils.c:4760
+#: src/common/utils.c:4782
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "星期一"
 
-#: src/common/utils.c:4761
+#: src/common/utils.c:4783
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "星期二"
 
-#: src/common/utils.c:4762
+#: src/common/utils.c:4784
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "星期三"
 
-#: src/common/utils.c:4763
+#: src/common/utils.c:4785
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "星期四"
 
-#: src/common/utils.c:4764
+#: src/common/utils.c:4786
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "星期五"
 
-#: src/common/utils.c:4765
+#: src/common/utils.c:4787
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "星期六"
 
-#: src/common/utils.c:4767
+#: src/common/utils.c:4789
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "一月"
 
-#: src/common/utils.c:4768
+#: src/common/utils.c:4790
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "二月"
 
-#: src/common/utils.c:4769
+#: src/common/utils.c:4791
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "三月"
 
-#: src/common/utils.c:4770
+#: src/common/utils.c:4792
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "四月"
 
-#: src/common/utils.c:4771
+#: src/common/utils.c:4793
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "五月"
 
-#: src/common/utils.c:4772
+#: src/common/utils.c:4794
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "六月"
 
-#: src/common/utils.c:4773
+#: src/common/utils.c:4795
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "七月"
 
-#: src/common/utils.c:4774
+#: src/common/utils.c:4796
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "八月"
 
-#: src/common/utils.c:4775
+#: src/common/utils.c:4797
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "九月"
 
-#: src/common/utils.c:4776
+#: src/common/utils.c:4798
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "十月"
 
-#: src/common/utils.c:4777
+#: src/common/utils.c:4799
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "十一月"
 
-#: src/common/utils.c:4778
+#: src/common/utils.c:4800
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "十二月"
 
-#: src/common/utils.c:4780
+#: src/common/utils.c:4802
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "星期日"
 
-#: src/common/utils.c:4781
+#: src/common/utils.c:4803
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "星期一"
 
-#: src/common/utils.c:4782
+#: src/common/utils.c:4804
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "星期二"
 
-#: src/common/utils.c:4783
+#: src/common/utils.c:4805
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "星期三"
 
-#: src/common/utils.c:4784
+#: src/common/utils.c:4806
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "星期四"
 
-#: src/common/utils.c:4785
+#: src/common/utils.c:4807
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "星期五"
 
-#: src/common/utils.c:4786
+#: src/common/utils.c:4808
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "星期六"
 
-#: src/common/utils.c:4788
+#: src/common/utils.c:4810
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "一月"
 
-#: src/common/utils.c:4789
+#: src/common/utils.c:4811
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "二月"
 
-#: src/common/utils.c:4790
+#: src/common/utils.c:4812
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "三月"
 
-#: src/common/utils.c:4791
+#: src/common/utils.c:4813
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "四月"
 
-#: src/common/utils.c:4792
+#: src/common/utils.c:4814
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "五月"
 
-#: src/common/utils.c:4793
+#: src/common/utils.c:4815
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "六月"
 
-#: src/common/utils.c:4794
+#: src/common/utils.c:4816
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "七月"
 
-#: src/common/utils.c:4795
+#: src/common/utils.c:4817
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "八月"
 
-#: src/common/utils.c:4796
+#: src/common/utils.c:4818
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "九月"
 
-#: src/common/utils.c:4797
+#: src/common/utils.c:4819
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "十月"
 
-#: src/common/utils.c:4798
+#: src/common/utils.c:4820
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "十一月"
 
-#: src/common/utils.c:4799
+#: src/common/utils.c:4821
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "十二月"
 
-#: src/common/utils.c:4810
+#: src/common/utils.c:4832
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "上午"
 
-#: src/common/utils.c:4811
+#: src/common/utils.c:4833
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "下午"
 
-#: src/common/utils.c:4812
+#: src/common/utils.c:4834
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "上午"
 
-#: src/common/utils.c:4813
+#: src/common/utils.c:4835
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "下午"
 
-#: src/compose.c:591
+#: src/compose.c:593
 msgid "_Add..."
 msgstr "新增(_A)..."
 
-#: src/compose.c:592 src/mh_gtk.c:377 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:594 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:316
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/compose.c:594 src/folderview.c:254
+#: src/compose.c:596 src/folderview.c:254
 msgid "_Properties..."
 msgstr "屬性(_P)"
 
-#: src/compose.c:601 src/mainwindow.c:516 src/messageview.c:211
+#: src/compose.c:603 src/mainwindow.c:516 src/messageview.c:211
 msgid "_Message"
 msgstr "郵件(_M)"
 
-#: src/compose.c:604
+#: src/compose.c:606
 msgid "_Spelling"
 msgstr "拼字(_S)"
 
-#: src/compose.c:606 src/compose.c:673
+#: src/compose.c:608 src/compose.c:675
 msgid "_Options"
 msgstr "選用(_O)"
 
-#: src/compose.c:610
+#: src/compose.c:612
 msgid "S_end"
 msgstr "傳送(_e)"
 
-#: src/compose.c:611
+#: src/compose.c:613
 msgid "Send _later"
 msgstr "稍後傳送(_l)"
 
-#: src/compose.c:614
+#: src/compose.c:616
 msgid "_Attach file"
 msgstr "附加檔案(_A)"
 
-#: src/compose.c:615
+#: src/compose.c:617
 msgid "_Insert file"
 msgstr "插入檔案(_I)"
 
-#: src/compose.c:616
+#: src/compose.c:618
 msgid "Insert si_gnature"
 msgstr "插入簽名(_g)"
 
-#: src/compose.c:617
+#: src/compose.c:619
 msgid "_Replace signature"
 msgstr "覆蓋簽名(_R)"
 
-#: src/compose.c:621
+#: src/compose.c:623
 msgid "_Print"
 msgstr "列印(_P)"
 
-#: src/compose.c:626 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:628 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "復原(_U)"
 
-#: src/compose.c:627 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:629 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "取消復原(_R)"
 
-#: src/compose.c:630 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "剪下(_t)"
 
-#: src/compose.c:634
+#: src/compose.c:636
 msgid "_Special paste"
 msgstr "特殊貼上(_S)"
 
-#: src/compose.c:635
+#: src/compose.c:637
 msgid "As _quotation"
 msgstr "如引言(_q)"
 
-#: src/compose.c:636
+#: src/compose.c:638
 msgid "_Wrapped"
 msgstr "已換行(_W)"
 
-#: src/compose.c:637
+#: src/compose.c:639
 msgid "_Unwrapped"
 msgstr "不換行(_U)"
 
-#: src/compose.c:639 src/mainwindow.c:549
+#: src/compose.c:641 src/mainwindow.c:549
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "全選(_a)"
 
-#: src/compose.c:641
+#: src/compose.c:643
 msgid "A_dvanced"
 msgstr "進階(_d)"
 
-#: src/compose.c:642
+#: src/compose.c:644
 msgid "Move a character backward"
 msgstr "向後移動一個位元"
 
-#: src/compose.c:643
+#: src/compose.c:645
 msgid "Move a character forward"
 msgstr "向前移動一個位元"
 
-#: src/compose.c:644
+#: src/compose.c:646
 msgid "Move a word backward"
 msgstr "向後移動一個字"
 
-#: src/compose.c:645
+#: src/compose.c:647
 msgid "Move a word forward"
 msgstr "向前移動一個字"
 
-#: src/compose.c:646
+#: src/compose.c:648
 msgid "Move to beginning of line"
 msgstr "移至列首"
 
-#: src/compose.c:647
+#: src/compose.c:649
 msgid "Move to end of line"
 msgstr "移至列尾"
 
-#: src/compose.c:648
+#: src/compose.c:650
 msgid "Move to previous line"
 msgstr "移至上一列"
 
-#: src/compose.c:649
+#: src/compose.c:651
 msgid "Move to next line"
 msgstr "移至下一列"
 
-#: src/compose.c:650
+#: src/compose.c:652
 msgid "Delete a character backward"
 msgstr "向後刪除一個字元"
 
-#: src/compose.c:651
+#: src/compose.c:653
 msgid "Delete a character forward"
 msgstr "向前刪除一個字元"
 
-#: src/compose.c:652
+#: src/compose.c:654
 msgid "Delete a word backward"
 msgstr "向後刪除一個字"
 
-#: src/compose.c:653
+#: src/compose.c:655
 msgid "Delete a word forward"
 msgstr "向前刪除一個字"
 
-#: src/compose.c:654
+#: src/compose.c:656
 msgid "Delete line"
 msgstr "刪除列"
 
-#: src/compose.c:655
+#: src/compose.c:657
 msgid "Delete to end of line"
 msgstr "刪除至列尾"
 
-#: src/compose.c:658 src/messageview.c:228
+#: src/compose.c:660 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "尋找(_F)"
 
-#: src/compose.c:661
+#: src/compose.c:663
 msgid "_Wrap current paragraph"
 msgstr "目前的段落換行(_W)"
 
-#: src/compose.c:662
+#: src/compose.c:664
 msgid "Wrap all long _lines"
 msgstr "所有的長列換行(_l)"
 
-#: src/compose.c:664
+#: src/compose.c:666
 msgid "Edit with e_xternal editor"
 msgstr "用外部編輯器進行編輯(_x)"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "_Check all or check selection"
 msgstr "檢查所有或勾選的項目(_C)"
 
-#: src/compose.c:668
+#: src/compose.c:670
 msgid "_Highlight all misspelled words"
 msgstr "標示所有拼錯的單字(_H)"
 
-#: src/compose.c:669
+#: src/compose.c:671
 msgid "Check _backwards misspelled word"
 msgstr "向後檢查拼錯的單字(_b)"
 
-#: src/compose.c:670
+#: src/compose.c:672
 msgid "_Forward to next misspelled word"
 msgstr "向前檢查拼錯的單字(_F)"
 
-#: src/compose.c:677
+#: src/compose.c:679
 msgid "Reply _mode"
 msgstr "回復模式(_m)"
 
-#: src/compose.c:679
+#: src/compose.c:681
 msgid "Privacy _System"
 msgstr "隱私系統(_S)"
 
-#: src/compose.c:683
+#: src/compose.c:685
 msgid "_Priority"
 msgstr "優先權(_P)"
 
-#: src/compose.c:685 src/mainwindow.c:611 src/messageview.c:264
+#: src/compose.c:687 src/mainwindow.c:611 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "字元編碼(_e)"
 
-#: src/compose.c:690 src/mainwindow.c:616 src/messageview.c:269
+#: src/compose.c:692 src/mainwindow.c:616 src/messageview.c:269
 msgid "Western European"
 msgstr "西歐"
 
-#: src/compose.c:691 src/mainwindow.c:617 src/messageview.c:270
+#: src/compose.c:693 src/mainwindow.c:617 src/messageview.c:270
 msgid "Baltic"
 msgstr "波羅的海"
 
-#: src/compose.c:692 src/mainwindow.c:618 src/messageview.c:271
+#: src/compose.c:694 src/mainwindow.c:618 src/messageview.c:271
 msgid "Hebrew"
 msgstr "希伯來"
 
-#: src/compose.c:693 src/mainwindow.c:619 src/messageview.c:272
+#: src/compose.c:695 src/mainwindow.c:619 src/messageview.c:272
 msgid "Arabic"
 msgstr "阿拉伯"
 
-#: src/compose.c:694 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:696 src/mainwindow.c:620 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "西里爾"
 
-#: src/compose.c:695 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:697 src/mainwindow.c:621 src/messageview.c:274
 msgid "Japanese"
 msgstr "日文"
 
-#: src/compose.c:696 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:698 src/mainwindow.c:622 src/messageview.c:275
 msgid "Chinese"
 msgstr "中文"
 
-#: src/compose.c:697 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:699 src/mainwindow.c:623 src/messageview.c:276
 msgid "Korean"
 msgstr "韓文"
 
-#: src/compose.c:698 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:700 src/mainwindow.c:624 src/messageview.c:277
 msgid "Thai"
 msgstr "泰文"
 
-#: src/compose.c:701 src/mainwindow.c:734 src/messageview.c:313
+#: src/compose.c:703 src/mainwindow.c:734 src/messageview.c:313
 msgid "_Address book"
 msgstr "通訊錄"
 
-#: src/compose.c:703
+#: src/compose.c:705
 msgid "_Template"
 msgstr "樣板"
 
-#: src/compose.c:705 src/mainwindow.c:762 src/messageview.c:333
+#: src/compose.c:707 src/mainwindow.c:762 src/messageview.c:333
 msgid "Actio_ns"
 msgstr "動作"
 
-#: src/compose.c:714
+#: src/compose.c:716
 msgid "Aut_o wrapping"
 msgstr "自動換行"
 
-#: src/compose.c:715
+#: src/compose.c:717
 msgid "Auto _indent"
 msgstr "自動縮排(_i)"
 
-#: src/compose.c:716
+#: src/compose.c:718
 msgid "Si_gn"
 msgstr "簽名"
 
-#: src/compose.c:717
+#: src/compose.c:719
 msgid "_Encrypt"
 msgstr "加密"
 
-#: src/compose.c:718
+#: src/compose.c:720
 msgid "_Request Return Receipt"
 msgstr "要求回條"
 
-#: src/compose.c:719
+#: src/compose.c:721
 msgid "Remo_ve references"
 msgstr "移除參考"
 
-#: src/compose.c:720
+#: src/compose.c:722
 msgid "Show _ruler"
 msgstr "顯示尺標"
 
-#: src/compose.c:725 src/compose.c:735
+#: src/compose.c:727 src/compose.c:737
 msgid "_Normal"
 msgstr "一般"
 
-#: src/compose.c:726 src/mainwindow.c:665 src/messageview.c:302
+#: src/compose.c:728 src/mainwindow.c:665 src/messageview.c:302
 msgid "_All"
 msgstr "所有"
 
-#: src/compose.c:727 src/mainwindow.c:666 src/messageview.c:303
+#: src/compose.c:729 src/mainwindow.c:666 src/messageview.c:303
 msgid "_Sender"
 msgstr "傳送者"
 
-#: src/compose.c:728
+#: src/compose.c:730
 msgid "_Mailing-list"
 msgstr "寄送清單"
 
-#: src/compose.c:733
+#: src/compose.c:735
 msgid "_Highest"
 msgstr "最高"
 
-#: src/compose.c:734
+#: src/compose.c:736
 msgid "Hi_gh"
 msgstr "高"
 
-#: src/compose.c:736
+#: src/compose.c:738
 msgid "Lo_w"
 msgstr "低"
 
-#: src/compose.c:737
+#: src/compose.c:739
 msgid "_Lowest"
 msgstr "最低"
 
-#: src/compose.c:742 src/mainwindow.c:880 src/messageview.c:350
+#: src/compose.c:744 src/mainwindow.c:878 src/messageview.c:350
 msgid "_Automatic"
 msgstr "自動"
 
-#: src/compose.c:743 src/mainwindow.c:881 src/messageview.c:351
+#: src/compose.c:745 src/mainwindow.c:879 src/messageview.c:351
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7位元 ASCII (US-ASC_II)"
 
-#: src/compose.c:744 src/mainwindow.c:882 src/messageview.c:352
+#: src/compose.c:746 src/mainwindow.c:880 src/messageview.c:352
 msgid "Unicode (_UTF-8)"
 msgstr "萬國碼 (_UTF-8)"
 
-#: src/compose.c:748 src/mainwindow.c:886 src/messageview.c:356
+#: src/compose.c:750 src/mainwindow.c:884 src/messageview.c:356
 msgid "Central European (ISO-8859-_2)"
 msgstr "中歐 (ISO-8859-_2)"
 
-#: src/compose.c:751 src/mainwindow.c:889 src/messageview.c:359
+#: src/compose.c:753 src/mainwindow.c:887 src/messageview.c:359
 msgid "Greek (ISO-8859-_7)"
 msgstr "希臘 (ISO-8859-_7)"
 
-#: src/compose.c:756 src/mainwindow.c:894 src/messageview.c:364
+#: src/compose.c:758 src/mainwindow.c:892 src/messageview.c:364
 msgid "Turkish (ISO-8859-_9)"
 msgstr "士耳其語 (ISO-8859-_9)"
 
-#: src/compose.c:1085
+#: src/compose.c:1087
 msgid "New message From format error."
 msgstr "新訊息寄件者格式錯誤"
 
-#: src/compose.c:1177
+#: src/compose.c:1180
 msgid "New message subject format error."
 msgstr "新訊息標題格式錯誤"
 
-#: src/compose.c:1208 src/quote_fmt.c:570
+#: src/compose.c:1212 src/quote_fmt.c:563
+#, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "新訊息內容樣板在第%d行出現錯誤"
 
-#: src/compose.c:1469
+#: src/compose.c:1477
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "無法回覆,原始信件可能不存在"
 
-#: src/compose.c:1652 src/quote_fmt.c:587
+#: src/compose.c:1660 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr "回寄信件內的寄件者樣板包含一個無效的郵件地址"
 
-#: src/compose.c:1700 src/quote_fmt.c:590
+#: src/compose.c:1709 src/quote_fmt.c:583
+#, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "回寄信件內的內容樣板在第%d行出現一個錯誤"
 
-#: src/compose.c:1834 src/compose.c:2025 src/quote_fmt.c:607
+#: src/compose.c:1843 src/compose.c:2035 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "轉寄信件內的寄件者樣板包含一個無效的郵件地址"
 
-#: src/compose.c:1894 src/quote_fmt.c:610
+#: src/compose.c:1904 src/quote_fmt.c:603
+#, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "轉寄信件內的內容樣板在第%d行出現一個錯誤"
 
-#: src/compose.c:2067
+#: src/compose.c:2078
 msgid "Fw: multiple emails"
 msgstr "回覆:多重郵件"
 
-#: src/compose.c:2569
+#: src/compose.c:2580
+#, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "改寄信件內的內容樣板在第%d行出現一個錯誤"
 
-#: src/compose.c:2636 src/gtk/headers.h:14
+#: src/compose.c:2647 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "副本:"
 
-#: src/compose.c:2639 src/gtk/headers.h:15
+#: src/compose.c:2650 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "密件副本:"
 
-#: src/compose.c:2642 src/gtk/headers.h:12
+#: src/compose.c:2653 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "回信給:"
 
-#: src/compose.c:2645 src/compose.c:4963 src/compose.c:4965
+#: src/compose.c:2656 src/compose.c:5023 src/compose.c:5025
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "新聞群組:"
 
-#: src/compose.c:2648 src/gtk/headers.h:34
+#: src/compose.c:2659 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "跟隨至:"
 
-#: src/compose.c:2651 src/gtk/headers.h:17
+#: src/compose.c:2662 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "回覆至:"
 
-#: src/compose.c:2655 src/compose.c:4960 src/compose.c:4968
+#: src/compose.c:2666 src/compose.c:5020 src/compose.c:5028
 #: src/gtk/headers.h:13 src/summary_search.c:481
 msgid "To:"
 msgstr "收件者:"
 
-#: src/compose.c:2841
+#: src/compose.c:2856
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "無法夾帶檔案(字元轉換失敗)"
 
-#: src/compose.c:2847
+#: src/compose.c:2862
+#, c-format
 msgid ""
 "The following file has been attached: \n"
 "%s"
@@ -1820,66 +1863,73 @@ msgstr[1] ""
 "下列檔案已經夾帶:\n"
 "%s"
 
-#: src/compose.c:3124
+#: src/compose.c:3142
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "樣板內\"引用標示\"有誤"
 
-#: src/compose.c:3630
+#: src/compose.c:3671
+#, c-format
 msgid "Could not get size of file '%s'."
 msgstr "無法取得檔案'%s'大小"
 
-#: src/compose.c:3641
+#: src/compose.c:3689
+#, 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 "你可以在訊息內容中插入一個檔案 %s,確認要這樣幹嗎?"
 
-#: src/compose.c:3644
+#: src/compose.c:3692
 msgid "Are you sure?"
 msgstr "你確定嗎?"
 
-#: src/compose.c:3645 src/compose.c:10650 src/compose.c:11526
+#: src/compose.c:3693 src/compose.c:10856 src/compose.c:11734
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/compose.c:3769
+#: src/compose.c:3817
+#, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空白的"
 
-#: src/compose.c:3770
+#: src/compose.c:3818
 msgid "Empty file"
 msgstr "清空檔案"
 
-#: src/compose.c:3771
+#: src/compose.c:3819
 msgid "_Attach anyway"
 msgstr "直接夾檔(_A)"
 
-#: src/compose.c:3780
+#: src/compose.c:3828
+#, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s"
 
-#: src/compose.c:3807
+#: src/compose.c:3855
+#, c-format
 msgid "Message: %s"
 msgstr "訊息: %s"
 
-#: src/compose.c:4800 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4860 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " 已編輯"
 
-#: src/compose.c:4807 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4867 src/plugins/python/composewindowtype.c:501
+#, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新信件 %s"
 
-#: src/compose.c:4810 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4870 src/plugins/python/composewindowtype.c:504
+#, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[無主題] - 新信件 %s"
 
-#: src/compose.c:4812 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4872 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "新信件"
 
-#: src/compose.c:4839 src/messageview.c:903
+#: src/compose.c:4899 src/messageview.c:903
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1887,54 +1937,57 @@ msgstr ""
 "尚未指定郵件的傳送地址\n"
 "傳送前請選擇一個郵件地址"
 
-#: src/compose.c:5060 src/compose.c:5097
+#: src/compose.c:5120 src/compose.c:5157
+#, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "只存在一個預設的收件者 '%s',確認寄出?"
 
-#: src/compose.c:5062 src/compose.c:5099 src/compose.c:5142 src/compose.c:5190
-#: src/prefs_account.c:3323 src/toolbar.c:484 src/toolbar.c:516
+#: src/compose.c:5122 src/compose.c:5159 src/compose.c:5202 src/compose.c:5251
+#: src/prefs_account.c:3405 src/toolbar.c:487 src/toolbar.c:519
 msgid "Send"
 msgstr "傳送"
 
-#: src/compose.c:5064 src/compose.c:5101 src/compose.c:5135 src/compose.c:5183
-#: src/compose.c:5718 src/folderview.c:2543 src/messageview.c:856
+#: src/compose.c:5124 src/compose.c:5161 src/compose.c:5195 src/compose.c:5244
+#: src/compose.c:5790 src/folderview.c:2543 src/messageview.c:856
 #: src/messageview.c:884 src/plugins/attachwarner/attachwarner.c:210
-#: src/toolbar.c:2933
+#: src/toolbar.c:3030
 msgid "_Send"
 msgstr "傳送(_S)"
 
-#: src/compose.c:5118
+#: src/compose.c:5178
 msgid "Recipient is not specified."
 msgstr "尚未指定收件者"
 
-#: src/compose.c:5137 src/compose.c:5185
+#: src/compose.c:5197 src/compose.c:5246
 #: src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "草稿(_Q)"
 
-#: src/compose.c:5138
+#: src/compose.c:5198
+#, c-format
 msgid "Subject is empty. %s"
 msgstr "主題空白 %s"
 
-#: src/compose.c:5139 src/compose.c:5187
+#: src/compose.c:5199 src/compose.c:5248
 #: src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "確認寄出?"
 
-#: src/compose.c:5140 src/compose.c:5188
+#: src/compose.c:5200 src/compose.c:5249
 #: src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "儲存至草稿?"
 
-#: src/compose.c:5142 src/compose.c:5190 src/toolbar.c:517
+#: src/compose.c:5202 src/compose.c:5251 src/toolbar.c:520
 msgid "Send later"
 msgstr "稍後寄送"
 
-#: src/compose.c:5186
+#: src/compose.c:5247
+#, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "傳送給 %d 接收者. %s"
 
-#: src/compose.c:5243 src/compose.c:10122
+#: src/compose.c:5304 src/compose.c:10298
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -1944,7 +1997,7 @@ msgstr ""
 "\n"
 "字元轉換失敗"
 
-#: src/compose.c:5246 src/compose.c:10125
+#: src/compose.c:5307 src/compose.c:10301
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -1954,7 +2007,8 @@ msgstr ""
 "\n"
 "無法取得收件者的加密金鑰"
 
-#: src/compose.c:5252 src/compose.c:10119
+#: src/compose.c:5313 src/compose.c:10295
+#, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -1964,7 +2018,8 @@ msgstr ""
 "\n"
 "簽名天敗:  %s"
 
-#: src/compose.c:5255
+#: src/compose.c:5316
+#, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -1974,11 +2029,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/compose.c:5257
+#: src/compose.c:5318
 msgid "Could not queue message for sending."
 msgstr "無法將寄送信件儲存在草稿"
 
-#: src/compose.c:5272 src/compose.c:5332
+#: src/compose.c:5333 src/compose.c:5393
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -1986,7 +2041,8 @@ msgstr ""
 "草稿信件無法被傳送\n"
 "從主視窗用\"傳送草稿訊息\"重試"
 
-#: src/compose.c:5328
+#: src/compose.c:5389
+#, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -1994,7 +2050,8 @@ msgstr ""
 "%s\n"
 "從主視窗用\"傳送草稿訊息\"重試"
 
-#: src/compose.c:5714
+#: src/compose.c:5786
+#, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 "to the specified %s charset.\n"
@@ -2003,7 +2060,8 @@ msgstr ""
 "無法轉換訊息的字元編碼至指定的 %s 編碼\n"
 "確認以 %s 傳送?"
 
-#: src/compose.c:5776
+#: src/compose.c:5848
+#, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 "The contents of the message might be broken on the way to the delivery.\n"
@@ -2014,69 +2072,72 @@ msgstr ""
 "訊息內容將被打斷以利傳輸\n"
 "確定要傳送嗎?"
 
-#: src/compose.c:5887
+#: src/compose.c:5959
+#, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "郵件 %s 無法被加密"
 
-#: src/compose.c:6008
+#: src/compose.c:6080
 msgid "Encryption warning"
 msgstr "加密警告"
 
-#: src/compose.c:6009
+#: src/compose.c:6081
 msgid "C_ontinue"
 msgstr "繼續(_o)"
 
-#: src/compose.c:6058
+#: src/compose.c:6130
 msgid "No account for sending mails available!"
 msgstr "傳送郵件時找不到有效的帳號"
 
-#: src/compose.c:6067
+#: src/compose.c:6139
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "選擇的帳號並非NNTP:無法傳輸"
 
-#: src/compose.c:6300
+#: src/compose.c:6379
+#, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "附加檔案%s不存在,忽略嗎?"
 
-#: src/compose.c:6301 src/mainwindow.c:656 src/toolbar.c:274 src/toolbar.c:2466
+#: src/compose.c:6380 src/mainwindow.c:656 src/toolbar.c:276 src/toolbar.c:2560
 msgid "Cancel sending"
 msgstr "終止傳送"
 
-#: src/compose.c:6301
+#: src/compose.c:6380
 msgid "Ignore attachment"
 msgstr "忽略附加檔案"
 
-#: src/compose.c:6341
+#: src/compose.c:6436
+#, c-format
 msgid "Original %s part"
 msgstr "原始的第%s部份"
 
-#: src/compose.c:6941
+#: src/compose.c:7036
 msgid "Add to address _book"
 msgstr "新增至通訊錄"
 
-#: src/compose.c:7102
+#: src/compose.c:7208
 msgid "Delete entry contents"
 msgstr "刪除目錄"
 
-#: src/compose.c:7106 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7212 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "按下 <tab> 可自動完成郵件地址"
 
-#: src/compose.c:7321
+#: src/compose.c:7444
 msgid "Mime type"
 msgstr "Mime格式"
 
-#: src/compose.c:7327 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
-#: src/prefs_matcher.c:630 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:85 src/summaryview.c:446
+#: src/compose.c:7450 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:407
+#: src/prefs_matcher.c:630 src/prefs_summaries.c:441
+#: src/prefs_summary_column.c:84 src/summaryview.c:447
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:7390
+#: src/compose.c:7513
 msgid "Save Message to "
 msgstr "儲存訊息到"
 
-#: src/compose.c:7427 src/editjpilot.c:276 src/editldap.c:519
+#: src/compose.c:7550 src/editjpilot.c:276 src/editldap.c:517
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
 #: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1075
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2087,27 +2148,28 @@ msgstr "儲存訊息到"
 msgid "_Browse"
 msgstr "瀏覽"
 
-#: src/compose.c:7449
+#: src/compose.c:7572
 msgid "Select folder to save message to"
 msgstr "選擇要儲存郵件的目錄"
 
-#: src/compose.c:7906
+#: src/compose.c:8029
 msgid "Hea_der"
 msgstr "標頭"
 
-#: src/compose.c:7911
+#: src/compose.c:8034
 msgid "_Attachments"
 msgstr "附件檔"
 
-#: src/compose.c:7925
+#: src/compose.c:8048
 msgid "Othe_rs"
 msgstr "其它"
 
-#: src/compose.c:7940
+#: src/compose.c:8063
 msgid "S_ubject:"
 msgstr "主旨"
 
-#: src/compose.c:8164
+#: src/compose.c:8287
+#, c-format
 msgid ""
 "Spell checker could not be started.\n"
 "%s"
@@ -2115,66 +2177,70 @@ msgstr ""
 "拼字檢查無法正確啟用\n"
 "%s"
 
-#: src/compose.c:8311
+#: src/compose.c:8434
 msgid "_From:"
 msgstr "寄件者:"
 
-#: src/compose.c:8328
+#: src/compose.c:8451
 msgid "Account to use for this email"
 msgstr "此郵件使用的帳號"
 
-#: src/compose.c:8330
+#: src/compose.c:8453
 msgid "Sender address to be used"
 msgstr "使用的寄件者地址"
 
-#: src/compose.c:8496
+#: src/compose.c:8635
+#, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr "無法載入隱私系統'%s',此訊息將無法被簽證或加密"
 
-#: src/compose.c:8597 src/plugins/archive/archiver_gtk.c:1174
+#: src/compose.c:8746 src/plugins/archive/archiver_gtk.c:1174
 msgid "_None"
 msgstr "空白(_N)"
 
-#: src/compose.c:8698 src/prefs_template.c:750
+#: src/compose.c:8847 src/prefs_template.c:751
+#, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "此樣板內容的第%d行發現錯誤"
 
-#: src/compose.c:8793
+#: src/compose.c:8944
+#, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "樣板中 '%s' 欄位格式錯誤"
 
-#: src/compose.c:9194
+#: src/compose.c:9370
 msgid "Invalid MIME type."
 msgstr "無效的MINE型式"
 
-#: src/compose.c:9209
+#: src/compose.c:9385
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或空白"
 
-#: src/compose.c:9283
+#: src/compose.c:9459
 msgid "Properties"
 msgstr "屬性"
 
-#: src/compose.c:9300
+#: src/compose.c:9476
 msgid "MIME type"
 msgstr "MIME型式"
 
-#: src/compose.c:9341
+#: src/compose.c:9517
 msgid "Encoding"
 msgstr "編碼中"
 
-#: src/compose.c:9361
+#: src/compose.c:9537
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:9362
+#: src/compose.c:9538
 msgid "File name"
 msgstr "檔案名稱"
 
-#: src/compose.c:9621
+#: src/compose.c:9797
+#, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
@@ -2184,15 +2250,16 @@ msgstr ""
 "強制終止此行程嗎?\n"
 "行程id: %d"
 
-#: src/compose.c:10088 src/messageview.c:1105
+#: src/compose.c:10264 src/messageview.c:1105
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail 需要網路的存取權才能傳送此郵件"
 
-#: src/compose.c:10114
+#: src/compose.c:10290
 msgid "Could not queue message."
 msgstr "此訊息無法稍後再送出"
 
-#: src/compose.c:10116
+#: src/compose.c:10292
+#, c-format
 msgid ""
 "Could not queue message:\n"
 "\n"
@@ -2202,15 +2269,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10294
+#: src/compose.c:10470
 msgid "Could not save draft."
 msgstr "無法儲存為草稿"
 
-#: src/compose.c:10298
+#: src/compose.c:10474
 msgid "Could not save draft"
 msgstr "無法儲存為草稿"
 
-#: src/compose.c:10299
+#: src/compose.c:10475
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2218,23 +2285,25 @@ msgstr ""
 "無法儲存為草稿\n"
 "確定要終止離開或放棄此郵件?"
 
-#: src/compose.c:10301
+#: src/compose.c:10477
 msgid "_Cancel exit"
 msgstr "終止離開"
 
-#: src/compose.c:10301
+#: src/compose.c:10477
 msgid "_Discard email"
 msgstr "放棄郵件"
 
-#: src/compose.c:10461 src/compose.c:10475
+#: src/compose.c:10667 src/compose.c:10681
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:10489
+#: src/compose.c:10695
+#, c-format
 msgid "File '%s' could not be read."
 msgstr "無法讀取檔案'%s'"
 
-#: src/compose.c:10491
+#: src/compose.c:10697
+#, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 "for the current encoding, insertion may be incorrect."
@@ -2242,49 +2311,51 @@ msgstr ""
 "目前的編碼檔案'%s'包含無效的字元\n"
 "插入可能是無效的"
 
-#: src/compose.c:10570
+#: src/compose.c:10776
 msgid "Discard message"
 msgstr "放棄訊息"
 
-#: src/compose.c:10571
+#: src/compose.c:10777
 msgid "This message has been modified. Discard it?"
 msgstr "此訊息已經被修改過了,要放棄嗎?"
 
-#: src/compose.c:10572 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10778 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "放棄"
 
-#: src/compose.c:10572 src/compose.c:10576
+#: src/compose.c:10778 src/compose.c:10782
 msgid "_Save to Drafts"
 msgstr "儲存至草稿(_S)"
 
-#: src/compose.c:10574 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10780 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "儲存異動"
 
-#: src/compose.c:10575
+#: src/compose.c:10781
 msgid "This message has been modified. Save the latest changes?"
 msgstr "此訊息已經被修改過了,要儲存最後的修改嗎?"
 
-#: src/compose.c:10576
+#: src/compose.c:10782
 msgid "_Don't save"
 msgstr "不要儲存"
 
-#: src/compose.c:10647
+#: src/compose.c:10853
+#, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "確定要使用樣板 '%s'嗎?"
 
-#: src/compose.c:10649
+#: src/compose.c:10855
 msgid "Apply template"
 msgstr "使用樣板"
 
-#: src/compose.c:10650 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:774 src/prefs_template.c:311
+#: src/compose.c:10856 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/prefs_filtering.c:477 src/prefs_matcher.c:774 src/prefs_template.c:310
 #: src/prefs_toolbar.c:1063
 msgid "_Replace"
 msgstr "覆蓋(_R)"
 
-#: src/compose.c:11519
+#: src/compose.c:11727
+#, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
 "attach it to the email?"
@@ -2294,25 +2365,28 @@ msgid_plural ""
 msgstr[0] "確定要將此一檔案內容插入至郵件訊息中?還是要將它附加至郵件?"
 msgstr[1] "確定要將%d個檔案的內容插入至郵件訊息中?還是要將它們附加至郵件?"
 
-#: src/compose.c:11525
+#: src/compose.c:11733
 msgid "Insert or attach?"
 msgstr "確定插入或附加檔案?"
 
-#: src/compose.c:11526
+#: src/compose.c:11734
 msgid "_Attach"
 msgstr "附加檔案(_A)"
 
-#: src/compose.c:11744
+#: src/compose.c:11954
+#, c-format
 msgid "Quote format error at line %d."
 msgstr "第%d格式有誤"
 
-#: src/compose.c:12041
+#: src/compose.c:12251
+#, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 "time. Do you want to continue?"
 msgstr "您企圖回覆%d訊息,開啟視窗可能會花費一些時,確認要繼續嗎?"
 
 #: src/crash.c:140
+#, c-format
 msgid "Claws Mail process (%ld) received signal %ld"
 msgstr "Claws Mail 進行 (%ld) 收到信號 %ld"
 
@@ -2321,6 +2395,7 @@ msgid "Claws Mail has crashed"
 msgstr "Claws Mail 不正常結束"
 
 #: src/crash.c:202
+#, c-format
 msgid ""
 "%s.\n"
 "Please file a bug report and include the information below."
@@ -2332,7 +2407,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "偵錯log"
 
-#: src/crash.c:251 src/toolbar.c:534
+#: src/crash.c:251 src/toolbar.c:539
 msgid "Close"
 msgstr "關閉"
 
@@ -2429,6 +2504,7 @@ msgid "Choose a picture"
 msgstr "選擇一張照片"
 
 #: src/editaddress.c:803
+#, c-format
 msgid ""
 "Failed to import image: \n"
 "%s"
@@ -2471,7 +2547,7 @@ msgstr "別名"
 
 #: src/editaddress.c:1265 src/editaddress.c:1334 src/editaddress.c:1354
 #: src/editaddress_other_attributes_ldap.c:303
-#: src/editaddress_other_attributes_ldap.c:371 src/prefs_customheader.c:222
+#: src/editaddress_other_attributes_ldap.c:371 src/prefs_customheader.c:221
 msgid "Value"
 msgstr "數值"
 
@@ -2488,6 +2564,7 @@ msgid "O_ther Attributes"
 msgstr "其它屬性"
 
 #: src/editaddress.c:1583
+#, c-format
 msgid ""
 "Failed to save image: \n"
 "%s"
@@ -2516,7 +2593,7 @@ msgid " Check File "
 msgstr "檢查檔案"
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1976
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2023
 #: src/wizard.c:1196 src/wizard.c:1616
 msgid "File"
 msgstr "檔案"
@@ -2565,12 +2642,12 @@ msgstr "編輯資料夾"
 msgid "Input the new name of folder:"
 msgstr "輸入新名稱給資料夾"
 
-#: src/editgroup.c:556 src/foldersel.c:594 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/editgroup.c:556 src/foldersel.c:571 src/imap_gtk.c:193 src/mh_gtk.c:144
 #: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:91
 msgid "New folder"
 msgstr "新增資料夾"
 
-#: src/editgroup.c:557 src/foldersel.c:595 src/mh_gtk.c:145
+#: src/editgroup.c:557 src/foldersel.c:572 src/mh_gtk.c:145
 #: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "Input the name of new folder:"
 msgstr "輸入名稱給新資料夾"
@@ -2595,32 +2672,32 @@ msgstr "附加的電子郵件地址項目"
 msgid "Add New JPilot Entry"
 msgstr "新增JPilot進入點"
 
-#: src/editldap_basedn.c:137
+#: src/editldap_basedn.c:136
 msgid "Edit LDAP - Select Search Base"
 msgstr "編輯LDAP - 選擇搜尋基準"
 
-#: src/editldap_basedn.c:156 src/editldap.c:441
+#: src/editldap_basedn.c:155 src/editldap.c:440
 msgid "Hostname"
 msgstr "主機名稱"
 
-#: src/editldap_basedn.c:166 src/editldap.c:458
+#: src/editldap_basedn.c:165 src/editldap.c:457
 #: src/plugins/clamd/clamav_plugin_gtk.c:390 src/ssl_manager.c:108
 msgid "Port"
 msgstr "通訊埠"
 
-#: src/editldap_basedn.c:176 src/editldap.c:503
+#: src/editldap_basedn.c:175 src/editldap.c:501
 msgid "Search Base"
 msgstr "搜尋基準"
 
-#: src/editldap_basedn.c:197
+#: src/editldap_basedn.c:196
 msgid "Available Search Base(s)"
 msgstr "有效的搜尋基準"
 
-#: src/editldap_basedn.c:287
+#: src/editldap_basedn.c:286
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "無法從伺服器中讀取搜尋基準 - 請手動設定"
 
-#: src/editldap_basedn.c:291 src/editldap.c:281
+#: src/editldap_basedn.c:290 src/editldap.c:281
 msgid "Could not connect to server"
 msgstr "無法連線至伺服器"
 
@@ -2640,15 +2717,15 @@ msgstr "至少要提供一個LDAP搜尋基準屬性"
 msgid "Connected successfully to server"
 msgstr "伺服器連線成功"
 
-#: src/editldap.c:336 src/editldap.c:971
+#: src/editldap.c:335 src/editldap.c:990
 msgid "Edit LDAP Server"
 msgstr "編輯LDAP伺器"
 
-#: src/editldap.c:437
+#: src/editldap.c:436
 msgid "A name that you wish to call the server."
 msgstr "要呼叫的伺服器名稱"
 
-#: src/editldap.c:450
+#: src/editldap.c:449
 msgid ""
 "This is the hostname of the server. For example, \"ldap.example.org\" may be "
 "appropriate for the \"example.org\" organization. An IP address may also be "
@@ -2659,15 +2736,15 @@ msgstr ""
 "以使用IP位址。如果和Claws Mail在同一台電腦上執行LDAP伺服器,可以指定為"
 "\"localhost\"。"
 
-#: src/editldap.c:470
+#: src/editldap.c:468
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3396
+#: src/editldap.c:469 src/prefs_account.c:3478
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
-#: src/editldap.c:475
+#: src/editldap.c:473
 msgid ""
 "Enable secure connection to the LDAP server via STARTTLS. Connection starts "
 "unencrypted and is secured by STARTTLS command. If connection fails, be sure "
@@ -2677,7 +2754,7 @@ msgstr ""
 "透過STARTTLS可以啟用LDAP伺服器的安全連線機制。若連線失敗,務必檢查ldap.conf檔"
 "案的設定(TLS_CACERTDIR 和 TLS_REQCERT項目)"
 
-#: src/editldap.c:480
+#: src/editldap.c:478
 msgid ""
 "Enable secure connection to the LDAP server via SSL/TLS. If connection "
 "fails, be sure to check the correct configuration in ldap.conf "
@@ -2686,19 +2763,19 @@ msgstr ""
 "透過SSL/TLS可以啟用LDAP伺服器的安全連線機制。若連線失敗,務必檢查ldap.conf檔"
 "案的設定(TLS_CACERTDIR 和 TLS_REQCERT項目)"
 
-#: src/editldap.c:492
+#: src/editldap.c:490
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr "這是伺服器的監聽埠,預設通訊埠是389"
 
-#: src/editldap.c:495
+#: src/editldap.c:493
 msgid " Check Server "
 msgstr "檢查伺服器"
 
-#: src/editldap.c:499
+#: src/editldap.c:497
 msgid "Press this button to test the connection to the server."
 msgstr "按下此鍵進行伺服器連線測試"
 
-#: src/editldap.c:512
+#: src/editldap.c:510
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
@@ -2711,38 +2788,38 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
-#: src/editldap.c:523
+#: src/editldap.c:521
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
 msgstr "按下此鍵在伺服器上搜尋有效的目錄名稱"
 
-#: src/editldap.c:579
+#: src/editldap.c:577
 msgid "Search Attributes"
 msgstr "搜尋屬性"
 
-#: src/editldap.c:588
+#: src/editldap.c:586
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
 msgstr "用於搜尋名稱或地址時的LDAP屬性列表"
 
-#: src/editldap.c:591
+#: src/editldap.c:589
 msgid " Defaults "
 msgstr "預設"
 
-#: src/editldap.c:595
+#: src/editldap.c:593
 msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
 msgstr ""
 "將重置屬性名稱為預設值,如此可以在搜尋姓名或地址過程中,找到更多的姓名和地址"
 
-#: src/editldap.c:601
+#: src/editldap.c:599
 msgid "Max Query Age (secs)"
 msgstr "最大的搜尋年齡 (secs)"
 
-#: src/editldap.c:616
+#: src/editldap.c:613
 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 "
@@ -2761,21 +2838,21 @@ msgstr ""
 "少下一次的搜尋時間。此功能對於較慢的伺服器可以提供更多的記憶體來暫存搜搜結"
 "果,進而提高搜尋效能。"
 
-#: src/editldap.c:633
+#: src/editldap.c:630
 msgid "Include server in dynamic search"
 msgstr "動態搜尋包含伺服器"
 
-#: src/editldap.c:638
+#: src/editldap.c:635
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
 msgstr "當使用地址完成功能時,檢查這個選項以包含動態搜尋"
 
-#: src/editldap.c:644
+#: src/editldap.c:641
 msgid "Match names 'containing' search term"
 msgstr "姓名符合'包含'搜尋項目"
 
-#: src/editldap.c:649
+#: src/editldap.c:646
 msgid ""
 "Searches for names and addresses can be performed either using \"begins-with"
 "\" or \"contains\" search term. Check this option to perform a \"contains\" "
@@ -2787,11 +2864,11 @@ msgstr ""
 "行\"包含\"的搜尋,此法通常會花費較長的時間。特別注意,為了提昇效能,地址自動"
 "完成功能使用\"以...開始\"進行所有搜尋,以取代其它的地址界面"
 
-#: src/editldap.c:702
+#: src/editldap.c:709
 msgid "Bind DN"
 msgstr "綁定 DN"
 
-#: src/editldap.c:711
+#: src/editldap.c:718
 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 "
@@ -2802,45 +2879,50 @@ msgstr ""
 "的格式一般為 \"cn=user,dc=claws-mail,dc=org\",這個欄位一般建議空白以進行搜"
 "尋。"
 
-#: src/editldap.c:718
+#: src/editldap.c:725
 msgid "Bind Password"
 msgstr "綁定密碼"
 
-#: src/editldap.c:728
+#: src/editldap.c:735
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "以\"Bind DN\"進行連線時,此密碼將被使用"
 
-#: src/editldap.c:733
+#: src/editldap.c:738 src/prefs_account.c:1314 src/prefs_account.c:1868
+#: src/prefs_account.c:2587 src/prefs_account.c:2615
+msgid "Show password"
+msgstr "顯示密碼"
+
+#: src/editldap.c:747
 msgid "Timeout (secs)"
 msgstr "超時 (secs)"
 
-#: src/editldap.c:747
+#: src/editldap.c:760
 msgid "The timeout period in seconds."
 msgstr "超時的週期 (單位秒)"
 
-#: src/editldap.c:751
+#: src/editldap.c:764
 msgid "Maximum Entries"
 msgstr "最大的登入數量"
 
-#: src/editldap.c:765
+#: src/editldap.c:777
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "搜尋結果中可以接收的最大登入數量"
 
-#: src/editldap.c:780 src/prefs_account.c:3287
+#: src/editldap.c:792 src/prefs_account.c:3369
 msgid "Basic"
 msgstr "基本"
 
-#: src/editldap.c:782 src/gtk/quicksearch.c:708
+#: src/editldap.c:794 src/gtk/quicksearch.c:708
 msgid "Extended"
 msgstr "延伸"
 
-#: src/editldap.c:976
+#: src/editldap.c:995
 msgid "Add New LDAP Server"
 msgstr "新增LDAP伺服器?"
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1447
-#: src/prefs_summaries.c:449
+#: src/edittags.c:187 src/prefs_filtering_action.c:1450
+#: src/prefs_summaries.c:448
 msgid "Tag"
 msgstr "標籤"
 
@@ -2852,32 +2934,32 @@ msgstr "刪除標籤"
 msgid "Do you really want to delete this tag?"
 msgstr "確認要刪除標籤?"
 
-#: src/edittags.c:244
+#: src/edittags.c:251
 msgid "Delete all tags"
 msgstr "刪除所有的標籤"
 
-#: src/edittags.c:245
+#: src/edittags.c:252
 msgid "Do you really want to delete all tags?"
 msgstr "確認刪除所有的標籤?"
 
-#: src/edittags.c:416
+#: src/edittags.c:423
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr "此標籤名稱是保留的,請選擇另一個"
 
-#: src/edittags.c:458
+#: src/edittags.c:465
 msgid "Tag is not set."
 msgstr "沒有設定標籤"
 
-#: src/edittags.c:523
+#: src/edittags.c:530
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "指定標籤"
 
-#: src/edittags.c:537
+#: src/edittags.c:544
 msgid "New tag:"
 msgstr "新標籤"
 
-#: src/edittags.c:570
+#: src/edittags.c:577
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr "請選擇標籤以指定或移除,修改將立即生效。"
 
@@ -2901,6 +2983,14 @@ msgstr "新增vCard進入點"
 msgid "Impossible to set the client certificate.\n"
 msgstr "無法設定客戶端認證\n"
 
+#: src/etpan/nntp-thread.c:865
+msgid "couldn't get xover range\n"
+msgstr "無法取得 xover 的範圍\n"
+
+#: src/etpan/nntp-thread.c:963
+msgid "couldn't get xhdr range\n"
+msgstr "無法取得 xhdr 的範圍\n"
+
 #: src/exphtmldlg.c:105
 msgid "Please specify output directory and file to create."
 msgstr "請指定要輸出的目錄和檔案"
@@ -2914,6 +3004,7 @@ msgid "File exported successfully."
 msgstr "檔案匯出成功"
 
 #: src/exphtmldlg.c:177
+#, c-format
 msgid ""
 "The HTML output directory '%s'\n"
 "does not exist. Do you want to create it?"
@@ -2926,6 +3017,7 @@ msgid "Create directory"
 msgstr "建立目錄"
 
 #: src/exphtmldlg.c:189
+#, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
 "%s"
@@ -2957,10 +3049,10 @@ msgid "Stylesheet"
 msgstr "樣式"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:387 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1190
+#: src/gtk/gtkaspell.c:2225 src/gtk/menu.c:125 src/mainwindow.c:1188
 #: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:941
-#: src/prefs_toolbar.c:790 src/prefs_toolbar.c:1479 src/summaryview.c:6017
+#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:949
+#: src/prefs_toolbar.c:790 src/prefs_toolbar.c:1479 src/summaryview.c:6061
 msgid "None"
 msgstr "無"
 
@@ -2969,7 +3061,7 @@ msgstr "無"
 msgid "Default"
 msgstr "預設"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:243
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:246
 #: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:167
 msgid "Full"
 msgstr "完整"
@@ -3047,6 +3139,7 @@ msgid "Specify parameters to format distinguished name."
 msgstr "指定參數用來格式化區分名稱"
 
 #: src/expldifdlg.c:187
+#, c-format
 msgid ""
 "LDIF Output Directory '%s'\n"
 "does not exist. OK to create new directory?"
@@ -3059,6 +3152,7 @@ msgid "Create Directory"
 msgstr "建立目錄"
 
 #: src/expldifdlg.c:199
+#, c-format
 msgid ""
 "Could not create output directory for LDIF file:\n"
 "%s"
@@ -3186,7 +3280,7 @@ msgstr "匯出通訊錄至 LDIF 檔"
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:113 src/summaryview.c:8175
+#: src/export.c:113 src/summaryview.c:8233
 msgid "Export to mbox file"
 msgstr "匯出至 mbox 檔案"
 
@@ -3252,14 +3346,17 @@ msgid "Not specified."
 msgstr "未指定"
 
 #: src/file_checker.c:76
+#, c-format
 msgid "The file %s is missing! Do you want to use the backup file from %s?"
 msgstr "缺少檔案 %s,確認要用使用來自於 %s 的備份檔案嗎?"
 
 #: src/file_checker.c:84 src/file_checker.c:106
+#, c-format
 msgid "Could not copy %s to %s"
 msgstr "無法從 %s 複制到 %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?"
@@ -3270,6 +3367,7 @@ msgid "rule is not account-based\n"
 msgstr "這不是一個以帳號為基準的規則\n"
 
 #: src/filtering.c:607
+#, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
@@ -3290,6 +3388,7 @@ msgid ""
 msgstr "這是一個以帳號為基準的規則,但是不符合用來作為取回郵件的帳號\n"
 
 #: src/filtering.c:624
+#, 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"
@@ -3303,6 +3402,7 @@ msgid ""
 msgstr "這不是一個以帳號為基準的規則,所有的規則將被使用在使用者需求上\n"
 
 #: src/filtering.c:649
+#, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
 "request\n"
@@ -3311,6 +3411,7 @@ msgstr ""
 "求上\n"
 
 #: src/filtering.c:667
+#, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr "這是一個以帳號為基準的規則 [id=%d, name='%s'],將跳過使用者請求\n"
 
@@ -3319,6 +3420,7 @@ msgid "rule is account-based, skipped on user request\n"
 msgstr "這是一個以帳號為基準的規則,將跳過使用者請求\n"
 
 #: src/filtering.c:694
+#, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching current account [id="
 "%d, name='%s']\n"
@@ -3331,6 +3433,7 @@ msgid "rule is account-based, not matching current account\n"
 msgstr "這是一個以帳號為基準的規則,但是不符合目前帳號\n"
 
 #: src/filtering.c:712
+#, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], current account [id=%d, "
 "name='%s']\n"
@@ -3339,6 +3442,7 @@ msgstr ""
 "name='%s']\n"
 
 #: src/filtering.c:752
+#, c-format
 msgid "applying action [ %s ]\n"
 msgstr "套用動作 [ %s ]\n"
 
@@ -3347,22 +3451,27 @@ msgid "action could not apply\n"
 msgstr "無法套用此動作\n"
 
 #: src/filtering.c:759
+#, c-format
 msgid "no further processing after action [ %s ]\n"
 msgstr "此動作 [ %s ] 套用後沒有其它的處理程序\n"
 
 #: src/filtering.c:810
+#, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "套用規則 '%s' [ %s ]\n"
 
 #: src/filtering.c:814
+#, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "套用規則 <unnamed> [ %s ]\n"
 
 #: src/filtering.c:832
+#, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "關閉規則 '%s' [ %s ]\n"
 
 #: src/filtering.c:836
+#, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "關閉規則 <unnamed> [ %s ]\n"
 
@@ -3390,7 +3499,8 @@ msgstr "前處理"
 msgid "post-processing"
 msgstr "後處理"
 
-#: src/filtering.c:911
+#: src/filtering.c:909
+#, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
@@ -3406,11 +3516,12 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:913 src/filtering.c:922
+#: src/filtering.c:911 src/filtering.c:920
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:920
+#: src/filtering.c:918
+#, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
@@ -3418,39 +3529,43 @@ msgstr ""
 "郵件過濾中 (%s%s%s)\n"
 "%s郵件檔案: %s\n"
 
-#: src/folder.c:1570 src/foldersel.c:412 src/prefs_folder_item.c:315
+#: src/folder.c:1570 src/prefs_folder_item.c:315
 msgid "Inbox"
 msgstr "收件夾"
 
-#: src/folder.c:1574 src/foldersel.c:416
+#: src/folder.c:1574
 msgid "Sent"
 msgstr "已傳送"
 
-#: src/folder.c:1578 src/foldersel.c:420 src/prefs_folder_item.c:318
+#: src/folder.c:1578 src/prefs_folder_item.c:318
 msgid "Queue"
 msgstr "暫存"
 
-#: src/folder.c:1582 src/foldersel.c:424 src/prefs_folder_item.c:319
+#: src/folder.c:1582 src/prefs_folder_item.c:319
 msgid "Trash"
 msgstr "回收桶"
 
-#: src/folder.c:1586 src/foldersel.c:428 src/prefs_folder_item.c:317
+#: src/folder.c:1586 src/prefs_folder_item.c:317
 msgid "Drafts"
 msgstr "草稿"
 
 #: src/folder.c:2017
+#, c-format
 msgid "Processing (%s)...\n"
 msgstr "處理 (%s)...\n"
 
 #: src/folder.c:3262
+#, c-format
 msgid "Copying %s to %s...\n"
 msgstr "正在複製 %s 到 %s...\n"
 
 #: src/folder.c:3262
+#, c-format
 msgid "Moving %s to %s...\n"
 msgstr "正在移動 %s 到 %s...\n"
 
 #: src/folder.c:3572
+#, c-format
 msgid "Updating cache for %s..."
 msgstr "正在為 %s 更新緩衝..."
 
@@ -3459,6 +3574,7 @@ msgid "Processing messages..."
 msgstr "郵件處理..."
 
 #: src/folder.c:4569
+#, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "離線同步化 %s ...\n"
 
@@ -3474,29 +3590,32 @@ msgstr "資料夾名稱開頭或結尾不能為'.'"
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: src/foldersel.c:596 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/foldersel.c:573 src/imap_gtk.c:197 src/mh_gtk.c:146
 #: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "NewFolder"
 msgstr "新資料夾"
 
-#: src/foldersel.c:604 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:581 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
 #: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:432
+#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
 #: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2063
+#: src/plugins/vcalendar/vcal_folder.c:2059
+#, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' 不能被包含在資料夾名稱內"
 
-#: src/foldersel.c:619 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/foldersel.c:596 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2070
+#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:217
+#: src/plugins/vcalendar/vcal_folder.c:2066
+#, c-format
 msgid "The folder '%s' already exists."
 msgstr "資料夾 '%s' 已經存在"
 
-#: src/foldersel.c:626 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:603 src/imap_gtk.c:230 src/mh_gtk.c:173
 #: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
 #: src/plugins/rssyl/rssyl_cb_menu.c:124
+#, c-format
 msgid "Can't create the folder '%s'."
 msgstr "無法建立資料夾 '%s'"
 
@@ -3538,24 +3657,24 @@ msgstr "傳送暫存郵件(_q)..."
 
 #: src/folderview.c:397 src/folderview.c:444
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6291
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:393 src/summaryview.c:6335
 msgid "New"
 msgstr "新郵件"
 
 #: src/folderview.c:398 src/folderview.c:445
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6293
-#: src/toolbar.c:509
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:392 src/summaryview.c:6337
+#: src/toolbar.c:512
 msgid "Unread"
 msgstr "未讀郵件"
 
 #: src/folderview.c:399 src/plugins/notification/notification_lcdproc.c:149
-#: src/prefs_folder_column.c:81
+#: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "全部郵件"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:447 src/summaryview.c:447
+#: src/folderview.c:447 src/summaryview.c:448
 msgid "#"
 msgstr "#"
 
@@ -3563,7 +3682,7 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "設定資料夾訊息..."
 
-#: src/folderview.c:867 src/summaryview.c:4138
+#: src/folderview.c:867 src/summaryview.c:4182
 msgid "Mark all as read"
 msgstr "將所有的郵件標示為已讀"
 
@@ -3573,11 +3692,11 @@ msgid ""
 "read?"
 msgstr "確定要將此資料夾及其下的子目錄內所有的郵件標示為已讀嗎?"
 
-#: src/folderview.c:870 src/summaryview.c:4139
+#: src/folderview.c:870 src/summaryview.c:4183
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "確定要將此資料內所有的郵件標示為已讀嗎?"
 
-#: src/folderview.c:873 src/summaryview.c:4177
+#: src/folderview.c:873 src/summaryview.c:4221
 msgid "Mark all as unread"
 msgstr "將所有的郵件標示為未讀"
 
@@ -3587,15 +3706,17 @@ msgid ""
 "unread?"
 msgstr "確定要將此資料夾及其下的子目錄內所有的郵件標示為未讀嗎?"
 
-#: src/folderview.c:876 src/summaryview.c:4178
+#: src/folderview.c:876 src/summaryview.c:4222
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr "確定要將此資料內所有的郵件標示為未讀嗎?"
 
-#: src/folderview.c:1066 src/imap.c:4605
+#: src/folderview.c:1066 src/imap.c:4606
+#, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "掃描資料夾 %s/%s..."
 
-#: src/folderview.c:1069 src/imap.c:4609 src/mainwindow.c:5249 src/setup.c:96
+#: src/folderview.c:1069 src/imap.c:4610 src/mainwindow.c:5245 src/setup.c:96
+#, c-format
 msgid "Scanning folder %s..."
 msgstr "掃描資料夾 %s..."
 
@@ -3617,6 +3738,7 @@ msgid "Scanning folder tree..."
 msgstr "資料夾串列掃描..."
 
 #: src/folderview.c:1204
+#, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "無法掃描資料夾 %s\n"
 
@@ -3625,10 +3747,12 @@ msgid "Checking for new messages in all folders..."
 msgstr "在所有資料夾內檢查新郵件..."
 
 #: src/folderview.c:2229
+#, c-format
 msgid "Closing folder %s..."
 msgstr "關閉資料夾 %s..."
 
 #: src/folderview.c:2324
+#, c-format
 msgid "Opening folder %s..."
 msgstr "開啟 %s..."
 
@@ -3636,7 +3760,7 @@ msgstr "開啟 %s..."
 msgid "Folder could not be opened."
 msgstr "資料夾無法開啟"
 
-#: src/folderview.c:2484 src/mainwindow.c:2906 src/mainwindow.c:2910
+#: src/folderview.c:2484 src/mainwindow.c:2902 src/mainwindow.c:2906
 msgid "Empty trash"
 msgstr "清空回收桶"
 
@@ -3648,27 +3772,28 @@ msgstr "刪除所以回收桶內的郵件"
 msgid "_Empty trash"
 msgstr "清空回收桶(_E)"
 
-#: src/folderview.c:2529 src/inc.c:1533 src/toolbar.c:2911
+#: src/folderview.c:2529 src/inc.c:1533 src/toolbar.c:3008
 msgid "Offline warning"
 msgstr "離線警告"
 
-#: src/folderview.c:2530 src/toolbar.c:2912
+#: src/folderview.c:2530 src/toolbar.c:3009
 msgid "You're working offline. Override?"
 msgstr "目前為離線模式,要覆寫嗎?"
 
-#: src/folderview.c:2541 src/toolbar.c:2931
+#: src/folderview.c:2541 src/toolbar.c:3028
 msgid "Send queued messages"
 msgstr "傳送暫存郵件"
 
-#: src/folderview.c:2542 src/toolbar.c:2932
+#: src/folderview.c:2542 src/toolbar.c:3029
 msgid "Send all queued messages?"
 msgstr "傳送所有暫存郵件?"
 
-#: src/folderview.c:2551 src/toolbar.c:2951
+#: src/folderview.c:2551 src/toolbar.c:3048
 msgid "Some errors occurred while sending queued messages."
 msgstr "傳送暫存郵件時發生一些錯誤"
 
-#: src/folderview.c:2554 src/main.c:2752 src/toolbar.c:2954
+#: src/folderview.c:2554 src/main.c:2780 src/toolbar.c:3051
+#, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"
@@ -3677,10 +3802,12 @@ msgstr ""
 "%s"
 
 #: src/folderview.c:2629
+#, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "確認要複製資料夾 '%s' 嗎?(從'%s'內)"
 
 #: src/folderview.c:2630
+#, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "確認要將資料夾 '%s' 變為 '%s' 的子資料夾嗎?"
 
@@ -3693,10 +3820,12 @@ msgid "Move folder"
 msgstr "移動資料夾"
 
 #: src/folderview.c:2643
+#, c-format
 msgid "Copying %s to %s..."
 msgstr "從 %s 複製到 %s ..."
 
 #: src/folderview.c:2643
+#, c-format
 msgid "Moving %s to %s..."
 msgstr "從 %s 移動到 %s ..."
 
@@ -3725,10 +3854,11 @@ msgid "Move failed!"
 msgstr "移動失敗"
 
 #: src/folderview.c:2737
+#, c-format
 msgid "Processing configuration for folder %s"
 msgstr "進行資料夾 %s 配置"
 
-#: src/folderview.c:3177 src/summaryview.c:4574 src/summaryview.c:4680
+#: src/folderview.c:3177 src/summaryview.c:4618 src/summaryview.c:4724
 msgid "The destination folder can only be used to store subfolders."
 msgstr "目的資料夾只能被用來儲存子資料夾"
 
@@ -3752,7 +3882,7 @@ msgstr " 搜尋 "
 msgid "Newsgroup name"
 msgstr "新聞群組名稱"
 
-#: src/grouplistdialog.c:205 src/prefs_send.c:171
+#: src/grouplistdialog.c:205 src/prefs_send.c:184
 msgid "Messages"
 msgstr "郵件"
 
@@ -3768,7 +3898,7 @@ msgstr "合適的"
 msgid "readonly"
 msgstr "唯讀的"
 
-#: src/grouplistdialog.c:351 src/plugins/att_remover/att_remover.c:297
+#: src/grouplistdialog.c:351 src/plugins/att_remover/att_remover.c:302
 #: src/plugins/vcalendar/vcal_manager.c:114
 #: src/plugins/vcalendar/vcal_manager.c:148
 msgid "unknown"
@@ -3778,11 +3908,12 @@ msgstr "未知的"
 msgid "Can't retrieve newsgroup list."
 msgstr "無法取得新聞群組清單"
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1922 src/summaryview.c:1585
+#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1934 src/summaryview.c:1600
 msgid "Done."
 msgstr "完成"
 
 #: src/grouplistdialog.c:492
+#, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "新聞群組 %d 接收完成 (%s 讀取)"
 
@@ -3807,13 +3938,13 @@ msgstr ""
 "Claws Mail 是自由軟體並遵循GPL規範釋出。若希望贊助 Claws Mail 專案,可以如"
 "下:"
 
-#: src/gtk/about.c:162
+#: src/gtk/about.c:162 src/gtk/about.c:850
 msgid ""
 "Copyright (C) 1999-2017\n"
 "The Claws Mail Team\n"
-" and Hiroyuki Yamamoto"
+"and Hiroyuki Yamamoto"
 msgstr ""
-"版權所有 (C) 1999-2016\n"
+"版權所有 (C) 1999-2017\n"
 "Claws Mail 團隊及\n"
 "Hiroyuki Yamamoto"
 
@@ -3822,6 +3953,7 @@ msgid "System Information\n"
 msgstr "系統資訊\n"
 
 #: src/gtk/about.c:173
+#, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
@@ -3830,6 +3962,7 @@ msgstr ""
 "作業系統: %s %s (%s)"
 
 #: src/gtk/about.c:182
+#, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
@@ -3838,6 +3971,7 @@ msgstr ""
 "作業系統: %s"
 
 #: src/gtk/about.c:191
+#, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
@@ -3845,7 +3979,7 @@ msgstr ""
 "地區: %s (charset: %s)\n"
 "作業系統: 不明"
 
-#: src/gtk/about.c:247 src/prefs_themes.c:805 src/wizard.c:527
+#: src/gtk/about.c:247 src/prefs_themes.c:842 src/wizard.c:527
 msgid "The Claws Mail Team"
 msgstr "Claws Mail 團隊"
 
@@ -3959,39 +4093,45 @@ msgstr ""
 "你將會伴隨此程式收到一份 GNU General Public License 的複本,如果沒有收到,請"
 "參閱"
 
-#: src/gtk/about.c:717 src/main.c:2576
+#: src/gtk/about.c:717 src/main.c:2604
 msgid "Session statistics\n"
 msgstr "通信統計\n"
 
-#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2586 src/main.c:2589
+#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2614 src/main.c:2617
+#, c-format
 msgid "Started: %s\n"
 msgstr "開始於: %s\n"
 
-#: src/gtk/about.c:737 src/main.c:2595
+#: src/gtk/about.c:737 src/main.c:2623
 msgid "Incoming traffic\n"
 msgstr "收件傳輸量\n"
 
-#: src/gtk/about.c:740 src/main.c:2598
+#: src/gtk/about.c:740 src/main.c:2626
+#, c-format
 msgid "Received messages: %d\n"
 msgstr "已接收郵件: %d\n"
 
-#: src/gtk/about.c:747 src/main.c:2604
+#: src/gtk/about.c:747 src/main.c:2632
 msgid "Outgoing traffic\n"
 msgstr "外寄傳輸量\n"
 
-#: src/gtk/about.c:750 src/main.c:2607
+#: src/gtk/about.c:750 src/main.c:2635
+#, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "新/改寄的郵件: %d\n"
 
-#: src/gtk/about.c:755 src/main.c:2611
+#: src/gtk/about.c:755 src/main.c:2639
+#, c-format
 msgid "Replied messages: %d\n"
 msgstr "回覆的郵件: %d\n"
 
-#: src/gtk/about.c:760 src/main.c:2615
+#: src/gtk/about.c:760 src/main.c:2643
+#, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "轉寄的郵件: %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2619
+#: src/gtk/about.c:765 src/main.c:2647
+#, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "所有寄出的郵件: %d\n"
 
@@ -3999,16 +4139,6 @@ msgstr "所有寄出的郵件: %d\n"
 msgid "About Claws Mail"
 msgstr "關於 Claws Mail"
 
-#: src/gtk/about.c:850
-msgid ""
-"Copyright (C) 1999-2017\n"
-"The Claws Mail Team\n"
-"and Hiroyuki Yamamoto"
-msgstr ""
-"版權所有 (C) 1999-2017\n"
-"Claws Mail 團隊及\n"
-"Hiroyuki Yamamoto"
-
 #: src/gtk/about.c:864
 msgid "_Info"
 msgstr "資訊(_I)"
@@ -4033,63 +4163,63 @@ msgstr "釋出記錄(_R)"
 msgid "_Statistics"
 msgstr "統計(_S)"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:367
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:362
 msgid "Orange"
 msgstr "橙"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:371
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:366
 msgid "Red"
 msgstr "紅"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:375
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:370
 msgid "Pink"
 msgstr "粉紅"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:379
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:374
 msgid "Sky blue"
 msgstr "天空藍"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:383
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:378
 msgid "Blue"
 msgstr "藍"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:387
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:382
 msgid "Green"
 msgstr "綠"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:391
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:386
 msgid "Brown"
 msgstr "棕"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:395
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:390
 msgid "Grey"
 msgstr "灰"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:399
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:394
 msgid "Light brown"
 msgstr "淡藍"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:403
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:398
 msgid "Dark red"
 msgstr "深紅"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:407
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:402
 msgid "Dark pink"
 msgstr "深粉紅"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:411
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:406
 msgid "Steel blue"
 msgstr "金屬藍"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:415
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:410
 msgid "Gold"
 msgstr "金"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:419
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:414
 msgid "Bright green"
 msgstr "亮綠"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:423
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:418
 msgid "Magenta"
 msgstr "洋紅"
 
@@ -4110,6 +4240,7 @@ msgid "No dictionary selected."
 msgstr "尚未選擇字典"
 
 #: src/gtk/gtkaspell.c:365 src/gtk/gtkaspell.c:395
+#, c-format
 msgid "Couldn't initialize %s speller."
 msgstr "無法初始化 %s 拼字器"
 
@@ -4118,6 +4249,7 @@ msgid "Couldn't initialize Enchant broker."
 msgstr "無法初始化魔法經紀人(Enchant broker)"
 
 #: src/gtk/gtkaspell.c:713
+#, c-format
 msgid "Couldn't initialize %s dictionary:"
 msgstr "無法初始化 %s 字典:"
 
@@ -4130,6 +4262,7 @@ msgid "Replace unknown word"
 msgstr "取代未知的單字"
 
 #: src/gtk/gtkaspell.c:1460
+#, c-format
 msgid "Replace \"%s\" with: "
 msgstr "以...取代\"%s\""
 
@@ -4139,55 +4272,56 @@ msgid ""
 "will learn from mistake.\n"
 msgstr "按下 Enter 鍵時保持控制鍵將會從錯誤的地方進行學習\n"
 
-#: src/gtk/gtkaspell.c:1800
-msgid "Change to..."
-msgstr "改變為..."
-
-#: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
+#: src/gtk/gtkaspell.c:1805 src/gtk/gtkaspell.c:1943
 msgid "More..."
 msgstr "更多..."
 
-#: src/gtk/gtkaspell.c:1867
+#: src/gtk/gtkaspell.c:1861
+#, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
 msgstr "\"%s\" 在字典中找不到 '%s'"
 
-#: src/gtk/gtkaspell.c:1883
+#: src/gtk/gtkaspell.c:1877
 msgid "Accept in this session"
 msgstr "此次接受"
 
-#: src/gtk/gtkaspell.c:1893
+#: src/gtk/gtkaspell.c:1887
 msgid "Add to personal dictionary"
 msgstr "新增至個人字典"
 
-#: src/gtk/gtkaspell.c:1903
+#: src/gtk/gtkaspell.c:1897
 msgid "Replace with..."
 msgstr "以...取代"
 
-#: src/gtk/gtkaspell.c:1916
+#: src/gtk/gtkaspell.c:1910
+#, c-format
 msgid "Check with %s"
 msgstr "用 %s 檢查"
 
-#: src/gtk/gtkaspell.c:1938
+#: src/gtk/gtkaspell.c:1932
 msgid "(no suggestions)"
 msgstr "(沒有建議)"
 
-#: src/gtk/gtkaspell.c:2012
+#: src/gtk/gtkaspell.c:2006
+#, c-format
 msgid "Dictionary: %s"
 msgstr "字典: %s"
 
-#: src/gtk/gtkaspell.c:2027
+#: src/gtk/gtkaspell.c:2021
+#, c-format
 msgid "Use alternate (%s)"
 msgstr "使用替換 (%s)"
 
-#: src/gtk/gtkaspell.c:2038
+#: src/gtk/gtkaspell.c:2032
 msgid "Use both dictionaries"
 msgstr "使用兩個字典"
 
-#: src/gtk/gtkaspell.c:2054 src/prefs_spelling.c:144
+#: src/gtk/gtkaspell.c:2048 src/prefs_spelling.c:143
 msgid "Check while typing"
 msgstr "輸⼊時檢查"
 
-#: src/gtk/gtkaspell.c:2153
+#: src/gtk/gtkaspell.c:2147
+#, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
 "%s"
@@ -4195,7 +4329,8 @@ msgstr ""
 "這個拼字檢查器無法改變字典\n"
 "%s"
 
-#: src/gtk/gtkaspell.c:2209
+#: src/gtk/gtkaspell.c:2203
+#, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
 "%s"
@@ -4203,25 +4338,26 @@ msgstr ""
 "這個拼字檢查器無法改變替換的字典\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1927
+#: src/gtk/gtkutils.c:1939
 msgid "Failed: no service record found."
 msgstr "失敗: 找不到服務記錄"
 
-#: src/gtk/gtkutils.c:1930
+#: src/gtk/gtkutils.c:1942
 msgid "Failed: network error."
 msgstr "失敗: 網路錯誤"
 
-#: src/gtk/gtkutils.c:1933
+#: src/gtk/gtkutils.c:1945
+#, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "未知的錯誤(%d)"
 
-#: src/gtk/gtkutils.c:2003
+#: src/gtk/gtkutils.c:2015
 msgid "Configuring..."
 msgstr "配置..."
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2166 src/prefs_summaries.c:443
-#: src/prefs_summary_column.c:84 src/quote_fmt.c:49 src/summaryview.c:445
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1262
+#: src/prefs_matcher.c:2168 src/prefs_summaries.c:442
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:446
 msgid "Date"
 msgstr "日期"
 
@@ -4229,9 +4365,9 @@ msgstr "日期"
 msgid "Date:"
 msgstr "日期:"
 
-#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2163 src/prefs_summaries.c:445
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:50 src/summaryview.c:443
+#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1259
+#: src/prefs_matcher.c:2165 src/prefs_summaries.c:444
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:444
 msgid "From"
 msgstr "寄件者"
 
@@ -4251,14 +4387,14 @@ msgstr "寄件者:"
 msgid "Reply-To"
 msgstr "回覆給"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1257
-#: src/prefs_matcher.c:2164 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:57 src/summaryview.c:444
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1260
+#: src/prefs_matcher.c:2166 src/prefs_summaries.c:445
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:445
 msgid "To"
 msgstr "收件者"
 
-#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1258
-#: src/prefs_matcher.c:2165 src/quote_fmt.c:58
+#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1261
+#: src/prefs_matcher.c:2167 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "副本"
 
@@ -4266,8 +4402,8 @@ msgstr "副本"
 msgid "Bcc"
 msgstr "密件副本"
 
-#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2167 src/quote_fmt.c:61
+#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1263
+#: src/prefs_matcher.c:2169 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Message-ID"
 
@@ -4279,8 +4415,8 @@ msgstr "Message-ID:"
 msgid "In-Reply-To"
 msgstr "In-Reply-To"
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2169 src/quote_fmt.c:60
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1265
+#: src/prefs_matcher.c:2171 src/quote_fmt.c:60
 msgid "References"
 msgstr "索引"
 
@@ -4288,13 +4424,13 @@ msgstr "索引"
 msgid "References:"
 msgstr "索引:"
 
-#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2162 src/prefs_summaries.c:447
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:56 src/summaryview.c:442
+#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1258
+#: src/prefs_matcher.c:2164 src/prefs_summaries.c:446
+#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:443
 msgid "Subject"
 msgstr "主旨"
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:700
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:702
 #: src/summary_search.c:488
 msgid "Subject:"
 msgstr "主旨:"
@@ -4311,7 +4447,7 @@ msgstr "註解:"
 msgid "Keywords"
 msgstr "關鍵字"
 
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:702
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Keywords:"
 msgstr "關鍵字:"
 
@@ -4387,8 +4523,8 @@ msgstr "已接收"
 msgid "Received:"
 msgstr "已接收:"
 
-#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2168 src/quote_fmt.c:59
+#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1264
+#: src/prefs_matcher.c:2170 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "新聞群組"
 
@@ -4413,12 +4549,12 @@ msgid "Seen:"
 msgstr "已見:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:451
-#: src/prefs_summary_column.c:79 src/summaryview.c:2808
+#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:450
+#: src/prefs_summary_column.c:78 src/summaryview.c:2823
 msgid "Status"
 msgstr "狀態"
 
-#: src/gtk/headers.h:37 src/prefs_themes.c:996
+#: src/gtk/headers.h:37 src/prefs_themes.c:1033
 msgid "Status:"
 msgstr "狀態:"
 
@@ -4486,7 +4622,7 @@ msgstr "優先權"
 msgid "Precedence:"
 msgstr "優先權:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1066
+#: src/gtk/headers.h:46 src/prefs_account.c:1078
 msgid "Organization"
 msgstr "組織"
 
@@ -4716,11 +4852,13 @@ msgid ""
 msgstr "以下圖示用來顯示郵件和資料夾狀態:"
 
 #: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
+#, c-format
 msgid "Input password for %s on %s:"
 msgstr "為 %s 輸入密碼於 %s:"
 
 #: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
 #: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
+#, c-format
 msgid "Input password for %s:"
 msgstr "為 %s 輸入密碼:"
 
@@ -4782,6 +4920,7 @@ msgid "Select the Plugins to load"
 msgstr "選擇欲載入的外掛程式"
 
 #: src/gtk/pluginwindow.c:215
+#, c-format
 msgid ""
 "The following error occurred while loading %s:\n"
 "\n"
@@ -4802,7 +4941,7 @@ msgstr ""
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:137
 #: src/plugins/libravatar/libravatar_prefs.c:545
-#: src/plugins/managesieve/sieve_prefs.c:424
+#: src/plugins/managesieve/sieve_prefs.c:427
 #: src/plugins/notification/notification_prefs.c:398
 #: src/plugins/notification/notification_prefs.c:413
 #: src/plugins/notification/notification_prefs.c:432
@@ -4811,7 +4950,8 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:486
 #: src/plugins/notification/notification_prefs.c:504
 #: src/plugins/notification/notification_prefs.c:522
-#: src/plugins/pgpcore/prefs_gpg.c:617 src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/pgpcore/prefs_gpg.c:686 src/plugins/pgpcore/prefs_gpg.c:706
+#: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:648
 #: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:957
@@ -4819,30 +4959,31 @@ msgid "Plugins"
 msgstr "外掛程式"
 
 #: src/gtk/pluginwindow.c:336
-msgid "Load..."
-msgstr "載入..."
+msgid "_Load..."
+msgstr "載入(_L)..."
 
 #: src/gtk/pluginwindow.c:337
-msgid "Unload"
-msgstr "移除"
+msgid "_Unload"
+msgstr "卸載(_U)"
 
-#: src/gtk/pluginwindow.c:350 src/prefs_summaries.c:229
+#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:229
 msgid "Description"
 msgstr "說明"
 
-#: src/gtk/pluginwindow.c:374
+#: src/gtk/pluginwindow.c:375
+#, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr "參閱 %sClaws Mail website%s 以取得更詳細的資訊"
 
-#: src/gtk/pluginwindow.c:415
+#: src/gtk/pluginwindow.c:416
 msgid "Click here to load one or more plugins"
 msgstr "點選此處以載入一個或多個外掛程式"
 
-#: src/gtk/pluginwindow.c:418
+#: src/gtk/pluginwindow.c:419
 msgid "Unload the selected plugin"
 msgstr "移除選擇的外掛程式"
 
-#: src/gtk/pluginwindow.c:483
+#: src/gtk/pluginwindow.c:484
 msgid "Loaded plugins"
 msgstr "已載入的外掛程式"
 
@@ -4850,16 +4991,16 @@ msgstr "已載入的外掛程式"
 msgid "Page Index"
 msgstr "頁索引"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:843
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
 msgid "_Hide"
 msgstr "隱藏(_H)"
 
-#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3286 src/prefs_account.c:3304 src/prefs_account.c:3322
-#: src/prefs_account.c:3340 src/prefs_account.c:3358 src/prefs_account.c:3376
-#: src/prefs_account.c:3395 src/prefs_account.c:3488
-#: src/prefs_filtering_action.c:1422 src/prefs_filtering.c:397
-#: src/prefs_filtering.c:1877
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:688
+#: src/prefs_account.c:3368 src/prefs_account.c:3386 src/prefs_account.c:3404
+#: src/prefs_account.c:3422 src/prefs_account.c:3440 src/prefs_account.c:3458
+#: src/prefs_account.c:3477 src/prefs_account.c:3570
+#: src/prefs_filtering_action.c:1425 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1879
 msgid "Account"
 msgstr "帳號"
 
@@ -5024,6 +5165,7 @@ msgid "messages which contain S in References header"
 msgstr "參考標頭內包含S的郵件"
 
 #: src/gtk/quicksearch.c:518
+#, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "傳入命令的返回值為0 - %F 為郵件檔案"
 
@@ -5115,7 +5257,7 @@ msgid "E_dit"
 msgstr "編輯(_d)"
 
 #: src/gtk/quicksearch.c:847 src/gtk/quicksearch.c:871 src/prefs_actions.c:347
-#: src/prefs_filtering.c:495 src/prefs_template.c:330
+#: src/prefs_filtering.c:495 src/prefs_template.c:329
 msgid "C_lear"
 msgstr "清除(_l)"
 
@@ -5133,7 +5275,7 @@ msgid "Signer"
 msgstr "簽核者"
 
 #: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:952
+#: src/prefs_themes.c:989
 msgid "Name: "
 msgstr "名稱: "
 
@@ -5158,10 +5300,12 @@ msgid "Expires on: "
 msgstr "過期日: "
 
 #: src/gtk/sslcertwindow.c:302
+#, c-format
 msgid "SSL/TLS certificate for %s"
 msgstr "%s 的 SSL/TLS 簽證"
 
 #: src/gtk/sslcertwindow.c:318
+#, c-format
 msgid ""
 "Certificate is for %s, but connection is to %s.\n"
 "You may be connecting to a rogue server.\n"
@@ -5172,6 +5316,7 @@ msgstr ""
 "\n"
 
 #: src/gtk/sslcertwindow.c:338
+#, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
 "%sDo you want to accept it?"
@@ -5181,6 +5326,7 @@ msgstr ""
 
 #: src/gtk/sslcertwindow.c:350 src/gtk/sslcertwindow.c:400
 #: src/gtk/sslcertwindow.c:464
+#, c-format
 msgid "Signature status: %s"
 msgstr "簽名狀態: %s"
 
@@ -5206,6 +5352,7 @@ msgid "_Accept and save"
 msgstr "接受並儲存(_A)"
 
 #: src/gtk/sslcertwindow.c:387
+#, c-format
 msgid ""
 "Certificate for %s is expired.\n"
 "%sDo you want to continue?"
@@ -5234,6 +5381,7 @@ msgid "Known certificate:"
 msgstr "已知的簽證"
 
 #: src/gtk/sslcertwindow.c:451
+#, c-format
 msgid ""
 "Certificate for %s has changed.\n"
 "%sDo you want to accept it?"
@@ -5259,15 +5407,15 @@ msgstr "標簽:"
 
 #: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3379
-#: src/summaryview.c:3397 src/summaryview.c:3418
+#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3423
+#: src/summaryview.c:3441 src/summaryview.c:3462
 msgid "(No From)"
 msgstr "(無寄件者)"
 
 #: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3430
-#: src/summaryview.c:3433
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3474
+#: src/summaryview.c:3477
 msgid "(No Subject)"
 msgstr "(無主旨)"
 
@@ -5276,8 +5424,8 @@ msgid "Error:"
 msgstr "錯誤:"
 
 #: src/image_viewer.c:299 src/mimeview.c:2611
-#: src/plugins/att_remover/att_remover.c:301
-#: src/plugins/pdf_viewer/poppler_viewer.c:696
+#: src/plugins/att_remover/att_remover.c:306
+#: src/plugins/pdf_viewer/poppler_viewer.c:698
 msgid "Filename:"
 msgstr "檔案名稱"
 
@@ -5302,6 +5450,7 @@ msgstr "IMAP4 連線中斷\n"
 #: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
 #: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
 #: src/imap.c:738 src/imap.c:742
+#, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP 發生%s錯誤:"
 
@@ -5470,6 +5619,7 @@ msgid "SSL/TLS error"
 msgstr " SSL 錯誤"
 
 #: src/imap.c:742
+#, c-format
 msgid "Unknown error [%d]"
 msgstr "未知的錯誤 [%d]"
 
@@ -5534,23 +5684,27 @@ msgstr ""
 "才能正常運作"
 
 #: src/imap.c:977
+#, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "連線到 %s 失敗:登入被拒絕 %s"
 
 #: src/imap.c:981
+#, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "連線到 %s 失敗:登入被拒絕 %s\n"
 
 #: src/imap.c:999
+#, c-format
 msgid "Connecting to %s failed"
 msgstr "連線到 %s 失敗"
 
 #: src/imap.c:1006 src/imap.c:1009
+#, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 連線到 %s 已經被中斷,正在重新連線...\n"
 
-#: src/imap.c:1039 src/imap.c:3655 src/imap.c:4314 src/imap.c:4408
-#: src/imap.c:4586 src/imap.c:5397
+#: src/imap.c:1039 src/imap.c:3656 src/imap.c:4315 src/imap.c:4409
+#: src/imap.c:4587 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail 需要有網路的存取能力,才能夠存取 IMAP 伺服器"
 
@@ -5576,90 +5730,100 @@ msgid "Con_tinue connecting"
 msgstr "繼續保持連線"
 
 #: src/imap.c:1165
+#, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "帳號 '%s':連線到 IMAP4 伺服器:  %s:%d..."
 
 #: src/imap.c:1213
+#, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "無法連線到 IMAP4 伺服器: %s:%d"
 
 #: src/imap.c:1216
+#, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "無法連線到 IMAP4 伺服器: %s:%d\n"
 
-#: src/imap.c:1249 src/imap.c:4076
+#: src/imap.c:1249 src/imap.c:4077
 msgid "Can't start STARTTLS session.\n"
 msgstr "無法啟始 STARTTLS 通信\n"
 
 #: src/imap.c:1316
+#, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "無法登入到 IMAP 伺服器 %s \n"
 
 #: src/imap.c:1319
+#, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "無法登入到 IMAP 伺服器 %s"
 
-#: src/imap.c:1746
+#: src/imap.c:1747
 msgid "Adding messages..."
 msgstr "加入郵件..."
 
-#: src/imap.c:1951 src/mh.c:529
+#: src/imap.c:1952 src/mh.c:529
 msgid "Copying messages..."
 msgstr "複製郵件..."
 
-#: src/imap.c:2544
+#: src/imap.c:2545
 msgid "can't set deleted flags\n"
 msgstr "無法設定已刪除旗標\n"
 
-#: src/imap.c:2551 src/imap.c:5027
+#: src/imap.c:2552 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "無法刪掉\n"
 
-#: src/imap.c:2902
+#: src/imap.c:2903
+#, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "在沒有訂閱的資料夾 %s 內尋找..."
 
-#: src/imap.c:2905
+#: src/imap.c:2906
+#, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "在%s尋找子資料夾..."
 
-#: src/imap.c:3195
+#: src/imap.c:3196
 msgid "can't create mailbox: LIST failed\n"
 msgstr "無法建立郵件箱:LIST錯誤\n"
 
-#: src/imap.c:3210
+#: src/imap.c:3211
 msgid "can't create mailbox\n"
 msgstr "無法建立郵件箱\n"
 
-#: src/imap.c:3341
+#: src/imap.c:3342
+#, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "無法將郵件箱口稱從 %s 變更為 %s\n"
 
-#: src/imap.c:3454
+#: src/imap.c:3455
 msgid "can't delete mailbox\n"
 msgstr "無法刪除郵件箱\n"
 
-#: src/imap.c:3733
+#: src/imap.c:3734
 msgid "LIST failed\n"
 msgstr "LIST 失敗\n"
 
-#: src/imap.c:3818
+#: src/imap.c:3819
 msgid "Flagging messages..."
 msgstr "標示郵件..."
 
-#: src/imap.c:3921
+#: src/imap.c:3922
+#, c-format
 msgid "can't select folder: %s\n"
 msgstr "無法選擇資料夾: %s\n"
 
-#: src/imap.c:4073
+#: src/imap.c:4074
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "伺服器需要以 STARTTLS 進行登入\n"
 
-#: src/imap.c:4083
+#: src/imap.c:4084
 msgid "Can't refresh capabilities.\n"
 msgstr "不能刷新功能\n"
 
-#: src/imap.c:4088
+#: src/imap.c:4089
+#, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
 "compiled without STARTTLS support.\n"
@@ -5667,19 +5831,20 @@ msgstr ""
 "連線到 %s 失敗:伺服器需要 STARTTLS,但是目前的 Claws Mail 被編譯成不支援 "
 "STARTTLS 的版本\n"
 
-#: src/imap.c:4096
+#: src/imap.c:4097
 msgid "Server logins are disabled.\n"
 msgstr "伺服器登入被關閉\n"
 
-#: src/imap.c:4319
+#: src/imap.c:4320
 msgid "Fetching message..."
 msgstr "取得郵件..."
 
-#: src/imap.c:5020
+#: src/imap.c:5021
+#, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "無法設定被刪除的旗標: %d\n"
 
-#: src/imap.c:6055
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -5765,20 +5930,21 @@ msgid "Inherit properties from parent folder"
 msgstr "從上層資料夾繼承屬性"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:421 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2055
+#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:197
+#: src/plugins/vcalendar/vcal_folder.c:2051
+#, c-format
 msgid "Input new name for '%s':"
 msgstr "為 %s 輸入新名稱"
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:422
+#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
 #: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2056
+#: src/plugins/vcalendar/vcal_folder.c:2052
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:452 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2076
+#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:224
+#: src/plugins/vcalendar/vcal_folder.c:2072
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -5786,21 +5952,18 @@ msgstr ""
 "此資料夾不能被重新命名\n"
 "這個資料夾名稱是不允許的"
 
-#: src/imap_gtk.c:318 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:373
-#: src/summaryview.c:4624
-msgid "Select folder to move selected message to"
-msgid_plural "Select folder to move selected messages to"
-msgstr[0] "選擇路徑將選定的郵件移至該位置"
-msgstr[1] "選擇路徑將選定的郵件移至該位置"
+#: src/imap_gtk.c:317 src/mh_gtk.c:307 src/plugins/mailmbox/plugin_gtk.c:372
+#, c-format
+msgid "Select folder to move folder '%s' to"
+msgstr "將資料夾 %s 移至選擇的路徑"
 
-#: src/imap_gtk.c:339 src/mh_gtk.c:329 src/plugins/mailmbox/plugin_gtk.c:394
-#: src/summaryview.c:4709
-msgid "Select folder to copy selected message to"
-msgid_plural "Select folder to copy selected messages to"
-msgstr[0] "選擇路徑,將所有選定複製到該位置"
-msgstr[1] "選擇路徑,將所有選定複製到該位置"
+#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:392
+#, c-format
+msgid "Select folder to copy folder '%s' to"
+msgstr "將資料夾 %s 複製到選擇的資料夾"
 
-#: src/imap_gtk.c:367 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
+#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
+#, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
 "will not be possible.\n"
@@ -5811,41 +5974,44 @@ msgstr ""
 "\n"
 "確認要刪除嗎?"
 
-#: src/imap_gtk.c:386 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
+#: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
 #: src/plugins/rssyl/rssyl_cb_menu.c:171
-#: src/plugins/vcalendar/vcal_folder.c:2009
+#: src/plugins/vcalendar/vcal_folder.c:2005
+#, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "不能移除資料夾 '%s'"
 
-#: src/imap_gtk.c:508
+#: src/imap_gtk.c:506
+#, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr "確認要在 '%s' 取消訂閱的子資料夾中搜尋嗎?"
 
-#: src/imap_gtk.c:511
+#: src/imap_gtk.c:509
 msgid "Search recursively"
 msgstr "遞回搜尋"
 
-#: src/imap_gtk.c:516 src/imap_gtk.c:575
+#: src/imap_gtk.c:514 src/imap_gtk.c:573
 msgid "Subscriptions"
 msgstr "訂閱內容"
 
-#: src/imap_gtk.c:517
+#: src/imap_gtk.c:515
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: src/imap_gtk.c:527
+#: src/imap_gtk.c:525
+#, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "選擇 %s 的一個子資料夾以訂閱:"
 
-#: src/imap_gtk.c:538 src/mainwindow.c:680
+#: src/imap_gtk.c:536 src/mainwindow.c:680
 msgid "Subscribe"
 msgstr "訂閱"
 
-#: src/imap_gtk.c:540 src/imap_gtk.c:542
+#: src/imap_gtk.c:538 src/imap_gtk.c:540
 msgid "All of them"
 msgstr "全部"
 
-#: src/imap_gtk.c:558
+#: src/imap_gtk.c:556
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -5857,28 +6023,29 @@ msgstr ""
 "如果在其它的客戶端有新資料夾已建立而且已訂閱,在\"檢查新資料夾\" 使用郵件箱的"
 "主目錄"
 
-#: src/imap_gtk.c:567
+#: src/imap_gtk.c:565
+#, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "確認要 %s 這個 '%s' 資料夾嗎?"
 
-#: src/imap_gtk.c:568
+#: src/imap_gtk.c:566
 msgid "subscribe"
 msgstr "訂閱"
 
-#: src/imap_gtk.c:568
+#: src/imap_gtk.c:566
 msgid "unsubscribe"
 msgstr "取消訂閱"
 
-#: src/imap_gtk.c:570 src/prefs_folder_item.c:1447 src/prefs_folder_item.c:1475
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1447 src/prefs_folder_item.c:1475
 #: src/prefs_folder_item.c:1503
 msgid "Apply to subfolders"
 msgstr "套用至子資料夾"
 
-#: src/imap_gtk.c:576
+#: src/imap_gtk.c:574
 msgid "_Subscribe"
 msgstr "訂閱(_S)"
 
-#: src/imap_gtk.c:577 src/news_gtk.c:252
+#: src/imap_gtk.c:575 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
@@ -5968,7 +6135,7 @@ msgstr "選擇要匯入的 LDIF 檔案"
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:726 src/summaryview.c:440
+#: src/importldif.c:726 src/summaryview.c:441
 msgid "S"
 msgstr "S"
 
@@ -6068,6 +6235,7 @@ msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail 需要網路才能取得郵件"
 
 #: src/inc.c:343
+#, c-format
 msgid "%s failed\n"
 msgstr "%s 失敗\n"
 
@@ -6088,6 +6256,7 @@ msgid "Retrieving"
 msgstr "正在取回"
 
 #: src/inc.c:635
+#, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "完成 (%d 郵件 (%s) 已取回)"
@@ -6105,8 +6274,8 @@ msgstr "連線失敗"
 msgid "Auth failed"
 msgstr "認證失敗"
 
-#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:454
-#: src/prefs_summary_column.c:88 src/summaryview.c:2804 src/summaryview.c:6317
+#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:453
+#: src/prefs_summary_column.c:87 src/summaryview.c:2819 src/summaryview.c:6361
 msgid "Locked"
 msgstr "已鎖定"
 
@@ -6115,6 +6284,7 @@ msgid "Timeout"
 msgstr "超時"
 
 #: src/inc.c:752
+#, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "已完成 (%d 新郵件)"
@@ -6125,18 +6295,22 @@ msgid "Finished (no new messages)"
 msgstr "已完成 (沒有新郵件)"
 
 #: src/inc.c:795
+#, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 正在取回新郵件"
 
 #: src/inc.c:825
+#, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "帳號 '%s': POP3 伺服器連線中: %s:%d..."
 
 #: src/inc.c:843
+#, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "無法連線至 POP3 伺服器: %s:%d"
 
 #: src/inc.c:847
+#, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線至 POP3 伺服器: %s:%d\n"
 
@@ -6146,6 +6320,7 @@ msgid "Authenticating..."
 msgstr "認證中..."
 
 #: src/inc.c:929
+#, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "正在從 %s (%s) 取回郵件..."
 
@@ -6170,16 +6345,19 @@ msgid "Quitting"
 msgstr "離開中"
 
 #: src/inc.c:979
+#, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在取得郵件 (%d / %d) (%s / %s)"
 
 #: src/inc.c:992
+#, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "正在取回 (%d 郵件 (%s) 已接收)"
 msgstr[1] "正在取回 (%d 郵件 (%s) 已接收)"
 
 #: src/inc.c:1151
+#, c-format
 msgid "Connection to %s:%d failed."
 msgstr "連線至 %s:%d 失敗"
 
@@ -6188,6 +6366,7 @@ msgid "Error occurred while processing mail."
 msgstr "處理郵件時發生錯誤"
 
 #: src/inc.c:1162
+#, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
@@ -6208,6 +6387,7 @@ msgid "Socket error."
 msgstr "通訊錯誤"
 
 #: src/inc.c:1181
+#, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "連線至 %s:%d 時通訊錯誤"
 
@@ -6216,6 +6396,7 @@ msgid "Connection closed by the remote host."
 msgstr "遠端伺服器關閉連線"
 
 #: src/inc.c:1189
+#, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "連線至 %s:%d 時被遠端伺服器關閉連線"
 
@@ -6224,6 +6405,7 @@ msgid "Mailbox is locked."
 msgstr "郵件箱已鎖定"
 
 #: src/inc.c:1198
+#, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
@@ -6236,6 +6418,7 @@ msgid "Authentication failed."
 msgstr "認證失敗"
 
 #: src/inc.c:1210 src/send_message.c:676
+#, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
@@ -6250,6 +6433,7 @@ msgid ""
 msgstr "連線已超時。可以在選項/其它/雜項中增加超時設定值,或許可以回復"
 
 #: src/inc.c:1220
+#, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "連線至 %s:%d 超時"
 
@@ -6258,10 +6442,12 @@ msgid "Incorporation cancelled\n"
 msgstr "已取消合併\n"
 
 #: src/inc.c:1523
+#, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%s 目前處於離線模式,要回復 %d 分鐘嗎?"
 
 #: src/inc.c:1529
+#, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%s 目前處於離線模式,要回復嗎?"
 
@@ -6269,7 +6455,7 @@ msgstr "%s%s 目前處於離線模式,要回復嗎?"
 msgid "On_ly once"
 msgstr "僅一次有效(_l)"
 
-#: src/ldapupdate.c:1056
+#: src/ldapupdate.c:1044
 msgid "Some SN"
 msgstr "一些 SN"
 
@@ -6277,7 +6463,8 @@ msgstr "一些 SN"
 msgid "Nick Name"
 msgstr "暱稱"
 
-#: src/main.c:246
+#: src/main.c:249
+#, c-format
 msgid ""
 "File '%s' already exists.\n"
 "Can't create folder."
@@ -6285,7 +6472,8 @@ msgstr ""
 "檔案 '%s' 已經存在\n"
 "無法建立資料夾"
 
-#: src/main.c:367
+#: src/main.c:370
+#, c-format
 msgid ""
 "Configuration for %s found.\n"
 "Do you want to migrate this configuration?"
@@ -6293,7 +6481,8 @@ msgstr ""
 "發現 %s 的配置設定\n"
 "確認要合併配置設定內容嗎?"
 
-#: src/main.c:369
+#: src/main.c:372
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -6305,11 +6494,11 @@ msgstr ""
 "你的 Sylpheed 過濾條件可以使用一個在 %s 的有效 script 進行轉換\n"
 " "
 
-#: src/main.c:381
+#: src/main.c:384
 msgid "Keep old configuration"
 msgstr "保留舊有的配置設定內容"
 
-#: src/main.c:384
+#: src/main.c:387
 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 "
@@ -6318,31 +6507,32 @@ msgstr ""
 "保留備份可以允許你未來回復至舊的版本,但是,如果你有 IMAP 或是新聞資料時,將"
 "會花費一些時間,同時,也會占去磁碟上的部份空間"
 
-#: src/main.c:392
+#: src/main.c:395
 msgid "Migration of configuration"
 msgstr "配置設定的合併內容"
 
-#: src/main.c:403
+#: src/main.c:406
 msgid "Copying configuration... This may take a while..."
 msgstr "正在複製配置內容... 這將會花費一些時間..."
 
-#: src/main.c:412
+#: src/main.c:415
 msgid "Migration failed!"
 msgstr "合併失敗"
 
-#: src/main.c:421
+#: src/main.c:424
 msgid "Migrating configuration..."
 msgstr "正在合併配置內容..."
 
-#: src/main.c:1128
+#: src/main.c:1138
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib 沒有支援 gthread(_t)\n"
 
-#: src/main.c:1148 src/main.c:1152 src/main.c:1156
+#: src/main.c:1158 src/main.c:1162 src/main.c:1166
 msgid "(or older)"
 msgstr "(或較舊的)"
 
-#: src/main.c:1457
+#: src/main.c:1483
+#, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
 "more information:\n"
@@ -6358,7 +6548,7 @@ msgstr[1] ""
 "以下這些外掛程式載入失敗,請檢查外掛程式配置以獲取更多的資訊:\n"
 "%s"
 
-#: src/main.c:1508
+#: src/main.c:1525
 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 "
@@ -6367,7 +6557,7 @@ msgstr ""
 "Claws Mail已偵測到郵件配置,但是它並不完整。這可能是源自於一個無效的 IMAP 帳"
 "號。請嘗試使用郵件箱的最上層資料夾內的\"重建資料夾\"功能進行修復"
 
-#: src/main.c:1514
+#: src/main.c:1531
 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 "
@@ -6376,35 +6566,36 @@ msgstr ""
 "Claws Mail已偵測到郵件配置,但是它無法載入。這可能是源自於一個過時的延伸外掛"
 "程式,請重新安裝外掛程式後,再試一次。"
 
-#: src/main.c:1759
+#: src/main.c:1776
 msgid "Missing filename\n"
 msgstr "找不到案名稱\n"
 
-#: src/main.c:1766
+#: src/main.c:1783
 msgid "Cannot open filename for reading\n"
 msgstr "無法開啟要讀取的檔案名稱\n"
 
-#: src/main.c:1777
+#: src/main.c:1794
 msgid "Malformed header\n"
 msgstr "變形的標頭\n"
 
-#: src/main.c:1784
+#: src/main.c:1801
 msgid "Duplicated 'To:' header\n"
 msgstr "重複的'收件者:'標頭\n"
 
-#: src/main.c:1795
+#: src/main.c:1812
 msgid "Missing required 'To:' header\n"
 msgstr "遺失必要的'收件者:'標頭\n"
 
-#: src/main.c:1938
+#: src/main.c:1958
+#, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "使用方式: %s [選項]...\n"
 
-#: src/main.c:1940
+#: src/main.c:1960
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [郵件地址]    開啟新郵件視窗"
 
-#: src/main.c:1941
+#: src/main.c:1961
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6421,11 +6612,11 @@ msgstr ""
 "行,接著是\n"
 "                         郵件的內容,直到檔案結束"
 
-#: src/main.c:1946
+#: src/main.c:1966
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      如果可能的話加入訂閱的 URI"
 
-#: src/main.c:1947
+#: src/main.c:1967
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6435,23 +6626,33 @@ msgstr ""
 "                         以指定的附加檔案開啟新郵件視窗\n"
 "                         "
 
-#: src/main.c:1950
+#: src/main.c:1970
+msgid ""
+"  --insert file1 [file2]...\n"
+"                         open composition window with specified files\n"
+"                         inserted"
+msgstr ""
+"  --attach 檔案1 [檔案2]...\n"
+"                         以指定的附加檔案夾在新開啟的郵件視窗\n"
+"                         "
+
+#: src/main.c:1973
 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新郵件"
 
-#: src/main.c:1951
+#: src/main.c:1974
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帳號的新郵件"
 
-#: src/main.c:1952
+#: src/main.c:1975
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     取消接收郵件"
 
-#: src/main.c:1953
+#: src/main.c:1976
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       取消傳送郵件"
 
-#: src/main.c:1954
+#: src/main.c:1977
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6469,15 +6670,15 @@ msgstr ""
 "                         需求: 尋找字串\n"
 "                         遞迴: 若字串的開頭為 0, n, N, f or F,將會失敗"
 
-#: src/main.c:1961
+#: src/main.c:1984
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 傳送所有暫存的郵件"
 
-#: src/main.c:1962
+#: src/main.c:1985
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [資料夾]...   顯示所有郵件的數量"
 
-#: src/main.c:1963
+#: src/main.c:1986
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6485,15 +6686,15 @@ msgstr ""
 "  --status-full [資料夾]...\n"
 "                         顯示每一個資料夾的狀態"
 
-#: src/main.c:1965
+#: src/main.c:1988
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           顯示統計資訊"
 
-#: src/main.c:1966
+#: src/main.c:1989
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     重置統計資訊"
 
-#: src/main.c:1967
+#: src/main.c:1990
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6501,45 +6702,45 @@ msgstr ""
 "  --select 資料夾[/郵件]  跳至指定的資料夾/郵件\n"
 "                         資料夾是一個資料夾 id 像是'資料夾/子資料夾(_f)'"
 
-#: src/main.c:1969
+#: src/main.c:1992
 msgid "  --online               switch to online mode"
 msgstr "  --online               切換至上線模式"
 
-#: src/main.c:1970
+#: src/main.c:1993
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              切換至離線模式"
 
-#: src/main.c:1971
+#: src/main.c:1994
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       離開 Claws Mail"
 
-#: src/main.c:1972
+#: src/main.c:1995
 msgid "  --debug                debug mode"
 msgstr "  --debug                除錯模式"
 
-#: src/main.c:1973
+#: src/main.c:1996
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         釘住除錯模式"
 
-#: src/main.c:1974
+#: src/main.c:1997
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              顯示這個說明並離開"
 
-#: src/main.c:1975
+#: src/main.c:1998
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           顯示版本資訊並離開"
 
-#: src/main.c:1976
+#: src/main.c:1999
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
 msgstr "  --version-full -V      顯示版本資訊及內鍵的功能資訊並離開 "
 
-#: src/main.c:1977
+#: src/main.c:2000
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           顯示配置路徑"
 
-#: src/main.c:1978
+#: src/main.c:2001
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6547,7 +6748,7 @@ msgstr ""
 "  --alternate-config-dir [路徑]\n"
 "                         使用指定的配置路徑"
 
-#: src/main.c:1980
+#: src/main.c:2003
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
@@ -6555,31 +6756,32 @@ msgstr ""
 "  --geometry -geometry WxH+X+Y\n"
 "\t\t\t\t\t\t\t設定主視窗的大小"
 
-#: src/main.c:2033
+#: src/main.c:2056
 msgid "Unknown option\n"
 msgstr "未知的選項\n"
 
-#: src/main.c:2051
+#: src/main.c:2074
+#, c-format
 msgid "Processing (%s)..."
 msgstr "處理 (%s)..."
 
-#: src/main.c:2054
+#: src/main.c:2077
 msgid "top level folder"
 msgstr "最上層資料夾"
 
-#: src/main.c:2137
+#: src/main.c:2160
 msgid "Queued messages"
 msgstr "已暫存郵件"
 
-#: src/main.c:2138
+#: src/main.c:2161
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "尚有未傳送郵件在暫存區,確定要離開嗎?"
 
-#: src/main.c:2880
+#: src/main.c:2908
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager(網路管理員):網路是上線的\n"
 
-#: src/main.c:2886
+#: src/main.c:2914
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager(網路管理員):網路是離線的\n"
 
@@ -6587,7 +6789,7 @@ msgstr "NetworkManager(網路管理員):網路是離線的\n"
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: src/mainwindow.c:515 src/messageview.c:210 src/summaryview.c:435
+#: src/mainwindow.c:515 src/messageview.c:210 src/summaryview.c:436
 msgid "_View"
 msgstr "檢視(_V)"
 
@@ -6787,7 +6989,7 @@ msgstr "下一行"
 msgid "Previous page"
 msgstr "上一頁"
 
-#: src/mainwindow.c:608 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:608 src/messageview.c:261 src/printing.c:487
 msgid "Next page"
 msgstr "下一頁"
 
@@ -6811,7 +7013,7 @@ msgstr "部份信件"
 msgid "View as text"
 msgstr "以文字模式檢視"
 
-#: src/mainwindow.c:638 src/messageview.c:289 src/toolbar.c:491
+#: src/mainwindow.c:638 src/messageview.c:289 src/toolbar.c:494
 msgid "Open"
 msgstr "開啟"
 
@@ -6860,7 +7062,7 @@ msgstr "新增郵件"
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: src/mainwindow.c:664 src/messageview.c:301 src/summaryview.c:427
+#: src/mainwindow.c:664 src/messageview.c:301 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "回覆給(_y)"
 
@@ -6872,15 +7074,15 @@ msgstr "郵件清單(_l)"
 msgid "Follow-up and reply to"
 msgstr "轉送及回覆"
 
-#: src/mainwindow.c:671 src/messageview.c:307 src/toolbar.c:2368
+#: src/mainwindow.c:671 src/messageview.c:307 src/toolbar.c:2446
 msgid "_Forward"
 msgstr "轉送(_F)"
 
-#: src/mainwindow.c:672 src/messageview.c:308 src/toolbar.c:2369
+#: src/mainwindow.c:672 src/messageview.c:308 src/toolbar.c:2447
 msgid "For_ward as attachment"
 msgstr "以夾檔方式轉送(_w)"
 
-#: src/mainwindow.c:673 src/messageview.c:309 src/toolbar.c:2370
+#: src/mainwindow.c:673 src/messageview.c:309 src/toolbar.c:2448
 msgid "Redirec_t"
 msgstr "重新導向(_t)"
 
@@ -6936,7 +7138,7 @@ msgstr "刪除串列(_h)"
 msgid "Cancel a news message"
 msgstr "取消新郵件"
 
-#: src/mainwindow.c:699 src/mainwindow.c:700 src/summaryview.c:428
+#: src/mainwindow.c:699 src/mainwindow.c:700 src/summaryview.c:429
 msgid "_Mark"
 msgstr "標記(_M)"
 
@@ -6961,7 +7163,7 @@ msgid "Mark all unread"
 msgstr "標記所有為未讀"
 
 #: src/mainwindow.c:710 src/prefs_filtering_action.c:199 src/toolbar.c:242
-#: src/toolbar.c:500
+#: src/toolbar.c:503
 msgid "Ignore thread"
 msgstr "忽略串列"
 
@@ -6970,7 +7172,7 @@ msgid "Unignore thread"
 msgstr "不忽略串列"
 
 #: src/mainwindow.c:712 src/prefs_filtering_action.c:200 src/toolbar.c:243
-#: src/toolbar.c:501
+#: src/toolbar.c:504
 msgid "Watch thread"
 msgstr "以串列檢視"
 
@@ -6986,19 +7188,19 @@ msgstr "標記為垃圾郵件(_s)"
 msgid "Mark as _ham"
 msgstr "標記為非垃圾郵件(_h)"
 
-#: src/mainwindow.c:720 src/prefs_filtering_action.c:181 src/toolbar.c:504
+#: src/mainwindow.c:720 src/prefs_filtering_action.c:181 src/toolbar.c:507
 msgid "Lock"
 msgstr "上鎖"
 
-#: src/mainwindow.c:721 src/prefs_filtering_action.c:182 src/toolbar.c:505
+#: src/mainwindow.c:721 src/prefs_filtering_action.c:182 src/toolbar.c:508
 msgid "Unlock"
 msgstr "解鎖"
 
-#: src/mainwindow.c:723 src/summaryview.c:429
+#: src/mainwindow.c:723 src/summaryview.c:430
 msgid "Color la_bel"
 msgstr "顏色標記(_b)"
 
-#: src/mainwindow.c:724 src/summaryview.c:430
+#: src/mainwindow.c:724 src/summaryview.c:431
 msgid "Ta_gs"
 msgstr "標籤(_g)"
 
@@ -7047,12 +7249,12 @@ msgstr "建立過濾器規則(_C)"
 msgid "_Automatically"
 msgstr "自動地(_A)"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/mainwindow.c:860
+#: src/mainwindow.c:748 src/mainwindow.c:754 src/mainwindow.c:858
 #: src/messageview.c:319 src/messageview.c:325
 msgid "By _From"
 msgstr "根據寄件者(_F)"
 
-#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:861
+#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:859
 #: src/messageview.c:320 src/messageview.c:326
 msgid "By _To"
 msgstr "根據收件者(_T)"
@@ -7062,7 +7264,7 @@ msgstr "根據收件者(_T)"
 msgid "By _Subject"
 msgstr "根據主旨(_S)"
 
-#: src/mainwindow.c:752 src/messageview.c:323 src/summaryview.c:433
+#: src/mainwindow.c:752 src/messageview.c:323 src/summaryview.c:434
 msgid "Create processing rule"
 msgstr "建立執行規則"
 
@@ -7098,302 +7300,302 @@ msgstr "刪除(_u)"
 msgid "SSL/TLS cer_tificates"
 msgstr "SSL/TLS 認證(_t)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:779
 msgid "Filtering Lo_g"
 msgstr "過濾日誌(_g)"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:780
 msgid "Network _Log"
 msgstr "網路日誌(_L)"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:782
 msgid "_Forget all session passwords"
 msgstr "消除所有(_F)"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:784
 msgid "Forget _master passphrase"
 msgstr "消除所有(_F)"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:788
 msgid "C_hange current account"
 msgstr "更改目前帳號(_h)"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:790
 msgid "_Preferences for current account..."
 msgstr "目前帳號設定(_P)..."
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:791
 msgid "Create _new account..."
 msgstr "新增帳號(_n)"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:792
 msgid "_Edit accounts..."
 msgstr "編輯帳號(_E)"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:795
 msgid "P_references..."
 msgstr "選項(_r)..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:796
 msgid "Pre-pr_ocessing..."
 msgstr "前處理(_o)..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:797
 msgid "Post-pro_cessing..."
 msgstr "後處理(_c)..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:798
 msgid "_Filtering..."
 msgstr "過濾器(_F)..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:799
 msgid "_Templates..."
 msgstr "樣板(_T)..."
 
-#: src/mainwindow.c:802
+#: src/mainwindow.c:800
 msgid "_Actions..."
 msgstr "動作(_A)..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:801
 msgid "Tag_s..."
 msgstr "標籤(_s)..."
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:803
 msgid "Plu_gins..."
 msgstr "外掛(_g)..."
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:806
 msgid "_Manual"
 msgstr "手冊(_M)"
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:807
 msgid "_Online User-contributed FAQ"
 msgstr "線上協助 FAQ(_O)"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:808
 msgid "Icon _Legend"
 msgstr "圖示說明(_L)"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:810
 msgid "Set as default client"
 msgstr "設置為預設客戶端"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:817
 msgid "Offline _mode"
 msgstr "離線模式(_m)"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:818
 msgid "Men_ubar"
 msgstr "選單列(_u)"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:819
 msgid "_Message view"
 msgstr "郵件檢視(_M)"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:821
 msgid "Status _bar"
 msgstr "狀態列(_b)"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:823
 msgid "Column headers"
 msgstr "標頭列"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:824
 msgid "Th_read view"
 msgstr "串列檢視(_r)"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:825
 msgid "Hide read threads"
 msgstr "隱藏讀取串列"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:826
 msgid "_Hide read messages"
 msgstr "隱藏讀取郵件(_H)"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:827
 msgid "Hide deleted messages"
 msgstr "隱藏刪除郵件"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:828
 msgid "_Fullscreen"
 msgstr "全螢幕(_F)"
 
-#: src/mainwindow.c:831 src/messageview.c:342
+#: src/mainwindow.c:829 src/messageview.c:342
 msgid "Show all _headers"
 msgstr "顯示所有標頭(_h)"
 
-#: src/mainwindow.c:832 src/messageview.c:343
+#: src/mainwindow.c:830 src/messageview.c:343
 msgid "_Collapse all"
 msgstr "全部折疊(_C)"
 
-#: src/mainwindow.c:833 src/messageview.c:344
+#: src/mainwindow.c:831 src/messageview.c:344
 msgid "Collapse from level _2"
 msgstr "從第二層開始折疊(_2)"
 
-#: src/mainwindow.c:834 src/messageview.c:345
+#: src/mainwindow.c:832 src/messageview.c:345
 msgid "Collapse from level _3"
 msgstr "從第三層開始折疊(_3)"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:836
 msgid "Text _below icons"
 msgstr "圖示下方顯示字串(_b)"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:837
 msgid "Text be_side icons"
 msgstr "圖示旁顯示字串(_s)"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:838
 msgid "_Icons only"
 msgstr "只顯示圖示(_I)"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:839
 msgid "_Text only"
 msgstr "只顯示字串(_T)"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:846
 msgid "_Standard"
 msgstr "標準(_S)"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:847
 msgid "_Three columns"
 msgstr "三欄(_T)"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:848
 msgid "_Wide message"
 msgstr "寬郵件(_W)"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:849
 msgid "W_ide message list"
 msgstr "寬郵件清單(_i)"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:850
 msgid "S_mall screen"
 msgstr "小螢幕(_m)"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:854
 msgid "By _number"
 msgstr "根據數值(_n)"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:855
 msgid "By s_ize"
 msgstr "根據大小(_i)"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:856
 msgid "By _date"
 msgstr "根據日期(_d)"
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:857
 msgid "By thread date"
 msgstr "根據串列日期"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:860
 msgid "By s_ubject"
 msgstr "根據主旨(_u)"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:861
 msgid "By _color label"
 msgstr "根據標籤顏色(_c)"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:862
 msgid "By tag"
 msgstr "根據標籤"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:863
 msgid "By _mark"
 msgstr "根據標記(_m)"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:864
 msgid "By _status"
 msgstr "根據狀態(_s)"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:865
 msgid "By a_ttachment"
 msgstr "根據附加檔案(_t)"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:866
 msgid "By score"
 msgstr "根據分數"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:867
 msgid "By locked"
 msgstr "根據鎖定"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:868
 msgid "D_on't sort"
 msgstr "不排序(_o)"
 
-#: src/mainwindow.c:874 src/prefs_summaries.c:463
+#: src/mainwindow.c:872 src/prefs_summaries.c:462
 msgid "Ascending"
 msgstr "升冪"
 
-#: src/mainwindow.c:875 src/prefs_summaries.c:464
+#: src/mainwindow.c:873 src/prefs_summaries.c:463
 msgid "Descending"
 msgstr "降冪"
 
-#: src/mainwindow.c:917 src/messageview.c:387
+#: src/mainwindow.c:915 src/messageview.c:387
 msgid "_Auto detect"
 msgstr "自動偵測(_A)"
 
-#: src/mainwindow.c:1314 src/summaryview.c:6243
+#: src/mainwindow.c:1312 src/summaryview.c:6287
 msgid "Apply tags..."
 msgstr "指定標籤"
 
-#: src/mainwindow.c:1962
+#: src/mainwindow.c:1958
 msgid "Some error(s) happened. Click here to view log."
 msgstr "發生一些錯誤,點選這裡以檢視日誌"
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1973
 msgid "You are online. Click the icon to go offline"
 msgstr "目前是上線狀態,按下圖示進入離線狀態"
 
-#: src/mainwindow.c:1980
+#: src/mainwindow.c:1976
 msgid "You are offline. Click the icon to go online"
 msgstr "目前是離線狀態,按下圖示進入上線狀態"
 
-#: src/mainwindow.c:1994
+#: src/mainwindow.c:1990
 msgid "Select account"
 msgstr "選擇帳號"
 
-#: src/mainwindow.c:2021 src/prefs_logging.c:140
+#: src/mainwindow.c:2017 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "網路日誌"
 
-#: src/mainwindow.c:2025
+#: src/mainwindow.c:2021
 msgid "Filtering/Processing debug log"
 msgstr "過濾器/執行除錯日誌"
 
-#: src/mainwindow.c:2044 src/prefs_logging.c:392
+#: src/mainwindow.c:2040 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "開啟過濾器日誌\n"
 
-#: src/mainwindow.c:2046 src/prefs_logging.c:394
+#: src/mainwindow.c:2042 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "關閉過濾器日誌\n"
 
-#: src/mainwindow.c:2489 src/mainwindow.c:2496 src/mainwindow.c:2539
-#: src/mainwindow.c:2572 src/mainwindow.c:2604 src/mainwindow.c:2649
+#: src/mainwindow.c:2485 src/mainwindow.c:2492 src/mainwindow.c:2535
+#: src/mainwindow.c:2568 src/mainwindow.c:2600 src/mainwindow.c:2645
 #: src/plugins/notification/notification_trayicon.c:372
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1077
 msgid "Untitled"
 msgstr "無標題的"
 
-#: src/mainwindow.c:2650 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2646 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "無"
 
-#: src/mainwindow.c:2907 src/mainwindow.c:2911
+#: src/mainwindow.c:2903 src/mainwindow.c:2907
 msgid "Delete all messages in trash folders?"
 msgstr "刪除回收桶中所有的郵件"
 
-#: src/mainwindow.c:2908
+#: src/mainwindow.c:2904
 msgid "Don't quit"
 msgstr "不要離開"
 
-#: src/mainwindow.c:2937 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2933 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "新增郵件夾"
 
-#: src/mainwindow.c:2938
+#: src/mainwindow.c:2934
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7402,17 +7604,18 @@ msgstr ""
 "輸入郵件夾的路徑\n"
 "如果指定的郵件夾已經存在,它將被自動的找到"
 
-#: src/mainwindow.c:2944 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2940 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:2949 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2945 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
 #: src/wizard.c:740
 msgid "Mailbox"
 msgstr "郵件夾"
 
-#: src/mainwindow.c:2954 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2950 src/plugins/mailmbox/plugin_gtk.c:215 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 "
@@ -7421,106 +7624,112 @@ msgstr ""
 "郵件箱建立失敗\n"
 "可能有部份檔案已經存在,或是沒有足夠的存取權限"
 
-#: src/mainwindow.c:3423
+#: src/mainwindow.c:3419
 msgid "No posting allowed"
 msgstr "不允許發郵件"
 
-#: src/mainwindow.c:4006
+#: src/mainwindow.c:4002
 msgid "Mbox import has failed."
 msgstr "Mbox 匯入失敗"
 
-#: src/mainwindow.c:4015 src/mainwindow.c:4024
+#: src/mainwindow.c:4011 src/mainwindow.c:4020
 msgid "Export to mbox has failed."
 msgstr "匯出至 mbox 失敗"
 
-#: src/mainwindow.c:4065 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:4065 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "離開 Clasw Mail?"
 
-#: src/mainwindow.c:4256
+#: src/mainwindow.c:4252
 msgid "Folder synchronisation"
 msgstr "資料夾同步"
 
-#: src/mainwindow.c:4257
+#: src/mainwindow.c:4253
 msgid "Do you want to synchronise your folders now?"
 msgstr "同步資料夾?"
 
-#: src/mainwindow.c:4258
+#: src/mainwindow.c:4254
 msgid "_Synchronise"
 msgstr "同步(_S)"
 
-#: src/mainwindow.c:4706
+#: src/mainwindow.c:4702
 msgid "Deleting duplicated messages..."
 msgstr "正在刪除重複的郵件..."
 
-#: src/mainwindow.c:4716
+#: src/mainwindow.c:4712
 msgid "No duplicate message found in selected folder.\n"
 msgstr "選擇的路徑中沒有重複的郵件\n"
 
-#: src/mainwindow.c:4722
+#: src/mainwindow.c:4718
+#, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
 msgstr[0] "已刪除 %d 重複郵件於選擇的資料夾內\n"
 msgstr[1] "已刪除 %d 重複郵件於選擇的資料夾內\n"
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4722
+#, c-format
 msgid "Marked %d duplicate message for deletion in selected folder.\n"
 msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
 msgstr[0] "已刪除 %d 重複郵件於選擇的資料夾內\n"
 msgstr[1] "已刪除 %d 重複郵件於選擇的資料夾內\n"
 
-#: src/mainwindow.c:4764
+#: src/mainwindow.c:4760
 msgid "Deleting duplicated messages in all folders..."
 msgstr "正在所有的路徑中刪除重複的郵件..."
 
-#: src/mainwindow.c:4770
+#: src/mainwindow.c:4766
+#, 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:4775
+#: src/mainwindow.c:4771
+#, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "資料夾 %d 內沒有重複的郵件\n"
 
-#: src/mainwindow.c:4937 src/messageview.c:2657
+#: src/mainwindow.c:4933 src/messageview.c:2657
 msgid "Select folder to go to"
 msgstr "選擇要前往的資料夾"
 
-#: src/mainwindow.c:5038 src/summaryview.c:5734
+#: src/mainwindow.c:5034 src/summaryview.c:5778
 msgid "Processing rules to apply before folder rules"
 msgstr "在資料夾的規則進行前套用"
 
-#: src/mainwindow.c:5046
+#: src/mainwindow.c:5042
 msgid "Processing rules to apply after folder rules"
 msgstr "在資料夾的規則進行後套用"
 
-#: src/mainwindow.c:5054 src/summaryview.c:5745
+#: src/mainwindow.c:5050 src/summaryview.c:5789
 msgid "Filtering configuration"
 msgstr "過濾配置"
 
-#: src/mainwindow.c:5169
+#: src/mainwindow.c:5165
 msgid "Can not register as default client: impossible to get executable path."
 msgstr "無法註冊為預設的客戶端郵件程式:無法寫入取得可執行的路徑"
 
-#: src/mainwindow.c:5228
+#: src/mainwindow.c:5224
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail 已註冊為預設客戶端郵件程式"
 
-#: src/mainwindow.c:5230
+#: src/mainwindow.c:5226
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr "無法註冊為預設的客戶端郵件程式:無法寫入 registry"
 
-#: src/mainwindow.c:5244 src/setup.c:91
+#: src/mainwindow.c:5240 src/setup.c:91
+#, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "掃描資料夾 %s%c%s..."
 
-#: src/mainwindow.c:5388
+#: src/mainwindow.c:5384
+#, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "忘記了 %d 密碼於 %d 帳號內\n"
@@ -7528,6 +7737,7 @@ msgstr[1] "忘記了 %d 密碼於 %d 帳號內\n"
 
 #: src/matcher.c:214 src/matcher.c:215 src/matcher.c:216 src/matcher.c:217
 #: src/matcher.c:218 src/matcher.c:219 src/matcher.c:220 src/matcher.c:221
+#, c-format
 msgid "%s header"
 msgstr "%s 標頭"
 
@@ -7556,24 +7766,26 @@ msgstr "區分大小寫"
 msgid "Case insensitive"
 msgstr "不區分大小寫"
 
-#: src/matcher.c:1862
+#: src/matcher.c:1859
+#, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "檢查郵件是否相符 [ %s ]\n"
 
-#: src/matcher.c:1933 src/matcher.c:1952 src/matcher.c:1965
+#: src/matcher.c:1930 src/matcher.c:1949 src/matcher.c:1962
 msgid "message matches\n"
 msgstr "郵件相符\n"
 
-#: src/matcher.c:1940 src/matcher.c:1958 src/matcher.c:1967
+#: src/matcher.c:1937 src/matcher.c:1955 src/matcher.c:1964
 msgid "message does not match\n"
 msgstr "郵件不相符\n"
 
-#: src/matcher.c:2230 src/matcher.c:2231 src/matcher.c:2232 src/matcher.c:2233
-#: src/matcher.c:2234 src/matcher.c:2235 src/matcher.c:2236 src/matcher.c:2237
+#: src/matcher.c:2227 src/matcher.c:2228 src/matcher.c:2229 src/matcher.c:2230
+#: src/matcher.c:2231 src/matcher.c:2232 src/matcher.c:2233 src/matcher.c:2234
 msgid "(none)"
 msgstr "(空)"
 
 #: src/mbox.c:107
+#, c-format
 msgid ""
 "Could not open mbox file:\n"
 "%s\n"
@@ -7582,6 +7794,7 @@ msgstr ""
 "%s\n"
 
 #: src/mbox.c:144
+#, c-format
 msgid "Importing from mbox... (%d mail imported)"
 msgid_plural "Importing from mbox... (%d mails imported)"
 msgstr[0] "從 mbox 匯入... (%d 郵件已匯入)"
@@ -7596,11 +7809,12 @@ msgid "This file already exists. Do you want to overwrite it?"
 msgstr "此檔案已經鄉在,要覆寫嗎?"
 
 #: src/mbox.c:551 src/messageview.c:1864 src/mimeview.c:1843
-#: src/prefs_themes.c:561 src/textview.c:3086
+#: src/prefs_themes.c:598 src/textview.c:3095
 msgid "Overwrite"
 msgstr "覆寫"
 
 #: src/mbox.c:560
+#, c-format
 msgid ""
 "Could not create mbox file:\n"
 "%s\n"
@@ -7653,6 +7867,7 @@ msgid "<No Return-Path found>"
 msgstr "<找不到回覆路徑>"
 
 #: src/messageview.c:849
+#, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
 "to be sent does not correspond to the return path:\n"
@@ -7671,6 +7886,7 @@ msgid "_Don't Send"
 msgstr "不傳送(_D)"
 
 #: src/messageview.c:875
+#, c-format
 msgctxt "'%s' stands for 'To' then 'Cc'"
 msgid ""
 "This message is asking for a return receipt notification\n"
@@ -7684,10 +7900,12 @@ msgstr ""
 "建議你不要傳送回條"
 
 #: src/messageview.c:1385
+#, c-format
 msgid "Fetching message (%s)..."
 msgstr "取得郵件 (%s)..."
 
-#: src/messageview.c:1421 src/procmime.c:1008
+#: src/messageview.c:1421 src/procmime.c:1009
+#, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "無法解碼: %s"
 
@@ -7696,8 +7914,8 @@ msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "郵件不符合 MIME 標準,可能解讀錯誤"
 
 #: src/messageview.c:1856 src/messageview.c:1859 src/mimeview.c:2048
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4838
-#: src/summaryview.c:4841 src/textview.c:3074
+#: src/plugins/fancy/fancy_viewer.c:709 src/summaryview.c:4882
+#: src/summaryview.c:4885 src/textview.c:3083
 msgid "Save as"
 msgstr "另存新檔"
 
@@ -7705,12 +7923,14 @@ msgstr "另存新檔"
 msgid "Overwrite existing file?"
 msgstr "覆寫已存在的檔案嗎?"
 
-#: src/messageview.c:1873 src/summaryview.c:4858 src/summaryview.c:4861
-#: src/summaryview.c:4876
+#: src/messageview.c:1873 src/summaryview.c:4902 src/summaryview.c:4905
+#: src/summaryview.c:4920
+#, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "無法儲存檔案 '%s'"
 
 #: src/messageview.c:1926
+#, c-format
 msgid "Show all %s."
 msgstr "顯示全部 %s"
 
@@ -7745,6 +7965,7 @@ msgstr ""
 "而且已經待伺服器被刪除"
 
 #: src/messageview.c:2018
+#, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s."
@@ -7761,6 +7982,7 @@ msgid "Mark for deletion"
 msgstr "標示欲刪除項目"
 
 #: src/messageview.c:2028
+#, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be downloaded."
@@ -7769,11 +7991,12 @@ msgstr ""
 "%s 將被下載"
 
 #: src/messageview.c:2033 src/messageview.c:2046
-#: src/prefs_filtering_action.c:180 src/toolbar.c:503
+#: src/prefs_filtering_action.c:180 src/toolbar.c:506
 msgid "Unmark"
 msgstr "未標示"
 
 #: src/messageview.c:2039
+#, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be deleted."
@@ -7831,8 +8054,8 @@ msgstr ""
 "\n"
 "  郵件已被刪除或移至其它資料夾"
 
-#: src/messageview.c:3009 src/messageview.c:3015 src/summaryview.c:4251
-#: src/summaryview.c:7010
+#: src/messageview.c:3009 src/messageview.c:3015 src/summaryview.c:4295
+#: src/summaryview.c:7054
 msgid "An error happened while learning.\n"
 msgstr "學習過程中發生錯誤\n"
 
@@ -7849,6 +8072,7 @@ msgid "Remove _mailbox..."
 msgstr "移除郵件箱(_m)..."
 
 #: src/mh_gtk.c:222
+#, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
 "\n"
@@ -7858,7 +8082,8 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:298
+#: src/mh_gtk.c:372 src/plugins/mailmbox/plugin_gtk.c:298
+#, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
 "(The messages are NOT deleted from the disk)"
@@ -7866,7 +8091,7 @@ msgstr ""
 "確定要移除郵件箱 '%s'嗎?\n"
 "(這些郵件將不會從碟磁中被移除)"
 
-#: src/mh_gtk.c:376 src/plugins/mailmbox/plugin_gtk.c:300
+#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:300
 msgid "Remove mailbox"
 msgstr "移除郵件箱"
 
@@ -7908,10 +8133,12 @@ msgid "Check again"
 msgstr "再檢查一次"
 
 #: src/mimeview.c:1059
+#, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s 點選圖示去檢查它"
 
 #: src/mimeview.c:1061
+#, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s 點選圖示或點擊'%s'去檢查它 "
 
@@ -7920,6 +8147,7 @@ msgid "Timeout checking the signature. Click the icon to try again."
 msgstr "檢查簽章超時,點選圖示再試一次"
 
 #: src/mimeview.c:1073
+#, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr "檢查簽章超時,點選圖示或點擊'%s'再試一次"
@@ -7933,15 +8161,18 @@ msgid "Go back to email"
 msgstr "回到電子郵件"
 
 #: src/mimeview.c:1761 src/mimeview.c:1853 src/mimeview.c:2095
-#: src/mimeview.c:2131 src/mimeview.c:2243 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2131 src/mimeview.c:2243 src/plugins/fancy/fancy_viewer.c:449
+#, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "無法儲存多重郵件的一個部份:%s"
 
-#: src/mimeview.c:1840 src/textview.c:3084
+#: src/mimeview.c:1840 src/textview.c:3093
+#, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "覆寫已存在的檔案 '%s' 嗎?"
 
 #: src/mimeview.c:1864
+#, c-format
 msgid ""
 "An error has occurred while saving message part #%d. Do you want to cancel "
 "operation or skip error and continue?"
@@ -7960,37 +8191,42 @@ msgid "Skip all"
 msgstr "跳過全部"
 
 #: src/mimeview.c:1878
+#, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] "檔案 %d 已經成功的儲存"
 msgstr[1] "檔案 %d 已經成功的儲存"
 
 #: src/mimeview.c:1886
+#, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] "檔案 %d 已經成功的儲存"
 msgstr[1] "檔案 %d 已經成功的儲存"
 
 #: src/mimeview.c:1891
+#, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s,%d 檔案失敗"
 msgstr[1] "%s,%d 檔案失敗"
 
 #: src/mimeview.c:1924 src/plugins/archive/archiver_prefs.c:142
-#: src/prefs_filtering_action.c:1297
+#: src/prefs_filtering_action.c:1300
 msgid "Select destination folder"
 msgstr "選擇目的資料夾"
 
 #: src/mimeview.c:1931 src/plugins/archive/archiver_prefs.c:148
+#, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s'並不是一個路徑"
 
-#: src/mimeview.c:2178 src/mimeview.c:2185 src/textview.c:3001
+#: src/mimeview.c:2178 src/mimeview.c:2185 src/textview.c:3010
 msgid "Open with"
 msgstr "以...開啟"
 
-#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3002
+#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3011
+#, c-format
 msgid ""
 "Enter the command-line to open file:\n"
 "('%s' will be replaced with file name)"
@@ -7999,6 +8235,7 @@ msgstr ""
 "('%s' 將被用檔名覆蓋)"
 
 #: src/mimeview.c:2281
+#, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
 "\n"
@@ -8028,12 +8265,12 @@ msgstr ""
 msgid "Run binary"
 msgstr "執行二進制檔"
 
-#: src/mimeview.c:2596 src/plugins/att_remover/att_remover.c:299
+#: src/mimeview.c:2596 src/plugins/att_remover/att_remover.c:304
 msgid "Type:"
 msgstr "型式:"
 
-#: src/mimeview.c:2597 src/plugins/att_remover/att_remover.c:300
-#: src/plugins/pdf_viewer/poppler_viewer.c:697 src/summaryview.c:2698
+#: src/mimeview.c:2597 src/plugins/att_remover/att_remover.c:305
+#: src/plugins/pdf_viewer/poppler_viewer.c:699 src/summaryview.c:2713
 msgid "Size:"
 msgstr "大小:"
 
@@ -8044,14 +8281,17 @@ msgid "Description:"
 msgstr "描述:"
 
 #: src/news.c:303
+#, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "連線至 %s:%d 的 NNTP 已經斷線\n"
 
 #: src/news.c:336
+#, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "帳號 '%s': 連線至 NNTP 伺服器:%s:%d...\n"
 
 #: src/news.c:357
+#, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "登入%s:%d時發生錯誤...\n"
 
@@ -8065,10 +8305,12 @@ msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "雖然模式讀取器失效,但仍將繼續\n"
 
 #: src/news.c:451
+#, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "用 %s:%d 建立資料發生錯誤\n"
 
 #: src/news.c:466
+#, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "向 %s:%d 認證時發生錯誤\n"
 
@@ -8077,34 +8319,38 @@ msgid "Claws Mail needs network access in order to access the News server."
 msgstr "Claws Mail 需要網路才能存取新聞伺服器"
 
 #: src/news.c:862
+#, c-format
 msgid "couldn't select group: %s\n"
 msgstr "無法選擇群組: %s\n"
 
-#: src/news.c:1054 src/news.c:1224
+#: src/news.c:1054 src/news.c:1232
+#, c-format
 msgid "couldn't set group: %s\n"
 msgstr "無法設定群組: %s\n"
 
 #: src/news.c:1063
+#, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "無效的文章範圍 %d - %d\n"
 
-#: src/news.c:1133 src/news.c:1157 src/news.c:1181
+#: src/news.c:1133 src/news.c:1160 src/news.c:1187
 msgid "couldn't get xhdr\n"
 msgstr "無法取得 xhdr\n"
 
-#: src/news.c:1217
+#: src/news.c:1225
+#, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "取得 xover %d - %d 於 %s 內...\n"
 
-#: src/news.c:1232
+#: src/news.c:1240
 msgid "couldn't get xover\n"
 msgstr "無法取得 xover\n"
 
-#: src/news.c:1247
+#: src/news.c:1257
 msgid "invalid xover line\n"
 msgstr "無效的 xover 線\n"
 
-#: src/news.c:1449
+#: src/news.c:1459
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -8125,6 +8371,7 @@ msgid "_Unsubscribe newsgroup"
 msgstr "取消訂閱新聞群組(_U)"
 
 #: src/news_gtk.c:250
+#, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr "真的要取消訂閱新聞群組 '%s' 嗎?"
 
@@ -8329,6 +8576,7 @@ msgstr "保留寄件者地址的區塊"
 #: src/plugins/address_keeper/address_keeper_prefs.c:147
 #: src/plugins/address_keeper/address_keeper_prefs.c:161
 #: src/plugins/address_keeper/address_keeper_prefs.c:175
+#, c-format
 msgctxt "address keeper: %s stands for a header name"
 msgid "Keep addresses which appear in '%s' headers"
 msgstr "保留出現在 '%s' 標頭內的地址"
@@ -8347,6 +8595,7 @@ msgid "Create Archive..."
 msgstr "建立封存..."
 
 #: src/plugins/archive/archiver.c:123
+#, c-format
 msgid ""
 "This plugin adds archiving features to Claws Mail.\n"
 "\n"
@@ -8403,6 +8652,7 @@ msgid "Archiving:"
 msgstr "封存:"
 
 #: src/plugins/archive/archiver_gtk.c:525
+#, c-format
 msgid ""
 "Some uninitialized data prevents from starting\n"
 "the archiving process:\n"
@@ -8429,22 +8679,27 @@ msgstr ""
 "尚未設定封存名稱"
 
 #: src/plugins/archive/archiver_gtk.c:552
+#, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s: 已存在!繼續嗎?"
 
 #: src/plugins/archive/archiver_gtk.c:555
+#, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: 是一個超連結!無法繼續"
 
 #: src/plugins/archive/archiver_gtk.c:558
+#, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: 是一個路徑!無法繼續"
 
 #: src/plugins/archive/archiver_gtk.c:561
+#, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: 沒有權限!無法繼續"
 
 #: src/plugins/archive/archiver_gtk.c:564
+#, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: 未知的錯誤!無法繼續"
 
@@ -8454,6 +8709,7 @@ msgid "Creating archive"
 msgstr "建立新的封存"
 
 #: src/plugins/archive/archiver_gtk.c:585
+#, c-format
 msgid ""
 "Not a valid file name:\n"
 "%s."
@@ -8462,6 +8718,7 @@ msgstr ""
 "%s."
 
 #: src/plugins/archive/archiver_gtk.c:590
+#, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
 "%s."
@@ -8470,6 +8727,7 @@ msgstr ""
 "%s."
 
 #: src/plugins/archive/archiver_gtk.c:614
+#, c-format
 msgid ""
 "Adding files in folder failed\n"
 "Files in folder: %d\n"
@@ -8484,6 +8742,7 @@ msgstr ""
 "繼續嗎?"
 
 #: src/plugins/archive/archiver_gtk.c:631
+#, c-format
 msgid ""
 "Archive creation error:\n"
 "%s"
@@ -8530,14 +8789,14 @@ msgstr "壓縮等級"
 #: src/plugins/archive/archiver_gtk.c:833
 #: src/plugins/archive/archiver_gtk.c:841
 #: src/plugins/archive/archiver_gtk.c:849
-#: src/plugins/pdf_viewer/poppler_viewer.c:716 src/prefs_folder_item.c:522
+#: src/plugins/pdf_viewer/poppler_viewer.c:718 src/prefs_folder_item.c:522
 msgid "Yes"
 msgstr "是"
 
 #: src/plugins/archive/archiver_gtk.c:833
 #: src/plugins/archive/archiver_gtk.c:841
 #: src/plugins/archive/archiver_gtk.c:849
-#: src/plugins/pdf_viewer/poppler_viewer.c:719 src/prefs_folder_item.c:521
+#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:521
 #: src/prefs_summaries.c:380
 msgid "No"
 msgstr "否"
@@ -8568,6 +8827,7 @@ msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr "選擇封存檔案名稱 [後綴將類似 .tgz]"
 
 #: src/plugins/archive/archiver_gtk.c:986
+#, c-format
 msgid "%ld of %ld"
 msgstr "%ld of %ld"
 
@@ -8601,7 +8861,7 @@ msgstr "封存路徑和名稱"
 
 #: src/plugins/archive/archiver_gtk.c:1092
 #: src/plugins/archive/archiver_prefs.c:225
-#: src/plugins/pgpcore/select-keys.c:421
+#: src/plugins/pgpcore/select-keys.c:435
 msgid "_Select"
 msgstr "選擇(_S)"
 
@@ -8624,6 +8884,7 @@ msgstr "選擇壓縮方式"
 #: src/plugins/archive/archiver_gtk.c:1162
 #: src/plugins/archive/archiver_gtk.c:1170
 #: src/plugins/archive/archiver_gtk.c:1177
+#, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr "選擇這個選項,將可在封存時使用 %s 壓縮功能"
 
@@ -8635,6 +8896,7 @@ msgstr "選擇格式"
 #: src/plugins/archive/archiver_gtk.c:1244
 #: src/plugins/archive/archiver_gtk.c:1250
 #: src/plugins/archive/archiver_gtk.c:1256
+#, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr "選擇這個選項,將可在封存時使用 %s 格式"
 
@@ -8722,6 +8984,7 @@ msgstr "預設的壓縮"
 #: src/plugins/archive/archiver_prefs.c:302
 #: src/plugins/archive/archiver_prefs.c:310
 #: src/plugins/archive/archiver_prefs.c:317
+#, c-format
 msgid "Choose this option to use %s compression by default"
 msgstr "預設將選擇這個選項以使用 %s 進行壓縮"
 
@@ -8733,6 +8996,7 @@ msgstr "預設格式"
 #: src/plugins/archive/archiver_prefs.c:380
 #: src/plugins/archive/archiver_prefs.c:386
 #: src/plugins/archive/archiver_prefs.c:392
+#, c-format
 msgid "Choose this option to use the %s as format by default"
 msgstr "預設將選擇這個選項以使用 %s 格式"
 
@@ -8760,7 +9024,7 @@ msgstr ""
 " "
 
 #: src/plugins/archive/archiver_prefs.c:425
-#: src/plugins/managesieve/sieve_manager.c:761
+#: src/plugins/managesieve/sieve_manager.c:765
 msgid "Rename"
 msgstr "重新命名"
 
@@ -8768,25 +9032,25 @@ msgstr "重新命名"
 msgid "Choose this option to delete mails after archiving"
 msgstr "選擇這個選項,在封存後刪除郵件"
 
-#: src/plugins/att_remover/att_remover.c:332
+#: src/plugins/att_remover/att_remover.c:337
 msgid "Remove attachments"
 msgstr "移除附加檔"
 
-#: src/plugins/att_remover/att_remover.c:357
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:1060
+#: src/plugins/att_remover/att_remover.c:362
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:1097
 msgid "Remove"
 msgstr "移除"
 
-#: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:452
-#: src/prefs_summary_column.c:80 src/summaryview.c:2792
+#: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:451
+#: src/prefs_summary_column.c:79 src/summaryview.c:2807
 msgid "Attachment"
 msgstr "附加檔"
 
-#: src/plugins/att_remover/att_remover.c:417
+#: src/plugins/att_remover/att_remover.c:422
 msgid "Destroy attachments"
 msgstr "刪除附加檔"
 
-#: src/plugins/att_remover/att_remover.c:418
+#: src/plugins/att_remover/att_remover.c:423
 msgid ""
 "Do you really want to remove all attachments from the selected messages?\n"
 "\n"
@@ -8796,20 +9060,20 @@ msgstr ""
 "\n"
 "被刪除的資料將無法回復"
 
-#: src/plugins/att_remover/att_remover.c:479
+#: src/plugins/att_remover/att_remover.c:484
 msgid "This message doesn't have any attachments."
 msgstr "此郵件沒有任何的附合檔案"
 
-#: src/plugins/att_remover/att_remover.c:494
+#: src/plugins/att_remover/att_remover.c:499
 msgid "Remove attachments..."
 msgstr "移除附加檔案..."
 
-#: src/plugins/att_remover/att_remover.c:506
-#: src/plugins/att_remover/att_remover.c:566
+#: src/plugins/att_remover/att_remover.c:511
+#: src/plugins/att_remover/att_remover.c:571
 msgid "AttRemover"
 msgstr "AttRemover"
 
-#: src/plugins/att_remover/att_remover.c:571
+#: src/plugins/att_remover/att_remover.c:576
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -8820,11 +9084,12 @@ msgstr ""
 "\n"
 "警告:這個操作將會完整地刪除且附加檔案且無法取消,附加檔案將永遠永遠的消失。 "
 
-#: src/plugins/att_remover/att_remover.c:595
+#: src/plugins/att_remover/att_remover.c:600
 msgid "Attachment handling"
 msgstr "已掌握附加檔案"
 
 #: src/plugins/attachwarner/attachwarner.c:217
+#, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
 "attached. Mention appears on line %d, which begins with text: %s\n"
@@ -8892,7 +9157,7 @@ msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr "轉發或改寄郵件時,不要檢查是否缺少附件"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:353
 msgid "Signatures"
 msgstr "簽名"
 
@@ -8942,6 +9207,7 @@ msgstr ""
 "練,建議使用數百個垃圾郵件及一般郵件來進行。"
 
 #: src/plugins/bogofilter/bogofilter.c:592
+#, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
 "couldn't be run."
@@ -8953,6 +9219,7 @@ msgstr "Bogofilter: 從郵件中學習..."
 
 #: src/plugins/bogofilter/bogofilter.c:752
 #: src/plugins/bogofilter/bogofilter.c:799 src/plugins/bsfilter/bsfilter.c:486
+#, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "學習失敗; `%s` 返回狀態為 %d."
 
@@ -8961,6 +9228,7 @@ msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: 從郵件中學習..."
 
 #: src/plugins/bogofilter/bogofilter.c:855
+#, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
 "%s"
@@ -9023,7 +9291,7 @@ msgstr "郵件大小超過此將不被檢查"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1511
+#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1544
 msgid "KB"
 msgstr "KB"
 
@@ -9148,6 +9416,7 @@ msgstr ""
 "議使用數百個垃圾郵件及一般郵件來進行。"
 
 #: src/plugins/bsfilter/bsfilter.c:374
+#, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
@@ -9229,10 +9498,12 @@ msgstr ""
 "Clamd 仍在執行嗎?"
 
 #: src/plugins/clamd/clamav_plugin.c:119
+#, c-format
 msgid "Detected %s virus."
 msgstr "偵測到 %s 病毒"
 
 #: src/plugins/clamd/clamav_plugin.c:135
+#, c-format
 msgid ""
 "Scanning error:\n"
 "%s"
@@ -9241,6 +9512,7 @@ msgstr ""
 "%s"
 
 #: src/plugins/clamd/clamav_plugin.c:146
+#, c-format
 msgid "File: %s. Size (%d) greater than limit (%d)\n"
 msgstr "檔案: %s  大小 (%d) 大於限制 (%d)\n"
 
@@ -9419,6 +9691,7 @@ msgstr ""
 "clamd 仍在執行嗎?"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:121
+#, c-format
 msgid ""
 "%s: Unable to open\n"
 "clamd will be disabled"
@@ -9427,6 +9700,7 @@ msgstr ""
 "clamd 將被關閉"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:216
+#, c-format
 msgid ""
 "%s: Not able to find required information\n"
 "clamd will be disabled"
@@ -9453,6 +9727,7 @@ msgid "Socket write error"
 msgstr "Socket寫入錯誤"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:482
+#, c-format
 msgid "%s: Error reading"
 msgstr "%s: 讀取錯誤"
 
@@ -9566,9 +9841,9 @@ msgstr "此檔案內的CSS將套用在所有的HTML上"
 
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1346
-#: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1445 src/prefs_account.c:1534 src/prefs_account.c:2008
-#: src/prefs_customheader.c:236
+#: src/plugins/pgpcore/prefs_gpg.c:209 src/plugins/rssyl/rssyl_prefs.c:186
+#: src/prefs_account.c:1478 src/prefs_account.c:1567 src/prefs_account.c:2055
+#: src/prefs_customheader.c:234
 msgid "Bro_wse"
 msgstr "瀏覽(W)"
 
@@ -9576,91 +9851,94 @@ msgstr "瀏覽(W)"
 msgid "Select stylesheet"
 msgstr "選擇風格"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:418
 msgid "Remote content loading is disabled."
 msgstr "不載入遠端資源"
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:497
 msgid "Load images"
 msgstr "載入圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:499
 msgid "Enable remote content"
 msgstr "使用遠端資源"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:501
 msgid "Enable Javascript"
 msgstr "啟用 Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:503
 msgid "Enable Plugins"
 msgstr "啟用外掛程式"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:505
 msgid "Enable Java"
 msgstr "啟用 Java"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:507
 msgid "Open links with external browser"
 msgstr "以外部瀏覽器開啟連結"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:689
+#, c-format
 msgid "An error occurred: %d\n"
 msgstr "發生錯誤: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:745
+#, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s 是一個畸形或不支援的輸入資料"
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:756
 msgid "Search the Web"
 msgstr "搜尋瀏覽器"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:768
 msgid "Open in Viewer"
 msgstr "在檢視器中開啟"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:770
 msgid "Open in Viewer (enable remote content)"
 msgstr "在檢視器中開啟 (啟用遠端的內容)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:779
 msgid "Open in Browser"
 msgstr "在瀏覽器中開啟"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:789
 msgid "Open Image"
 msgstr "開啟圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Copy Link"
 msgstr "複製連結"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:802
 msgid "Download Link"
 msgstr "下載連結"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:813
 msgid "Save Image As"
 msgstr "另存圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:823
 msgid "Copy Image"
 msgstr "複製圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:841
 msgid "Import feed"
 msgstr "匯入資料"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1120
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1148
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML 檢視器"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1153
+#, 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 /"
@@ -9784,11 +10062,13 @@ msgid "Enter code:"
 msgstr "輸入認證碼:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:329
+#, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "GData外掛程式: 連個人查詢錯誤: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
 #: src/plugins/gdata/cm_gdata_contacts.c:345
+#, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
 msgstr[0] "新增 %d 至"
@@ -9796,6 +10076,7 @@ msgstr[1] "新增 %d 至"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
 #: src/plugins/gdata/cm_gdata_contacts.c:347
+#, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] "1 個連絡人加入至快取"
@@ -9806,6 +10087,7 @@ msgid "GData plugin: Starting async contacts query\n"
 msgstr "GData外掛程式: 開始進行非同步連絡人查詢\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:378
+#, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "GData外掛程式: 群組查詢錯誤: %s\n"
 
@@ -9818,6 +10100,7 @@ msgid "GData plugin: Starting async groups query\n"
 msgstr "GData外掛程式: 開始非同步的群組查尋\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:447
+#, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "GData外掛程式:認證錯誤: %s\n"
 
@@ -9840,6 +10123,7 @@ msgid ""
 msgstr "GData外掛程式:沒有收到認證碼,認證要求取消\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:497
+#, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "GData外掛程式: 認證刷新失敗: %s\n"
 
@@ -9848,6 +10132,7 @@ msgid "GData plugin: Authorization refresh successful\n"
 msgstr "GData外掛程式: 認證刷新成功\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:566
+#, c-format
 msgid ""
 "GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
 msgstr ""
@@ -9858,7 +10143,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData外掛程式: 正在嘗試刷新認證\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1752
+#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1786
 msgid "Authentication"
 msgstr "認證"
 
@@ -9964,10 +10249,12 @@ msgid "Error reading cache stats"
 msgstr "讀取暫存狀態錯誤"
 
 #: src/plugins/libravatar/libravatar_prefs.c:141
+#, c-format
 msgid "Using %s in %d files, %d directories, %d others and %d errors"
 msgstr "使用在 %s 內的 %d 檔案, %d 目錄和 %d 其它項目以及 %d 錯誤"
 
 #: src/plugins/libravatar/libravatar_prefs.c:150
+#, c-format
 msgid "Using %s in %d files, %d directories and %d others"
 msgstr "使用在 %s 內的 %d 檔案, %d 目錄和 %d 其它項目"
 
@@ -9984,6 +10271,7 @@ msgid "Not enough memory for operation"
 msgstr "沒有足夠的記憶體進行操作"
 
 #: src/plugins/libravatar/libravatar_prefs.c:183
+#, c-format
 msgid ""
 "Icon cache successfully cleared:\n"
 "• %u missing entries removed.\n"
@@ -9998,6 +10286,7 @@ msgid "Icon cache successfully cleared!"
 msgstr "圖示快取清除完成!"
 
 #: src/plugins/libravatar/libravatar_prefs.c:191
+#, c-format
 msgid ""
 "Errors clearing icon cache:\n"
 "• %u missing entries removed.\n"
@@ -10029,7 +10318,7 @@ msgid "Cache refresh interval"
 msgstr "快取刷新的間隔時間"
 
 #: src/plugins/libravatar/libravatar_prefs.c:229
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1490
+#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1523
 #: src/prefs_matcher.c:336 src/prefs_receive.c:177
 msgid "hours"
 msgstr "小時"
@@ -10165,6 +10454,7 @@ msgstr ""
 " "
 
 #: src/plugins/mailmbox/plugin_gtk.c:330
+#, c-format
 msgid ""
 "All folders and messages under '%s' will be deleted.\n"
 "Do you really want to delete?"
@@ -10185,11 +10475,13 @@ msgid "Disconnected"
 msgstr "連線已終止"
 
 #: src/plugins/managesieve/managesieve.c:676
+#, c-format
 msgid "Disconnected: %s"
 msgstr "連線已終止:  %s"
 
 #: src/plugins/managesieve/managesieve.c:725
 #: src/plugins/managesieve/managesieve.c:870
+#, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr "無法掌控在Sieve程序中的郵件: %s\n"
 
@@ -10206,10 +10498,12 @@ msgid "error occurred on SIEVE session\n"
 msgstr "Sieve程序中發生錯誤\n"
 
 #: src/plugins/managesieve/managesieve.c:866
+#, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr "Sieve程序中發生錯誤: %s\n"
 
 #: src/plugins/managesieve/managesieve.c:875
+#, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "無法掌控在Sieve程序中的郵件: %d\n"
 
@@ -10222,10 +10516,11 @@ msgid "Auth method not available"
 msgstr "認證方法無效"
 
 #: src/plugins/managesieve/managesieve.c:1151
+#, c-format
 msgid "sending error on Sieve session: %s\n"
 msgstr "在Sieve程序中發生傳送錯誤: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5632
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5676
 msgid "_Filter"
 msgstr "過濾器(_F)"
 
@@ -10277,11 +10572,12 @@ msgid "This script has been modified. Save the latest changes?"
 msgstr "這個腳本已經被修改過。儲存最新的異動嗎?"
 
 #: src/plugins/managesieve/sieve_editor.c:693
+#, c-format
 msgid "%s - Sieve Filter%s"
 msgstr "%s - 過濾器%s"
 
 #: src/plugins/managesieve/sieve_editor.c:742
-#: src/plugins/pdf_viewer/poppler_viewer.c:1272
+#: src/plugins/pdf_viewer/poppler_viewer.c:1282
 msgid "Loading..."
 msgstr "載入..."
 
@@ -10299,6 +10595,7 @@ msgid "Enter new name for the script."
 msgstr "為腳本輸入新的名稱"
 
 #: src/plugins/managesieve/sieve_manager.c:323
+#, c-format
 msgid "Do you really want to delete the filter '%s'?"
 msgstr "你確定要刪除過濾器 '%s' 嗎?"
 
@@ -10318,19 +10615,19 @@ msgstr "一個帳號一次只能有一個啟動腳本"
 msgid "Unable to connect"
 msgstr "無法進行連線"
 
-#: src/plugins/managesieve/sieve_manager.c:620
+#: src/plugins/managesieve/sieve_manager.c:623
 msgid "Listing scripts..."
 msgstr "列出腳本..."
 
-#: src/plugins/managesieve/sieve_manager.c:623
+#: src/plugins/managesieve/sieve_manager.c:626
 msgid "Connecting..."
 msgstr "連線..."
 
-#: src/plugins/managesieve/sieve_manager.c:655
+#: src/plugins/managesieve/sieve_manager.c:658
 msgid "Manage Sieve Filters"
 msgstr "管理Sieve過濾器"
 
-#: src/plugins/managesieve/sieve_manager.c:796
+#: src/plugins/managesieve/sieve_manager.c:800
 msgid "To use Sieve, enable it in an account's preferences."
 msgstr "若要使用Sieve,要在帳號的選項中啟用它"
 
@@ -10351,7 +10648,7 @@ msgstr "在伺服器上使用ManageSieve協定管理Sieve過濾器"
 msgid "Enable Sieve"
 msgstr "啟用Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1090
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1102
 msgid "Server information"
 msgstr "伺服器資訊"
 
@@ -10402,40 +10699,40 @@ msgstr "指定認證"
 
 #: src/plugins/managesieve/sieve_prefs.c:240
 #: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1275
-#: src/prefs_account.c:1798
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1297
+#: src/prefs_account.c:1832
 msgid "User ID"
 msgstr "使用者名稱"
 
 #: src/plugins/managesieve/sieve_prefs.c:250
 #: src/plugins/rssyl/rssyl_feed_props.c:393
 #: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1281
-#: src/prefs_account.c:1818 src/prefs_account.c:2535 src/prefs_account.c:2557
+#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1303
+#: src/prefs_account.c:1855 src/prefs_account.c:2583 src/prefs_account.c:2611
 #: src/wizard.c:1214 src/wizard.c:1634
 msgid "Password"
 msgstr "密碼"
 
-#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1573
-#: src/prefs_account.c:1770
+#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1606
+#: src/prefs_account.c:1804
 msgid "Authentication method"
 msgstr "認證方式"
 
-#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1583
-#: src/prefs_account.c:1779 src/prefs_send.c:233 src/prefs_send.c:304
-#: src/prefs_themes.c:1075
+#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1616
+#: src/prefs_account.c:1813 src/prefs_send.c:261 src/prefs_send.c:332
+#: src/prefs_themes.c:1112
 msgid "Automatic"
 msgstr "自動"
 
-#: src/plugins/managesieve/sieve_prefs.c:391
+#: src/plugins/managesieve/sieve_prefs.c:394
 msgid "Sieve server must not contain a space."
 msgstr "Sieve伺服器必不能包含空白"
 
-#: src/plugins/managesieve/sieve_prefs.c:397
+#: src/plugins/managesieve/sieve_prefs.c:400
 msgid "Sieve server is not entered."
 msgstr "Sieve伺服器不能被登入"
 
-#: src/plugins/managesieve/sieve_prefs.c:425
+#: src/plugins/managesieve/sieve_prefs.c:428
 msgid "Sieve"
 msgstr "Sieve"
 
@@ -10448,10 +10745,12 @@ msgid "Failed to register newmail hook"
 msgstr "註冊新郵件hook失敗"
 
 #: src/plugins/newmail/newmail.c:128
+#, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "無法開啟日誌檔 %s: %s\n"
 
 #: src/plugins/newmail/newmail.c:141
+#, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
 "after sorting.\n"
@@ -10602,6 +10901,7 @@ msgstr "郵件訊息"
 
 #: src/plugins/notification/notification_popup.c:489
 #: src/plugins/notification/notification_popup.c:495
+#, c-format
 msgid "%d new message arrived"
 msgid_plural "%d new messages arrived"
 msgstr[0] "%d 新訊息到達"
@@ -10617,6 +10917,7 @@ msgstr "行事歷訊息"
 
 #: src/plugins/notification/notification_popup.c:501
 #: src/plugins/notification/notification_trayicon.c:944
+#, c-format
 msgid "%d new calendar message arrived"
 msgid_plural "%d new calendar messages arrived"
 msgstr[0] "%d 新行事歷訊息已到達"
@@ -10627,12 +10928,14 @@ msgid "RSS news feed"
 msgstr "RSS新聞帖"
 
 #: src/plugins/notification/notification_popup.c:507
+#, c-format
 msgid "%d new article in a RSS feed arrived"
 msgid_plural "%d new articles in a RSS feed arrived"
 msgstr[0] "%d RSS內的新文章已到達"
 msgstr[1] "%d RSS內的新文章已到達"
 
 #: src/plugins/notification/notification_popup.c:571
+#, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d 新訊息"
@@ -10712,13 +11015,13 @@ msgid "Show banner"
 msgstr "顯示通知欄"
 
 #: src/plugins/notification/notification_prefs.c:766
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:147
-#: src/prefs_receive.c:231
+#: src/plugins/pgpcore/select-keys.c:240 src/plugins/pgpcore/sgpgme.c:147
+#: src/prefs_receive.c:228
 msgid "Never"
 msgstr "從不"
 
-#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
-#: src/prefs_summaries.c:494 src/prefs_summaries.c:504
+#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:226
+#: src/prefs_summaries.c:493 src/prefs_summaries.c:503
 msgid "Always"
 msgstr "總是"
 
@@ -10793,8 +11096,8 @@ msgstr "前景顏色"
 
 #: src/plugins/notification/notification_prefs.c:927
 #: src/plugins/notification/notification_prefs.c:1146
-#: src/prefs_msg_colors.c:281 src/prefs_msg_colors.c:302
-#: src/prefs_msg_colors.c:323
+#: src/prefs_msg_colors.c:276 src/prefs_msg_colors.c:296
+#: src/prefs_msg_colors.c:316
 msgid "Background"
 msgstr "背景"
 
@@ -10816,8 +11119,8 @@ msgstr "彈跳視窗超時"
 #: src/plugins/notification/notification_prefs.c:1072
 #: src/plugins/notification/notification_prefs.c:1367
 #: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:575
-#: src/prefs_receive.c:203 src/prefs_summaries.c:544
+#: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:574
+#: src/prefs_receive.c:200 src/prefs_summaries.c:542
 msgid "seconds"
 msgstr "秒"
 
@@ -10909,6 +11212,7 @@ msgid "Enable global hotkeys"
 msgstr "使用全域的快捷鍵"
 
 #: src/plugins/notification/notification_prefs.c:1882
+#, c-format
 msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
 msgstr "快捷鍵範例包括了 <b>%s</b> 和 <b>%s</b>"
 
@@ -10957,6 +11261,7 @@ msgid "Show Trayicon Notifications"
 msgstr "顯示通知小圖示"
 
 #: src/plugins/notification/notification_trayicon.c:277
+#, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "新的: %d, 未讀: %d, 全部: %d"
 
@@ -10981,139 +11286,149 @@ msgid "New messages arrived"
 msgstr "新訊息已到達"
 
 #: src/plugins/notification/notification_trayicon.c:922
+#, c-format
 msgid "%d new mail message arrived"
 msgid_plural "%d new mail messages arrived"
 msgstr[0] "%d 新郵件已到達"
 msgstr[1] "%d 新郵件已到達"
 
 #: src/plugins/notification/notification_trayicon.c:933
+#, c-format
 msgid "%d new news post arrived"
 msgid_plural "%d new news posts arrived"
 msgstr[0] "%d 新的新聞貼已到達"
 msgstr[1] "%d 新的新聞貼已到達"
 
 #: src/plugins/notification/notification_trayicon.c:955
+#, c-format
 msgid "%d new article in RSS feeds arrived"
 msgid_plural "%d new articles in RSS feeds arrived"
 msgstr[0] "%d 新的RSS文章已到達"
 msgstr[1] "%d 新的RSS文章已到達"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:699
+#: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Title:"
 msgstr "標題:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/plugins/pdf_viewer/poppler_viewer.c:703
 msgid "Author:"
 msgstr "作者:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:703
+#: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Creator:"
 msgstr "建立者:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:704
+#: src/plugins/pdf_viewer/poppler_viewer.c:706
 msgid "Producer:"
 msgstr "製造者:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:707
+#: src/plugins/pdf_viewer/poppler_viewer.c:709
 msgid "Created:"
 msgstr "已建立:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:711
+#: src/plugins/pdf_viewer/poppler_viewer.c:713
 msgid "Modified:"
 msgstr "已修改:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:714
+#: src/plugins/pdf_viewer/poppler_viewer.c:716
 msgid "Format:"
 msgstr "格式:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:716
-#: src/plugins/pdf_viewer/poppler_viewer.c:719
+#: src/plugins/pdf_viewer/poppler_viewer.c:718
+#: src/plugins/pdf_viewer/poppler_viewer.c:721
 msgid "Optimized:"
 msgstr "已最佳化:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1177
+#: src/plugins/pdf_viewer/poppler_viewer.c:1185
 msgid "PDF properties"
 msgstr "PDF屬性"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1323
+#: src/plugins/pdf_viewer/poppler_viewer.c:1333
 msgid "Enter password"
 msgstr "輸入密碼"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1324
+#: src/plugins/pdf_viewer/poppler_viewer.c:1334
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr "此文件已被鎖定,需要輸入正確的密碼才能開啟"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1339
+#: src/plugins/pdf_viewer/poppler_viewer.c:1349
+#, c-format
 msgid "%s Document"
 msgstr "%s 文件"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1345
+#: src/plugins/pdf_viewer/poppler_viewer.c:1355
+#, c-format
 msgid "of %d"
 msgstr "%d 個當中"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1361
+#: src/plugins/pdf_viewer/poppler_viewer.c:1371
 msgid "PDF rendering failed for an unknown reason."
 msgstr "PDF因為未知原因開啟(渲染)失敗"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1725
-#: src/plugins/pdf_viewer/poppler_viewer.c:1934
+#: src/plugins/pdf_viewer/poppler_viewer.c:1735
+#: src/plugins/pdf_viewer/poppler_viewer.c:1950
 msgid "Document Index"
 msgstr "文件索引"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1902
+#: src/plugins/pdf_viewer/poppler_viewer.c:1915
 msgid "First Page"
 msgstr "第一頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1905
+#: src/plugins/pdf_viewer/poppler_viewer.c:1918
 msgid "Previous Page"
 msgstr "上一頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1908
+#: src/plugins/pdf_viewer/poppler_viewer.c:1921
 msgid "Next Page"
 msgstr "下一頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1911
+#: src/plugins/pdf_viewer/poppler_viewer.c:1924
 msgid "Last Page"
 msgstr "最後一頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1914
+#: src/plugins/pdf_viewer/poppler_viewer.c:1927
 msgid "Zoom In"
 msgstr "放大"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1916
+#: src/plugins/pdf_viewer/poppler_viewer.c:1929
 msgid "Zoom Out"
 msgstr "縮小"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1919
+#: src/plugins/pdf_viewer/poppler_viewer.c:1932
 msgid "Fit Page"
 msgstr "滿版"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1922
+#: src/plugins/pdf_viewer/poppler_viewer.c:1935
 msgid "Fit Page Width"
 msgstr "寬度放滿頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1925
+#: src/plugins/pdf_viewer/poppler_viewer.c:1938
 msgid "Rotate Left"
 msgstr "向左旋轉"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1928
+#: src/plugins/pdf_viewer/poppler_viewer.c:1941
 msgid "Rotate Right"
 msgstr "向右旋轉"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1931
+#: src/plugins/pdf_viewer/poppler_viewer.c:1944
+msgid "Print Document"
+msgstr "列印文件"
+
+#: src/plugins/pdf_viewer/poppler_viewer.c:1947
 msgid "Document Info"
 msgstr "文件資訊"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1936
+#: src/plugins/pdf_viewer/poppler_viewer.c:1952
 msgid "Page Number"
 msgstr "頁碼"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1938
+#: src/plugins/pdf_viewer/poppler_viewer.c:1954
 msgid "Zoom Factor"
 msgstr "縮放倍率因子"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2043
+#: src/plugins/pdf_viewer/poppler_viewer.c:2064
+#, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
 "Poppler %s Lib and the gs tool.\n"
@@ -11125,13 +11440,14 @@ msgstr ""
 "\n"
 "歡迎任何的回覆至: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2049
-#: src/plugins/pdf_viewer/poppler_viewer.c:2057
-#: src/plugins/pdf_viewer/poppler_viewer.c:2077
+#: src/plugins/pdf_viewer/poppler_viewer.c:2070
+#: src/plugins/pdf_viewer/poppler_viewer.c:2078
+#: src/plugins/pdf_viewer/poppler_viewer.c:2098
 msgid "PDF Viewer"
 msgstr "PDF檢視器"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2053
+#: src/plugins/pdf_viewer/poppler_viewer.c:2074
+#, 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 "
@@ -11152,7 +11468,7 @@ msgstr "編輯perl過濾器的規則 (ext)..."
 msgid "Failed to register PGP address autocompletion hook"
 msgstr "註冊PGP地址自動完成hook失敗"
 
-#: src/plugins/pgpcore/passphrase.c:85 src/plugins/pgpcore/prefs_gpg.c:127
+#: src/plugins/pgpcore/passphrase.c:85 src/plugins/pgpcore/prefs_gpg.c:147
 msgid "Passphrase"
 msgstr "密碼"
 
@@ -11255,7 +11571,7 @@ msgstr ""
 "匯入\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:283
+#: src/plugins/pgpcore/pgp_viewer.c:289
 msgid "   This key is in your keyring.\n"
 msgstr "   這個金鑰已經在你的鑰匙圈內了\n"
 
@@ -11289,145 +11605,154 @@ msgstr ""
 msgid "Core operations"
 msgstr "核心操作"
 
-#: src/plugins/pgpcore/prefs_gpg.c:122
+#: src/plugins/pgpcore/prefs_gpg.c:142
 msgid "Automatically check signatures"
 msgstr "自動地檢查簽名"
 
-#: src/plugins/pgpcore/prefs_gpg.c:125
+#: src/plugins/pgpcore/prefs_gpg.c:145
 msgid "Use keyring for address autocompletion"
 msgstr "為了地址自動完成功能使用鑰匙圈"
 
-#: src/plugins/pgpcore/prefs_gpg.c:130
+#: src/plugins/pgpcore/prefs_gpg.c:150
 msgid "Use gpg-agent to manage passwords"
 msgstr "使用 gpg-agent 管理密碼"
 
-#: src/plugins/pgpcore/prefs_gpg.c:135
+#: src/plugins/pgpcore/prefs_gpg.c:155
 msgid "Store passphrase in memory"
 msgstr "儲存密碼在記憶體中"
 
-#: src/plugins/pgpcore/prefs_gpg.c:145
+#: src/plugins/pgpcore/prefs_gpg.c:165
 msgid "Expire after"
 msgstr "過期了"
 
-#: src/plugins/pgpcore/prefs_gpg.c:159
+#: src/plugins/pgpcore/prefs_gpg.c:179
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "設定為 '0' 將會為整個程序儲存密碼"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:474
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1874
+#: src/plugins/pgpcore/prefs_gpg.c:183 src/plugins/rssyl/rssyl_feed_props.c:474
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1921
 #: src/prefs_receive.c:187
 msgid "minutes"
 msgstr "分"
 
-#: src/plugins/pgpcore/prefs_gpg.c:173
+#: src/plugins/pgpcore/prefs_gpg.c:193
 msgid "Grab input while entering a passphrase"
 msgstr "在鍵入密碼時擷取輸入內容"
 
-#: src/plugins/pgpcore/prefs_gpg.c:180
+#: src/plugins/pgpcore/prefs_gpg.c:200
 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "如果 GnuPG 無法正常工作,在一開始就顯示警告"
 
-#: src/plugins/pgpcore/prefs_gpg.c:183
+#: src/plugins/pgpcore/prefs_gpg.c:203
 msgid "Path to GnuPG executable"
 msgstr "Bsfilter的執行路徑"
 
-#: src/plugins/pgpcore/prefs_gpg.c:188
+#: src/plugins/pgpcore/prefs_gpg.c:208
 msgid ""
 "If left blank the location of the GnuPG executable will be automatically "
 "determined."
 msgstr "如果留下空白,那麼將會自動偵測 GnuPG 的執行檔所在路徑 "
 
-#: src/plugins/pgpcore/prefs_gpg.c:229
+#: src/plugins/pgpcore/prefs_gpg.c:249
 msgid "Select GnuPG executable"
 msgstr "選擇 GnuPG 執行檔"
 
-#: src/plugins/pgpcore/prefs_gpg.c:356
+#: src/plugins/pgpcore/prefs_gpg.c:361
 msgid "Sign key"
 msgstr "簽署金鑰"
 
-#: src/plugins/pgpcore/prefs_gpg.c:364
+#: src/plugins/pgpcore/prefs_gpg.c:369
 msgid "Use default GnuPG key"
 msgstr "使用預設的 GnuPG 金鑰"
 
-#: src/plugins/pgpcore/prefs_gpg.c:375
+#: src/plugins/pgpcore/prefs_gpg.c:380
 msgid "Select key by your email address"
 msgstr "為你的郵件地址選擇金鑰"
 
-#: src/plugins/pgpcore/prefs_gpg.c:386
+#: src/plugins/pgpcore/prefs_gpg.c:391
 msgid "Specify key manually"
 msgstr "手動指定金鑰"
 
-#: src/plugins/pgpcore/prefs_gpg.c:396
+#: src/plugins/pgpcore/prefs_gpg.c:401
 msgid "User or key ID:"
 msgstr "使用者或是金鑰ID:"
 
-#: src/plugins/pgpcore/prefs_gpg.c:437
+#: src/plugins/pgpcore/prefs_gpg.c:445
 msgid "No secret key found."
 msgstr "找不到密祕金鑰"
 
-#: src/plugins/pgpcore/prefs_gpg.c:440
+#: src/plugins/pgpcore/prefs_gpg.c:448
 msgid "Generate a new key pair"
 msgstr "產生一對新的金鑰"
 
-#: src/plugins/pgpcore/prefs_gpg.c:618
+#: src/plugins/pgpcore/prefs_gpg.c:687
 msgid "GPG"
 msgstr "GPG"
 
+#: src/plugins/pgpcore/prefs_gpg.c:707 src/plugins/smime/plugin.c:38
+#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:913
+msgid "S/MIME"
+msgstr "S/MIME"
+
 #: src/plugins/pgpcore/select-keys.c:94
+#, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr "沒有完全符合'%s'的;請選擇金鑰"
 
 #: src/plugins/pgpcore/select-keys.c:97
+#, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "為 '%s' ... %c 搜集資訊"
 
-#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:145
+#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:145
 msgid "Undefined"
 msgstr "未定義"
 
-#: src/plugins/pgpcore/select-keys.c:240 src/plugins/pgpcore/sgpgme.c:149
+#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:149
 #: src/plugins/pgpcore/sgpgme.c:165
 msgid "Marginal"
 msgstr "臨界值"
 
-#: src/plugins/pgpcore/select-keys.c:246 src/plugins/pgpcore/sgpgme.c:153
+#: src/plugins/pgpcore/select-keys.c:249 src/plugins/pgpcore/sgpgme.c:153
 #: src/plugins/pgpcore/sgpgme.c:169
 msgid "Ultimate"
 msgstr "極限值"
 
-#: src/plugins/pgpcore/select-keys.c:367
+#: src/plugins/pgpcore/select-keys.c:381
 msgid "Select Keys"
 msgstr "選擇金鑰"
 
-#: src/plugins/pgpcore/select-keys.c:394
+#: src/plugins/pgpcore/select-keys.c:408
 msgid "Key ID"
 msgstr "金鑰 ID"
 
-#: src/plugins/pgpcore/select-keys.c:397
+#: src/plugins/pgpcore/select-keys.c:411
 msgid "Trust"
 msgstr "信任"
 
-#: src/plugins/pgpcore/select-keys.c:422
+#: src/plugins/pgpcore/select-keys.c:436
 msgid "_Other"
 msgstr "其它(_O)"
 
-#: src/plugins/pgpcore/select-keys.c:423
+#: src/plugins/pgpcore/select-keys.c:437
 msgid "Do_n't encrypt"
 msgstr "不要加密(_n)"
 
-#: src/plugins/pgpcore/select-keys.c:582
+#: src/plugins/pgpcore/select-keys.c:596
 msgid "Add key"
 msgstr "新加入金鑰"
 
-#: src/plugins/pgpcore/select-keys.c:583
+#: src/plugins/pgpcore/select-keys.c:597
 msgid "Enter another user or key ID:"
 msgstr "輸入其它的使用者ID或金鑰ID:"
 
-#: src/plugins/pgpcore/select-keys.c:605
+#: src/plugins/pgpcore/select-keys.c:619
+#, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "加密至 %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:606
+#: src/plugins/pgpcore/select-keys.c:620
+#, 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"
@@ -11455,6 +11780,7 @@ msgid "Untrusted"
 msgstr "不被信任的"
 
 #: src/plugins/pgpcore/sgpgme.c:237 src/plugins/pgpcore/sgpgme.c:256
+#, c-format
 msgid "The signature can't be checked - %s"
 msgstr "這個簽名無法被檢查 - %s"
 
@@ -11467,130 +11793,156 @@ msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: 無法取得金鑰 - 沒有執行gpg-agent"
 
 #: src/plugins/pgpcore/sgpgme.c:269
+#, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "來自於 \"%s\" 的良好簽名 [最根本的]"
 
 #: src/plugins/pgpcore/sgpgme.c:272
+#, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "來自於 \"%s\" 的良好簽名 [完整的]"
 
 #: src/plugins/pgpcore/sgpgme.c:275
+#, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "來自於 \"%s\" 的良好簽名 [最低限度的]"
 
 #: src/plugins/pgpcore/sgpgme.c:282
+#, c-format
 msgid "Good signature from \"%s\""
 msgstr "來自於 \"%s\" 的良好簽名"
 
-#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:305
+#: src/plugins/pgpcore/sgpgme.c:284 src/plugins/pgpcore/sgpgme.c:302
+#, c-format
 msgid "Key 0x%s not available to verify this signature"
 msgstr "金鑰 0x%s 用來驗證這一個簽名是無效的"
 
-#: src/plugins/pgpcore/sgpgme.c:292
+#: src/plugins/pgpcore/sgpgme.c:290
+#, c-format
 msgid "Expired signature from \"%s\""
 msgstr "來自於 \"%s\" 的過期簽名"
 
-#: src/plugins/pgpcore/sgpgme.c:295
+#: src/plugins/pgpcore/sgpgme.c:293
+#, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "來自於 \"%s\" 的良好簽名,但是金鑰已經過期了"
 
-#: src/plugins/pgpcore/sgpgme.c:298
+#: src/plugins/pgpcore/sgpgme.c:296
+#, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "來自於 \"%s\" 的良好簽名,但是金鑰已經被撤回"
 
-#: src/plugins/pgpcore/sgpgme.c:301
+#: src/plugins/pgpcore/sgpgme.c:299
+#, c-format
 msgid "Bad signature from \"%s\""
 msgstr "來自於 \"%s\" 的不良簽名,"
 
-#: src/plugins/pgpcore/sgpgme.c:310
+#: src/plugins/pgpcore/sgpgme.c:306
 msgid "The signature has not been checked"
 msgstr "這個簽名尚未被檢查過"
 
-#: src/plugins/pgpcore/sgpgme.c:329
+#: src/plugins/pgpcore/sgpgme.c:325
 msgid "Error checking signature: no status\n"
 msgstr "檢查簽名發生錯誤:沒有狀態\n"
 
-#: src/plugins/pgpcore/sgpgme.c:347
+#: src/plugins/pgpcore/sgpgme.c:343
+#, c-format
 msgid "Error checking signature: %s\n"
 msgstr "檢查簽名發生錯誤: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:365
+#: src/plugins/pgpcore/sgpgme.c:361
+#, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "此簽名是以 %s 製作,使用 %s 金鑰 ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:371
+#: src/plugins/pgpcore/sgpgme.c:367
+#, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "來自 uid\"%s\"的良好簽名 (有效期限: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:372
+#, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "逾期的金鑰 uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:381
+#: src/plugins/pgpcore/sgpgme.c:377
+#, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "來自 uid\"%s\"的逾期簽名 (有效期限: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:386
+#: src/plugins/pgpcore/sgpgme.c:382
+#, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "已撤銷的金鑰 uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:391
+#: src/plugins/pgpcore/sgpgme.c:387
+#, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "來自 \"%s\" 的不良簽名\n"
 
-#: src/plugins/pgpcore/sgpgme.c:404
+#: src/plugins/pgpcore/sgpgme.c:400
+#, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid\"%s\"(有效期限: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:406
+#: src/plugins/pgpcore/sgpgme.c:402
 msgid "Revoked"
 msgstr "已撤銷"
 
-#: src/plugins/pgpcore/sgpgme.c:411
+#: src/plugins/pgpcore/sgpgme.c:407
+#, c-format
 msgid "Owner Trust: %s\n"
 msgstr "擁有者信任: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:412
+#: src/plugins/pgpcore/sgpgme.c:408
 msgid "No key!"
 msgstr "沒有金鑰!"
 
-#: src/plugins/pgpcore/sgpgme.c:414
+#: src/plugins/pgpcore/sgpgme.c:410
 msgid "Primary key fingerprint:"
 msgstr "主要的金鑰指紋:"
 
-#: src/plugins/pgpcore/sgpgme.c:432
+#: src/plugins/pgpcore/sgpgme.c:428
+#, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "警告:簽名者的地址 \"%s\" 和DNS項目不符合\n"
 
-#: src/plugins/pgpcore/sgpgme.c:438
+#: src/plugins/pgpcore/sgpgme.c:434
+#, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "已驗證的簽名者地址是 \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:472
+#: src/plugins/pgpcore/sgpgme.c:468
+#, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "無法取得來自郵件 %s 的資料"
 
-#: src/plugins/pgpcore/sgpgme.c:488
+#: src/plugins/pgpcore/sgpgme.c:484
+#, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "無法初始化資料, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:643
+#: src/plugins/pgpcore/sgpgme.c:661
 msgid "Secret key specification is ambiguous"
 msgstr "密鑰規格模稜兩可"
 
-#: src/plugins/pgpcore/sgpgme.c:653
+#: src/plugins/pgpcore/sgpgme.c:671
+#, c-format
 msgid "Secret key not found (%s)"
 msgstr "無不到密鑰 (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:666
+#: src/plugins/pgpcore/sgpgme.c:684
+#, c-format
 msgid "Error setting secret key: %s"
 msgstr "設定密鑰錯誤: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:759
+#: src/plugins/pgpcore/sgpgme.c:777
+#, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr "Gpgme 協定 '%s' 無法使用:引擎 '%s' 尚未被正確的安裝"
 
-#: src/plugins/pgpcore/sgpgme.c:765
+#: src/plugins/pgpcore/sgpgme.c:783
+#, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
 "version %s is required.\n"
@@ -11598,11 +11950,12 @@ msgstr ""
 "Gpgme 協定 '%s' 無法使用:已安裝引擎 '%s' ,版本為 %s,但是 需要的版本應為 "
 "%s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:773
+#: src/plugins/pgpcore/sgpgme.c:791
+#, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme 協定 '%s' 無法使用 (未知的問題)"
 
-#: src/plugins/pgpcore/sgpgme.c:789
+#: src/plugins/pgpcore/sgpgme.c:807
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -11610,17 +11963,17 @@ msgstr ""
 "GnuPG 尚未正確的安裝,或是需要升級\n"
 "OpenPGP支援已關閉"
 
-#: src/plugins/pgpcore/sgpgme.c:866
+#: src/plugins/pgpcore/sgpgme.c:884
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr "你必需要先按下\"OK\"鍵,以儲存帳號的資訊,才能產生一對金鑰\n"
 
-#: src/plugins/pgpcore/sgpgme.c:871
+#: src/plugins/pgpcore/sgpgme.c:889
 msgid "No PGP key found"
 msgstr "找不到PGP金鑰"
 
-#: src/plugins/pgpcore/sgpgme.c:872
+#: src/plugins/pgpcore/sgpgme.c:890
 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"
@@ -11630,21 +11983,23 @@ msgstr ""
 "件\n"
 "你確定現在要產生一對新的金鑰嗎?"
 
-#: src/plugins/pgpcore/sgpgme.c:961 src/plugins/pgpcore/sgpgme.c:983
+#: src/plugins/pgpcore/sgpgme.c:979 src/plugins/pgpcore/sgpgme.c:1001
+#, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "無法產生一對新的金鑰: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:971
+#: src/plugins/pgpcore/sgpgme.c:989
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr "你的新金鑰對正在建立中... 請將移動滑鼠以利產生... generate entropy..."
 
-#: src/plugins/pgpcore/sgpgme.c:989
+#: src/plugins/pgpcore/sgpgme.c:1007
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "無法產生新的金鑰對: 未知的錯誤"
 
-#: src/plugins/pgpcore/sgpgme.c:993
+#: src/plugins/pgpcore/sgpgme.c:1011
+#, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
 "%s\n"
@@ -11656,15 +12011,15 @@ msgstr ""
 "\n"
 "你要將它匯出至金鑰伺服器嗎?"
 
-#: src/plugins/pgpcore/sgpgme.c:997
+#: src/plugins/pgpcore/sgpgme.c:1015
 msgid "Key generated"
 msgstr "金鑰已產生"
 
-#: src/plugins/pgpcore/sgpgme.c:1073
+#: src/plugins/pgpcore/sgpgme.c:1091
 msgid "Key exported."
 msgstr "金鑰已匯出"
 
-#: src/plugins/pgpcore/sgpgme.c:1075
+#: src/plugins/pgpcore/sgpgme.c:1093
 msgid "Couldn't export key."
 msgstr "無法匯出金鑰"
 
@@ -11687,8 +12042,9 @@ msgstr "無法將文字資料轉換至其它合理的字元"
 #: src/plugins/pgpinline/pgpinline.c:196 src/plugins/pgpinline/pgpinline.c:518
 #: src/plugins/pgpinline/pgpinline.c:657 src/plugins/pgpinline/pgpinline.c:713
 #: src/plugins/pgpmime/pgpmime.c:183 src/plugins/pgpmime/pgpmime.c:329
-#: src/plugins/pgpmime/pgpmime.c:510 src/plugins/pgpmime/pgpmime.c:653
+#: src/plugins/pgpmime/pgpmime.c:511 src/plugins/pgpmime/pgpmime.c:654
 #: src/plugins/smime/smime.c:413
+#, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "無法初始化PGP內容, %s"
 
@@ -11697,6 +12053,7 @@ msgid "Couldn't parse mime part."
 msgstr "無法解析mime的區塊"
 
 #: src/plugins/pgpinline/pgpinline.c:345 src/plugins/pgpmime/pgpmime.c:352
+#, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "無法開啟已加密的檔案 %s"
 
@@ -11704,6 +12061,7 @@ msgstr "無法開啟已加密的檔案 %s"
 #: src/plugins/pgpinline/pgpinline.c:380 src/plugins/pgpinline/pgpinline.c:388
 #: src/plugins/pgpinline/pgpinline.c:398 src/plugins/pgpinline/pgpinline.c:407
 #: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
+#, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "無法寫入已解密的檔案 %s"
 
@@ -11722,6 +12080,7 @@ msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- 此為 PGP/Inline 加密資料的結束 ---\n"
 
 #: src/plugins/pgpinline/pgpinline.c:415 src/plugins/pgpmime/pgpmime.c:389
+#, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "無法關閉已解密的檔案 %s"
 
@@ -11738,23 +12097,26 @@ msgid "Malformed message"
 msgstr "Malformed 郵件"
 
 #: src/plugins/pgpinline/pgpinline.c:503 src/plugins/pgpinline/pgpinline.c:695
-#: src/plugins/pgpmime/pgpmime.c:693
+#: src/plugins/pgpmime/pgpmime.c:694
+#, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "無法建立暫存檔,%s"
 
-#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:537
+#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:538
+#, c-format
 msgid "Data signing failed, %s"
 msgstr "資料簽名失敗, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:564
+#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:565
+#, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "資料簽名失敗起因於無效的簽名者: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:573
+#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:574
 msgid "Data signing failed, no results."
 msgstr "資料簽名失敗, 沒有結果"
 
-#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:584
+#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:585
 msgid "Data signing failed, no contents."
 msgstr "資料簽名失敗,沒有內容"
 
@@ -11764,11 +12126,13 @@ msgid ""
 "are email headers, like Subject."
 msgstr "請注意!附件沒有用 PGP/Inline 系統進行加密,不包括 郵件標頭,像是主旨"
 
-#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:663
+#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:664
+#, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "無法加入 GPG 金鑰 %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:720
+#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:722
+#, c-format
 msgid "Encryption failed, %s"
 msgstr "加密失敗,%s"
 
@@ -11817,20 +12181,21 @@ msgid "Couldn't parse decrypted file parts."
 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:597
+#: src/plugins/pgpmime/pgpmime.c:598
 msgid "OpenPGP digital signature"
 msgstr "OpenPGP 數位簽名"
 
-#: src/plugins/pgpmime/pgpmime.c:619
+#: src/plugins/pgpmime/pgpmime.c:620
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
 msgstr "請注郵件標頭,像是主旨,無法使用PGP/Mime系統進行加密"
 
-#: src/plugins/pgpmime/pgpmime.c:792
+#: src/plugins/pgpmime/pgpmime.c:794
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -11875,8 +12240,8 @@ msgstr "顯示 Python 控制台..."
 msgid "Refresh"
 msgstr "更新"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2524
-#: src/prefs_account.c:2546 src/prefs_account.c:2822 src/wizard.c:1204
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2572
+#: src/prefs_account.c:2600 src/prefs_account.c:2883 src/wizard.c:1204
 #: src/wizard.c:1624
 msgid "Browse"
 msgstr "瀏覽"
@@ -11975,6 +12340,7 @@ msgid "Python integration"
 msgstr "Python 整合"
 
 #: src/plugins/rssyl/old_feeds.c:90
+#, c-format
 msgid ""
 "Couldn't read contents of old feeds.xml file:\n"
 "%s"
@@ -11983,14 +12349,17 @@ msgstr ""
 "%s"
 
 #: src/plugins/rssyl/opml_export.c:110
+#, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr "RSSyl:  當寫入'%s'以匯出feed清單時發生錯誤\n"
 
 #: src/plugins/rssyl/opml_export.c:131
+#, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr "RSSyl: 無法刪除舊版本的 OPML 檔案 '%s': %s\n"
 
 #: src/plugins/rssyl/opml_export.c:141
+#, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr "RSSyl: 無法開啟檔案 '%s' 以匯出feed清單: %s\n"
 
@@ -11999,6 +12368,7 @@ msgid "RSSyl: Error during writing feed export file.\n"
 msgstr "RSSyl: 寫入feed匯出檔案時發生錯誤\n"
 
 #: src/plugins/rssyl/opml_import.c:109
+#, c-format
 msgid ""
 "Error while subscribing feed\n"
 "%s\n"
@@ -12046,6 +12416,7 @@ msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "輸入你希望訂閱的新聞feed的URL:"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:98
+#, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' 不能用於資料夾名稱"
 
@@ -12056,6 +12427,7 @@ msgstr[0] "Claws Mail需要網路的存取能力才能進行feed的更新"
 msgstr[1] "Claws Mail需要網路的存取能力才能進行feed的更新"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:314
+#, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "你確定要移除feed `%s' 的樹狀結構嗎?\n"
 
@@ -12068,34 +12440,42 @@ msgid "Select an OPML file"
 msgstr "選擇一個 OPML 檔案"
 
 #: src/plugins/rssyl/rssyl_feed.h:10
+#, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
 msgstr "RSSyl: 訂閱新的feed: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:11
+#, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
 msgstr "RSSyl: 已訂閱新的feed: '%s' (%s)\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:12
+#, c-format
 msgid "RSSyl: Updating feed: %s\n"
 msgstr "RSSyl: 正在更新 feed: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:13
+#, c-format
 msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl: 已完成更新 feed: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:14
+#, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
 msgstr "RSSyl: 在 '%s' 擷取feed時發生錯誤: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:15
+#, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
 msgstr "RSSyl: 在 '%s' 沒有合法的 feed\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:16
+#, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
 msgstr "RSSyl: 無法在 '%s' 進行 feed \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: 應用程式已經存在,無法在 '%s' 結束feed的更新動作\n"
 
@@ -12170,7 +12550,7 @@ msgstr "如果可以的話擷取註解,貼文出現至今少於"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:424
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1480 src/prefs_folder_item.c:568 src/prefs_matcher.c:337
+#: src/prefs_account.c:1513 src/prefs_folder_item.c:568 src/prefs_matcher.c:337
 msgid "days"
 msgstr "天"
 
@@ -12288,6 +12668,7 @@ msgid "Security and privacy"
 msgstr "安全與隱私"
 
 #: src/plugins/rssyl/rssyl_subscribe.c:158
+#, c-format
 msgid "Couldn't create folder for new feed '%s'."
 msgstr "無法建為新的feed '%s' 建立資料夾"
 
@@ -12310,6 +12691,7 @@ msgid "_Edit feed properties after subscribing"
 msgstr "加入後編輯 feed 屬性(_E)"
 
 #: src/plugins/rssyl/rssyl_update_comments.c:107
+#, c-format
 msgid "Updating comments for '%s'..."
 msgstr "為 '%s' 更新註解..."
 
@@ -12329,10 +12711,12 @@ msgid "404 (Not found)"
 msgstr "404 (找不到)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:114
+#, c-format
 msgid "Error %d"
 msgstr "錯誤 %d"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:127
+#, c-format
 msgctxt "First parameter is URL, second is error text"
 msgid ""
 "Error fetching feed at\n"
@@ -12345,6 +12729,7 @@ msgstr ""
 "%s"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:140
+#, c-format
 msgid ""
 "No valid feed found at\n"
 "<b>%s</b>"
@@ -12357,14 +12742,17 @@ msgid "Untitled feed"
 msgstr "無標題的 Feed"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:154
+#, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "RSSyl: 可能在 '%s' 中存在不合法的 feed 沒有主旨\n"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:231
+#, c-format
 msgid "Updating feed '%s'..."
 msgstr "正在更新 feed '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:258
+#, c-format
 msgid ""
 "Couldn't process feed at\n"
 "<b>%s</b>\n"
@@ -12386,11 +12774,6 @@ msgid ""
 msgstr ""
 "升級儲存格式時發生內部錯誤,這是不應該發生的。請將除錯輸出夾檔後提報。\n"
 
-#: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:913
-msgid "S/MIME"
-msgstr "S/MIME"
-
 #: src/plugins/smime/plugin.c:59
 msgid ""
 "This plugin handles S/MIME signed and/or encrypted mails. You can decrypt "
@@ -12426,6 +12809,7 @@ msgstr ""
 "GPGME 版本來自於 Werner Koch <dd9jn at gnu.org>,於 2001"
 
 #: src/plugins/smime/smime.c:421
+#, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "無法設定 GPG 協定,%s"
 
@@ -12618,6 +13002,7 @@ msgid ""
 msgstr "允許檢查的最高次數。如果檢查花費了太長的時間,它將會終止。"
 
 #: src/plugins/tnef_parse/tnef_parse.c:73
+#, c-format
 msgid ""
 "\n"
 "Claws Mail TNEF parser:\n"
@@ -12811,6 +13196,7 @@ msgid "Create meeting from message..."
 msgstr "從郵件建立會議..."
 
 #: src/plugins/vcalendar/vcalendar.c:120
+#, c-format
 msgid ""
 "You are about to create %d meetings, one by one. Do you want to continue?"
 msgstr "你可以一個一個建立 %d 會議,你要續嗎?"
@@ -12874,6 +13260,7 @@ msgid "You have received an answer to an unknown meeting proposal."
 msgstr "你收到了一個未知的計畫會議回覆"
 
 #: src/plugins/vcalendar/vcalendar.c:747
+#, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
 "%s has %s the invitation whose details follow:"
@@ -13039,6 +13426,7 @@ msgid "later"
 msgstr "稍後"
 
 #: src/plugins/vcalendar/vcal_folder.c:1516
+#, c-format
 msgid ""
 "\n"
 "These are the events planned %s:\n"
@@ -13047,14 +13435,17 @@ msgstr ""
 "這些是已計劃的事件 %s:\n"
 
 #: src/plugins/vcalendar/vcal_folder.c:1611
+#, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "已超時 (%d 秒),發生在連線至 %s 時\n"
 
 #: src/plugins/vcalendar/vcal_folder.c:1629
+#, c-format
 msgid "Error %ld"
 msgstr "錯誤 %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1815
+#: src/plugins/vcalendar/vcal_folder.c:1811
+#, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
 "%s:\n"
@@ -13066,7 +13457,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1841
+#: src/plugins/vcalendar/vcal_folder.c:1837
+#, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
 "%s\n"
@@ -13076,44 +13468,46 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1872
-#: src/plugins/vcalendar/vcal_folder.c:1875
+#: src/plugins/vcalendar/vcal_folder.c:1868
+#: src/plugins/vcalendar/vcal_folder.c:1871
+#, c-format
 msgid "Could not create directory %s"
 msgstr "無法建立目錄 %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1915
+#: src/plugins/vcalendar/vcal_folder.c:1911
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail 需要網路的存取能力以更新Webcal feed"
 
-#: src/plugins/vcalendar/vcal_folder.c:1926
+#: src/plugins/vcalendar/vcal_folder.c:1922
+#, c-format
 msgid "Fetching calendar for %s..."
 msgstr "為 %s 取得行事曆..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1923
 msgid "new subscription"
 msgstr "新的訂閱"
 
-#: src/plugins/vcalendar/vcal_folder.c:1938
+#: src/plugins/vcalendar/vcal_folder.c:1934
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail 需要網路的存取能力以進行訂閱更新"
 
-#: src/plugins/vcalendar/vcal_folder.c:1950
+#: src/plugins/vcalendar/vcal_folder.c:1946
 msgid "Subscribe to Webcal"
 msgstr "向WebCal訂閱"
 
-#: src/plugins/vcalendar/vcal_folder.c:1950
+#: src/plugins/vcalendar/vcal_folder.c:1946
 msgid "Enter the WebCal URL:"
 msgstr "輸入WebCal的URL:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1962
+#: src/plugins/vcalendar/vcal_folder.c:1958
 msgid "Could not parse the URL."
 msgstr "無法解析此URL"
 
-#: src/plugins/vcalendar/vcal_folder.c:1990
+#: src/plugins/vcalendar/vcal_folder.c:1986
 msgid "Do you really want to unsubscribe?"
 msgstr "你確定要取消訂閱?"
 
-#: src/plugins/vcalendar/vcal_folder.c:1991
+#: src/plugins/vcalendar/vcal_folder.c:1987
 msgid "Delete subscription"
 msgstr "取消訂閱"
 
@@ -13216,42 +13610,52 @@ msgid "You are busy at the time of your planned meeting"
 msgstr "你自己在你計畫的這個會議時間是忙碌的"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:783
+#, c-format
 msgid "%s is busy at the time of your planned meeting"
 msgstr "%s 在你計畫的這個會議時間是忙碌的"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:785
+#, c-format
 msgid "%d hour sooner"
 msgstr "%d 小時之前"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:787
+#, c-format
 msgid "%d hours sooner"
 msgstr "%d 小時之前"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:789
+#, c-format
 msgid "%d hours and %d minutes sooner"
 msgstr "%d 小時和 %d 分鐘之前"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:791
+#, c-format
 msgid "%d minutes sooner"
 msgstr "%d 分鐘之前"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:796
+#, c-format
 msgid "%d hour later"
 msgstr "%d 小時之後"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:798
+#, c-format
 msgid "%d hours later"
 msgstr "%d 小時之後"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:800
+#, c-format
 msgid "%d hours and %d minutes later"
 msgstr "%d 小時和 %d 分鐘之後"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:802
+#, c-format
 msgid "%d minutes later"
 msgstr "%d 分鐘之前"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:808
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -13262,6 +13666,7 @@ msgstr ""
 "每一個人都可以 %s 或 %s."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:810
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -13283,10 +13688,12 @@ msgstr ""
 "在這之前的6個小時或是之前的6個小時內,要每一個人參與這個會議是不可 能的事情"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:817
+#, c-format
 msgid "would be available %s or %s"
 msgstr "%s 或 %s 將是可以的"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:819
+#, c-format
 msgid "would be available %s"
 msgstr "%s 是可以的"
 
@@ -13297,10 +13704,12 @@ msgid "not available"
 msgstr "不可能"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:824
+#, c-format
 msgid ", but would be available %s or %s."
 msgstr ", 但是 %s 或 %s 是可以的"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:826
+#, c-format
 msgid ", but would be available %s."
 msgstr ", 但是 %s 是可以的"
 
@@ -13330,6 +13739,7 @@ msgid "Not everyone is available. See tooltips for more info..."
 msgstr "並不是每個人都可以!參考提示以獲得更多的資訊..."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1118
+#, c-format
 msgid "Fetching planning for %s..."
 msgstr "為 %s 取得計畫..."
 
@@ -13383,6 +13793,7 @@ msgid "New meeting"
 msgstr "新的會議"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1652
+#, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - 編輯會議"
 
@@ -13392,22 +13803,26 @@ msgid "Time:"
 msgstr "時間:"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1864
+#, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1867
+#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分鐘"
 msgstr[1] "%d 分鐘"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1878
+#, c-format
 msgid "Upcoming event: %s"
 msgstr "即將到來的事件: %s"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1879
+#, c-format
 msgid ""
 "You have a meeting or event soon.\n"
 "It starts at %s and ends %s later.\n"
@@ -13424,6 +13839,7 @@ msgstr ""
 "%s"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1896
+#, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "在 %d 分鐘後提醒我"
@@ -13446,6 +13862,7 @@ msgid "Export calendar to ICS"
 msgstr "把行事曆匯出至 ICS"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:2103
+#, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "無法匯出行事曆至 '%s'\n"
 
@@ -13454,6 +13871,7 @@ msgid "Could not export the freebusy info."
 msgstr "無法匯出 空閒/忙碌 的資訊"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:2251
+#, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "無法匯出 空閒/忙碌 至'%s'\n"
 
@@ -13532,6 +13950,7 @@ msgid "Get free/busy status of others from"
 msgstr "從其它的寄件者取得空閒/忙碌狀態"
 
 #: src/plugins/vcalendar/vcal_prefs.c:567
+#, 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"
@@ -13560,14 +13979,17 @@ msgid "POP protocol error\n"
 msgstr "POP3 協定錯誤\n"
 
 #: src/pop.c:263
+#, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "無效的 UIDL 回應: %s\n"
 
 #: src/pop.c:841
+#, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP3: 刪除已過期的郵件 %d [%s]\n"
 
 #: src/pop.c:857
+#, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP3: 略過郵件 %d [%s] (%d 位元)\n"
 
@@ -13591,56 +14013,56 @@ msgstr "POP3通信發生錯誤\n"
 msgid "TOP command unsupported\n"
 msgstr "未支援的頂端命令\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1454 src/prefs_account.c:2452
+#: src/prefs_account.c:335 src/prefs_account.c:1487 src/prefs_account.c:2500
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1567 src/prefs_account.c:2467
+#: src/prefs_account.c:336 src/prefs_account.c:1600 src/prefs_account.c:2515
 #: src/wizard.c:1499
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:336
+#: src/prefs_account.c:337
 msgid "News (NNTP)"
 msgstr "新聞 (NNTP)"
 
-#: src/prefs_account.c:337 src/wizard.c:1500
+#: src/prefs_account.c:338 src/wizard.c:1500
 msgid "Local mbox file"
 msgstr "本地 mbox 檔案"
 
-#: src/prefs_account.c:338
+#: src/prefs_account.c:339
 msgid "None (SMTP only)"
 msgstr "空  (只針對SMTP)"
 
-#: src/prefs_account.c:1028
+#: src/prefs_account.c:1040
 msgid "Name of account"
 msgstr "帳號名稱"
 
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1049
 msgid "Set as default"
 msgstr "設定為預設值"
 
-#: src/prefs_account.c:1045
+#: src/prefs_account.c:1057
 msgid "Personal information"
 msgstr "個人資訊"
 
-#: src/prefs_account.c:1054
+#: src/prefs_account.c:1066
 msgid "Full name"
 msgstr "全名"
 
-#: src/prefs_account.c:1060
+#: src/prefs_account.c:1072
 msgid "Mail address"
 msgstr "郵件地址"
 
-#: src/prefs_account.c:1123 src/wizard.c:1523
+#: src/prefs_account.c:1135 src/wizard.c:1523
 msgid "Auto-configure"
 msgstr "自動配置"
 
-#: src/prefs_account.c:1125 src/wizard.c:1524
+#: src/prefs_account.c:1137 src/wizard.c:1524
 msgid "Cancel"
 msgstr "取消"
 
-#: src/prefs_account.c:1142
+#: src/prefs_account.c:1154
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -13648,429 +14070,448 @@ msgstr ""
 "警告:此 Claws Mail 編譯版本未支援\n"
 "IMPA 和 新聞功能"
 
-#: src/prefs_account.c:1171
+#: src/prefs_account.c:1185
 msgid "This server requires authentication"
 msgstr "此伺服器要求認證"
 
-#: src/prefs_account.c:1178
+#: src/prefs_account.c:1192
 msgid "Authenticate on connect"
 msgstr "連線時進行認證"
 
-#: src/prefs_account.c:1232
+#: src/prefs_account.c:1254
 msgid "News server"
 msgstr "新聞伺服器"
 
-#: src/prefs_account.c:1238
+#: src/prefs_account.c:1260
 msgid "Server for receiving"
 msgstr "POP3 伺服器 (接收)"
 
-#: src/prefs_account.c:1244
+#: src/prefs_account.c:1266
 msgid "Local mailbox"
 msgstr "本地郵件夾"
 
-#: src/prefs_account.c:1251
+#: src/prefs_account.c:1273
 msgid "SMTP server (send)"
 msgstr "SMTP 伺服器 (傳送)"
 
-#: src/prefs_account.c:1259
+#: src/prefs_account.c:1281
 msgid "Use mail command rather than SMTP server"
 msgstr "與其使用郵件命令,不如使用 SMTP 伺服器"
 
-#: src/prefs_account.c:1268
+#: src/prefs_account.c:1290
 msgid "command to send mails"
 msgstr "傳送郵件命令"
 
-#: src/prefs_account.c:1332
+#: src/prefs_account.c:1365
+#, c-format
 msgid "Account%d"
 msgstr "帳號 %d"
 
-#: src/prefs_account.c:1428
+#: src/prefs_account.c:1461
 msgid "Local"
 msgstr "本地"
 
-#: src/prefs_account.c:1434 src/prefs_account.c:1523
+#: src/prefs_account.c:1467 src/prefs_account.c:1556
 msgid "Default Inbox"
 msgstr "預設收件夾"
 
-#: src/prefs_account.c:1441 src/prefs_account.c:1448 src/prefs_account.c:1530
-#: src/prefs_account.c:1537
+#: src/prefs_account.c:1474 src/prefs_account.c:1481 src/prefs_account.c:1563
+#: src/prefs_account.c:1570
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "未過濾郵件將被儲存在這個資料夾"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1489
 msgid "Use secure authentication (APOP)"
 msgstr "使用安全認證 (APOP)"
 
-#: src/prefs_account.c:1459
+#: src/prefs_account.c:1492
 msgid "Remove messages on server when received"
 msgstr "郵件接收後從伺服器上移除"
 
-#: src/prefs_account.c:1470
+#: src/prefs_account.c:1503
 msgid "Remove after"
 msgstr "超過"
 
-#: src/prefs_account.c:1477 src/prefs_account.c:1487
+#: src/prefs_account.c:1510 src/prefs_account.c:1520
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 天 0 小時後: 立刻移除"
 
-#: src/prefs_account.c:1500
+#: src/prefs_account.c:1533
 msgid "Receive size limit"
 msgstr "接收郵件大小限制"
 
-#: src/prefs_account.c:1503
+#: src/prefs_account.c:1536
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgstr ""
 "郵件超過此限制將被部份接收,當選擇它們後,你將可以把它們全部下找或刪除。"
 
-#: src/prefs_account.c:1543 src/prefs_account.c:2482
+#: src/prefs_account.c:1576 src/prefs_account.c:2530
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1550
+#: src/prefs_account.c:1583
 msgid "Maximum number of articles to download"
 msgstr "可允許最大的郵件下載數量"
 
-#: src/prefs_account.c:1560
+#: src/prefs_account.c:1593
 msgid "unlimited if 0 is specified"
 msgstr "若設為0代表沒有限制"
 
-#: src/prefs_account.c:1585
+#: src/prefs_account.c:1618
 msgid "Plain text"
 msgstr "尋找字串:"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1631
 msgid "IMAP server directory"
 msgstr "IMAP 伺服器目錄"
 
-#: src/prefs_account.c:1602
+#: src/prefs_account.c:1635
 msgid "(usually empty)"
 msgstr "(通常是空白的)"
 
-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1649
 msgid "Show subscribed folders only"
 msgstr "只顯示訂閱資料夾"
 
-#: src/prefs_account.c:1623
+#: src/prefs_account.c:1656
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "寬頻效果模式 (防止接到遠端的標籤)"
 
-#: src/prefs_account.c:1625
+#: src/prefs_account.c:1658
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr "此模式使用較少的頻寬,對於某此伺服器可能會有速度較慢的情況發生"
 
-#: src/prefs_account.c:1632
+#: src/prefs_account.c:1665
 msgid "Filter messages on receiving"
 msgstr "接收郵件時進行過濾"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1672
 msgid "Allow filtering using plugins on receiving"
 msgstr "接收郵件時允許使用外掛程式進行過濾"
 
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1676
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'接收郵件' 檢查此帳號的新郵件"
 
-#: src/prefs_account.c:1725 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:623 src/prefs_matcher.c:1968 src/prefs_matcher.c:1990
+#: src/prefs_account.c:1759 src/prefs_customheader.c:208
+#: src/prefs_matcher.c:623 src/prefs_matcher.c:1970 src/prefs_matcher.c:1992
 msgid "Header"
 msgstr "郵件標頭"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1761
 msgid "Generate Message-ID"
 msgstr "產生  Message-ID"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1764
 msgid "Send account mail address in Message-ID"
 msgstr "將傳送帳號的郵件地址放入  Message-ID"
 
-#: src/prefs_account.c:1733
+#: src/prefs_account.c:1767
 msgid "Add user agent header"
 msgstr "加入使用者代理郵件標頭"
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1774
 msgid "Add user-defined header"
 msgstr "加入使用者自訂郵件標頭"
 
-#: src/prefs_account.c:1755
+#: src/prefs_account.c:1789
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP 認證 (SMTP AUTH)"
 
-#: src/prefs_account.c:1840
+#: src/prefs_account.c:1887
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "若以下欄位空白,將以使用者名稱和密碼進行接收"
 
-#: src/prefs_account.c:1851
+#: src/prefs_account.c:1898
 msgid "Authenticate with POP before sending"
 msgstr "傳送前用 POP3 認證"
 
-#: src/prefs_account.c:1866
+#: src/prefs_account.c:1913
 msgid "POP authentication timeout: "
 msgstr "POP 認證超時:"
 
-#: src/prefs_account.c:1954 src/prefs_account.c:2000
+#: src/prefs_account.c:2001 src/prefs_account.c:2047
 msgid "Signature"
 msgstr "簽名"
 
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:2004
 msgid "Automatically insert signature"
 msgstr "自動插入簽名"
 
-#: src/prefs_account.c:1962
+#: src/prefs_account.c:2009
 msgid "Signature separator"
 msgstr "簽名分隔線"
 
-#: src/prefs_account.c:1987
+#: src/prefs_account.c:2034
 msgid "Command output"
 msgstr "命令輸出"
 
-#: src/prefs_account.c:2020
+#: src/prefs_account.c:2067
 msgid "Automatically set the following addresses"
 msgstr "自動設置轉寄地址"
 
-#: src/prefs_account.c:2072
+#: src/prefs_account.c:2119
 msgid "Spell check dictionaries"
 msgstr "併字檢查字典"
 
-#: src/prefs_account.c:2082 src/prefs_folder_item.c:1104
-#: src/prefs_spelling.c:163
+#: src/prefs_account.c:2129 src/prefs_folder_item.c:1104
+#: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "預設定典"
 
-#: src/prefs_account.c:2095 src/prefs_folder_item.c:1138
-#: src/prefs_spelling.c:176
+#: src/prefs_account.c:2142 src/prefs_folder_item.c:1138
+#: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "預設替代定典"
 
-#: src/prefs_account.c:2181 src/prefs_account.c:3341
-#: src/prefs_compose_writing.c:373 src/prefs_folder_item.c:1449
-#: src/prefs_folder_item.c:1841 src/prefs_quote.c:119 src/prefs_quote.c:237
-#: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
+#: src/prefs_account.c:2228 src/prefs_account.c:3423
+#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1449
+#: src/prefs_folder_item.c:1842 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "新郵件"
 
-#: src/prefs_account.c:2196 src/prefs_folder_item.c:1477 src/prefs_quote.c:134
-#: src/toolbar.c:487
+#: src/prefs_account.c:2243 src/prefs_folder_item.c:1477 src/prefs_quote.c:134
+#: src/toolbar.c:490
 msgid "Reply"
 msgstr "回覆"
 
-#: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1505 src/prefs_quote.c:149 src/toolbar.c:492
+#: src/prefs_account.c:2258 src/prefs_filtering_action.c:191
+#: src/prefs_folder_item.c:1505 src/prefs_quote.c:149 src/toolbar.c:495
 msgid "Forward"
 msgstr "轉寄"
 
-#: src/prefs_account.c:2258
+#: src/prefs_account.c:2305
 msgid "Default privacy system"
 msgstr "預設的隱私系統"
 
-#: src/prefs_account.c:2287
+#: src/prefs_account.c:2334
 msgid "Always sign messages"
 msgstr "總是進行郵件簽章"
 
-#: src/prefs_account.c:2289
+#: src/prefs_account.c:2336
 msgid "Always encrypt messages"
 msgstr "總是將郵件加密"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2338
 msgid "Always sign messages when replying to a signed message"
 msgstr "當回覆簽章郵件時,總是將郵件進行簽章"
 
-#: src/prefs_account.c:2294
+#: src/prefs_account.c:2341
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "當回覆已加密郵件時,總是將郵件進行加密"
 
-#: src/prefs_account.c:2297
+#: src/prefs_account.c:2344
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "除了收件者外,將已傳送的郵件用私有金鑰進行加密"
 
-#: src/prefs_account.c:2299
+#: src/prefs_account.c:2346
 msgid "Save sent encrypted messages as clear text"
 msgstr "將已傳送的加密郵件儲存為明碼文件"
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2485
+#: src/prefs_account.c:2504 src/prefs_account.c:2519 src/prefs_account.c:2533
 msgid "Don't use SSL/TLS"
 msgstr "不使用 SSL/TLS"
 
-#: src/prefs_account.c:2459 src/prefs_account.c:2474 src/prefs_account.c:2494
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2507 src/prefs_account.c:2522 src/prefs_account.c:2542
+#: src/prefs_account.c:2553
 msgid "Use SSL/TLS"
 msgstr "使用 SSL/TLS"
 
-#: src/prefs_account.c:2462 src/prefs_account.c:2477 src/prefs_account.c:2508
+#: src/prefs_account.c:2510 src/prefs_account.c:2525 src/prefs_account.c:2556
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "使用 STARTTLS 命令啟用加密通訊"
 
-#: src/prefs_account.c:2498
+#: src/prefs_account.c:2546
 msgid "Send (SMTP)"
 msgstr "傳送 (SMTP)"
 
-#: src/prefs_account.c:2502
+#: src/prefs_account.c:2550
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "不使用 SSL/TLS (若需要,使用 STARTTLS)"
 
-#: src/prefs_account.c:2513
+#: src/prefs_account.c:2561
 msgid "Client certificates"
 msgstr "客戶端認證"
 
-#: src/prefs_account.c:2521
+#: src/prefs_account.c:2569
 msgid "Certificate for receiving"
 msgstr "進行接收認證"
 
-#: src/prefs_account.c:2526 src/prefs_account.c:2528 src/prefs_account.c:2548
-#: src/prefs_account.c:2550
+#: src/prefs_account.c:2574 src/prefs_account.c:2576 src/prefs_account.c:2602
+#: src/prefs_account.c:2604
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "客戶端認證檔案為 PKCS12 或 PEM 檔"
 
-#: src/prefs_account.c:2543
+#: src/prefs_account.c:2597
 msgid "Certificate for sending"
 msgstr "進行傳送認證"
 
-#: src/prefs_account.c:2576
+#: src/prefs_account.c:2637
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "自動接放不明的合法 SSL/TLS 認證"
 
-#: src/prefs_account.c:2579
+#: src/prefs_account.c:2640
 msgid "Use non-blocking SSL/TLS"
 msgstr "使用非阻斷式 SSL/TLS"
 
-#: src/prefs_account.c:2591
+#: src/prefs_account.c:2652
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "如果發生 SSL/TLS 連線問題,請把此功能關閉"
 
-#: src/prefs_account.c:2726
+#: src/prefs_account.c:2787
 msgid "SMTP port"
 msgstr "SMTP 通訊埠"
 
-#: src/prefs_account.c:2733
+#: src/prefs_account.c:2794
 msgid "POP port"
 msgstr "POP3 通訊埠"
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2801
 msgid "IMAP port"
 msgstr "IMAP4 通訊埠"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2808
 msgid "NNTP port"
 msgstr "NNTP 通訊埠"
 
-#: src/prefs_account.c:2753
+#: src/prefs_account.c:2814
 msgid "Domain name"
 msgstr "網域名稱"
 
-#: src/prefs_account.c:2756
+#: src/prefs_account.c:2817
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
 msgstr "網域名稱將被用來產生 Message-ID 以及當要連接到 SMTP 伺服器時"
 
-#: src/prefs_account.c:2770
+#: src/prefs_account.c:2831
 msgid "Use command to communicate with server"
 msgstr "以命令和伺服器進行通訊"
 
-#: src/prefs_account.c:2779
+#: src/prefs_account.c:2840
 msgid "Mark cross-posted messages as read and color:"
 msgstr "標示已傳送郵件為已讀並更改顏色"
 
-#: src/prefs_account.c:2835
+#: src/prefs_account.c:2896
 msgid "Put sent messages in"
 msgstr "郵已傳送郵件放在"
 
-#: src/prefs_account.c:2837
+#: src/prefs_account.c:2898
 msgid "Put queued messages in"
 msgstr "將暫存郵件放在"
 
-#: src/prefs_account.c:2839
+#: src/prefs_account.c:2900
 msgid "Put draft messages in"
 msgstr "將草稿郵件放在"
 
-#: src/prefs_account.c:2841
+#: src/prefs_account.c:2902
 msgid "Put deleted messages in"
 msgstr "將刪除的郵件放在"
 
-#: src/prefs_account.c:2900
+#: src/prefs_account.c:2961
 msgid "Account name is not entered."
 msgstr "未指定帳號名稱"
 
-#: src/prefs_account.c:2904
+#: src/prefs_account.c:2965
 msgid "Mail address is not entered."
 msgstr "未指定郵件地方"
 
-#: src/prefs_account.c:2911
+#: src/prefs_account.c:2973
 msgid "SMTP server is not entered."
 msgstr "未指定 SMTP 伺服器"
 
-#: src/prefs_account.c:2916
+#: src/prefs_account.c:2978
 msgid "User ID is not entered."
 msgstr "使用者 ID 未指定"
 
-#: src/prefs_account.c:2921
+#: src/prefs_account.c:2983
 msgid "POP server is not entered."
 msgstr "未指定 POP3 伺服器"
 
-#: src/prefs_account.c:2941
+#: src/prefs_account.c:3003
 msgid "The default Inbox folder doesn't exist."
 msgstr "預設收件夾不存在"
 
-#: src/prefs_account.c:2947
+#: src/prefs_account.c:3009
 msgid "IMAP server is not entered."
 msgstr "IMAP4 伺服器未指定"
 
-#: src/prefs_account.c:2952
+#: src/prefs_account.c:3014
 msgid "NNTP server is not entered."
 msgstr "NNTP 伺服器未指定"
 
-#: src/prefs_account.c:2958
+#: src/prefs_account.c:3020
 msgid "local mailbox filename is not entered."
 msgstr "本地郵件夾名稱未指定"
 
-#: src/prefs_account.c:2964
+#: src/prefs_account.c:3026
 msgid "mail command is not entered."
 msgstr "郵件命令未指定"
 
-#: src/prefs_account.c:3305
+#: src/prefs_account.c:3036
+msgid "User ID cannot contain a newline character."
+msgstr ""
+
+#: src/prefs_account.c:3041
+msgid "Password cannot contain a newline character."
+msgstr ""
+
+#: src/prefs_account.c:3069
+msgid "SMTP user ID cannot contain a newline character."
+msgstr ""
+
+#: src/prefs_account.c:3074
+msgid "SMTP password cannot contain a newline character."
+msgstr ""
+
+#: src/prefs_account.c:3387
 msgid "Receive"
 msgstr "接收"
 
-#: src/prefs_account.c:3359 src/prefs_folder_item.c:1857 src/prefs_quote.c:238
+#: src/prefs_account.c:3441 src/prefs_folder_item.c:1858 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "樣版"
 
-#: src/prefs_account.c:3377
+#: src/prefs_account.c:3459
 msgid "Privacy"
 msgstr "隱私"
 
-#: src/prefs_account.c:3489
+#: src/prefs_account.c:3571
 msgid "Advanced"
 msgstr "進階"
 
-#: src/prefs_account.c:3806
+#: src/prefs_account.c:3906
 msgid "Preferences for new account"
 msgstr "新帳號選項"
 
-#: src/prefs_account.c:3808
+#: src/prefs_account.c:3908
+#, c-format
 msgid "%s - Account preferences"
 msgstr "%s - 帳號選項"
 
-#: src/prefs_account.c:3929 src/wizard.c:1388
+#: src/prefs_account.c:4029 src/wizard.c:1388
 msgid "Failed (wrong address)"
 msgstr "失敗 (錯誤的地址)"
 
-#: src/prefs_account.c:4014
+#: src/prefs_account.c:4114
 msgid "Select signature file"
 msgstr "繼擇簽名檔案"
 
-#: src/prefs_account.c:4032 src/prefs_account.c:4049 src/wizard.c:1065
+#: src/prefs_account.c:4132 src/prefs_account.c:4149 src/wizard.c:1065
 msgid "Select certificate file"
 msgstr "選擇認證檔案"
 
-#: src/prefs_account.c:4145
+#: src/prefs_account.c:4245
 msgid "Protocol:"
 msgstr "通訊協定"
 
-#: src/prefs_account.c:4285
+#: src/prefs_account.c:4385
+#, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (未載入外掛程式)"
 
@@ -14103,7 +14544,7 @@ 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:780 src/prefs_template.c:320
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:780 src/prefs_template.c:319
 #: src/prefs_toolbar.c:1069
 msgid "D_elete"
 msgstr "刪除(_e)"
@@ -14112,7 +14553,7 @@ msgstr "刪除(_e)"
 msgid "Delete the selected action from the list"
 msgstr "從清單中刪除已選擇的動作"
 
-#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:338
+#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:337
 msgid "Clear all the input fields in the dialog"
 msgstr "在對話框中清除所有輸入的區塊"
 
@@ -14128,10 +14569,10 @@ msgstr "將選擇的動作上移"
 msgid "Move selected action down"
 msgstr "將選擇的動作下移"
 
-#: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
+#: src/prefs_actions.c:535 src/prefs_filtering_action.c:707
 #: src/prefs_filtering.c:838 src/prefs_filtering.c:840
 #: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:897
-#: src/prefs_template.c:472
+#: src/prefs_template.c:471
 msgid "(New)"
 msgstr "(新的)"
 
@@ -14160,6 +14601,7 @@ msgid "Menu name and command are too long."
 msgstr "功能項目和命令都太長了"
 
 #: src/prefs_actions.c:649
+#, c-format
 msgid ""
 "The command\n"
 "%s\n"
@@ -14185,21 +14627,21 @@ msgstr "刪除所有動作"
 msgid "Do you really want to delete all the actions?"
 msgstr "你真的要刪除所有的動作嗎?"
 
-#: src/prefs_actions.c:892 src/prefs_actions.c:923 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2115 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_actions.c:892 src/prefs_actions.c:923 src/prefs_filtering.c:1501
+#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2117 src/prefs_template.c:571
+#: src/prefs_template.c:596
 msgid "Entry not saved"
 msgstr "項目尚未儲存"
 
-#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1500
-#: src/prefs_filtering.c:1522 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1502
+#: src/prefs_filtering.c:1524 src/prefs_template.c:572 src/prefs_template.c:597
 msgid "The entry was not saved. Close anyway?"
 msgstr "項目尚未儲存,仍然要關閉嗎?"
 
 #: src/prefs_actions.c:894 src/prefs_actions.c:899 src/prefs_actions.c:925
-#: src/prefs_filtering.c:1479 src/prefs_filtering.c:1501
-#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2118 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1481 src/prefs_filtering.c:1503
+#: src/prefs_filtering.c:1525 src/prefs_matcher.c:2120 src/prefs_template.c:573
+#: src/prefs_template.c:598 src/prefs_template.c:603
 msgid "_Continue editing"
 msgstr "繼續編輯(_C)"
 
@@ -14292,7 +14734,7 @@ msgstr "套用在 {} 間的過濾動作到選擇的郵件上"
 msgid "for a literal %"
 msgstr "文字 %"
 
-#: src/prefs_actions.c:998 src/prefs_themes.c:1051
+#: src/prefs_actions.c:998 src/prefs_themes.c:1088
 msgid "Actions"
 msgstr "動作"
 
@@ -14304,8 +14746,8 @@ msgstr ""
 "此動作功能提供了使用者一個可以執行外部命令的方法,用來套用至完整郵件檔案或是"
 "郵件的其中的一個部份"
 
-#: src/prefs_actions.c:1086 src/prefs_filtering.c:1697
-#: src/prefs_template.c:1111
+#: src/prefs_actions.c:1086 src/prefs_filtering.c:1699
+#: src/prefs_template.c:1112
 msgid "D_uplicate"
 msgstr "重複的(_u)"
 
@@ -14313,20 +14755,20 @@ msgstr "重複的(_u)"
 msgid "Current actions"
 msgstr "目前的動作"
 
-#: src/prefs_actions.c:1305 src/prefs_filtering.c:1076
-#: src/prefs_filtering.c:1134
+#: src/prefs_actions.c:1305 src/prefs_filtering.c:1078
+#: src/prefs_filtering.c:1136
 msgid "Action string is not valid."
 msgstr "動作字串是無效的"
 
-#: src/prefs_common.c:237 src/prefs_quote.c:69
+#: src/prefs_common.c:236 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "嗨, \\n"
 
-#: src/prefs_common.c:315
+#: src/prefs_common.c:314
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "在 %d\\n%f 已寫入:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:321 src/prefs_quote.c:85
+#: src/prefs_common.c:320 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"
@@ -14334,7 +14776,7 @@ 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"
 
-#: src/prefs_common.c:453
+#: src/prefs_common.c:448
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -14366,67 +14808,68 @@ msgstr "自動執行外部編輯器"
 msgid "Automatically save message to Drafts folder every"
 msgstr "自動儲存至暫存資料夾  每"
 
-#: src/prefs_compose_writing.c:163 src/prefs_wrapping.c:101
+#: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:100
 msgid "characters"
 msgstr "字串"
 
-#: src/prefs_compose_writing.c:174
+#: src/prefs_compose_writing.c:173
 msgid "Even if message is to be encrypted"
 msgstr "即使郵件已經加密"
 
-#: src/prefs_compose_writing.c:181
+#: src/prefs_compose_writing.c:180
 msgid "Undo level"
 msgstr "復原次數"
 
-#: src/prefs_compose_writing.c:199
+#: src/prefs_compose_writing.c:197
 msgid "Warn when inserting a file larger than"
 msgstr "發出警告,當附加檔案超過"
 
-#: src/prefs_compose_writing.c:211
+#: src/prefs_compose_writing.c:208
 msgid "KB into message body "
 msgstr "KB 被插入郵件內"
 
-#: src/prefs_compose_writing.c:217
+#: src/prefs_compose_writing.c:214
 msgid "Replying"
 msgstr "回信"
 
-#: src/prefs_compose_writing.c:220
+#: src/prefs_compose_writing.c:217
 msgid "Reply will quote by default"
 msgstr "回信內容預設將被引用"
 
-#: src/prefs_compose_writing.c:223
+#: src/prefs_compose_writing.c:220
 msgid "Reply button invokes mailing list reply"
 msgstr "回信按鍵執行寄件清單的回覆"
 
-#: src/prefs_compose_writing.c:225
+#: src/prefs_compose_writing.c:222
 msgid "Forwarding"
 msgstr "轉送"
 
-#: src/prefs_compose_writing.c:228 src/prefs_filtering_action.c:192
+#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:192
 msgid "Forward as attachment"
 msgstr "以附加檔轉送"
 
-#: src/prefs_compose_writing.c:230
+#: src/prefs_compose_writing.c:227
+#, c-format
 msgid "Keep the original '%s' header when redirecting"
 msgstr "當改寄時保持原郵件的 '%s' 欄位"
 
-#: src/prefs_compose_writing.c:236
+#: src/prefs_compose_writing.c:233
 msgid "When dropping files into the Compose window"
 msgstr "當檔案被移入寄件視窗時"
 
-#: src/prefs_compose_writing.c:245
+#: src/prefs_compose_writing.c:242
 msgid "Ask"
 msgstr "詢問"
 
-#: src/prefs_compose_writing.c:246 src/toolbar.c:519
+#: src/prefs_compose_writing.c:243 src/toolbar.c:522
 msgid "Insert"
 msgstr "插入"
 
-#: src/prefs_compose_writing.c:247 src/toolbar.c:520
+#: src/prefs_compose_writing.c:244 src/toolbar.c:523
 msgid "Attach"
 msgstr "附件"
 
-#: src/prefs_compose_writing.c:374
+#: src/prefs_compose_writing.c:371
 msgid "Writing"
 msgstr "寫信"
 
@@ -14434,68 +14877,69 @@ msgstr "寫信"
 msgid "Custom header configuration"
 msgstr "自訂的標頭配置"
 
-#: src/prefs_customheader.c:506 src/prefs_display_header.c:601
-#: src/prefs_matcher.c:1595 src/prefs_matcher.c:1610
+#: src/prefs_customheader.c:502 src/prefs_display_header.c:601
+#: src/prefs_matcher.c:1597 src/prefs_matcher.c:1612
 msgid "Header name is not set."
 msgstr "尚未設定標頭名稱"
 
-#: src/prefs_customheader.c:516
+#: src/prefs_customheader.c:512
 msgid "This Header name is not allowed as a custom header."
 msgstr "此標頭名稱不允許作為自訂標頭"
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:559
 msgid "Choose a PNG file"
 msgstr "選擇一個 PNG 檔"
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:561
 msgid "Choose an XBM file"
 msgstr "選擇一個 XBM 檔"
 
-#: src/prefs_customheader.c:567
+#: src/prefs_customheader.c:563
 msgid "Choose a text file"
 msgstr "選擇一個文字檔"
 
-#: src/prefs_customheader.c:580
+#: src/prefs_customheader.c:576
 msgid "This file isn't an image."
 msgstr "這不是一個影像檔"
 
-#: src/prefs_customheader.c:585
+#: src/prefs_customheader.c:581
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "所選的影像檔大小不正確 (48x48)"
 
-#: src/prefs_customheader.c:591
+#: src/prefs_customheader.c:587
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "此影像檔太大;最大不可超過 725 位元"
 
-#: src/prefs_customheader.c:596
+#: src/prefs_customheader.c:592
 msgid "The image isn't in the correct format (PNG)."
 msgstr "此影像檔格式不正確 (PNG)"
 
-#: src/prefs_customheader.c:605
+#: src/prefs_customheader.c:601
 msgid "The image isn't in the correct format (XBM)."
 msgstr "此影像檔格式不正確 (XBM)"
 
-#: src/prefs_customheader.c:614
+#: src/prefs_customheader.c:610
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr "無法呼叫 `compface`。請確認它在你的 $PATH 內"
 
-#: src/prefs_customheader.c:620
+#: src/prefs_customheader.c:616
+#, c-format
 msgid "Compface error: %s"
 msgstr "Compface 錯誤: %s"
 
-#: src/prefs_customheader.c:673
+#: src/prefs_customheader.c:669
 msgid "This file contains newlines."
 msgstr "此檔包含了新列"
 
-#: src/prefs_customheader.c:703
+#: src/prefs_customheader.c:699
 msgid "Delete header"
 msgstr "刪除標頭"
 
-#: src/prefs_customheader.c:704
+#: src/prefs_customheader.c:700
 msgid "Do you really want to delete this header?"
 msgstr "你確定要刪除這個標頭嗎?"
 
-#: src/prefs_customheader.c:877
+#: src/prefs_customheader.c:873
 msgid "Current custom headers"
 msgstr "目前的自訂標頭"
 
@@ -14524,6 +14968,7 @@ msgid "This header is already in the list."
 msgstr "此標頭已經存在清單中了"
 
 #: src/prefs_ext_prog.c:102
+#, c-format
 msgid "%s will be replaced with file name / URI"
 msgstr "%s 將會被檔案名稱覆蓋 / URI"
 
@@ -14556,7 +15001,7 @@ msgstr ""
 "時,它可以透過一個腳本達成"
 
 #: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
-#: src/prefs_message.c:354
+#: src/prefs_message.c:352
 msgid "Message View"
 msgstr "郵件檢視"
 
@@ -14583,8 +15028,8 @@ msgstr "隱藏"
 msgid "Message flags"
 msgstr "郵件旗標"
 
-#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:450
-#: src/prefs_summary_column.c:78 src/summaryview.c:2798 src/toolbar.c:502
+#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:449
+#: src/prefs_summary_column.c:77 src/summaryview.c:2813 src/toolbar.c:505
 msgid "Mark"
 msgstr "標示"
 
@@ -14604,12 +15049,12 @@ msgstr "標示為垃圾郵件"
 msgid "Mark as ham"
 msgstr "標示為一般郵件"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1439
-#: src/toolbar.c:238 src/toolbar.c:496 src/toolbar.c:2387
+#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1442
+#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2465
 msgid "Execute"
 msgstr "執行"
 
-#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:448
+#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:447
 msgid "Color label"
 msgstr "標籤顏色"
 
@@ -14623,9 +15068,9 @@ msgid "Redirect"
 msgstr "改寄"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1443 src/prefs_matcher.c:629
-#: src/prefs_summaries.c:453 src/prefs_summary_column.c:87
-#: src/summaryview.c:448
+#: src/prefs_filtering_action.c:1446 src/prefs_matcher.c:629
+#: src/prefs_summaries.c:452 src/prefs_summary_column.c:86
+#: src/summaryview.c:449
 msgid "Score"
 msgstr "分數"
 
@@ -14639,7 +15084,7 @@ msgstr "設定分數"
 
 #: src/prefs_filtering_action.c:196 src/prefs_filtering_action.c:197
 #: src/prefs_filtering_action.c:198 src/prefs_matcher.c:633
-#: src/prefs_summary_column.c:89 src/summaryview.c:450
+#: src/prefs_summary_column.c:88 src/summaryview.c:451
 msgid "Tags"
 msgstr "標籤"
 
@@ -14667,7 +15112,7 @@ msgstr "保止過濾"
 msgid "Action configuration"
 msgstr "動作設定"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1888
+#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1890
 #: src/prefs_matcher.c:586
 msgid "Rule"
 msgstr "規則"
@@ -14676,65 +15121,65 @@ msgstr "規則"
 msgid "Action"
 msgstr "動作"
 
-#: src/prefs_filtering_action.c:935
+#: src/prefs_filtering_action.c:938
 msgid "Command-line not set"
 msgstr "命令列未設定"
 
-#: src/prefs_filtering_action.c:936
+#: src/prefs_filtering_action.c:939
 msgid "Destination is not set."
 msgstr "目的地未設定"
 
-#: src/prefs_filtering_action.c:947
+#: src/prefs_filtering_action.c:950
 msgid "Recipient is not set."
 msgstr "回條未設定"
 
-#: src/prefs_filtering_action.c:965
+#: src/prefs_filtering_action.c:968
 msgid "Score is not set"
 msgstr "分數未設定"
 
-#: src/prefs_filtering_action.c:973
+#: src/prefs_filtering_action.c:976
 msgid "Header is not set."
 msgstr "標頭未設定"
 
-#: src/prefs_filtering_action.c:980
+#: src/prefs_filtering_action.c:983
 msgid "Target addressbook/folder is not set."
 msgstr "目的通訊錄/資料夾未設定"
 
-#: src/prefs_filtering_action.c:994
+#: src/prefs_filtering_action.c:997
 msgid "Tag name is empty."
 msgstr "標籤名稱是空白的"
 
-#: src/prefs_filtering_action.c:1216
+#: src/prefs_filtering_action.c:1219
 msgid "No action was defined."
 msgstr "沒有定義動作"
 
-#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2161
+#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2163
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "字 %"
 
-#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2170
+#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2172
 msgid "filename (should not be modified)"
 msgstr "檔案名稱 (不能被修改)"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2171
+#: src/prefs_filtering_action.c:1267 src/prefs_matcher.c:2173
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "新的行"
 
-#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2172
+#: src/prefs_filtering_action.c:1268 src/prefs_matcher.c:2174
 msgid "escape character for quotes"
 msgstr "引言的跳脫字元"
 
-#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2173
+#: src/prefs_filtering_action.c:1269 src/prefs_matcher.c:2175
 msgid "quote character"
 msgstr "引言字元"
 
-#: src/prefs_filtering_action.c:1275
+#: src/prefs_filtering_action.c:1278
 msgid "Filtering Action: 'Execute'"
 msgstr "過濾動作: '執行'"
 
-#: src/prefs_filtering_action.c:1276
+#: src/prefs_filtering_action.c:1279
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
@@ -14743,23 +15188,23 @@ msgstr ""
 "'執行' 允許你傳送一個郵件或訊息到一個外部的程式或腳本\n"
 "可以使用以下的符號:"
 
-#: src/prefs_filtering_action.c:1423
+#: src/prefs_filtering_action.c:1426
 msgid "Recipient"
 msgstr "回條"
 
-#: src/prefs_filtering_action.c:1427
+#: src/prefs_filtering_action.c:1430
 msgid "Book/Folder"
 msgstr "通訊錄/資料夾"
 
-#: src/prefs_filtering_action.c:1431
+#: src/prefs_filtering_action.c:1434
 msgid "Destination"
 msgstr "目的"
 
-#: src/prefs_filtering_action.c:1435
+#: src/prefs_filtering_action.c:1438
 msgid "Color"
 msgstr "顏色"
 
-#: src/prefs_filtering_action.c:1521
+#: src/prefs_filtering_action.c:1524
 msgid "Current action list"
 msgstr "目前的動作清單"
 
@@ -14768,7 +15213,7 @@ msgid "Filtering/Processing configuration"
 msgstr "過濾/處理 配置"
 
 #: src/prefs_filtering.c:266 src/prefs_filtering.c:869
-#: src/prefs_filtering.c:983
+#: src/prefs_filtering.c:985
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "全部"
@@ -14829,59 +15274,59 @@ msgstr "移動選擇的規則至下一頁"
 msgid "Move the selected rule to the bottom"
 msgstr "移動選擇的規則至底部"
 
-#: src/prefs_filtering.c:1040 src/prefs_filtering.c:1126
+#: src/prefs_filtering.c:1042 src/prefs_filtering.c:1128
 msgid "Condition string is not valid."
 msgstr "條件字串是無效的"
 
-#: src/prefs_filtering.c:1113
+#: src/prefs_filtering.c:1115
 msgid "Condition string is empty."
 msgstr "條件字串是空白的"
 
-#: src/prefs_filtering.c:1119
+#: src/prefs_filtering.c:1121
 msgid "Action string is empty."
 msgstr "動作字串是空白的"
 
-#: src/prefs_filtering.c:1207
+#: src/prefs_filtering.c:1209
 msgid "Delete rule"
 msgstr "刪除規則"
 
-#: src/prefs_filtering.c:1208
+#: src/prefs_filtering.c:1210
 msgid "Do you really want to delete this rule?"
 msgstr "你確定要刪除這個規則嗎?"
 
-#: src/prefs_filtering.c:1226
+#: src/prefs_filtering.c:1228
 msgid "Delete all rules"
 msgstr "刪除所有的規則"
 
-#: src/prefs_filtering.c:1227
+#: src/prefs_filtering.c:1229
 msgid "Do you really want to delete all the rules?"
 msgstr "你確定要刪除所有的規則"
 
-#: src/prefs_filtering.c:1477
+#: src/prefs_filtering.c:1479
 msgid "Filtering rules not saved"
 msgstr "過濾規格尚未儲存"
 
-#: src/prefs_filtering.c:1478
+#: src/prefs_filtering.c:1480
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "此過濾規則清單已被修改,仍然要關閉嗎?"
 
-#: src/prefs_filtering.c:1700
+#: src/prefs_filtering.c:1702
 msgid "Move one page up"
 msgstr "移往上一頁"
 
-#: src/prefs_filtering.c:1701
+#: src/prefs_filtering.c:1703
 msgid "Move one page down"
 msgstr "移至下一頁"
 
-#: src/prefs_filtering.c:1856
+#: src/prefs_filtering.c:1858
 msgid "Enable"
 msgstr "啟用"
 
-#: src/prefs_folder_column.c:212
+#: src/prefs_folder_column.c:211
 msgid "Folder list columns configuration"
 msgstr "配置資料夾清單列"
 
-#: src/prefs_folder_column.c:229
+#: src/prefs_folder_column.c:228
 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."
@@ -14893,13 +15338,13 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "隱藏行數"
 
-#: src/prefs_folder_column.c:290 src/prefs_summaries.c:417
-#: src/prefs_summaries.c:593 src/prefs_summary_column.c:304
+#: src/prefs_folder_column.c:299 src/prefs_summaries.c:416
+#: src/prefs_summaries.c:590 src/prefs_summary_column.c:313
 msgid "Displayed columns"
 msgstr "顯示行數"
 
-#: src/prefs_folder_column.c:329 src/prefs_msg_colors.c:494
-#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1077
+#: src/prefs_folder_column.c:332 src/prefs_msg_colors.c:484
+#: src/prefs_summary_column.c:346 src/prefs_toolbar.c:1077
 msgid " Use default "
 msgstr "使用預設值"
 
@@ -15017,11 +15462,13 @@ msgstr "用傳送儲存外寄郵件複本至這個資料夾"
 
 #: src/prefs_folder_item.c:924 src/prefs_folder_item.c:976
 #: src/prefs_folder_item.c:1002 src/prefs_folder_item.c:1028
+#, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s"
 msgstr "預設 %s"
 
 #: src/prefs_folder_item.c:950
+#, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s for replies"
 msgstr "回信的預設 %s"
@@ -15038,11 +15485,12 @@ msgstr "放棄快取"
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr "你確定要放棄本地資料夾的快取資料嗎?"
 
-#: src/prefs_folder_item.c:1824
+#: src/prefs_folder_item.c:1825
 msgid "General"
 msgstr "一般"
 
-#: src/prefs_folder_item.c:1903
+#: src/prefs_folder_item.c:1904
+#, c-format
 msgid "Properties for folder %s"
 msgstr "資料夾屬性 %s"
 
@@ -15050,7 +15498,7 @@ msgstr "資料夾屬性 %s"
 msgid "Folder and Message Lists"
 msgstr "資料夾與郵件清單"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2036
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2038
 msgid "Message"
 msgstr "郵件"
 
@@ -15074,8 +15522,8 @@ msgstr "使用不同的字型進行列印"
 msgid "Message Printing"
 msgstr "列印郵件"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:768
-#: src/prefs_themes.c:389
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:830 src/prefs_summaries.c:765
+#: src/prefs_themes.c:421
 msgid "Display"
 msgstr "顯示"
 
@@ -15083,7 +15531,7 @@ msgstr "顯示"
 msgid "Fonts"
 msgstr "字型"
 
-#: src/prefs_gtk.c:908 src/toolbar.c:256 src/toolbar.c:514
+#: src/prefs_gtk.c:910 src/toolbar.c:256 src/toolbar.c:517
 msgid "Preferences"
 msgstr "選項"
 
@@ -15111,27 +15559,27 @@ msgstr "列印圖片"
 msgid "Image Viewer"
 msgstr "圖片檢視器"
 
-#: src/prefs_logging.c:147 src/prefs_logging.c:254
+#: src/prefs_logging.c:143 src/prefs_logging.c:249
 msgid "Restrict the log window to"
 msgstr "從日誌視窗取回"
 
-#: src/prefs_logging.c:159 src/prefs_logging.c:266
+#: src/prefs_logging.c:154 src/prefs_logging.c:260
 msgid "0 to stop logging in the log window"
 msgstr "0代表停止在日誌視窗中記錄日誌"
 
-#: src/prefs_logging.c:161 src/prefs_logging.c:268
+#: src/prefs_logging.c:156 src/prefs_logging.c:262
 msgid "lines"
 msgstr "行"
 
-#: src/prefs_logging.c:171
+#: src/prefs_logging.c:165
 msgid "Filtering/processing log"
 msgstr "過濾/執行日誌"
 
-#: src/prefs_logging.c:174
+#: src/prefs_logging.c:168
 msgid "Enable logging of filtering/processing rules"
 msgstr "啟用過濾/執行規則進行日誌記錄"
 
-#: src/prefs_logging.c:180
+#: src/prefs_logging.c:174
 msgid ""
 "If checked, turns on logging of filtering and processing rules.\n"
 "The log is accessible from 'Tools/Filtering log'.\n"
@@ -15143,47 +15591,47 @@ msgstr ""
 "注意:開啟這個選項將會降低 過濾/處理 的速度, 如果套用很多規則到數以千計的郵"
 "件,可能會到達臨界值 "
 
-#: src/prefs_logging.c:187
+#: src/prefs_logging.c:181
 msgid "Log filtering/processing when..."
 msgstr "當...情況下記錄過濾/執行日誌"
 
-#: src/prefs_logging.c:191
+#: src/prefs_logging.c:185
 msgid "filtering at incorporation"
 msgstr "在組合規格的情況下過濾"
 
-#: src/prefs_logging.c:193
+#: src/prefs_logging.c:187
 msgid "pre-processing folders"
 msgstr "對資料夾進行前處理"
 
-#: src/prefs_logging.c:198
+#: src/prefs_logging.c:192
 msgid "manually filtering"
 msgstr "手動過濾"
 
-#: src/prefs_logging.c:200
+#: src/prefs_logging.c:194
 msgid "post-processing folders"
 msgstr "對資料夾進行後處理"
 
-#: src/prefs_logging.c:207
+#: src/prefs_logging.c:201
 msgid "processing folders"
 msgstr "處理資料夾"
 
-#: src/prefs_logging.c:222
+#: src/prefs_logging.c:217
 msgid "Log level"
 msgstr "日誌等級"
 
-#: src/prefs_logging.c:231
+#: src/prefs_logging.c:226
 msgid "Low"
 msgstr "低"
 
-#: src/prefs_logging.c:232
+#: src/prefs_logging.c:227
 msgid "Medium"
 msgstr "中"
 
-#: src/prefs_logging.c:233
+#: src/prefs_logging.c:228
 msgid "High"
 msgstr "高"
 
-#: src/prefs_logging.c:238
+#: src/prefs_logging.c:233
 msgid ""
 "Select the level of detail of the logging.\n"
 "Choose Low to see when rules are applied, which conditions match or don't "
@@ -15202,35 +15650,35 @@ msgstr ""
 "不符合\n"
 "注意:越高的等制,代表將對效能有更大的衝擊及影響"
 
-#: src/prefs_logging.c:280
+#: src/prefs_logging.c:274
 msgid "Disk log"
 msgstr "磁碟日誌"
 
-#: src/prefs_logging.c:282
+#: src/prefs_logging.c:276
 msgid "Write the following information to disk..."
 msgstr "將下列資訊寫入磁碟內..."
 
-#: src/prefs_logging.c:290
+#: src/prefs_logging.c:284
 msgid "Warning messages"
 msgstr "警示郵件"
 
-#: src/prefs_logging.c:291
+#: src/prefs_logging.c:285
 msgid "Network protocol messages"
 msgstr "網路協定郵件"
 
-#: src/prefs_logging.c:295
+#: src/prefs_logging.c:289
 msgid "Error messages"
 msgstr "錯誤郵件"
 
-#: src/prefs_logging.c:296
+#: src/prefs_logging.c:290
 msgid "Status messages for filtering/processing log"
 msgstr "記錄過濾/執行日誌的狀態郵件"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:144 src/prefs_other.c:776
 msgid "Other"
 msgstr "其它"
 
-#: src/prefs_logging.c:428
+#: src/prefs_logging.c:411
 msgid "Logging"
 msgstr "日誌"
 
@@ -15302,11 +15750,11 @@ msgstr "內文部份"
 msgid "whole message"
 msgstr "全部郵件"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6307
+#: src/prefs_matcher.c:394 src/summaryview.c:6351
 msgid "Marked"
 msgstr "已標示"
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6305
+#: src/prefs_matcher.c:395 src/summaryview.c:6349
 msgid "Deleted"
 msgstr "已刪除"
 
@@ -15314,12 +15762,12 @@ msgstr "已刪除"
 msgid "Replied"
 msgstr "已回覆"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6299
+#: src/prefs_matcher.c:397 src/summaryview.c:6343
 msgid "Forwarded"
 msgstr "已轉寄"
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6289 src/toolbar.c:512
-#: src/toolbar.c:981 src/toolbar.c:2261
+#: src/prefs_matcher.c:399 src/summaryview.c:6333 src/toolbar.c:515
+#: src/toolbar.c:988 src/toolbar.c:2339
 msgid "Spam"
 msgstr "垃圾郵件"
 
@@ -15327,7 +15775,7 @@ msgstr "垃圾郵件"
 msgid "Has attachment"
 msgstr "有附加檔額"
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6325
+#: src/prefs_matcher.c:401 src/summaryview.c:6369
 msgid "Signed"
 msgstr "簽章"
 
@@ -15411,7 +15859,7 @@ msgstr "片語"
 msgid "Flags"
 msgstr "旗標"
 
-#: src/prefs_matcher.c:627 src/prefs_msg_colors.c:410
+#: src/prefs_matcher.c:627 src/prefs_msg_colors.c:399
 msgid "Color labels"
 msgstr "標籤顏色"
 
@@ -15427,8 +15875,8 @@ msgstr "部份已下載"
 msgid "External program test"
 msgstr "外部程式測試"
 
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1616 src/prefs_matcher.c:1631
-#: src/prefs_matcher.c:2517
+#: src/prefs_matcher.c:710 src/prefs_matcher.c:1618 src/prefs_matcher.c:1633
+#: src/prefs_matcher.c:2519
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "所有"
@@ -15453,27 +15901,29 @@ msgstr "所有"
 msgid "of above rules"
 msgstr "在上述所的規則內"
 
-#: src/prefs_matcher.c:1534 src/prefs_matcher.c:1600
+#: src/prefs_matcher.c:1536 src/prefs_matcher.c:1602
 msgid "Search pattern is not set."
 msgstr "搜尋模型尚未設定"
 
-#: src/prefs_matcher.c:1543
+#: src/prefs_matcher.c:1545
 msgid "Test command is not set."
 msgstr "測試命令尚未設定"
 
-#: src/prefs_matcher.c:1617
+#: src/prefs_matcher.c:1619
 msgid "all addresses in all headers"
 msgstr "所有郵件標頭內的所有地址"
 
-#: src/prefs_matcher.c:1620
+#: src/prefs_matcher.c:1622
 msgid "any address in any header"
 msgstr "任何郵件標頭內的任何地址"
 
-#: src/prefs_matcher.c:1622
+#: src/prefs_matcher.c:1624
+#, c-format
 msgid "the address(es) in header '%s'"
 msgstr "郵件標頭'%s'內的地址"
 
-#: src/prefs_matcher.c:1623
+#: src/prefs_matcher.c:1625
+#, c-format
 msgid ""
 "Book/folder path is not set.\n"
 "\n"
@@ -15484,83 +15934,83 @@ msgstr ""
 "\n"
 "如果你想符合 %s 所有的通訊錄,必需從通訊錄/資料夾的下拉式選單中選取'%s'"
 
-#: src/prefs_matcher.c:1842
+#: src/prefs_matcher.c:1844
 msgid "Headers part"
 msgstr "郵件標頭的部份"
 
-#: src/prefs_matcher.c:1846
+#: src/prefs_matcher.c:1848
 msgid "Headers values"
 msgstr "郵件標頭的數值"
 
-#: src/prefs_matcher.c:1850
+#: src/prefs_matcher.c:1852
 msgid "Body part"
 msgstr "內文部份"
 
-#: src/prefs_matcher.c:1854
+#: src/prefs_matcher.c:1856
 msgid "Whole message"
 msgstr "全部郵件"
 
-#: src/prefs_matcher.c:1967 src/prefs_matcher.c:2009
+#: src/prefs_matcher.c:1969 src/prefs_matcher.c:2011
 msgid "in"
 msgstr "在"
 
-#: src/prefs_matcher.c:1969
+#: src/prefs_matcher.c:1971
 msgid "content is"
 msgstr "內容為"
 
-#: src/prefs_matcher.c:1978
+#: src/prefs_matcher.c:1980
 msgid "Age is"
 msgstr "年齡為"
 
-#: src/prefs_matcher.c:1983
+#: src/prefs_matcher.c:1985
 msgid "Flag"
 msgstr "旗標"
 
-#: src/prefs_matcher.c:1984 src/prefs_matcher.c:1999
+#: src/prefs_matcher.c:1986 src/prefs_matcher.c:2001
 msgid "is"
 msgstr "是"
 
-#: src/prefs_matcher.c:1989
+#: src/prefs_matcher.c:1991
 msgid "Name:"
 msgstr "名稱:"
 
-#: src/prefs_matcher.c:1998
+#: src/prefs_matcher.c:2000
 msgid "Label"
 msgstr "標籤"
 
-#: src/prefs_matcher.c:2004
+#: src/prefs_matcher.c:2006
 msgid "Value:"
 msgstr "值:"
 
-#: src/prefs_matcher.c:2019
+#: src/prefs_matcher.c:2021
 msgid "Score is"
 msgstr "範圍為"
 
-#: src/prefs_matcher.c:2020
+#: src/prefs_matcher.c:2022
 msgid "points"
 msgstr "點"
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2032
 msgid "Size is"
 msgstr "大小為"
 
-#: src/prefs_matcher.c:2035
+#: src/prefs_matcher.c:2037
 msgid "Scope:"
 msgstr "範圍"
 
-#: src/prefs_matcher.c:2037
+#: src/prefs_matcher.c:2039
 msgid "tags"
 msgstr "標籤"
 
-#: src/prefs_matcher.c:2042
+#: src/prefs_matcher.c:2044
 msgid "type is"
 msgstr "型式為"
 
-#: src/prefs_matcher.c:2046
+#: src/prefs_matcher.c:2048
 msgid "Program returns"
 msgstr "程式結束"
 
-#: src/prefs_matcher.c:2116
+#: src/prefs_matcher.c:2118
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -15568,11 +16018,11 @@ msgstr ""
 "輸入內容尚未儲存\n"
 "確定要離開?"
 
-#: src/prefs_matcher.c:2182
+#: src/prefs_matcher.c:2184
 msgid "Match Type: 'Test'"
 msgstr "符合型式:'測試'"
 
-#: src/prefs_matcher.c:2183
+#: src/prefs_matcher.c:2185
 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"
@@ -15583,7 +16033,7 @@ msgstr ""
 "\n"
 "下列的符號是可以使用的:"
 
-#: src/prefs_matcher.c:2282
+#: src/prefs_matcher.c:2284
 msgid "Current condition rules"
 msgstr "目前條件規則"
 
@@ -15627,47 +16077,48 @@ msgstr "選擇多類型郵件的HTML部份"
 msgid "Line space"
 msgstr "行距"
 
-#: src/prefs_message.c:189 src/prefs_message.c:223
+#: src/prefs_message.c:188 src/prefs_message.c:221
 msgid "pixels"
 msgstr "畫素"
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:194
 msgid "Scroll"
 msgstr "捲動"
 
-#: src/prefs_message.c:197
+#: src/prefs_message.c:196
 msgid "Half page"
 msgstr "半頁"
 
-#: src/prefs_message.c:203
+#: src/prefs_message.c:202
 msgid "Smooth scroll"
 msgstr "平滑捲動"
 
-#: src/prefs_message.c:209
+#: src/prefs_message.c:208
 msgid "Step"
 msgstr "步驟"
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:228
 msgid "Show attachment descriptions (rather than names)"
 msgstr "顯示附件說明 (優先於附件名稱)"
 
-#: src/prefs_message.c:233
+#: src/prefs_message.c:231
 msgid "Quotation"
 msgstr "引言"
 
-#: src/prefs_message.c:242
+#: src/prefs_message.c:240
 msgid "Collapse quoted text on double click"
 msgstr "雙擊折疊引言"
 
-#: src/prefs_message.c:249
+#: src/prefs_message.c:247
 msgid "Treat these characters as quotation marks: "
 msgstr "視此字元為引言標示:"
 
-#: src/prefs_message.c:355
+#: src/prefs_message.c:353
 msgid "Text Options"
 msgstr "字串選項"
 
-#: src/prefs_migration.c:95
+#: src/prefs_migration.c:50
+#, c-format
 msgid ""
 "Your Claws Mail configuration is from a newer version than the version which "
 "you are currently using.\n"
@@ -15686,100 +16137,100 @@ msgstr ""
 "\n"
 "你確認現在要離開嗎?"
 
-#: src/prefs_migration.c:104
+#: src/prefs_migration.c:59
 msgid "Configuration warning"
 msgstr "配置完成"
 
-#: src/prefs_msg_colors.c:147
+#: src/prefs_msg_colors.c:146
 msgid "Message view"
 msgstr "郵件檢視"
 
-#: src/prefs_msg_colors.c:154
+#: src/prefs_msg_colors.c:153
 msgid "Enable coloration of message text"
 msgstr "啟用郵件文字的著色功能"
 
-#: src/prefs_msg_colors.c:162
+#: src/prefs_msg_colors.c:161
 msgid "Quote"
 msgstr "引言"
 
-#: src/prefs_msg_colors.c:174
+#: src/prefs_msg_colors.c:173
 msgid "Cycle quote colors"
 msgstr "引言顏色循環"
 
-#: src/prefs_msg_colors.c:178
+#: src/prefs_msg_colors.c:177
 msgid "If there are more than 3 quote levels, the colors will be reused"
 msgstr "如果超過3層引言,則這些顏色將會被重複使用"
 
-#: src/prefs_msg_colors.c:184
+#: src/prefs_msg_colors.c:183
 msgid "1st Level"
 msgstr "第一層"
 
-#: src/prefs_msg_colors.c:190 src/prefs_msg_colors.c:216
-#: src/prefs_msg_colors.c:242
+#: src/prefs_msg_colors.c:189 src/prefs_msg_colors.c:214
+#: src/prefs_msg_colors.c:239
 msgid "Text"
 msgstr "文字"
 
-#: src/prefs_msg_colors.c:204
+#: src/prefs_msg_colors.c:202
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text"
 msgstr "為第一層文字挑選顏色"
 
-#: src/prefs_msg_colors.c:210
+#: src/prefs_msg_colors.c:208
 msgid "2nd Level"
 msgstr "第二層"
 
-#: src/prefs_msg_colors.c:230
+#: src/prefs_msg_colors.c:227
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text"
 msgstr "為第二層文字挑選顏色"
 
-#: src/prefs_msg_colors.c:236
+#: src/prefs_msg_colors.c:233
 msgid "3rd Level"
 msgstr "第三層"
 
-#: src/prefs_msg_colors.c:256
+#: src/prefs_msg_colors.c:252
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text"
 msgstr "為第三層文字挑選顏色"
 
-#: src/prefs_msg_colors.c:263
+#: src/prefs_msg_colors.c:259
 msgid "Enable coloration of text background"
 msgstr "曲用文字背景著色功能"
 
-#: src/prefs_msg_colors.c:279
+#: src/prefs_msg_colors.c:274
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text background"
 msgstr "為第一層文字背景挑選顏色"
 
-#: src/prefs_msg_colors.c:300
+#: src/prefs_msg_colors.c:294
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text background"
 msgstr "為第二層文字背景挑選顏色"
 
-#: src/prefs_msg_colors.c:321
+#: src/prefs_msg_colors.c:314
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text background"
 msgstr "為第三層文字背景挑選顏色"
 
-#: src/prefs_msg_colors.c:341
+#: src/prefs_msg_colors.c:333
 msgctxt "Tooltip"
 msgid "Pick color for links"
 msgstr "挑選連結的顏色"
 
-#: src/prefs_msg_colors.c:343
+#: src/prefs_msg_colors.c:335
 msgid "URI link"
 msgstr "URI連結"
 
-#: src/prefs_msg_colors.c:360
+#: src/prefs_msg_colors.c:351
 msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "挑選簽名的顏色"
 
-#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:365
+#: src/prefs_msg_colors.c:358 src/prefs_summaries.c:365
 msgid "Folder list"
 msgstr "資料夾清單"
 
-#: src/prefs_msg_colors.c:380
+#: src/prefs_msg_colors.c:370
 msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"
@@ -15787,89 +16238,92 @@ msgstr ""
 "挑選目的資料夾的顏色。在選項 '當移動或刪除郵件時立即執行' 被關閉時,目的資料"
 "夾將會被使用"
 
-#: src/prefs_msg_colors.c:384
+#: src/prefs_msg_colors.c:374
 msgid "Target folder"
 msgstr "目的資料夾"
 
-#: src/prefs_msg_colors.c:399
+#: src/prefs_msg_colors.c:388
 msgid "Pick color for folders containing new messages"
 msgstr "為包含新郵件的資料夾挑選顏色"
 
-#: src/prefs_msg_colors.c:401
+#: src/prefs_msg_colors.c:390
 msgid "Folder containing new messages"
 msgstr "包含新郵件的資料夾"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:428 src/prefs_msg_colors.c:459
+#: src/prefs_msg_colors.c:417 src/prefs_msg_colors.c:449
+#, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
 msgstr "為 '顏色 %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
+#: src/prefs_msg_colors.c:421 src/prefs_msg_colors.c:453
+#, c-format
 msgid "Set label for 'color %d'"
 msgstr "為 '顏色 %d' 設定標籤"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:592
+#: src/prefs_msg_colors.c:582
+#, c-format
 msgctxt "Dialog title"
 msgid "Pick color for 'color %d'"
 msgstr "為 '顏色 %d' 挑選顏色"
 
-#: src/prefs_msg_colors.c:600
+#: src/prefs_msg_colors.c:590
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text"
 msgstr "為第一層文字挑選顏色"
 
-#: src/prefs_msg_colors.c:603
+#: src/prefs_msg_colors.c:593
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text"
 msgstr "為第二層文字挑選顏色"
 
-#: src/prefs_msg_colors.c:606
+#: src/prefs_msg_colors.c:596
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text"
 msgstr "為第三層文字挑選顏色"
 
-#: src/prefs_msg_colors.c:609
+#: src/prefs_msg_colors.c:599
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text background"
 msgstr "為第一層文字背景挑選顏色"
 
-#: src/prefs_msg_colors.c:612
+#: src/prefs_msg_colors.c:602
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text background"
 msgstr "為第二層文字背景挑選顏色"
 
-#: src/prefs_msg_colors.c:615
+#: src/prefs_msg_colors.c:605
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text background"
 msgstr "為第三層文字背景挑選顏色"
 
-#: src/prefs_msg_colors.c:618
+#: src/prefs_msg_colors.c:608
 msgctxt "Dialog title"
 msgid "Pick color for links"
 msgstr "挑選連結的顏色"
 
-#: src/prefs_msg_colors.c:621
+#: src/prefs_msg_colors.c:611
 msgctxt "Dialog title"
 msgid "Pick color for target folder"
 msgstr "挑選目的資料夾的顏色"
 
-#: src/prefs_msg_colors.c:624
+#: src/prefs_msg_colors.c:614
 msgctxt "Dialog title"
 msgid "Pick color for signatures"
 msgstr "挑選簽名的顏色"
 
-#: src/prefs_msg_colors.c:627
+#: src/prefs_msg_colors.c:617
 msgctxt "Dialog title"
 msgid "Pick color for folder"
 msgstr "挑選資料夾的顏色"
 
-#: src/prefs_msg_colors.c:840
+#: src/prefs_msg_colors.c:831
 msgid "Colors"
 msgstr "顏色"
 
@@ -15949,25 +16403,25 @@ msgstr "更安全"
 
 #: src/prefs_other.c:544
 msgid "Faster"
-msgstr "更是"
+msgstr "更快"
 
 #: src/prefs_other.c:562
 msgid "Socket I/O timeout"
 msgstr "Socket I/O 超時"
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:583
 msgid "Ask before emptying trash"
 msgstr "清空回收桶前詢問"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:585
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr "手動進行過濾時,詢問要使用那一個帳號使用的過濾規則"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:590
 msgid "Use secure file deletion if possible"
 msgstr "如果可以,使用安全的檔案刪除"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:594
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -15975,7 +16429,7 @@ msgstr ""
 "如果可以,使用安全的檔案刪除\n"
 "('shred'程式是無效的)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:599
 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."
@@ -15983,19 +16437,19 @@ msgstr ""
 "使用'shred'程式,以隨機的方式在檔案刪除前覆寫檔案,這樣將使刪除變慢。請仔細閱"
 "讀'shred'的man page,以取得更詳細的警示說明"
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:603
 msgid "Synchronise offline folders as soon as possible"
 msgstr "儘快的同步離線資料夾"
 
-#: src/prefs_other.c:607
+#: src/prefs_other.c:606
 msgid "Master passphrase"
 msgstr "錯誤的密碼"
 
-#: src/prefs_other.c:610
+#: src/prefs_other.c:609
 msgid "Use a master passphrase"
 msgstr "請輸入密碼:"
 
-#: src/prefs_other.c:613
+#: src/prefs_other.c:612
 msgid ""
 "If checked, your saved account passwords will be protected by a master "
 "passphrase. If no master passphrase is set, you will be prompted to set one."
@@ -16003,11 +16457,11 @@ msgstr ""
 "如果勾選了此選項,你已儲存的帳密將會受到一個慣用詞的保護,如果沒有指定慣用"
 "詞,你將會被要求設定一個。"
 
-#: src/prefs_other.c:618
+#: src/prefs_other.c:617
 msgid "Change master passphrase"
 msgstr "請輸入密碼:"
 
-#: src/prefs_other.c:778
+#: src/prefs_other.c:777
 msgid "Miscellaneous"
 msgstr "雜項"
 
@@ -16031,55 +16485,56 @@ msgstr "自動檢查"
 msgid "Check for new mail every"
 msgstr "檢查新郵件頻率"
 
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:212
 msgid "Check for new mail on start-up"
 msgstr "啟動後檢查新郵件"
 
-#: src/prefs_receive.c:218
+#: src/prefs_receive.c:215
 msgid "Dialogs"
 msgstr "對話視窗"
 
-#: src/prefs_receive.c:220
+#: src/prefs_receive.c:217
 msgid "Show receive dialog"
 msgstr "顯示接收視窗"
 
-#: src/prefs_receive.c:230
+#: src/prefs_receive.c:227
 msgid "Only on manual receiving"
 msgstr "只在手動收信時"
 
-#: src/prefs_receive.c:241
+#: src/prefs_receive.c:238
 msgid "Close receive dialog when finished"
 msgstr "當結束時關閉接收視窗"
 
-#: src/prefs_receive.c:244
+#: src/prefs_receive.c:241
 msgid "Don't popup error dialog on receive error"
 msgstr "接收錯誤時不會彈出錯誤對話視窗"
 
-#: src/prefs_receive.c:247
+#: src/prefs_receive.c:244
 msgid "After receiving new mail"
 msgstr "在接收新郵件後"
 
-#: src/prefs_receive.c:249
+#: src/prefs_receive.c:246
 msgid "Go to Inbox"
 msgstr "前往收件夾"
 
-#: src/prefs_receive.c:251
+#: src/prefs_receive.c:248
 msgid "Update all local folders"
 msgstr "更新所有本地資料夾"
 
-#: src/prefs_receive.c:253
+#: src/prefs_receive.c:250
 msgid "Run command"
 msgstr "執行命令"
 
-#: src/prefs_receive.c:258
+#: src/prefs_receive.c:255
 msgid "after automatic check"
 msgstr "在自動檢查後"
 
-#: src/prefs_receive.c:260
+#: src/prefs_receive.c:257
 msgid "after manual check"
 msgstr "在手動檢查後"
 
-#: src/prefs_receive.c:268
+#: src/prefs_receive.c:265
+#, c-format
 msgid ""
 "Command to execute:\n"
 "(use %d as number of new mails)"
@@ -16087,224 +16542,228 @@ msgstr ""
 "執行的命令:\n"
 "(使用 %d 封新郵件)"
 
-#: src/prefs_receive.c:411 src/prefs_send.c:371
+#: src/prefs_receive.c:408 src/prefs_send.c:415
 msgid "Mail Handling"
 msgstr "郵件處理"
 
-#: src/prefs_receive.c:412
+#: src/prefs_receive.c:409
 msgid "Receiving"
 msgstr "接收"
 
-#: src/prefs_send.c:159
+#: src/prefs_send.c:172
 msgid "Save sent messages"
 msgstr "儲存已傳送的郵件"
 
-#: src/prefs_send.c:162
+#: src/prefs_send.c:175
 msgid "Never send Return Receipts"
 msgstr "不傳送回條"
 
-#: src/prefs_send.c:180
+#: src/prefs_send.c:193
 msgid "Confirm before sending queued messages"
 msgstr "傳送暫存郵件前需確認"
 
-#: src/prefs_send.c:183
+#: src/prefs_send.c:196
 msgid "Show send dialog"
 msgstr "顯示傳送對話視窗"
 
-#: src/prefs_send.c:186
+#: src/prefs_send.c:199
 msgid "Warn when Subject is empty"
 msgstr "主旨空白時提示警告"
 
-#: src/prefs_send.c:193
+#: src/prefs_send.c:205
+msgid "Warn when sending to more recipients than:"
+msgstr "發出警告!當附加檔案超過:"
+
+#: src/prefs_send.c:221
 msgid "Outgoing encoding"
 msgstr "外寄郵件編碼"
 
-#: src/prefs_send.c:218
+#: src/prefs_send.c:246
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgstr "如果選取'自動',則目前本地端的最佳化將被套用"
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:263
 msgid "7bit ASCII (US-ASCII)"
 msgstr "7位元  ASCII (US-ASCII)"
 
-#: src/prefs_send.c:236
+#: src/prefs_send.c:264
 msgid "Unicode (UTF-8)"
 msgstr "萬國碼 (UTF-8)"
 
-#: src/prefs_send.c:238
+#: src/prefs_send.c:266
 msgid "Western European (ISO-8859-1)"
 msgstr "西歐 (ISO-8859-1)"
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:267
 msgid "Western European (ISO-8859-15)"
 msgstr "西歐 (ISO-8859-15)"
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:269
 msgid "Central European (ISO-8859-2)"
 msgstr "中歐 (ISO-8859-2)"
 
-#: src/prefs_send.c:243
+#: src/prefs_send.c:271
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:272
 msgid "Baltic (ISO-8859-4)"
 msgstr "波羅的海 (ISO-8859-4)"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:274
 msgid "Greek (ISO-8859-7)"
 msgstr "希臘 (ISO-8859-7)"
 
-#: src/prefs_send.c:248
+#: src/prefs_send.c:276
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯萊 (ISO-8859-8)"
 
-#: src/prefs_send.c:249
+#: src/prefs_send.c:277
 msgid "Hebrew (Windows-1255)"
 msgstr "希伯萊 (Windows-1255)"
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:279
 msgid "Arabic (ISO-8859-6)"
 msgstr "阿拉伯 (ISO-8859-6)"
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:280
 msgid "Arabic (Windows-1256)"
 msgstr "阿拉伯 (Windows-1256)"
 
-#: src/prefs_send.c:254
+#: src/prefs_send.c:282
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其 (ISO-8859-9)"
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:284
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "西里爾 (ISO-8859-5)"
 
-#: src/prefs_send.c:257
+#: src/prefs_send.c:285
 msgid "Cyrillic (KOI8-R)"
 msgstr "西里爾 (KOI8-R)"
 
-#: src/prefs_send.c:258
+#: src/prefs_send.c:286
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr "西里爾 (X-MAC-CYRILLIC)"
 
-#: src/prefs_send.c:259
+#: src/prefs_send.c:287
 msgid "Cyrillic (KOI8-U)"
 msgstr "西里爾 (KOI8-U)"
 
-#: src/prefs_send.c:260
+#: src/prefs_send.c:288
 msgid "Cyrillic (Windows-1251)"
 msgstr "西里爾 (Windows-1251)"
 
-#: src/prefs_send.c:262
+#: src/prefs_send.c:290
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日文(ISO-2022-JP)"
 
-#: src/prefs_send.c:264
+#: src/prefs_send.c:292
 msgid "Japanese (EUC-JP)"
 msgstr "日文 (EUC-JP)"
 
-#: src/prefs_send.c:265
+#: src/prefs_send.c:293
 msgid "Japanese (Shift_JIS)"
 msgstr "日文 (Shift_JIS)"
 
-#: src/prefs_send.c:268
+#: src/prefs_send.c:296
 msgid "Simplified Chinese (GB18030)"
 msgstr "簡體中文 (GB18030)"
 
-#: src/prefs_send.c:269
+#: src/prefs_send.c:297
 msgid "Simplified Chinese (GB2312)"
 msgstr "簡體中文 (GB2312)"
 
-#: src/prefs_send.c:270
+#: src/prefs_send.c:298
 msgid "Simplified Chinese (GBK)"
 msgstr "簡體中文 (GBK)"
 
-#: src/prefs_send.c:271
+#: src/prefs_send.c:299
 msgid "Traditional Chinese (Big5)"
 msgstr "繁體中文 (Big5)"
 
-#: src/prefs_send.c:273
+#: src/prefs_send.c:301
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁體中文 (EUC-TW)"
 
-#: src/prefs_send.c:274
+#: src/prefs_send.c:302
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:305
 msgid "Korean (EUC-KR)"
 msgstr "韓文 (EUC-KR)"
 
-#: src/prefs_send.c:279
+#: src/prefs_send.c:307
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_send.c:280
+#: src/prefs_send.c:308
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_send.c:284
+#: src/prefs_send.c:312
 msgid "Transfer encoding"
 msgstr "傳送編號"
 
-#: src/prefs_send.c:295
+#: src/prefs_send.c:323
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgstr "當郵件內容包含非ASCII編碼字元時需指定傳送加碼方式"
 
-#: src/prefs_send.c:372 src/send_message.c:501 src/send_message.c:505
+#: src/prefs_send.c:416 src/send_message.c:501 src/send_message.c:505
 #: src/send_message.c:510
 msgid "Sending"
 msgstr "傳送"
 
-#: src/prefs_spelling.c:81
+#: src/prefs_spelling.c:80
 msgid "Pick color for misspelled word"
 msgstr "為拼錯的單字挑選顏色"
 
-#: src/prefs_spelling.c:129
+#: src/prefs_spelling.c:128
 msgid "Enable spell checker"
 msgstr "啟用拼字檢查"
 
-#: src/prefs_spelling.c:134
+#: src/prefs_spelling.c:133
 msgid "Enable alternate dictionary"
 msgstr "啟用字典交互查詢"
 
-#: src/prefs_spelling.c:139
+#: src/prefs_spelling.c:138
 msgid "Faster switching with last used dictionary"
 msgstr "採用最後使用的字典以加速切換"
 
-#: src/prefs_spelling.c:141
+#: src/prefs_spelling.c:140
 msgid "Automatic spell checking"
 msgstr "自動拼字檢查"
 
-#: src/prefs_spelling.c:149
+#: src/prefs_spelling.c:148
 msgid "Re-check message when changing dictionary"
 msgstr "當改變字典時,重新檢查郵件"
 
-#: src/prefs_spelling.c:153
+#: src/prefs_spelling.c:152
 msgid "Dictionary"
 msgstr "字典"
 
-#: src/prefs_spelling.c:190
+#: src/prefs_spelling.c:187
 msgid "Check with both dictionaries"
 msgstr "用兩部字典進行檢查"
 
-#: src/prefs_spelling.c:197
+#: src/prefs_spelling.c:194
 msgid "Get more dictionaries..."
 msgstr "取得更多的字典..."
 
-#: src/prefs_spelling.c:207
+#: src/prefs_spelling.c:204
 msgid "Misspelled word color"
 msgstr "錯字的顏色"
 
-#: src/prefs_spelling.c:220
+#: src/prefs_spelling.c:216
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "為錯字挑選顏色,要使用黑色的底線嗎?"
 
-#: src/prefs_spelling.c:337
+#: src/prefs_spelling.c:333
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
@@ -16385,7 +16844,7 @@ msgid "the time zone or name or abbreviation"
 msgstr "時區或名稱或縮寫"
 
 #: src/prefs_summaries.c:199 src/prefs_summaries.c:247
-#: src/prefs_summaries.c:567
+#: src/prefs_summaries.c:565
 msgid "Date format"
 msgstr "日期格式"
 
@@ -16417,131 +16876,131 @@ msgstr "啟動時開啟最後一次開啟的資料夾"
 msgid "Abbreviate newsgroup names longer than"
 msgstr "新聞群組名稱超過"
 
-#: src/prefs_summaries.c:409
+#: src/prefs_summaries.c:408
 msgid "letters"
 msgstr "字元時縮寫"
 
-#: src/prefs_summaries.c:427
+#: src/prefs_summaries.c:426
 msgid "Message list"
 msgstr "郵件清單"
 
-#: src/prefs_summaries.c:433
+#: src/prefs_summaries.c:432
 msgid "Sort new folders by"
 msgstr "新資料夾排序以"
 
-#: src/prefs_summaries.c:441 src/prefs_summary_column.c:86
+#: src/prefs_summaries.c:440 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr "數字"
 
-#: src/prefs_summaries.c:444
+#: src/prefs_summaries.c:443
 msgid "Thread date"
 msgstr "根據串列日期"
 
-#: src/prefs_summaries.c:455
+#: src/prefs_summaries.c:454
 msgid "Don't sort"
 msgstr "不排序"
 
-#: src/prefs_summaries.c:472
+#: src/prefs_summaries.c:471
 msgid "Set default selection when entering a folder"
 msgstr "設定進入資料夾時的預設選項"
 
-#: src/prefs_summaries.c:485
+#: src/prefs_summaries.c:484
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "顯示 \"無未讀或新郵件\" 對話框"
 
-#: src/prefs_summaries.c:495
+#: src/prefs_summaries.c:494
 msgid "Assume 'Yes'"
 msgstr "假設 'Yes'"
 
-#: src/prefs_summaries.c:496
+#: src/prefs_summaries.c:495
 msgid "Assume 'No'"
 msgstr "假設 'No'"
 
-#: src/prefs_summaries.c:501
+#: src/prefs_summaries.c:500
 msgid "Open message when selected"
 msgstr "開啟選擇的郵件"
 
-#: src/prefs_summaries.c:506
+#: src/prefs_summaries.c:505
 msgid "When opening a folder"
 msgstr "當開啟一個資料夾"
 
-#: src/prefs_summaries.c:508
+#: src/prefs_summaries.c:507
 msgid "When displaying search results"
 msgstr "當顯示搜尋結果時"
 
-#: src/prefs_summaries.c:510
+#: src/prefs_summaries.c:509
 msgid "When selecting next or previous message using shortcuts"
 msgstr "當選擇下一個或上一個郵件時使用捷徑"
 
-#: src/prefs_summaries.c:512
+#: src/prefs_summaries.c:511
 msgid "When deleting or moving messages"
 msgstr "當刪除或移動郵件"
 
-#: src/prefs_summaries.c:514
+#: src/prefs_summaries.c:513
 msgid "When using directional keys"
 msgstr "當使用方向鍵時"
 
-#: src/prefs_summaries.c:518
+#: src/prefs_summaries.c:517
 msgid "Thread using subject in addition to standard headers"
 msgstr "除了標準標頭之外,執行緒將使用主旨"
 
-#: src/prefs_summaries.c:522
+#: src/prefs_summaries.c:521
 msgid "Execute immediately when moving or deleting messages"
 msgstr "當移除或刪除郵件時,立即執行"
 
-#: src/prefs_summaries.c:524
+#: src/prefs_summaries.c:523
 msgid ""
 "Defers moving, copying and deleting of messages until you choose 'Tools/"
 "Execute'"
 msgstr "延後移動、複製和刪除郵件,直到你選擇 '工具/執行'"
 
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:526
 msgid "Mark message as read"
 msgstr "標示為已讀"
 
-#: src/prefs_summaries.c:530
+#: src/prefs_summaries.c:529
 msgid "when selected, after"
 msgstr "在選擇後過了"
 
-#: src/prefs_summaries.c:550
+#: src/prefs_summaries.c:548
 msgid "only when opened in a new window, or replied to"
 msgstr "只有當開啟了新視窗或回覆"
 
-#: src/prefs_summaries.c:557
+#: src/prefs_summaries.c:555
 msgid "Display sender using address book"
 msgstr "以通訊錄顯示寄件者"
 
-#: src/prefs_summaries.c:561
+#: src/prefs_summaries.c:559
 msgid "Show tooltips"
 msgstr "顯示工具提示"
 
-#: src/prefs_summaries.c:587
+#: src/prefs_summaries.c:584
 msgid "Date format help"
 msgstr "日期格式"
 
-#: src/prefs_summaries.c:605
+#: src/prefs_summaries.c:602
 msgid "Confirm before marking all messages in a folder as read"
 msgstr "將資料夾中所有的郵件標示為已讀時,需經過確認"
 
-#: src/prefs_summaries.c:608
+#: src/prefs_summaries.c:605
 msgid "Translate header names"
 msgstr "轉換標頭名稱"
 
-#: src/prefs_summaries.c:610
+#: src/prefs_summaries.c:607
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
 msgstr "標準標頭的顯示 (像是 'From:', 'Subject:') 將會 翻譯為你的語言"
 
-#: src/prefs_summaries.c:769
+#: src/prefs_summaries.c:766
 msgid "Summaries"
 msgstr "摘要"
 
-#: src/prefs_summary_column.c:226
+#: src/prefs_summary_column.c:225
 msgid "Message list columns configuration"
 msgstr "配置郵件清單列"
 
-#: src/prefs_summary_column.c:243
+#: src/prefs_summary_column.c:242
 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."
@@ -16573,7 +17032,7 @@ msgstr "最後一封清單中的郵件"
 msgid "first email in the list"
 msgstr "第一封清單中的郵件"
 
-#: src/prefs_summary_open.c:184
+#: src/prefs_summary_open.c:185
 msgid " Selection when entering a folder"
 msgstr " 當進入資料夾後選取"
 
@@ -16581,7 +17040,7 @@ msgstr " 當進入資料夾後選取"
 msgid "Possible selections"
 msgstr "可能的選擇"
 
-#: src/prefs_summary_open.c:266
+#: src/prefs_summary_open.c:265
 msgid "Selection on folder opening"
 msgstr "當開啟資料夾後選取"
 
@@ -16595,128 +17054,131 @@ msgid ""
 "account."
 msgstr "從郵件標頭覆寫新郵件帳號,這樣不會改變新郵件的帳號"
 
-#: src/prefs_template.c:309
+#: src/prefs_template.c:308
 msgid "Append the new template above to the list"
 msgstr "將新樣版加在清單的上方"
 
-#: src/prefs_template.c:318
+#: src/prefs_template.c:317
 msgid "Replace the selected template in list with the template above"
 msgstr "用上方的樣版將清單內所選擇的樣版置換"
 
-#: src/prefs_template.c:328
+#: src/prefs_template.c:327
 msgid "Delete the selected template from the list"
 msgstr "從清單中把選擇的板版刪除"
 
-#: src/prefs_template.c:346
+#: src/prefs_template.c:345
 msgid "Show information on configuring templates"
 msgstr "顯示所有設定的樣版資訊"
 
-#: src/prefs_template.c:370
+#: src/prefs_template.c:369
 msgid "Move the selected template to the top"
 msgstr "將選擇的樣版移至最上方"
 
-#: src/prefs_template.c:380
+#: src/prefs_template.c:379
 msgid "Move the selected template up"
 msgstr "將選擇的樣版上移"
 
-#: src/prefs_template.c:388
+#: src/prefs_template.c:387
 msgid "Move the selected template down"
 msgstr "將選擇的樣版下移"
 
-#: src/prefs_template.c:398
+#: src/prefs_template.c:397
 msgid "Move the selected template to the bottom"
 msgstr "移動已選擇的樣版到底部"
 
-#: src/prefs_template.c:414
+#: src/prefs_template.c:413
 msgid "Template configuration"
 msgstr "樣版設定"
 
-#: src/prefs_template.c:602
+#: src/prefs_template.c:601
 msgid "Templates list not saved"
 msgstr "樣版尚未儲存"
 
-#: src/prefs_template.c:603
+#: src/prefs_template.c:602
 msgid "The templates list has been modified. Close anyway?"
 msgstr "樣版清單已變更,確認關閉嗎?"
 
-#: src/prefs_template.c:758
+#: src/prefs_template.c:759
 msgid "The template's name is not set."
 msgstr "樣版名稱尚未設定"
 
-#: src/prefs_template.c:801
+#: src/prefs_template.c:802
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "樣版的\"寄件者\"欄位包含了無效的郵件地址"
 
-#: src/prefs_template.c:807
+#: src/prefs_template.c:808
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "樣版的\"收件者\"欄位包含了無效的郵件地址"
 
-#: src/prefs_template.c:813
+#: src/prefs_template.c:814
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "樣版的\"副本\"欄位包含了無效的郵件地址"
 
-#: src/prefs_template.c:819
+#: src/prefs_template.c:820
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "樣版的\"副本\"欄位包含了無效的郵件地址"
 
-#: src/prefs_template.c:825
+#: src/prefs_template.c:826
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr "樣版的\"回覆給\"欄位包含了無效的郵件地址"
 
-#: src/prefs_template.c:831
+#: src/prefs_template.c:832
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "樣版的\"主旨\"欄位無效"
 
-#: src/prefs_template.c:902
+#: src/prefs_template.c:903
 msgid "Delete template"
 msgstr "刪除樣版"
 
-#: src/prefs_template.c:903
+#: src/prefs_template.c:904
 msgid "Do you really want to delete this template?"
 msgstr "確定要刪除這個樣版嗎?"
 
-#: src/prefs_template.c:915
+#: src/prefs_template.c:916
 msgid "Delete all templates"
 msgstr "刪除所有的樣版嗎?"
 
-#: src/prefs_template.c:916
+#: src/prefs_template.c:917
 msgid "Do you really want to delete all the templates?"
 msgstr "確定要刪除所有樣版嗎?"
 
-#: src/prefs_template.c:1231
+#: src/prefs_template.c:1232
 msgid "Current templates"
 msgstr "現有的樣版"
 
-#: src/prefs_template.c:1259
+#: src/prefs_template.c:1260
 msgid "Template"
 msgstr "樣版"
 
-#: src/prefs_themes.c:368 src/prefs_themes.c:804
+#: src/prefs_themes.c:400 src/prefs_themes.c:841
 msgid "Default internal theme"
 msgstr "預設內部主題"
 
-#: src/prefs_themes.c:390
+#: src/prefs_themes.c:422
 msgid "Themes"
 msgstr "佈景主題"
 
-#: src/prefs_themes.c:464
+#: src/prefs_themes.c:501
 msgid "Only root can remove system themes"
 msgstr "只有 root 權限才能移除系統佈景主題"
 
-#: src/prefs_themes.c:467
+#: src/prefs_themes.c:504
+#, c-format
 msgid "Remove system theme '%s'"
 msgstr "移除系統佈景主題 '%s'"
 
-#: src/prefs_themes.c:470
+#: src/prefs_themes.c:507
+#, c-format
 msgid "Remove theme '%s'"
 msgstr "移除佈景主題 '%s'"
 
-#: src/prefs_themes.c:476
+#: src/prefs_themes.c:513
 msgid "Are you sure you want to remove this theme?"
 msgstr "你確認要移除這個佈景主題嗎?"
 
-#: src/prefs_themes.c:486
+#: src/prefs_themes.c:523
+#, c-format
 msgid ""
 "File %s failed\n"
 "while removing theme."
@@ -16724,23 +17186,24 @@ msgstr ""
 " 檔案 %s 失敗\n"
 "當移除佈景主題時"
 
-#: src/prefs_themes.c:490
+#: src/prefs_themes.c:527
 msgid "Removing theme directory failed."
 msgstr "移除佈景主題路徑失敗"
 
-#: src/prefs_themes.c:493
+#: src/prefs_themes.c:530
 msgid "Theme removed successfully"
 msgstr "佈景主題移除成功"
 
-#: src/prefs_themes.c:513
+#: src/prefs_themes.c:550
 msgid "Select theme folder"
 msgstr "選擇佈景主題資料夾"
 
-#: src/prefs_themes.c:528
+#: src/prefs_themes.c:565
+#, c-format
 msgid "Install theme '%s'"
 msgstr "安裝佈景主題 '%s'"
 
-#: src/prefs_themes.c:531
+#: src/prefs_themes.c:568
 msgid ""
 "This folder doesn't seem to be a theme folder.\n"
 "Install anyway?"
@@ -16748,15 +17211,15 @@ msgstr ""
 "此資料夾似乎不是一個佈景主題資料夾\n"
 "仍然要安裝嗎?"
 
-#: src/prefs_themes.c:538
+#: src/prefs_themes.c:575
 msgid "Do you want to install theme for all users?"
 msgstr "你希望為所有的使用者安裝佈景主題嗎?"
 
-#: src/prefs_themes.c:558
+#: src/prefs_themes.c:595
 msgid "Theme exists"
 msgstr "佈景主題已經存在"
 
-#: src/prefs_themes.c:559
+#: src/prefs_themes.c:596
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -16768,23 +17231,26 @@ msgstr ""
 "\n"
 "你希望覆蓋它嗎?"
 
-#: src/prefs_themes.c:565
+#: src/prefs_themes.c:602
+#, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "無法在 %s 內刪除舊佈景主題"
 
-#: src/prefs_themes.c:573
+#: src/prefs_themes.c:610
+#, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "無法建立目的路徑 %s"
 
-#: src/prefs_themes.c:586
+#: src/prefs_themes.c:623
 msgid "Theme installed successfully."
 msgstr "佈景主題已經成功安裝"
 
-#: src/prefs_themes.c:593
+#: src/prefs_themes.c:630
 msgid "Failed installing theme"
 msgstr "佈景主題安裝失敗"
 
-#: src/prefs_themes.c:596
+#: src/prefs_themes.c:633
+#, c-format
 msgid ""
 "File %s failed\n"
 "while installing theme."
@@ -16792,67 +17258,70 @@ msgstr ""
 "檔案 %s 失敗\n"
 "當安裝佈景主題時"
 
-#: src/prefs_themes.c:766
+#: src/prefs_themes.c:803
+#, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d 個有效的佈景主題 (%d 個使用者的, %d 個系統的, 1 個內鍵的)"
 
-#: src/prefs_themes.c:807
+#: src/prefs_themes.c:844
+#, c-format
 msgid "Internal theme has %d icons"
 msgstr "內鍵的佈景主題有 %d  圖示"
 
-#: src/prefs_themes.c:813
+#: src/prefs_themes.c:850
 msgid "No info file available for this theme"
 msgstr "這個佈景主題沒有有效的資訊檔案"
 
-#: src/prefs_themes.c:831
+#: src/prefs_themes.c:868
 msgid "Error: couldn't get theme status"
 msgstr "錯誤:無法取得佈景主題狀態"
 
-#: src/prefs_themes.c:861
+#: src/prefs_themes.c:898
+#, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d 個檔案 (%d 個圖示), 大小: %s"
 
-#: src/prefs_themes.c:919
+#: src/prefs_themes.c:956
 msgid "Selector"
 msgstr "選擇器"
 
-#: src/prefs_themes.c:930
+#: src/prefs_themes.c:967
 msgid "Install new..."
 msgstr "安裝..."
 
-#: src/prefs_themes.c:935
+#: src/prefs_themes.c:972
 msgid "Get more..."
 msgstr "更多..."
 
-#: src/prefs_themes.c:946
+#: src/prefs_themes.c:983
 msgid "Information"
 msgstr "資訊"
 
-#: src/prefs_themes.c:960
+#: src/prefs_themes.c:997
 msgid "Author: "
 msgstr "作者:"
 
-#: src/prefs_themes.c:968
+#: src/prefs_themes.c:1005
 msgid "URL:"
 msgstr "URL:"
 
-#: src/prefs_themes.c:1010
+#: src/prefs_themes.c:1047
 msgid "Preview"
 msgstr "預覽"
 
-#: src/prefs_themes.c:1066
+#: src/prefs_themes.c:1103
 msgid "SVG rendering"
 msgstr "SVG 渲染"
 
-#: src/prefs_themes.c:1073
+#: src/prefs_themes.c:1110
 msgid "Enable alpha channel"
 msgstr "啟用alpha頻道"
 
-#: src/prefs_themes.c:1074
+#: src/prefs_themes.c:1111
 msgid "Force scaling"
 msgstr "強制比例"
 
-#: src/prefs_themes.c:1080
+#: src/prefs_themes.c:1117
 msgid "Pixels per inch (PPI)"
 msgstr "每英吋的點數(PPI)"
 
@@ -16888,7 +17357,7 @@ msgstr "內部功能"
 msgid "User Action"
 msgstr "自行動作"
 
-#: src/prefs_toolbar.c:958 src/toolbar.c:277
+#: src/prefs_toolbar.c:958 src/toolbar.c:279
 msgid "Separator"
 msgstr "間隔器"
 
@@ -16956,7 +17425,7 @@ msgstr "自動縮排"
 msgid "Wrap text at"
 msgstr "換行字串於"
 
-#: src/prefs_wrapping.c:154
+#: src/prefs_wrapping.c:153
 msgid "Wrapping"
 msgstr "換行"
 
@@ -16968,27 +17437,28 @@ msgstr "預覽列印"
 msgid "First page"
 msgstr "第一頁"
 
-#: src/printing.c:490
+#: src/printing.c:489
 msgid "Last page"
 msgstr "最後一頁"
 
-#: src/printing.c:496
+#: src/printing.c:495
 msgid "Zoom 100%"
 msgstr "縮放 100%"
 
-#: src/printing.c:498
+#: src/printing.c:497
 msgid "Zoom fit"
 msgstr "縮放至滿版"
 
-#: src/printing.c:500
+#: src/printing.c:499
 msgid "Zoom in"
 msgstr "放大"
 
-#: src/printing.c:502
+#: src/printing.c:501
 msgid "Zoom out"
 msgstr "縮小"
 
-#: src/printing.c:701
+#: src/printing.c:700
+#, c-format
 msgid "Page %d"
 msgstr "第 %d 頁"
 
@@ -17008,43 +17478,45 @@ msgstr "[BASE64編碼錯誤]\n"
 msgid "Already trying to send."
 msgstr "已嘗試傳送"
 
-#: src/procmsg.c:1558 src/procmsg.c:1618
+#: src/procmsg.c:1558 src/procmsg.c:1619
+#, c-format
 msgid "Couldn't open file %s."
 msgstr "無法開啟檔案 %s"
 
-#: src/procmsg.c:1628
+#: src/procmsg.c:1629
 msgid "Queued message header is broken."
 msgstr "暫存的郵件標頭已損毀"
 
-#: src/procmsg.c:1648
+#: src/procmsg.c:1649
 msgid "An error happened during SMTP session."
 msgstr "SMTP傳送過程中發生錯誤"
 
-#: src/procmsg.c:1662
+#: src/procmsg.c:1663
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr "找不到已指定的帳號進行郵件傳送,而且在 SMTP 通信時 發生錯誤"
 
-#: src/procmsg.c:1670
+#: src/procmsg.c:1671
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr "無法偵測傳送的資訊,可能是因為Claws Mail無法產生郵件 "
 
-#: src/procmsg.c:1693
+#: src/procmsg.c:1694
 msgid "Couldn't create temporary file for news sending."
 msgstr "無法為新傳送郵件建立暫存檔案"
 
-#: src/procmsg.c:1706
+#: src/procmsg.c:1707
 msgid "Error when writing temporary file for news sending."
 msgstr "為新傳送郵件建立暫存檔案時發生錯誤"
 
-#: src/procmsg.c:1720
+#: src/procmsg.c:1721
+#, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "當發出郵件至 %s 時,發生錯誤"
 
-#: src/procmsg.c:2272
+#: src/procmsg.c:2273
 msgid "Filtering messages...\n"
 msgstr "過濾郵件...\n"
 
@@ -17291,55 +17763,56 @@ msgstr "可以使用以下的符號和命令:"
 msgid "Use template when composing new messages"
 msgstr "寄新郵件時使用樣版"
 
-#: src/quote_fmt.c:198
+#: src/quote_fmt.c:197
 msgid ""
 "Override From header. This doesn't change the account used to compose the "
 "new message."
 msgstr "覆寫寄件人標頭。此功能不能改變用來寄新郵件的帳號  "
 
-#: src/quote_fmt.c:300
+#: src/quote_fmt.c:297
 msgid "Use template when replying to messages"
 msgstr "當回覆時使用樣版"
 
-#: src/quote_fmt.c:324
+#: src/quote_fmt.c:320
 msgid "Override From header. This doesn't change the account used to reply."
 msgstr "覆寫寄件人標頭。此功能不能改變用來回覆郵件的帳號 "
 
-#: src/quote_fmt.c:335 src/quote_fmt.c:465
+#: src/quote_fmt.c:331 src/quote_fmt.c:459
 msgid "Quotation mark"
 msgstr "引言標示"
 
-#: src/quote_fmt.c:430
+#: src/quote_fmt.c:425
 msgid "Use template when forwarding messages"
 msgstr "轉寄郵件時使用樣版"
 
-#: src/quote_fmt.c:454
+#: src/quote_fmt.c:448
 msgid "Override From header. This doesn't change the account used to forward."
 msgstr "覆寫寄件者標頭。這個動作不會改變使用的轉寄帳號"
 
-#: src/quote_fmt.c:546
+#: src/quote_fmt.c:539
 msgid "Defaults"
 msgstr "預設值"
 
-#: src/quote_fmt.c:564
+#: src/quote_fmt.c:557
 msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
 "address."
 msgstr "此 \"新郵件\" 樣版的 \"寄件者\" 欄位包含了無效的郵件地地"
 
-#: src/quote_fmt.c:567
+#: src/quote_fmt.c:560
 msgid "The \"Subject\" field of the \"New message\" template is invalid."
 msgstr "此 \"新郵件\" 樣版的 \"主旨\" 欄位是無效的"
 
-#: src/quote_fmt.c:584
+#: src/quote_fmt.c:577
 msgid "The \"Quotation mark\" field of the \"Reply\" template is invalid."
 msgstr "此 \"回覆\" 樣版的 \"引言標示\" 欄位是無效的"
 
-#: src/quote_fmt.c:604
+#: src/quote_fmt.c:597
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
 msgstr "此 \"轉寄\" 樣版的 \"引言標示\" 欄位是無效的"
 
 #: src/quote_fmt_parse.y:541
+#, c-format
 msgid "Enter text to replace '%s'"
 msgstr "輸入文字以覆蓋 '%s'"
 
@@ -17348,14 +17821,17 @@ msgid "Enter variable"
 msgstr "輸入變數"
 
 #: src/send_message.c:152
+#, c-format
 msgid "Sending message using command: %s\n"
 msgstr "使用此命令傳送郵件: %s\n"
 
 #: src/send_message.c:166
+#, c-format
 msgid "Couldn't execute command: %s"
 msgstr "不能執行此命令: %s"
 
 #: src/send_message.c:202
+#, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "當執行此命令時發生錯誤: %s"
 
@@ -17372,6 +17848,7 @@ msgid "POP before SMTP"
 msgstr "在SMTP之前POP"
 
 #: src/send_message.c:363
+#, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "帳號'%s':連線到SMTP伺服器: %s:%d..."
 
@@ -17412,6 +17889,7 @@ msgid "Quitting..."
 msgstr "離開..."
 
 #: src/send_message.c:542
+#, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "傳送郵件 (%d / %d 位元)"
 
@@ -17424,6 +17902,7 @@ msgid "Error occurred while sending the message."
 msgstr "在傳送郵件時發生錯誤"
 
 #: src/send_message.c:667
+#, c-format
 msgid ""
 "Error occurred while sending the message:\n"
 "%s"
@@ -17452,6 +17931,7 @@ msgid "Source of the message"
 msgstr "郵件的來源"
 
 #: src/sourcewindow.c:159
+#, c-format
 msgid "%s - Source"
 msgstr "%s - 來源"
 
@@ -17459,11 +17939,11 @@ msgstr "%s - 來源"
 msgid "Saved SSL/TLS certificates"
 msgstr "儲存 SSL/TLS 認證"
 
-#: src/ssl_manager.c:436
+#: src/ssl_manager.c:410
 msgid "Delete certificate"
 msgstr "刪除認證"
 
-#: src/ssl_manager.c:437
+#: src/ssl_manager.c:411
 msgid "Do you really want to delete this certificate?"
 msgstr "你確定要刪除這個認證嗎?"
 
@@ -17491,7 +17971,8 @@ msgstr "條件:"
 msgid "Find _all"
 msgstr "尋找全部(_a)"
 
-#: src/summary_search.c:751 src/summaryview.c:1089 src/summaryview.c:1351
+#: src/summary_search.c:751 src/summaryview.c:1090 src/summaryview.c:1352
+#, c-format
 msgid "Searching in %s... \n"
 msgstr "在%s內搜尋...\n"
 
@@ -17503,264 +17984,286 @@ msgstr "已到達清單的開頭,從結尾繼續嗎?"
 msgid "End of list reached; continue from beginning?"
 msgstr "已到達清單的結尾,從開頭繼續嗎?"
 
-#: src/summaryview.c:431
+#: src/summaryview.c:432
 msgid "Create _filter rule"
 msgstr "建立過濾規則(_f)"
 
-#: src/summaryview.c:559
+#: src/summaryview.c:560
 msgid "Toggle quick search bar"
 msgstr "釘住快速搜尋列"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:597
 msgid "Toggle multiple selection"
 msgstr "釘住多重選擇"
 
-#: src/summaryview.c:1279
+#: src/summaryview.c:1280
 msgid "Process mark"
 msgstr "進行標示"
 
-#: src/summaryview.c:1280
+#: src/summaryview.c:1281
 msgid "Some marks are left. Process them?"
 msgstr "有一些標示已留下,要進行嗎?"
 
-#: src/summaryview.c:1330
+#: src/summaryview.c:1331
+#, c-format
 msgid "Scanning folder (%s)..."
 msgstr "掃描資料夾 (%s)..."
 
-#: src/summaryview.c:1868 src/summaryview.c:1916
+#: src/summaryview.c:1883 src/summaryview.c:1931
 msgid "No more unread messages"
 msgstr "沒有更多的未讀郵件"
 
-#: src/summaryview.c:1869
+#: src/summaryview.c:1884
 msgid "No unread message found. Search from the end?"
 msgstr "找不到未讀郵件,從結尾開始搜尋嗎?"
 
-#: src/summaryview.c:1881 src/summaryview.c:1929 src/summaryview.c:1966
-#: src/summaryview.c:2014 src/summaryview.c:2081
+#: src/summaryview.c:1896 src/summaryview.c:1944 src/summaryview.c:1981
+#: src/summaryview.c:2029 src/summaryview.c:2096
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr "內部錯誤:無法預期的 prefs_common.next_unread_msg_dialog 數值\n"
 
-#: src/summaryview.c:1893
+#: src/summaryview.c:1908
 msgid "No unread messages."
 msgstr "沒有未讀郵件"
 
-#: src/summaryview.c:1917
+#: src/summaryview.c:1932
 msgid "No unread message found. Go to next folder?"
 msgstr "找不到未讀的郵件,到下一個資料夾嗎?"
 
-#: src/summaryview.c:1953 src/summaryview.c:2001
+#: src/summaryview.c:1968 src/summaryview.c:2016
 msgid "No more new messages"
 msgstr "沒有新郵件"
 
-#: src/summaryview.c:1954
+#: src/summaryview.c:1969
 msgid "No new message found. Search from the end?"
 msgstr "找不到新郵件,從結尾開始搜尋嗎?"
 
-#: src/summaryview.c:1978
+#: src/summaryview.c:1993
 msgid "No new messages."
 msgstr "沒有新郵件"
 
-#: src/summaryview.c:2002
+#: src/summaryview.c:2017
 msgid "No new message found. Go to next folder?"
 msgstr "找不到新郵件,到下一個資料夾嗎?"
 
-#: src/summaryview.c:2035 src/summaryview.c:2068
+#: src/summaryview.c:2050 src/summaryview.c:2083
 msgid "No more marked messages"
 msgstr "沒有更多已標示的郵件"
 
-#: src/summaryview.c:2036
+#: src/summaryview.c:2051
 msgid "No marked message found. Search from the end?"
 msgstr "找不到已標示郵件,從結尾再次搜尋?"
 
-#: src/summaryview.c:2045
+#: src/summaryview.c:2060
 msgid "No marked messages."
 msgstr "沒有已標示的郵件"
 
-#: src/summaryview.c:2069
+#: src/summaryview.c:2084
 msgid "No marked message found. Go to next folder?"
 msgstr "找不到已標示的郵件,到下一次資料夾嗎?"
 
-#: src/summaryview.c:2102 src/summaryview.c:2131
+#: src/summaryview.c:2117 src/summaryview.c:2146
 msgid "No more labeled messages"
 msgstr "沒有已貼標籤的郵件"
 
-#: src/summaryview.c:2103
+#: src/summaryview.c:2118
 msgid "No labeled message found. Search from the end?"
 msgstr "找不到已貼標籤的郵件,到下一次資料夾嗎?"
 
-#: src/summaryview.c:2112 src/summaryview.c:2145
+#: src/summaryview.c:2127 src/summaryview.c:2160
 msgid "No labeled messages."
 msgstr "沒有已貼標籤的郵件"
 
-#: src/summaryview.c:2132
+#: src/summaryview.c:2147
 msgid "No labeled message found. Search from the beginning?"
 msgstr "找不到已貼標籤的郵件,從開頭繼重新搜尋嗎?"
 
-#: src/summaryview.c:2449
+#: src/summaryview.c:2464
 msgid "Attracting messages by subject..."
 msgstr "從主旨取出郵件..."
 
-#: src/summaryview.c:2634
+#: src/summaryview.c:2649
+#, c-format
 msgid "%d deleted"
 msgstr "%d 已刪除"
 
-#: src/summaryview.c:2638
+#: src/summaryview.c:2653
+#, c-format
 msgid "%s%d moved"
 msgstr "%s%d 已移動"
 
-#: src/summaryview.c:2639 src/summaryview.c:2646
+#: src/summaryview.c:2654 src/summaryview.c:2661
 msgid ", "
 msgstr ",  "
 
-#: src/summaryview.c:2644
+#: src/summaryview.c:2659
+#, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已複製"
 
-#: src/summaryview.c:2658
+#: src/summaryview.c:2673
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] "項目已選擇"
 msgstr[1] "項目已選擇"
 
-#: src/summaryview.c:2676 src/summaryview.c:2719
+#: src/summaryview.c:2691 src/summaryview.c:2734
+#, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 新郵件, %d 未讀, %d 全部 (%s)"
 
-#: src/summaryview.c:2694
+#: src/summaryview.c:2709
 msgid "Message summary"
 msgstr "郵件摘要"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2710
 msgid "New:"
 msgstr "新郵件:"
 
-#: src/summaryview.c:2696
+#: src/summaryview.c:2711
 msgid "Unread:"
 msgstr "未讀郵件:"
 
-#: src/summaryview.c:2697
+#: src/summaryview.c:2712
 msgid "Total:"
 msgstr "全部郵件:"
 
-#: src/summaryview.c:2699
+#: src/summaryview.c:2714
 msgid "Marked:"
 msgstr "已標示:"
 
-#: src/summaryview.c:2700
+#: src/summaryview.c:2715
 msgid "Replied:"
 msgstr "已回覆:"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2716
 msgid "Forwarded:"
 msgstr "已轉寄:"
 
-#: src/summaryview.c:2702
+#: src/summaryview.c:2717
 msgid "Locked:"
 msgstr "已鎖定:"
 
-#: src/summaryview.c:2703
+#: src/summaryview.c:2718
 msgid "Ignored:"
 msgstr "忽略:"
 
-#: src/summaryview.c:2704
+#: src/summaryview.c:2719
 msgid "Watched:"
 msgstr "已監看:"
 
-#: src/summaryview.c:2714
+#: src/summaryview.c:2729
+#, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d 已選擇 (%s/%s), %d 未讀"
 
-#: src/summaryview.c:3007
+#: src/summaryview.c:3022
 msgid "Sorting summary..."
 msgstr "摘要排序..."
 
-#: src/summaryview.c:3146
+#: src/summaryview.c:3190
 msgid "Setting summary from message data..."
 msgstr "從郵件資料設定摘要..."
 
-#: src/summaryview.c:3351
+#: src/summaryview.c:3395
 msgid "(No Date)"
 msgstr "(無資料)"
 
-#: src/summaryview.c:3403
+#: src/summaryview.c:3447
 msgid "(No Recipient)"
 msgstr "(無收信者)"
 
-#: src/summaryview.c:3438
+#: src/summaryview.c:3482
+#, c-format
 msgid "From: %s, on %s"
 msgstr "寄件者: %s,  以 %s"
 
-#: src/summaryview.c:3447
+#: src/summaryview.c:3491
+#, c-format
 msgid "To: %s, on %s"
 msgstr "收件者: %s, 以 %s"
 
-#: src/summaryview.c:4312
+#: src/summaryview.c:4356
 msgid "You're not the author of the article.\n"
 msgstr "你不是文章的作者\n"
 
-#: src/summaryview.c:4402
+#: src/summaryview.c:4446
+#, 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] "你確定要刪除 %d 封選擇的郵件嗎?"
 msgstr[1] "你確定要刪除 %d 封選擇的郵件嗎?"
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4449
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "刪除郵件"
 msgstr[1] "刪除郵件"
 
-#: src/summaryview.c:4569
+#: src/summaryview.c:4613
 msgid "Destination is same as current folder."
 msgstr "目的資料夾和目前的相同"
 
-#: src/summaryview.c:4675
+#: src/summaryview.c:4668
+msgid "Select folder to move selected message to"
+msgid_plural "Select folder to move selected messages to"
+msgstr[0] "選擇路徑將選定的郵件移至該位置"
+msgstr[1] "選擇路徑將選定的郵件移至該位置"
+
+#: src/summaryview.c:4719
 msgid "Destination to copy is same as current folder."
 msgstr "要複製的目的資料夾和目前的相同"
 
-#: src/summaryview.c:4845
+#: src/summaryview.c:4753
+msgid "Select folder to copy selected message to"
+msgid_plural "Select folder to copy selected messages to"
+msgstr[0] "選擇路徑,將所有選定複製到該位置"
+msgstr[1] "選擇路徑,將所有選定複製到該位置"
+
+#: src/summaryview.c:4889
 msgid "Append or Overwrite"
 msgstr "擴展或覆寫"
 
-#: src/summaryview.c:4846
+#: src/summaryview.c:4890
 msgid "Append or overwrite existing file?"
 msgstr "擴展或覆寫已存在的檔案?"
 
-#: src/summaryview.c:4847
+#: src/summaryview.c:4891
 msgid "_Append"
 msgstr "擴展(_A)"
 
-#: src/summaryview.c:4847
+#: src/summaryview.c:4891
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
-#: src/summaryview.c:4888
+#: src/summaryview.c:4932
+#, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "你想要列印%d封件,一封一封的印,你確定要繼續嗎?"
 
-#: src/summaryview.c:5346
+#: src/summaryview.c:5390
 msgid "Building threads..."
 msgstr "建立串列..."
 
-#: src/summaryview.c:5594
+#: src/summaryview.c:5638
 msgid "Skip these rules"
 msgstr "略過這些規則"
 
-#: src/summaryview.c:5597
+#: src/summaryview.c:5641
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "不管帳號是屬於誰的,全部套用這些規則"
 
-#: src/summaryview.c:5600
+#: src/summaryview.c:5644
 msgid "Apply these rules if they apply to the current account"
 msgstr "如果這些規則已經套用在目前的帳號,就套用吧!"
 
-#: src/summaryview.c:5629
+#: src/summaryview.c:5673
 msgid "Filtering"
 msgstr "過濾"
 
-#: src/summaryview.c:5630
+#: src/summaryview.c:5674
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -17768,55 +18271,56 @@ msgstr ""
 "有一些過濾規則屬於一個特定帳號\n"
 "請選擇要使用這些規則做什麼:"
 
-#: src/summaryview.c:5660
+#: src/summaryview.c:5704
 msgid "Filtering..."
 msgstr "過濾..."
 
-#: src/summaryview.c:5739
+#: src/summaryview.c:5783
 msgid "Processing configuration"
 msgstr "處理配置"
 
-#: src/summaryview.c:6285
+#: src/summaryview.c:6329
 msgid "Ignored thread"
 msgstr "忽略串列"
 
-#: src/summaryview.c:6287
+#: src/summaryview.c:6331
 msgid "Watched thread"
 msgstr "關注串列"
 
-#: src/summaryview.c:6295
+#: src/summaryview.c:6339
 msgid "Replied but also forwarded - click to see reply"
 msgstr "已回覆但是也轉發了 - 點選以檢視回覆"
 
-#: src/summaryview.c:6297
+#: src/summaryview.c:6341
 msgid "Replied - click to see reply"
 msgstr "已回覆 - 點選以檢視回覆"
 
-#: src/summaryview.c:6309
+#: src/summaryview.c:6353
 msgid "To be moved"
 msgstr "將被移動"
 
-#: src/summaryview.c:6311
+#: src/summaryview.c:6355
 msgid "To be copied"
 msgstr "將被複製"
 
-#: src/summaryview.c:6323
+#: src/summaryview.c:6367
 msgid "Signed, has attachment(s)"
 msgstr "已簽名,有附件"
 
-#: src/summaryview.c:6327
+#: src/summaryview.c:6371
 msgid "Encrypted, has attachment(s)"
 msgstr "已加密,有附件"
 
-#: src/summaryview.c:6329
+#: src/summaryview.c:6373
 msgid "Encrypted"
 msgstr "已加密"
 
-#: src/summaryview.c:6331
+#: src/summaryview.c:6375
 msgid "Has attachment(s)"
 msgstr "有附件"
 
-#: src/summaryview.c:7988
+#: src/summaryview.c:8046
+#, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 "%s"
@@ -17824,11 +18328,11 @@ msgstr ""
 "正規表示式 (regexp) 發生錯誤:\n"
 "%s"
 
-#: src/summaryview.c:8091
+#: src/summaryview.c:8149
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "回到資料夾清單 (你有未讀郵件)"
 
-#: src/summaryview.c:8096
+#: src/summaryview.c:8154
 msgid "Go back to the folder list"
 msgstr "回到資料夾清單"
 
@@ -17861,10 +18365,12 @@ msgid "_Save image..."
 msgstr "儲存影像檔(_S)..."
 
 #: src/textview.c:724
+#, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d 位元)]"
 
 #: src/textview.c:727
+#, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d 位元)]"
 
@@ -17943,7 +18449,8 @@ msgstr "     - 或是使用 "
 msgid "'Open with...'"
 msgstr "以...開啟"
 
-#: src/textview.c:1146
+#: src/textview.c:1147
+#, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 "    %s\n"
@@ -17953,47 +18460,47 @@ msgstr ""
 "    %s\n"
 "離開碼 %d\n"
 
-#: src/textview.c:2197
+#: src/textview.c:2206
 msgid "Tags: "
 msgstr "標籤:"
 
-#: src/textview.c:2905
+#: src/textview.c:2914
 msgid "The real URL is different from the displayed URL."
 msgstr "這個真實的URL和顯示的URL不同"
 
-#: src/textview.c:2906
+#: src/textview.c:2915
 msgid "Displayed URL:"
 msgstr "顯示 URL:"
 
-#: src/textview.c:2907
+#: src/textview.c:2916
 msgid "Real URL:"
 msgstr "真實 URL:"
 
-#: src/textview.c:2908
+#: src/textview.c:2917
 msgid "Open it anyway?"
 msgstr "確認寄出?"
 
-#: src/textview.c:2909
+#: src/textview.c:2918
 msgid "Phishing attempt warning"
 msgstr "嘗試釣魚的警告"
 
-#: src/textview.c:2910
+#: src/textview.c:2919
 msgid "_Open URL"
 msgstr "開啟URL(_O)"
 
-#: src/toolbar.c:224 src/toolbar.c:2213
+#: src/toolbar.c:224 src/toolbar.c:2291
 msgid "Receive Mail from all Accounts"
 msgstr "從所有的帳號接收郵件"
 
-#: src/toolbar.c:225 src/toolbar.c:2218
+#: src/toolbar.c:225 src/toolbar.c:2296
 msgid "Receive Mail from current Account"
 msgstr "從目前的帳號接收郵件"
 
-#: src/toolbar.c:226 src/toolbar.c:2222
+#: src/toolbar.c:226 src/toolbar.c:2300
 msgid "Send Queued Messages"
 msgstr "傳送暫存郵件"
 
-#: src/toolbar.c:227 src/toolbar.c:952 src/toolbar.c:2240 src/toolbar.c:2251
+#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2318 src/toolbar.c:2329
 msgid "Compose Email"
 msgstr "新郵件"
 
@@ -18001,35 +18508,35 @@ msgstr "新郵件"
 msgid "Compose News"
 msgstr "新新聞"
 
-#: src/toolbar.c:229 src/toolbar.c:2295 src/toolbar.c:2305
+#: src/toolbar.c:229 src/toolbar.c:2373 src/toolbar.c:2383
 msgid "Reply to Message"
 msgstr "回覆郵件"
 
-#: src/toolbar.c:230 src/toolbar.c:2312 src/toolbar.c:2322
+#: src/toolbar.c:230 src/toolbar.c:2390 src/toolbar.c:2400
 msgid "Reply to Sender"
 msgstr "回覆寄件者"
 
-#: src/toolbar.c:231 src/toolbar.c:2329 src/toolbar.c:2339
+#: src/toolbar.c:231 src/toolbar.c:2407 src/toolbar.c:2417
 msgid "Reply to All"
 msgstr "回覆全部"
 
-#: src/toolbar.c:232 src/toolbar.c:2346 src/toolbar.c:2356
+#: src/toolbar.c:232 src/toolbar.c:2424 src/toolbar.c:2434
 msgid "Reply to Mailing-list"
 msgstr "回覆至郵件清單"
 
-#: src/toolbar.c:233 src/toolbar.c:2234
+#: src/toolbar.c:233 src/toolbar.c:2312
 msgid "Open email"
 msgstr "開啟郵件"
 
-#: src/toolbar.c:234 src/toolbar.c:2363 src/toolbar.c:2374
+#: src/toolbar.c:234 src/toolbar.c:2441 src/toolbar.c:2452
 msgid "Forward Message"
 msgstr "轉寄"
 
-#: src/toolbar.c:235 src/toolbar.c:2379
+#: src/toolbar.c:235 src/toolbar.c:2457
 msgid "Trash Message"
 msgstr "垃圾郵件"
 
-#: src/toolbar.c:236 src/toolbar.c:2383
+#: src/toolbar.c:236 src/toolbar.c:2461
 msgid "Delete Message"
 msgstr "刪除郵件"
 
@@ -18037,11 +18544,11 @@ msgstr "刪除郵件"
 msgid "Delete duplicate messages"
 msgstr "刪除重覆的郵件"
 
-#: src/toolbar.c:239 src/toolbar.c:2391
+#: src/toolbar.c:239 src/toolbar.c:2469
 msgid "Go to Previous Unread Message"
 msgstr "移動至上一個未讀郵件"
 
-#: src/toolbar.c:240 src/toolbar.c:2395
+#: src/toolbar.c:240 src/toolbar.c:2473
 msgid "Go to Next Unread Message"
 msgstr "移動至下一個未讀郵件"
 
@@ -18077,7 +18584,7 @@ msgstr "郵件標示為已讀"
 msgid "Mark Message as unread"
 msgstr "郵件標示為未讀"
 
-#: src/toolbar.c:253 src/toolbar.c:511
+#: src/toolbar.c:253 src/toolbar.c:514
 msgid "Print"
 msgstr "列印"
 
@@ -18089,242 +18596,266 @@ msgstr "學習垃圾郵件或非垃圾郵件"
 msgid "Open folder/Go to folder list"
 msgstr "開啟資料夾/前往資料夾清單"
 
-#: src/toolbar.c:258 src/toolbar.c:2401
+#: src/toolbar.c:258 src/toolbar.c:2479
 msgid "Send Message"
 msgstr "傳送郵件"
 
-#: src/toolbar.c:259 src/toolbar.c:2405
+#: src/toolbar.c:259 src/toolbar.c:2483
 msgid "Put into queue folder and send later"
 msgstr "移至暫存郵件夾並稍後傳送"
 
-#: src/toolbar.c:260 src/toolbar.c:2409
+#: src/toolbar.c:260 src/toolbar.c:2487
 msgid "Save to draft folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/toolbar.c:261 src/toolbar.c:2413
+#: src/toolbar.c:261 src/toolbar.c:2491
 msgid "Insert file"
 msgstr "插入檔案"
 
-#: src/toolbar.c:262 src/toolbar.c:2417
+#: src/toolbar.c:262 src/toolbar.c:2495
 msgid "Attach file"
 msgstr "附加檔案"
 
-#: src/toolbar.c:263 src/toolbar.c:2421
+#: src/toolbar.c:263 src/toolbar.c:2499
 msgid "Insert signature"
 msgstr "插入簽名"
 
-#: src/toolbar.c:264 src/toolbar.c:2425
+#: src/toolbar.c:264 src/toolbar.c:2503
 msgid "Replace signature"
 msgstr "覆蓋簽名"
 
-#: src/toolbar.c:265 src/toolbar.c:2429
+#: src/toolbar.c:265 src/toolbar.c:2507
 msgid "Edit with external editor"
 msgstr "用外部編輯器進行編輯"
 
-#: src/toolbar.c:266 src/toolbar.c:2433
+#: src/toolbar.c:266 src/toolbar.c:2511
 msgid "Wrap long lines of current paragraph"
 msgstr "將目前段落內的過長內容換行"
 
-#: src/toolbar.c:267 src/toolbar.c:2437
+#: src/toolbar.c:267 src/toolbar.c:2515
 msgid "Wrap all long lines"
 msgstr "所有過長內容換行"
 
-#: src/toolbar.c:270 src/toolbar.c:528 src/toolbar.c:2446
+#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2524
 msgid "Check spelling"
 msgstr "檢查拼字"
 
-#: src/toolbar.c:272
+#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2529
+msgid "Sign"
+msgstr "簽核者"
+
+#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2537
+msgid "Encrypt"
+msgstr "加密"
+
+#: src/toolbar.c:274
 msgid "Claws Mail Actions Feature"
 msgstr "Claws Mail Actions 功能"
 
-#: src/toolbar.c:273 src/toolbar.c:2462
+#: src/toolbar.c:275 src/toolbar.c:2556
 msgid "Cancel receiving"
 msgstr "終止收信"
 
-#: src/toolbar.c:275 src/toolbar.c:2470
+#: src/toolbar.c:277 src/toolbar.c:2564
 msgid "Cancel receiving/sending"
 msgstr "終止收信/寄信"
 
-#: src/toolbar.c:276 src/toolbar.c:2226
+#: src/toolbar.c:278 src/toolbar.c:2304
 msgid "Close window"
 msgstr "關閉視窗"
 
-#: src/toolbar.c:278
+#: src/toolbar.c:280
 msgid "Claws Mail Plugins"
 msgstr "Claws Mail 支援的外掛程式"
 
-#: src/toolbar.c:442 src/toolbar.c:493
+#: src/toolbar.c:445 src/toolbar.c:496
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "回收桶"
 
-#: src/toolbar.c:482
+#: src/toolbar.c:485
 msgid "Get Mail"
 msgstr "收信"
 
-#: src/toolbar.c:483
+#: src/toolbar.c:486
 msgid "Get"
 msgstr "擷取"
 
-#: src/toolbar.c:485 src/toolbar.c:486
+#: src/toolbar.c:488 src/toolbar.c:489
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "新郵件"
 
-#: src/toolbar.c:488
+#: src/toolbar.c:491
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "寄件者"
 
-#: src/toolbar.c:489
+#: src/toolbar.c:492
 msgid "All"
 msgstr "回覆所有"
 
-#: src/toolbar.c:490
+#: src/toolbar.c:493
 msgid "List"
 msgstr "清單"
 
-#: src/toolbar.c:495 src/toolbar.c:2279 src/toolbar.c:2288
+#: src/toolbar.c:498 src/toolbar.c:2357 src/toolbar.c:2366
 msgid "Delete duplicates"
 msgstr "刪除重覆的郵件"
 
-#: src/toolbar.c:497
+#: src/toolbar.c:500
 msgid "Prev"
 msgstr "上一封"
 
-#: src/toolbar.c:498
+#: src/toolbar.c:501
 msgid "Next"
 msgstr "下一封"
 
-#: src/toolbar.c:506
+#: src/toolbar.c:509
 msgid "All read"
 msgstr "所有為已讀"
 
-#: src/toolbar.c:507
+#: src/toolbar.c:510
 msgid "All unread"
 msgstr "所有為未讀"
 
-#: src/toolbar.c:508
+#: src/toolbar.c:511
 msgid "Read"
 msgstr "讀取"
 
-#: src/toolbar.c:513
+#: src/toolbar.c:516
 msgid "Folders"
 msgstr "資料夾"
 
-#: src/toolbar.c:518
+#: src/toolbar.c:521
 msgid "Draft"
 msgstr "草稿"
 
-#: src/toolbar.c:521
+#: src/toolbar.c:524
 msgid "Insert sig."
 msgstr "插入簽名"
 
-#: src/toolbar.c:522
+#: src/toolbar.c:525
 msgid "Replace sig."
 msgstr "置換簽名"
 
-#: src/toolbar.c:523
+#: src/toolbar.c:526
 msgid "Edit"
 msgstr "編輯"
 
-#: src/toolbar.c:524
+#: src/toolbar.c:527
 msgid "Wrap para."
 msgstr "段落換行"
 
-#: src/toolbar.c:525
+#: src/toolbar.c:528
 msgid "Wrap all"
 msgstr "全部換行"
 
-#: src/toolbar.c:531 src/toolbar.c:532
+#: src/toolbar.c:536 src/toolbar.c:537
 msgid "Stop"
 msgstr "停止"
 
-#: src/toolbar.c:533
+#: src/toolbar.c:538
 msgid "Stop all"
 msgstr "全部停止"
 
-#: src/toolbar.c:944
+#: src/toolbar.c:951
 msgid "Compose News message"
-msgstr "給新郵件"
+msgstr "開新郵件"
 
-#: src/toolbar.c:983
+#: src/toolbar.c:990
 msgid "Learn spam"
 msgstr "學習垃圾郵件"
 
-#: src/toolbar.c:992
+#: src/toolbar.c:999
 msgid "Ham"
 msgstr "非垃圾郵件"
 
-#: src/toolbar.c:994
+#: src/toolbar.c:1001
 msgid "Learn ham"
 msgstr "學習非垃圾郵件"
 
-#: src/toolbar.c:2208
+#: src/toolbar.c:1916
+msgid "Message will be signed"
+msgstr "郵件將簽核"
+
+#: src/toolbar.c:1918
+msgid "Message will not be signed"
+msgstr "郵件將不被簽核"
+
+#: src/toolbar.c:1937
+msgid "Message will be encrypted"
+msgstr "郵件將加密"
+
+#: src/toolbar.c:1939
+msgid "Message will not be encrypted"
+msgstr "郵件將不加密"
+
+#: src/toolbar.c:2286
 msgid "Go to folder list"
 msgstr "前往資料夾清單"
 
-#: src/toolbar.c:2214
+#: src/toolbar.c:2292
 msgid "Receive Mail from selected Account"
 msgstr "從選擇的帳號收信"
 
-#: src/toolbar.c:2230
+#: src/toolbar.c:2308
 msgid "Open preferences"
 msgstr "開啟選項"
 
-#: src/toolbar.c:2241
+#: src/toolbar.c:2319
 msgid "Compose with selected Account"
 msgstr "從選擇的帳號開新郵件"
 
-#: src/toolbar.c:2262
+#: src/toolbar.c:2340
 msgid "Learn as..."
 msgstr "學習自..."
 
-#: src/toolbar.c:2272
+#: src/toolbar.c:2350
 msgid "Learn as _Spam"
 msgstr "從垃圾郵件學習"
 
-#: src/toolbar.c:2273
+#: src/toolbar.c:2351
 msgid "Learn as _Ham"
 msgstr "從非垃圾郵件學習"
 
-#: src/toolbar.c:2280
+#: src/toolbar.c:2358
 msgid "Delete duplicates options"
 msgstr "刪除重覆的選項"
 
-#: src/toolbar.c:2284
+#: src/toolbar.c:2362
 msgid "Delete duplicates in selected folder"
 msgstr "在選擇的資料夾內刪除重複的郵件"
 
-#: src/toolbar.c:2285
+#: src/toolbar.c:2363
 msgid "Delete duplicates in all folders"
 msgstr "在所有的資料夾內刪除重複的郵件"
 
-#: src/toolbar.c:2296
+#: src/toolbar.c:2374
 msgid "Reply to Message options"
 msgstr "「回覆的郵件的選項"
 
-#: src/toolbar.c:2300 src/toolbar.c:2317 src/toolbar.c:2334 src/toolbar.c:2351
+#: src/toolbar.c:2378 src/toolbar.c:2395 src/toolbar.c:2412 src/toolbar.c:2429
 msgid "_Reply with quote"
 msgstr "回覆包含引言"
 
-#: src/toolbar.c:2301 src/toolbar.c:2318 src/toolbar.c:2335 src/toolbar.c:2352
+#: src/toolbar.c:2379 src/toolbar.c:2396 src/toolbar.c:2413 src/toolbar.c:2430
 msgid "Reply without _quote"
 msgstr "回覆不包含引言"
 
-#: src/toolbar.c:2313
+#: src/toolbar.c:2391
 msgid "Reply to Sender options"
 msgstr "回覆至寄件者的選項"
 
-#: src/toolbar.c:2330
+#: src/toolbar.c:2408
 msgid "Reply to All options"
 msgstr "回覆至所有的選項"
 
-#: src/toolbar.c:2347
+#: src/toolbar.c:2425
 msgid "Reply to Mailing-list options"
 msgstr "回覆至郵件清單的選項"
 
-#: src/toolbar.c:2364
+#: src/toolbar.c:2442
 msgid "Forward Message options"
 msgstr "轉寄郵件的選項"
 
@@ -18355,6 +18886,7 @@ msgid "Welcome to Claws Mail"
 msgstr "歡迎光臨 Claws Mail"
 
 #: src/wizard.c:544
+#, c-format
 msgid ""
 "\n"
 "Welcome to Claws Mail\n"
@@ -18571,11 +19103,11 @@ msgstr ""
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws Mail 設定精靈"
 
-#: src/wizard.c:1821
+#: src/wizard.c:1820
 msgid "Welcome to Claws Mail"
 msgstr "歡迎來到 Clasw Mail"
 
-#: src/wizard.c:1828
+#: src/wizard.c:1827
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -18588,34 +19120,35 @@ msgstr ""
 "我們將會從定義一些基本的資訊開始,關於你和你常用的郵件選項。如此你就可以在少"
 "於5分鐘的時間內,開始使用 Claws Mail  "
 
-#: src/wizard.c:1841
+#: src/wizard.c:1840
 msgid "About You"
 msgstr "關於你"
 
-#: src/wizard.c:1849 src/wizard.c:1864 src/wizard.c:1879 src/wizard.c:1895
+#: src/wizard.c:1848 src/wizard.c:1863 src/wizard.c:1878 src/wizard.c:1894
 msgid "Bold fields must be completed"
 msgstr "粗體欄位需要被完成"
 
-#: src/wizard.c:1856
+#: src/wizard.c:1855
 msgid "Receiving mail"
 msgstr "接收郵件"
 
-#: src/wizard.c:1871
+#: src/wizard.c:1870
 msgid "Sending mail"
 msgstr "傳送郵件"
 
-#: src/wizard.c:1887
+#: src/wizard.c:1886
 msgid "Saving mail on disk"
 msgstr "儲存郵件在磁碟上"
 
-#: src/wizard.c:1903
+#: src/wizard.c:1902
 msgid "Configuration finished"
 msgstr "配置完成"
 
-#: src/wizard.c:1910
+#: src/wizard.c:1909
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
 "Claws Mail 已經準備好了\n"
 "點擊儲存後開始"
+

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list